# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179781103 0
# Node ID 618a3748ff64c93e35e7c8635bfa378f1625a0e0
# Parent  e42309469a4a4980a8beb308359786ff2d1ff96e# Parent  0598803f9b6494ef2dba1a2dcb147eba9cc1a7d9
merge of '6a857845ed772173ecc2083603f0d661eb52c68a'
     and 'f806da14ec2d87cd6650b921eaeed3c6d6587598'

diff -r e42309469a4a -r 618a3748ff64 COPYRIGHT
--- a/COPYRIGHT	Mon May 21 20:02:18 2007 +0000
+++ b/COPYRIGHT	Mon May 21 20:58:23 2007 +0000
@@ -87,7 +87,9 @@
 Palmer Cox
 Jeramey Crawford
 Michael Culbertson
+Steven Danna
 Martijn Dekker
+Vinicius Depizzol
 Philip Derrin
 Taso N. Devetzis
 Balwinder Singh Dheeman
@@ -171,6 +173,7 @@
 Thomas Huriaux
 Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
+Intel Corporation
 Scott Jackson
 Hans Petter Jansson
 Henry Jen
@@ -302,6 +305,7 @@
 David Schmitt
 Mark Schneider
 Evan Schoenberg
+Gabriel Schulhof
 Federico Schwindt
 Torrey Searle
 Peter Seebach
@@ -321,6 +325,7 @@
 Phil Snowberger
 Eddie Sohn (tr1sk)
 Sony Computer Entertainment America, Inc.
+Andy Spencer
 Mark Spencer
 Lex Spoon
 Chris Stafford
@@ -353,11 +358,13 @@
 Junichi Uekawa
 István Váradi
 Martijn van Beers
+Arjan van de Ven
 Philip Van Hoof
 Kristof Vansant
 James Vega
 David Vermeille
 Sid Vicious
+Jorge Villaseñor (Masca)
 Bjoern Voigt
 Wan Hing Wah
 Philip Walford
diff -r e42309469a4a -r 618a3748ff64 ChangeLog
--- a/ChangeLog	Mon May 21 20:02:18 2007 +0000
+++ b/ChangeLog	Mon May 21 20:58:23 2007 +0000
@@ -3,13 +3,59 @@
 version 2.0.1 (??/??/????):
 	* Buddy list update speedups when buddy icons are not being
 	  displayed.  (Scott Wolchok)
+	* Fix icons on docklet change status menu to match the status selector
+	* Custom smileys on MSN can be saved by right-clicking on them
+	* Fix a crash deleting a buddy that is in the Buddy List more than once
+	* Compile fixes for Solaris
+	* Fix GTalk formatting when there's a space before/after a */_
+	* Fix Log viewer crash when the filename is not in the expected format
+	* Get User Info now provides immediate feedback, and is updated when the
+	  user information is available
+	* Make the choose buddy icon dialog correctly list the current directory
+	* Fix for buddy icons disappearing
+	* Timestamps are always on in debug output (-d) and Debug Window now
+	* Don't escape html entities in Yahoo! system messages
+	* Fix for the choose buddy icon dialog resizing strangely as files are selected
+	* Receives notifications when XMPP buddies send "leaving chat"
+	  messages
+	* Fix the typing animation so it doesn't stop animating once a conversation
+	  has gone from typing -> not typing -> typing
+	* Fix error messages when joing XMPP chats
+	* Identify the account when warning about plaintext auth over an
+	  unencrypted channel
+	* Fix XMPP SASL authentication error when using Cyrus and a connect server
+	* Fix changing tab locations to update properly
+	* Turning off "Show formatting on incoming messages" now ignores
+	  formatting in <span> tags too
+	* File transfer progress for transfers on MSN is now correctly displayed
+	* You can set/change alias of buddies/chats by double-clicking on the
+	  conversation tabs (Ma Xuan)
+	* Fix IRC connection bug with dircproxy (xjoe)
+	* Ctrl+[shift]+tab focuses the next most active tab (William Thompson)
+	* Fix Open Hotmail Inbox for MSN to work more reliably
+	* Add a Google Talk item to the protocol list, to help users who think
+	  we don't support Google Talk.  The item acts just like "XMPP".
+	* Remember if the X server supports XScreenSaver, to avoid waking it
+	  every 5 seconds.  (Arjan van de Ven with Intel Corporation)
+	* Change our idle checking to poll only as necessary and raise the
+	  unidle timeout from 5 seconds to 60 when using XScreenSaver.  This
+	  and the XScreenSaver change will reduce Pidgin's effect on power
+	  consumption when running with NO_HZ.  (Arjan van de Ven with Intel
+	  Corporation)
+	* Conversation -> Save As will now use aliases.
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using
-	  "/users" command.
-	* Menus in the conversation windows.
-	* Improved tab completion support.
-	* Ctrl+c prompts with a dialog before exiting.
+	  "/users" command
+	* Menus in the conversation windows
+	* Improved tab completion support
+	* Ctrl+c prompts with a dialog before exiting
+	* Filter string in the debug window
+	* Notify when you leave a chat
+	* Work around an ncurses bug which appears when half of a multi-cell
+	  character is covered by an upper-level window
+	* New plugins are shown in bold text in the plugin dialog
+	* Nicer HTML screendumps
 
 version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the
diff -r e42309469a4a -r 618a3748ff64 ChangeLog.win32
--- a/ChangeLog.win32	Mon May 21 20:02:18 2007 +0000
+++ b/ChangeLog.win32	Mon May 21 20:58:23 2007 +0000
@@ -1,7 +1,9 @@
+version 2.0.1 (??/??/????):
+
 version 2.0.0 (5/3/2007):
 	* URI Handler support added via `pidgin.exe --protocolhandler=`
 	* Running a second instance will popup the Buddy List, if possible.
-	* Updated GTK+ to 2.10.11 (rev.a) (Win98/ME will need to use 2.6.10)
+	* Updated GTK+ to 2.10.11 (rev.b) (Win98/ME will need to use 2.6.10)
 	* The transparency plugin has been rewritten and enhanced.
 	* MSN open email bug fixed.
 	* Update SILC to use the 1.0.2 toolkit
diff -r e42309469a4a -r 618a3748ff64 config.h.mingw
--- a/config.h.mingw	Mon May 21 20:02:18 2007 +0000
+++ b/config.h.mingw	Mon May 21 20:58:23 2007 +0000
@@ -4,65 +4,26 @@
 /* configure arguments */
 /* #undef CONFIG_ARGS */
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Define if debugging is enabled. */
 /* #undef DEBUG */
 
-/* Use binary relocation? */
-/* #undef ENABLE_BINRELOC */
-
 /* Define if mono enabled. */
 /* #undef ENABLE_MONO */
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
+/* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* Define to make assertions fatal (useful for debugging). */
-/* #undef PURPLE_FATAL_ASSERTS */
-
-/* Define if plugins are enabled. */
-#define PURPLE_PLUGINS 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-/* #undef HAVE_ALSA_ASOUNDLIB_H */
-
 /* Define if you have the external 'altzone' variable. */
 /* #undef HAVE_ALTZONE */
 
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
 /* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
 /* #undef HAVE_ARPA_NAMESER_COMPAT_H */
 
-/* Define to 1 if you have the `asprintf' function. */
-/* #undef HAVE_ASPRINTF */
-
 /* Define to 1 if you have the `atexit' function. */
 #define HAVE_ATEXIT 1
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
 
 /* Define to 1 if you have the `connect' function. */
 /* #undef HAVE_CONNECT */
@@ -73,39 +34,19 @@
 /* Define if you have the external 'daylight' variable. */
 #define HAVE_DAYLIGHT 1
 
-/* Define if we are re using DBUS. */
+/* Define if we are using D-Bus. */
 /* #undef HAVE_DBUS */
 
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
+/* Define to 1 if you have the `dcgettext' function. */
 /* #undef HAVE_DCGETTEXT */
 
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_FEOF_UNLOCKED */
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-/* #undef HAVE_DECL_FGETS_UNLOCKED */
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_GETC_UNLOCKED */
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNPRINTF 1
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNWPRINTF 1
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_TZNAME */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define to 1 if you have the `dlopen' function. */
-/* #undef HAVE_DLOPEN */
-
 /* whether or not we have dot */
 /* #undef HAVE_DOT */
 
@@ -121,68 +62,28 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define to 1 if you have the `fwprintf' function. */
-#define HAVE_FWPRINTF 1
-
 /* Define to 1 if you have the getaddrinfo function. */
 /* TODO: Use this on new enough versions of Windows */
 /* #define HAVE_GETADDRINFO 1 */
 
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-/* #define HAVE_GETEGID 1 */
-
-/* Define to 1 if you have the `geteuid' function. */
-/* #define HAVE_GETEUID 1 */
-
-/* Define to 1 if you have the `getgid' function. */
-/* #define HAVE_GETGID 1 */
-
 /* Define to 1 if you have the `gethostid' function. */
 /* #define HAVE_GETHOSTID 1 */
 
 /* Define to 1 if you have the `getopt_long' function. */
 /* #define HAVE_GETOPT_LONG 1 */
 
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 /* #define HAVE_GETTEXT 1 */
 
-/* Define to 1 if you have the `getuid' function. */
-/* #define HAVE_GETUID 1 */
-
-/* Pidgin always has GLib, but Linphone can be built without it */
-/* #undef HAVE_GLIB */
-
 /* Define if you have GNUTLS */
 /* #define HAVE_GNUTLS 1 */
 
 /* Define to 1 if you have the <gnutls/gnutls.h> header file. */
 /* #define HAVE_GNUTLS_GNUTLS_H 1 */
 
-/* Define if you have the iconv() function. */
-/* #define HAVE_ICONV 1 */
-
-/* Defined when we have ilbc codec lib */
-/* #undef HAVE_ILBC */
-
-/* Define to 1 if you have the <iLBC_decode.h> header file. */
-/* #undef HAVE_ILBC_DECODE_H */
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_INTMAX_T 1
-
 /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #define HAVE_INTTYPES_H 1
 
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-
 /* Define if we have IOKit */
 /* #undef HAVE_IOKIT */
 
@@ -201,15 +102,15 @@
 /* Define to 1 if you have the `krb_set_key' function. */
 /* #undef HAVE_KRB_SET_KEY */
 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-/* #define HAVE_LANGINFO_CODESET 1 */
-
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #define HAVE_LC_MESSAGES 1 */
 
 /* Define to 1 if you have libgadu. */
 #define HAVE_LIBGADU 1
 
+/* Define if you have NetworkManager */
+/* #undef HAVE_LIBNM */
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #define HAVE_LIBNSL 1 */
 
@@ -219,24 +120,12 @@
 /* Define to 1 if you have the `socket' library (-lsocket). */
 /* #undef HAVE_LIBSOCKET */
 
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
-/* Define if you have the 'long double' type. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you have the 'long long' type. */
-#define HAVE_LONG_LONG 1
-
 /* Define to 1 if you have the `lrand48' function. */
 /* #define HAVE_LRAND48 1 */
 
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-/* #undef HAVE_MACHINE_SOUNDCARD_H */
-
 /* Define to 1 if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H 1
 
@@ -249,12 +138,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if you have the `mempcpy' function. */
-/* #define HAVE_MEMPCPY 1*/
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #define HAVE_MMAP 1 */
-
 /* Define to 1 if you have the `mono_jit_init' function. */
 /* #undef HAVE_MONO_JIT_INIT */
 
@@ -264,12 +147,6 @@
 /* Define to 1 if you have the <mono/metadata/object.h> header file. */
 /* #undef HAVE_MONO_METADATA_OBJECT_H */
 
-/* Define to 1 if you have the `munmap' function. */
-/* #define HAVE_MUNMAP 1 */
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-/* #define HAVE_NL_TYPES_H 1 */
-
 /* Define to 1 if you have the <nspr.h> header file. */
 /* #undef HAVE_NSPR_H */
 
@@ -297,24 +174,15 @@
 /* Define to 1 if you have the `perl_run' function. */
 /* #define HAVE_PERL_RUN 1 */
 
-/* Define if your printf() function supports format strings with positions. */
-#define HAVE_POSIX_PRINTF 1
-
 /* Define to 1 if you have the <prio.h> header file. */
 /* #undef HAVE_PRIO_H */
 
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
 /* Define to 1 if you have the `random' function. */
 /* #define HAVE_RANDOM 1 */
 
 /* Define to 1 if you have the <regex.h> header file. */
 /* #define HAVE_REGEX_H 1 */
 
-/* Define to 1 if you have the `setenv' function. */
-/* #define HAVE_SETENV 1 */
-
 /* Define to 1 if you have the `setlocale' function. */
 #define HAVE_SETLOCALE 1
 
@@ -333,12 +201,6 @@
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
-/* Define to 1 if you have the <soundcard.h> header file. */
-/* #undef HAVE_SOUNDCARD_H */
-
-/* Define to 1 if you have the <speex.h> header file. */
-/* #undef HAVE_SPEEX_H */
-
 /* Define if you have SSL */
 #define HAVE_SSL 1
 
@@ -351,25 +213,12 @@
 /* Define to 1 if you have the <stdarg.h> header file. */
 #define HAVE_STDARG_H 1
 
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the `stpcpy' function. */
-/* #define HAVE_STPCPY 1 */
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
 /* Define to 1 if you have the `strchr' function. */
 #define HAVE_STRCHR 1
 
@@ -394,15 +243,9 @@
 /* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
 /* Define to 1 if `tm_zone' is member of `struct tm'. */
 /* #define HAVE_STRUCT_TM_TM_ZONE 1 */
 
-/* Define to 1 if you have the <sys/audio.h> header file. */
-/* #undef HAVE_SYS_AUDIO_H */
-
 /* Define to 1 if you have the <sys/cdefs.h> header file. */
 /* #define HAVE_SYS_CDEFS_H 1 */
 
@@ -418,15 +261,9 @@
 /* Define to 1 if you have the <sys/msgbuf.h> header file. */
 /* #undef HAVE_SYS_MSGBUF_H */
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #define HAVE_SYS_PARAM_H 1 */
-
 /* Define to 1 if you have the <sys/select.h> header file. */
 /* #define HAVE_SYS_SELECT_H 1 */
 
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -464,61 +301,28 @@
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 /* #define HAVE_TM_ZONE 1 */
 
-/* Define to 1 if you have the `tsearch' function. */
-/* #define HAVE_TSEARCH 1 */
-
 /* Define to 1 if you don't have `tm_zone' but do have the external array
    `tzname'. */
 /* #undef HAVE_TZNAME */
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_UINTMAX_T 1
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define if you have the 'unsigned long long' type. */
-#define HAVE_UNSIGNED_LONG_LONG 1
-
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
-/* Compile with Voice/Video support */
-/* #undef HAVE_VV */
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* Define if you have the 'wint_t' type. */
-#define HAVE_WINT_T 1
+/* Define to 1 if you have X11 */
+/* #define HAVE_X11 1 */
 
 /* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
 /* #define HAVE_X11_SM_SMLIB_H 1 */
 
-/* Define to 1 if you have the `__argz_count' function. */
-/* #define HAVE___ARGZ_COUNT 1 */
-
-/* Define to 1 if you have the `__argz_next' function. */
-/* #define HAVE___ARGZ_NEXT 1 */
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-/* #define HAVE___ARGZ_STRINGIFY 1 */
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-/* #define HAVE___FSETLOCKING 1 */
-
-/* Define as const if the declaration of iconv() needs const. */
-/* #define ICONV_CONST */
-
-/* Define if integer division by zero raises signal SIGFPE. */
-/* #define INTDIV0_RAISES_SIGFPE 1 */
-
 /* Define if external libzephyr should be used. */
 /* #undef LIBZEPHYR_EXT */
 
+/* Define to 1 if you don't have wide-character support. */
+/* #undef NO_WIDECHAR */
+
 /* Define if old perl is installed. */
 /* #undef OLD_PERL */
 
@@ -540,23 +344,17 @@
 /* Define to the version of this package. */
 /* #define PACKAGE_VERSION "2.0.0dev" */
 
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-/* #undef PRI_MACROS_BROKEN */
+/* Define to make assertions fatal (useful for debugging). */
+/* #define PURPLE_FATAL_ASSERTS 1 */
+
+/* Define if plugins are enabled. */
+#define PURPLE_PLUGINS 1
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-/* #undef SIZE_MAX */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
+/* The size of `time_t', as computed by sizeof. */
+#define SIZEOF_TIME_T 4
 
 /* Loads static protocol plugin module initialization functions. */
 #ifndef STATIC_PROTO_INIT
@@ -569,10 +367,10 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 /* #undef TM_IN_SYS_TIME */
 
-/* Define if we're using libao and libaudiofile for sound playing */
-/* #define USE_AO 1 */
+/* Use GStreamer for playing sounds */
+/* #define USE_GSTREAMER 1 */
 
-/* do we have gtkspell? */
+/* Define if we're using GtkSpell */
 #define USE_GTKSPELL 1
 
 /* Define if we're using XScreenSaver. */
@@ -603,48 +401,14 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-/* Defined when alsa support is enabled */
-/* #undef __ALSA_ENABLED__ */
-
-/* Jack support */
-/* #undef __JACK_ENABLED__ */
-
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-/* #undef ptrdiff_t */
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-/* #undef signed */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
 /* socklen_t size */
-/* #define socklen_t int */
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-/* #undef uintmax_t */
-
-#define HAVE_LIBXML 1
+/* #undef socklen_t */
 
 /*
  * Following are added for Win32 version of Pidgin
  */
 #define HAVE_VSNPRINTF 1
 
-#define SIZEOF_TIME_T 4
-
-#define PIDGIN_NAME "Pidgin"
diff -r e42309469a4a -r 618a3748ff64 configure.ac
--- a/configure.ac	Mon May 21 20:02:18 2007 +0000
+++ b/configure.ac	Mon May 21 20:58:23 2007 +0000
@@ -139,6 +139,19 @@
 ALL_LINGUAS="af am ar az bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ps ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
+dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
+dnl AM_GLIB_GNU_GETTEXT found it.
+
+if test x$MSGFMT = xno -o x$GMSGFMT = x
+then
+	AC_ERROR([
+
+The msgfmt command is required to build libpurple.  If it is installed
+on your system, ensure that it is in your path.  If it is not, install
+GNU gettext to continue.
+])
+fi
+
 dnl we don't use autobreak on cygwin!!
 dnl AC_CYGWIN
 
@@ -892,22 +905,7 @@
 AC_CHECK_HEADER(sys/utsname.h)
 AC_CHECK_FUNC(uname)
 
-AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], enable_fortify="$enableval", enable_fortify=yes)
-
-AC_ARG_ENABLE(mcheck, [AC_HELP_STRING([--enable-mcheck], [compile with mcheck (malloc debugging) support])], enable_mcheck="$enableval", enable_mcheck="$enable_debug")
-if test "x$enable_mcheck" = "xyes" ; then
-	orig_LIBS="$LIBS"
-	LIBS="$LIBS -lmcheck"
-	AC_MSG_CHECKING(for mcheck support)
-	AC_TRY_COMPILE([], [
-		int main() {return 0;}
-	], [
-		AC_MSG_RESULT(yes)
-	], [
-		AC_MSG_RESULT(no)
-		LIBS="$orig_LIBS"
-	])
-fi
+AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
 
 if test "x$GCC" = "xyes"; then
 	dnl We enable -Wall later.
@@ -1987,16 +1985,11 @@
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],
 	[compile with debugging support])], , enable_debug=no)
+
 if test "x$enable_debug" = "xyes" ; then
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
-AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--enable-fatal-asserts],
-	[make assertions fatal (useful for debugging)])], , enable_fatal_asserts=no)
-if test "x$enable_fatal_asserts" = "xyes" ; then
-	AC_DEFINE(PURPLE_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).])
-fi
-
 AC_OUTPUT([Makefile
 		   Doxyfile
 		   doc/Makefile
@@ -2145,7 +2138,6 @@
 echo Build with Tk support......... : $enable_tk
 echo
 echo Print debugging messages...... : $enable_debug
-echo Assertions are fatal.......... : $enable_fatal_asserts
 echo
 eval eval echo Pidgin will be installed in $bindir.
 if test "x$pidginpath" != "x" ; then
diff -r e42309469a4a -r 618a3748ff64 doc/finch.1.in
--- a/doc/finch.1.in	Mon May 21 20:02:18 2007 +0000
+++ b/doc/finch.1.in	Mon May 21 20:58:23 2007 +0000
@@ -29,11 +29,12 @@
 
 .SH DESCRIPTION
 .PP
-\fBfinch\fR is a console-based modular messaging client capable of using
-AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
-Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in
-other clients, as well as many unique features.  Finch is not endorsed by or
-affiliated with America Online, ICQ, Microsoft, or Yahoo.
+\fBfinch\fR is a console-based modular messaging client based on libpurple
+which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
+many common features found in other clients, as well as many unique features.
+Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+Yahoo.
 
 .SH OPTIONS
 The following options are provided by \fBfinch\fR using the standard GNU
diff -r e42309469a4a -r 618a3748ff64 doc/pidgin.1.in
--- a/doc/pidgin.1.in	Mon May 21 20:02:18 2007 +0000
+++ b/doc/pidgin.1.in	Mon May 21 20:58:23 2007 +0000
@@ -28,11 +28,12 @@
 
 .SH DESCRIPTION
 .PP
-Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP,
-ICQ, IRC, SILC, SIP/SIMPLE Novell GroupWise, Lotus Sametime, Bonjour,
-Zephyr, Gadu-Gadu, and QQ all at once.  It has many common features found in
-other clients, as well as many unique features.  Pidgin is not endorsed by or
-affiliated with America Online, ICQ, Microsoft, or Yahoo.
+\fBpidgin\fR is a graphical modular messaging client based on libpurple
+which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
+many common features found in other clients, as well as many unique features.
+Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+Yahoo.
 
 .SH OPTIONS
 The following options are provided by Pidgin using the standard GNU
diff -r e42309469a4a -r 618a3748ff64 finch/finch.c
--- a/finch/finch.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/finch.c	Mon May 21 20:58:23 2007 +0000
@@ -214,11 +214,6 @@
 		{0, 0, 0, 0}
 	};
 
-#ifdef PURPLE_FATAL_ASSERTS
-	/* Make g_return_... functions fatal. */
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-#endif
-
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -274,7 +269,9 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("%s v%s.\n", "Finch", VERSION);
+		/* Translators may want to transliterate the name.
+		 It is not to be translated. */
+		printf("%s %s\n", _("Finch"), VERSION);
 		return 0;
 	}
 
@@ -303,7 +300,7 @@
 			char *text = g_strdup_printf(_(
 				"%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"), "Finch",
+				"migration by hand. Please report this error at http://developer.pidgin.im"), _("Finch"),
 				old, purple_user_dir());
 
 			g_free(old);
diff -r e42309469a4a -r 618a3748ff64 finch/gntaccount.c
--- a/finch/gntaccount.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntaccount.c	Mon May 21 20:58:23 2007 +0000
@@ -930,11 +930,15 @@
 
 static PurpleAccountUiOps ui_ops =
 {
-	.notify_added = notify_added,
-	.status_changed = NULL,
-	.request_add  = request_add,
-	.request_authorize = finch_request_authorize,
-	.close_account_request = finch_request_close
+	notify_added,
+	NULL,
+	request_add,
+	finch_request_authorize,
+	finch_request_close,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleAccountUiOps *finch_accounts_get_ui_ops()
diff -r e42309469a4a -r 618a3748ff64 finch/gntblist.c
--- a/finch/gntblist.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntblist.c	Mon May 21 20:58:23 2007 +0000
@@ -447,9 +447,13 @@
 	node_remove,
 	NULL,
 	NULL,
-	.request_add_buddy = finch_request_add_buddy,
-	.request_add_chat = finch_request_add_chat,
-	.request_add_group = finch_request_add_group
+	finch_request_add_buddy,
+	finch_request_add_chat,
+	finch_request_add_group,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static gpointer
@@ -955,7 +959,7 @@
 
 	prompt = g_strdup_printf(_("Please enter the new name for %s"), name);
 
-	text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Alias");
+	text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Set Alias");
 	purple_request_input(node, text, prompt, _("Enter empty string to reset the name."),
 			name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
 			_("Cancel"), NULL,
diff -r e42309469a4a -r 618a3748ff64 finch/gntconn.c
--- a/finch/gntconn.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntconn.c	Mon May 21 20:58:23 2007 +0000
@@ -56,11 +56,17 @@
 
 static PurpleConnectionUiOps ops = 
 {
-	.connect_progress = NULL,
-	.connected = NULL,
-	.disconnected = NULL,
-	.notice = NULL,
-	.report_disconnect = finch_connection_report_disconnect
+	NULL, /* connect_progress */
+	NULL, /* connected */
+	NULL, /* disconnected */
+	NULL, /* notice */
+	finch_connection_report_disconnect,
+	NULL, /* network_connected */
+	NULL, /* network_disconnected */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConnectionUiOps *finch_connections_get_ui_ops()
diff -r e42309469a4a -r 618a3748ff64 finch/gntconv.c
--- a/finch/gntconv.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntconv.c	Mon May 21 20:58:23 2007 +0000
@@ -57,6 +57,9 @@
 
 #include "config.h"
 
+static void finch_write_common(PurpleConversation *conv, const char *who,
+		const char *message, PurpleMessageFlags flags, time_t mtime);
+
 static void
 send_typing_notification(GntWidget *w, FinchConv *ggconv)
 {
@@ -268,6 +271,13 @@
 	g_free(title);
 }
 
+static void
+chat_left_cb(PurpleConversation *conv, gpointer null)
+{
+	finch_write_common(conv, NULL, _("You have left this chat."),
+			PURPLE_MESSAGE_SYSTEM, time(NULL));
+}
+
 static gpointer
 finch_conv_get_handle()
 {
@@ -303,6 +313,11 @@
 get_info_cb(GntMenuItem *item, gpointer ggconv)
 {
 	FinchConv *ggc = ggconv;
+	PurpleNotifyUserInfo *info = purple_notify_user_info_new();
+	purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+	purple_notify_userinfo(ggc->active_conv->account->gc, purple_conversation_get_name(ggc->active_conv), info, NULL, NULL);
+	purple_notify_user_info_destroy(info);
+
 	serv_get_info(purple_conversation_get_gc(ggc->active_conv),
 			purple_conversation_get_name(ggc->active_conv));
 }
@@ -396,17 +411,26 @@
 	gnt_menuitem_set_callback(item, toggle_timestamps_cb, ggc);
 
 	if (purple_conversation_get_type(ggc->active_conv) == PURPLE_CONV_TYPE_IM) {
-		item = gnt_menuitem_new(_("Send File"));
-		gnt_menu_add_item(GNT_MENU(sub), item);
-		gnt_menuitem_set_callback(item, send_file_cb, ggc);
+		PurpleAccount *account = purple_conversation_get_account(ggc->active_conv);
+		PurplePluginProtocolInfo *pinfo = account->gc ? PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl) : NULL;
+
+		if (pinfo && pinfo->get_info) {
+			item = gnt_menuitem_new(_("Get Info"));
+			gnt_menu_add_item(GNT_MENU(sub), item);
+			gnt_menuitem_set_callback(item, get_info_cb, ggc);
+		}
 
 		item = gnt_menuitem_new(_("Add Buddy Pounce..."));
 		gnt_menu_add_item(GNT_MENU(sub), item);
 		gnt_menuitem_set_callback(item, add_pounce_cb, ggc);
 
-		item = gnt_menuitem_new(_("Get Info"));
-		gnt_menu_add_item(GNT_MENU(sub), item);
-		gnt_menuitem_set_callback(item, get_info_cb, ggc);
+		if (pinfo && pinfo->send_file &&
+				(!pinfo->can_receive_file ||
+				 	pinfo->can_receive_file(account->gc, purple_conversation_get_name(ggc->active_conv)))) {
+			item = gnt_menuitem_new(_("Send File"));
+			gnt_menu_add_item(GNT_MENU(sub), item);
+			gnt_menuitem_set_callback(item, send_file_cb, ggc);
+		}
 
 		generate_send_to_menu(ggc);
 	}
@@ -469,7 +493,8 @@
 		FinchConvChat *fc = ggc->u.chat = g_new0(FinchConvChat, 1);
 		hbox = gnt_hbox_new(FALSE);
 		gnt_box_set_pad(GNT_BOX(hbox), 0);
-		tree = fc->userlist = gnt_tree_new();
+		tree = fc->userlist = gnt_tree_new_with_columns(2);
+		gnt_tree_set_col_width(GNT_TREE(tree), 0, 1);   /* The flag column */
 		gnt_tree_set_compare_func(GNT_TREE(tree), (GCompareFunc)g_utf8_collate);
 		gnt_tree_set_hash_fns(GNT_TREE(tree), g_str_hash, g_str_equal, g_free);
 		GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
@@ -505,10 +530,6 @@
 
 	if (type == PURPLE_CONV_TYPE_IM) {
 		g_signal_connect(G_OBJECT(ggc->entry), "text_changed", G_CALLBACK(send_typing_notification), ggc);
-		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
-						PURPLE_CALLBACK(update_buddy_typing), NULL);
-		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", finch_conv_get_handle(),
-						PURPLE_CALLBACK(update_buddy_typing), NULL);
 	}
 
 	g_free(title);
@@ -655,6 +676,20 @@
 	finch_write_common(conv, name, message, flags, mtime);
 }
 
+static const char *
+chat_flag_text(PurpleConvChatBuddyFlags flags)
+{
+	if (flags & PURPLE_CBFLAGS_FOUNDER)
+		return "~";
+	if (flags & PURPLE_CBFLAGS_OP)
+		return "@";
+	if (flags & PURPLE_CBFLAGS_HALFOP)
+		return "%";
+	if (flags & PURPLE_CBFLAGS_VOICE)
+		return "+";
+	return " ";
+}
+
 static void
 finch_chat_add_users(PurpleConversation *conv, GList *users, gboolean new_arrivals)
 {
@@ -689,7 +724,7 @@
 		gnt_entry_add_suggest(entry, cbuddy->name);
 		gnt_entry_add_suggest(entry, cbuddy->alias);
 		gnt_tree_add_row_after(tree, g_strdup(cbuddy->name),
-				gnt_tree_create_row(tree, cbuddy->alias), NULL, NULL);
+				gnt_tree_create_row(tree, chat_flag_text(cbuddy->flags), cbuddy->alias), NULL, NULL);
 	}
 }
 
@@ -700,16 +735,19 @@
 	FinchConv *ggc = conv->ui_data;
 	GntEntry *entry = GNT_ENTRY(ggc->entry);
 	GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
+	PurpleConvChatBuddy *cb = purple_conv_chat_cb_find(PURPLE_CONV_CHAT(conv), new_n);
+
 	gnt_entry_remove_suggest(entry, old);
+	gnt_tree_remove(tree, (gpointer)old);
+
 	gnt_entry_add_suggest(entry, new_n);
 	gnt_entry_add_suggest(entry, new_a);
-	gnt_tree_remove(tree, (gpointer)old);
 	gnt_tree_add_row_after(tree, g_strdup(new_n),
-			gnt_tree_create_row(tree, new_a), NULL, NULL);
+			gnt_tree_create_row(tree, chat_flag_text(cb->flags), new_a), NULL, NULL);
 }
 
 static void
-finch_chat_remove_user(PurpleConversation *conv, GList *list)
+finch_chat_remove_users(PurpleConversation *conv, GList *list)
 {
 	/* Remove the name from string completion */
 	FinchConv *ggc = conv->ui_data;
@@ -724,24 +762,32 @@
 static void
 finch_chat_update_user(PurpleConversation *conv, const char *user)
 {
+	PurpleConvChatBuddy *cb = purple_conv_chat_cb_find(PURPLE_CONV_CHAT(conv), user);
+	FinchConv *ggc = conv->ui_data;
+	gnt_tree_change_text(GNT_TREE(ggc->u.chat->userlist), (gpointer)user, 0, chat_flag_text(cb->flags));
 }
 
 static PurpleConversationUiOps conv_ui_ops = 
 {
-	.create_conversation = finch_create_conversation,
-	.destroy_conversation = finch_destroy_conversation,
-	.write_chat = finch_write_chat,
-	.write_im = finch_write_im,
-	.write_conv = finch_write_conv,
-	.chat_add_users = finch_chat_add_users,
-	.chat_rename_user = finch_chat_rename_user,
-	.chat_remove_users = finch_chat_remove_user,
-	.chat_update_user = finch_chat_update_user,
-	.present = NULL,
-	.has_focus = NULL,
-	.custom_smiley_add = NULL,
-	.custom_smiley_write = NULL,
-	.custom_smiley_close = NULL
+	finch_create_conversation,
+	finch_destroy_conversation,
+	finch_write_chat,
+	finch_write_im,
+	finch_write_conv,
+	finch_chat_add_users,
+	finch_chat_rename_user,
+	finch_chat_remove_users,
+	finch_chat_update_user,
+	NULL, /* present */
+	NULL, /* has_focus */
+	NULL, /* custom_smiley_add */
+	NULL, /* custom_smiley_write */
+	NULL, /* custom_smiley_close */
+	NULL, /* send_confirm */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConversationUiOps *finch_conv_get_ui_ops()
@@ -930,10 +976,18 @@
 	purple_cmd_register("status", "", PURPLE_CMD_P_DEFAULT,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
 	                  cmd_show_window, _("statuses: Show the savedstatuses window."), finch_savedstatus_show_all);
+
+	purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
+					PURPLE_CALLBACK(update_buddy_typing), NULL);
+	purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", finch_conv_get_handle(),
+					PURPLE_CALLBACK(update_buddy_typing), NULL);
+	purple_signal_connect(purple_conversations_get_handle(), "chat-left", finch_conv_get_handle(),
+					PURPLE_CALLBACK(chat_left_cb), NULL);
 }
 
 void finch_conversation_uninit()
 {
+	purple_signals_disconnect_by_handle(finch_conv_get_handle());
 }
 
 void finch_conversation_set_active(PurpleConversation *conv)
diff -r e42309469a4a -r 618a3748ff64 finch/gntdebug.c
--- a/finch/gntdebug.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntdebug.c	Mon May 21 20:58:23 2007 +0000
@@ -24,10 +24,12 @@
  */
 #include <gnt.h>
 #include <gntbox.h>
-#include <gnttextview.h>
 #include <gntbutton.h>
 #include <gntcheckbox.h>
+#include <gntentry.h>
+#include <gntlabel.h>
 #include <gntline.h>
+#include <gnttextview.h>
 
 #include "gntdebug.h"
 #include "finch.h"
@@ -42,26 +44,36 @@
 {
 	GntWidget *window;
 	GntWidget *tview;
+	GntWidget *search;
 	gboolean paused;
-	gboolean timestamps;
 } debug;
 
+static gboolean
+match_string(const char *category, const char *args)
+{
+	const char *str = gnt_entry_get_text(GNT_ENTRY(debug.search));
+	if (!str || !*str)
+		return TRUE;
+	if (g_strrstr(category, str) != NULL)
+		return TRUE;
+	if (g_strrstr(args, str) != NULL)
+		return TRUE;
+	return FALSE;
+}
+
 static void
 finch_debug_print(PurpleDebugLevel level, const char *category,
 		const char *args)
 {
-	if (debug.window && !debug.paused)
+	if (debug.window && !debug.paused && match_string(category, args))
 	{
 		int pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(debug.tview));
 		GntTextFormatFlags flag = GNT_TEXT_FLAG_NORMAL;
-
-		if (debug.timestamps) {
-			const char *mdate;
-			time_t mtime = time(NULL);
-			mdate = purple_utf8_strftime("%H:%M:%S ", localtime(&mtime));
-			gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview),
-					mdate, flag);
-		}
+		const char *mdate;
+		time_t mtime = time(NULL);
+		mdate = purple_utf8_strftime("%H:%M:%S ", localtime(&mtime));
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview),
+				mdate, flag);
 
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview),
 				category, GNT_TEXT_FLAG_BOLD);
@@ -112,7 +124,7 @@
 static void
 reset_debug_win(GntWidget *w, gpointer null)
 {
-	debug.window = debug.tview = NULL;
+	debug.window = debug.tview = debug.search = NULL;
 }
 
 static void
@@ -137,13 +149,6 @@
 	debug.paused = !debug.paused;
 }
 
-static void
-toggle_timestamps(GntWidget *w, gpointer n)
-{
-	debug.timestamps = !debug.timestamps;
-	purple_prefs_set_bool("/purple/debug/timestamps", debug.timestamps);
-}
-
 /* Xerox */
 static void
 purple_glib_log_handler(const gchar *domain, GLogLevelFlags flags,
@@ -199,10 +204,24 @@
 	purple_prefs_set_int(PREF_ROOT "/size/height", h);
 }
 
+static gboolean
+for_real(gpointer entry)
+{
+	purple_prefs_set_string(PREF_ROOT "/filter", gnt_entry_get_text(entry));
+	return FALSE;
+}
+
+static void
+update_filter_string(GntEntry *entry, gpointer null)
+{
+	int id = g_timeout_add(1000, for_real, entry);
+	g_object_set_data_full(G_OBJECT(entry), "update-filter", GINT_TO_POINTER(id),
+					(GDestroyNotify)g_source_remove);
+}
+
 void finch_debug_window_show()
 {
 	debug.paused = FALSE;
-	debug.timestamps = purple_prefs_get_bool("/purple/debug/timestamps");
 	if (debug.window == NULL)
 	{
 		GntWidget *wid, *box;
@@ -234,17 +253,16 @@
 		GNT_WIDGET_SET_FLAGS(wid, GNT_WIDGET_GROW_Y);
 		gnt_box_add_widget(GNT_BOX(box), wid);
 
+		debug.search = gnt_entry_new(purple_prefs_get_string(PREF_ROOT "/filter"));
+		gnt_box_add_widget(GNT_BOX(box), gnt_label_new(_("Filter: ")));
+		gnt_box_add_widget(GNT_BOX(box), debug.search);
+		g_signal_connect(G_OBJECT(debug.search), "text_changed", G_CALLBACK(update_filter_string), NULL);
+
 		wid = gnt_check_box_new(_("Pause"));
 		g_signal_connect(G_OBJECT(wid), "toggled", G_CALLBACK(toggle_pause), NULL);
 		GNT_WIDGET_SET_FLAGS(wid, GNT_WIDGET_GROW_Y);
 		gnt_box_add_widget(GNT_BOX(box), wid);
 
-		wid = gnt_check_box_new(_("Timestamps"));
-		gnt_check_box_set_checked(GNT_CHECK_BOX(wid), debug.timestamps);
-		g_signal_connect(G_OBJECT(wid), "toggled", G_CALLBACK(toggle_timestamps), NULL);
-		GNT_WIDGET_SET_FLAGS(wid, GNT_WIDGET_GROW_Y);
-		gnt_box_add_widget(GNT_BOX(box), wid);
-
 		gnt_box_add_widget(GNT_BOX(debug.window), box);
 		GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_GROW_Y);
 
@@ -283,6 +301,7 @@
 	g_set_printerr_handler(suppress_error_messages);
 
 	purple_prefs_add_none(PREF_ROOT);
+	purple_prefs_add_string(PREF_ROOT "/filter", "");
 	purple_prefs_add_none(PREF_ROOT "/size");
 	purple_prefs_add_int(PREF_ROOT "/size/width", 60);
 	purple_prefs_add_int(PREF_ROOT "/size/height", 15);
diff -r e42309469a4a -r 618a3748ff64 finch/gntnotify.c
--- a/finch/gntnotify.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntnotify.c	Mon May 21 20:58:23 2007 +0000
@@ -405,17 +405,21 @@
 
 static PurpleNotifyUiOps ops = 
 {
-	.notify_message = finch_notify_message,
-	.close_notify = finch_close_notify,       /* The rest of the notify-uiops return a GntWidget.
-                                              These widgets should be destroyed from here. */
-	.notify_formatted = finch_notify_formatted,
-	.notify_email = finch_notify_email,
-	.notify_emails = finch_notify_emails,
-	.notify_userinfo = finch_notify_userinfo,
+	finch_notify_message,
+	finch_notify_email,
+	finch_notify_emails,
+	finch_notify_formatted,
+	finch_notify_searchresults,
+	finch_notify_sr_new_rows,
+	finch_notify_userinfo,
+	NULL,                     /* notify_uri is of low-priority to me. --sadrul */
+	finch_close_notify,       /* The rest of the notify-uiops return a GntWidget.
+                                     These widgets should be destroyed from here. */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 
-	.notify_searchresults = finch_notify_searchresults,
-	.notify_searchresults_new_rows = finch_notify_sr_new_rows,
-	.notify_uri = NULL                     /* This is of low-priority to me */
 };
 
 PurpleNotifyUiOps *finch_notify_get_ui_ops()
diff -r e42309469a4a -r 618a3748ff64 finch/gntplugin.c
--- a/finch/gntplugin.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntplugin.c	Mon May 21 20:58:23 2007 +0000
@@ -67,11 +67,10 @@
 static void
 plugin_toggled_cb(GntWidget *tree, PurplePlugin *plugin, gpointer null)
 {
-	/* TODO: Mark these strings for translation after the freeze */
 	if (gnt_tree_get_choice(GNT_TREE(tree), plugin))
 	{
 		if (!purple_plugin_load(plugin)) {
-			purple_notify_error(NULL, "ERROR", "loading plugin failed", NULL);
+			purple_notify_error(NULL, _("ERROR"), _("loading plugin failed"), NULL);
 			gnt_tree_set_choice(GNT_TREE(tree), plugin, FALSE);
 		}
 	}
@@ -80,7 +79,7 @@
 		GntWidget *win;
 
 		if (!purple_plugin_unload(plugin)) {
-			purple_notify_error(NULL, "ERROR", "unloading plugin failed", NULL);
+			purple_notify_error(NULL, _("ERROR"), _("unloading plugin failed"), NULL);
 			gnt_tree_set_choice(GNT_TREE(tree), plugin, TRUE);
 		}
 
@@ -105,6 +104,20 @@
 {
 	PurplePlugin *plugin = current;
 	char *text;
+	GList *list = NULL, *iter = NULL;
+
+	/* If the selected plugin was unseen before, mark it as seen. But save the list
+	 * only when the plugin list is closed. So if the user enables a plugin, and it
+	 * crashes, it won't get marked as seen so the user can fix the bug and still
+	 * quickly find the plugin in the list.
+	 * I probably mean 'plugin developers' by 'users' here. */
+	list = g_object_get_data(G_OBJECT(widget), "seen-list");
+	if (list)
+		iter = g_list_find_custom(list, plugin->path, (GCompareFunc)strcmp);
+	if (!iter) {
+		list = g_list_prepend(list, g_strdup(plugin->path));
+		g_object_set_data(G_OBJECT(widget), "seen-list", list);
+	}
 
 	/* XXX: Use formatting and stuff */
 	gnt_text_view_clear(GNT_TEXT_VIEW(plugins.aboot));
@@ -121,6 +134,11 @@
 static void
 reset_plugin_window(GntWidget *window, gpointer null)
 {
+	GList *list = g_object_get_data(G_OBJECT(plugins.tree), "seen-list");
+	purple_prefs_set_path_list("/finch/plugins/seen", list);
+	g_list_foreach(list, (GFunc)g_free, NULL);
+	g_list_free(list);
+
 	plugins.window = NULL;
 	plugins.tree = NULL;
 	plugins.aboot = NULL;
@@ -214,6 +232,8 @@
 {
 	GntWidget *window, *tree, *box, *aboot, *button;
 	GList *iter;
+	GList *seen;
+
 	if (plugins.window)
 		return;
 
@@ -244,6 +264,7 @@
 	gnt_widget_set_size(aboot, 40, 20);
 	gnt_box_add_widget(GNT_BOX(box), aboot);
 
+	seen = purple_prefs_get_path_list("/finch/plugins/seen");
 	for (iter = purple_plugins_get_all(); iter; iter = iter->next)
 	{
 		PurplePlugin *plug = iter->data;
@@ -256,10 +277,13 @@
 		gnt_tree_add_choice(GNT_TREE(tree), plug,
 				gnt_tree_create_row(GNT_TREE(tree), plug->info->name), NULL, NULL);
 		gnt_tree_set_choice(GNT_TREE(tree), plug, purple_plugin_is_loaded(plug));
+		if (!g_list_find_custom(seen, plug->path, (GCompareFunc)strcmp))
+			gnt_tree_set_row_flags(GNT_TREE(tree), plug, GNT_TEXT_FLAG_BOLD);
 	}
 	gnt_tree_set_col_width(GNT_TREE(tree), 0, 30);
 	g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(plugin_toggled_cb), NULL);
 	g_signal_connect(G_OBJECT(tree), "selection_changed", G_CALLBACK(selection_changed), NULL);
+	g_object_set_data(G_OBJECT(tree), "seen-list", seen);
 
 	box = gnt_hbox_new(FALSE);
 	gnt_box_add_widget(GNT_BOX(window), box);
diff -r e42309469a4a -r 618a3748ff64 finch/gntprefs.c
--- a/finch/gntprefs.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntprefs.c	Mon May 21 20:58:23 2007 +0000
@@ -39,6 +39,7 @@
 
 	purple_prefs_add_none("/finch/plugins");
 	purple_prefs_add_path_list("/finch/plugins/loaded", NULL);
+	purple_prefs_add_path_list("/finch/plugins/seen", NULL);
 
 	purple_prefs_add_none("/finch/conversations");
 	purple_prefs_add_bool("/finch/conversations/timestamps", TRUE);
@@ -75,7 +76,7 @@
 get_idle_options()
 {
 	GList *list = NULL;
-	list = g_list_append(list, "Based on keyboard use"); /* XXX: string freeze */
+	list = g_list_append(list, (char *)_("Based on keyboard use"));
 	list = g_list_append(list, "system");
 	list = g_list_append(list, (char*)_("From last sent message"));
 	list = g_list_append(list, "purple");
diff -r e42309469a4a -r 618a3748ff64 finch/gntrequest.c
--- a/finch/gntrequest.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/gntrequest.c	Mon May 21 20:58:23 2007 +0000
@@ -612,13 +612,17 @@
 
 static PurpleRequestUiOps uiops =
 {
-	.request_input = finch_request_input,
-	.close_request = finch_close_request,
-	.request_choice = finch_request_choice,
-	.request_action = finch_request_action,
-	.request_fields = finch_request_fields,
-	.request_file = finch_request_file,
-	.request_folder = NULL                        /* No plans for this */
+	finch_request_input,
+	finch_request_choice,
+	finch_request_action,
+	finch_request_fields,
+	finch_request_file,
+	finch_close_request,
+	NULL,                       /* No plans for request_folder */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleRequestUiOps *finch_request_get_ui_ops()
diff -r e42309469a4a -r 618a3748ff64 finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/finch/libgnt/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -66,10 +66,10 @@
 
 gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
 	echo "#include \"gntmarshal.h\"" > $@
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
+	glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
 
 gntmarshal.h: $(srcdir)/genmarshal
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
+	glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
diff -r e42309469a4a -r 618a3748ff64 finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/libgnt/gntmain.c	Mon May 21 20:58:23 2007 +0000
@@ -144,8 +144,8 @@
 		event = GNT_MOUSE_UP;
 	} else
 		return FALSE;
-	
-	if (gnt_wm_process_click(wm, event, x, y, widget))
+
+	if (widget && gnt_wm_process_click(wm, event, x, y, widget))
 		return TRUE;
 	
 	if (event == GNT_LEFT_MOUSE_DOWN && widget && widget != wm->_list.window &&
@@ -177,7 +177,8 @@
 		offset = 0;
 	}
 
-	gnt_widget_clicked(widget, event, x, y);
+	if (widget)
+		gnt_widget_clicked(widget, event, x, y);
 	return TRUE;
 }
 
@@ -348,6 +349,10 @@
 	gnt_wm_raise_window(wm, win);
 }
 
+#ifdef SIGWINCH
+static void (*org_winch_handler)(int);
+#endif
+
 static void
 sighandler(int sig)
 {
@@ -357,6 +362,7 @@
 		werase(stdscr);
 		wrefresh(stdscr);
 		g_idle_add(refresh_screen, NULL);
+		org_winch_handler(sig);
 		signal(SIGWINCH, sighandler);
 		break;
 #endif
@@ -434,7 +440,7 @@
 	wrefresh(stdscr);
 
 #ifdef SIGWINCH
-	signal(SIGWINCH, sighandler);
+	org_winch_handler = signal(SIGWINCH, sighandler);
 #endif
 	signal(SIGCHLD, sighandler);
 	signal(SIGINT, sighandler);
diff -r e42309469a4a -r 618a3748ff64 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/libgnt/gntwm.c	Mon May 21 20:58:23 2007 +0000
@@ -48,6 +48,10 @@
 static void update_window_in_list(GntWM *wm, GntWidget *wid);
 static void shift_window(GntWM *wm, GntWidget *widget, int dir);
 
+#ifndef NO_WIDECHAR
+static int widestringwidth(wchar_t *wide);
+#endif
+
 static gboolean write_already(gpointer data);
 static int write_timeout;
 static time_t last_active_time;
@@ -136,6 +140,65 @@
 	copywin(src, dst, node->scroll, 0, 0, 0, getmaxy(dst) - 1, getmaxx(dst) - 1, 0);
 }
 
+/**
+ * The following is a workaround for a bug in most versions of ncursesw.
+ * Read about it in: http://article.gmane.org/gmane.comp.lib.ncurses.bugs/2751
+ * 
+ * In short, if a panel hides one cell of a multi-cell character, then the rest
+ * of the characters in that line get screwed. The workaround here is to erase
+ * any such character preemptively.
+ *
+ * Caveat: If a wide character is erased, and the panel above it is moved enough
+ * to expose the entire character, it is not always redrawn.
+ */
+static void
+work_around_for_ncurses_bug()
+{
+#ifndef NO_WIDECHAR
+	PANEL *panel = NULL;
+	while ((panel = panel_below(panel)) != NULL) {
+		int sx, ex, sy, ey, w, y;
+		cchar_t ch;
+		PANEL *below = panel;
+
+		sx = panel->win->_begx;
+		ex = panel->win->_maxx + sx;
+		sy = panel->win->_begy;
+		ey = panel->win->_maxy + sy;
+
+		while ((below = panel_below(below)) != NULL) {
+			if (sy > below->win->_begy + below->win->_maxy ||
+					ey < below->win->_begy)
+				continue;
+			if (sx > below->win->_begx + below->win->_maxx ||
+					ex < below->win->_begx)
+				continue;
+			for (y = MAX(sy, below->win->_begy); y <= MIN(ey, below->win->_begy + below->win->_maxy); y++) {
+				if (mvwin_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch) != OK)
+					goto right;
+				w = widestringwidth(ch.chars);
+				if (w > 1 && (ch.attr & 1)) {
+					ch.chars[0] = ' ';
+					ch.attr &= ~ A_CHARTEXT;
+					mvwadd_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch);
+					touchline(below->win, y - below->win->_begy, 1);
+				}
+right:
+				if (mvwin_wch(below->win, y - below->win->_begy, ex + 1 - below->win->_begx, &ch) != OK)
+					continue;
+				w = widestringwidth(ch.chars);
+				if (w > 1 && !(ch.attr & 1)) {
+					ch.chars[0] = ' ';
+					ch.attr &= ~ A_CHARTEXT;
+					mvwadd_wch(below->win, y - below->win->_begy, ex + 1 - below->win->_begx, &ch);
+					touchline(below->win, y - below->win->_begy, 1);
+				}
+			}
+		}
+	}
+#endif
+}
+
 static gboolean
 update_screen(GntWM *wm)
 {
@@ -148,6 +211,7 @@
 			top = top->submenu;
 		}
 	}
+	work_around_for_ncurses_bug();
 	update_panels();
 	doupdate();
 	return TRUE;
@@ -564,14 +628,40 @@
 	int x, y;
 	chtype old = 0, now = 0;
 	FILE *file = fopen("dump.html", "w");
+	struct {
+		char ascii;
+		char *unicode;
+	} unis[] = {
+		{'q', "&#x2500;"},
+		{'t', "&#x251c;"},
+		{'u', "&#x2524;"},
+		{'x', "&#x2502;"},
+		{'-', "&#x2191;"},
+		{'.', "&#x2193;"},
+		{'l', "&#x250c;"},
+		{'k', "&#x2510;"},
+		{'m', "&#x2514;"},
+		{'j', "&#x2518;"},
+		{'a', "&#x2592;"},
+		{'\0', NULL}
+	};
 
+	fprintf(file, "<head>\n  <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />\n</head>\n<body>\n");
 	fprintf(file, "<pre>");
 	for (y = 0; y < getmaxy(stdscr); y++) {
 		for (x = 0; x < getmaxx(stdscr); x++) {
-			char ch;
+			char ch[2] = {0, 0}, *print;
+#ifdef NO_WIDECHAR
 			now = mvwinch(curscr, y, x);
-			ch = now & A_CHARTEXT;
-			now ^= ch;
+			ch[0] = now & A_CHARTEXT;
+			now ^= ch[0];
+#else
+			cchar_t wch;
+			char unicode[12];
+			mvwin_wch(curscr, y, x, &wch);
+			now = wch.attr;
+			ch[0] = (char)(wch.chars[0] & 0xff);
+#endif
 
 #define CHECK(attr, start, end) \
 			do \
@@ -607,7 +697,11 @@
 				if (bgp == -1)
 					bgp = COLOR_WHITE;
 				if (now & A_REVERSE)
-					fgp ^= bgp ^= fgp ^= bgp;  /* *wink* */
+				{
+					short tmp = fgp;
+					fgp = bgp;
+					bgp = tmp;
+				}
 				ret = color_content(fgp, &r, &g, &b);
 				fg.r = r; fg.b = b; fg.g = g;
 				ret = color_content(bgp, &r, &g, &b);
@@ -624,48 +718,39 @@
 				fprintf(file, "<span style=\"background:#%02x%02x%02x;color:#%02x%02x%02x\">",
 						bg.r, bg.g, bg.b, fg.r, fg.g, fg.b);
 			}
+			print = ch;
+#ifndef NO_WIDECHAR
+			if (wch.chars[0] > 255) {
+				snprintf(unicode, sizeof(unicode), "&#x%x;", wch.chars[0]);
+				print = unicode;
+			}
+#endif
 			if (now & A_ALTCHARSET)
 			{
-				switch (ch)
-				{
-					case 'q':
-						ch = '-'; break;
-					case 't':
-					case 'u':
-					case 'x':
-						ch = '|'; break;
-					case 'v':
-					case 'w':
-					case 'l':
-					case 'm':
-					case 'k':
-					case 'j':
-					case 'n':
-						ch = '+'; break;
-					case '-':
-						ch = '^'; break;
-					case '.':
-						ch = 'v'; break;
-					case 'a':
-						ch = '#'; break;
-					default:
-						ch = ' '; break;
+				int u;
+				for (u = 0; unis[u].ascii; u++) {
+					if (ch[0] == unis[u].ascii) {
+						print = unis[u].unicode;
+						break;
+					}
 				}
+				if (!unis[u].ascii)
+					print = " ";
 			}
-			if (ch == '&')
+			if (ch[0] == '&')
 				fprintf(file, "&amp;");
-			else if (ch == '<')
+			else if (ch[0] == '<')
 				fprintf(file, "&lt;");
-			else if (ch == '>')
+			else if (ch[0] == '>')
 				fprintf(file, "&gt;");
 			else
-				fprintf(file, "%c", ch);
+				fprintf(file, "%s", print);
 			old = now;
 		}
 		fprintf(file, "</span>\n");
 		old = 0;
 	}
-	fprintf(file, "</pre>");
+	fprintf(file, "</pre>\n</body>");
 	fclose(file);
 	return TRUE;
 }
diff -r e42309469a4a -r 618a3748ff64 finch/plugins/gntgf.c
--- a/finch/plugins/gntgf.c	Mon May 21 20:02:18 2007 +0000
+++ b/finch/plugins/gntgf.c	Mon May 21 20:58:23 2007 +0000
@@ -56,7 +56,8 @@
 #include <gntlabel.h>
 #include <gnttree.h>
 
-#include <gntplugin.h>
+#include "gntplugin.h"
+#include "gntconv.h"
 
 typedef struct
 {
@@ -154,7 +155,7 @@
 #endif
 
 static void
-notify(const char *fmt, ...)
+notify(PurpleConversation *conv, const char *fmt, ...)
 {
 	GntWidget *window;
 	GntToast *toast;
@@ -164,6 +165,13 @@
 
 	if (purple_prefs_get_bool(PREFS_BEEP))
 		beep();
+
+	if (conv != NULL) {
+		FinchConv *fc = conv->ui_data;
+		if (gnt_widget_has_focus(fc->window))
+			return;
+	}
+
 #ifdef HAVE_X11
 	if (purple_prefs_get_bool(PREFS_URGENT))
 		urgent();
@@ -220,14 +228,14 @@
 buddy_signed_on(PurpleBuddy *buddy, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_SIGNONF))
-		notify(_("%s just signed on"), purple_buddy_get_alias(buddy));
+		notify(NULL, _("%s just signed on"), purple_buddy_get_alias(buddy));
 }
 
 static void
 buddy_signed_off(PurpleBuddy *buddy, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_SIGNONF))
-		notify(_("%s just signed off"), purple_buddy_get_alias(buddy));
+		notify(NULL, _("%s just signed off"), purple_buddy_get_alias(buddy));
 }
 
 static void
@@ -235,7 +243,7 @@
 		PurpleConversation *conv, PurpleMessageFlags flags, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_IM_MSG))
-		notify(_("%s sent you a message"), sender);
+		notify(conv, _("%s sent you a message"), sender);
 }
 
 static void
@@ -254,9 +262,9 @@
 
 	if (purple_prefs_get_bool(PREFS_EVENT_CHAT_NICK) &&
 			(purple_utf8_has_word(msg, nick)))
-		notify(_("%s said your nick in %s"), sender, purple_conversation_get_name(conv));
+		notify(conv, _("%s said your nick in %s"), sender, purple_conversation_get_name(conv));
 	else if (purple_prefs_get_bool(PREFS_EVENT_CHAT_MSG))
-		notify(_("%s sent a message in %s"), sender, purple_conversation_get_name(conv));
+		notify(conv, _("%s sent a message in %s"), sender, purple_conversation_get_name(conv));
 }
 
 static gboolean
diff -r e42309469a4a -r 618a3748ff64 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -151,7 +151,7 @@
 dbus_headers  = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h
 
 dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
-                connection.h conversation.h core.h log.h prefs.h roomlist.h \
+                connection.h conversation.h core.h log.h notify.h prefs.h roomlist.h \
                 savedstatuses.h status.h server.h util.h xmlnode.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders))
diff -r e42309469a4a -r 618a3748ff64 libpurple/account.c
--- a/libpurple/account.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/account.c	Mon May 21 20:58:23 2007 +0000
@@ -548,9 +548,9 @@
 	data = xmlnode_get_attrib(node, "active");
 	if (data == NULL)
 		return;
-	if (strcasecmp(data, "true") == 0)
+	if (g_ascii_strcasecmp(data, "true") == 0)
 		active = TRUE;
-	else if (strcasecmp(data, "false") == 0)
+	else if (g_ascii_strcasecmp(data, "false") == 0)
 		active = FALSE;
 	else
 		return;
diff -r e42309469a4a -r 618a3748ff64 libpurple/buddyicon.c
--- a/libpurple/buddyicon.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/buddyicon.c	Mon May 21 20:58:23 2007 +0000
@@ -416,7 +416,7 @@
 			}
 			ref_filename(filename);
 		}
-		else
+		else if (!icon->img)
 		{
 			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
 			purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
diff -r e42309469a4a -r 618a3748ff64 libpurple/cipher.c
--- a/libpurple/cipher.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/cipher.c	Mon May 21 20:58:23 2007 +0000
@@ -1275,6 +1275,175 @@
 };
 
 /*******************************************************************************
+ * RC4
+ ******************************************************************************/
+
+struct RC4Context {
+  guchar state[256];
+  guchar x;
+  guchar y;
+  gint key_len;
+};
+
+static void
+rc4_init(PurpleCipherContext *context, void *extra) {
+	struct RC4Context *rc4_ctx;
+	rc4_ctx = g_new0(struct RC4Context, 1);
+	purple_cipher_context_set_data(context, rc4_ctx);
+	purple_cipher_context_reset(context, extra);
+}
+
+
+static void
+rc4_reset(PurpleCipherContext *context, void *extra) {
+	struct RC4Context *rc4_ctx;
+	guint i;
+
+	rc4_ctx = purple_cipher_context_get_data(context);
+
+	g_return_if_fail(rc4_ctx);
+
+	for(i = 0; i < 256; i++)
+		rc4_ctx->state[i] = i;
+	rc4_ctx->x = 0;
+	rc4_ctx->y = 0;
+
+	/* default is 5 bytes (40bit key) */
+	rc4_ctx->key_len = 5;
+
+}
+
+static void
+rc4_uninit(PurpleCipherContext *context) {
+	struct RC4Context *rc4_ctx;
+
+	rc4_ctx = purple_cipher_context_get_data(context);
+	memset(rc4_ctx, 0, sizeof(rc4_ctx));
+
+	g_free(rc4_ctx);
+	rc4_ctx = NULL;
+}
+
+
+
+static void
+rc4_set_key (PurpleCipherContext *context, const guchar * key) {
+	struct RC4Context *ctx;
+	guchar *state;
+	guchar temp_swap;
+	guchar x, y;
+	guint i;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	x = 0;
+	y = 0;
+	state = &ctx->state[0];
+	for(i = 0; i < 256; i++)
+	{
+		y = (key[x] + state[i] + y) % 256;
+		temp_swap = state[i];
+		state[i] = state[y];
+		state[y] = temp_swap;
+		x = (x + 1) % ctx->key_len;
+	}
+}
+
+static void
+rc4_set_opt(PurpleCipherContext *context, const gchar *name, void *value) {
+	struct RC4Context *ctx;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	if(!strcmp(name, "key_len")) {
+		ctx->key_len = GPOINTER_TO_INT(value);
+	}
+}
+
+static size_t 
+rc4_get_key_size (PurpleCipherContext *context)
+{
+	struct RC4Context *ctx;
+
+	g_return_val_if_fail(context, -1);
+
+	ctx = purple_cipher_context_get_data(context);
+
+	g_return_val_if_fail(ctx, -1);
+
+	return ctx->key_len;
+}
+
+static void *
+rc4_get_opt(PurpleCipherContext *context, const gchar *name) {
+	struct RC4Context *ctx;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	if(!strcmp(name, "key_len")) {
+		return GINT_TO_POINTER(ctx->key_len);
+	}
+
+	return NULL;
+}
+
+static gint
+rc4_encrypt(PurpleCipherContext *context, const guchar data[],
+	    size_t len, guchar output[], size_t *outlen) {
+	struct RC4Context *ctx;
+	guchar temp_swap;
+	guchar x, y, z;
+	guchar *state;
+	guint i;
+
+	ctx = purple_cipher_context_get_data(context);
+
+	x = ctx->x;
+	y = ctx->y;
+	state = &ctx->state[0];
+
+	for(i = 0; i < len; i++)
+	{
+		x = (x + 1) % 256;
+		y = (state[x] + y) % 256;
+		temp_swap = state[x];
+		state[x] = state[y];
+		state[y] = temp_swap;
+		z = state[x] + (state[y]) % 256;
+		output[i] = data[i] ^ state[z];
+	}
+	ctx->x = x;
+	ctx->y = y;
+	if(outlen)
+		*outlen = len;
+
+	return 0;
+}
+
+static PurpleCipherOps RC4Ops = {
+	rc4_set_opt,   /* Set Option    */
+	rc4_get_opt,   /* Get Option    */
+	rc4_init,      /* init          */
+	rc4_reset,     /* reset         */
+	rc4_uninit,    /* uninit        */
+	NULL,          /* set iv        */
+	NULL,          /* append        */
+	NULL,          /* digest        */
+	rc4_encrypt,   /* encrypt       */
+	NULL,          /* decrypt       */
+	NULL,          /* set salt      */
+	NULL,          /* get salt size */
+	rc4_set_key,   /* set key       */
+	rc4_get_key_size, /* get key size  */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+/*******************************************************************************
  * Structs
  ******************************************************************************/
 struct _PurpleCipher {
@@ -1468,6 +1637,7 @@
 	purple_ciphers_register_cipher("sha1", &SHA1Ops);
 	purple_ciphers_register_cipher("md4", &MD4Ops);
 	purple_ciphers_register_cipher("des", &DESOps);
+	purple_ciphers_register_cipher("rc4", &RC4Ops);
 }
 
 void
@@ -1830,8 +2000,8 @@
 	/* Check for a supported algorithm. */
 	g_return_val_if_fail(algorithm == NULL ||
 						 *algorithm == '\0' ||
-						 strcasecmp(algorithm, "MD5") ||
-						 strcasecmp(algorithm, "MD5-sess"), NULL);
+						 g_ascii_strcasecmp(algorithm, "MD5") ||
+						 g_ascii_strcasecmp(algorithm, "MD5-sess"), NULL);
 
 	cipher = purple_ciphers_find_cipher("md5");
 	g_return_val_if_fail(cipher != NULL, NULL);
@@ -1844,7 +2014,7 @@
 	purple_cipher_context_append(context, (guchar *)":", 1);
 	purple_cipher_context_append(context, (guchar *)password, strlen(password));
 
-	if (algorithm != NULL && !strcasecmp(algorithm, "MD5-sess"))
+	if (algorithm != NULL && !g_ascii_strcasecmp(algorithm, "MD5-sess"))
 	{
 		guchar digest[16];
 
@@ -1895,14 +2065,14 @@
 	/* Check for a supported algorithm. */
 	g_return_val_if_fail(algorithm == NULL ||
 						 *algorithm == '\0' ||
-						 strcasecmp(algorithm, "MD5") ||
-						 strcasecmp(algorithm, "MD5-sess"), NULL);
+						 g_ascii_strcasecmp(algorithm, "MD5") ||
+						 g_ascii_strcasecmp(algorithm, "MD5-sess"), NULL);
 
 	/* Check for a supported "quality of protection". */
 	g_return_val_if_fail(qop == NULL ||
 						 *qop == '\0' ||
-						 strcasecmp(qop, "auth") ||
-						 strcasecmp(qop, "auth-int"), NULL);
+						 g_ascii_strcasecmp(qop, "auth") ||
+						 g_ascii_strcasecmp(qop, "auth-int"), NULL);
 
 	cipher = purple_ciphers_find_cipher("md5");
 	g_return_val_if_fail(cipher != NULL, NULL);
@@ -1913,7 +2083,7 @@
 	purple_cipher_context_append(context, (guchar *)":", 1);
 	purple_cipher_context_append(context, (guchar *)digest_uri, strlen(digest_uri));
 
-	if (qop != NULL && !strcasecmp(qop, "auth-int"))
+	if (qop != NULL && !g_ascii_strcasecmp(qop, "auth-int"))
 	{
 		PurpleCipherContext *context2;
 		gchar entity_hash[33];
diff -r e42309469a4a -r 618a3748ff64 libpurple/conversation.c
--- a/libpurple/conversation.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/conversation.c	Mon May 21 20:58:23 2007 +0000
@@ -970,20 +970,20 @@
 	{
 		im->typing_state = state;
 
-		if (state == PURPLE_TYPING)
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing", im->conv->account, im->conv->name);
-		}
-		else if (state == PURPLE_TYPED)
+		switch (state)
 		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typed", im->conv->account, im->conv->name);
-		}
-		else if (state == PURPLE_NOT_TYPING)
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing-stopped", im->conv->account, im->conv->name);
+			case PURPLE_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing", im->conv->account, im->conv->name);
+				break;
+			case PURPLE_TYPED:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typed", im->conv->account, im->conv->name);
+				break;
+			case PURPLE_NOT_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing-stopped", im->conv->account, im->conv->name);
+				break;
 		}
 	}
 }
@@ -1497,7 +1497,7 @@
 	} else if (a->buddy != b->buddy) {
 		ret = a->buddy ? -1 : 1;
 	} else {
-		ret = strcasecmp(user1, user2);
+		ret = purple_utf8_strcasecmp(user1, user2);
 	}
 
 	return ret;
diff -r e42309469a4a -r 618a3748ff64 libpurple/dbus-analyze-functions.py
--- a/libpurple/dbus-analyze-functions.py	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/dbus-analyze-functions.py	Mon May 21 20:58:23 2007 +0000
@@ -96,7 +96,7 @@
 
         if len(type) == 1:
             # simple types (int, gboolean, etc.) and enums
-            if (type[0] in simpletypes) or (type[0].startswith("Purple")):
+            if (type[0] in simpletypes) or ((type[0].startswith("Purple") and not type[0].endswith("Callback"))):
                 return self.inputsimple(type, name)
 
         # pointers ... 
@@ -118,7 +118,6 @@
             # unknown pointers are always replaced with NULL
             else:
                 return self.inputpointer(type, name)
-                return
 
         raise myexception
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/dbus-server.c
--- a/libpurple/dbus-server.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/dbus-server.c	Mon May 21 20:58:23 2007 +0000
@@ -654,11 +654,12 @@
 
 #define my_arg(type) (ptr != NULL ? * ((type *)ptr) : va_arg(data, type))
 
-static void
+static gboolean
 purple_dbus_message_append_purple_values(DBusMessageIter *iter,
 		int number, PurpleValue **purple_values, va_list data)
 {
 	int i;
+	gboolean error = FALSE;
 
 	for (i = 0; i < number; i++)
 	{
@@ -668,11 +669,12 @@
 		guint xuint;
 		gboolean xboolean;
 		gpointer ptr = NULL;
+		gpointer val;
 
 		if (purple_value_is_outgoing(purple_values[i]))
 		{
 			ptr = my_arg(gpointer);
-			g_return_if_fail(ptr);
+			g_return_val_if_fail(ptr, TRUE);
 		}
 
 		switch (purple_values[i]->type)
@@ -705,14 +707,18 @@
 		case PURPLE_TYPE_POINTER:
 		case PURPLE_TYPE_OBJECT:
 		case PURPLE_TYPE_BOXED:
-			id = purple_dbus_pointer_to_id(my_arg(gpointer));
+			val = my_arg(gpointer);
+			id = purple_dbus_pointer_to_id(val);
+			if (id == 0 && val != NULL)
+				error = TRUE;      /* Some error happened. */
 			dbus_message_iter_append_basic(iter,
 					(sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id);
 			break;
 		default: /* no conversion implemented */
-			g_return_if_reached();
+			g_return_val_if_reached(TRUE);
 		}
 	}
+	return error;
 }
 
 #undef my_arg
@@ -746,7 +752,8 @@
 	signal = dbus_message_new_signal(DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, newname);
 	dbus_message_iter_init_append(signal, &iter);
 
-	purple_dbus_message_append_purple_values(&iter, num_values, values, vargs);
+	if (purple_dbus_message_append_purple_values(&iter, num_values, values, vargs))
+		purple_debug_warning("dbus", "The signal \"%s\" caused some dbus error.\n", name);
 
 	dbus_connection_send(purple_dbus_connection, signal, NULL);
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/debug.c
--- a/libpurple/debug.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/debug.c	Mon May 21 20:58:23 2007 +0000
@@ -61,18 +61,12 @@
 
 	if (debug_enabled) {
 		gchar *ts_s;
-
-		if ((category != NULL) &&
-			(purple_prefs_exists("/purple/debug/timestamps")) &&
-			(purple_prefs_get_bool("/purple/debug/timestamps"))) {
-			const char *mdate;
+		const char *mdate;
+		time_t mtime = time(NULL);
 
-			time_t mtime = time(NULL);
-			mdate = purple_utf8_strftime("%H:%M:%S", localtime(&mtime));
-			ts_s = g_strdup_printf("(%s) ", mdate);
-		} else {
-			ts_s = g_strdup("");
-		}
+
+		mdate = purple_utf8_strftime("%H:%M:%S", localtime(&mtime));
+		ts_s = g_strdup_printf("(%s) ", mdate);
 
 		if (category == NULL)
 			g_print("%s%s", ts_s, arg_s);
@@ -189,11 +183,4 @@
 void
 purple_debug_init(void)
 {
-	purple_prefs_add_none("/purple/debug");
-
-	/*
-	 * This pref is currently used by both the console
-	 * output and the debug window output.
-	 */
-	purple_prefs_add_bool("/purple/debug/timestamps", FALSE);
 }
diff -r e42309469a4a -r 618a3748ff64 libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/example/nullclient.c	Mon May 21 20:58:23 2007 +0000
@@ -137,7 +137,25 @@
 
 static PurpleConversationUiOps null_conv_uiops = 
 {
-	.write_conv = null_write_conv
+	NULL,                      /* create_conversation  */
+	NULL,                      /* destroy_conversation */
+	NULL,                      /* write_chat           */
+	NULL,                      /* write_im             */
+	null_write_conv,           /* write_conv           */
+	NULL,                      /* chat_add_users       */
+	NULL,                      /* chat_rename_user     */
+	NULL,                      /* chat_remove_users    */
+	NULL,                      /* chat_update_user     */
+	NULL,                      /* present              */
+	NULL,                      /* has_focus            */
+	NULL,                      /* custom_smiley_add    */
+	NULL,                      /* custom_smiley_write  */
+	NULL,                      /* custom_smiley_close  */
+	NULL,                      /* send_confirm         */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r e42309469a4a -r 618a3748ff64 libpurple/ft.c
--- a/libpurple/ft.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/ft.c	Mon May 21 20:58:23 2007 +0000
@@ -972,7 +972,8 @@
 
 	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
 
-	xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+	if (xfer->fd)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
 
 	xfer->start_time = time(NULL);
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/idle.c
--- a/libpurple/idle.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/idle.c	Mon May 21 20:58:23 2007 +0000
@@ -31,7 +31,6 @@
 #include "signals.h"
 
 #define IDLEMARK 600 /* 10 minutes! */
-#define IDLE_CHECK_INTERVAL 5 /* 5 seconds */
 
 typedef enum
 {
@@ -92,6 +91,9 @@
 	purple_presence_set_idle(presence, FALSE, 0);
 }
 
+
+static int no_away = 0;
+static gint time_until_next_idle_event;
 /*
  * This function should be called when you think your idle state
  * may have changed.  Maybe you're over the 10-minute mark and
@@ -110,14 +112,17 @@
  * 2. Set or unset your auto-away message.
  * 3. Report your current idle time to the IM server.
  */
-static gint
-check_idleness()
+
+static void
+check_idleness(void)
 {
 	time_t time_idle;
 	gboolean auto_away;
 	const gchar *idle_reporting;
 	gboolean report_idle;
 	GList *l;
+	gint away_seconds = 0;
+	gint idle_recheck_interval;
 
 	purple_signal_emit(purple_blist_get_handle(), "update-idle");
 
@@ -128,11 +133,13 @@
 	{
 		/* Use system idle time (mouse or keyboard movement, etc.) */
 		time_idle = idle_ui_ops->get_time_idle();
+		idle_recheck_interval = 60;
 	}
 	else if (!strcmp(idle_reporting, "purple"))
 	{
 		/* Use 'Purple idle' */
 		time_idle = time(NULL) - last_active_time;
+		idle_recheck_interval = 0;
 	}
 	else
 	{
@@ -146,21 +153,54 @@
 
 	/* If we're not reporting idle, we can still do auto-away.
 	 * First try "system" and if that isn't possible, use "purple" */
-	if (!report_idle && auto_away) {
-		if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
-			time_idle = idle_ui_ops->get_time_idle();
+	if (!report_idle)
+	{
+		if (auto_away)
+		{
+			if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
+			{
+				time_idle = idle_ui_ops->get_time_idle();
+				idle_recheck_interval = 60;
+			}
+			else
+			{
+				time_idle = time(NULL) - last_active_time;
+				idle_recheck_interval = 0;
+			}
+		}
 		else
-			time_idle = time(NULL) - last_active_time;
+		{
+			if (!no_away)
+			{
+				purple_savedstatus_set_idleaway(FALSE);
+				no_away = 1;
+			}
+			time_until_next_idle_event = 0;
+			return;
+		}
 	}
 
-	if (auto_away &&
-		(time_idle > (60 * purple_prefs_get_int("/purple/away/mins_before_away"))))
+	time_until_next_idle_event = IDLEMARK - time_idle;
+	if (time_until_next_idle_event < 0)
+	{
+		/* If we're already idle, check again as appropriate. */
+		time_until_next_idle_event = idle_recheck_interval;
+	}
+
+	if (auto_away || !no_away)
+		away_seconds = 60 * purple_prefs_get_int("/purple/away/mins_before_away");
+
+	if (auto_away && time_idle > away_seconds)
 	{
 		purple_savedstatus_set_idleaway(TRUE);
+		no_away = 0;
 	}
-	else if (time_idle < 60 * purple_prefs_get_int("/purple/away/mins_before_away"))
+	else if (!no_away && time_idle < away_seconds)
 	{
+		no_away = 1;
 		purple_savedstatus_set_idleaway(FALSE);
+		if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event)
+			time_until_next_idle_event = away_seconds - time_idle;
 	}
 
 	/* Idle reporting stuff */
@@ -177,8 +217,21 @@
 		while (idled_accts != NULL)
 			set_account_unidle(idled_accts->data);
 	}
+}
 
-	return TRUE;
+
+/*
+ * Check idle and set the timer to fire at the next idle-worth event 
+ */
+static gint
+check_idleness_timer()
+{
+	check_idleness();
+	if (time_until_next_idle_event == 0)
+		idle_timer = 0;
+	else
+		idle_timer = purple_timeout_add(1000 * (time_until_next_idle_event + 1), check_idleness_timer, NULL);
+	return FALSE;
 }
 
 static void
@@ -205,10 +258,26 @@
 	set_account_unidle(account);
 }
 
+static void
+idle_reporting_cb(const char *name, PurplePrefType type, gconstpointer val, gpointer data)
+{
+	if (idle_timer)
+		purple_timeout_remove(idle_timer);
+	idle_timer = 0;
+	check_idleness_timer();
+}
+
 void
 purple_idle_touch()
 {
 	time(&last_active_time);
+	if (!no_away)
+	{
+		if (idle_timer)
+			purple_timeout_remove(idle_timer);
+		idle_timer = 0;
+		check_idleness_timer();
+	}
 }
 
 void
@@ -241,7 +310,7 @@
 purple_idle_init()
 {
 	/* Add the timer to check if we're idle */
-	idle_timer = purple_timeout_add(IDLE_CHECK_INTERVAL * 1000, check_idleness, NULL);
+	idle_timer = purple_timeout_add(1000 * (IDLEMARK + 1), check_idleness_timer, NULL);
 
 	purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg",
 						purple_idle_get_handle(),
@@ -253,6 +322,9 @@
 						purple_idle_get_handle(),
 						PURPLE_CALLBACK(signing_off_cb), NULL);
 
+	purple_prefs_connect_callback(purple_idle_get_handle(), "/purple/away/idle_reporting",
+	                              idle_reporting_cb, NULL);
+
 	purple_idle_touch();
 }
 
@@ -260,6 +332,7 @@
 purple_idle_uninit()
 {
 	purple_signals_disconnect_by_handle(purple_idle_get_handle());
+	purple_prefs_disconnect_by_handle(purple_idle_get_handle());
 
 	/* Remove the idle timer */
 	if (idle_timer > 0)
diff -r e42309469a4a -r 618a3748ff64 libpurple/log.c
--- a/libpurple/log.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/log.c	Mon May 21 20:58:23 2007 +0000
@@ -778,7 +778,7 @@
 			if (tz_off != PURPLE_NO_TZ_OFF)
 				tm.tm_gmtoff = tz_off - tm.tm_gmtoff;
 
-			if (rest == NULL || (end = strchr(rest, '.')) == NULL || strchr(rest, ' ') != NULL)
+			if (stamp == 0 || rest == NULL || (end = strchr(rest, '.')) == NULL || strchr(rest, ' ') != NULL)
 			{
 				log = purple_log_new(type, name, account, NULL, stamp, NULL);
 			}
@@ -792,7 +792,7 @@
 #else
 			time_t stamp = purple_str_to_time(filename, FALSE, &tm, NULL, NULL);
 
-			log = purple_log_new(type, name, account, NULL, stamp, &tm);
+			log = purple_log_new(type, name, account, NULL, stamp, (stamp != 0) ?  &tm : NULL);
 #endif
 
 			log->logger = logger;
diff -r e42309469a4a -r 618a3748ff64 libpurple/notify.c
--- a/libpurple/notify.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/notify.c	Mon May 21 20:58:23 2007 +0000
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
+#include "dbus-maybe.h"
 #include "notify.h"
 
 static PurpleNotifyUiOps *notify_ui_ops = NULL;
@@ -481,6 +483,7 @@
 	PurpleNotifyUserInfoEntry *user_info_entry;
 	
 	user_info_entry = g_new0(PurpleNotifyUserInfoEntry, 1);
+	PURPLE_DBUS_REGISTER_POINTER(user_info_entry, PurpleNotifyUserInfoEntry);
 	user_info_entry->label = g_strdup(label);
 	user_info_entry->value = g_strdup(value);
 	user_info_entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR;
@@ -495,6 +498,7 @@
 	
 	g_free(user_info_entry->label);
 	g_free(user_info_entry->value);	
+	PURPLE_DBUS_UNREGISTER_POINTER(user_info_entry);
 	g_free(user_info_entry);
 }
 
@@ -504,6 +508,7 @@
 	PurpleNotifyUserInfo *user_info;
 	
 	user_info = g_new0(PurpleNotifyUserInfo, 1);
+	PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo);
 	user_info->user_info_entries = NULL;
 	
 	return user_info;
@@ -521,6 +526,7 @@
 	}
 	
 	g_list_free(user_info->user_info_entries);
+	PURPLE_DBUS_UNREGISTER_POINTER(user_info);
 	g_free(user_info);
 }
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Mon May 21 20:58:23 2007 +0000
@@ -156,7 +156,7 @@
 static gboolean check_expire_time(struct joinpart_key *key,
                                   time_t *last_said, time_t *limit)
 {
-	purple_debug_info("joinpart", "Removing key for %s/%s\n", key->conv->name, key->user);
+	purple_debug_info("joinpart", "Removing key for %s\n", key->user);
 	return (*last_said < *limit);
 }
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -78,7 +78,8 @@
 #	common/fallback/const-xs.inc
 
 perl_scripts = \
-	scripts/function_list.pl
+	scripts/function_list.pl \
+	scripts/signals-test.pl
 
 EXTRA_DIST = \
 	Makefile.mingw \
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/common/SavedStatuses.xs
--- a/libpurple/plugins/perl/common/SavedStatuses.xs	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs	Mon May 21 20:58:23 2007 +0000
@@ -1,41 +1,129 @@
 #include "module.h"
 
+/* I can't get this to work, both with and without the const on the return
+ * type I get errors from gcc. One way about ignoring types in a cast, and the
+ * other about assigning to read-only variables.
+const Purple::StatusType
+purple_savedstatus_substatus_get_type(substatus)
+	const Purple::SavedStatus::Sub substatus
+*/
+
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatus  PREFIX = purple_savedstatus_
 PROTOTYPES: ENABLE
 
-gboolean
-purple_savedstatus_delete(title)
-	const char *title
-
-Purple::SavedStatus
-purple_savedstatus_find(title)
-	const char *title
-
-const char *
-purple_savedstatus_get_message(saved_status)
-	Purple::SavedStatus saved_status
-
-const char *
-purple_savedstatus_get_title(saved_status)
-	Purple::SavedStatus saved_status
-
-Purple::StatusPrimitive
-purple_savedstatus_get_type(saved_status)
-	Purple::SavedStatus saved_status
-
 Purple::SavedStatus
 purple_savedstatus_new(title, type)
 	const char *title
 	Purple::StatusPrimitive type
 
 void
+purple_savedstatus_set_title(status, title)
+	Purple::SavedStatus status
+	const char *title
+
+void
+purple_savedstatus_set_type(status, type)
+	Purple::SavedStatus status
+	Purple::StatusPrimitive type
+
+void
 purple_savedstatus_set_message(status, message)
 	Purple::SavedStatus status
 	const char *message
 
+void
+purple_savedstatus_set_substatus(status, account, type, message)
+	Purple::SavedStatus status
+	Purple::Account account
+	Purple::StatusType type
+	const char *message
+
+void
+purple_savedstatus_unset_substatus(status, account)
+	Purple::SavedStatus status
+	Purple::Account account
+
+gboolean
+purple_savedstatus_delete(title)
+	const char *title
+
 Purple::SavedStatus
 purple_savedstatus_get_current()
 
+Purple::SavedStatus
+purple_savedstatus_get_default()
+
+Purple::SavedStatus
+purple_savedstatus_get_idleaway()
+
+gboolean
+purple_savedstatus_is_idleaway()
+
+void
+purple_savedstatus_set_idleaway(idleaway)
+	gboolean idleaway
+
+Purple::SavedStatus
+purple_savedstatus_get_startup()
+
+Purple::SavedStatus
+purple_savedstatus_find(title)
+	const char *title
+
+Purple::SavedStatus
+purple_savedstatus_find_by_creation_time(creation_time)
+	time_t creation_time
+
+Purple::SavedStatus
+purple_savedstatus_find_transient_by_type_and_message(type, message)
+	Purple::StatusPrimitive type
+	const char *message
+
+gboolean
+purple_savedstatus_is_transient(saved_status)
+	const Purple::SavedStatus saved_status
+
+const char *
+purple_savedstatus_get_title(saved_status)
+	const Purple::SavedStatus saved_status
+
+Purple::StatusPrimitive
+purple_savedstatus_get_type(saved_status)
+	const Purple::SavedStatus saved_status
+
+const char *
+purple_savedstatus_get_message(saved_status)
+	const Purple::SavedStatus saved_status
+
+time_t
+purple_savedstatus_get_creation_time(saved_status)
+	const Purple::SavedStatus saved_status
+
+gboolean
+purple_savedstatus_has_substatuses(saved_status)
+	const Purple::SavedStatus saved_status
+
+Purple::SavedStatus::Sub
+purple_savedstatus_get_substatus(saved_status, account)
+	Purple::SavedStatus saved_status
+	Purple::Account account
+
+void
+purple_savedstatus_activate(saved_status)
+	Purple::SavedStatus saved_status
+
+void
+purple_savedstatus_activate_for_account(saved_status, account)
+	const Purple::SavedStatus saved_status
+	Purple::Account account
+
+MODULE = Purple::SavedStatus::Sub  PACKAGE = Purple::SavedStatus::Sub  PREFIX = purple_savedstatus_substatus_
+PROTOTYPES: ENABLE
+
+const char *
+purple_savedstatus_substatus_get_message(substatus)
+	const Purple::SavedStatus::Sub substatus
+
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatuses  PREFIX = purple_savedstatuses_
 PROTOTYPES: ENABLE
 
@@ -48,6 +136,16 @@
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
 	}
 
+void
+purple_savedstatuses_get_popular(how_many)
+	unsigned int how_many
+PREINIT:
+	const GList *l;
+PPCODE:
+	for (l = purple_savedstatuses_get_popular(how_many); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
+	}
+
 Purple::Handle
 purple_savedstatuses_get_handle()
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/common/module.h
--- a/libpurple/plugins/perl/common/module.h	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/perl/common/module.h	Mon May 21 20:58:23 2007 +0000
@@ -236,7 +236,7 @@
 
 /* savedstatuses.h */
 typedef PurpleSavedStatus *		Purple__SavedStatus;
-typedef PurpleSavedStatusSub *		Purple__SavedStatusSub;
+typedef PurpleSavedStatusSub *		Purple__SavedStatus__Sub;
 
 /* sound.h */
 typedef PurpleSoundEventID		Purple__SoundEventID;
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/common/typemap
--- a/libpurple/plugins/perl/common/typemap	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/perl/common/typemap	Mon May 21 20:58:23 2007 +0000
@@ -137,7 +137,9 @@
 Purple::RoomlistRoomType			T_IV
 
 Purple::SavedStatus			T_PurpleObj
-Purple::SavedStatusSub			T_PurpleObj
+const Purple::SavedStatus			T_PurpleObj
+Purple::SavedStatus::Sub			T_PurpleObj
+const Purple::SavedStatus::Sub			T_PurpleObj
 Purple::SoundEventID			T_IV
 Purple::Sound::UiOps			T_PurpleObj
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/perl-common.c
--- a/libpurple/plugins/perl/perl-common.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.c	Mon May 21 20:58:23 2007 +0000
@@ -80,7 +80,7 @@
 	stash = gv_stashpv(stash_name, 1);
 
 	hv = newHV();
-	hv_store(hv, "_purple", 5, create_sv_ptr(object), 0);
+	hv_store(hv, "_purple", 7, create_sv_ptr(object), 0);
 
 	return sv_bless(newRV_noinc((SV *)hv), stash);
 }
@@ -94,7 +94,7 @@
 	hv = hvref(o);
 
 	if (hv != NULL) {
-		sv = hv_fetch(hv, "_purple", 5, 0);
+		sv = hv_fetch(hv, "_purple", 7, 0);
 
 		if (sv != NULL)
 			return TRUE;
@@ -118,7 +118,7 @@
 	if (hv == NULL)
 		return NULL;
 
-	sv = hv_fetch(hv, "_purple", 5, 0);
+	sv = hv_fetch(hv, "_purple", 7, 0);
 
 	if (sv == NULL)
 		croak("variable is damaged");
diff -r e42309469a4a -r 618a3748ff64 libpurple/plugins/perl/scripts/signals-test.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/plugins/perl/scripts/signals-test.pl	Mon May 21 20:58:23 2007 +0000
@@ -0,0 +1,80 @@
+$MODULE_NAME = "Signals Test Script in Perl";
+
+use Purple;
+
+%PLUGIN_INFO = (
+	perl_api_version => 2,
+	name => "Perl: $MODULE_NAME",
+	version => "0.1",
+	summary => "Signals Test plugin for the Perl interpreter.",
+	description => "Demonstrate the user of purple signals from " .
+		       "a perl plugin.",
+	author => "Sadrul Habib Chowdhury <sadrul\@pidgin.im>",
+	url => "http://developer.pidgin.im/wiki/sadrul/",
+
+	load => "plugin_load",
+	unload => "plugin_unload"
+);
+
+# Accounts
+sub account_connecting_cb
+{
+	my $account = shift;
+	Purple::Debug::misc("signals test in perl", "account-connecting (" . $account->get_username() . ")\n");
+}
+
+# Buddylist
+sub buddy_signed_on
+{
+	my $buddy = shift;
+	Purple::Debug::misc("signals test in perl", "buddy-signed-on (" . $buddy->get_name() . ")\n");
+}
+
+# Connections
+sub signed_on
+{
+	my $conn = shift;
+	Purple::Debug::misc("signals test in perl", "signed-on (" . $conn->get_account()->get_username() . ")\n");
+}
+
+# Conversations
+sub conv_received_msg
+{
+	my ($account, $sender, $message, $conv, $flags, $data) = @_;
+	Purple::Debug::misc("signals test in perl", "$data (" . $account->get_username() . ", $sender, $message, $flags)\n");
+}
+
+sub plugin_load
+{
+	my $plugin = shift;
+
+	# Hook to the signals
+
+	# Accounts
+	$act_handle = Purple::Accounts::get_handle();
+	Purple::Signal::connect($act_handle, "account-connecting", $plugin,
+					\&account_connecting_cb, 0);
+
+	# Buddy List
+	$blist = Purple::BuddyList::get_handle();
+	Purple::Signal::connect($blist, "buddy-signed-on", $plugin,
+					\&buddy_signed_on, 0);
+
+	# Connections
+	$conn = Purple::Connections::get_handle();
+	Purple::Signal::connect($conn, "signed-on", $plugin,
+					\&signed_on, 0);
+
+	# Conversations
+	$conv = Purple::Conversations::get_handle();
+	Purple::Signal::connect($conv, "received-im-msg", $plugin,
+					\&conv_received_msg, "received im message");
+	Purple::Signal::connect($conv, "received-chat-msg", $plugin,
+					\&conv_received_msg, "received chat message");
+}
+
+sub plugin_unload
+{
+	# Nothing to do here for this plugin.
+}
+
diff -r e42309469a4a -r 618a3748ff64 libpurple/prefs.c
--- a/libpurple/prefs.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/prefs.c	Mon May 21 20:58:23 2007 +0000
@@ -937,7 +937,7 @@
 
 		if(pref->type != PURPLE_PREF_PATH_LIST) {
 			purple_debug_error("prefs",
-					"purple_prefs_set_path_list: %s not a string list pref\n",
+					"purple_prefs_set_path_list: %s not a path list pref\n",
 					name);
 			return;
 		}
@@ -1355,6 +1355,7 @@
 	purple_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog");
 	purple_prefs_remove("/plugins/core/autorecon/restore_state");
 	purple_prefs_remove("/plugins/core/autorecon");
+	purple_prefs_remove("/purple/debug/timestamps");
 
 	/* Convert old sounds while_away pref to new 3-way pref. */
 	if (purple_prefs_exists("/purple/sound/while_away") &&
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Mon May 21 20:58:23 2007 +0000
@@ -242,7 +242,7 @@
 	if (cbba->bj->account == gb->account)
 	{
 		bb = gb->proto_data;
-		if ((bb != NULL) && (g_strcasecmp(bb->ip, cbba->address) == 0))
+		if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0))
 			*(cbba->gb) = gb;
 	}
 }
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Mon May 21 20:58:23 2007 +0000
@@ -146,10 +146,10 @@
 	purple_signal_emit(_irc_plugin, "irc-sending-text", purple_account_get_connection(irc->account), &tosend);
 	if (tosend == NULL)
 		return 0;
-	
+
 	buflen = strlen(tosend);
-	
-	
+
+
 	/* If we're not buffering writes, try to send immediately */
 	if (!irc->writeh)
 		ret = do_send(irc, tosend, buflen);
@@ -342,7 +342,7 @@
 }
 
 static gboolean do_login(PurpleConnection *gc) {
-	char *buf;
+	char *buf, *tmp = NULL;
 	char hostname[256];
 	const char *username, *realname;
 	struct irc_conn *irc = gc->proto_data;
@@ -358,12 +358,26 @@
 		g_free(buf);
 	}
 
+
 	gethostname(hostname, sizeof(hostname));
 	hostname[sizeof(hostname) - 1] = '\0';
+	realname = purple_account_get_string(irc->account, "realname", "");
 	username = purple_account_get_string(irc->account, "username", "");
-	realname = purple_account_get_string(irc->account, "realname", "");
-	buf = irc_format(irc, "vvvv:", "USER", strlen(username) ? username : g_get_user_name(), hostname, irc->server,
+
+	if (username == NULL || *username == '\0') {
+		username = g_get_user_name();
+	}
+
+	if (username != NULL && strchr(username, ' ') != NULL) {
+		tmp = g_strdup(username);
+		while ((buf = strchr(tmp, ' ')) != NULL) {
+			*buf = '_';
+		}
+	}
+
+	buf = irc_format(irc, "vvvv:", "USER", tmp ? tmp : username, hostname, irc->server,
 			      strlen(realname) ? realname : IRC_DEFAULT_ALIAS);
+	g_free(tmp);
 	if (irc_send(irc, buf) < 0) {
 /*		purple_connection_error(gc, "Error registering with server");*/
 		g_free(buf);
@@ -548,13 +562,13 @@
 	irc->inbuf[irc->inbufused] = '\0';
 
 	cur = irc->inbuf;
-	
+
 	/* This is a hack to work around the fact that marv gets messages
 	 * with null bytes in them while using some weird irc server at work
 	 */
 	while ((cur < (irc->inbuf + irc->inbufused)) && !*cur)
 		cur++;
-	
+
 	while (cur < irc->inbuf + irc->inbufused &&
 	       ((end = strstr(cur, "\r\n")) || (end = strstr(cur, "\n")))) {
 		int step = (*end == '\r' ? 2 : 1);
@@ -643,7 +657,7 @@
 	return g_strdup(g_hash_table_lookup(data, "channel"));
 }
 
-static void irc_chat_invite(PurpleConnection *gc, int id, const char *message, const char *name) 
+static void irc_chat_invite(PurpleConnection *gc, int id, const char *message, const char *name)
 {
 	struct irc_conn *irc = gc->proto_data;
 	PurpleConversation *convo = purple_find_chat(gc, id);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/irc/irc.h
--- a/libpurple/protocols/irc/irc.h	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/irc/irc.h	Mon May 21 20:58:23 2007 +0000
@@ -142,8 +142,8 @@
 void irc_msg_ping(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_pong(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_privmsg(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_quit(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_regonly(struct irc_conn *irc, const char *name, const char *from, char **args);
-void irc_msg_quit(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_time(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_topic(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_unavailable(struct irc_conn *irc, const char *name, const char *from, char **args);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Mon May 21 20:58:23 2007 +0000
@@ -35,6 +35,7 @@
 static char *irc_mask_userhost(const char *mask);
 static void irc_chat_remove_buddy(PurpleConversation *convo, char *data[2]);
 static void irc_buddy_status(char *name, struct irc_buddy *ib, struct irc_conn *irc);
+static void irc_connected(struct irc_conn *irc, const char *nick);
 
 static void irc_msg_handle_privmsg(struct irc_conn *irc, const char *name,
                                    const char *from, const char *to,
@@ -70,6 +71,52 @@
 	g_free(message);
 }
 
+static void irc_connected(struct irc_conn *irc, const char *nick)
+{
+	PurpleConnection *gc;
+	PurpleStatus *status;
+	PurpleBlistNode *gnode, *cnode, *bnode;
+
+	if ((gc = purple_account_get_connection(irc->account)) == NULL
+	    || PURPLE_CONNECTION_IS_CONNECTED(gc))
+		return;
+
+	purple_connection_set_display_name(gc, nick);
+	purple_connection_set_state(gc, PURPLE_CONNECTED);
+
+	/* If we're away then set our away message */
+	status = purple_account_get_active_status(irc->account);
+	if (!purple_status_get_type(status) != PURPLE_STATUS_AVAILABLE) {
+		PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+		prpl_info->set_status(irc->account, status);
+	}
+
+	/* this used to be in the core, but it's not now */
+	for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
+		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
+			continue;
+		for(cnode = gnode->child; cnode; cnode = cnode->next) {
+			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
+				continue;
+			for(bnode = cnode->child; bnode; bnode = bnode->next) {
+				PurpleBuddy *b;
+				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+					continue;
+				b = (PurpleBuddy *)bnode;
+				if(b->account == gc->account) {
+					struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
+					ib->name = g_strdup(b->name);
+					g_hash_table_insert(irc->buddies, ib->name, ib);
+				}
+			}
+		}
+	}
+
+	irc_blist_timeout(irc);
+	if (!irc->timer)
+		irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
+}
+
 void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	purple_debug(PURPLE_DEBUG_INFO, "irc", "Unrecognized message: %s\n", args[0]);
@@ -95,56 +142,16 @@
 
 void irc_msg_luser(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	PurpleConnection *gc;
-	PurpleStatus *status;
-	PurpleBlistNode *gnode, *cnode, *bnode;
-
-	if (!args || !args[0] || !args[1])
-		return;
-
-	gc = purple_account_get_connection(irc->account);
-	if (!gc)
+	if (!args || !args[0])
 		return;
 
 	if (!strcmp(name, "251")) {
-		/* 251 is required, so we pluck our nick from here */
-		purple_connection_set_display_name(gc, args[0]);
+		/* 251 is required, so we pluck our nick from here and
+		 * finalize connection */
+		irc_connected(irc, args[0]);
 		/* Some IRC servers seem to not send a 255 numeric, so
 		 * I guess we can't require it; 251 will do. */
 	/* } else if (!strcmp(name, "255")) { */
-		purple_connection_set_state(gc, PURPLE_CONNECTED);
-
-		/* If we're away then set our away message */
-		status = purple_account_get_active_status(irc->account);
-		if (!purple_status_get_type(status) != PURPLE_STATUS_AVAILABLE) {
-			PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-			prpl_info->set_status(irc->account, status);
-		}
-
-		/* this used to be in the core, but it's not now */
-		for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
-			if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-				continue;
-			for(cnode = gnode->child; cnode; cnode = cnode->next) {
-				if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-					continue;
-				for(bnode = cnode->child; bnode; bnode = bnode->next) {
-					PurpleBuddy *b;
-					if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-						continue;
-					b = (PurpleBuddy *)bnode;
-					if(b->account == gc->account) {
-						struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-						ib->name = g_strdup(b->name);
-						g_hash_table_insert(irc->buddies, ib->name, ib);
-					}
-				}
-			}
-		}
-
-		irc_blist_timeout(irc);
-		if (!irc->timer)
-			irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
 	}
 }
 
@@ -523,6 +530,9 @@
 {
 	char *escaped;
 
+	if (!args || !args[0])
+		return;
+
 	if (!irc->motd)
 		irc->motd = g_string_new("");
 
@@ -532,7 +542,9 @@
 		irc->motd = g_string_new("");
 		return;
 	} else if (!strcmp(name, "376")) {
-		/* We no longer have to do anything for ENDMOTD */
+		/* dircproxy 1.0.5 does not send 251 on reconnection, so
+		 * finalize the connection here if it is not already done. */
+		irc_connected(irc, args[0]);
 		return;
 	}
 
@@ -541,6 +553,9 @@
 		return;
 	}
 
+	if (!args[1])
+		return;
+
 	escaped = g_markup_escape_text(args[1], -1);
 	g_string_append_printf(irc->motd, "%s<br>", escaped);
 	g_free(escaped);
@@ -1079,7 +1094,7 @@
 	if (!args || !args[1] || !args[2] || !gc)
 		return;
 
-	msg = g_strdup_printf(_("Cannot join %s:"), args[1]);
+	msg = g_strdup_printf(_("Cannot join %s: Registration is required."), args[1]);
 	purple_notify_error(gc, _("Cannot join channel"), msg, args[2]);
 	g_free(msg);
 }
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/irc/parse.c	Mon May 21 20:58:23 2007 +0000
@@ -91,6 +91,7 @@
 	{ "442", "nc:", irc_msg_notinchan },	/* Not in channel		*/
 	{ "473", "nc:", irc_msg_inviteonly },	/* Tried to join invite-only	*/
 	{ "474", "nc:", irc_msg_banned },	/* Banned from channel		*/
+	{ "477", "nc:", irc_msg_regonly },	/* Registration Required	*/
 	{ "478", "nct:", irc_msg_banfull },	/* Banlist is full		*/
 	{ "482", "nc:", irc_msg_notop },	/* Need to be op to do that	*/
 	{ "501", "n:", irc_msg_badmode },	/* Unknown mode flag		*/
@@ -226,7 +227,7 @@
 	enclist = purple_account_get_string(irc->account, "encoding", IRC_DEFAULT_CHARSET);
 	encodings = g_strsplit(enclist, ",", 2);
 
-	if (encodings[0] == NULL || !strcasecmp("UTF-8", encodings[0])) {
+	if (encodings[0] == NULL || !g_ascii_strcasecmp("UTF-8", encodings[0])) {
 		g_strfreev(encodings);
 		return g_strdup(string);
 	}
@@ -263,7 +264,7 @@
 		while (*charset == ' ')
 			charset++;
 
-		if (!strcasecmp("UTF-8", charset)) {
+		if (!g_ascii_strcasecmp("UTF-8", charset)) {
 			if (g_utf8_validate(string, -1, NULL))
 				utf8 = g_strdup(string);
 		} else {
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Mon May 21 20:58:23 2007 +0000
@@ -291,12 +291,15 @@
 				 * plaintext auth
 				 */
 				} else if (!plaintext) {
+					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,
 							2, js->gc->account, NULL, NULL, NULL,
 							allow_cyrus_plaintext_auth,
 							disallow_plaintext_auth);
+					g_free(msg);
 					return;
 				/* Everything else has failed, so fail the
 				 * connection. Should probably have a better
@@ -477,13 +480,16 @@
 		js->auth_type = JABBER_AUTH_PLAIN;
 
 		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,
 					2,
 					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);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Mon May 21 20:58:23 2007 +0000
@@ -1118,6 +1118,24 @@
 	return FALSE;
 }
 
+static gboolean _client_is_blacklisted(JabberBuddyResource *jbr, const char *ns)
+{
+	/* can't be blacklisted if we don't know what you're running yet */
+	if(!jbr->client.name)
+		return FALSE;
+
+	if(!strcmp(ns, "jabber:iq:last")) {
+		if(!strcmp(jbr->client.name, "Trillian")) {
+			if(!strcmp(jbr->client.version, "3.1.0.121")) {
+				/* verified by nwalp 2007/05/09 */
+				return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
 static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 {
 	JabberIq *iq;
@@ -1175,11 +1193,18 @@
 			jabber_iq_send(iq);
 		}
 
-		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
-		xmlnode_set_attrib(iq->node, "to", full_jid);
-		jabber_iq_set_callback(iq, jabber_last_parse, jbi);
-		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
-		jabber_iq_send(iq);
+		/* this is to fix the feeling of irritation I get when trying
+		 * to get info on a friend running Trillian, which doesn't
+		 * respond (with an error or otherwise) to jabber:iq:last
+		 * requests.  There are a number of Trillian users in my
+		 * office. */
+		if(!_client_is_blacklisted(jbr, "jabber:iq:last")) {
+			iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
+			xmlnode_set_attrib(iq->node, "to", full_jid);
+			jabber_iq_set_callback(iq, jabber_last_parse, jbi);
+			jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
+			jabber_iq_send(iq);
+		}
 
 		g_free(full_jid);
 	}
@@ -1793,7 +1818,7 @@
 
 	purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"),
 			_("Select a user directory to search"),
-			js->user_directories ? js->user_directories->data : "users.jabber.org",
+			js->user_directories ? js->user_directories->data : NULL,
 			FALSE, FALSE, NULL,
 			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search_ok),
 			_("Cancel"), NULL,
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/chat.c	Mon May 21 20:58:23 2007 +0000
@@ -75,8 +75,6 @@
 
 	if (js->chat_servers)
 		g_hash_table_insert(defaults, "server", g_strdup(js->chat_servers->data));
-	else
-		g_hash_table_insert(defaults, "server", g_strdup("conference.jabber.org"));
 
 	if (chat_name != NULL) {
 		JabberID *jid = jabber_id_new(chat_name);
@@ -782,7 +780,7 @@
 
 	purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"),
 			_("Select a conference server to query"),
-			js->chat_servers ? js->chat_servers->data : "conference.jabber.org",
+			js->chat_servers ? js->chat_servers->data : NULL,
 			FALSE, FALSE, NULL,
 			_("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb),
 			_("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon May 21 20:58:23 2007 +0000
@@ -508,13 +508,13 @@
 			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc);
 }
 
-static void jabber_login_connect(JabberStream *js, const char *server, int port)
+static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
 {
 #ifdef HAVE_CYRUS_SASL
-	js->serverFQDN = g_strdup(server);
+	js->serverFQDN = g_strdup(fqdn);
 #endif
 
-	if (purple_proxy_connect(js->gc, js->gc->account, server,
+	if (purple_proxy_connect(js->gc, js->gc->account, host,
 			port, jabber_login_callback, js->gc) == NULL)
 		purple_connection_error(js->gc, _("Unable to create socket"));
 }
@@ -527,10 +527,10 @@
 	js->srv_query_data = NULL;
 
 	if(results) {
-		jabber_login_connect(js, resp->hostname, resp->port);
+		jabber_login_connect(js, resp->hostname, resp->hostname, resp->port);
 		g_free(resp);
 	} else {
-		jabber_login_connect(js, js->user->domain,
+		jabber_login_connect(js, js->user->domain, js->user->domain,
 			purple_account_get_int(js->gc->account, "port", 5222));
 	}
 }
@@ -556,7 +556,6 @@
 			g_free, (GDestroyNotify)jabber_buddy_free);
 	js->chats = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_chat_free);
-	js->chat_servers = g_list_append(NULL, g_strdup("conference.jabber.org"));
 	js->user = jabber_id_new(purple_account_get_username(account));
 	js->next_id = g_random_int();
 	js->write_buffer = purple_circ_buffer_new(512);
@@ -565,7 +564,12 @@
 		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
-
+	
+	if (!js->user->domain || *(js->user->domain) == '\0') {
+		purple_connection_error(gc, _("Invalid XMPP ID. Domain must be set."));
+		return;
+	}
+	
 	if(!js->user->resource) {
 		char *me;
 		js->user->resource = g_strdup("Home");
@@ -600,7 +604,7 @@
 	 * invoke the magic of SRV lookups, to figure out host and port */
 	if(!js->gsc) {
 		if(connect_server[0]) {
-			jabber_login_connect(js, connect_server, purple_account_get_int(account, "port", 5222));
+			jabber_login_connect(js, js->user->domain, connect_server, purple_account_get_int(account, "port", 5222));
 		} else {
 			js->srv_query_data = purple_srv_resolve("xmpp-client",
 					"tcp", js->user->domain, srv_resolved_cb, js);
@@ -945,7 +949,7 @@
 
 	if(!js->gsc) {
 		if (connect_server[0]) {
-			jabber_login_connect(js, server,
+			jabber_login_connect(js, js->user->domain, server,
 			                     purple_account_get_int(account,
 			                                          "port", 5222));
 		} else {
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon May 21 20:58:23 2007 +0000
@@ -191,7 +191,8 @@
         PurpleAccountUserSplit *split;
         PurpleAccountOption *option;
 
-        split = purple_account_user_split_new(_("Server"), "jabber.org", '@');
+	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
+        split = purple_account_user_split_new(_("Domain"), NULL, '@');
         prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
         split = purple_account_user_split_new(_("Resource"), "Home", '/');
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Mon May 21 20:58:23 2007 +0000
@@ -391,7 +391,7 @@
 		static int i = 1;
 		char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
 
-		if(state == JABBER_BUDDY_STATE_ERROR && jid->resource == NULL) {
+		if(state == JABBER_BUDDY_STATE_ERROR) {
 			char *title, *msg = jabber_parse_error(js, packet);
 
 			if(chat->conv) {
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon May 21 20:58:23 2007 +0000
@@ -73,6 +73,15 @@
 
 } MsnGetInfoStepTwoData;
 
+typedef struct
+{
+	PurpleConnection *gc;
+	const char *who;
+	char *msg;
+	PurpleMessageFlags flags;
+	time_t when;
+} MsnIMData;
+
 static const char *
 msn_normalize(const PurpleAccount *account, const char *str)
 {
@@ -409,33 +418,7 @@
 static void
 t_msn_xfer_init(PurpleXfer *xfer)
 {
-	MsnSlpLink *slplink;
-	const char *filename;
-	FILE *fp;
-
-	filename = purple_xfer_get_local_filename(xfer);
-
-	slplink = xfer->data;
-
-	if ((fp = g_fopen(filename, "rb")) == NULL)
-	{
-		PurpleAccount *account;
-		const char *who;
-		char *msg;
-
-		account = slplink->session->account;
-		who = slplink->remote_user;
-
-		msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
-							  filename, strerror(errno));
-		purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg);
-		purple_xfer_cancel_local(xfer);
-		g_free(msg);
-
-		return;
-	}
-	fclose(fp);
-
+	MsnSlpLink *slplink = xfer->data;
 	msn_slplink_request_ft(slplink, xfer);
 }
 
@@ -636,7 +619,8 @@
 	account = purple_connection_get_account(gc);
 	user = msn_normalize(account, purple_account_get_username(account));
 
-	if (strstr(user, "@hotmail.com") != NULL)
+	if ((strstr(user, "@hotmail.") != NULL) ||
+		(strstr(user, "@msn.com") != NULL))
 	{
 		m = g_list_append(m, NULL);
 		act = purple_plugin_action_new(_("Open Hotmail Inbox"),
@@ -753,6 +737,16 @@
 	gc->proto_data = NULL;
 }
 
+static gboolean
+msn_send_me_im(gpointer data)
+{
+	MsnIMData *imdata = data;
+	serv_got_im(imdata->gc, imdata->who, imdata->msg, imdata->flags, imdata->when);
+	g_free(imdata->msg);
+	g_free(imdata);
+	return FALSE;
+}
+
 static int
 msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 			PurpleMessageFlags flags)
@@ -805,6 +799,7 @@
 	{
 		char *body_str, *body_enc, *pre, *post;
 		const char *format;
+		MsnIMData *imdata = g_new0(MsnIMData, 1);
 		/*
 		 * In MSN, you can't send messages to yourself, so
 		 * we'll fake like we received it ;)
@@ -822,8 +817,12 @@
 		g_free(post);
 
 		serv_got_typing_stopped(gc, who);
-		serv_got_im(gc, who, body_str, flags, time(NULL));
-		g_free(body_str);
+		imdata->gc = gc;
+		imdata->who = who;
+		imdata->msg = body_str;
+		imdata->flags = flags;
+		imdata->when = time(NULL);
+		g_idle_add(msn_send_me_im, imdata);
 	}
 
 	msn_message_destroy(msg);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Mon May 21 20:58:23 2007 +0000
@@ -589,6 +589,23 @@
 }
 
 static void
+qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	static int count = 0;
+	MsnSession *session = cmdproc->session;
+
+	if (session->passport_info.file == NULL)
+		return;
+
+	if (count++ < 26)
+		return;
+
+	count = 0;
+	msn_cmdproc_send(cmdproc, "URL", "%s", "INBOX");
+}
+
+
+static void
 fln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSlpLink *slplink;
@@ -982,7 +999,8 @@
 	}
 	else
 	{
-		fputs("<html>\n"
+		fputs("<!-- saved from url=(0013)about:internet -->\n"
+			  "<html>\n"
 			  "<head>\n"
 			  "<noscript>\n"
 			  "<meta http-equiv=\"Refresh\" content=\"0; "
@@ -1404,7 +1422,7 @@
 	msn_table_add_cmd(cbs_table, NULL, "ADD", add_cmd);
 
 	msn_table_add_cmd(cbs_table, NULL, "QRY", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "QNG", NULL);
+	msn_table_add_cmd(cbs_table, NULL, "QNG", qng_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "FLN", fln_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "NLN", nln_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "ILN", iln_cmd);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Mon May 21 20:58:23 2007 +0000
@@ -404,4 +404,9 @@
 
 	/* Sync users */
 	msn_session_sync_users(session);
+	/* It seems that some accounts that haven't accessed hotmail for a while
+	 * and @msn.com accounts don't automatically get the initial email
+	 * notification so we always request it on login
+	 */
+	msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
 }
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Mon May 21 20:58:23 2007 +0000
@@ -158,7 +158,9 @@
 msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
 					  gsize size)
 {
-	purple_xfer_set_completed(slpcall->xfer, TRUE);
+	PurpleXfer *xfer = slpcall->xfer;
+	purple_xfer_set_completed(xfer, TRUE);
+	purple_xfer_end(xfer);
 }
 
 /**************************************************************************
@@ -361,6 +363,8 @@
 			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
 
 			slpcall->xfer = xfer;
+			purple_xfer_ref(slpcall->xfer);
+
 			xfer->data = slpcall;
 
 			purple_xfer_request(xfer);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Mon May 21 20:58:23 2007 +0000
@@ -120,6 +120,9 @@
 	if (slpcall->end_cb != NULL)
 		slpcall->end_cb(slpcall, session);
 
+	if (slpcall->xfer != NULL)
+		purple_xfer_unref(slpcall->xfer);
+
 	g_free(slpcall);
 }
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/msn/slplink.c	Mon May 21 20:58:23 2007 +0000
@@ -482,6 +482,8 @@
 {
 	MsnSlpCall *slpcall;
 	MsnSlpMessage *slpmsg;
+	struct stat st;
+	PurpleXfer *xfer;
 
 	slpcall = slpsession->slpcall;
 	slpmsg = msn_slpmsg_new(slpcall->slplink);
@@ -491,7 +493,12 @@
 #ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP FILE";
 #endif
-	msn_slpmsg_open_file(slpmsg, purple_xfer_get_local_filename(slpcall->xfer));
+	xfer = (PurpleXfer *)slpcall->xfer;
+	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	slpmsg->fp = xfer->dest_fp;
+	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
+		slpmsg->size = st.st_size;
+	xfer->dest_fp = NULL; /* Disable double fclose() */
 
 	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
 }
@@ -551,9 +558,10 @@
 
 					if (xfer != NULL)
 					{
-						slpmsg->fp =
-							g_fopen(purple_xfer_get_local_filename(slpmsg->slpcall->xfer),
-								  "wb");
+						purple_xfer_start(slpmsg->slpcall->xfer,
+							0, NULL, 0);
+						slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp;
+						xfer->dest_fp = NULL; /* Disable double fclose() */
 					}
 				}
 			}
@@ -755,6 +763,7 @@
 	slpcall->progress_cb = msn_xfer_progress_cb;
 	slpcall->cb = msn_xfer_completed_cb;
 	slpcall->xfer = xfer;
+	purple_xfer_ref(slpcall->xfer);
 
 	slpcall->pending = TRUE;
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/novell/nmuser.c
--- a/libpurple/protocols/novell/nmuser.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/novell/nmuser.c	Mon May 21 20:58:23 2007 +0000
@@ -944,7 +944,7 @@
 	}
 
 	/* Remove item from the cached list */
-	if ((node = g_slist_find_custom(*list_ptr, dn, (GCompareFunc)nm_utf8_strcasecmp))) {
+	if ((node = g_slist_find_custom(*list_ptr, dn, (GCompareFunc)purple_utf8_strcasecmp))) {
 		*list_ptr = g_slist_remove_link(*list_ptr, node);
 		g_slist_free_1(node);
 	}
@@ -1223,13 +1223,13 @@
 	locate = nm_locate_field(NM_A_LOCKED_ATTR_LIST, user->fields);
 	if (locate && locate->ptr_value) {
 		if (locate->type == NMFIELD_TYPE_UTF8 &&
-			(nm_utf8_strcasecmp(locate->ptr_value, NM_A_BLOCKING) == 0)) {
+			(purple_utf8_strcasecmp(locate->ptr_value, NM_A_BLOCKING) == 0)) {
 			user->privacy_locked = TRUE;
 		} else if (locate->type == NMFIELD_TYPE_MV ||
 				   locate->type == NMFIELD_TYPE_ARRAY) {
 			NMField *tmp = (NMField *)locate->ptr_value;
 			while (tmp && tmp->tag) {
-				if (nm_utf8_strcasecmp(tmp->ptr_value, NM_A_BLOCKING) == 0) {
+				if (purple_utf8_strcasecmp(tmp->ptr_value, NM_A_BLOCKING) == 0) {
 					user->privacy_locked = TRUE;
 					break;
 				}
@@ -1800,25 +1800,11 @@
  * Some utility functions...haven't figured out where
  * they belong yet.
  */
-gint
-nm_utf8_strcasecmp(gconstpointer str1, gconstpointer str2)
-{
-	gint rv;
-	char *str1_down = g_utf8_strdown(str1, -1);
-	char *str2_down = g_utf8_strdown(str2, -1);
-
-	rv = g_utf8_collate(str1_down, str2_down);
-
-	g_free(str1_down);
-	g_free(str2_down);
-
-	return rv;
-}
 
 gboolean
 nm_utf8_str_equal(gconstpointer str1, gconstpointer str2)
 {
-	return (nm_utf8_strcasecmp(str1, str2) == 0);
+	return (purple_utf8_strcasecmp(str1, str2) == 0);
 }
 
 char *
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/novell/nmuser.h
--- a/libpurple/protocols/novell/nmuser.h	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/novell/nmuser.h	Mon May 21 20:58:23 2007 +0000
@@ -646,18 +646,6 @@
  */
 gboolean nm_are_guids_equal(const char *guid1, const char *guid2);
 
-
-/**
- * Case insensitive compare for utf8 strings
- *
- * @param guid1	First string to compare
- * @param guid2 Second string to compare
- *
- * @return 		-1 if str1 < str2, 0 if str1 = str2, 1 if str1 > str2
- *
- */
-gint nm_utf8_strcasecmp(gconstpointer str1, gconstpointer str2);
-
 /**
  * Compare UTF8 strings for equality only (case insensitive)
  *
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Mon May 21 20:58:23 2007 +0000
@@ -734,14 +734,14 @@
 		if (allowed) {
 
 			if (!g_slist_find_custom(gc->account->permit,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 				purple_privacy_permit_add(gc->account, display_id, TRUE);
 			}
 
 		} else {
 
 			if (!g_slist_find_custom(gc->account->permit,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 				purple_privacy_deny_add(gc->account, display_id, TRUE);
 			}
 		}
@@ -782,7 +782,7 @@
 		if (display_id) {
 
 			if (!g_slist_find_custom(gc->account->deny,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 
 				purple_privacy_deny_add(gc->account, display_id, TRUE);
 			}
@@ -834,7 +834,7 @@
 
 			if (!g_slist_find_custom(gc->account->permit,
 									 display_id,
-									 (GCompareFunc)nm_utf8_strcasecmp)) {
+									 (GCompareFunc)purple_utf8_strcasecmp)) {
 
 				purple_privacy_permit_add(gc->account, display_id, TRUE);
 			}
@@ -1412,7 +1412,7 @@
 			name =(char *)node->data;
 
 		if (!g_slist_find_custom(gc->account->permit,
-								 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 			purple_privacy_permit_add(gc->account, name , TRUE);
 		}
 	}
@@ -1425,7 +1425,7 @@
 			name =(char *)node->data;
 
 		if (!g_slist_find_custom(gc->account->deny,
-								 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 			purple_privacy_deny_add(gc->account, name, TRUE);
 		}
 	}
@@ -1436,7 +1436,7 @@
 		dn = nm_lookup_dn(user, (char *)node->data);
 		if (dn != NULL &&
 			!g_slist_find_custom(user->allow_list,
-								 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 			rem_list = g_slist_append(rem_list, node->data);
 		}
 	}
@@ -1453,7 +1453,7 @@
 		dn = nm_lookup_dn(user, (char *)node->data);
 		if (dn != NULL &&
 			!g_slist_find_custom(user->deny_list,
-								 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 			rem_list = g_slist_append(rem_list, node->data);
 		}
 	}
@@ -3268,7 +3268,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(gc->account->permit,
-												 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 							purple_privacy_permit_add(gc->account, name , TRUE);
 						}
 					}
@@ -3282,7 +3282,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(user->allow_list,
-												 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 							rc = nm_send_create_privacy_item(user, dn, TRUE,
 															 _create_privacy_item_deny_resp_cb,
 															 g_strdup(dn));
@@ -3310,7 +3310,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(gc->account->deny,
-												 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 							purple_privacy_deny_add(gc->account, name , TRUE);
 						}
 					}
@@ -3325,7 +3325,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(user->deny_list,
-												 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 							rc = nm_send_create_privacy_item(user, dn, FALSE,
 															 _create_privacy_item_deny_resp_cb,
 															 g_strdup(name));
@@ -3358,7 +3358,7 @@
 				contact = nm_folder_get_contact(user->root_folder, i);
 				dn = nm_contact_get_dn(contact);
 				if (dn && !g_slist_find_custom(user->allow_list,
-											   dn, (GCompareFunc)nm_utf8_strcasecmp))
+											   dn, (GCompareFunc)purple_utf8_strcasecmp))
 				{
 					rc = nm_send_create_privacy_item(user, dn, TRUE,
 													 _create_privacy_item_deny_resp_cb,
@@ -3377,7 +3377,7 @@
 					contact = nm_folder_get_contact(folder, j);
 					dn = nm_contact_get_dn(contact);
 					if (dn && !g_slist_find_custom(user->allow_list,
-												   dn, (GCompareFunc)nm_utf8_strcasecmp))
+												   dn, (GCompareFunc)purple_utf8_strcasecmp))
 					{
 						rc = nm_send_create_privacy_item(user, dn, TRUE,
 														 _create_privacy_item_deny_resp_cb,
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon May 21 20:58:23 2007 +0000
@@ -304,15 +304,15 @@
 
 	if ((encoding == NULL) || encoding[0] == '\0') {
 		purple_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
-	} else if (!strcasecmp(encoding, "iso-8859-1")) {
+	} else if (!g_ascii_strcasecmp(encoding, "iso-8859-1")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "iso-8859-1", NULL, NULL, NULL);
-	} else if (!strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
-	           !strcasecmp(encoding, "us-ascii"))
+	} else if (!g_ascii_strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
+	           !g_ascii_strcasecmp(encoding, "us-ascii"))
 	{
 		utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
-	} else if (!strcasecmp(encoding, "unicode-2-0")) {
+	} else if (!g_ascii_strcasecmp(encoding, "unicode-2-0")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
-	} else if (strcasecmp(encoding, "utf-8")) {
+	} else if (g_ascii_strcasecmp(encoding, "utf-8")) {
 		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
 						   "attempting to convert to UTF-8 anyway\n", encoding);
 		utf8 = g_convert(text, textlen, "UTF-8", encoding, NULL, NULL, NULL);
@@ -362,7 +362,7 @@
 	if ((charsetstr == NULL) || (*charsetstr == '\0'))
 		return NULL;
 
-	if (strcasecmp("UTF-8", charsetstr)) {
+	if (g_ascii_strcasecmp("UTF-8", charsetstr)) {
 		if (fallback)
 			ret = g_convert_with_fallback(data, datalen, "UTF-8", charsetstr, "?", NULL, NULL, &err);
 		else
@@ -4143,6 +4143,7 @@
 			conn->sn, msg->str, &tmp, &tmplen, &charset, &charsubset);
 	g_string_free(msg, TRUE);
 	msg = g_string_new_len(tmp, tmplen);
+	g_free(tmp);
 
 	/* Append any binary data that we may have */
 	if (oscar_id) {
@@ -6463,15 +6464,18 @@
 gboolean
 oscar_offline_message(const PurpleBuddy *buddy)
 {
-	OscarData *od;
+	OscarData *od = NULL;
 	PurpleAccount *account;
-	PurpleConnection *gc;
+	PurpleConnection *gc = NULL;
 
 	account = purple_buddy_get_account(buddy);
-	gc = purple_account_get_connection(account);
-	od = (OscarData *)gc->proto_data;
-
-	return (od->icq && aim_sn_is_icq(purple_account_get_username(account)));
+	if (account != NULL) {
+		gc = purple_account_get_connection(account);
+		if (gc != NULL)
+			od = (OscarData *)gc->proto_data;
+	}
+
+	return (od != NULL && od->icq && aim_sn_is_icq(purple_account_get_username(account)));
 }
 
 /* TODO: Find somewhere to put this instead of including it in a bunch of places.
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Mon May 21 20:58:23 2007 +0000
@@ -611,9 +611,9 @@
 
 
 static struct mwAwareListHandler mw_aware_list_handler = {
-  .on_aware = mw_aware_list_on_aware,
-  .on_attrib = mw_aware_list_on_attrib,
-  .clear = mw_aware_list_clear,
+  mw_aware_list_on_aware,
+  mw_aware_list_on_attrib,
+  mw_aware_list_clear,
 };
 
 
@@ -1777,14 +1777,14 @@
 
 
 static struct mwSessionHandler mw_session_handler = {
-  .io_write = mw_session_io_write,
-  .io_close = mw_session_io_close,
-  .clear = mw_session_clear,
-  .on_stateChange = mw_session_stateChange,
-  .on_setPrivacyInfo = mw_session_setPrivacyInfo,
-  .on_setUserStatus = mw_session_setUserStatus,
-  .on_admin = mw_session_admin,
-  .on_announce = mw_session_announce,
+  mw_session_io_write,
+  mw_session_io_close,
+  mw_session_clear,
+  mw_session_stateChange,
+  mw_session_setPrivacyInfo,
+  mw_session_setUserStatus,
+  mw_session_admin,
+  mw_session_announce,
 };
 
 
@@ -1803,8 +1803,8 @@
 
 
 static struct mwAwareHandler mw_aware_handler = {
-  .on_attrib = mw_aware_on_attrib,
-  .clear = mw_aware_clear,
+  mw_aware_on_attrib,
+  mw_aware_clear,
 };
 
 
@@ -2042,14 +2042,14 @@
 
 
 static struct mwConferenceHandler mw_conference_handler = {
-  .on_invited = mw_conf_invited,
-  .conf_opened = mw_conf_opened,
-  .conf_closed = mw_conf_closed,
-  .on_peer_joined = mw_conf_peer_joined,
-  .on_peer_parted = mw_conf_peer_parted,
-  .on_text = mw_conf_text,
-  .on_typing = mw_conf_typing,
-  .clear = mw_conf_clear,
+  mw_conf_invited,
+  mw_conf_opened,
+  mw_conf_closed,
+  mw_conf_peer_joined,
+  mw_conf_peer_parted,
+  mw_conf_text,
+  mw_conf_typing,
+  mw_conf_clear,
 };
 
 
@@ -2287,12 +2287,12 @@
 
 
 static struct mwFileTransferHandler mw_ft_handler = {
-  .ft_offered = mw_ft_offered,
-  .ft_opened = mw_ft_opened,
-  .ft_closed = mw_ft_closed,
-  .ft_recv = mw_ft_recv,
-  .ft_ack = mw_ft_ack,
-  .clear = mw_ft_clear,
+  mw_ft_offered,
+  mw_ft_opened,
+  mw_ft_closed,
+  mw_ft_recv,
+  mw_ft_ack,
+  mw_ft_clear,
 };
 
 
@@ -2854,11 +2854,11 @@
 
 
 static struct mwImHandler mw_im_handler = {
-  .conversation_opened = mw_conversation_opened,
-  .conversation_closed = mw_conversation_closed,
-  .conversation_recv = mw_conversation_recv,
-  .place_invite = mw_place_invite,
-  .clear = mw_im_clear,
+  mw_conversation_opened,
+  mw_conversation_closed,
+  mw_conversation_recv,
+  mw_place_invite,
+  mw_im_clear,
 };
 
 
@@ -3052,14 +3052,14 @@
 
 
 static struct mwPlaceHandler mw_place_handler = {
-  .opened = mw_place_opened,
-  .closed = mw_place_closed,
-  .peerJoined = mw_place_peerJoined,
-  .peerParted = mw_place_peerParted,
-  .peerSetAttribute = mw_place_peerSetAttribute,
-  .peerUnsetAttribute = mw_place_peerUnsetAttribute,
-  .message = mw_place_message,
-  .clear = mw_place_clear,
+  mw_place_opened,
+  mw_place_closed,
+  mw_place_peerJoined,
+  mw_place_peerParted,
+  mw_place_peerSetAttribute,
+  mw_place_peerUnsetAttribute,
+  mw_place_message,
+  mw_place_clear,
 };
 
 
@@ -4575,9 +4575,9 @@
   struct mwSession *session;
 
   struct mwPrivacyInfo privacy = {
-    .deny = FALSE,
-    .count = 0,
-    .users = NULL,
+    FALSE, /* deny  */
+    0,     /* count */
+    NULL,  /* users */
   };
 
   g_return_if_fail(gc != NULL);
@@ -5167,7 +5167,13 @@
 
 
 static PurplePluginUiInfo mw_plugin_ui_info = {
-  .get_plugin_pref_frame = mw_plugin_get_plugin_pref_frame,
+  mw_plugin_get_plugin_pref_frame,
+  0,    /* page_num */
+  NULL, /* frame */
+  NULL,
+  NULL,
+  NULL,
+  NULL
 };
 
 
@@ -5648,30 +5654,39 @@
   g_log_remove_handler("meanwhile", log_handler[1]);
 }
 
-
-static PurplePluginInfo mw_plugin_info = {
-  .magic           = PURPLE_PLUGIN_MAGIC,
-  .major_version   = PURPLE_MAJOR_VERSION,
-  .minor_version   = PURPLE_MINOR_VERSION,
-  .type            = PURPLE_PLUGIN_PROTOCOL,
-  .ui_requirement  = NULL,
-  .flags           = 0,
-  .dependencies    = NULL,
-  .priority        = PURPLE_PRIORITY_DEFAULT,
-  .id              = PLUGIN_ID,
-  .name            = PLUGIN_NAME,
-  .version         = VERSION,
-  .summary         = PLUGIN_SUMMARY,
-  .description     = PLUGIN_DESC,
-  .author          = PLUGIN_AUTHOR,
-  .homepage        = PLUGIN_HOMEPAGE,
-  .load            = mw_plugin_load,
-  .unload          = mw_plugin_unload,
-  .destroy         = mw_plugin_destroy,
-  .ui_info         = NULL,
-  .extra_info      = &mw_prpl_info,
-  .prefs_info      = &mw_plugin_ui_info,
-  .actions         = mw_plugin_actions,
+static PurplePluginInfo mw_plugin_info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_PROTOCOL,                           /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                          /**< priority       */
+
+	PLUGIN_ID,                                        /**< id             */
+	PLUGIN_NAME,                                      /**< name           */
+	VERSION,                                          /**< version        */
+	PLUGIN_SUMMARY,                                   /**< summary        */
+	PLUGIN_DESC,                                      /**<  description    */
+	PLUGIN_AUTHOR,                                    /**< author         */
+	PLUGIN_HOMEPAGE,                                  /**< homepage       */
+
+	mw_plugin_load,                                   /**< load           */
+	mw_plugin_unload,                                 /**< unload         */
+	mw_plugin_destroy,                                /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	&mw_prpl_info,                                    /**< extra_info     */
+	&mw_plugin_ui_info,                               /**< prefs_info     */
+	mw_plugin_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/silc/util.c
--- a/libpurple/protocols/silc/util.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/silc/util.c	Mon May 21 20:58:23 2007 +0000
@@ -620,15 +620,15 @@
 	ct = strrchr(filename, '.');
 	if (!ct)
 		return NULL;
-	else if (!strcasecmp(".png", ct))
+	else if (!g_ascii_strcasecmp(".png", ct))
 		return strdup("image/png");
-	else if (!strcasecmp(".jpg", ct))
+	else if (!g_ascii_strcasecmp(".jpg", ct))
 		return strdup("image/jpeg");
-	else if (!strcasecmp(".jpeg", ct))
+	else if (!g_ascii_strcasecmp(".jpeg", ct))
 		return strdup("image/jpeg");
-	else if (!strcasecmp(".gif", ct))
+	else if (!g_ascii_strcasecmp(".gif", ct))
 		return strdup("image/gif");
-	else if (!strcasecmp(".tiff", ct))
+	else if (!g_ascii_strcasecmp(".tiff", ct))
 		return strdup("image/tiff");
 	
 	return NULL;
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Mon May 21 20:58:23 2007 +0000
@@ -277,18 +277,18 @@
 							auth->nonce, noncecount, NULL, auth->digest_session_key);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
 
-		ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response);
+		ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
 		g_free(response);
 		return ret;
 	} else if(auth->type == 2) { /* NTLM */
 		if(auth->nc == 3 && auth->nonce) {
 			/* TODO: Don't hardcode "purple" as the hostname */
 			ret = purple_ntlm_gen_type3(authuser, sip->password, "purple", authdomain, (const guint8 *)auth->nonce, &auth->flags);
-			tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"\r\n", auth->opaque, auth->realm, auth->target, ret);
+			tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"", auth->opaque, auth->realm, auth->target, ret);
 			g_free(ret);
 			return tmp;
 		}
-		tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"\r\n", auth->realm, auth->target);
+		tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"", auth->realm, auth->target);
 		return tmp;
 	}
 
@@ -298,7 +298,7 @@
 						auth->nonce, noncecount, NULL, auth->digest_session_key);
 	purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
 
-	ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response);
+	ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
 	g_free(response);
 	return ret;
 }
@@ -630,14 +630,12 @@
 	if(addheaders) addh = addheaders;
 	if(sip->registrar.type && !strcmp(method, "REGISTER")) {
 		buf = auth_header(sip, &sip->registrar, method, url);
-		auth = g_strdup_printf("Authorization: %s", buf);
+		auth = g_strdup_printf("Authorization: %s\r\n", buf);
 		g_free(buf);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
-	}
-
-	if(sip->proxy.type && strcmp(method, "REGISTER")) {
+	} else if(sip->proxy.type && strcmp(method, "REGISTER")) {
 		buf = auth_header(sip, &sip->proxy, method, url);
-		auth = g_strdup_printf("Proxy-Authorization: %s", buf);
+		auth = g_strdup_printf("Proxy-Authorization: %s\r\n", buf);
 		g_free(buf);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
 	}
@@ -984,8 +982,8 @@
 		state = xmlnode_get_child(isc, "state");
 
 		if(!state) {
-			purple_debug_info("simple", "process_incoming_message: no state found\n");
-			xmlnode_free(isc);
+				purple_debug_info("simple", "process_incoming_message: no state found\n");
+				xmlnode_free(isc);
 			return;
 		}
 
@@ -1239,9 +1237,9 @@
 			while(tmp && tmp < acceptheader + strlen(acceptheader)) {
 				gchar *tmp2 = strchr(tmp, ',');
 				if(tmp2) *tmp2 = '\0';
-				if(!strcasecmp("application/pidf+xml", tmp))
+				if(!g_ascii_strcasecmp("application/pidf+xml", tmp))
 					foundpidf = TRUE;
-				if(!strcasecmp("application/xpidf+xml", tmp))
+				if(!g_ascii_strcasecmp("application/xpidf+xml", tmp))
 					foundxpidf = TRUE;
 				if(tmp2) {
 					*tmp2 = ',';
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/simple/sipmsg.c
--- a/libpurple/protocols/simple/sipmsg.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/simple/sipmsg.c	Mon May 21 20:58:23 2007 +0000
@@ -180,7 +180,7 @@
 	GSList *tmp = msg->headers;
 	while(tmp) {
 		elem = tmp->data;
-		if(strcasecmp(elem->name, name)==0) {
+		if(g_ascii_strcasecmp(elem->name, name)==0) {
 			msg->headers = g_slist_remove(msg->headers, elem);
 			g_free(elem->name);
 			g_free(elem->value);
@@ -198,7 +198,7 @@
 	tmp = msg->headers;
 	while(tmp) {
 		elem = tmp->data;
-		if(strcasecmp(elem->name, name)==0) {
+		if(g_ascii_strcasecmp(elem->name, name)==0) {
 			return elem->value;
 		}
 		tmp = g_slist_next(tmp);
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon May 21 20:58:23 2007 +0000
@@ -906,7 +906,7 @@
 static void yahoo_process_sysmessage(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
-	char *prim, *me = NULL, *msg = NULL, *escmsg = NULL;
+	char *prim, *me = NULL, *msg = NULL;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -922,14 +922,10 @@
 	if (!msg || !g_utf8_validate(msg, -1, NULL))
 		return;
 
-	/* TODO: Does this really need to be escaped?  It seems like it doesn't. */
-	escmsg = g_markup_escape_text(msg, -1);
-
 	prim = g_strdup_printf(_("Yahoo! system message for %s:"),
 	                       me?me:purple_connection_get_display_name(gc));
-	purple_notify_info(NULL, NULL, prim, escmsg);
+	purple_notify_info(NULL, NULL, prim, msg);
 	g_free(prim);
-	g_free(escmsg);
 }
 
 struct yahoo_add_request {
diff -r e42309469a4a -r 618a3748ff64 libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Mon May 21 20:58:23 2007 +0000
@@ -990,7 +990,8 @@
 
 	tc = tree_child(ptree,0)->contents;
 
-	if (ptree->num_children > 0  &&	tc && !strcasecmp(tc, key)) {
+	/* g_strcasecmp() is deprecated.  What is the encoding here??? */
+	if (ptree->num_children > 0  &&	tc && !g_strcasecmp(tc, key)) {
 		return ptree;
 	} else {
 		parse_tree *result = &null_parse_tree;
diff -r e42309469a4a -r 618a3748ff64 libpurple/proxy.c
--- a/libpurple/proxy.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/proxy.c	Mon May 21 20:58:23 2007 +0000
@@ -217,14 +217,14 @@
 		g_free(path);
 
 		/* See whether to use a proxy. */
-		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp,
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/mode", &tmp,
 					       NULL, NULL, NULL))
 			return purple_global_proxy_get_info();
-		if (!strcmp(tmp, "false\n")) {
+		if (!strcmp(tmp, "none\n")) {
 			info.type = PURPLE_PROXY_NONE;
 			g_free(tmp);
 			return &info;
-		} else if (strcmp(tmp, "true\n")) {
+		} else if (strcmp(tmp, "manual\n")) {
 			g_free(tmp);
 			return purple_global_proxy_get_info();
 		}
diff -r e42309469a4a -r 618a3748ff64 libpurple/prpl.c
--- a/libpurple/prpl.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/prpl.c	Mon May 21 20:58:23 2007 +0000
@@ -128,7 +128,7 @@
 purple_prpl_got_user_status(PurpleAccount *account, const char *name,
 		const char *status_id, ...)
 {
-	GSList *list;
+	GSList *list, *l;
 	PurpleBuddy *buddy;
 	PurplePresence *presence;
 	PurpleStatus *status;
@@ -140,24 +140,30 @@
 	g_return_if_fail(status_id != NULL);
 	g_return_if_fail(purple_account_is_connected(account) || purple_account_is_connecting(account));
 
-	if ((buddy = purple_find_buddy(account, name)) == NULL)
+	if((list = purple_find_buddies(account, name)) == NULL)
 		return;
 
-	presence = purple_buddy_get_presence(buddy);
-	status   = purple_presence_get_status(presence, status_id);
+	for(l = list; l != NULL; l = l->next) {
+		buddy = l->data;
 
-	g_return_if_fail(status != NULL);
+		presence = purple_buddy_get_presence(buddy);
+		status   = purple_presence_get_status(presence, status_id);
 
-	old_status = purple_presence_get_active_status(presence);
+		if(NULL == status)
+			continue;
 
-	va_start(args, status_id);
-	purple_status_set_active_with_attrs(status, TRUE, args);
-	va_end(args);
+		old_status = purple_presence_get_active_status(presence);
 
-	list = purple_find_buddies(account, name);
-	g_slist_foreach(list, (GFunc)purple_blist_update_buddy_status, old_status);
+		va_start(args, status_id);
+		purple_status_set_active_with_attrs(status, TRUE, args);
+		va_end(args);
+
+		purple_blist_update_buddy_status(buddy, old_status);
+	}
+
 	g_slist_free(list);
 
+	/* we get to re-use the last status we found */
 	if (!purple_status_is_online(status))
 		serv_got_typing_stopped(purple_account_get_connection(account), name);
 }
@@ -165,6 +171,7 @@
 void purple_prpl_got_user_status_deactive(PurpleAccount *account, const char *name,
 					const char *status_id)
 {
+	GSList *list, *l;
 	PurpleBuddy *buddy;
 	PurplePresence *presence;
 	PurpleStatus *status;
@@ -174,14 +181,22 @@
 	g_return_if_fail(status_id != NULL);
 	g_return_if_fail(purple_account_is_connected(account) || purple_account_is_connecting(account));
 
-	if ((buddy = purple_find_buddy(account, name)) == NULL)
+	if((list = purple_find_buddies(account, name)) == NULL)
 		return;
 
-	presence = purple_buddy_get_presence(buddy);
-	status   = purple_presence_get_status(presence, status_id);
+	for(l = list; l != NULL; l = l->next) {
+		buddy = l->data;
+
+		presence = purple_buddy_get_presence(buddy);
+		status   = purple_presence_get_status(presence, status_id);
 
-	g_return_if_fail(status != NULL);
-	purple_status_set_active(status, FALSE);
+		if(NULL == status)
+			continue;
+
+		purple_status_set_active(status, FALSE);
+	}
+
+	g_slist_free(list);
 }
 
 static void
diff -r e42309469a4a -r 618a3748ff64 libpurple/purple-remote
--- a/libpurple/purple-remote	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/purple-remote	Mon May 21 20:58:23 2007 +0000
@@ -94,6 +94,8 @@
 def execute(uri):
     match = re.match(urlregexp, uri)
     protocol = match.group(2)
+    if protocol == "xmpp"
+        protocol = "jabber"
     if protocol == "aim" or protocol == "icq":
         protocol = "oscar"
     if protocol is not None:
diff -r e42309469a4a -r 618a3748ff64 libpurple/server.c
--- a/libpurple/server.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/server.c	Mon May 21 20:58:23 2007 +0000
@@ -576,15 +576,20 @@
 		purple_conv_im_set_typing_state(im, state);
 		purple_conv_im_update_typing(im);
 	} else {
-		if (state == PURPLE_TYPING)
+		switch (state)
 		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing", gc->account, name);
-		}
-		else
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typed", gc->account, name);
+			case PURPLE_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing", gc->account, name);
+				break;
+			case PURPLE_TYPED:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typed", gc->account, name);
+				break;
+			case PURPLE_NOT_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing-stopped", gc->account, name);
+				break;
 		}
 	}
 
diff -r e42309469a4a -r 618a3748ff64 libpurple/status.c
--- a/libpurple/status.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/status.c	Mon May 21 20:58:23 2007 +0000
@@ -134,8 +134,6 @@
 	10      /* Offline messageable      */
 };
 
-static GHashTable *buddy_presences = NULL;
-
 #define SCORE_IDLE      8
 #define SCORE_IDLE_TIME 9
 #define SCORE_OFFLINE_MESSAGE 10
@@ -1118,32 +1116,17 @@
 purple_presence_new_for_buddy(PurpleBuddy *buddy)
 {
 	PurplePresence *presence;
-	PurpleStatusBuddyKey *key;
 	PurpleAccount *account;
 
 	g_return_val_if_fail(buddy != NULL, NULL);
 	account = buddy->account;
 
-	key = g_new0(PurpleStatusBuddyKey, 1);
-	key->account = buddy->account;
-	key->name    = g_strdup(buddy->name);
-
-	presence = g_hash_table_lookup(buddy_presences, key);
-	if (presence == NULL)
-	{
-		presence = purple_presence_new(PURPLE_PRESENCE_CONTEXT_BUDDY);
+	presence = purple_presence_new(PURPLE_PRESENCE_CONTEXT_BUDDY);
 
-		presence->u.buddy.name    = g_strdup(buddy->name);
-		presence->u.buddy.account = buddy->account;
-		presence->statuses = purple_prpl_get_statuses(buddy->account, presence);
+	presence->u.buddy.name    = g_strdup(buddy->name);
+	presence->u.buddy.account = buddy->account;
+	presence->statuses = purple_prpl_get_statuses(buddy->account, presence);
 
-		g_hash_table_insert(buddy_presences, key, presence);
-	}
-	else
-	{
-		g_free(key->name);
-		g_free(key);
-	}
 	presence->u.buddy.buddy = buddy;
 
 	return presence;
@@ -1156,13 +1139,6 @@
 
 	if (purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_BUDDY)
 	{
-		PurpleStatusBuddyKey key;
-
-		key.account = presence->u.buddy.account;
-		key.name    = presence->u.buddy.name;
-
-		g_hash_table_remove(buddy_presences, &key);
-
 		g_free(presence->u.buddy.name);
 	}
 	else if (purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_CONV)
@@ -1639,41 +1615,6 @@
 	primitive_scores[index] = GPOINTER_TO_INT(value);
 }
 
-static guint
-purple_buddy_presences_hash(gconstpointer key)
-{
-	const PurpleStatusBuddyKey *me = key;
-	guint ret;
-	char *str;
-
-	str = g_strdup_printf("%p%s", me->account, me->name);
-	ret = g_str_hash(str);
-	g_free(str);
-
-	return ret;
-}
-
-static gboolean
-purple_buddy_presences_equal(gconstpointer a, gconstpointer b)
-{
-	PurpleStatusBuddyKey *key_a = (PurpleStatusBuddyKey *)a;
-	PurpleStatusBuddyKey *key_b = (PurpleStatusBuddyKey *)b;
-
-	if(key_a->account == key_b->account &&
-			!strcmp(key_a->name, key_b->name))
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static void
-purple_buddy_presences_key_free(gpointer a)
-{
-	PurpleStatusBuddyKey *key = (PurpleStatusBuddyKey *)a;
-	g_free(key->name);
-	g_free(key);
-}
-
 void *
 purple_status_get_handle(void) {
 	static int handle;
@@ -1725,19 +1666,9 @@
 	purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
 			score_pref_changed_cb,
 			GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
-
-	buddy_presences = g_hash_table_new_full(purple_buddy_presences_hash,
-											purple_buddy_presences_equal,
-											purple_buddy_presences_key_free, NULL);
 }
 
 void
 purple_status_uninit(void)
 {
-	if (buddy_presences != NULL)
-	{
-		g_hash_table_destroy(buddy_presences);
-
-		buddy_presences = NULL;
-	}
 }
diff -r e42309469a4a -r 618a3748ff64 libpurple/util.c
--- a/libpurple/util.c	Mon May 21 20:02:18 2007 +0000
+++ b/libpurple/util.c	Mon May 21 20:58:23 2007 +0000
@@ -1874,6 +1874,11 @@
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
 
+					if ((!g_ascii_strncasecmp(c, "http://", 7) && (t - c == 7)) ||
+						(!g_ascii_strncasecmp(c, "https://", 8) && (t - c == 8))) {
+						break;
+					}
+
 					if (*(t) == ',' && (*(t + 1) != ' ')) {
 						t++;
 						continue;
@@ -1933,6 +1938,12 @@
 			t = c;
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
+
+					if ((!g_ascii_strncasecmp(c, "ftp://", 6) && (t - c == 6)) ||
+						(!g_ascii_strncasecmp(c, "sftp://", 7) && (t - c == 7))) {
+						break;
+					}
+
 					if (*(t - 1) == '.')
 						t--;
 					if ((*(t - 1) == ')' && (inside_paren > 0))) {
@@ -1984,8 +1995,21 @@
 			t = c;
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
+					char *d;
+					if (t - c == 7) {
+						break;
+					}
 					if (*(t - 1) == '.')
 						t--;
+					if ((d = strstr(c + 7, "?")) != NULL && d < t)
+						url_buf = g_strndup(c + 7, d - c - 7);
+					else
+						url_buf = g_strndup(c + 7, t - c - 7);
+					if (!purple_email_is_valid(url_buf)) {
+						g_free(url_buf);
+						break;
+					}
+					g_free(url_buf);
 					url_buf = g_strndup(c, t - c);
 					tmpurlbuf = purple_unescape_html(url_buf);
 					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
@@ -2000,6 +2024,39 @@
 				t++;
 
 			}
+		} else if ((*c=='x') && (!g_ascii_strncasecmp(c, "xmpp:", 5)) &&
+				   (c == text || badchar(c[-1]) || badentity(c-1))) {
+			t = c;
+			while (1) {
+				if (badchar(*t) || badentity(t)) {
+
+					if (t - c == 5) {
+						break;
+					}
+
+					if (*(t) == ',' && (*(t + 1) != ' ')) {
+						t++;
+						continue;
+					}
+
+					if (*(t - 1) == '.')
+						t--;
+					if ((*(t - 1) == ')' && (inside_paren > 0))) {
+						t--;
+					}
+
+					url_buf = g_strndup(c, t - c);
+					tmpurlbuf = purple_unescape_html(url_buf);
+					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
+							tmpurlbuf, url_buf);
+					g_free(url_buf);
+					g_free(tmpurlbuf);
+					c = t;
+					break;
+				}
+				t++;
+
+			}
 		} else if (c != text && (*c == '@')) {
 			int flag;
 			GString *gurl_buf = NULL;
@@ -3285,6 +3342,9 @@
 		gfud->inpa = 0;
 		close(gfud->fd);
 		gfud->fd = -1;
+		gfud->request_written = 0;
+		gfud->len = 0;
+		gfud->data_len = 0;
 
 		g_free(gfud->website.user);
 		g_free(gfud->website.passwd);
@@ -3497,7 +3557,7 @@
 	}
 	gfud->request_written += len;
 
-	if (gfud->request_written != total_len)
+	if (gfud->request_written < total_len)
 		return;
 
 	/* We're done writing our request, now start reading the response */
@@ -4152,7 +4212,7 @@
 		gunichar c = g_utf8_get_char(iter);
 		/* If the character is an ASCII character and is alphanumeric,
 		 * or one of the specified values, no need to escape */
-		if (c < 128 && (isalnum(c) || c == '@' || c == '-' ||
+		if (c < 128 && (g_ascii_isalnum(c) || c == '@' || c == '-' ||
 				c == '_' || c == '.' || c == '#')) {
 			buf[j++] = c;
 		} else {
diff -r e42309469a4a -r 618a3748ff64 pidgin.spec.in
--- a/pidgin.spec.in	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin.spec.in	Mon May 21 20:58:23 2007 +0000
@@ -70,6 +70,10 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 Obsoletes: gaim
 Provides: gaim
 
@@ -296,7 +300,7 @@
     if [ -f %{_sysconfdir}/gconf/schemas/purple.schemas ]; then
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
-        killall -HUP gconfd-2 || :
+        killall -HUP gconfd-2 &> /dev/null || :
     fi
 fi
 
@@ -305,7 +309,7 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-install-rule \
         %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -319,7 +323,7 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 
 %postun
@@ -443,6 +447,10 @@
 %endif
 
 %changelog
+* Thu May 10 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Add scriptlet Requires for GConf2 to fix schema installation
+- Silence harmless errors when gconfd-2 is not running at install time
+
 * Thu May 3 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Add missing BuildRequires: startup-notification-devel, if you really
   need to build on a distro without it use --without startupnotification
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkaccount.c	Mon May 21 20:58:23 2007 +0000
@@ -385,12 +385,20 @@
 add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 {
 	GtkWidget *frame;
+	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *entry;
 	GList *user_splits;
 	GList *l, *l2;
 	char *username = NULL;
 
+	if (dialog->protocol_menu != NULL)
+	{
+		gtk_widget_ref(dialog->protocol_menu);
+		hbox = g_object_get_data(G_OBJECT(dialog->protocol_menu), "container");
+		gtk_container_remove(GTK_CONTAINER(hbox), dialog->protocol_menu);
+	}
+
 	if (dialog->login_frame != NULL)
 		gtk_widget_destroy(dialog->login_frame);
 
@@ -409,10 +417,17 @@
 	gtk_widget_show(vbox);
 
 	/* Protocol */
-	dialog->protocol_menu = pidgin_protocol_option_menu_new(
-			dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
-
-	add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
+	if (dialog->protocol_menu == NULL)
+	{
+		dialog->protocol_menu = pidgin_protocol_option_menu_new(
+				dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
+		gtk_widget_ref(dialog->protocol_menu);
+	}
+
+	hbox = add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
+	g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox);
+
+	gtk_widget_unref(dialog->protocol_menu);
 
 	/* Screen name */
 	dialog->screenname_entry = gtk_entry_new();
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkblist.c	Mon May 21 20:58:23 2007 +0000
@@ -274,6 +274,11 @@
 
 static void gtk_blist_menu_info_cb(GtkWidget *w, PurpleBuddy *b)
 {
+	PurpleNotifyUserInfo *info = purple_notify_user_info_new();
+	purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+	purple_notify_userinfo(b->account->gc, purple_buddy_get_name(b), info, NULL, NULL);
+	purple_notify_user_info_destroy(info);
+
 	serv_get_info(b->account->gc, b->name);
 }
 
@@ -322,7 +327,6 @@
 	GValue val;
 	PurpleBlistNode *node;
 	const char *text = NULL;
-	char *esc;
 
 	path = gtk_tree_path_new_from_string (path_str);
 	gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
@@ -345,12 +349,10 @@
 		g_return_if_reached();
 	}
 
-	esc = g_markup_escape_text(text, -1);
 	if (GTK_IS_ENTRY (editable)) {
 		GtkEntry *entry = GTK_ENTRY (editable);
-		gtk_entry_set_text(entry, esc);
-	}
-	g_free(esc);
+		gtk_entry_set_text(entry, text);
+	}
 }
 
 static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,
@@ -780,7 +782,8 @@
 	gtk_widget_show_all(data->window);
 }
 
-static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
+static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
+{
 	PurpleBlistNode *node;
 	GValue val;
 
@@ -804,7 +807,8 @@
 	}
 }
 
-static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
+static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
+{
 	PurpleBlistNode *node;
 	GValue val;
 
@@ -815,6 +819,8 @@
 
 	if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
 		char *title;
+		struct _pidgin_blist_node *gtknode;
+		PurpleBlistNode *cnode;
 
 		title = pidgin_get_group_title(node, FALSE);
 
@@ -825,6 +831,17 @@
 		g_free(title);
 
 		purple_blist_node_set_bool(node, "collapsed", TRUE);
+
+		for(cnode = node->child; cnode; cnode = cnode->next) {
+			if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
+				gtknode = cnode->ui_data;
+				if (!gtknode->contact_expanded)
+					continue;
+				gtknode->contact_expanded = FALSE;
+				pidgin_blist_update_contact(NULL, cnode);
+			}
+		}
+
 	} else if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		pidgin_blist_collapse_contact_cb(NULL, node);
 	}
@@ -2086,28 +2103,28 @@
 
 	if (width < 6 || height < 6)
 		return;
-	
+
 	/* Top left */
 	pixels[3] = 0;
 	pixels[7] = 0x80;
 	pixels[11] = 0xC0;
 	pixels[rowstride + 3] = 0x80;
 	pixels[rowstride * 2 + 3] = 0xC0;
-	
+
 	/* Top right */
 	pixels[width * 4 - 1] = 0;
 	pixels[width * 4 - 5] = 0x80;
 	pixels[width * 4 - 9] = 0xC0;
 	pixels[rowstride + (width * 4) - 1] = 0x80;
 	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-	
+
 	/* Bottom left */
 	pixels[(height - 1) * rowstride + 3] = 0;
 	pixels[(height - 1) * rowstride + 7] = 0x80;
 	pixels[(height - 1) * rowstride + 11] = 0xC0;
 	pixels[(height - 2) * rowstride + 3] = 0x80;
 	pixels[(height - 3) * rowstride + 3] = 0xC0;
-	
+
 	/* Bottom right */
 	pixels[height * rowstride - 1] = 0;
 	pixels[(height - 1) * rowstride - 1] = 0x80;
@@ -3147,7 +3164,8 @@
 	if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		if(!gtknode->contact_expanded) {
 			buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
-			gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data;
+			if (buddy != NULL)
+				gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data;
 		}
 	} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		buddy = (PurpleBuddy*)node;
@@ -3951,6 +3969,9 @@
 	g_free(primary);
 	gtk_widget_destroy(GTK_WIDGET(widget));
 	g_hash_table_remove(gtkblist->connection_errors, account);
+	if (gtk_container_get_children(GTK_CONTAINER(gtkblist->error_buttons)) == NULL) {
+		gtk_widget_hide(gtkblist->error_buttons);
+	}
 }
 
 /* Add some buttons that show connection errors */
@@ -3971,7 +3992,7 @@
 	                       escaped);
 	g_free(escaped);
 
-	hbox = gtk_hbox_new(FALSE, 0);
+	hbox = gtk_hbox_new(FALSE, 6);
 
 	/* Create the icon */
 	if ((status_type = purple_account_get_status_type_with_primitive(account,
@@ -3981,8 +4002,7 @@
 			image = gtk_image_new_from_pixbuf(pixbuf);
 			g_object_unref(pixbuf);
 
-			gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE,
-			                   PIDGIN_HIG_BOX_SPACE);
+			gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
 		}
 	}
 
@@ -3993,8 +4013,7 @@
 #if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE,
-	                   PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 
 	/* Create the actual button and put the icon and text on it */
 	button = gtk_button_new();
@@ -4005,6 +4024,7 @@
 	gtk_widget_show_all(button);
 	gtk_box_pack_end(GTK_BOX(gtkblist->error_buttons), button,
 	                 FALSE, FALSE, 0);
+	gtk_widget_show_all(gtkblist->error_buttons);
 }
 
 void
@@ -4470,7 +4490,8 @@
 	/* Create an empty vbox used for showing connection errors */
 	gtkblist->error_buttons = gtk_vbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->error_buttons, FALSE, FALSE, 0);
-
+        gtk_container_set_border_width(GTK_CONTAINER(gtkblist->error_buttons), 3);
+	
 	/* Add the statusbox */
 	gtkblist->statusbox = pidgin_status_box_new();
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
@@ -4567,6 +4588,7 @@
 						gtkblist);
 
 	gtk_widget_hide(gtkblist->headline_hbox);
+	gtk_widget_hide(gtkblist->error_buttons);
 
 	/* emit our created signal */
 	purple_signal_emit(handle, "gtkblist-created", list);
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkconv.c	Mon May 21 20:58:23 2007 +0000
@@ -176,6 +176,7 @@
 static gboolean color_is_visible(GdkColor foreground, GdkColor background, int color_contrast, int brightness_contrast);
 static void pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields);
 static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win);
+static void pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv);
 
 static GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name) {
 	static GdkColor col;
@@ -672,6 +673,11 @@
 	PurpleConversation *conv = gtkconv->active_conv;
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		PurpleNotifyUserInfo *info = purple_notify_user_info_new();
+		purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+		purple_notify_userinfo(conv->account->gc, purple_conversation_get_name(conv), info, NULL, NULL);
+		purple_notify_user_info_destroy(info);
+
 		serv_get_info(purple_conversation_get_gc(conv),
 					  purple_conversation_get_name(conv));
 
@@ -1006,12 +1012,24 @@
 {
 	PidginWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+	PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name);
+	const char *name;
 	gchar *buf;
-
-	buf = g_strdup_printf("%s.html", purple_normalize(conv->account, conv->name));
-
+	gchar *c;
+
+	if (buddy != NULL)
+		name = purple_buddy_get_contact_alias(buddy);
+	else
+		name = purple_normalize(conv->account, conv->name);
+
+	buf = g_strdup_printf("%s.html", name);
+	for (c = buf ; *c ; c++)
+	{
+		if (*c == '/' || *c == '\\')
+			*c = ' ';
+	}
 	purple_request_file(PIDGIN_CONVERSATION(conv), _("Save Conversation"),
-					  purple_escape_filename(buf),
+					  buf,
 					  TRUE, G_CALLBACK(savelog_writefile_cb), NULL,
 					  NULL, NULL, conv,
 					  conv);
@@ -1749,7 +1767,8 @@
 static void
 move_to_next_unread_tab(PidginConversation *gtkconv, gboolean forward)
 {
-	PidginConversation *next_gtkconv = NULL;
+	PidginConversation *next_gtkconv = NULL, *most_active = NULL;
+	PidginUnseenState unseen_state = PIDGIN_UNSEEN_NONE;
 	PidginWindow *win;
 	int initial, i, total, diff;
 
@@ -1765,17 +1784,21 @@
 
 	for (i = (initial + diff) % total; i != initial; i = (i + diff) % total) {
 		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
-		if (next_gtkconv->unseen_state > 0)
-			break;
-	}
-
-	if (i == initial) { /* no new messages */
+		if (next_gtkconv->unseen_state > unseen_state) {
+			most_active = next_gtkconv;
+			unseen_state = most_active->unseen_state;
+			if(PIDGIN_UNSEEN_NICK == unseen_state) /* highest possible state */
+				break;
+		}
+	}
+
+	if (most_active == NULL) { /* no new messages */
 		i = (i + diff) % total;
-		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
-	}
-
-	if (next_gtkconv != NULL && next_gtkconv != gtkconv)
-		pidgin_conv_window_switch_gtkconv(win, next_gtkconv);
+		most_active = pidgin_conv_window_get_gtkconv_at_index(win, i);
+	}
+
+	if (most_active != NULL && most_active != gtkconv)
+		pidgin_conv_window_switch_gtkconv(win, most_active);
 }
 
 static gboolean
@@ -3111,7 +3134,7 @@
 	}
 	if (gtkwin->menu.typing_icon == NULL) {
 		 gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
- 		 pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
+		 pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
                                                                   gtkwin->menu.typing_icon,
                                                                   _("User is typing..."));
 	} else {
@@ -3143,8 +3166,10 @@
 		return;
 
 	if (purple_conv_im_get_typing_state(im) == PURPLE_NOT_TYPING) {
-		if (gtkconv->u.im->typing_timer != 0)
+		if (gtkconv->u.im->typing_timer != 0) {
 			g_source_remove(gtkconv->u.im->typing_timer);
+			gtkconv->u.im->typing_timer = 0;
+		}
 		return;
 	}
 
@@ -3969,6 +3994,12 @@
 	}
 	else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
 		update_chat_alias((PurpleBuddy *)node, conv, gc, prpl_info);
+	else if (PURPLE_BLIST_NODE_IS_CHAT(node) &&
+			purple_conversation_get_account(conv) == ((PurpleChat*)node)->account)
+	{
+		if (old_alias == NULL || g_utf8_collate(old_alias, purple_conversation_get_title(conv)) == 0)
+			pidgin_conv_update_fields(conv, PIDGIN_CONV_SET_TITLE);
+	}
 }
 
 static void
@@ -4120,6 +4151,7 @@
 	GtkTreeViewColumn *col;
 	void *blist_handle = purple_blist_get_handle();
 	GList *focus_chain = NULL;
+	int ul_width;
 
 	gtkchat = gtkconv->u.chat;
 	gc      = purple_conversation_get_gc(conv);
@@ -4220,8 +4252,13 @@
 												   "pixbuf", CHAT_USERS_ICON_COLUMN, NULL);
 	gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
-	gtk_widget_set_size_request(lbox,
-	                            purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width"), -1);
+	ul_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width");
+	gtk_widget_set_size_request(lbox, ul_width, -1);
+
+	/* Hack to prevent completely collapsed userlist coming back with a 1 pixel width.
+	 * I would have liked to use the GtkPaned "max-position", but for some reason that didn't work */
+	if (ul_width == 0)
+		gtk_paned_set_position(GTK_PANED(hpaned), 999999);
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
@@ -4577,6 +4614,18 @@
 	}
 }
 
+static gboolean
+ignore_middle_click(GtkWidget *widget, GdkEventButton *e, gpointer null)
+{
+	/* A click on the pane is propagated to the notebook containing the pane.
+	 * So if Stu accidentally aims high and middle clicks on the pane-handle,
+	 * it causes a conversation tab to close. Let's stop that from happening.
+	 */
+	if (e->button == 2 && e->type == GDK_BUTTON_PRESS)
+		return TRUE;
+	return FALSE;
+}
+
 /**************************************************************************
  * Conversation UI operations
  **************************************************************************/
@@ -4650,6 +4699,8 @@
 	                  te, sizeof(te) / sizeof(GtkTargetEntry),
 	                  GDK_ACTION_COPY);
 
+	g_signal_connect(G_OBJECT(pane), "button_press_event",
+	                 G_CALLBACK(ignore_middle_click), NULL);
 	g_signal_connect(G_OBJECT(pane), "drag_data_received",
 	                 G_CALLBACK(conv_dnd_recv), gtkconv);
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "drag_data_received",
@@ -4978,6 +5029,8 @@
 	char *bracket;
 	int tag_count = 0;
 	gboolean is_rtl_message = FALSE;
+	GtkSmileyTree *tree = NULL;
+	GHashTable *smiley_data = NULL;
 
 	g_return_if_fail(conv != NULL);
 	gtkconv = PIDGIN_CONVERSATION(conv);
@@ -5121,6 +5174,17 @@
 		gtk_font_options |= GTK_IMHTML_USE_POINTSIZE;
 	}
 
+	if (!(flags & PURPLE_MESSAGE_RECV))
+	{
+		/* Temporarily revert to the original smiley-data to avoid showing up
+		 * custom smileys of the buddy when sending message
+		 */
+		tree = GTK_IMHTML(gtkconv->imhtml)->default_smilies;
+		GTK_IMHTML(gtkconv->imhtml)->default_smilies =
+								GTK_IMHTML(gtkconv->entry)->default_smilies;
+		smiley_data = GTK_IMHTML(gtkconv->imhtml)->smiley_data;
+		GTK_IMHTML(gtkconv->imhtml)->smiley_data = GTK_IMHTML(gtkconv->entry)->smiley_data;
+	}
 
 	/* TODO: These colors should not be hardcoded so log.c can use them */
 	if (flags & PURPLE_MESSAGE_RAW) {
@@ -5152,25 +5216,11 @@
 		 * escaped entities making the string longer */
 		int tag_start_offset = alias ? (strlen(alias_escaped) - strlen(alias)) : 0;
 		int tag_end_offset = 0;
-		GtkSmileyTree *tree = NULL;
-		GHashTable *smiley_data = NULL;
 
 		/* Enforce direction on alias */
 		if (is_rtl_message)
 			str_embed_direction_chars(&alias_escaped);
 
-		if (flags & PURPLE_MESSAGE_SEND)
-		{
-			/* Temporarily revert to the original smiley-data to avoid showing up
-			 * custom smileys of the buddy when sending message
-			 */
-			tree = GTK_IMHTML(gtkconv->imhtml)->default_smilies;
-			GTK_IMHTML(gtkconv->imhtml)->default_smilies =
-									GTK_IMHTML(gtkconv->entry)->default_smilies;
-			smiley_data = GTK_IMHTML(gtkconv->imhtml)->smiley_data;
-			GTK_IMHTML(gtkconv->imhtml)->smiley_data = GTK_IMHTML(gtkconv->entry)->smiley_data;
-		}
-
 		if (flags & PURPLE_MESSAGE_WHISPER) {
 			str = g_malloc(1024);
 
@@ -5312,13 +5362,6 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml),
 							 with_font_tag, gtk_font_options | gtk_font_options_all);
 
-		if (flags & PURPLE_MESSAGE_SEND)
-		{
-			/* Restore the smiley-data */
-			GTK_IMHTML(gtkconv->imhtml)->default_smilies = tree;
-			GTK_IMHTML(gtkconv->imhtml)->smiley_data = smiley_data;
-		}
-
 		g_free(with_font_tag);
 		g_free(new_message);
 	}
@@ -5344,6 +5387,13 @@
 		gtkconv_set_unseen(gtkconv, unseen);
 	}
 
+	if (!(flags & PURPLE_MESSAGE_RECV))
+	{
+		/* Restore the smiley-data */
+		GTK_IMHTML(gtkconv->imhtml)->default_smilies = tree;
+		GTK_IMHTML(gtkconv->imhtml)->smiley_data = smiley_data;
+	}
+
 	purple_signal_emit(pidgin_conversations_get_handle(),
 		(type == PURPLE_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"),
 		account, name, displaying, conv, flags);
@@ -5544,9 +5594,9 @@
 
 	flags = purple_conv_chat_user_get_flags(chat, user);
 
-	cbuddy = purple_conv_chat_cb_new(user, alias, flags);
-
-	add_chat_buddy_common(conv, cbuddy, NULL);
+	cbuddy = purple_conv_chat_cb_find(chat, user);
+	if (cbuddy)
+		add_chat_buddy_common(conv, cbuddy, NULL);
 	g_free(alias);
 }
 
@@ -5607,15 +5657,25 @@
 				icon, smiley->icon, smiley->smile);
 #endif
 		if (icon) {
+			GList *wids;
 			gtk_widget_show(icon);
 
 			anchor = GTK_TEXT_CHILD_ANCHOR(current->data);
+			wids = gtk_text_child_anchor_get_widgets(anchor);
 
 			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", purple_unescape_html(smiley->smile), g_free);
 			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley->smile), g_free);
 
-			if (smiley->imhtml)
-				gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(smiley->imhtml), icon, anchor);
+			if (smiley->imhtml) {
+				if (wids) {
+					GList *children = gtk_container_get_children(GTK_CONTAINER(wids->data));
+					g_list_foreach(children, (GFunc)gtk_widget_destroy, NULL);
+					g_list_free(children);
+					gtk_container_add(GTK_CONTAINER(wids->data), icon);
+				} else
+					gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(smiley->imhtml), icon, anchor);
+			}
+			g_list_free(wids);
 		}
 
 	}
@@ -6490,16 +6550,18 @@
 tab_side_pref_cb(const char *name, PurplePrefType type,
 				 gconstpointer value, gpointer data)
 {
-	GList *l;
+	GList *gtkwins, *gtkconvs;
 	GtkPositionType pos;
-	PidginWindow *win;
+	PidginWindow *gtkwin;
 
 	pos = GPOINTER_TO_INT(value);
 
-	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
-		win = l->data;
-
-		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(win->notebook), pos&~8);
+	for (gtkwins = pidgin_conv_windows_get_list(); gtkwins != NULL; gtkwins = gtkwins->next) {
+		gtkwin = gtkwins->data;
+		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(gtkwin->notebook), pos&~8);
+		for (gtkconvs = gtkwin->gtkconvs; gtkconvs != NULL; gtkconvs = gtkconvs->next) {
+			pidgin_conv_tab_pack(gtkwin, gtkconvs->data);
+		}
 	}
 }
 
@@ -7363,8 +7425,7 @@
 		PidginWindow *dest_win;
 		GtkNotebook *dest_notebook;
 		GtkWidget *tab;
-		gint nb_x, nb_y, page_num;
-		gint arrow1_x, arrow1_y, arrow2_x, arrow2_y;
+		gint page_num;
 		gboolean horiz_tabs = FALSE;
 		PidginConversation *gtkconv;
 		gboolean to_right = FALSE;
@@ -7380,52 +7441,35 @@
 
 		dest_notebook = GTK_NOTEBOOK(dest_win->notebook);
 
-		gdk_window_get_origin(GTK_WIDGET(dest_notebook)->window, &nb_x, &nb_y);
-
-		arrow1_x = arrow2_x = nb_x;
-		arrow1_y = arrow2_y = nb_y;
-
 		page_num = pidgin_conv_get_tab_at_xy(dest_win,
 		                                      e->x_root, e->y_root, &to_right);
 		to_right = to_right && (win != dest_win);
 
 		if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP ||
-		    gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_BOTTOM) {
-
-			    horiz_tabs = TRUE;
-		    }
+				gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_BOTTOM) {
+			horiz_tabs = TRUE;
+		}
 
 		gtkconv = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num);
 		tab = gtkconv->tabby;
 
 		if (horiz_tabs) {
-			arrow1_x = arrow2_x = nb_x + tab->allocation.x;
-
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				arrow1_x += tab->allocation.width;
-				arrow2_x += tab->allocation.width;
+				dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+			} else {
+				dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
 			}
-
-			arrow1_y = nb_y + tab->allocation.y;
-			arrow2_y = nb_y + tab->allocation.y + tab->allocation.height;
 		} else {
-			arrow1_x = nb_x + tab->allocation.x;
-			arrow2_x = nb_x + tab->allocation.x + tab->allocation.width;
-			arrow1_y = arrow2_y = nb_y + tab->allocation.y;
-
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				arrow1_y += tab->allocation.height;
-				arrow2_y += tab->allocation.height;
+				dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
+				dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+			} else {
+				dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
 			}
 		}
-
-		if (horiz_tabs) {
-			dnd_hints_show(HINT_ARROW_DOWN, arrow1_x, arrow1_y);
-			dnd_hints_show(HINT_ARROW_UP,   arrow2_x, arrow2_y);
-		} else {
-			dnd_hints_show(HINT_ARROW_RIGHT, arrow1_x, arrow1_y);
-			dnd_hints_show(HINT_ARROW_LEFT,  arrow2_x, arrow2_y);
-		}
 	}
 
 	return TRUE;
@@ -7790,6 +7834,105 @@
 }
 
 static void
+remove_edit_entry(PidginConversation *gtkconv, GtkWidget *entry)
+{
+	g_signal_handlers_disconnect_matched(G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
+				0, 0, NULL, NULL, gtkconv);
+	gtk_widget_show(gtkconv->tab_label);
+	gtk_widget_grab_focus(gtkconv->entry);
+	gtk_widget_destroy(entry);
+}
+
+static gboolean
+alias_focus_cb(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
+{
+	remove_edit_entry(user_data, widget);
+	return FALSE;
+}
+
+static gboolean
+alias_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+	if (event->keyval == GDK_Escape) {
+		remove_edit_entry(user_data, widget);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+alias_cb(GtkEntry *entry, gpointer user_data)
+{
+	PidginConversation *gtkconv;
+	PurpleConversation *conv;
+	PurpleAccount *account;
+	const char *name;
+
+	gtkconv = (PidginConversation *)user_data;
+	if (gtkconv == NULL) {
+		return;
+	}
+	conv    = gtkconv->active_conv;
+	account = purple_conversation_get_account(conv);
+	name    = purple_conversation_get_name(conv);
+
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		PurpleBuddy *buddy;
+		buddy = purple_find_buddy(account, name);
+		if (buddy != NULL) {
+			purple_blist_alias_buddy(buddy,
+                                                 gtk_entry_get_text(entry));
+		}
+		serv_alias_buddy(buddy);
+	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {	        
+		PurpleChat *chat;
+
+		chat = purple_blist_find_chat(account, name);
+		if (chat != NULL) {
+			purple_blist_alias_chat(chat,
+			                        gtk_entry_get_text(entry));
+		}
+	}
+	remove_edit_entry(user_data, GTK_WIDGET(entry));
+}
+
+static gboolean
+alias_double_click_cb(GtkNotebook *notebook, GdkEventButton *event, PidginConversation *gtkconv)
+{
+	GtkWidget *entry = NULL;
+
+	if (event->button != 1 || event->type != GDK_2BUTTON_PRESS) {
+		return FALSE;
+	}
+
+	if (!GTK_WIDGET_VISIBLE(gtkconv->tab_label)) {
+		/* There's already an entry for alias. Let's not create another one. */
+		return FALSE;
+	}
+
+	/* alias label */
+	entry = gtk_entry_new();
+	gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE);
+	gtk_entry_set_width_chars(GTK_ENTRY(entry), 10);
+	gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5);
+
+	gtk_box_pack_start(GTK_BOX(gtkconv->tabby), entry, TRUE, TRUE, 0);
+	/* after the tab label */
+	gtk_box_reorder_child(GTK_BOX(gtkconv->tabby), entry, 2);
+
+	g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(alias_cb), gtkconv);
+	g_signal_connect(G_OBJECT(entry), "focus-out-event", G_CALLBACK(alias_focus_cb), gtkconv);
+	g_signal_connect(G_OBJECT(entry), "key-press-event", G_CALLBACK(alias_key_press_cb), gtkconv);
+	gtk_entry_set_text(GTK_ENTRY(entry),
+			gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
+	gtk_widget_show(entry);
+	gtk_widget_hide(gtkconv->tab_label);
+	gtk_widget_grab_focus(entry);
+
+	return FALSE;
+}
+
+static void
 switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                gpointer user_data)
 {
@@ -8034,35 +8177,17 @@
 {
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginConversation *focus_gtkconv;
-	GtkWidget *tabby, *menu_tabby;
 	GtkWidget *tab_cont = gtkconv->tab_cont;
 	GtkWidget *close_image;
 	PurpleConversationType conv_type;
 	const gchar *tmp_lab;
 	gint close_button_width, close_button_height, focus_width, focus_pad;
-	gboolean tabs_side = FALSE;
-	gint angle = 0;
 
 	conv_type = purple_conversation_get_type(conv);
 
-
 	win->gtkconvs = g_list_append(win->gtkconvs, gtkconv);
 	gtkconv->win = win;
 
-	if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
-	    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT)
-		tabs_side = TRUE;
-	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_LEFT|8))
-		angle = 90;
-	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8))
-		angle = 270;
-
-	if (angle)
-		gtkconv->tabby = tabby = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	else
-		gtkconv->tabby = tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
 	/* Close button. */
 	gtkconv->close = gtk_button_new();
 	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &close_button_width, &close_button_height);
@@ -8106,56 +8231,25 @@
 	/* Tab label. */
 	gtkconv->tab_label = gtk_label_new(tmp_lab = purple_conversation_get_title(conv));
 
-#if GTK_CHECK_VERSION(2,6,0)
-	if (!angle)
-		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-	gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6);
-	if (tabs_side) {
-		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), MIN(g_utf8_strlen(tmp_lab, -1), 12));
-	}
-	if (angle)
-		gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
-#endif
-	gtkconv->menu_label = gtk_label_new(purple_conversation_get_title(conv));
-#if 0
-	gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5);
-	gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0);
-#endif
-
-	/* Pack it all together. */
-	if (angle == 90)
-		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0);
-	else
-		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->icon, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(menu_tabby), gtkconv->menu_icon,
-	                   FALSE, FALSE, 0);
-
-	gtk_widget_show_all(gtkconv->icon);
+	gtkconv->menu_tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtkconv->menu_label = gtk_label_new(purple_conversation_get_title(gtkconv->active_conv));
+	gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_icon, FALSE, FALSE, 0);
+
 	gtk_widget_show_all(gtkconv->menu_icon);
 
-	gtk_box_pack_start(GTK_BOX(tabby), gtkconv->tab_label, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0);
-	gtk_widget_show(gtkconv->tab_label);
+	gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0);
 	gtk_widget_show(gtkconv->menu_label);
 	gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0);
 
-	if (angle == 90)
-		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->icon, FALSE, FALSE, 0);
-	else
-		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0);
-	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
-		gtk_widget_show(gtkconv->close);
-
-	gtk_widget_show(tabby);
-	gtk_widget_show(menu_tabby);
+	gtk_widget_show(gtkconv->menu_tabby);
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 		pidgin_conv_update_buddy_icon(conv);
 
-	/* Add this pane to the conversation's notebook. */
-	gtk_notebook_append_page_menu(GTK_NOTEBOOK(win->notebook), tab_cont, tabby, menu_tabby);
-	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), tab_cont, !tabs_side && !angle, TRUE, GTK_PACK_START);
-
+	/* Build and set conversations tab */
+	pidgin_conv_tab_pack(win, gtkconv);
+
+	gtk_notebook_set_menu_label(GTK_NOTEBOOK(win->notebook), tab_cont, gtkconv->menu_tabby);
 
 	gtk_widget_show(tab_cont);
 
@@ -8176,6 +8270,94 @@
 		update_send_to_selection(win);
 }
 
+static void
+pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv)
+{
+	gboolean tabs_side = FALSE;
+	gint angle = 0;
+	GtkWidget *first, *third, *ebox;
+
+	if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
+	    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT)
+		tabs_side = TRUE;
+	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_LEFT|8))
+		angle = 90;
+	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8))
+		angle = 270;
+
+#if GTK_CHECK_VERSION(2,6,0)
+	if (!angle)
+		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END,  NULL);
+	else
+		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_NONE, NULL);
+	gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6);
+	if (tabs_side) {
+		gtk_label_set_width_chars(
+			GTK_LABEL(gtkconv->tab_label),
+			MIN(g_utf8_strlen(gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)), -1), 12)
+		);
+	}
+	if (angle)
+		gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
+#endif
+
+#if 0
+	gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5);
+	gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0);
+#endif
+
+	if (angle)
+		gtkconv->tabby = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	else
+		gtkconv->tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+	/* select the correct ordering for verticle tabs */
+	if (angle == 90) {
+		first = gtkconv->close;
+		third = gtkconv->icon;
+	} else {
+		first = gtkconv->icon;
+		third = gtkconv->close;
+	}
+
+	ebox = gtk_event_box_new();
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+	gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby);
+	g_signal_connect(G_OBJECT(ebox), "button-press-event",
+					G_CALLBACK(alias_double_click_cb), gtkconv);
+
+	if (gtkconv->tab_label->parent == NULL) {
+		/* Pack if it's a new widget */
+		gtk_box_pack_start(GTK_BOX(gtkconv->tabby), first,              FALSE, FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(gtkconv->tabby), gtkconv->tab_label, TRUE,  TRUE,  0);
+		gtk_box_pack_start(GTK_BOX(gtkconv->tabby), third,              FALSE, FALSE, 0);
+
+		/* Add this pane to the conversation's notebook. */
+		gtk_notebook_append_page(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox);
+	} else {
+		/* reparent old widgets on preference changes */
+		gtk_widget_reparent(first,              gtkconv->tabby);
+		gtk_widget_reparent(gtkconv->tab_label, gtkconv->tabby);
+		gtk_widget_reparent(third,              gtkconv->tabby);
+		gtk_box_set_child_packing(GTK_BOX(gtkconv->tabby), first,              FALSE, FALSE, 0, GTK_PACK_START);
+		gtk_box_set_child_packing(GTK_BOX(gtkconv->tabby), gtkconv->tab_label, TRUE,  TRUE,  0, GTK_PACK_START);
+		gtk_box_set_child_packing(GTK_BOX(gtkconv->tabby), third,              FALSE, FALSE, 0, GTK_PACK_START);
+
+		/* Reset the tabs label to the new version */
+		gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox);
+	}
+
+	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, !tabs_side && !angle, TRUE, GTK_PACK_START);
+
+	/* show the widgets */
+	gtk_widget_show(gtkconv->icon);
+	gtk_widget_show(gtkconv->tab_label);
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
+		gtk_widget_show(gtkconv->close);
+	gtk_widget_show(gtkconv->tabby);
+	gtk_widget_show(ebox);
+}
+
 void
 pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdebug.c	Mon May 21 20:58:23 2007 +0000
@@ -49,7 +49,6 @@
 
 	GtkListStore *store;
 
-	gboolean timestamps;
 	gboolean paused;
 
 #ifdef HAVE_REGEX_H
@@ -261,21 +260,6 @@
 #endif /* HAVE_REGEX_H */
 }
 
-static void
-timestamps_cb(GtkWidget *w, DebugWindow *win)
-{
-	win->timestamps = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
-
-	purple_prefs_set_bool("/purple/debug/timestamps", win->timestamps);
-}
-
-static void
-timestamps_pref_cb(const char *name, PurplePrefType type,
-				   gconstpointer value, gpointer data)
-{
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data), GPOINTER_TO_INT(value));
-}
-
 /******************************************************************************
  * regex stuff
  *****************************************************************************/
@@ -691,7 +675,6 @@
 	GtkWidget *vbox;
 	GtkWidget *toolbar;
 	GtkWidget *frame;
-	GtkWidget *button;
 	GtkWidget *image;
 	gint width, height;
 	void *handle;
@@ -779,20 +762,6 @@
 		                                    NULL, image,
 		                                    G_CALLBACK(pause_cb), win);
 
-		/* Timestamps */
-		button = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-		                                    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-		                                    NULL, _("Timestamps"),
-		                                    _("Timestamps"), NULL, NULL,
-		                                    G_CALLBACK(timestamps_cb),
-		                                    win);
-
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
-		                             purple_prefs_get_bool("/purple/debug/timestamps"));
-
-		purple_prefs_connect_callback(handle, "/purple/debug/timestamps",
-		                            timestamps_pref_cb, button);
-
 #ifdef HAVE_REGEX_H
 		/* regex stuff */
 		gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1);
@@ -1044,9 +1013,10 @@
 #ifdef HAVE_REGEX_H
 	GtkTreeIter iter;
 #endif /* HAVE_REGEX_H */
-	gboolean timestamps;
 	gchar *ts_s;
 	gchar *esc_s, *cat_s, *tmp, *s;
+	const char *mdate;
+	time_t mtime;
 
 	if (debug_win == NULL ||
 		!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"))
@@ -1054,22 +1024,9 @@
 		return;
 	}
 
-	timestamps = purple_prefs_get_bool("/purple/debug/timestamps");
-
-	/*
-	 * For some reason we only print the timestamp if category is
-	 * not NULL.  Why the hell do we do that?  --Mark
-	 */
-	if ((category != NULL) && (timestamps)) {
-		const char *mdate;
-
-		time_t mtime = time(NULL);
-		mdate = purple_utf8_strftime("%H:%M:%S", localtime(&mtime));
-		ts_s = g_strdup_printf("(%s) ", mdate);
-	} else {
-		ts_s = g_strdup("");
-	}
-
+	mtime = time(NULL);
+	mdate = purple_utf8_strftime("%H:%M:%S", localtime(&mtime));
+	ts_s = g_strdup_printf("(%s) ", mdate);
 	if (category == NULL)
 		cat_s = g_strdup("");
 	else
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdialogs.c	Mon May 21 20:58:23 2007 +0000
@@ -156,15 +156,15 @@
 	{N_("French"),              "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", "nacho.resa@gmail.com"},
 	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
-	{N_("Gujarati"),            "gu", "Gujarati Language Team", "indianoss-gujarati@lists.sourceforge.net"},
+	{N_("Gujarati"),            "gu", N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", "sutto.zoltan@rutinsoft.hu"},
 	{N_("Indonesian"),          "id", "Rai S. Regawa", "raireg@yahoo.com"},
 	{N_("Italian"),             "it", "Claudio Satriano", "satriano@na.infn.it"},
 	{N_("Japanese"),            "ja", "Takashi Aihana", "aihana@gnome.gr.jp"},
-	{N_("Georgian"),            "ka", "Ubuntu Georgian Translators", "alexander.didebulidze@stusta.mhn.de"},
-	{N_("Kannada"),             "kn", "Kannada Translation team", "translation@sampada.info"},
+	{N_("Georgian"),            "ka", N_("Ubuntu Georgian Translators"), "alexander.didebulidze@stusta.mhn.de"},
+	{N_("Kannada"),             "kn", N_("Kannada Translation team"), "translation@sampada.info"},
 	{N_("Korean"),              "ko", "Kyung-uk Son", "vvs740@chol.com"},
 	{N_("Kurdish"),             "ku", "Erdal Ronahi", "erdal.ronahi@gmail.com"},
 	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
@@ -362,7 +362,8 @@
 	str = g_string_sized_new(4096);
 
 	g_string_append_printf(str,
-		_("%s is a modular messaging client capable of using "
+		_("%s is a graphical modular messaging client based on "
+		  "libpurple which is capable of connecting to "
 		  "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 		  "Gadu-Gadu, and QQ all at once.  "
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdnd-hints.c
--- a/pidgin/gtkdnd-hints.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdnd-hints.c	Mon May 21 20:58:23 2007 +0000
@@ -91,8 +91,6 @@
 	if (w->parent && w->parent->window == w->window)
 	{
 		get_widget_coords(w->parent, &ox, &oy, NULL, NULL);
-		ox += w->allocation.x;
-		oy += w->allocation.y;
 		height = w->allocation.height;
 		width = w->allocation.width;
 	}
@@ -174,6 +172,8 @@
 	gint x = 0, y = 0;
 
 	get_widget_coords(widget, &x1, &y1, &x2, &y2);
+	x1 += widget->allocation.x;	x2 += widget->allocation.x;
+	y1 += widget->allocation.y;	y2 += widget->allocation.y;
 
 	switch (horiz)
 	{
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdocklet-x11.c
--- a/pidgin/gtkdocklet-x11.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Mon May 21 20:58:23 2007 +0000
@@ -42,7 +42,6 @@
 static GtkTooltips *tooltips = NULL;
 static GdkPixbuf *blank_icon = NULL;
 static int embed_timeout = 0;
-static DockletStatus icon_status = 0;
 static int docklet_height = 0;
 
 /* protos */
@@ -90,39 +89,38 @@
 }
 
 static void
-docklet_x11_update_icon(DockletStatus icon)
+docklet_x11_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending)
 {
 	const gchar *icon_name = NULL;
 
 	g_return_if_fail(image != NULL);
 
-	switch (icon) {
-		case DOCKLET_STATUS_OFFLINE:
+	switch (status) {
+		case PURPLE_STATUS_OFFLINE:
 			icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
 			break;
-		case DOCKLET_STATUS_CONNECTING:
-			icon_name = PIDGIN_STOCK_TRAY_CONNECT;
+		case PURPLE_STATUS_AWAY:
+			icon_name = PIDGIN_STOCK_TRAY_AWAY;
+			break;
+		case PURPLE_STATUS_UNAVAILABLE:
+			icon_name = PIDGIN_STOCK_TRAY_BUSY;
 			break;
-		case DOCKLET_STATUS_AVAILABLE:
+		case PURPLE_STATUS_EXTENDED_AWAY:
+			icon_name = PIDGIN_STOCK_TRAY_XA;
+			break;
+		case PURPLE_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+			break;
+		default:
 			icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
 			break;
-		case DOCKLET_STATUS_PENDING:
-			icon_name = PIDGIN_STOCK_TRAY_PENDING;
-			break;
-		case DOCKLET_STATUS_AWAY:
-			icon_name = PIDGIN_STOCK_TRAY_AWAY;
-			break;
-		case DOCKLET_STATUS_BUSY:
-			icon_name = PIDGIN_STOCK_TRAY_BUSY;
-			break;
-		case DOCKLET_STATUS_XA:
-			icon_name = PIDGIN_STOCK_TRAY_XA;
-			break;
-		case DOCKLET_STATUS_INVISIBLE:
-			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
-			break;
 	}
 
+	if (pending)
+		icon_name = PIDGIN_STOCK_TRAY_PENDING;
+	if (connecting)
+		icon_name = PIDGIN_STOCK_TRAY_CONNECT;
+
 	if(icon_name) {
 		int icon_size;
 		if (docklet_height < 22)
@@ -132,7 +130,6 @@
 
 		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, icon_size);
 	}
-	icon_status = icon;
 }
 
 static void
@@ -141,7 +138,7 @@
 	if (docklet_height == widget->allocation.height)
 		return;
 	docklet_height = widget->allocation.height;
-	docklet_x11_update_icon(icon_status);
+	pidgin_docklet_update_icon();
 }
 
 static void
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdocklet.c	Mon May 21 20:58:23 2007 +0000
@@ -49,7 +49,9 @@
 
 /* globals */
 static struct docklet_ui_ops *ui_ops = NULL;
-static DockletStatus status = DOCKLET_STATUS_OFFLINE;
+static PurpleStatusPrimitive status = PURPLE_STATUS_OFFLINE;
+static gboolean pending = FALSE;
+static gboolean connecting = FALSE;
 static gboolean enable_join_chat = FALSE;
 static guint docklet_blinking_timer = 0;
 static gboolean visible = FALSE;
@@ -66,21 +68,17 @@
 
 	blinked = !blinked;
 
-	switch (status) {
-		case DOCKLET_STATUS_PENDING:
-			if (blinked) {
-				if (ui_ops && ui_ops->blank_icon)
-					ui_ops->blank_icon();
-			} else {
-				if (ui_ops && ui_ops->update_icon)
-					ui_ops->update_icon(status);
-			}
-			ret = TRUE; /* keep blinking */
-			break;
-		default:
-			docklet_blinking_timer = 0;
-			blinked = FALSE;
-			break;
+	if(pending && !connecting) {
+		if (blinked) {
+			if (ui_ops && ui_ops->blank_icon)
+				ui_ops->blank_icon();
+		} else {
+			pidgin_docklet_update_icon();
+		}
+		ret = TRUE; /* keep blinking */
+	} else {
+		docklet_blinking_timer = 0;
+		blinked = FALSE;
 	}
 
 	return ret;
@@ -114,9 +112,8 @@
 	GList *convs, *l;
 	int count;
 	PurpleSavedStatus *saved_status;
-	PurpleStatusPrimitive prim;
-	DockletStatus newstatus = DOCKLET_STATUS_OFFLINE;
-	gboolean pending = FALSE, connecting = FALSE;
+	PurpleStatusPrimitive newstatus = PURPLE_STATUS_OFFLINE;
+	gboolean newpending = FALSE, newconnecting = FALSE;
 
 	/* get the current savedstatus */
 	saved_status = purple_savedstatus_get_current();
@@ -141,7 +138,7 @@
 	}
 
 	if (convs != NULL) {
-		pending = TRUE;
+		newpending = TRUE;
 
 		/* set tooltip if messages are pending */
 		if (ui_ops->set_tooltip) {
@@ -190,38 +187,22 @@
 
 		account_status = purple_account_get_active_status(account);
 		if (purple_account_is_connecting(account))
-			connecting = TRUE;
+			newconnecting = TRUE;
 	}
 
-	prim = purple_savedstatus_get_type(saved_status);
-	if (pending)
-		newstatus = DOCKLET_STATUS_PENDING;
-	else if (connecting)
-		newstatus = DOCKLET_STATUS_CONNECTING;
-	else if (prim == PURPLE_STATUS_UNAVAILABLE)
-		newstatus = DOCKLET_STATUS_BUSY;
-	else if (prim == PURPLE_STATUS_AWAY)
-		newstatus = DOCKLET_STATUS_AWAY;
-	else if (prim == PURPLE_STATUS_EXTENDED_AWAY)
-		newstatus = DOCKLET_STATUS_XA;
-	else if (prim == PURPLE_STATUS_OFFLINE)
-		newstatus = DOCKLET_STATUS_OFFLINE;
-	else if (prim == PURPLE_STATUS_INVISIBLE)
-		newstatus = DOCKLET_STATUS_INVISIBLE;
-	else
-		newstatus = DOCKLET_STATUS_AVAILABLE;
+	newstatus = purple_savedstatus_get_type(saved_status);
 
 	/* update the icon if we changed status */
-	if (status != newstatus) {
+	if (status != newstatus || pending!=newpending || connecting!=newconnecting) {
 		status = newstatus;
+		pending = newpending;
+		connecting = newconnecting;
 
-		if (ui_ops && ui_ops->update_icon)
-			ui_ops->update_icon(status);
+		pidgin_docklet_update_icon();
 
 		/* and schedule the blinker function if messages are pending */
-		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink") &&
-		    status == DOCKLET_STATUS_PENDING
-		    && docklet_blinking_timer == 0) {
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")
+			&& pending && !connecting && docklet_blinking_timer == 0) {
 			docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
 		}
 	}
@@ -510,7 +491,7 @@
 
 	menuitem = gtk_menu_item_new_with_label(_("Unread Messages"));
 
-	if (status == DOCKLET_STATUS_PENDING) {
+	if (pending) {
 		GtkWidget *submenu = gtk_menu_new();
 		GList *l = get_pending_list(0);
 		if (l == NULL) {
@@ -530,7 +511,7 @@
 	pidgin_separator(menu);
 
 	menuitem = pidgin_new_item_from_stock(menu, _("New Message..."), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, G_CALLBACK(pidgin_dialogs_im), NULL, 0, 0, NULL);
-	if (status == DOCKLET_STATUS_OFFLINE)
+	if (status == PURPLE_STATUS_OFFLINE)
 		gtk_widget_set_sensitive(menuitem, FALSE);
 
 	menuitem = docklet_status_submenu();
@@ -558,10 +539,6 @@
 
 	pidgin_separator(menu);
 
-	/* TODO: need a submenu to change status, this needs to "link"
-	 * to the status in the buddy list gtkstatusbox
-	 */
-
 	pidgin_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(purple_core_quit), NULL, 0, 0, NULL);
 
 #ifdef _WIN32
@@ -578,11 +555,18 @@
  * public api for ui_ops
  **************************************************************************/
 void
+pidgin_docklet_update_icon()
+{
+	if (ui_ops && ui_ops->update_icon)
+		ui_ops->update_icon(status, connecting, pending);
+}
+
+void
 pidgin_docklet_clicked(int button_type)
 {
 	switch (button_type) {
 		case 1:
-			if (status == DOCKLET_STATUS_PENDING) {
+			if (pending) {
 				GList *l = get_pending_list(1);
 				if (l != NULL) {
 					purple_conversation_present((PurpleConversation *)l->data);
@@ -608,8 +592,7 @@
 	}
 	visible = TRUE;
 	docklet_update_status();
-	if (ui_ops && ui_ops->update_icon)
-		ui_ops->update_icon(status);
+	pidgin_docklet_update_icon();
 }
 
 void
@@ -625,7 +608,7 @@
 			docklet_blinking_timer = 0;
 		}
 		visible = FALSE;
-		status = DOCKLET_STATUS_OFFLINE;
+		status = PURPLE_STATUS_OFFLINE;
 	}
 }
 
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkdocklet.h
--- a/pidgin/gtkdocklet.h	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkdocklet.h	Mon May 21 20:58:23 2007 +0000
@@ -25,23 +25,13 @@
 #ifndef _GTKDOCKLET_H_
 #define _GTKDOCKLET_H_
 
-typedef enum
-{
-	DOCKLET_STATUS_OFFLINE,
-	DOCKLET_STATUS_AVAILABLE,
-	DOCKLET_STATUS_INVISIBLE,
-	DOCKLET_STATUS_PENDING,
-	DOCKLET_STATUS_AWAY,
-	DOCKLET_STATUS_BUSY,
-	DOCKLET_STATUS_XA,
-	DOCKLET_STATUS_CONNECTING
-} DockletStatus;
+#include "status.h"
 
 struct docklet_ui_ops
 {
 	void (*create)(void);
 	void (*destroy)(void);
-	void (*update_icon)(DockletStatus);
+	void (*update_icon)(PurpleStatusPrimitive, gboolean, gboolean);
 	void (*blank_icon)(void);
 	void (*set_tooltip)(gchar *);
 	GtkMenuPositionFunc position_menu;
@@ -49,6 +39,7 @@
 
 
 /* functions in gtkdocklet.c */
+void pidgin_docklet_update_icon(void);
 void pidgin_docklet_clicked(int);
 void pidgin_docklet_embedded(void);
 void pidgin_docklet_remove(void);
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkidle.c
--- a/pidgin/gtkidle.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkidle.c	Mon May 21 20:58:23 2007 +0000
@@ -103,14 +103,21 @@
 
 	/* Query xscreensaver */
 	static XScreenSaverInfo *mit_info = NULL;
+	static int has_extension = -1;
 	int event_base, error_base;
-	if (XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base)) {
-		if (mit_info == NULL) {
+
+	if (has_extension == -1)
+		has_extension = XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base);
+
+	if (has_extension)
+	{
+		if (mit_info == NULL)
 			mit_info = XScreenSaverAllocInfo();
-		}
+
 		XScreenSaverQueryInfo(GDK_DISPLAY(), GDK_ROOT_WINDOW(), mit_info);
 		return (mit_info->idle) / 1000;
-	} else
+	}
+	else
 		return 0;
 #  endif /* !_WIN32 */
 # endif /* !HAVE_IOKIT */
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkimhtml.c	Mon May 21 20:58:23 2007 +0000
@@ -1872,18 +1872,8 @@
 }
 
 static GdkPixbufAnimation *
-gtk_smiley_tree_image (GtkIMHtml     *imhtml,
-		       const gchar   *sml,
-		       const gchar   *text)
+gtk_smiley_get_image(GtkIMHtmlSmiley *smiley)
 {
-
-	GtkIMHtmlSmiley *smiley;
-
-	smiley = gtk_imhtml_smiley_get(imhtml,sml,text);
-
-	if (!smiley)
-		return NULL;
-
 	if (!smiley->icon && smiley->file) {
 		smiley->icon = gdk_pixbuf_animation_new_from_file(smiley->file, NULL);
 	} else if (!smiley->icon && smiley->loader) {
@@ -1895,6 +1885,21 @@
 	return smiley->icon;
 }
 
+static GdkPixbufAnimation *
+gtk_smiley_tree_image (GtkIMHtml     *imhtml,
+		       const gchar   *sml,
+		       const gchar   *text)
+{
+	GtkIMHtmlSmiley *smiley;
+
+	smiley = gtk_imhtml_smiley_get(imhtml,sml,text);
+
+	if (!smiley)
+		return NULL;
+
+	return gtk_smiley_get_image(smiley);
+}
+
 #define VALID_TAG(x)	if (!g_ascii_strncasecmp (string, x ">", strlen (x ">"))) {	\
 				*tag = g_strndup (string, strlen (x));		\
 				*len = strlen (x) + 1;				\
@@ -2756,7 +2761,8 @@
 						}
 						if (textdec && font->underline != 1
 							&& g_ascii_strcasecmp(textdec, "underline") == 0
-							&& (imhtml->format_functions & GTK_IMHTML_UNDERLINE))
+							&& (imhtml->format_functions & GTK_IMHTML_UNDERLINE)
+							&& !(options & GTK_IMHTML_NO_FORMATTING))
 						{
 						    gtk_imhtml_toggle_underline(imhtml);
 						    font->underline = 1;
@@ -2785,7 +2791,7 @@
 								else
 									font->bold = 0;
 							}
-							if ((font->bold && oldfont && !oldfont->bold) || (oldfont && oldfont->bold && !font->bold) || (font->bold && !oldfont))
+							if (((font->bold && oldfont && !oldfont->bold) || (oldfont && oldfont->bold && !font->bold) || (font->bold && !oldfont)) && !(options & GTK_IMHTML_NO_FORMATTING))
 							{
 								gtk_imhtml_toggle_bold(imhtml);
 							}
@@ -2811,33 +2817,36 @@
 
 						if (!oldfont) {
 							gtk_imhtml_font_set_size(imhtml, 3);
-							if (font->underline)
+							if (font->underline && !(options & GTK_IMHTML_NO_FORMATTING))
 							    gtk_imhtml_toggle_underline(imhtml);
-							if (font->bold)
+							if (font->bold && !(options & GTK_IMHTML_NO_FORMATTING))
 								gtk_imhtml_toggle_bold(imhtml);
-							gtk_imhtml_toggle_fontface(imhtml, NULL);
-							gtk_imhtml_toggle_forecolor(imhtml, NULL);
-							gtk_imhtml_toggle_backcolor(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_FONTS))
+								gtk_imhtml_toggle_fontface(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_COLOURS))
+								gtk_imhtml_toggle_forecolor(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_COLOURS))
+								gtk_imhtml_toggle_backcolor(imhtml, NULL);
 						}
 						else
 						{
 
-						    if (font->size != oldfont->size)
+						    if ((font->size != oldfont->size) && !(options & GTK_IMHTML_NO_SIZES))
 							    gtk_imhtml_font_set_size(imhtml, oldfont->size);
 
-							if (font->underline != oldfont->underline)
+							if ((font->underline != oldfont->underline) && !(options & GTK_IMHTML_NO_FORMATTING))
 							    gtk_imhtml_toggle_underline(imhtml);
 
-							if ((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold))
+							if (((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold)) && !(options & GTK_IMHTML_NO_FORMATTING))
 								gtk_imhtml_toggle_bold(imhtml);
 
-							if (font->face && (!oldfont->face || strcmp(font->face, oldfont->face) != 0))
+							if (font->face && (!oldfont->face || strcmp(font->face, oldfont->face) != 0) && !(options & GTK_IMHTML_NO_FONTS))
 							    gtk_imhtml_toggle_fontface(imhtml, oldfont->face);
 
-							if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0))
+							if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0) && !(options & GTK_IMHTML_NO_COLOURS))
 							    gtk_imhtml_toggle_forecolor(imhtml, oldfont->fore);
 
-							if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0))
+							if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0) && !(options & GTK_IMHTML_NO_COLOURS))
 						      gtk_imhtml_toggle_backcolor(imhtml, oldfont->back);
 						}
 
@@ -3363,6 +3372,29 @@
 		return FALSE; /* Let clicks go through if we didn't catch anything */
 
 }
+
+static gboolean gtk_imhtml_smiley_clicked(GtkWidget *w, GdkEvent *event, GtkIMHtmlSmiley *smiley)
+{
+	GdkPixbufAnimation *anim = NULL;
+	GdkPixbuf *pix = NULL;
+	GtkIMHtmlScalable *image = NULL;
+	gboolean ret;
+	
+	if (event->type != GDK_BUTTON_RELEASE || ((GdkEventButton*)event)->button != 3)
+		return FALSE;
+
+	anim = gtk_smiley_get_image(smiley);
+	if (!anim)
+		return FALSE;
+
+	pix = gdk_pixbuf_animation_get_static_image(anim);
+	image = gtk_imhtml_image_new(pix, smiley->smile, 0);
+	ret = gtk_imhtml_image_clicked(w, event, (GtkIMHtmlImage*)image);
+	g_object_set_data_full(G_OBJECT(w), "image-data", image, (GDestroyNotify)gtk_imhtml_image_free);
+	g_object_unref(G_OBJECT(pix));
+	return ret;
+}
+
 void gtk_imhtml_image_free(GtkIMHtmlScalable *scale)
 {
 	GtkIMHtmlImage *image = (GtkIMHtmlImage *)scale;
@@ -4378,9 +4410,10 @@
 	GdkPixbuf *pixbuf = NULL;
 	GdkPixbufAnimation *annipixbuf = NULL;
 	GtkWidget *icon = NULL;
-	GtkTextChildAnchor *anchor;
+	GtkTextChildAnchor *anchor = NULL;
 	char *unescaped = purple_unescape_html(smiley);
 	GtkIMHtmlSmiley *imhtml_smiley = gtk_imhtml_smiley_get(imhtml, sml, unescaped);
+	GtkWidget *ebox = NULL;
 
 	if (imhtml->format_functions & GTK_IMHTML_SMILEY) {
 		annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped);
@@ -4397,6 +4430,7 @@
 					if (anim) {
 						GdkPixbuf *pb = gdk_pixbuf_animation_get_static_image(anim);
 						gtk_image_set_from_pixbuf(image, pb);
+						g_object_unref(G_OBJECT(pb));
 					}
 				} else {
  					imhtml->num_animations++;
@@ -4407,6 +4441,12 @@
 		}
 	}
 
+	if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
+		ebox = gtk_event_box_new();
+		gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+		gtk_widget_show(ebox);
+	}
+
 	if (icon) {
 		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);
@@ -4419,14 +4459,26 @@
 		g_signal_connect(G_OBJECT(icon), "expose-event", G_CALLBACK(image_expose), NULL);
 
 		gtk_widget_show(icon);
-		gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), icon, anchor);
+		if (ebox)
+			gtk_container_add(GTK_CONTAINER(ebox), icon);
+		gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox ? ebox : icon, anchor);
 	} else if (imhtml_smiley != NULL && (imhtml->format_functions & GTK_IMHTML_SMILEY)) {
 		anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
 		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);
+			gtk_container_add(GTK_CONTAINER(ebox), img);
+			gtk_widget_show(img);
+			gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox, anchor);
+		}
 	} else {
 		gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1);
 	}
 
+	if (ebox) {
+		g_signal_connect(G_OBJECT(ebox), "event", G_CALLBACK(gtk_imhtml_smiley_clicked), imhtml_smiley);
+	}
+
 	g_free(unescaped);
 }
 
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkmain.c	Mon May 21 20:58:23 2007 +0000
@@ -473,12 +473,7 @@
 #else
 	debug_enabled = FALSE;
 #endif
-
-#ifdef PURPLE_FATAL_ASSERTS
-	/* Make g_return_... functions fatal. */
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-#endif
-
+	
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtknotify.c	Mon May 21 20:58:23 2007 +0000
@@ -549,6 +549,21 @@
 	return FALSE;
 }
 
+static GtkIMHtmlOptions
+notify_imhtml_options()
+{
+	GtkIMHtmlOptions options = 0;
+
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"))
+		options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES;
+
+	options |= GTK_IMHTML_NO_COMMENTS;
+	options |= GTK_IMHTML_NO_TITLE;
+	options |= GTK_IMHTML_NO_NEWLINE;
+	options |= GTK_IMHTML_NO_SCROLL;
+	return options;
+}
+
 static void *
 pidgin_notify_formatted(const char *title, const char *primary,
 						  const char *secondary, const char *text)
@@ -559,7 +574,6 @@
 	GtkWidget *button;
 	GtkWidget *imhtml;
 	GtkWidget *frame;
-	int options = 0;
 	char label_text[2048];
 	char *linked_text, *primary_esc, *secondary_esc;
 
@@ -614,20 +628,13 @@
 	g_signal_connect(G_OBJECT(window), "key_press_event",
 					 G_CALLBACK(formatted_input_cb), NULL);
 
-	/* Add the text to the gtkimhtml */
-	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"))
-		options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES;
-
-	options |= GTK_IMHTML_NO_COMMENTS;
-	options |= GTK_IMHTML_NO_TITLE;
-	options |= GTK_IMHTML_NO_NEWLINE;
-	options |= GTK_IMHTML_NO_SCROLL;
-
 	/* Make sure URLs are clickable */
 	linked_text = purple_markup_linkify(text);
-	gtk_imhtml_append_text(GTK_IMHTML(imhtml), linked_text, options);
+	gtk_imhtml_append_text(GTK_IMHTML(imhtml), linked_text, notify_imhtml_options());
 	g_free(linked_text);
 
+	g_object_set_data(G_OBJECT(window), "info-widget", imhtml);
+
 	/* Show the window */
 	gtk_widget_show(window);
 
@@ -856,18 +863,53 @@
 	return data;
 }
 
+/** Xerox'ed from Finch! How the tables have turned!! ;) **/
+/** User information. **/
+static GHashTable *userinfo;
+
+static char *
+userinfo_hash(PurpleAccount *account, const char *who)
+{
+	char key[256];
+	snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
+	return g_utf8_strup(key, -1);
+}
+
+static void
+remove_userinfo(GtkWidget *widget, gpointer key)
+{
+	g_hash_table_remove(userinfo, key);
+}
+
 static void *
 pidgin_notify_userinfo(PurpleConnection *gc, const char *who,
 						 PurpleNotifyUserInfo *user_info)
 {
-	char *primary, *info;
+	char *info;
 	void *ui_handle;
+	char *key = userinfo_hash(purple_connection_get_account(gc), who);
+
+	if (!userinfo) {
+		userinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+	}
 
-	primary = g_strdup_printf(_("Info for %s"), who);
 	info = purple_notify_user_info_get_text_with_newline(user_info, "<br />");
-	ui_handle = pidgin_notify_formatted(_("Buddy Information"), primary, NULL, info);
+	ui_handle = g_hash_table_lookup(userinfo, key);
+	if (ui_handle != NULL) {
+		GtkIMHtml *imhtml = g_object_get_data(G_OBJECT(ui_handle), "info-widget");
+		char *linked_text = purple_markup_linkify(info);
+		gtk_imhtml_clear(imhtml);
+		gtk_imhtml_append_text(imhtml, linked_text, notify_imhtml_options());
+		g_free(linked_text);
+		g_free(key);
+	} else {
+		char *primary = g_strdup_printf(_("Info for %s"), who);
+		ui_handle = pidgin_notify_formatted(_("Buddy Information"), primary, NULL, info);
+		g_hash_table_insert(userinfo, key, ui_handle);
+		g_signal_connect(G_OBJECT(ui_handle), "destroy", G_CALLBACK(remove_userinfo), key);
+		g_free(primary);
+	}
 	g_free(info);
-	g_free(primary);
 	return ui_handle;
 }
 
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkprefs.c	Mon May 21 20:58:23 2007 +0000
@@ -1472,7 +1472,7 @@
 	purple_prefs_set_path(pref, "");
 	g_free(pref);
 
-	gtk_entry_set_text(GTK_ENTRY(sound_entry), "(default)");
+	gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)"));
 }
 
 static void
@@ -1561,7 +1561,7 @@
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
 	if (sound_entry)
-		gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)");
+		gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)"));
 	g_value_unset (&val);
 }
 
@@ -1753,7 +1753,7 @@
 			       pidgin_sound_get_event_option(0));
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
-	gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)");
+	gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)"));
 	gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE);
 
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Mon May 21 20:58:23 2007 +0000
@@ -2334,11 +2334,16 @@
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
 
+	height = 0;
 	wrapped_lines = 1;
 	gtk_text_buffer_get_start_iter(buffer, &iter);
-	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
-	while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(status_box->imhtml), &iter))
+	do {
+		gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
+		height += oneline.height;
 		wrapped_lines++;
+		if (wrapped_lines > 4)
+			break;
+	} while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(status_box->imhtml), &iter));
 
 	lines = gtk_text_buffer_get_line_count(buffer);
 
@@ -2350,8 +2355,8 @@
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(status_box->imhtml));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(status_box->imhtml));
 
-	height = (oneline.height + pad_top + pad_bottom) * lines;
-	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
+	height += (pad_top + pad_bottom) * lines;
+	height += (pad_inside) * (wrapped_lines - lines);
 
 	gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE);
 }
diff -r e42309469a4a -r 618a3748ff64 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/gtkutils.c	Mon May 21 20:58:23 2007 +0000
@@ -103,17 +103,17 @@
 	if (purple_running_gnome()) {
 		char *path, *font;
 		PangoFontDescription *desc = NULL;
-				
+
 		if ((path = g_find_program_in_path("gconftool-2"))) {
 			g_free(path);
 			if (!g_spawn_command_line_sync(
-					"gconftool-2 -g /desktop/gnome/interface/document_font_name", 
+					"gconftool-2 -g /desktop/gnome/interface/document_font_name",
 					&font, NULL, NULL, NULL))
 				return;
 		}
 		desc = pango_font_description_from_string(font);
 		g_free(font);
-		
+
 		if (desc) {
 			gtk_widget_modify_font(imhtml, desc);
 			pango_font_description_free(desc);
@@ -442,32 +442,78 @@
 	item = gtk_menu_get_active(GTK_MENU(menu));
 
 	protocol = g_object_get_data(G_OBJECT(item), "protocol");
+
+	if (!strcmp(protocol, "prpl-fake"))
+		protocol = g_object_get_data(G_OBJECT(item), "real_protocol");
+
+	if (!strcmp(protocol, g_object_get_data(G_OBJECT(optmenu), "last_protocol")))
+		return;
+
 	user_data = (g_object_get_data(G_OBJECT(optmenu), "user_data"));
+	g_object_set_data(G_OBJECT(optmenu), "last_protocol", (gpointer)protocol);
 
 	if (cb != NULL)
 		((void (*)(GtkWidget *, const char *, gpointer))cb)(item, protocol,
 															user_data);
 }
 
+static GtkWidget *
+pidgin_protocol_option_menu_item(GtkWidget *menu, GtkSizeGroup *sg, GtkWidget *image,
+                                  const char *name, const char *id)
+{
+	GtkWidget *item;
+	GtkWidget *hbox;
+	GtkWidget *label;
+
+	/* Create the item. */
+	item = gtk_menu_item_new();
+
+	/* Create the hbox. */
+	hbox = gtk_hbox_new(FALSE, 4);
+	gtk_container_add(GTK_CONTAINER(item), hbox);
+	gtk_widget_show(hbox);
+
+	gtk_size_group_add_widget(sg, image);
+
+	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
+	gtk_widget_show(image);
+
+	/* Create the label. */
+	label = gtk_label_new(name);
+	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+	gtk_widget_show(label);
+
+	g_object_set_data(G_OBJECT(item), "protocol", (gpointer)id);
+
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	gtk_widget_show(item);
+	pidgin_set_accessible_label (item, label);
+
+	return item;
+}
+
 GtkWidget *
 pidgin_protocol_option_menu_new(const char *id, GCallback cb,
 								  gpointer user_data)
 {
 	PurplePluginProtocolInfo *prpl_info;
 	PurplePlugin *plugin;
-	GtkWidget *hbox;
-	GtkWidget *label;
 	GtkWidget *optmenu;
 	GtkWidget *menu;
-	GtkWidget *item;
+	GdkPixbuf *pixbuf;
 	GtkWidget *image;
-	GdkPixbuf *pixbuf;
 	GList *p;
 	GtkSizeGroup *sg;
 	char *filename;
 	const char *proto_name;
 	char buf[256];
 	int i, selected_index = -1;
+	const char *gtalk_name = NULL;
+
+	if (purple_find_prpl("prpl-jabber"))
+		gtalk_name = _("Google Talk");
 
 	optmenu = gtk_option_menu_new();
 	gtk_widget_show(optmenu);
@@ -486,13 +532,27 @@
 		plugin = (PurplePlugin *)p->data;
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 
-		/* Create the item. */
-		item = gtk_menu_item_new();
-
-		/* Create the hbox. */
-		hbox = gtk_hbox_new(FALSE, 4);
-		gtk_container_add(GTK_CONTAINER(item), hbox);
-		gtk_widget_show(hbox);
+		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0)
+		{
+			GtkWidget *gtalk_item;
+
+			filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+			                            "16", "google-talk.png", NULL);
+			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+			g_free(filename);
+
+
+			if (pixbuf)
+				image = gtk_image_new_from_pixbuf(pixbuf);
+			else
+				image = gtk_image_new();
+
+			gtalk_item = pidgin_protocol_option_menu_item(menu, sg, image, gtalk_name, "prpl-fake");
+			g_object_set_data(G_OBJECT(gtalk_item), "real_protocol", "prpl-jabber");
+			i++;
+
+			gtalk_name = NULL;
+		}
 
 		/* Load the image. */
 		proto_name = prpl_info->list_icon(NULL, NULL);
@@ -503,34 +563,26 @@
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
 
-		if (pixbuf) {
+		if (pixbuf)
 			image = gtk_image_new_from_pixbuf(pixbuf);
-
-			g_object_unref(G_OBJECT(pixbuf));
-		}
 		else
 			image = gtk_image_new();
 
-		gtk_size_group_add_widget(sg, image);
-
-		gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-		gtk_widget_show(image);
-
-		/* Create the label. */
-		label = gtk_label_new(plugin->info->name);
-		gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-		gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-		gtk_widget_show(label);
-
-		g_object_set_data(G_OBJECT(item), "protocol", plugin->info->id);
-
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show(item);
-		pidgin_set_accessible_label (item, label);
+		pidgin_protocol_option_menu_item(menu, sg, image, plugin->info->name, plugin->info->id);
 
 		if (id != NULL && !strcmp(plugin->info->id, id))
+		{
+			g_object_set_data(G_OBJECT(optmenu), "last_protocol", plugin->info->id);
 			selected_index = i;
+		}
+		else if (i == 0)
+		{
+			/* Ensure we set the protocol even if id is NULL or can't be found. */
+			g_object_set_data(G_OBJECT(optmenu), "last_protocol", plugin->info->id);
+		}
+
+		if (pixbuf)
+			g_object_unref(G_OBJECT(pixbuf));
 	}
 
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
@@ -2277,20 +2329,10 @@
 		GTK_FILE_SELECTION(dialog->icon_filesel)));
 #endif /* FILECHOOSER */
 
-	if (!filename || g_stat(filename, &st))
+	if (!filename || g_stat(filename, &st) || !(pixbuf = gdk_pixbuf_new_from_file(filename, NULL)))
 	{
-		g_free(filename);
-		return;
-	}
-
-	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-	if (!pixbuf) {
 		gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), NULL);
 		gtk_label_set_markup(GTK_LABEL(dialog->icon_text), "");
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-		gtk_file_chooser_set_preview_widget_active(
-					GTK_FILE_CHOOSER(dialog->icon_filesel), FALSE);
-#endif /* FILECHOOSER */
 		g_free(filename);
 		return;
 	}
@@ -2307,10 +2349,6 @@
 	scale = gdk_pixbuf_scale_simple(pixbuf, width * 50 / height,
 									50, GDK_INTERP_BILINEAR);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), scale);
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-	gtk_file_chooser_set_preview_widget_active(
-					GTK_FILE_CHOOSER(dialog->icon_filesel), TRUE);
-#endif /* FILECHOOSER */
 	gtk_label_set_markup(GTK_LABEL(dialog->icon_text), markup);
 
 	g_object_unref(G_OBJECT(pixbuf));
@@ -2325,7 +2363,9 @@
 GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) {
 	struct _icon_chooser *dialog = g_new0(struct _icon_chooser, 1);
 
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+	GtkWidget *vbox;
+#else
 	GtkWidget *hbox;
 	GtkWidget *tv;
 	GtkTreeSelection *sel;
@@ -2356,9 +2396,17 @@
 
 	dialog->icon_preview = gtk_image_new();
 	dialog->icon_text = gtk_label_new(NULL);
-	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50);
-	gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog->icon_filesel),
-					    GTK_WIDGET(dialog->icon_preview));
+
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_widget_set_size_request(GTK_WIDGET(vbox), -1, 50);
+	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(dialog->icon_preview), TRUE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET(dialog->icon_text), FALSE, FALSE, 0);
+	gtk_widget_show_all(vbox);
+
+	gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog->icon_filesel), vbox);
+	gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(dialog->icon_filesel), TRUE);
+	gtk_file_chooser_set_use_preview_label(GTK_FILE_CHOOSER(dialog->icon_filesel), FALSE);
+
 	g_signal_connect(G_OBJECT(dialog->icon_filesel), "update-preview",
 					 G_CALLBACK(icon_preview_change_cb), dialog);
 	g_signal_connect(G_OBJECT(dialog->icon_filesel), "response",
@@ -2372,7 +2420,7 @@
 		gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog->icon_filesel),
 										current_folder);
 
-	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50);
+	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview),-1, 50);
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(
 		GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox),
@@ -2969,7 +3017,7 @@
 	PangoLogAttr *log_attrs;
 	gchar *word;
 
-	if (strcasecmp(key, "Global Thermonuclear War") == 0)
+	if (g_ascii_strcasecmp(key, "Global Thermonuclear War") == 0)
 	{
 		purple_notify_info(NULL, "WOPR",
 				"Wouldn't you prefer a nice game of chess?", NULL);
diff -r e42309469a4a -r 618a3748ff64 pidgin/pidgin.h
--- a/pidgin/pidgin.h	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/pidgin.h	Mon May 21 20:58:23 2007 +0000
@@ -45,7 +45,8 @@
 /* change this only when we have a sane upgrade path for old prefs */
 #define PIDGIN_PREFS_ROOT "/pidgin"
 
-/* Translators may want to transliterate the name. */
+/* Translators may want to transliterate the name.
+ It is not to be translated. */
 #define PIDGIN_NAME _("Pidgin")
 
 #ifndef _WIN32
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Mon May 21 20:58:23 2007 +0000
@@ -21,7 +21,7 @@
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
-! skywalker.png     C:-) c:-) C:) c:)
+! skywalker.png     C:-)    c:-)    C:)     c:)
 ! monkey.png        :-(|)
 
 ### Following AIM 6.1
@@ -42,6 +42,8 @@
 crying.png          :'(
 shut-mouth.png      :-X
 glasses-cool.png    8-)
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)
 
 ### Following Windows Live Messenger 8.1
 [MSN]
@@ -121,6 +123,14 @@
 eyeroll.png         8-)
 yawn.png            |-) 
 goat.png            (nah)
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)
+
+### Hidden MSN emotes
+sigarette.png      	(ci)    (CI)
+handcuffs.png       (%)
+console.png			(xx)    (XX)
+fingers-crossed.png	(yn)    (YN)
 
 ### Following QQ 2006
 [QQ]
@@ -217,6 +227,8 @@
 star.png            /星星   /<*>     /xixing   /star
 girl.png            /女     /<00>    /nv       /woman
 boy.png             /男     /<11>    /nan      /man
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)
 
 ### Following ICQ 5.1
 [ICQ]
@@ -248,6 +260,8 @@
 good.png            *THUMBS\ UP*
 beer.png            *DRINK*
 in-love.png         *IN\ LOVE*
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)
 
 ### Following Yahoo! Messenger 8.1
 [Yahoo]
@@ -294,7 +308,7 @@
 eyeroll.png         8-|
 silly.png           8-}
 clap.png            =D>     =d>
-#phbbbt             >:P     >:p     MISSING/YAHOO 6: "You are dumb! - No you are!!" => tongue on pissed of smily
+mad-tongue.png      >:P     >:p
 #timeout            :-t     :-T     MISSING: "Let's have a break."
 hug-left.png        >:D<    >:d<
 love-over.png       =((
@@ -302,8 +316,13 @@
 rotfl.png           =))    
 #loser              L-)     l-)     MISSING/YAHOO 6: "Loser!"
 party.png           <:-P    <:-p
+nailbiting.png      :-SS	:-Ss	:-sS	:-ss
 cowboy.png          <):)
 desire.png          8->
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)
+
+### Hidden Yahoo emotes
 alien.png           =:)     >-)
 beat-up.png         b-(     B-(
 chicken.png         ~:>
@@ -324,17 +343,16 @@
 flag.png            **==
 clover.png          %%-
 musical-note.png    :-"
-nailbiting.png      :-SS    :-ss
 giggle.png          ;))
 worship.png         ^:)^
 star.png            (*)
-mad-tongue.png      >:p
-#yahoo_waving.gif        >:/             TODO
-#yahoo_talktohand.gif    :-@             TODO
-#yahoo_youkiddingme.gif  :-j     :-J     TODO
+#waving.png         >:/
+#talktohand.png     :-@
+#youkiddingme.png   :-j :-J
 
 ### These only work in a certain IMvironment
-#yahoo_malefighter1.gif o->     O->
-#yahoo_malefighter2.gif o=>     O=>
-#yahoo_femalefighter.gif o-+     O-+
+#malefighter1.png   o->     O->
+#malefighter2.png   o=>     O=>
+#femalefighter.png  o-+     O-+
 yin-yang.png        (%)
+
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/16/Makefile.am
--- a/pidgin/pixmaps/protocols/16/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/pixmaps/protocols/16/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -3,6 +3,7 @@
 EXTRA_DIST =	aim.png \
 		bonjour.png \
 		gadu-gadu.png \
+		google-talk.png \
 		novell.png \
 		icq.png \
 		irc.png \
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/16/google-talk.png
Binary file pidgin/pixmaps/protocols/16/google-talk.png has changed
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/22/Makefile.am
--- a/pidgin/pixmaps/protocols/22/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/pixmaps/protocols/22/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -3,6 +3,7 @@
 EXTRA_DIST =	aim.png \
 		bonjour.png \
 		gadu-gadu.png \
+		google-talk.png \
 		novell.png \
 		icq.png \
 		irc.png \
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/22/google-talk.png
Binary file pidgin/pixmaps/protocols/22/google-talk.png has changed
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/48/scalable/Makefile.am
--- a/pidgin/pixmaps/protocols/48/scalable/Makefile.am	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/pixmaps/protocols/48/scalable/Makefile.am	Mon May 21 20:58:23 2007 +0000
@@ -1,6 +1,7 @@
 EXTRA_DIST = 	aim.svg \
 		bonjour.svg \
 		gadu-gadu.svg \
+		google-talk.svg \
 		novell.svg \
 		icq.svg \
 		irc.svg \
diff -r e42309469a4a -r 618a3748ff64 pidgin/pixmaps/protocols/48/scalable/google-talk.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/protocols/48/scalable/google-talk.svg	Mon May 21 20:58:23 2007 +0000
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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: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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2417"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   width="48"
+   height="48"
+   version="1.0"
+   sodipodi:docbase="/home/vinicius/tango-icon-theme-code/protocols/scalable"
+   sodipodi:docname="google-talk.svg"
+   inkscape:export-filename="/home/vinicius/tango-icon-theme-code/protocols/48x48/google-talk.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata2422">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Google Talk Icon</dc:title>
+        <dc:date>2006-12-03</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Vinicius Scopel Depizzol</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>vdepizzol@gmail.com</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Google Talk</rdf:li>
+            <rdf:li>GTalk</rdf:li>
+            <rdf:li>VOIP</rdf:li>
+            <rdf:li>Protocol</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2420">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6020">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6022" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6024" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3299">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.11764706;"
+         offset="0"
+         id="stop3301" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3303" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3299"
+       id="radialGradient3305"
+       cx="15.993708"
+       cy="26.722889"
+       fx="15.993708"
+       fy="26.722889"
+       r="15.912521"
+       gradientTransform="matrix(1,0,0,0.295918,-3.769888e-16,18.8151)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3527">
+      <stop
+         style="stop-color:#90ba1f;stop-opacity:1;"
+         offset="0"
+         id="stop3529" />
+      <stop
+         style="stop-color:#638205;stop-opacity:1;"
+         offset="1"
+         id="stop3531" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3518">
+      <stop
+         style="stop-color:#e7d000;stop-opacity:1;"
+         offset="0"
+         id="stop3520" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="1"
+         id="stop3522" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3486">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1;"
+         offset="0"
+         id="stop3488" />
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1;"
+         offset="1"
+         id="stop3490" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3510">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3512" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3514" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3286">
+      <stop
+         style="stop-color:#d1d1d1;stop-opacity:1;"
+         offset="0"
+         id="stop3288" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3290" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3527"
+       id="linearGradient4249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.465389,0,0,2.513895,-105.5963,47.11115)"
+       x1="55.483334"
+       y1="-14.40625"
+       x2="55.483334"
+       y2="-7.9999866" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3518"
+       id="linearGradient4252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.901968,0,0,2.518653,-127.7063,47.25387)"
+       x1="53.162479"
+       y1="-14.322747"
+       x2="53.162479"
+       y2="-9.9868765" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3486"
+       id="linearGradient4255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.48585,0,0,2.48585,-103.0483,47.16833)"
+       x1="49.45462"
+       y1="-12.934268"
+       x2="49.45462"
+       y2="-8.0529032" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3510"
+       id="linearGradient4258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.48585,0,0,2.48585,-100.3774,47.19573)"
+       x1="45.5"
+       y1="-14"
+       x2="45.5"
+       y2="-8.1156492" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient4262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.99378,0,0,2.99378,9.552849e-2,-0.965622)"
+       x1="8"
+       y1="15"
+       x2="8"
+       y2="0.9916327" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6020"
+       id="linearGradient6026"
+       x1="11.466431"
+       y1="11.008693"
+       x2="11.466431"
+       y2="15.000141"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6020"
+       id="linearGradient6030"
+       gradientUnits="userSpaceOnUse"
+       x1="11.466431"
+       y1="11.008693"
+       x2="11.466431"
+       y2="15.000141"
+       gradientTransform="matrix(1,0,0,1.75,0,-1.25)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient6052"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.99378,0,0,2.99378,-59.90447,-0.965622)"
+       x1="8"
+       y1="15"
+       x2="8"
+       y2="0.9916327" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="714"
+     inkscape:window-width="1014"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1"
+     inkscape:cx="27.558407"
+     inkscape:cy="20.353863"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2417"
+     showborder="false"
+     inkscape:showpageshadow="false" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:1;fill:url(#radialGradient3305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path2424"
+     sodipodi:cx="15.993708"
+     sodipodi:cy="26.722889"
+     sodipodi:rx="15.912521"
+     sodipodi:ry="4.7088075"
+     d="M 31.906229,26.722889 A 15.912521,4.7088075 0 1 1 31.906148,26.707864"
+     sodipodi:start="0"
+     sodipodi:end="6.2799944"
+     sodipodi:open="true"
+     transform="matrix(1.45896,0,0,1.538545,0.742037,-1.869655)" />
+  <path
+     id="path3264"
+     d="M 21.80045,3.5250496 C 10.471905,4.3704822 1.592428,11.452408 1.592428,19.990844 C 1.592428,26.29506 6.3896918,31.807945 13.473996,34.585527 C 13.301077,37.113716 12.611393,40.274075 10.57377,42.444203 C 16.402876,42.263357 20.689781,39.28536 23.484452,36.456639 C 23.677129,36.460226 23.851935,36.456639 24.045787,36.456639 C 36.451938,36.456639 46.499142,29.098509 46.499142,19.990844 L 46.499142,19.897289 C 46.459634,10.808172 36.426737,3.5250496 24.045787,3.5250496 C 23.270404,3.5250496 22.555687,3.4686875 21.80045,3.5250496 z "
+     style="fill:url(#linearGradient4262);fill-opacity:1;fill-rule:nonzero;stroke:#797979;stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     id="path3552"
+     d="M 14.063569,10.992619 L 10.975162,10.992619 L 10.975162,15.008301 L 9,15.008301 L 9,18.010155 L 10.975162,18.010155 L 10.975162,24.823081 C 10.975162,28.316382 16.413217,26.749332 16.906897,25.946127 L 16.765885,23.742745 C 16.14428,24.364355 14.063569,24.882059 14.063569,24.09267 L 14.063569,18.010155 L 16.089796,18.010155 L 16.089796,15.008301 L 14.063569,15.008301 L 14.063569,11.090553 L 14.063569,11.090553 L 14.063569,10.992619 z "
+     style="fill:url(#linearGradient4258);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:url(#linearGradient4255);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 20.513467,15.031036 C 20.138171,15.089956 19.656414,15.165467 19.228078,15.318859 C 17.702481,15.865192 16.671718,16.778263 16.671718,16.778263 L 17.928902,19.157272 C 19.392632,18.022338 22.111019,16.595753 21.828421,20.24551 C 16.134551,19.714196 14.746648,23.348506 16.160515,25.369297 C 17.612211,27.444158 20.173876,27.641863 21.329645,26.185476 C 21.514145,25.952987 21.740964,25.678231 21.873764,25.369297 C 22.016347,25.75349 22.226874,26.072865 22.417883,26.321505 C 22.574471,26.517581 23.312178,27.152657 24.004897,27.137684 C 24.806193,27.120365 25.583813,26.58185 26,25.958759 C 25.645136,26.22137 24.252362,25.650216 24.231613,24.779835 L 24.231613,18.29575 C 24.142462,16.667478 22.425687,14.730825 20.513467,15.031036 z M 21.193616,23.328851 C 21.034551,24.122851 19.396586,24.681233 18.790423,24.326402 C 17.894487,23.801947 19.229645,22.393776 20.377437,22.376643 C 21.417389,22.361119 21.33274,22.634384 21.193616,23.328851 z "
+     id="path3554"
+     sodipodi:nodetypes="cscccsscsscccccsss" />
+  <path
+     id="path3558"
+     d="M 29,11 L 26.098032,11 L 26.098032,27.104637 L 29,27.104637 L 29,11 z "
+     style="fill:url(#linearGradient4252);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccccccccccccc"
+     id="path3560"
+     d="M 30,10.895363 L 30,19.851112 L 30,27 L 32.963722,27 L 32.963722,22.924045 L 36.561805,27.064163 L 38.705904,25.193137 L 34.676855,20.715264 L 38.705904,16.23739 L 36.754295,14.238037 L 32.968278,18.187047 C 32.968278,18.187047 32.963722,10.895363 32.963722,10.895363 L 30,10.895363 z "
+     style="fill:url(#linearGradient4249);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 21.84375,4.03125 C 16.273135,4.4469767 11.295199,6.3799921 7.75,9.25 C 4.204801,12.120008 2.09375,15.904106 2.09375,20 C 2.093752,26.050562 6.709849,31.401486 13.65625,34.125 C 13.889662,34.247612 13.966606,34.430582 13.96875,34.625 C 13.8154,36.867085 13.233839,39.586592 11.6875,41.78125 C 16.756159,41.27394 20.580438,38.669315 23.125,36.09375 C 23.324492,35.928053 23.831229,35.96875 24.03125,35.96875 C 30.135475,35.96875 35.660367,34.1562 39.625,31.25 C 43.589633,28.3438 46,24.369973 46,20 L 46,19.90625 C 45.981043,15.545078 43.55655,11.604324 39.59375,8.71875 C 35.63095,5.8331761 30.123683,4.03125 24.03125,4.03125 C 23.381564,4.0312499 22.681539,3.982177 21.84375,4.03125 z M 24.03125,5.03125 C 29.927599,5.03125 35.264412,6.757119 39.03125,9.5 C 42.798088,12.242881 44.982638,15.911852 45,19.90625 L 45,20 C 45,24.002253 42.800008,27.674883 39.03125,30.4375 C 35.262492,33.200117 29.937773,34.96875 24.03125,34.96875 C 23.079654,34.946683 22.695929,35.117383 22.40625,35.40625 C 20.316957,37.520999 17.387178,39.593629 13.59375,40.46875 C 14.470139,38.520138 14.848653,36.443413 14.96875,34.6875 C 15.010593,33.903846 14.715478,33.607465 14.03125,33.1875 C 7.360656,30.572123 3.093751,25.543254 3.09375,20 C 3.09375,16.250753 5.042528,12.754344 8.40625,10.03125 C 11.769972,7.3081563 16.52295,5.4329977 21.90625,5.03125 C 22.667268,4.9737265 23.342191,5.0312499 24.03125,5.03125 z "
+     id="path6054"
+     sodipodi:nodetypes="csscccccsccssccsccscscccsscs" />
+</svg>
diff -r e42309469a4a -r 618a3748ff64 pidgin/plugins/extplacement.c
--- a/pidgin/plugins/extplacement.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/plugins/extplacement.c	Mon May 21 20:58:23 2007 +0000
@@ -101,6 +101,11 @@
 	ppref = purple_plugin_pref_new_with_label(_("Conversation Placement"));
 	purple_plugin_pref_frame_add(frame, ppref);
 
+	/* Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above */
+	ppref = purple_plugin_pref_new_with_label(_("Note: The preference for \"New conversations\" must be set to \"By conversation count\"."));
+	purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_INFO);
+	purple_plugin_pref_frame_add(frame, ppref);
+
 	ppref = purple_plugin_pref_new_with_name_and_label(
 							"/plugins/gtk/extplacement/placement_number",
 							_("Number of conversations per window"));
diff -r e42309469a4a -r 618a3748ff64 pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Mon May 21 20:58:23 2007 +0000
@@ -45,15 +45,12 @@
 static GtkWidget *color_widgets[G_N_ELEMENTS(color_prefs)];
 
 static const char *widget_size_prefs[] = {
-	"/plugins/gtk/purplerc/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/set/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_names[] = {
-	N_("GtkTreeView Expander Size"),
 	N_("GtkTreeView Horizontal Separation")
 };
 static GtkWidget *widget_size_widgets[G_N_ELEMENTS(widget_size_prefs)];
@@ -61,16 +58,16 @@
 static const char *font_prefs[] = {
 	"/plugins/gtk/purplerc/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/font/*pidgin_conv_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginlog_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginrequest_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginnotify_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_log_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_request_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_notify_imhtml",
 };
 static const char *font_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginlog_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginrequest_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginnotify_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_log_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_request_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_notify_imhtml",
 };
 static const char *font_names[] = {
 	N_("Conversation Entry"),
@@ -81,16 +78,15 @@
 };
 static GtkWidget *font_widgets[G_N_ELEMENTS(font_prefs)];
 
+/*
 static const char *widget_bool_prefs[] = {
-	"/plugins/gtk/purplerc/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_names[] = {
-	N_("GtkTreeView Indent Expanders"),
 };
 static GtkWidget *widget_bool_widgets[G_N_ELEMENTS(widget_bool_prefs)];
+*/
 
 static void
 purplerc_make_changes()
@@ -143,6 +139,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -152,6 +149,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -167,7 +165,7 @@
 				g_string_append_printf(style_string,
 				                       "style \"%s_style\"\n"
 				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\""
+				                       "widget \"%s\" "
 				                       "style \"%s_style\"\n",
 				                       prefbase, pref,
 				                       prefbase, prefbase);
@@ -236,6 +234,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -245,6 +244,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -260,7 +260,7 @@
 				g_string_append_printf(style_string,
 				                       "style \"%s_style\"\n"
 				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\""
+				                       "widget \"%s\" "
 				                       "style \"%s_style\"\n",
 				                       prefbase, pref,
 				                       prefbase, prefbase);
@@ -486,6 +486,7 @@
 	g_signal_connect(G_OBJECT(check), "toggled",
 	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
@@ -495,15 +496,16 @@
 		gtk_size_group_add_widget(labelsg, check);
 
 		widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-		/*
+		*
 		gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-		*/
+		*
 		gtk_widget_set_sensitive(widget_bool_widgets[i],
 		                         purple_prefs_get_bool(widget_bool_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
 		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 widget_bool_widgets[i]);
 	}
+	*/
 
 	frame = pidgin_make_frame(ret, _("Interface colors"));
 	/* imhtml stuff */
@@ -677,12 +679,14 @@
 		purple_prefs_add_bool(font_prefs_set[i], FALSE);
 	}
 
+	/*
 	purple_prefs_add_none("/plugins/gtk/purplerc/bool");
 	purple_prefs_add_none("/plugins/gtk/purplerc/set/bool");
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		purple_prefs_add_bool(widget_bool_prefs[i], TRUE);
 		purple_prefs_add_bool(widget_bool_prefs_set[i], FALSE);
 	}
+	*/
 }
 
 PURPLE_INIT_PLUGIN(purplerc, purplerc_init, purplerc_info)
diff -r e42309469a4a -r 618a3748ff64 pidgin/plugins/ticker/Makefile.mingw
--- a/pidgin/plugins/ticker/Makefile.mingw	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Mon May 21 20:58:23 2007 +0000
@@ -59,7 +59,7 @@
 
 all: $(TARGET).dll
 
-install: $(PIDGIN_INSTALL_PLUGINS_DIR)
+install: $(PIDGIN_INSTALL_PLUGINS_DIR) all
 	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
 $(OBJECTS): $(PIDGIN_CONFIG_H)
diff -r e42309469a4a -r 618a3748ff64 pidgin/win32/gtkdocklet-win32.c
--- a/pidgin/win32/gtkdocklet-win32.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/win32/gtkdocklet-win32.c	Mon May 21 20:58:23 2007 +0000
@@ -45,7 +45,8 @@
  *  LOCALS
  */
 static HWND systray_hwnd = NULL;
-static HICON cached_icons[DOCKLET_STATUS_CONNECTING + 1];
+/* additional two cached_icons entries for pending and connecting icons */
+static HICON cached_icons[PURPLE_STATUS_NUM_PRIMITIVES + 2];
 static GtkWidget *image = NULL;
 static NOTIFYICONDATA _nicon_data;
 
@@ -466,46 +467,56 @@
 	Shell_NotifyIcon(NIM_DELETE, &_nicon_data);
 }
 
-static void winpidgin_tray_update_icon(DockletStatus icon) {
+static void winpidgin_tray_update_icon(PurpleStatusPrimitive status,
+		gboolean connecting, gboolean pending) {
+
+	int icon_index;
+	g_return_if_fail(image != NULL);
 
-	g_return_if_fail(image != NULL);
-	g_return_if_fail(icon < (sizeof(cached_icons) / sizeof(HICON)));
+	if(connecting)
+		icon_index = PURPLE_STATUS_NUM_PRIMITIVES;
+	else if(pending)
+		icon_index = PURPLE_STATUS_NUM_PRIMITIVES+1;
+	else
+		icon_index = status;
+
+	g_return_if_fail(icon_index < (sizeof(cached_icons) / sizeof(HICON)));
 
 	/* Look up and cache the HICON if we don't already have it */
-	if (cached_icons[icon] == NULL) {
+	if (cached_icons[icon_index] == NULL) {
 		const gchar *icon_name = NULL;
-		switch (icon) {
-		case DOCKLET_STATUS_OFFLINE:
-			icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
-			break;
-		case DOCKLET_STATUS_CONNECTING:
-			icon_name = PIDGIN_STOCK_TRAY_CONNECT;
-			break;
-		case DOCKLET_STATUS_AVAILABLE:
-			icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
-			break;
-		case DOCKLET_STATUS_PENDING:
-			icon_name = PIDGIN_STOCK_TRAY_PENDING;
-			break;
-		case DOCKLET_STATUS_AWAY:
-			icon_name = PIDGIN_STOCK_TRAY_AWAY;
-			break;
-		case DOCKLET_STATUS_BUSY:
-			icon_name = PIDGIN_STOCK_TRAY_BUSY;
-			break;
-		case DOCKLET_STATUS_XA:
-			icon_name = PIDGIN_STOCK_TRAY_XA;
-			break;
-		case DOCKLET_STATUS_INVISIBLE:
-			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+		switch (status) {
+			case PURPLE_STATUS_OFFLINE:
+				icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
+				break;
+			case PURPLE_STATUS_AWAY:
+				icon_name = PIDGIN_STOCK_TRAY_AWAY;
+				break;
+			case PURPLE_STATUS_UNAVAILABLE:
+				icon_name = PIDGIN_STOCK_TRAY_BUSY;
+				break;
+			case PURPLE_STATUS_EXTENDED_AWAY:
+				icon_name = PIDGIN_STOCK_TRAY_XA;
+				break;
+			case PURPLE_STATUS_INVISIBLE:
+				icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+				break;
+			default:
+				icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
+				break;
 		}
 
+		if (pending)
+			icon_name = PIDGIN_STOCK_TRAY_PENDING;
+		if (connecting)
+			icon_name = PIDGIN_STOCK_TRAY_CONNECT;
+	
 		g_return_if_fail(icon_name != NULL);
 
-		cached_icons[icon] = load_hicon_from_stock(icon_name);
+		cached_icons[icon_index] = load_hicon_from_stock(icon_name);
 	}
 
-	systray_change_icon(cached_icons[icon]);
+	systray_change_icon(cached_icons[icon_index]);
 }
 
 static void winpidgin_tray_blank_icon() {
@@ -557,21 +568,21 @@
 	 * That is why we use custom 4-bit icons for pre XP Windowses */
 	if (osinfo.dwMajorVersion < 5 || (osinfo.dwMajorVersion == 5 && osinfo.dwMinorVersion == 0))
 	{
-		cached_icons[DOCKLET_STATUS_OFFLINE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_OFFLINE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_OFFLINE_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_AVAILABLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_AVAILABLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_AVAILABLE_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_AWAY] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_AWAY] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_AWAY_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_XA] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_EXTENDED_AWAY] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_XA_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_BUSY] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_UNAVAILABLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_BUSY_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_CONNECTING] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_NUM_PRIMITIVES] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_CONNECTING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_PENDING] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_NUM_PRIMITIVES+1] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_PENDING_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
-		cached_icons[DOCKLET_STATUS_INVISIBLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
+		cached_icons[PURPLE_STATUS_INVISIBLE] = (HICON) LoadImage(winpidgin_dll_hinstance(),
 			MAKEINTRESOURCE(PIDGIN_TRAY_INVISIBLE_4BIT), IMAGE_ICON, 16, 16, LR_CREATEDIBSECTION);
 	}
 
diff -r e42309469a4a -r 618a3748ff64 pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Mon May 21 20:58:23 2007 +0000
@@ -251,7 +251,13 @@
 
 static gboolean stop_flashing(GtkWidget *widget, GdkEventFocus *event, gpointer data) {
 	GtkWindow *window = data;
+	gpointer handler_id;
+
 	winpidgin_window_flash(window, FALSE);
+
+	if ((handler_id = g_object_get_data(G_OBJECT(window), "flash_stop_handler_id")))
+		g_signal_handler_disconnect(G_OBJECT(window), (gulong) GPOINTER_TO_UINT(handler_id));
+
 	return FALSE;
 }
 
@@ -275,12 +281,12 @@
 		memset(&info, 0, sizeof(FLASHWINFO));
 		info.cbSize = sizeof(FLASHWINFO);
 		info.hwnd = GDK_WINDOW_HWND(gdkwin);
-		if (flash)
-			info.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG;
-		else
+		if (flash) {
+			info.uCount = 3;
+			info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
+		} else
 			info.dwFlags = FLASHW_STOP;
 		info.dwTimeout = 0;
-		info.dwTimeout = 0;
 
 		MyFlashWindowEx(&info);
 	} else
@@ -314,8 +320,11 @@
 
 	winpidgin_window_flash(window, TRUE);
 	/* Stop flashing when window receives focus */
-	g_signal_connect(G_OBJECT(window), "focus-in-event",
-					 G_CALLBACK(stop_flashing), window);
+	if (g_object_get_data(G_OBJECT(window), "flash_stop_handler_id") == NULL) {
+		gulong handler_id = g_signal_connect(G_OBJECT(window), "focus-in-event",
+						     G_CALLBACK(stop_flashing), window);
+		g_object_set_data(G_OBJECT(window), "flash_stop_handler_id", GUINT_TO_POINTER(handler_id));
+	}
 }
 
 static gboolean
diff -r e42309469a4a -r 618a3748ff64 pidgin/win32/nsis/translations/hebrew.nsh
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Mon May 21 20:58:23 2007 +0000
@@ -1,39 +1,84 @@
-;;
-;;  hebrew.nsh
-;;
-;;  Hebrew language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1255
-;;
-;;  Author: Eugene Shcherbina <eugene@websterworlds.com>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"��� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
-!define GTK_SECTION_TITLE			"(����) .GTK+ �����"
-!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
-!define GTK_SECTION_DESCRIPTION		".�����-���������� GUI ���"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� ��"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
-!define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
-!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
+;;
+;;  hebrew.nsh
+;;
+;;  Hebrew language strings for the Windows Pidgin NSIS installer.
+;;  Windows Code page: 1255
+;;
+;;  Updated: Shalom Craimer <scraimer@gmail.com>
+;;  Origional Author: Eugene Shcherbina <eugene@websterworlds.com>
+;;  Version 3
+;;
+
+; Startup checks
+!define INSTALLER_IS_RUNNING			"����� ������ ��� ���."
+!define PIDGIN_IS_RUNNING			"���� �� ����'�� ��� ��. �� ����� �� ����'�� ������ ����."
+!define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"
+
+; License Page
+!define PIDGIN_LICENSE_BUTTON			"��� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
+
+; Components Page
+!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
+!define GTK_SECTION_TITLE			"(����) .GTK+ �����"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"������ ���"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"����� ������"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"����� �����"
+!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
+!define GTK_SECTION_DESCRIPTION		"�����-��������, �� ���� ����'�� GUI ���"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"������-��� ������ ����'��"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"��� �����-��� ���� ����'�� �� ����� ������"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"��� �����-��� ���� ����'�� ������ �����"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"
+!define GTK_WINDOWS_INCOMPATIBLE		"������ 95/98/������� ���� ������ �-GTK+ 2.8.0 �����. GTK+ ${GTK_INSTALL_VERSION} �� �����.$\r�� ��� �� GTK+ ${GTK_MIN_VERSION} ����� �����, ������ ��� �����."
+
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� �� "
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�� ����� ����� �� ������ ������� �� ����'��. ������ ����� ����� ��� ���� ����� �������."
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
+!define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"����� URI"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
+!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"����� ������� ����"
+!define PIDGIN_SPELLCHECK_ERROR		"����� ������ ������ ����"
+!define PIDGIN_SPELLCHECK_DICT_ERROR	"����� ������ ����� ������� ����"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"����� ���� ������ ���� (���� ����� ������� ������)"
+!define ASPELL_INSTALL_FAILED			"������ �����"
+!define PIDGIN_SPELLCHECK_BRETON		"�����"
+!define PIDGIN_SPELLCHECK_CATALAN		"�������"
+!define PIDGIN_SPELLCHECK_CZECH		"�'���"
+!define PIDGIN_SPELLCHECK_WELSH		"������"
+!define PIDGIN_SPELLCHECK_DANISH		"����"
+!define PIDGIN_SPELLCHECK_GERMAN		"������"
+!define PIDGIN_SPELLCHECK_GREEK		"������"
+!define PIDGIN_SPELLCHECK_ENGLISH		"������"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"�������"
+!define PIDGIN_SPELLCHECK_SPANISH		"������"
+!define PIDGIN_SPELLCHECK_FAROESE		"�����"
+!define PIDGIN_SPELLCHECK_FRENCH		"������"
+!define PIDGIN_SPELLCHECK_ITALIAN		"�������"
+!define PIDGIN_SPELLCHECK_DUTCH		"�������"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"��������"
+!define PIDGIN_SPELLCHECK_POLISH		"������"
+!define PIDGIN_SPELLCHECK_PORTUGUESE	"���������"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"������"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"�����"
+!define PIDGIN_SPELLCHECK_SLOVAK		"�������"
+!define PIDGIN_SPELLCHECK_SWEDISH		"������"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"���������"
+
diff -r e42309469a4a -r 618a3748ff64 pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/win32/winpidgin.c	Mon May 21 20:58:23 2007 +0000
@@ -145,7 +145,7 @@
 		putenv(settingsdir);
 
 		snprintf(aspelldir, sizeof(aspelldir), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path);
-		printf("%s", aspelldir);
+		printf("%s\n", aspelldir);
 		putenv(aspelldir);
 
 		/* set the GTK+ path to be \\path\to\GTK\bin */
diff -r e42309469a4a -r 618a3748ff64 pidgin/win32/wspell.c
--- a/pidgin/win32/wspell.c	Mon May 21 20:02:18 2007 +0000
+++ b/pidgin/win32/wspell.c	Mon May 21 20:58:23 2007 +0000
@@ -65,7 +65,7 @@
 static char* lookup_aspell_path() {
 	const char *tmp;
 
-	if ((tmp = g_getenv("PURPLE_ASPELL_DIR")))
+	if ((tmp = g_getenv("PIDGIN_ASPELL_DIR")))
 		return g_strdup(tmp);
 
 	return wpurple_read_reg_string(HKEY_LOCAL_MACHINE, "Software\\Aspell", "Path");
diff -r e42309469a4a -r 618a3748ff64 po/ChangeLog
--- a/po/ChangeLog	Mon May 21 20:02:18 2007 +0000
+++ b/po/ChangeLog	Mon May 21 20:58:23 2007 +0000
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.0.1
+	* Hebrew translation updated (Shalom Craimer)
+	* Hebrew win32 translation updated (Shalom Craimer)
+	* Russian translation updated (Dmitry Beloglazov)
+
 version 2.0.0 (5/3/2007):
 	* Afrikaans translation added (Friedel Wolff)
 	* Afrikaans win32 translation added (Friedel Wolff)
diff -r e42309469a4a -r 618a3748ff64 po/fr.po
--- a/po/fr.po	Mon May 21 20:02:18 2007 +0000
+++ b/po/fr.po	Mon May 21 20:58:23 2007 +0000
@@ -5125,7 +5125,7 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s est dans le groupe « %s » sur la liste locale mais pas pas sur le "
+"%s est dans le groupe « %s » sur la liste locale mais pas sur le "
 "serveur. Voulez-vous ajouter ce contact ?"
 
 #: ../libpurple/protocols/msn/dialog.c:124
@@ -5134,7 +5134,7 @@
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s est sur la liste locale mais pas pas sur le serveur. Voulez-vous ajouter "
+"%s est sur la liste locale mais pas sur le serveur. Voulez-vous ajouter "
 "ce contact ?"
 
 #: ../libpurple/protocols/msn/error.c:36
diff -r e42309469a4a -r 618a3748ff64 po/he.po
--- a/po/he.po	Mon May 21 20:02:18 2007 +0000
+++ b/po/he.po	Mon May 21 20:58:23 2007 +0000
@@ -1,4 +1,4 @@
-# Gaim Hebrew translation
+# Pidgin Hebrew translation
 # Copyright (C) 2005-2007, Shalom Craimer <scraimer at gmail dot com>
 # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net
 #
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2006-03-21 08:51+0200\n"
+"POT-Creation-Date: 2007-05-18 00:00-0400\n"
+"PO-Revision-Date: 2007-05-18 01:30+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. יש לנסות את '%s –h' למידע נוסף.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -43,14 +43,30 @@
 "  -n, --nologin       אל תתחבר אוטומטית\n"
 "  -v, --version       הצג את הגירסא של התוכנה וצא\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "פינץ'"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, 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 נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את "
+"ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:182 ../finch/gntplugin.c:226
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "שגיאה"
@@ -63,16 +79,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "השם לתצוגה של החשבון חייב להיות לא-ריק."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "הודעה על דואר חדש"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "זכור סיסמה"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "עריכת החשבון"
 
@@ -80,103 +96,103 @@
 msgid "New Account"
 msgstr "חשבון חדש"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "שם לתצוגה:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "תיאור:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:764 ../finch/gntblist.c:961
+#: ../finch/gntblist.c:1057 ../finch/gntblist.c:2151 ../finch/gntplugin.c:361
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "ביטול"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:361 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "שמור"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -187,297 +203,318 @@
 msgstr "מחק חשבון"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "מחק"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2056 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "אפשר להפעיל ולהשעות חשבונות מן הרשימה להלן."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1639
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "הוסף"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "ערוך"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s הפך %s לחבר שלו/שלה %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "להוסיף את איש הקשר לרשימה שלך?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s רוצה להוסיף את %s לרשימת אנשי-הקשר שלו או שלה%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "לתת אישור לחבר?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "אשר"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "דחה"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "חובה להזין שם לתצוגה לאיש הקשר."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "חובה להזין קבוצה."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "חובה לבחור חשבון."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "החשבון שבחרת איננו מחובר."
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "שגיאה בהוספת איש קשר"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "שם לתצוגה"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1205
+#: ../libpurple/protocols/msn/msn.c:1358
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1255
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "חשבון"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:813
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "הוסף איש קשר"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "יש להזין מידע על איש הקשר."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "שיחות"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "שם"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:815 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "הוסף שיחה"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "ניתן לערוך עוד מידע מתפריט-ההקשר אחר-כך."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "שגיאה בהוספת קבוצה"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "חובה להזין שם לקבוצה להוספה."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "קבוצה בשם זה כבר קיימת."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:817
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "יש להזין את שם הקבוצה"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:763
 msgid "Edit Chat"
 msgstr "ערוך שיחה"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:763
 msgid "Please Update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:764 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:780
 msgid "Auto-join"
 msgstr "הצטרף אוטומטית"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:789
 msgid "Edit Settings"
 msgstr "ערוך הגדרות"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:827 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "מידע"
+
+#: ../finch/gntblist.c:827 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "שולף..."
+
+#: ../finch/gntblist.c:860 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "הצג פרטים"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:864
 msgid "Add Buddy Pounce"
 msgstr "הוסף תגובה לפעולת איש קשר"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:871 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1587
 msgid "Send File"
 msgstr "שלח קובץ"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:875
 msgid "View Log"
 msgstr "הצג רישום"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:956
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "אנא הזן את השם חדש עבור %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:958 ../finch/gntblist.c:1205
 msgid "Rename"
 msgstr "שנה שם"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:958
+msgid "Set Alias"
+msgstr "קבע שם"
+
+#: ../finch/gntblist.c:959
 msgid "Enter empty string to reset the name."
 msgstr "הזנת מחרוזת ריקה תאפס את השם."
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1035
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "הסרת איש-קשר זה תסיר את על החברים באיש הקשר"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1043
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "הסרת קבוצה זו גם תסיר את כל החברים בקבוצה"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1048
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "האם אתה בטוח שברצונך להסיר את %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1051
 msgid "Confirm Remove"
 msgstr "אשר הסרה"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1056 ../finch/gntblist.c:1207 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1636
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "הסר"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1181 ../finch/gntblist.c:2228 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "רשימת אנשי קשר"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1212
 msgid "Place tagged"
 msgstr "המקום סומן"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1217
 msgid "Toggle Tag"
 msgstr "החלף סימון"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1250 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1366 ../libpurple/protocols/msn/msn.c:1534
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "כינוי"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1270 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1359
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -486,12 +523,12 @@
 "מחוברים: %d\n"
 "סה\"כ: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1368
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "חשבון: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1380
 #, c-format
 msgid ""
 "\n"
@@ -500,87 +537,87 @@
 "\n"
 "נראה לאחרונה: לפני %s"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1645 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "חדש..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1652 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2024 ../finch/gntplugin.c:245 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2132 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "שם_"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2137 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr " חשבון"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2145 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "הודעה מידית חדשה"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2147 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "נא הזן את שם הנמען אליו ברצונך לשלוח הודעה."
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2150 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "אישור"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2170 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2176
 msgid "Send IM..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "הדלק/כבה חברים שלא מחוברים"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2180
+msgid "Show offline buddies"
+msgstr "הצג חברים מנותקים"
+
+#: ../finch/gntblist.c:2186
 msgid "Sort by status"
 msgstr "מיין לפי מצב"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2190
 msgid "Sort alphabetically"
 msgstr "מיין אלפבתית"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2194
 msgid "Sort by log size"
 msgstr "מיין לפי גודל יומן השיחות"
 
@@ -603,55 +640,55 @@
 "%s נותק עקב התקלה הבאה:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "שגיעת התחברות"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "אין פקודה כזו."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "שגיאת תחביר:  הקלדת מספר שגוי של ארגומנטים לפקודה זו."
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "הפקודה שלך נכשלה מסיבה לא ידועה."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "פקודה זו פועלת רק בתוך צ'אטים, לא בהודעות."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "פקודה זו פועלת רק בהודעות, לא בתוך צ'אטים."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "פקודה זו לא פועלת בפקוטוקול זה."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "אין עדיין תמיכה בפקודות. ההודעה לא נשלחה."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -660,24 +697,48 @@
 "\n"
 "%s כותב כרגע..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "עזבת את הצ'אט הזה."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "שלח אל"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "שיחה"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "נקה גלילה לאחור"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "הצג חתימות-זמן"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "הוסף תגובה לפעולת איש קשר..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<מענה-אוטומטי> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "רשימת משתמשים:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:842 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:877 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "אין פקודה כזו (בהקשר הזה)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -685,55 +746,59 @@
 "התשמש ב-\"help &lt;פקודה&gt;\" לקבלת עזרה על פקודה ספציפית.\n"
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:938 ../pidgin/gtkconv.c:7073
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:941 ../pidgin/gtkconv.c:7076
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:944 ../pidgin/gtkconv.c:7079
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:947 ../pidgin/gtkconv.c:7082
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: נקה את תוכן חלון השיחה."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:950 ../pidgin/gtkconv.c:7085
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  עזרה על פקודה ספציפית."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:953
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  הצג את רשימת המשתמשים בצ'אט."
+
+#: ../finch/gntconv.c:958
 msgid "plugins: Show the plugins window."
 msgstr "plugins: : הצג את חלון התוספים."
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:961
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: הצג את רשימת החברים."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:964
 msgid "accounts: Show the accounts window."
 msgstr "accounts: הצג את חלון החשבונות."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:967
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: הצג את חלון ניפוי הבאגים."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:970
 msgid "prefs: Show the preference window."
 msgstr "prefs: הצג את חלון ההעדפות."
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:973
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "חלון ניפוי באגים"
 
@@ -741,18 +806,18 @@
 #. * 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:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "נקה"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "נפה: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "חתימת זמן"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -784,26 +849,26 @@
 msgstr "נשאר"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "מצב"
 
@@ -820,10 +885,10 @@
 msgstr "עצור"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:206
+#: ../finch/gntplugin.c:292 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "סגור"
 
@@ -853,68 +918,68 @@
 msgid "Transferring"
 msgstr "מעביר"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "דוא\"ל"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "יש לך דואר!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "מאת"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "הנדון"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) יש הודעה חדשה %d."
 msgstr[1] "%s (%s) יש %d הודעות חדשות."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "דוא\"ל חדש"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "מידע עבור %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "מידע עבור איש הקשר"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "המשך"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1615 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "מידע"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1576
 msgid "IM"
 msgstr "הודעה"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "הצטרף"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "הזמן"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(ללא)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:125
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -931,39 +996,36 @@
 "אתר: %s\n"
 "קובץ: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:183
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "על התוסף להיות טעון לפני שניתן לשנות לו הגדרות."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "עדיין צריך לעשות משהו בקשר לזה."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:227
 msgid "No configuration options for this plugin."
 msgstr "אין אפשרויות הגדרה לתוסף זה."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:250
 msgid "You can (un)load plugins from the following list."
 msgstr "ניתן לטעון ולהשעות תוספים מן הרשימה שלהלן."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:297
 msgid "Configure Plugin"
 msgstr "הגדר את התוסף"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:353 ../finch/gntplugin.c:360 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "העדפות"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "הזן איש קשר שיש להגיב לפעילות שלו."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "צור תגובת פעילות חדשה"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "ערוך שינויים בתגובת פעילות"
 
@@ -973,8 +1035,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "חשבון:"
 
@@ -983,52 +1045,52 @@
 msgstr "שם איש הקשר:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "הפעל כאשר איש-קשר..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "מתחבר"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "מתנתק"
+msgid "Signs on"
+msgstr "מתחבר"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "מתנתק"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "מתרחק/ת מהמחשב"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "חוזר/ת למחשב"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "חסר/ת פעילות"
+msgid "Returns from away"
+msgstr "חוזר/ת למחשב"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "חסר/ת פעילות"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "כבר לא חסר/ת פעילות"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "מתחיל/ה להקליד"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "עוצר בעת הקלדה"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "מפסיק/ה להקליד הודעה"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "שולח הודעה"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "פעולה"
 
@@ -1056,141 +1118,132 @@
 msgid "Pounce only when my status is not available"
 msgstr "הגב רק כאשר אני מסומן כלא זמין"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "חוזר"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "האם אתה בטוח שברצונך למחוק את התגובה על %s עבור %s?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "תגובות פעילות"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s התחיל לכתוב לך הודעה (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s עצר בזמן כתיבת הודעה אליך (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s התחבר (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s חזר לפעילות (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s חזר למחשב (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s הפסיק להקליד לך הודעה (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s התנתק (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s חסר פעילות (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s התרחק/ה מהמחשב. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s שלך לך הודעה. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "מזמן שליחת ההודעה האחרונה"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "לעולם לא"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "הצג זמן חוסר פעילות"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "הצג חברים מנותקים"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "הצג חתימות-זמן"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "הודע לאנשי קשר בעת שאת/ה מקליד"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "מבנה הרישום"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "רשום הודעות מיידיות"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "רשום שיחות"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "רשום את כל שינויי הסטטוס"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "שיחות"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "רישום"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "העדפות"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "טרם יושם."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "שמירה בשם..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "פתח..."
 
@@ -1203,102 +1256,102 @@
 msgid "Delete Status"
 msgstr "מחק מצב"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "סטטוסים נשמרו"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "תואר"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "סוג"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5463
+#: ../libpurple/protocols/oscar/oscar.c:5681
+#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
 #: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "הודעה"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "השתמש"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "כותרת לא-תקפה"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "יש להזין כותרת לא-ריקה עבור המצב."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "כפילות בכותרות"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "יש להזין כותרת שונה עבור המצב."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "תת-מצב"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "מצב:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "הודעה:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "ערוך מצב"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "השתמש בסטטוס שונה עבור החשבונות הבאים"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "שמור והשתמש"
 
@@ -1318,67 +1371,66 @@
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr ""
-"כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
-
-#: ../finch/plugins/gntgf.c:209
+msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
+
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s כרגע התחבר"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s כרגע התנתק"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s שלך לך הודעה"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s אמר את השם-כינוי שלך בתוך %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s שלך לך הודעה בתוך %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "איש קשר מתחבר/מתנתק"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "את/ה מקבל/ת הודעה מיידית"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "מישהו מדבר בשיחה"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr "התרעה עם טוסטר כאשר"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr "גם צפצף!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr "קבע כדחוף בחלון הטרמינל"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
 msgid "Toaster plugin"
 msgstr "תוסף טוסטר"
 
@@ -1432,83 +1484,84 @@
 msgid "Lastlog plugin."
 msgstr "תוסף Lastlog."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "חשבונות"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "ססמתך נחוצה להתחברות."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "הזן סיסמה עבור %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "הזן סיסמא"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "שמור חדשה"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "חסר תוסף הפרוטוקול עבור %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "הסיסמה החדשה ווידואה אינם תואמים."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "יש למלא את כל שדות הטופס."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "סיסמא מקורית"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "ודא סיסמה חדשה"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "שנה סיסמא עבור %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "אנא הזן את סיסמתך הנוכחית וסיסמתך החדשה:"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "שנה פרטי משתמש עבור %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "אנשי קשר"
@@ -1532,7 +1585,7 @@
 msgstr "+++ %s התנתק"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1555,40 +1608,40 @@
 msgid "Unable to send message."
 msgstr "לא ניתן לשלוח הודעה"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "שלח הודעה"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "שלח הודעה"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s נכנס לחדר"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] נכנס לחדר."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "%s ידוע כעת בשם אתה"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ידוע כעת בשם %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s עזב את החדר"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s עזב את החדר (%s)."
@@ -1608,6 +1661,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "כישלון בהשגת שם שרת: %s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "שרת ה- D-BUS של Purple אינה פועלת עקב הסיבות שלהלן"
+
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "ללא שם"
@@ -1657,7 +1714,7 @@
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1701,22 +1758,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s אינו קובץ רגיל. מסרב בפחדנות לכתוב עליו.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s רוצה לשלוח לך %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s רוצה לשלוח לך קובץ"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "האם ברצונך לקבל את הבקשה להעברת קובץ מ-%s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1727,60 +1784,60 @@
 "שרת מרוחק: %s\n"
 "יציאה מרוחקת: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s מציע/ה לשלוח קובץ %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s אינו שם חוקי לקובץ.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "מציע לשלוח %s ל-%s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "מתחיל את ההעברה של %s מ-%s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "העברה של קובץ %s הושלמה"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "הושלמה העברת הקובץ"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "ביטלת את העברת %s"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "העברת הקובץ בוטלה"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ביטל את העברת %s"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ביטל את העברת הקובץ"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "העברת הקובץ ל-%s נכשלה."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "העברת הקובץ מ-%s נכשלה."
@@ -1966,8 +2023,8 @@
 #: ../libpurple/log.c:1251
 #, c-format
 msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+"<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;מענה "
 "אוטומטי&gt;:</b></font> %s<br/>\n"
@@ -1975,11 +2032,11 @@
 #: ../libpurple/log.c:1253
 #, 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;מענה "
-"אוטומטי&gt;:</b></font> %s<br/>\n"
+"<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;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
@@ -2073,41 +2130,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "קבע הגדרות אישור קבלה אוטומטי"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "שמור"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "ביטול"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "שאל"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "אשר אוטומטית"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "התחבר מחדש בצורה אוטומטית"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "אשר העברת קבצים אוטומטית..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2115,11 +2172,11 @@
 "נתיב לשמור בו את הקבצים\n"
 "(יש לספק נתיב מלא)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "דחה אוטומטית ממשתמשים שאינם ברשימת החברים שלי"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2127,108 +2184,8 @@
 "הצג התרעה לאחר שהעברת קובץ שאושר אוטומטית הסתיימה\n"
 "(רק כאשר אין שיחה עם השולח)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "מענה אוטומטי לכל הפרוטוקולים"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"תוסף זה מאפשר קביעת הודעת מענה אוטומטי לכל פרוטוקול. ניתן לקבוע הודעת מענה "
-"גלובאלית מתוך חלון הגדרות התוספים. לקביעת הודעת מענה עבור איש-קשר מסויים, יש "
-"ללחוץ כפתור ימני על אותו איש קשר בחלון רשימת אנשי הקשר. לקביעת הודעות מענה "
-"עבור חשבון מסויים, יש לגשת לכרטיסיית ה'מתקדם' של חלון עריכת החשבון."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "קבע הודעת מענה אוטומטי עבור %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "קבע הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"ההודעה להלן תישלח אל איש הקשר כאשר הוא שולח הודעה אליך, והמענה האוטומטי פעיל."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "קבע הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "שלח הודעות מענה אוטומטי כאשר"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "כאשר החשבון שלי מרוחק"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "כאשר החשבון שלי חסר פעילות"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "מענה ברירת מחדל"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "הודעת מצב"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "ענה אוטומטית עם הודעת המצב"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "תמיד כאשר יש הודעת מצב"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "רק כאשר אין הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "השהייה בין מענים אוטומטיים"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "השהייה מינימלית (בדקות)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "פעמים לשלוח מענות אוטומטיים"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "מירב הפעמים"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "אינני זמין כרגע. אנא השאר/י לי את הודעתך, ואני אחזור אליך בהקדם."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Notes"
 msgstr "הערות"
 
@@ -2236,10 +2193,12 @@
 msgid "Enter your notes below..."
 msgstr "הזן את הערותיך להלן..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "ערוך הערות..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2256,7 +2215,7 @@
 msgid "Store notes on particular buddies."
 msgstr "אחסן הערות על אנשי-קשר מסויימים"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "מוסיף את האפשרות לרשום הערות על אנשי הקשר ברשימתך."
@@ -2316,46 +2275,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "מאפשר שליטה ע\"י הכנסת פקודות לקובץ."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "דקות"
 
 #. 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:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../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 "אני רוצה לנוח"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "קבע את זמן חוסר פעילות של החשבון"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_קבע"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "אף אחד מן החשבונות שלך חסר-פעילות."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "בטל את זמן חוסר פעילות של החשבון"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "ב_טל"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "קבע את זמן חוסר הפעילות עבור כל החשבונות"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "בטל את זמן חוסר הפעילות עבור כל החשבונות"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "מאפשר להגדיר ידנית כמה זמן החשבון בחוסר פעילות"
 
@@ -2425,19 +2384,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "הסתרת הצטרפות/עזיבה"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "מסתיר הודעות הצטרפות/עזיבה לא נחוצות."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../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."
@@ -2554,19 +2513,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "הצופה ביומנים"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "כלול יומנים של תוכנות צ'אט אחרות בצופה-היומנים."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2580,12 +2539,12 @@
 "אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש "
 "להשתמש בו על חשבון סיכונך האישי בלבד!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "טוען תוספי .NET עם Mono."
 
@@ -2608,7 +2567,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "מוסיף שורה חדשה לפני הודעה מוצגת."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2650,31 +2609,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "ניתן לערוך/למחוק את תגובת-הפעילות מתוך חלון תגובות-הפעילות"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "כן"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "לא"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "שמור הודעות לא-מקוונות בתגובת-פעילות"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "אל תשאל. תמיד שמור בתגובת פעילות."
 
@@ -2684,50 +2643,50 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "תוסף להפעלת תוכנות Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "מאפשר טעינה של תוספי Perl."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "מצב מנבא-עתידות"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "מצב מנבא-עתידות לשיחות נכנסות"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
-"עבור AIM, ICQ, Jabber, Sametime, Yahoo!"
-
-#: ../libpurple/plugins/psychic.c:66
+"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "אתה מרגיש הפרעה בכוח..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "אפשר רק עבור משתמשים ברשימת אנשי-הקשר שלי"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "כבה כאשר מרוחק מהמחשב"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "הצג הודעת התרעה בשיחות"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "הצג שיחות מנובאות"
 
@@ -2792,7 +2751,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2800,8 +2759,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "מספק תמיכה ב-SSL דרך GNUTLS."
 
@@ -2811,7 +2770,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2819,8 +2778,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "מספק תמיכה ב-SSL דרך מוזילה NSS."
 
@@ -2871,7 +2830,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "התרעות על מצב אנשי הקשר"
 
@@ -2879,8 +2838,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../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."
@@ -2888,15 +2847,15 @@
 "מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או "
 "חוזר."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "מטעין לתוספי Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "מספק תמיכה לטעינת תוספי Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2918,18 +2877,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4496
+#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
@@ -2943,51 +2902,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "תוסף פרוטוקול Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "אדם סגול"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "שם שרת"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "שם פרטי"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "שם משפחה"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "דוא\"ל"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "חשבון AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "חשבון Jabber"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "חשבון XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -3070,67 +3029,67 @@
 msgid "Save buddylist..."
 msgstr "שמור את רשימת אנשי הקשר..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "יש למלא את שדות ההרשמה."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "הושלמה ההרשמה לחשבון החדש של Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "הרישום בוצע בהצלחה"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "סיסמה"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "סיסמא )שוב("
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "הזן ערך נוכחי"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "ערך נוכחי"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "בצע רישום לחשבון חדש של Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "יש למלא את השדות הבאים"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "עיר"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "שנת לידה"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3138,219 +3097,219 @@
 msgid "Gender"
 msgstr "מין"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "זכר או נקבה"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "זכר"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "נקבה"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "רק כשמחובר"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "חפש אנשי קשר"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "יש להזין את הגדרות החיפוש להלן"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "יש למלא את השדות."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "הסיסמא הנוכחית שלך שונה מזו שהוזנה."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "לא ניתן לשנות את הסיסמה. אירעה שגיאה.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "שנה סיסמא עבור חשבון ה-Gadu-Gadu."
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "הסיסמא שונתה בהצלחה!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "סיסמא נוכחית"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "יש להזין את סיסמתך הנוכחית וסיסמתך החדשה עבור משתמש מספר: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "שינוי סיסמת Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "בחר צ'אט עבור איש הקשר: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "הוסף לשיחה..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5513
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "מנותק"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "זמין"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "מספר זיהוי"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "שנת לידה"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "לא ניתן להציג את תוצאות החיפוש."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "מדריך ציבורי ל-Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "תוצאות חיפוש"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "לא נמצאו משתמשים תואמים"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "לא נמצאו משתמשים התואמים לקריטריוני החיפוש שלך."
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "אין אפשרות לקרוא את השקע"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "רשימת אנשי הקשר הועתקה"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "רשימת אנשי הקשר שלך הועתקה מן השרת."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "רשימת אנשי הקשר נשלחה"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "רשימת אנשי הקשר שלך אוכסנה על השרת"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "ההתחברות נכשלה."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "חסום"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "הוסף לשיחה"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "הסר חסימה"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "חסום"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "שם _צ'אט:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "שגיאה בצ'אט"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "שם הצ'אט הזה כבר בשימוש"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "לא מחובר לשרת."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "חפש אנשי קשר..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "שנה סיסמא..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "שלח את רשימת אנשי הקשר לשרת"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "שנה סיסמא..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "שלח את רשימת אנשי הקשר לשרת"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "שלוף את רשימת אנשי הקשר מהשרת"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "מחק את רשימת אנשי קשר מהשרת"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "שמור את רשימת אנשי הקשר לקובץ..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "טען את רשימת אנשי הקשר מקובץ..."
 
@@ -3365,35 +3324,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "תוסף פרוטוקול Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "מערכת הודעות פופולרית בפולין"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "משתמש Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "פקודה בלתי מוכרת: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "הנושא הוא: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "אין כותרת"
 
@@ -3428,7 +3387,7 @@
 msgstr "הודעת היום עבור %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "השרת התנתק"
 
@@ -3451,59 +3410,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "מתחבר"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "אין תמיכה ב-SSL."
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
-msgstr "אין אפשרות ליצור שקע "
-
-#: ../libpurple/protocols/irc/irc.c:402
+msgstr "אין אפשרות ליצור שקע"
+
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "לא ניתן להתחבר לשרת"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "ההתחברות נכשלה"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "כשל בלחיצת היד של SSL"
 
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "שגיאה בקריאה"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "משתמשים"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3517,56 +3476,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "תוסף פרוטוקול IRC שפחות מבאס"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "שרת"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2134
+#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "י_ציאה"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "קידוד"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "שם אמיתי"
 
@@ -3574,223 +3532,223 @@
 #. 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:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "השתמש ב-SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "מצב לא תקין"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "מחסמה גישתך ל %s/"
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "חסום"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "לא ניתן לחסום %s: רשימת החסימה מלאה"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(שוטר צא'ט)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(מזוהה)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "כינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "כרגע ב-"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "לא פעיל כבר"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "מחובר מאז"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>התואר המגדיר:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "מרומם"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s שינה את הנושא להיות: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s איפס את הנושא."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "הנושא של %s הוא: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "הודעת לא מוכרת '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "הודעת לא מוכרת"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "שרת ה-IRC קיבל הודעה שלא הבין."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "משתמשים ב-%s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "מענה זמן"
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "השעה מקומית אצל שרת ה-IRC היא:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "אין כזה ערוץ"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "אין כזה ערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "המשתמש לא מחובר"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "לא קיים כזה משתמש או ערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "שליחת המסר נכשלה"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "הצטרפות ל %s דורשת הזמנה."
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "בהזמנה בלבד"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "נבעטת ע\"י: %s (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "נבעט ע\"י %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "מצב (%s %s) ע\"י %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "כשל בשינוי הכינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "אין אפשרות לשנות כינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "עזבת את הערוץ%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "שגיאה: התקבל PONG לא תקף מהשרת"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "מענה PING – בהשהייה של: %lu שניות"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "לא ניתן להצטרף ל %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "לא ניתן להצטרף אל %s: דרושה הרשמה."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "לא ניתן להצטרף לערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "שם הכינוי או הערוץ לא זמינים כרגע."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "כאפה מ-%s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;פעולה לביצוע&gt;: פעל פעולה ."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
 "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../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."
@@ -3798,7 +3756,7 @@
 "deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות "
 "מפעיל ערוץ כדי לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../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 "
@@ -3808,7 +3766,7 @@
 "מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה "
 "זו."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../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."
@@ -3816,7 +3774,7 @@
 "invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ "
 "הנוכחי."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../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."
@@ -3824,7 +3782,7 @@
 "j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם "
 "אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../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."
@@ -3832,7 +3790,7 @@
 "join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, "
 "עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../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."
@@ -3840,7 +3798,7 @@
 "kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי "
 "לעשות זאת."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../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>"
@@ -3848,15 +3806,15 @@
 "list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע "
 "פעולה זו.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: שלח פקודה אל memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../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."
@@ -3864,27 +3822,27 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ "
 "או משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../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;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;כינוי חדש&gt;:  שינוי שם הכינוי שלך."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: שלח פקודה אל nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3892,7 +3850,7 @@
 "op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך "
 "להיות מפעיל ערוץ לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3900,18 +3858,18 @@
 "operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה "
 "להשתמש בזה."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr " operserv: שלח פקודה אל operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 "part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3919,22 +3877,22 @@
 "ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין "
 "משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 "query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  שלח פקודה ישירות לשרת."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3942,23 +3900,23 @@
 "remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ "
 "לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: מציג את השעה המקומית בשרת ה-IRC."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [נושא חדש]:  הצג או שנה את נושא הערוץ."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  קבע או הסר מצב משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [שם כינוי]: שלח בקשה CTCP VERSION למשתמש"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -3966,155 +3924,161 @@
 "voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות "
 "מפעיל הערוץ לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [שרת] &lt;שם כינוי&gt;:  השג מידע על משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;שם כינוי&gt;:  השג מידע על משתמש שהתנתק."
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "זמן מענה מ-%s: %lu שניות"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "פונג"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "מענה CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "מנותק."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "השרת לא היה מסוגל לאמת אותך ללא סיסמא"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "אימות לא מוצפן"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "השרת לא תומך באימות באף תצורה"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "שגיעה בתגובה מהשרת"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת.להמשיך בכל זאת?"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr "השרת לא תומך באימות באף תצורה"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "שגיעה בתגובה מהשרת"
-
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "תשובת אימות לא תקפה מהשרת"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "שגיאת SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "שם מלא"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "שם משפחה"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "שם פרטי"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "קישור"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "כתובת"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "מיקום"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "איזור"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "מיקוד"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "מדינה"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "טלפון"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4122,152 +4086,152 @@
 msgstr "דואר"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "שם האירגון"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "מחלקה"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "יום הולדת"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "תיאור"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "ערוך את ב-Jabber vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "ערוך את ה- XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "כל הפריטים להלן הם בחירה. יש להזין רק את המידע שאת/ה מרגיש/ה נוח לתת."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "לקוח"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "מערכת הפעלה"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "משאב"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "עדיפות"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "כתובת"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "תיבת דואר"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "תצלום"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "סמל"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "הצג תבנית"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "בטל התרעת נוכחות"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
-msgstr "בטל את המנוי "
-
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+msgstr "בטל את המנוי"
+
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "פטפטן"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "להלן תוצאות החיפוש שלך"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4275,68 +4239,68 @@
 "מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך "
 "בחיפושים עם אותיות חלופיות (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "שגיאה בשאילתת הספרייה"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "לא ניתן לתשאל את שרת הספרייה"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "הנחיות שרת: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי Jabber מתאימים."
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי XMPP מתאימים."
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "כתובת דוא\"ל"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "חפש משתמשי Jabber"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "חיפוש משתמשי XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "ספרייה לא חוקית"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "כנס לספריית משתמש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "בחר ספריית משתמש לחיפוש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "חפש בספרייה"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5223
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_חדר:"
@@ -4349,80 +4313,80 @@
 msgid "_Handle:"
 msgstr "כ_ינוי:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s אינו שם חדר תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "שם החדר אינו תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s אינו שם תקף לשרת"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "שם שרת לא תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s אינו כינוי-חדר תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "כינוי-חדר לא תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "שגיאת הגדרות"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "לא ניתן לבצע הגדרה"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "שגיאה בהגדרות החדר"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "לא ניתן לשנות הגדרות חדר זה"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "שגיאת הרשמה"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "לא ניתן לשנות את כינוי המשתמש בחדרי צ'אט של מסוג MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "שגיאה בעת הורדת רשימת החדרים"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "שם השרת אינו תקין"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "יש להזין שרת ועידה"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "יש לבחור שרת ועידה לתישאול"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "חפש חדרים"
 
@@ -4445,416 +4409,420 @@
 msgid "Unable to create socket"
 msgstr "אין אפשרות ליצור שקע"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "זיהוי משתמש Jabber לא תקין"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "מזהה XMPP לא תקין"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "מזהה XMPP שגוי. יש להגדיר את הדומיין."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "הרישום של %s@%s בוצע בהצלחה"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "רישום בוצע בהצלחה"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "שגיאה לא ידועה"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "הרישום נכשל"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "הכינוי כבר רשום."
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "מחוז"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "מיקוד"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "טלפון"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "תאריך"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr ".יש להזין את המידע להלן כדי לרשום את החשבון החדש שלך"
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "רשום חשבון Jabber חדש"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "רשום חשבון XMPP חדש"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "הרשם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "מאתחל זרם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "מאמת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "מאתחל את הזרם מחדש"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5511
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "שניהם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "מאת (אל מושהה)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "אל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "ללא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "מנוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "סיסמה שונתה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "הסיסמה שלך שונתה."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "שגיאה במהלך שינוי הסיסמה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "סיסמא (שנית)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "הסיסמה שלך שונתה בהצלחה"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "שנה סיסמת XMPP"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "הזן את הסיסמה החדשה שלך."
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "קבע את המידע על המשתמש..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "שנה סיסמא..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "_חפש משתמשים..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "בקשה שגויה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "התנגשות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "טרם יושם."
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "אסור"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "לא-נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "שגיאה פנימית בשרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "פריט לא נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "זיהוי משתמש Jabber לא תקין"
-
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "זיהוי משתמש XMPP לא תקין"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "לא קביל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "לא מורשה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "נדרש תשלום"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "נמען לא זמין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "נדרשת הרשמה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "שרת לא נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "תם הזמן המוקצב לתקשורת שרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "עומס יתר על השרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "השירות אינו זמין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "נדרש מנוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "בקשה לא צפוייה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "אימות בוטל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "קידוד שגוי באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "authzid לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "מנגנון האימות לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "מנגנון האימות חלש מדי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "כשל זמני באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "כשל באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "מבנה לא תקין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "נתיב הקשר-שם שגוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "התנגשויות משאבים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "אזל הזמן המוקצב לחיבור"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "המארח נעלם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "מארח לא מוכר"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "כיתובת לא נכונה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "זיהוי לא תקין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "הקשר-שם לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "XML שגוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "מארחים לא תואמים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "חילול ההסכם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "שגיאת תקשורת בצד המרוחק"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "הגבלת משאבים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML מוגבל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "צפה במארח אחר"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "כיבוי המערכת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "מקרה לא מוגדר מראש"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "קידוד שלא נתמך"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "סוג סטנזה שלא נתמכת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "גירסא ללא תמיכה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML לא מובנה נכון"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "שגיאה בזרם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "לא ניתן לחסום משתמש %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "ייחוס לא מוכר: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "לא ניתן לייחס את משתמש %s בתור \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "תפקיד לא מוכר: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "לא ניתן לקבוע תפקיד \"%s\" עבור משתמש: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "לא ניתן לבעוט במשתמש %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  קבע הגדרות חדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  קבע הגדרות חדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [חדר]:  עזוב את החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  הרשם בחדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [נושא חדש]:  הצג או שנה את הנושא."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;משתמש&gt; [חדר]:  חסום משתמש מן החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4862,7 +4830,7 @@
 "affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש "
 "עם החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4870,19 +4838,19 @@
 "role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש עם "
 "החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;חדר&gt; [שרת]:  הצטרף לצ'אט בשרת זה."
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;משתמש&gt; [חדר]:  בעט משתמש מהחדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש אחר."
@@ -4897,55 +4865,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "תוסף פרוטוקול Jabber"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "תוסף פרוטוקול XMPP"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "דומיין"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "אלץ שימוש ב-SSL ישן )יציאה 5223("
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "אפשר אישרור לא מוצפן בתקשורת לא מוצפנת"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "יציאת ההתחברות"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "שרת ההתחברות"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s עזב את השיחה."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "הודעה מ-%s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s שינה את הנושא להיות: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "הנושא הוא: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "תקלה במשלוח הודעה אל %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "הודעת שגיאה לא מוכרת (Jabber)"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "הודעת שגיאת XMPP"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr "(קוד %s)"
@@ -4954,36 +4932,36 @@
 msgid "XML Parse error"
 msgstr "שגיאת פיענוח XML"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "שגיאה לא מוכרת בנוכחות"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "הגדרות החדר"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "שגיאה בשיחה %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "שגיאה בהצטרפות לצ'אט %s"
@@ -5212,7 +5190,7 @@
 msgstr "השרת עסוק מדי"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5248,39 +5226,39 @@
 msgid "MSN Error: %s\n"
 msgstr "שגיאת MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "כרגע שלחת דחיפה קלה!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "השם הידידותי החדש שלך ל-MSN ארוך מדי."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "קבע/י את שמך הידידותי."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "זהו השם שאותו יראו אנשי הקשר שלך ב-MSN."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "קבע/י את מספר הטלפון בבית."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr ". קבע/י את מספר הטלפון בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "קבע/י את מספר הטלפון הנייד."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "אפשר הודעות לנייד מ-MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5288,129 +5266,128 @@
 "האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות "
 "לטלפון הנייד או שאר מכשירים ניידים?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "אפשר"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "אל תאפשר"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "שלח בתור הודעה לנייד."
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "דף"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "יש אותך"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
-msgstr "חוזר עוד שניה"
-
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+msgstr "מיד אשוב"
+
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "משוחח בטלפון"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "יצא לאכול"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "קבע/י שם ידידותי..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "קבע/י מספר טלפון בבית..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "קבע/י מספר טלפון בעבודה..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "קבע/י מספר טלפון נייד..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "אפשר/בטל מכשירים ניידים..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "אפשר/בטל הודעות למכשירים ניידים..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:625
 msgid "Open Hotmail Inbox"
 msgstr "פתח את תיבת הדואר של Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:649
 msgid "Send to Mobile"
 msgstr "שלח למכשיר נייד"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:659
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "יז_ום שיחה"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:697
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
-
-#: ../libpurple/protocols/msn/msn.c:719
+msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
+
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Failed to connect to server."
 msgstr "כשל בהתחברות לשרת"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1457 ../libpurple/protocols/msn/msn.c:1802
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "שגיאה בשליפת הפרופיל"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1528 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "כללי"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "גיל"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1537
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "עיסוק"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5418,186 +5395,186 @@
 msgid "Location"
 msgstr "מיקום"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1543 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Hobbies and Interests"
 msgstr "תחביבים ותחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1669
+#: ../libpurple/protocols/msn/msn.c:1675 ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1697
 msgid "A Little About Me"
 msgstr "קצת אודותיי"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1566
 msgid "Social"
 msgstr "חברתי"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1568
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "מצב משפחתי"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1569
 msgid "Interests"
 msgstr "תחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Pets"
 msgstr "חיות מחמד"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Hometown"
 msgstr "עיר המולדת"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Places Lived"
 msgstr "ערי מגורים"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Fashion"
 msgstr "אופנה"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Humor"
 msgstr "הומור"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Music"
 msgstr "מוסיקה"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1576 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "ציטוט אהוב"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Contact Info"
 msgstr "מידע על איש הקשר"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Personal"
 msgstr "אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Significant Other"
 msgstr "בן/בת-זוג"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Home Phone"
 msgstr "טלפון בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone 2"
 msgstr "טלפון בבית 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "כתובת בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1601
 msgid "Personal Mobile"
 msgstr "טלפון נייד"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Home Fax"
 msgstr "פקס בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Personal E-Mail"
 msgstr "דוא\"ל אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal IM"
 msgstr "IM אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1606
 msgid "Anniversary"
 msgstr "יום נישואין"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Work"
 msgstr "בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1624
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "תואר"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "חברה"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1626
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "מחלקה"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Profession"
 msgstr "מקצוע"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work Phone"
 msgstr "טלפון בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone 2"
 msgstr "טלפון בעבודה 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "כתובת העבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Work Mobile"
 msgstr "טלפון נייד בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Pager"
 msgstr "ביפר בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Fax"
 msgstr "פקס בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work E-Mail"
 msgstr "דוא\"ל בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work IM"
 msgstr "IM בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Start Date"
 msgstr "תאריך תחילה"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1712
+#: ../libpurple/protocols/msn/msn.c:1719 ../libpurple/protocols/msn/msn.c:1726
 msgid "Favorite Things"
 msgstr "דברים מועדפים"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1771
 msgid "Last Updated"
 msgstr "עודכן לאחרונה"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1782
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "כתובת אתר בית"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1803
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1804
 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 "
@@ -5606,13 +5583,13 @@
 "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
 "שהמשתמש קיים אך לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1808
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL לפרופיל"
@@ -5627,19 +5604,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2102 ../libpurple/protocols/msn/msn.c:2104
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2138
 msgid "Use HTTP Method"
 msgstr "השתמש בשיטת HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2143
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2151
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5716,7 +5693,7 @@
 msgid "Unable to delete group"
 msgstr "אין אפשרות למחוק את הקבוצה"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1304
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5769,8 +5746,8 @@
 msgstr "שגיאה בפיענוח HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "אתה התחברת ממיקום נוסף."
 
@@ -5908,7 +5885,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
-msgstr "לא נתמך "
+msgstr "לא נתמך"
 
 #: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
@@ -6085,7 +6062,7 @@
 msgstr "לא ניתן להסיר את %s מרשימת הפרטיות (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "לא ניתן לשנות את הגדרות הפרטיות בשרת (%s)."
@@ -6096,7 +6073,7 @@
 msgstr "אין אפשרות ליצור ועידה (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "שגיאה בתקשורת עם השרת. סוגר את החיבור."
 
@@ -6112,8 +6089,8 @@
 msgid "Mailstop"
 msgstr "תחנת דואר"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "שם משתמש"
 
@@ -6123,41 +6100,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "שם מלא"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "ועידת GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "לא ניתן לבצע חיבור SSL לשרת."
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "מאמת..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "לא ניתן להתחבר לשרת"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "לא ניתן להתחבר לשרת"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "ממתין לתשובה..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s הוזמן לשיחה זו."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "הזמנה לשיחה"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6168,16 +6145,16 @@
 "\n"
 "נשלחה: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "האם ברצונך להצטרף לשיחה?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "נותקת כיוון שהתחברת ממחשב אחר."
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6187,17 +6164,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת שברצונך להתחבר אליו."
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות."
 
@@ -6211,22 +6188,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "תוסף תקשורת ב-Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "כתובת שרת"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "פורט השרת"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6234,8 +6211,8 @@
 msgstr "השרת סגר את החיבור."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6272,8 +6249,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "תוסף פרוטוקולים AIM"
 
@@ -6287,14 +6264,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "תוסף פרוטוקול ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "קידוד"
 
@@ -6424,7 +6401,7 @@
 msgid "Not while on AOL"
 msgstr "לא בזמן שהות ב-AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6435,7 +6412,7 @@
 "מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
 "המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6445,144 +6422,144 @@
 "יש תוכנה עם באגים.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "סמל איש הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "קול"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "הודעות ישירות של AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "שיחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5919
 msgid "Get File"
 msgstr "קבל קובץ"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "משחקים"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "תוספות"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "שלח רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "חיבור ישיר של ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP משתמש"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "כופר במוסכמות"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ניתוב שרת ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 ישן"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "הצפנת טריליאן"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "הטופ שבפופ"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "אבטחה מופעלת"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "שיחת וידאו"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat אור-קולי"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "שידור חי"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "מצלמה"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5710
 msgid "Occupied"
 msgstr "עסוק"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "מודע רשת"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "מחובר"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "כתובת IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "רמת אזהרה"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "הערת איש קשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6591,7 +6568,7 @@
 "לא ניתן להתחבר לשרת האימות:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6600,20 +6577,20 @@
 "לא ניתן להתחבר לשרת ה-BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "נשלח שם המשתמש"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "חיבור הושלם, נשלח cookie."
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "מבצע גימור לחיבור"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6624,28 +6601,29 @@
 "משתמשים חייבים אחת להתחיל באות ולהכיל רק אותיות מספרים ורווחים, או לחילופין, "
 "להכיל אך ורק מספרים."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "שם לתצוגה לא תקין."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "סיסמה לא נכונה."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "חשבונך מושעה כרגע."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "שירות ההודעות של AOL לא זמין כרגע."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6653,99 +6631,99 @@
 "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
 "תיאלץ להמתין אפילו יותר."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "לא ניתן להתחבר"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "התקבלה הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "המפתח עבור SecurID אינו תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "יש להזין SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "יש להזין את קוד 6 הספרות מהתצוגה הדיגיטלית."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "אישור"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן.אפשר לבדוק ב-%"
-"s לעידכונים."
-
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC "
+"עד אשר זה יתוקן. אפשר לבדוק ב-%s לעידכונים."
+
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "לא מצליח להשיג קוד התחברות תקף של AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "לא מצליח להשיג קוד התחברות תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "הסיסמא נשלחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "לא ניתן לאתחל חיבור"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "בבקשה, תנ/י לי אישור כדי להוסיף אותך לרשימת אנשי הקשר שלי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "הודעת בקשה להרשאה:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "בבקשה, אני רוצה הרשאה!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "הודעת סירוב הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6755,17 +6733,17 @@
 "המשתמש %u דחה את בקשתך להוסיף אותם לרשימת אנשי הקשר שלהם מהסיבה להלן:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "נדחית הרשאת ICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "המשתמש %u אישר את בקשתך להוסיף אותם לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6778,7 +6756,7 @@
 "מאת: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6791,7 +6769,7 @@
 "מאת: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6804,38 +6782,38 @@
 "ההודעה היא:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "משתמש %u הפנה אותך לאיש קשר %s - פרטים: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "הוסף"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "דחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהיא היתה לא תקנית."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו לא תקניות."
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהיא היתה גדולה מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו גדולות מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6844,21 +6822,21 @@
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות השליחה מופרזת."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהוא רע מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהוא רע מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שאת/ה רע מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שאת/ה רע מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -6866,71 +6844,67 @@
 msgstr[1] "פספסת %hu הודעות מאת %s מסיבה לא ידועה."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "לא ניתן לשלוח הודעה: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "סיבה לא ידועה."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "לא ניתן לשלוח הודעה ל %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "מידע על המשתמש אינו זמין: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "מידע על המשתמש %s אינו זמין:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "מחובר מאז"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "חבר מאז"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "יכולות"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "הודעת זמינות"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "החיבור AIM שלך אולי יתנתק."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "שגיאה בהגבלת מהירות."
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6938,85 +6912,85 @@
 "הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
 "יש לחכות 10 שניות ולנסות שנית."
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "נותקת מסיבה לא ידועה."
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "נותקת מחדר הצ'אט %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "פלאפון"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "דף אינטרנט אישי"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "מידע נוסף"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "מיקוד"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "מחלקה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "משרה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "פרטי עבודה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "הודעה קופצת"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "שם המשתמש שלהלן מקושר עם %s"
 msgstr[1] "שמות המשתמשים שלהלן מקושרים עם %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "שם לתצוגה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "לא נמצאו תוצאות עבור כתובת הדוא\"ל %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "ישלח דוא\"ל לאשר את %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "התקבלה בקשה לאישור החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "שגיאה בשינוי המידע של החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7024,19 +6998,19 @@
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש לא תקני."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש ארוך מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7045,7 +7019,7 @@
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
 "משתמש זה."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7054,7 +7028,7 @@
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
 "ליותר מדי שמות משתמשים."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7062,30 +7036,30 @@
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "שגיאה 0x%04x: שגיאה לא מוכרת."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "כתובת הדוא\"ל של %s היא %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4193
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4438
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4439
 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 "
@@ -7094,24 +7068,22 @@
 "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
 "לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4453
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
-msgstr[0] ""
-"עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
-msgstr[1] ""
-"עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
-
-#: ../libpurple/protocols/oscar/oscar.c:4482
+"truncated for you."
+msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
+msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
+
+#: ../libpurple/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "הפרופיל ארוך מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4503
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7119,16 +7091,14 @@
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] ""
-"עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
-msgstr[1] ""
-"עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
-
-#: ../libpurple/protocols/oscar/oscar.c:4532
+msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
+msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
+
+#: ../libpurple/protocols/oscar/oscar.c:4508
 msgid "Away message too long."
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4577
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7138,34 +7108,34 @@
 "לא ניתן להוסיף את איש הקשר %s מכיוון ששם המשתמש שלו לא חוקי. שמות משתמשים "
 "חייבים להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או רק להכיל מספרים."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "לא ניתן להוסיף"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4683
 msgid "Unable To Retrieve Buddy List"
 msgstr "כשלון בשליפת רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 msgstr ""
-"זמנית לא ניתן לקבל את רשימת אנשי-הקשר שלך משרתי ה-AIM. הרשימה לא אבדה, "
-"וככל הנראה תהייה זמינה בשעות הקרובות."
-
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+"זמנית לא ניתן לקבל את רשימת אנשי-הקשר שלך משרתי ה-AIM. הרשימה לא אבדה, וככל "
+"הנראה תהייה זמינה בשעות הקרובות."
+
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4894
+#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5076
 msgid "Orphans"
 msgstr "יתומים"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5000
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7174,12 +7144,12 @@
 "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר "
 "ברשימה. יש להסיר אחד ולנסות שנית."
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5014
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7189,7 +7159,7 @@
 "לא ניתן להוסיף את %s מסיבה לא ידועה. הסיבה הכי נפוצה היא שהגעת למספר המירבי "
 "המותר של אנשי קשר ברשימתך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5107
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7197,22 +7167,22 @@
 msgstr ""
 "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך. האם ברצונך להוסיף אותם?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5115
 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5188
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5189
 msgid "Authorization Granted"
 msgstr "ההרשאה ניתנה"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5192
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7222,51 +7192,51 @@
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5193
 msgid "Authorization Denied"
 msgstr "ההרשאה נדחית"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5229
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "החלפה:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5269
 msgid "Invalid chat name specified."
 msgstr "שם הצ'אט שצויין אינו תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5339
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמונות לצ'אטים ב-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5478
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "Away Message"
 msgstr "הודעת ריחוק מהמחשב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5483
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(שולף)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5683
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5791
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "הערת איש קשר עבור %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5792
 msgid "Buddy Comment:"
 msgstr "הערת איש קשר:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5839
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5843
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7274,63 +7244,63 @@
 "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
 "להמשיך בכל זאת?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid "C_onnect"
 msgstr "התחבר"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Get AIM Info"
 msgstr "הצג פרטי AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5898
 msgid "Get Status Msg"
 msgstr "הורד הודעת מצב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5911
 msgid "Direct IM"
 msgstr "תקשורת ישירה להודעות"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Re-request Authorization"
 msgstr "בקש הרשאה שוב"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5992
 msgid "Require authorization"
 msgstr "דרוש הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5995
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "מכיר-אינטרנט (הפעלה של זה תביא לדואר שלך SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "ICQ Privacy Options"
 msgstr "אפשרויות פרטיות של ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6019
 msgid "The new formatting is invalid."
 msgstr "הפורמט החדש אינו תקני."
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "פירמוט של שם משתמש רק יכולה לשנות אותיות גדולות/קטנות ורווחים."
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6073
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6119
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>אינך מחכה להרשאה</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6122
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7338,73 +7308,73 @@
 "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
 "ולבחור \"בקש הרשאה שוב\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Find Buddy by E-Mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Search for a buddy by e-mail address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "הקלד את כתובת הדוא\"ל של איש הקשר אותו אתה מחפש."
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "_Search"
 msgstr "חיפוש"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6303
 msgid "Set User Info (URL)..."
 msgstr "קבע את המידע על המשתמש (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6314
 msgid "Change Password (URL)"
 msgstr "שנה סיסמא (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6318
 msgid "Configure IM Forwarding (URL)"
 msgstr "הגדרות עקוב-אחרי להודעות (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6328
 msgid "Set Privacy Options..."
 msgstr "קבע אפשרויות פרטיות..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Confirm Account"
 msgstr "אשר חשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "Display Currently Registered E-Mail Address"
 msgstr "הצג את הכתובת הרשומה כרגע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "שנה את הכתובת הרשומה כרגע..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "Show Buddies Awaiting Authorization"
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Search for Buddy by Information"
 msgstr "חפש איש-קשר עפ\"י מידע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6429
 msgid "Use recent buddies group"
 msgstr "השתמש בקבוצת אנשי קשר אחרונה"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6432
 msgid "Show how long you have been idle"
 msgstr "הצג כמה זמן את/ה ללא פעילות"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6587
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7440,7 +7410,7 @@
 "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
 "ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "התחבר"
 
@@ -7605,92 +7575,98 @@
 msgid "Update my information"
 msgstr "עדכן את המידע שלי"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "המידע שלך עודכן"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-"אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr "אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "פרצוף QQ לא תקף"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "דחית את בקשת %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "הזנ/י את סיבתך:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "דחה בקשה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "סליחה, את/ה לא הטיפוס שלי..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "דחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "הוסף איש-קשר עם כשל בקשות אימות"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "הסרת איש-קשר בהצלחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "הסרת את עצמך מאיש קשר בהצלחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "משתמש %d דורש אימות"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "יש להזין את הבקשה כאו"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "התרצ/י להיות ידיד/ה שלי?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "שלח"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "הוספת את %d לרשימת אנשי-הקשר שלך"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "שגיאת QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "QQid לא תקף"
 
@@ -7726,59 +7702,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "ניתן לחפש רק קבוצות QQ קבועות\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "המשתמש %d ביקש להצטרף לקבוצה %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "סיבה: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "פעולת QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "אשר"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "בקשתך להצטרף לקבוצה %d נדחתה על ידי המנהל %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "בקשתך להצטרף לקבוצה %d אושרה על ידי המנהל %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "את/ה [%d] יצאת מקבוצה \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "את/ה [%d] נוספת על ידי קבוצה \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "קבוצה זו נוספה לרשימת אנשי הקשר שלך"
 
@@ -7806,27 +7782,27 @@
 msgid "This group does not allow others to join"
 msgstr "קבוצה זו לא מאשרת לאחרים להצטרף"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "יצאת מן הקבוצה בהצלחה"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "אימות לקבוצת QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "פעולה האימות שלך התקבלה על ידי שרת ה-QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "הזנת מזהה-קבוצה מחוץ לטווח המקובל"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "האם את/ה בטוח/ה שברצונך לצאת מ-Qun זה?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7834,7 +7810,7 @@
 "יש לשים לב, כי אם את/ה היוצר/ת, \n"
 "פעולה זו תביא בסופו של דבר להסרת ה-Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "המשך"
 
@@ -7847,40 +7823,41 @@
 msgid "Group Operation Error"
 msgstr "שגיאה בפעולת-קבוצה"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "האם ברצונך לאשר את הבקשה?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "שינית בהצלחה את החבר-Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "שינית בהצלחה את המידע של ה-Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "יצרת בהצלחה Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "האם ברצונך לקבוע את פרטי ה-Qun כעת?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "הגדרות"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "הודעת מערכת"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "ACK שרת"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "שליחת הודעת נכשלת\n"
 
@@ -7899,11 +7876,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -7944,47 +7921,47 @@
 msgid "Invalid name"
 msgstr "שם משתמש שגוי"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>כרגע מחוברים</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>עידכון אחרון</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>סוג החיבור</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>כתובת השרת</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>כתובתי המפורסמת</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>זמן כניסה</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>כתובת חיבור אחרונה</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>זמן חיבור אחרון</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "מידע על הכניסה"
 
@@ -8004,6 +7981,10 @@
 msgid "Exit this QQ Qun"
 msgstr "צא מתוך QQ Qun זה"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "חסום משתמש זה"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8014,15 +7995,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "פרוטוקול QQ\tתוסף"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "התחבר ב-TCP"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "התחבר מוסתר"
 
@@ -8066,51 +8047,53 @@
 msgid "Login failed, no reply"
 msgstr "לא ניתן להתחבר, אין תשובה"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "הוספת ע\"י %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "האם ברצונך להוסיף אותו?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s הוסיף אותך [%s]"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "המשתמש %s סרב לבקשתך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "המשתמש %s אישר את בקשתך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s רוצה להוסיף אותך [%s] כחברים"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s אינו ברשימת אנשי-הקשר שלך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "האם ברצונך להוסיף אותו?"
 
@@ -8202,7 +8185,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "לא ניתן להתחבר לשרת"
 
@@ -8219,52 +8202,52 @@
 msgid "Unable to send message: "
 msgstr "לא ניתן לשלוח הודעה: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "המקום נסגר"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "מיקרופון"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "רמקולים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "מצלמת וידאו"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "משלוח קבצים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "תומכים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "משתמש חיצוני"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "צור שיחת ועידה עם המשתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "יש להזין נושא עבוד שיחת הועידה, והודעת הזמנה שתישלח אל %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "ועידה חדשה"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "צור"
 
@@ -8294,23 +8277,23 @@
 msgid "Invite to Conference"
 msgstr "הזמן לועידה"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "הזמן לועידה..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "שלח הודעת ניסיון"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4165
 msgid "Topic:"
 msgstr "כותרת:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "לא ניתן שרת קהילה של Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8319,38 +8302,38 @@
 "לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי "
 "להמשיך בכניסה למערכת."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "הגדרות תקשורת Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "לא הוגדר שרת קהילת Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "לא ידוע (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "תוכנת-לקוח אחרונה"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "שם משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "מזהה Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "שם משתמש דו-משמעי הוזן"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8359,15 +8342,15 @@
 "המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון "
 "מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "בחר משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "אין אפשרות להוסיף משתמש: המשתמש לא נמצא"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8376,11 +8359,11 @@
 "המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי "
 "הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "לא ניתן להוסיף משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8389,63 +8372,63 @@
 "שגיאה בקריאת הקובץ %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "רשימת אנשי הקשר המאוחסנת בריחוק"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "צורת איכסון רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "רשימת אנשי קשר מקומית בלבד"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "מזג רשימה מן השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "מזג ושמור רשימה בתוך השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "מסנכרן רשימה עם השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "ייבא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "ייצא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה קיימת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "קבוצה בשם '%s' כבר קיימת ברשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "אין אפשרות להוסיף את הקבוצה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "התאמות אפשריות"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8455,26 +8438,26 @@
 "המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר/"
 "י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5475
 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."
@@ -8482,12 +8465,12 @@
 "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
 "וחבריה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8497,28 +8480,28 @@
 "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
 "אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "המזהה '%s' לא תואם לאף משתמש בקהילת ה-Sametime שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8526,39 +8509,39 @@
 "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב-"
 "Sametimeשלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr "ייבא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr "ייצא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr "הוסף קבוצה מתוך ספר כתובות של Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "חיפוש משתמש..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr "אלץ כניסה (מתעלם מהפניות-שרת)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr "הסתר זהות לקוח"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8604,12 +8587,12 @@
 msgstr "לא ניתן להתחיל הסכמה על מפתחות עם עצמך"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "המשתמש המרוחק כבר לא נוכח ברשת"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8617,7 +8600,7 @@
 msgstr ""
 "בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8628,49 +8611,49 @@
 "כתובת מחשב: %s\n"
 "יציאה: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "בקשה להסכמה על מפתחות"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "הודעה מיידית עם סיסמא"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "לא יכול לקבוע מפתח להודעה"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "קבע סיסמאת הודעות"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "השג מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "לא ניתן להשיג את המפתח הציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "הצג מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "לא ניתן להטעין את המפתח הציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8679,18 +8662,18 @@
 msgid "User Information"
 msgstr "מידע על המשתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "לא יכול להשיג את המידע על המשתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "איש הקשר %s אינו נבטח"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8699,16 +8682,16 @@
 "ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "פתח..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "המשתמש %s לא נוכח ברשת"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8716,15 +8699,15 @@
 "להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" "
 "לייבא מפתח ציבורי."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "ייבא..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "בחר/י משתמש נכון"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8732,7 +8715,7 @@
 "יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון "
 "להוסיף לרשימת אנשי הקשר."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8740,154 +8723,154 @@
 "יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף "
 "לרשימת אנשי הקשר."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "מנותק"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "חולה"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "להעיר אותי"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "היפראקטיבי"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "רובוט"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "שמח"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "עצוב"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "כועס"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "מקנא"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "מבוייש"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "מאוהב"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "ישנוני"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "משועמם"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "נלהב"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "לחוץ"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "מצבי משתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "מצב רוח"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "איש קשר מועדף"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "שפה מועדפת"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "מכשיר"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "איזור זמן"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "מיקום"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "אתחל מפתח הודעות"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "הודעה עם החלפת מפתחות"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "הודעה עם סיסמא"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "השג מפתח ציבורי..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "הרוג משתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "צייר על הלוח-הלבן"
 
@@ -8963,15 +8946,15 @@
 msgid "Open Public Key..."
 msgstr "פתח מפתח ציבורי..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "סיסמת הערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "רשימת המפתחות הציבוריים של הערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8984,130 +8967,130 @@
 "נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו "
 "להצטרף."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "אימות בערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "הוסף / הסר"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "שם קבוצה"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "סיסמא"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "יש להזין את שם הקבוצה הפרטית והסיסמא עבור הערוץ %s."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "הוסף קבוצה פרטית לערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "הגבלת משתמשים"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "לקביעת הגבלת מספר משתמשים. אפס מציין שאין הגבלה."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "רשימת הזמנות"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "רשימת חסומים"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "הוסף קבוצה פרטית"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "אתחל קבוע"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "הגדרת קבוע"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "קביעת הגבלת מספר משתמשים"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "אתחל הגבלת נושא"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "קביעת הגבלת נושא"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "אתחל פרטיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "קביעת פרטיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "אתחל סודיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "קביעת סודיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "הינך מייסד/ת הערוץ ב-<I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "מייסד/ת הערוץ ב<I>%s</I> זה <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "חובה להצטרף לערוץ %s לפני הצטרפות לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "הצטרף לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "לא ניתן להצטרף לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "בצע פקודה"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "לא יכול לבצע פקודה"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "פקודה לא מוכרת"
 
@@ -9217,7 +9200,7 @@
 msgstr "תפקיד"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "אירגון"
 
@@ -9258,7 +9241,7 @@
 msgstr "עוד..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "הנתק מן השרת"
 
@@ -9395,51 +9378,51 @@
 msgid "Verifying server public key"
 msgstr "מוודא מפתח ציבורי של השרת"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "נדרשת סיסמא"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "שגיאה: אי-תאימות גירסאות, יש לשדרג את תוכנה הלקוח שלך"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "שגיאה: הצד המרוחק לא בוטח/תומך במפתח הציבורי שלך"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "שגיאה: בצד המרוחק לא תומך בקבוצת ה-KE שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "שגיאה: הצד המרוחק לא תומך בהצפנה שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-PKCS שהוצע"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "שגיאה: הצד המרוחק לא תומך בפונקציית ההאש שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-HMAC שהוצע"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "שגיאה: חתימה שגוייה"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "שגיאה: cookie שגוי"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "שגיאה: האימות נכשל"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9448,12 +9431,12 @@
 "המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך "
 "להמשיך ולקבל את המפתח הציבורי?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "המפתח הציבורי של %s התקבל. האם ברצונך לקבל מפתח זה?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9466,15 +9449,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "וודא מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "צפייה..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "סוג מפתח ציבורי שאינו נתמך"
 
@@ -9524,7 +9507,7 @@
 msgid "Your Current Mood"
 msgstr "מצב הרוח הנוכחי שלך"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "רגיל"
 
@@ -9588,190 +9571,190 @@
 "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
 "המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "ההודעה להיום"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "לא קיימת הודעה להיום"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "אין הודעה להיום המשוייכת לחיבור זה"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "צור זוג מפתחות SILC חדש"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "כשל בעת יצירה של זוג מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "אורך מפתח"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "קובץ מפתח פרטי"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "סיסמא (שוב)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "צור זוג מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "זמינות"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "הצג את הודעת היום"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "צור זוג מפתחות SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "המתשמש <I>%s</I> אינו נוכח ברשת"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "הנושא ארוך מדי"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "חובה לציין כינוי משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "הערוץ %s לא נמצא"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "מצבי ערוץ %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "אין מצבים שנקבעו על הערוץ %s"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "כשל בקביעת מצבי ערוץ עבור %s"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "פקודה לא מוכרת: %s, )ייתכן וזהו באג בתוכנה("
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
-msgstr "part [ערוץ]: עזוב את הערוץ "
-
-#: ../libpurple/protocols/silc/silc.c:1595
+msgstr "part [ערוץ]: עזוב את הערוץ"
+
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [ערוץ]: עזוב את הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;נושא חדש&gt;]: הצג או שנה את הנושא "
-
-#: ../libpurple/protocols/silc/silc.c:1604
+msgstr "topic [&lt;נושא חדש&gt;]: הצג או שנה את הנושא"
+
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;ערוץ&gt; [&lt;סיסמא&gt;]:  הצטרף לערוץ ברשת זו"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  הצג את רשימת הערוצים ברשת זו"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;כינוי משתמש&gt;:  צפה במידע אודות המשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/silc/silc.c:1618
 #: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;כינוי משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;כינוי משתמש&gt; [&lt;הודעה&gt;]:  שלח הודעה פרטית למשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  צפה בהודעת היום של השרת"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  נתק תהליך פעולות זה מהשרת"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [הודעה]:  ניתוק מן השרת, עם אפשרות להודעה"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;פקודה&gt;:  קרא לפקודת לקוח כלשהי של silc"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;שם כינוי&gt; [-pubkey|&lt;סיבה&gt;]:  הרוג משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;שם כינוי חדש&gt;:  שינוי הכינוי שלך"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 "cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9779,35 +9762,35 @@
 "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
 "ההזמנות של הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [שרת]:  הצג מידע תפעולי על השרת"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;ערוץ&gt; +|-&lt;שם כינוי&gt;]:  חסום משתמש מן הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;שמם כינוי|שרת&gt;:  השג מפתח ציבורי של שרת או משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  הצג מידע סטטיסטי על השרת והרשת"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  שלח PING לשרת המחובר"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9824,66 +9807,66 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "פרוטוקול תקשורת בזמן-אמת מאובטחת(SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "רשת"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "קובץ מפתח פרטי"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "צופן"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "אימות עפ\"י מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "סרב צפייה ע\"י משתמשים אחרים"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "חסום הזמנות"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "חסום הודעות מידיות ללא החלפת מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "סרב לבקשות מצב חיבור"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "חסום הודעות ללוח-הלבן"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "פתח לוח-לבן אוטומטית"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
-msgstr "חתום דיגיטלית וודא את כל ההודעות המיידיות "
+msgstr "חתום דיגיטלית וודא את כל ההודעות המיידיות"
 
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:247
@@ -10000,26 +9983,26 @@
 msgstr "לא ניתן לכתוב"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "לא ניתן להתחבר"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "אין אפשרות ליצור שקע-קשב"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "לא ניתן למצוא כתובת שרת"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "לא ניתן למצוא כתובת שרת"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @"
 
@@ -10031,36 +10014,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף פרוטוקול SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף הפרוטוקול SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "ייצא סטטוס (הערה: כולם יוכלו לצפות בך)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "השתמש ב-UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "השתמש במתווך"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "מתווך"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "משתמש לאימות"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "דומיין לאימות"
 
@@ -10279,11 +10262,11 @@
 msgid "TOC Protocol Plugin"
 msgstr "תוסף פרוטוקול TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "הודעת ה Yahoo שלך לא נשלחה."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s שלח לך הרגע זמזום!"
@@ -10293,16 +10276,16 @@
 msgid "Yahoo! system message for %s:"
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "הודעת סירוב הרשאה:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10311,25 +10294,25 @@
 "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
 "%s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "הוספת איש קשר נדחתה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל "
-"להתחבר בהצלחה לשרת ה-Yahoo. בדוק ב-%s לעידכונים."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. "
+"בדוק ב-%s לעידכונים."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10338,148 +10321,149 @@
 "ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
 "תסיר ותתעלם מן המשתמש."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "לא ניתן להוסיף את איש הקשר %s לקבוצה %s ברשימה על השרת בחשבון %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "תקלת תקשורת"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "לא נמצא בבית"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "לא ליד השולחן"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "לא ליד השולחן"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "לא נמצא במשרד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "יצא לרגע"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "לא ברשימת השרתים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "נראה מחובר"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "נראה מנותק לעד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "נוכחות"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "ככל הנראה מנותק"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "אל תיראה מנותק לעד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "יזום ועידה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "אפשרויות נוכחות"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "התחל לקשקש"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "איזה ID להפעיל?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "להצטרף למי בצ'אט?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "הפעל ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "הצטרף למשתמש בצ'אט..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "כרגע שלחת זמזום!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: שלח זימזום למשתמש כדי להשיג את תשומת ליבם"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
 
@@ -10493,56 +10477,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo יפן"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "שרת ה-Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "שרת ה-Pager ביפן"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "יציאת Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "שרת העברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "שרת יפני להעברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "יציאה להעברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "הגדרה איזורית לחדר צ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "מיקום של רשימת חדרי הצ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "שרת צ'אט של Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "כניסת שרת Yahoo"
 
@@ -10641,7 +10625,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
-msgstr "פרופיל Yahoo! "
+msgstr "פרופיל Yahoo!"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
@@ -10693,7 +10677,7 @@
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
-msgstr "פרטי המשתמש %sאינם זמינים "
+msgstr "פרטי המשתמש %s אינם זמינים"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
@@ -10859,40 +10843,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "השתמש ב-tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "פקודת tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "ייצא ל-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "ייצא ל-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "ייבא מ-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "ייבא מ-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr "איזור"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr "חשיפה"
 
@@ -10934,18 +10918,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "כ_ן"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "ל_א"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "א_שר"
 
@@ -10956,16 +10940,16 @@
 msgid "I'm not here right now"
 msgstr "אני לא כאן כרגע"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "סטטוסים שמורים"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ידוע כעת בשם %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10974,58 +10958,58 @@
 "%s הזמין את %s לחדר הצ'אט %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s הזמין את %s לחדר הצ'אט %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "לקבל הזמנה לצ'אט?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "בטל"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "לא זמין"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "נייד"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s שינה את הנושא מ-%s ל-%s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s כעת %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s כבר לא %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s חסר פעילות"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s החל בפעילות"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s חסר פעילות"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s החל בפעילות"
@@ -11035,12 +11019,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2496
 #, c-format
 msgid "Error Reading %s"
 msgstr "שגיאה בקריאת %s"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2497
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11048,62 +11032,62 @@
 msgstr ""
 "חלה שגיאה בעת קריאת ה-%s שלך.  הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~."
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:2967
 msgid "Calculating..."
 msgstr "מחשב..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:2970
 msgid "Unknown."
 msgstr "לא ידוע"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:2996
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d שנייה"
 msgstr[1] "%d שניות"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3008
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d יום"
 msgstr[1] "%d ימים"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3016
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d שעה"
 msgstr[1] "%s, %d שעות"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3022
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d שעה"
 msgstr[1] "%d שעות"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3030
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d דקה"
 msgstr[1] "%s, %d דקות"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3036
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d דקה"
 msgstr[1] "%d דקות"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "לא ניתן להתחבר אל %s"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3431
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11112,17 +11096,17 @@
 "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
 "משהו מזיק."
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3466
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "שגיאה בקריאה מתוך %s: %s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3497
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "שגיאה בכתיבה לתוך %s: %s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3522
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "לא ניתן להתחבר אל %s: %s"
@@ -11148,55 +11132,55 @@
 msgstr "כיוון מגש המערכת"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "מאפייני כניסה למערכת"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "שם מקומי:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "אפשרויות המשתמש"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "השתמש בתמונה זו לחשבון זה:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s אפשרויות"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "השתמש בהגדרות פרוקסי של GNOME"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "השתמש בהגדרות פרוקסי כלליות"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "ללא פרוקסי"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "השתמש בהגדרות הסביבה"
 
@@ -11205,60 +11189,60 @@
 #. 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:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "אם תביט ממש מקרוב"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "ניתן לראות פרפרים מזדווגים"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "אפשרויות פרוקסי"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "סוג ה_פרוקסי"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_שרת:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_יציאה:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "_שם משתמש:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "סי_סמא"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "הוספת חשבון"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "_בסיסי"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "_מתקדם"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
-msgstr "דלוק"
-
-#: ../pidgin/gtkaccount.c:1961
+msgstr "פעיל"
+
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11280,231 +11264,231 @@
 "ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
 "<b>חשבונות->הוסף/ערוך</b> שבחלון רשימת אנשי-הקשר"
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "חש_בון:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "חסום"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "הסר חסימה"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "הצג _פרטים"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "הודעה"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "שלח קובץ"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "להוסי_ף תגובה לפעולת איש קשר?"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "שם נוסף..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "הוספת _איש קשר"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "הוסף _שיחה"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "הסר _קבוצה"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "_שנה שם"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "הצ_טרף"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "הצטרף אוטומטית"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "_קפל"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "ה_רחב"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4523
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_אנשי קשר"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/אנשי קשר/הצג יומ_ן שיחות עם משתמש..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/אנשי קשר/הצג אנשי קשר ש_אינם מחוברים"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/אנשי קשר/הצג _קבוצות ריקות"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/אנשי קשר/הצג פר_טי אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/אנשי קשר/הצג _זמני חוסר-פעילות"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/אנשי קשר/_מיין אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/אנשי קשר/_יציאה"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_חשבונות"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/_חשבונות/הוסף/\\ערוך"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/_כלים"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/כלים/ת_גובות פעילות אנשי קשר"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/כלים/תו_ספים"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/כלים/_העדפות"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/כלים/_רשימת החלונות"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/כלים/דו\"ח המערכת"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/כלים/ה_שתק צלילים"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11513,131 +11497,127 @@
 "\n"
 "<b>חשבון:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "כינוי לאיש-הקשר"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "מחובר"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "נראה לאחרונה"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "מפחיד"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "מדהים"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "מגניב"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "לא פעיל %dש %02dד"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "לא פעיל %dד"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/כלים/תגובות לפעילות אנשי קשר"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/כלים/_רשימת חדרי הצ'אט"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "הודעה %d שלא נקראה מאת %s\n"
 msgstr[1] "%d הודעות שלא נקראו מאת %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "ידנית"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "אלפבתית"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "לפי מצב"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "לפי גודל יומן השיחות"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s מנותק"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "הפעל מחדש חשבון"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s נותק: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>שם משתמש:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>סיסמא:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "התחברות"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/חשבונות"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11655,23 +11635,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "הצג גם _משתמשים מנותקים ברשימה"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/אנשי קשר/הצג קבוצות ריקות"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/אנשי קשר/הצג פרטי אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/אנשי קשר/הצג זמני חוסר פעילות"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11680,62 +11660,62 @@
 "יש להזין את שם המשתמש של אותו אתם רוצים להוסיף לרשימת הקשר..ישנה גם אפשרות "
 "לתת כינוי אשר יוצג במקום שם המשתמש\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "קבוצה:"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "יש להזין את שם הקבוצה החדשה."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/חשבונות/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2911
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "_בטל"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "הפעל חשבון"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/חשבונות/הפעל חשבון"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/_כלים"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/אנשי קשר/מיין אנשי-קשר"
 
@@ -11751,79 +11731,79 @@
 "\n"
 "%s לא ינסה לחבר מחדש חשבון זה שתתקנ/י את השגיאה ותפעיל/י את החשבון מחדש."
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "איש קשר זה אינו באותו פרוטוקול של צ'אט זה"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "אינך מחובר/ת בחשבון שיכול להזמין את איש הקשר הזה."
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "הזמן איש קשר לתוך חדר צ'אט"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_איש הקשר:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>שיחה עם %s>/h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1019
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1168 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "חפש"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1194 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
-msgstr "_חפש בעבור: "
-
-#: ../pidgin/gtkconv.c:1338
+msgstr "_חיפוש עבור:"
+
+#: ../pidgin/gtkconv.c:1346
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1354
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1602
 msgid "Un-Ignore"
 msgstr "בטל כל התעלמות"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1605
 msgid "Ignore"
 msgstr "התעלם"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1625
 msgid "Get Away Message"
 msgstr "השג את הודעת ההתרחקות"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1648
 msgid "Last said"
 msgstr "נאמר לאחרונה"
 
@@ -11831,125 +11811,125 @@
 msgid "Unable to save icon file to disk."
 msgstr "לא ניתן לשמור את הסמל לדיסק."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2546
 msgid "Save Icon"
 msgstr "שמירת סמל"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2598
 msgid "Animate"
 msgstr "הנפש"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2603
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2606
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2610
 msgid "Set Custom Icon..."
 msgstr "קבע תמונה..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2623
 msgid "Remove Custom Icon"
 msgstr "הסר תמונה שנקבעה"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2765
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2767
 msgid "/Conversation/New Instant _Message..."
 msgstr "/שיחה/הוד_עה חדשה..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2772
 msgid "/Conversation/_Find..."
 msgstr "/שיחה/_חפש..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2774
 msgid "/Conversation/View _Log"
 msgstr "/שיחה/ה_צג יומן שיחות"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2775
 msgid "/Conversation/_Save As..."
 msgstr "/שיחה/_שמור בשם..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2777
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/שיחה/נ_קה גלילה לאחור"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2781
 msgid "/Conversation/Se_nd File..."
 msgstr "/שיחה/ש_לח קובץ..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2782
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/שיחה/הוסף פ_עולת תגובה..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/In_vite..."
 msgstr "/שיחה/הז_מן..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2788
 msgid "/Conversation/M_ore"
 msgstr "/שיחה/_עוד"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2792
 msgid "/Conversation/Al_ias..."
 msgstr "/שיחה/כ_ינוי..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Block..."
 msgstr "/שיחה/חסו_ם..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Unblock..."
 msgstr "/שיחה/הסר חסי_מה..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/_Add..."
 msgstr "/שיחה/הוס_ף"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/_Remove..."
 msgstr "/שיחה/הס_ר..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/_Close"
 msgstr "/שיחה/_סגור"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2809
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2810
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2811
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר _צלילים"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2812
 msgid "/Options/Show Buddy _Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2814
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2815
 msgid "/Options/Show Ti_mestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/More"
 msgstr "/שיחה/עוד"
 
@@ -11958,228 +11938,228 @@
 #. 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:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2935 ../pidgin/gtkconv.c:2967
 msgid "/Conversation"
 msgstr "/שיחה"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2975
 msgid "/Conversation/View Log"
 msgstr "/שיחה/הצג יומן שיחות"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/שיחה/הוסף פעולת תגובה לאירועי איש קשר..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2991
 msgid "/Conversation/Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2995
 msgid "/Conversation/Invite..."
 msgstr "/שיחה/הזמן..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3001
 msgid "/Conversation/Alias..."
 msgstr "/שיחה/כינוי..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3005
 msgid "/Conversation/Block..."
 msgstr "/שיחה/חסום..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3009
 msgid "/Conversation/Unblock..."
 msgstr "/שיחה/הסר חסימה..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Add..."
 msgstr "/שיחה/הוסף..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Remove..."
 msgstr "/שיחה/הסר..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3021
 msgid "/Options/Enable Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3024
 msgid "/Options/Enable Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3037
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3040
 msgid "/Options/Show Timestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3043
 msgid "/Options/Show Buddy Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3127 ../pidgin/gtkconv.c:3169
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3172
 msgid "User has typed something and stopped"
 msgstr "המשתמש כתב משהו ועצר"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3354
 msgid "_Send To"
 msgstr "שלח _אל"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4068
 msgid "_Send"
 msgstr "ש_לח"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4217
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5409 ../pidgin/gtkconv.c:5530
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "איש %d בחדר זה"
 msgstr[1] "%d אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6096 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "מקליד/ה"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6102
 msgid "Stopped Typing"
 msgstr "הפסיק/ה להקליד"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6107
 msgid "Nick Said"
 msgstr "שם נאמר"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6112 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "הודעות שלא נקראו"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6117
 msgid "New Event"
 msgstr "אירוע חדש"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7246
 msgid "Confirm close"
 msgstr "אשר סגירה"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7278
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "יש לך הודעות שלא נקראו. האם ברצונך לסגור את החלון?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7795
 msgid "Close other tabs"
 msgstr "סגור את שאר הטאבים"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7801
 msgid "Close all tabs"
 msgstr "סגור את כל הטאבים"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7809
 msgid "Detach this tab"
 msgstr "נתק טאב זה"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7815
 msgid "Close this tab"
 msgstr "סגור טאב זה"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8199
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8720
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8722
 msgid "Separate IM and Chat windows"
 msgstr "הפרד בין חלונות של הודעות וצ'אטים"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8724 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "חלון חדש"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8726
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8728
 msgid "By account"
 msgstr "לפי חשבון"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "שמור רישומת ניפוי באגים"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "הפוך"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "סמן תוצאות"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "_תמונה בלבד"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "טקס_ט בלבד"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "_גם תמונה וגם טקסט"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "נפה"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "לחיצה ימנית לעוד אפשרויות."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "רמה "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "יש לבחור את רמת ניפוי הבאגים."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "הכל"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "אחר"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
-msgstr "שגיאה"
-
-#: ../pidgin/gtkdebug.c:865
+msgstr "שגיאה "
+
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "שגיאה קטלנית"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "מפתח ראשי"
 
@@ -12188,8 +12168,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "מפתח"
 
@@ -12197,405 +12178,407 @@
 msgid "developer & webmaster"
 msgstr "מפתח ומנהל אתר"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "תמיכה"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "תמיכה/QA"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "גירסה לחלונות"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "מתחזק"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "מתחזק libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "מתכנת ונהג פיכח - עצלן"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "מפתח Jabber"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "מפתח XMPP"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "מתכנת מקורי"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "אפריקאנס"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "ערבית"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
-msgid "Bulgarian"
-msgstr "בולגרית"
-
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "בולגרית"
+
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "בנגאלית"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "בוסנית"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "קטלנית"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "קטלנית-ואלנסית"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "צ'כית"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "דנית"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
-msgid "German"
-msgstr "גרמנית"
-
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "גרמנית"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "צדונקא"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "יוונית"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "אנגלית בריטית"
 
-#: ../pidgin/gtkdialogs.c:144
-msgid "Canadian English"
-msgstr "אנגלית קנדית"
-
-#: ../pidgin/gtkdialogs.c:145
-msgid "British English"
-msgstr "אנגלית בריטית"
-
 #: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "אנגלית קנדית"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "אנגלית בריטית"
+
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "אספרנט"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "ספרדית"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "אאוסקרה(בסקית)"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "פרסית"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "פינית"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "צרפתית"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "גליסיאנית"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "גוג'ראטית"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
 msgstr "הינדית"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "הונגרית"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "אינדונזית"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "איטלקית"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "יפנית"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "גרמנית"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "קאנאדית"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "קוריאנית"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "כורדית"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "ליטואנית"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "מקדונית"
 
-#: ../pidgin/gtkdialogs.c:172
-msgid "Bokmål Norwegian"
-msgstr "נורבגית ספרותית"
-
-#: ../pidgin/gtkdialogs.c:173
-msgid "Nepali"
-msgstr "נפאלית"
-
 #: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "נורבגית ספרותית"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "נפאלית"
+
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "הולנדית, פלמית"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "נורבגית"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "פולנית"
 
-#: ../pidgin/gtkdialogs.c:179
-msgid "Portuguese"
-msgstr "פורטוגזית"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Portuguese-Brazil"
-msgstr "פורטוגזית ברזילאית"
-
 #: ../pidgin/gtkdialogs.c:181
-msgid "Pashto"
-msgstr "פאשטוזית (אירנית)"
+msgid "Portuguese"
+msgstr "פורטוגזית"
 
 #: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "פורטוגזית ברזילאית"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "פאשטוזית (אירנית)"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "רומנית"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "רוסית"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "סלובקית"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "סלובקית"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "סלובנית"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "אלבנית"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "סרבית"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "שוודית"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
 msgstr "תמיל"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Telugu"
-msgstr "טלוגו"
-
-#: ../pidgin/gtkdialogs.c:193
-msgid "Thai"
-msgstr "תאלנדית"
-
 #: ../pidgin/gtkdialogs.c:194
-msgid "Turkish"
-msgstr "תורכית"
+msgid "Telugu"
+msgstr "טלוגו"
 
 #: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "תאלנדית"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "תורכית"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "ויאטנמית"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "צוות VI של גנום"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "סינית פשוטה"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "סינית של הונג-קונג"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "סינית מסורתית"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "אמהרית"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "אודות %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s הינה תוכנת שליחת הודעות מיידיות מודולרית המאפשרת שימוש ב AIM, MSN,  "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, QQ ובכולם בו-זמנית. התוכנה נכתבה בעזרת GTK+."
-"<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת הנחיות רישיון הGPL (גרסא 2 "
-"והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ 'COPYING' המופץ עם %s. %s "
-"היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את הקובץ 'COPYRIGHT' לרשימה מלאה "
-"של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר "
+"לבצע חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, QQ ובכולם בו- זמנית. "
+"התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת "
+"הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ "
+"'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את "
+"הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה זו."
+"<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ב- irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ב- irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "מפתחים"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "מחברי תיקונים מטורפים"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "מפתחים שתרמו בעבר"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "אמנים"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "מתרגמים פעילים"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "מתרגמים לשעבר"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "מידע לניפוי באגים"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא את פרטיו."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "הצג יומן שיחות עם המשתמש"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא יומן השיחות איתו."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "שם נוסף לאיש קשר"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "הזן שם נוסף עבור איש קשר זה."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ".%s הזן כינוי חדש עבור"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "שם נוסף לאיש הקשר"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "שם נוסף לשיחה"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12610,70 +12593,70 @@
 "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
 "בתוכו מתוך רשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "ה_סר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "האם הנך בטוח/ה שברצונך לאחד את הקבוצה %s לתוך הקבוצה %s?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "מזג קבוצות"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "מזג קבוצות"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, 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 וכל חבריה מרשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "הסר _קבוצה"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "הס_ר שיחה"
 
@@ -12681,30 +12664,27 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "לחיצה ימנית לעוד הודעות שלא נקראו...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "שנה מצב"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "הצג את רשימת אנשי קשר"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "הודעה חדשה..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "השתק צלילים"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "הבהב בעת קבלת הודעה חדשה"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "יציאה"
 
@@ -12785,7 +12765,7 @@
 msgstr "פרטי העברות קבצים"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "השהייה"
 
@@ -12794,11 +12774,11 @@
 msgid "_Resume"
 msgstr "ה_משך"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "נקה פירמוט טקסט"
 
@@ -12830,7 +12810,7 @@
 msgid "_Copy Link Location"
 msgstr "ה_עתק מיקום הקישור"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12840,7 +12820,7 @@
 "\n"
 "מניח שזה מסוג PNG."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12850,7 +12830,7 @@
 "\n"
 "מניח שזה מסוג PNG."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12861,7 +12841,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12872,11 +12852,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "שמור תמונה"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "שמור _תמונה..."
 
@@ -12984,91 +12964,91 @@
 msgid "Insert smiley"
 msgstr "הכנס חיוך"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהתחלת ב- %s?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה ב- %s שהתחיל ב- %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>השיחה בתוך %s ב-%s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>שיחה עם %s ב-%s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "לא נמצאו יומני רישום"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "עיין בספריית יומני-הרישום"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "גודל יומן סה\"כ:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "שיחות בתוך %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s שיחות עם"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. יש לנסות את '%s –h' למידע נוסף.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13093,41 +13073,41 @@
 "                      ובין כל שם צריך להיות פסיק)\n"
 "  -v, --version       הצג את הגירסאשל התוכנה וצא\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "%s נפל וניסה לכתוב קובץ של הזיכרון לקובץ.\n"
 "זהו באג בתוכנה, שקרה ללא שום אשמה מצידך.\n"
 "\n"
-"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחי פידג'ין דרך:\n"
-"%sbug.php\n"
+"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים דרך:\n"
+"%snewticket/\n"
 "\n"
 "יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
 "core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "אם יש צורך בעזרה נוספת, אנא פנה בהודעה אל SeanEgn או LSchiere דרך AIM.\n"
 "מידע ליצור קשר עם שון ולוק בפרוטוקולים אחרים נמצא ב:\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13155,22 +13135,22 @@
 msgstr[0] "<b>יש לך הודעה חדשה %d.</b>"
 msgstr[1] "<b>יש לך %d הודעות חדשות.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "הפקודה \"%s\" לדפדפן, אינה תקפה."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "URLלא ניתן לפתוח את ה-"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת הפקודה \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
@@ -13183,11 +13163,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "תוספים מרובים ייפרקו מן הזיכרון."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "פרוק תוספים"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13198,7 +13178,7 @@
 "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13209,11 +13189,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">שגיאה: %s\n"
 "בדוק את אתר התוסף לעידכון.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "הגדר את התוסף"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>פרטי התוסף</b>"
 
@@ -13222,95 +13202,95 @@
 msgstr "בחר קובץ"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "למי להגיב"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "שם איש הקשר:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "מתחבר"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "מתנתק"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "התרחק/ה מהמחשב"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "חוזר למחשב"
+msgid "Goes a_way"
+msgstr "התרחק/ה מהמחשב"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "חוזר למחשב"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "חסר _פעילות"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "כבר לא חסר/ת פעילות"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "מתחיל/ה להקליד הודעה"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "_עוצר בעת הקלדה"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "מפסיק/ה להקליד הודעה"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "מפסיק/ה להקליד הודעה"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "שו_לח הודעה"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "פתח חלון הודעות"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "תן התרעה"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "ש_לח הודעה"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "הפעל הפקודה"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "נגן _צליל"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "עיו_ן..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "עי_ון..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "_תצוגה מקדימה"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "הגב רק כאשר אני לא זמין"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "חוזר"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "מטרת התגובה"
 
@@ -13338,7 +13318,7 @@
 msgid "_Show system tray icon:"
 msgstr "הצג את סמל מגש המערכת:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13357,7 +13337,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "ה_סתר שיחות חדשות"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "כאשר מרוחק"
 
@@ -13587,55 +13567,55 @@
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "הכי שקט"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "יותר שקט"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "שקט"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "רועש"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "יותר רועש"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "הכי רועש"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "שיטת הצליל"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "שי_טה:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "&צפצף"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "&צפצף"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "פקודה"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "ללא צלילים"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13644,117 +13624,117 @@
 "צליל לפקו_דה:\n"
 "(%s עבור קובץ)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "הגדרות הצליל"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "צלילים כאשר יש לחלון השיחה מי_קוד"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "הפעל צלילים:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "רק כאשר זמין"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "רק כאשר לא-זמין"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "עוצמת-שמע:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "ארועי צליל"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "נגן"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "אירוע"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "בדיקה"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "אפס"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "בחר..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "_דווח זמן חוסר פעילות:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "על-פי פעילות עכבר או מקלדת"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "מענה אוטומ_טי:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "כאשר מרוחק וגם חסר פעילות"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "ריחוק אוטומטי"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "קבע ריחוק בעת חוסר פעילות"
 
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "_דקות לפני קביעת ריחוק:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "שנה ריחוק ל:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "סטטוס בעת איתחול"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "השתמש בסטטוס מיציאה אחרונה בעת איתחול"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "סטטוס להחיל בעת איתחול:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "ממשק המשתמש"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "ערכות החיוכים"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "צלילים"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "דפדפן"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "מצב / חוסר פעילות"
 
@@ -13791,7 +13771,7 @@
 msgid "Set privacy for:"
 msgstr "קבע פרטיות עבור:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "אפשר למשתמש"
 
@@ -13803,38 +13783,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "יש להזין את שם המשתמש שברצונך לאפשר ליצור קשר איתך."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "הרשה"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "לאפשר ל %s ליצור איתך קשר?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "האם את/ה בטוח/ה שברצונך לאפשר ל-%s ליצור איתך קשר?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "חסום משתמש"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "יש להזין את שם המשתמש שברצונך לחסום."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "יש להזין את שם המשתמש שברצונך לחסום."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "לחסום את %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "האם את/ה בטוח/ה שברצונך לחסום את %s?"
@@ -13843,23 +13823,23 @@
 msgid "Apply"
 msgstr "החל"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "הקובץ כבר קיים"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "לשכתב?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "כתוב מעל"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "בחר שם חדש"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "בחירת תיקיה..."
 
@@ -13882,37 +13862,37 @@
 msgstr "האם אתה בטוח שברצונך למחוק את המצבים השמורים שסומנו?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "הש_תמש"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "תואר כבר בשימוש, עליך לבחור תואר יחודי."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "שונה"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_תואר:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_מצב:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "השתמש בסטטוס שונה עבור חשבונות מסויימים"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "שמור והשתמש"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "מצב עבור %s"
@@ -13965,37 +13945,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "כישלון בעת איתחול GStreamer"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "ממתין לחיבור לרשת"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "צ'אט של גוגל"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "ארעה השגיאה להלן בעת ניסיון טעינת %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "כישלון בעת טעינת תמונה"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "לא ניתן לשלוח את הספריה %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד"
-
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד."
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "גררת תמונה"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14003,23 +13987,23 @@
 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
 "עבור איש הקשר הזה."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "קבע להיות סמל איש הקשר"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "שלח קובץ תמונה"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "הכנס לתוך ההודעה"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "האם ברצונך לקבוע את זה להיות הסמל של איש קשר זה?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14027,7 +14011,7 @@
 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
 "עבור איש הקשר הזה."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14038,11 +14022,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14050,7 +14034,7 @@
 "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל "
 "מצביעעליו, ולא את המפעיל עצמו."
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14061,59 +14045,65 @@
 "<b>גודל הקובץ:</b> %s\n"
 "<b>גודל התמונה:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "הקובץ '%s' גדול מדי עבור %s.  יש לנסות תמונה יותר קטנה.\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "שגיאת תמונה"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "לא ניתן לקבוע תמונה"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "כישלון בעת פתיחת הקובץ '%s': %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "שמור קובץ"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "בחר צבע"
 
-#: ../pidgin/pidginstock.c:88
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "פידג'ין"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "תיאו_ר"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "סגור טאבים"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "הצג פרטים"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "הזמן"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_ערוך"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_פתח דואר"
 
@@ -14135,7 +14125,7 @@
 msgstr "זמן מירבי לחכות לתגובה:"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "דקות"
 
@@ -14219,20 +14209,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "שנה עדיפות"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14294,11 +14284,19 @@
 msgid "Conversation Placement"
 msgstr "מיקום חלון שיחה"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. 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 ""
+"הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "מספר שיחות בכל חלון"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "הפרד בין הודעות לציאטים כאשר ממקמים עפ\"י מספר"
 
@@ -14308,54 +14306,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "על-מיקום"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "אפשרויות נוספות למיקום שיחות"
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "הגבל את מספר השיחות בכל חלון-שיחה, עם אפשרות להפריד בין הודעות לצ'אטים"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "תוסף הדגמה של פידג'ין"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "תוסף הדגמא שעושה דברים - ראה תיאור."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"זה תוסף ממש מגניב שעושה המון דברים:\n"
-"- זה אומר לך מי כתב את התוכנה כשמתחברים\n"
-"- זה הופך את כל הטקסט הנכנס\n"
-"- זה שולי הודעה לאנשי הקשר ברגע שהם מתחברים"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14380,19 +14348,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "פעולות עכבר"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "מוסיף תמיכה לפעולות עכבר"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../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"
@@ -14484,7 +14452,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "שילוב עם Evolution"
 
@@ -14492,8 +14460,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "מאפשר שילוב עם Evolution."
 
@@ -14619,7 +14587,7 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
-msgstr "שגיאה בהרצת העורך "
+msgstr "שגיאה בהרצת העורך"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
@@ -14646,12 +14614,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -14736,7 +14704,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "התרעה על הודעה"
 
@@ -14744,10 +14712,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "מאפשר מבחר דרכים להודיע לך על הודעות חדשות."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "תוסף הדגמה של פידג'ין"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "תוסף הדגמא שעושה דברים - ראה תיאור."
+
+#. *  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"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"זה תוסף ממש מגניב שעושה המון דברים:\n"
+"- זה אומר לך מי כתב את התוכנה כשמתחברים\n"
+"- זה הופך את כל הטקסט הנכנס\n"
+"- זה שולי הודעה לאנשי הקשר ברגע שהם מתחברים"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "צבע הסמן"
@@ -14838,11 +14836,11 @@
 msgid "Re-read gtkrc files"
 msgstr "קרא-מחדש קבצי gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:622
 msgid "Pidgin GTK+ Theme Control"
 msgstr "בקרת מוטיבים של GTK+ בפידג'ין"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "יש לאפשר גישה להגדרות נפוצות של gtkrc"
 
@@ -14856,11 +14854,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט כגון Jabber, MSN, IRC, "
-"TOC.לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
+"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ "
+"'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -14882,8 +14880,8 @@
 "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
 "im</a>."
 msgstr ""
-"ניתן להשיג את גירסא %s מ:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
+"ניתן להשיג את גירסא %s מ:<br><a href=\"http://pidgin.im/\">http://pidgin.im</"
+"a>."
 
 #: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
 msgid "New Version Available"
@@ -14971,11 +14969,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "אפשר החלפה של המילה האחרונה בעת שליחה"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "החלפת הטקסט"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "מחליף טקסט בהודעות יוצאות עפ\"י חוקים שנקבעים ע\"י המשתמש."
 
@@ -14997,7 +14995,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "גירסא מאוזנת (במקום מאונכת) של אנשי הקשר, שמעבירה את כולם בסך."
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "הצג חותמת-זמן כל"
 
@@ -15007,19 +15005,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "חותמת זמן"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "הצג חותמות זמן מסוג iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "הצג חותמות זמן מסוג iChat כל N דקות."
 
@@ -15028,9 +15026,8 @@
 msgstr "אפשרויות חותמת-זמן"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "_אלץ (מסורתיות %s) שימוש בחותמת-זמן על בסיס 24-שעות"
+msgid "_Force 24-hour time format"
+msgstr " אלץ שימוש בחותמת-זמן על בסיס 24-שעות"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15060,19 +15057,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "הגדרות חותמת-זמן בהודעות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "מגדיר את פורמט חותמות-הזמן בהודעות."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15117,7 +15114,7 @@
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr " בטל שקיפות חלון רשימת אנשי הקשר בעת הפיכתו לפעיל "
+msgstr "בטל שקיפות חלון רשימת אנשי הקשר בעת הפיכתו לפעיל"
 
 #. *< type
 #. *< ui_requirement
@@ -15125,19 +15122,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "שקיפות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "שקיפות משתנה עבור רשימת אנשי הקשר וחלונות השיחה."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15180,15 +15177,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
 msgstr "הגדרות פידג'ין לחלונות"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -15242,6 +15239,130 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
+#~ msgid "Toggle offline buddies"
+#~ msgstr "הדלק/כבה חברים שלא מחוברים"
+
+#~ msgid "Timestamps"
+#~ msgstr "חתימת זמן"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Still need to do something about this."
+#~ msgstr "עדיין צריך לעשות משהו בקשר לזה."
+
+#~ msgid "Autoreply"
+#~ msgstr "מענה אוטומטי"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "מענה אוטומטי לכל הפרוטוקולים"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "תוסף זה מאפשר קביעת הודעת מענה אוטומטי לכל פרוטוקול. ניתן לקבוע הודעת "
+#~ "מענה גלובאלית מתוך חלון הגדרות התוספים. לקביעת הודעת מענה עבור איש-קשר "
+#~ "מסויים, יש ללחוץ כפתור ימני על אותו איש קשר בחלון רשימת אנשי הקשר. לקביעת "
+#~ "הודעות מענה עבור חשבון מסויים, יש לגשת לכרטיסיית ה'מתקדם' של חלון עריכת "
+#~ "החשבון."
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "קבע הודעת מענה אוטומטי עבור %s"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "קבע הודעת מענה אוטומטי"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "ההודעה להלן תישלח אל איש הקשר כאשר הוא שולח הודעה אליך, והמענה האוטומטי "
+#~ "פעיל."
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "קבע הודעת מענה אוטומטי"
+
+#~ msgid "Autoreply message"
+#~ msgstr "הודעת מענה אוטומטי"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "שלח הודעות מענה אוטומטי כאשר"
+
+#~ msgid "When my account is _away"
+#~ msgstr "כאשר החשבון שלי מרוחק"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "כאשר החשבון שלי חסר פעילות"
+
+#~ msgid "_Default reply"
+#~ msgstr "מענה ברירת מחדל"
+
+#~ msgid "Status message"
+#~ msgstr "הודעת מצב"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "ענה אוטומטית עם הודעת המצב"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "תמיד כאשר יש הודעת מצב"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "רק כאשר אין הודעת מענה אוטומטי"
+
+#~ msgid "Delay between autoreplies"
+#~ msgstr "השהייה בין מענים אוטומטיים"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "השהייה מינימלית (בדקות)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "פעמים לשלוח מענות אוטומטיים"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "מירב הפעמים"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr "אינני זמין כרגע. אנא השאר/י לי את הודעתך, ואני אחזור אליך בהקדם."
+
+#~ msgid "Jabber Account"
+#~ msgstr "חשבון Jabber"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "לא ניתן להצטרף ל %s:"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "השרת לא היה מסוגל לאמת אותך ללא סיסמא"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "חפש משתמשי Jabber"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "זיהוי משתמש Jabber לא תקין"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "הסיסמה שלך שונתה בהצלחה"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "תוסף פרוטוקול Jabber"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "שגיאה בהגבלת מהירות."
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/כלים/תגובות לפעילות אנשי קשר"
+
+#~ msgid "Jabber developer"
+#~ msgstr "מפתח Jabber"
+
+#~ msgid "Slovack"
+#~ msgstr "סלובקית"
+
 #~ msgid "/Conversation/Insert Lin_k..."
 #~ msgstr "/שיחה/הכנס קיש_ור..."
 
@@ -16327,9 +16448,6 @@
 #~ msgid "Show fewer options"
 #~ msgstr "פחות"
 
-#~ msgid "Information"
-#~ msgstr "מידע"
-
 #~ msgid "/Buddies/_Signoff"
 #~ msgstr "/אנשי קשר/_התנתקות"
 
@@ -16394,9 +16512,6 @@
 #~ msgid "Warn the user"
 #~ msgstr "הזהר את המשתמש"
 
-#~ msgid "Block the user"
-#~ msgstr "חסום משתמש"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "שלח קובץ אל המשתמש"
 
@@ -16644,9 +16759,6 @@
 #~ msgid "Send message through server"
 #~ msgstr "שלח הודעה דרך השרת"
 
-#~ msgid "Connecting..."
-#~ msgstr "מתחבר..."
-
 #~ msgid "Nick:"
 #~ msgstr "כינוי:"
 
diff -r e42309469a4a -r 618a3748ff64 po/ko.po
--- a/po/ko.po	Mon May 21 20:02:18 2007 +0000
+++ b/po/ko.po	Mon May 21 20:58:23 2007 +0000
@@ -2,2029 +2,1767 @@
 # Copyright (C) YYYY, Sang-hyun S <artsilly@kuls.korea.ac.kr>
 # Copyright (C) YYYY, A Ho-seok Lee <alee@debian.org>
 # Copyright (C) 2003, Kyeong-uk Son <hey@gnome.or.kr>
+# Copyright (C) 2007, sushizang <sushizang@empal.com>
 #
 # This file is distributed under the same license as the Gaim package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 1.1.2\n"
+"Project-Id-Version: gaim 2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2004-05-28 22:54+0900\n"
-"Last-Translator: Son, Kyeong-uk <hey@gnome.or.kr>\n"
+"PO-Revision-Date: 2007-05-07 09:18+0900\n"
+"Last-Translator: sushizang <sushizang@empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Korean\n"
+"X-Poedit-Country: KOREA, REPUBLIC OF\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
-msgstr "게임 메신저"
+msgstr "Pidgin 인터넷 메신저"
 
 #: ../gaim.desktop.in.h:2
 msgid "Internet Messenger"
-msgstr "메신저"
+msgstr "인터넷 메신저"
 
 #: ../gaim.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
-msgstr "다중 프로토콜 메신저"
-
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "오류 메시지 막기"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "연결끊김 오류 감추기"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "접속 오류 감추기"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "연결끊김 오류 감추기"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "자동으로 다시 연결"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "접속이 끊기면 다시 접속합니다."
-
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr ""
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "친구가 접속 종료했음:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "친구가 자리비움:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "친구가 사용하지 않음:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr ""
-
-#. Explanation
-#: plugins/contact_priority.c:141
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-
-#: plugins/contact_priority.c:144
-msgid "Point values to use for account..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/contact_priority.c:195
-msgid "Contact Priority"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *< summary
-#: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-
-#. *< description
-#: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "게임"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "게임 - 연결 끊기"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "게임 - 자리비움"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "친구 목록"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "새 메시지..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "채팅 참여..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "음소거"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "파일 전송"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
+msgstr "복수의 프로토콜을 이용하여 인터넷 메시지를 보냅니다."
+
+#: ../console/gntaccount.c:119
+#: ../console/gntblist.c:272
+#: ../console/gntblist.c:390
+#: ../console/gntblist.c:403
+#: ../console/gntplugin.c:154
+#: ../console/gntplugin.c:199
+#: ../console/gntstatus.c:291
+#: ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
+msgid "Error"
+msgstr "오류"
+
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "계정이 추가되지 않았습니다."
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "계정의 아이디를 입력해야 합니다."
+
+#: ../console/gntaccount.c:423
+#: ../gtk/gtkaccount.c:567
+msgid "New mail notifications"
+msgstr "새 메일 알림"
+
+#: ../console/gntaccount.c:433
+#: ../gtk/gtkaccount.c:496
+msgid "Remember password"
+msgstr "비밀번호 저장"
+
+#: ../console/gntaccount.c:474
+#: ../gtk/gtkaccount.c:1430
+#: ../gtk/gtkblist.c:3868
+msgid "Modify Account"
+msgstr "계정 편집"
+
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "새 계정"
+
+#: ../console/gntaccount.c:500
+#: ../gtk/gtkaccount.c:407
+#: ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "프로토콜:"
+
+#: ../console/gntaccount.c:508
+#: ../gtk/gtkaccount.c:412
+#: ../gtk/gtkblist.c:5229
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "아이디:"
+
+#: ../console/gntaccount.c:521
+#: ../gtk/gtkaccount.c:487
+msgid "Password:"
+msgstr "비밀번호:"
+
+#: ../console/gntaccount.c:531
+#: ../gtk/gtkblist.c:5250
+#: ../gtk/gtkblist.c:5613
+msgid "Alias:"
+msgstr "별칭:"
+
+#. Cancel
+#: ../console/gntaccount.c:554
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834
+#: ../console/gntblist.c:313
+#: ../console/gntblist.c:380
+#: ../console/gntblist.c:413
+#: ../console/gntblist.c:737
+#: ../console/gntblist.c:906
+#: ../console/gntblist.c:997
+#: ../console/gntblist.c:2021
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:472
+#: ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866
+#: ../gtk/gtkaccount.c:2433
+#: ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685
+#: ../gtk/gtkdialogs.c:822
+#: ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932
+#: ../gtk/gtkdialogs.c:954
+#: ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018
+#: ../gtk/gtkdialogs.c:1056
+#: ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147
+#: ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098
+#: ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604
+#: ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:336
+#: ../libgaim/account.c:961
+#: ../libgaim/account.c:1149
+#: ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164
+#: ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338
+#: ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264
+#: ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294
+#: ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402
+#: ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183
+#: ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726
+#: ../libgaim/protocols/silc/ops.c:1912
+#: ../libgaim/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
+msgid "Cancel"
+msgstr "취소"
+
+#. Save
+#: ../console/gntaccount.c:558
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:475
+#: ../console/gntstatus.c:585
+#: ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276
+#: ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "저장"
+
+#: ../console/gntaccount.c:610
+#: ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "정말 %s 을(를) 삭제하시겠습니까?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "계정 삭제"
+
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1865
+#: ../gtk/gtkpounce.c:1097
+#: ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
+msgid "Delete"
+msgstr "삭제"
+
+#: ../console/gntaccount.c:644
+#: ../console/gntblist.c:1927
+#: ../console/gntui.c:70
+#: ../gtk/gtkaccount.c:2259
+#: ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "계정"
 
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "기본 설정"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "끝내기"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:556
-msgid "System Tray Icon"
-msgstr "시스템 트레이 아이콘"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:559
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "시스템 트레이에 게임 아이콘을 보여줍니다."
-
-#. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"게임의 현재 상태를 트레이 아이콘(예를 들면 GNOME이나 KDE, 윈도우 등에서)으로 "
-"보여주고, 일반적으로 사용되는 함수의 접근을 용이하게 하며, 친구 목록이나 로그"
-"인창을 토글할 수 있게 합니다. 또 ICQ처럼 아이콘을 클릭할 때까지 도착하는 메시"
-"지를 쌓아놓을 수 있습니다."
-
-#: plugins/extplacement.c:79
-msgid "By conversation count"
-msgstr "대화 갯수 기준"
-
-#: plugins/extplacement.c:100
-msgid "Conversation Placement"
-msgstr "대화 위치"
-
-#: plugins/extplacement.c:105
-msgid "Number of conversations per window"
-msgstr "대화창별 대화 갯수"
-
-#: plugins/extplacement.c:111
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "갯수에 따라 메시지와 대화창을 분리함"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/extplacement.c:132
-msgid "ExtPlacement"
-msgstr ""
-
-#. *< name
-#. *< version
-#: plugins/extplacement.c:134
-msgid "Extra conversation placement options."
-msgstr "별도의 대화 위치 옵션입니다."
-
-#. *< summary
-#. *  description
-#: plugins/extplacement.c:136
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "창별 대화 갯수를 제한하고 메시지와 대화를 구분합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "게임 파일 콘트롤"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "게임 플러그인 시연"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr ""
-
-#. *  description
-#: plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr ""
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: plugins/gaimrc.c:72
-#, fuzzy
-msgid "Conversation Entry"
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "다음 목록의 계정을 사용 또는 사용 안 함으로 변경할 수 있습니다."
+
+#: ../console/gntaccount.c:673
+#: ../console/gntaccount.c:833
+#: ../console/gntblist.c:313
+#: ../console/gntblist.c:380
+#: ../console/gntblist.c:413
+#: ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191
+#: ../gtk/gtkaccount.c:2432
+#: ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654
+#: ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "추가"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "변경"
+
+#: ../console/gntaccount.c:758
+#: ../gtk/gtkaccount.c:2379
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s 님이 %s 님을 친구로 설정했습니다%s%s"
+
+#: ../console/gntaccount.c:831
+#: ../gtk/gtkaccount.c:2431
+msgid "Add buddy to your list?"
+msgstr "친구 목록에 추가하시겠습니까?"
+
+#: ../console/gntblist.c:264
+msgid "You must provide a screename for the buddy."
+msgstr "친구의 아이디를 지정해 주십시오."
+
+#: ../console/gntblist.c:266
+msgid "You must provide a group."
+msgstr "그룹을 지정해 주십시오."
+
+#: ../console/gntblist.c:268
+msgid "You must select an account."
+msgstr "계정을 선택해 주십시오."
+
+#: ../console/gntblist.c:272
+msgid "Error adding buddy"
+msgstr "친구를 추가하는 중 오류"
+
+#: ../console/gntblist.c:297
+#: ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923
+#: ../libgaim/protocols/oscar/oscar.c:2849
+msgid "Screen Name"
+msgstr "아이디"
+
+#: ../console/gntblist.c:300
+#: ../console/gntblist.c:372
+#: ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953
+#: ../gtk/gtkdialogs.c:973
+#: ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362
+#: ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
+msgid "Alias"
+msgstr "별칭"
+
+#: ../console/gntblist.c:303
+#: ../console/gntblist.c:375
+msgid "Group"
+msgstr "그룹"
+
+#: ../console/gntblist.c:306
+#: ../console/gntblist.c:363
+#: ../console/gntblist.c:1166
+#: ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2710
+#: ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265
+#: ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "계정"
+
+#: ../console/gntblist.c:312
+#: ../console/gntblist.c:784
+#: ../gtk/gtkblist.c:5183
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
+msgid "Add Buddy"
+msgstr "친구 추가"
+
+#: ../console/gntblist.c:312
+msgid "Please enter buddy information."
+msgstr "친구의 정보를 입력해 주십시오."
+
+#: ../console/gntblist.c:335
+#: ../libgaim/blist.c:1195
+msgid "Chats"
 msgstr "대화"
 
-#: plugins/gaimrc.c:73
-#, fuzzy
-msgid "Conversation History"
-msgstr "대화"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
-msgid "Log Viewer"
-msgstr "로그인 서버"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
-msgid "Request Dialog"
-msgstr "인증 요청"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
-msgid "Notify Dialog"
-msgstr "다음 경우 알림"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
-msgid "Select Color for %s"
-msgstr "글자 색깔 선택"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
-msgid "Select Color"
-msgstr "글자 색깔 선택"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
-msgid "Select Font for %s"
-msgstr "글꼴 선택"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
-msgid "Select Interface Font"
-msgstr "글꼴 선택"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
-msgid "GTK+ Interface Font"
-msgstr "인터페이스 옵션"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
-msgid "Gaim GTK+ Theme Control"
-msgstr "게임 파일 콘트롤"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
-#. Configuration frame
-#: plugins/gestures/gestures.c:243
-msgid "Mouse Gestures Configuration"
-msgstr "마우스 놀림 설정"
-
-#: plugins/gestures/gestures.c:250
-msgid "Middle mouse button"
-msgstr "마우스 가운데 단추"
-
-#: plugins/gestures/gestures.c:255
-msgid "Right mouse button"
-msgstr "마우스 오른쪽 단추"
-
-#. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
-msgid "_Visual gesture display"
-msgstr "비주얼하게 놀림 보여주기(_V)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gestures/gestures.c:296
-msgid "Mouse Gestures"
-msgstr "마우스 놀림"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gestures/gestures.c:299
-msgid "Provides support for mouse gestures"
-msgstr "마우스 놀림 지원을 제공합니다."
-
-#. *  description
-#: plugins/gestures/gestures.c:301
-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 ""
-"대화창에서 마우스 놀림을 허용합니다.\n"
-"다음 행동을 하려면 마우스 가운데 단추를 누르고 움직이세요:\n"
-"\n"
-"아래로 끌고 오른쪽으로 밀면 대화를 닫습니다.\n"
-"위로 밀고 왼쪽으로 움직이면 이전 대화로 갑니다.\n"
-"위로 밀고 오른쪽으로 움직이면 다음 대화로 갑니다."
-
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#. Extract their Name and put it in
+#: ../console/gntblist.c:369
+#: ../gtk/gtkplugin.c:579
+#: ../gtk/gtkroomlist.c:621
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535
+#: ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627
+#: ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "이름"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "인스턴트 메시징"
-
-#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-
-#. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
-msgid "Search"
+#: ../console/gntblist.c:378
+#: ../console/gntblist.c:786
+#: ../gtk/gtkblist.c:5559
+msgid "Add Chat"
+msgstr "대화 추가"
+
+#: ../console/gntblist.c:379
+msgid "You can edit more information from the context menu later."
+msgstr "오른쪽 클릭 메뉴로부터 정보를 편집할 수 있습니다."
+
+#: ../console/gntblist.c:390
+#: ../console/gntblist.c:403
+msgid "Error adding group"
+msgstr "그룹을 추가하는 중 오류"
+
+#: ../console/gntblist.c:391
+msgid "You must give a name for the group to add."
+msgstr "추가할 그룹의 이름을 입력해 주십시오."
+
+#: ../console/gntblist.c:404
+msgid "A group with the name already exists."
+msgstr "같은 이름의 그룹이 이미 존재합니다."
+
+#: ../console/gntblist.c:411
+#: ../console/gntblist.c:788
+#: ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
+msgid "Add Group"
+msgstr "그룹 추가"
+
+#: ../console/gntblist.c:411
+msgid "Enter the name of the group"
+msgstr "추가할 그룹의 이름을 입력해 주십시오."
+
+#: ../console/gntblist.c:736
+msgid "Edit Chat"
+msgstr "대화 편집"
+
+#: ../console/gntblist.c:736
+msgid "Please Update the necessary fields."
+msgstr "필요한 항목을 갱신해 주십시오."
+
+#: ../console/gntblist.c:737
+#: ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "편집"
+
+#: ../console/gntblist.c:751
+msgid "Auto-join"
+msgstr "자동 참가"
+
+#: ../console/gntblist.c:760
+msgid "Edit Settings"
+msgstr "설정 편집"
+
+#: ../console/gntblist.c:806
+#: ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "정보 가져오기"
+
+#: ../console/gntblist.c:811
+msgid "Add Buddy Pounce"
+msgstr "친구 알림 추가"
+
+#: ../console/gntblist.c:818
+#: ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
+msgid "Send File"
+msgstr "파일 전송"
+
+#: ../console/gntblist.c:822
+msgid "View Log"
+msgstr "로그 보기"
+
+#: ../console/gntblist.c:902
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "%s 님의 새 이름을 입력해 주십시오."
+
+#: ../console/gntblist.c:904
+#: ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
+msgid "Rename"
+msgstr "이름 바꾸기"
+
+#: ../console/gntblist.c:904
+msgid "Enter empty string to reset the name."
+msgstr "빈 문자열을 입력하면 이름이 초기화 됩니다."
+
+#: ../console/gntblist.c:977
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "이 연락처를 삭제하면 그 안에 있는 친구의 정보도 모두 삭제됩니다."
+
+#: ../console/gntblist.c:985
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "이 그룹을 삭제하면 그 안에 있는 친구의 정보도 모두 삭제됩니다."
+
+#: ../console/gntblist.c:990
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "정말 %s 을(를) 삭제하시겠습니까?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:993
+msgid "Confirm Remove"
+msgstr "삭제 확인"
+
+#: ../console/gntblist.c:996
+#: ../console/gntblist.c:1118
+#: ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651
+#: ../gtk/gtkrequest.c:275
+#: ../gtk/gtkstatusbox.c:248
+msgid "Remove"
+msgstr "삭제"
+
+#. Buddy List
+#: ../console/gntblist.c:1093
+#: ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219
+#: ../console/gntui.c:71
+#: ../gtk/gtkblist.c:4091
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "친구 목록"
+
+#: ../console/gntblist.c:1123
+msgid "Place tagged"
+msgstr "Place tagged"
+
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr "Toggle Tag"
+
+#. General
+#: ../console/gntblist.c:1161
+#: ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627
+#: ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179
+#: ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "별명"
+
+#. Idle stuff
+#: ../console/gntblist.c:1181
+#: ../gtk/gtkblist.c:2754
+#: ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683
+#: ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "대기 상태"
+
+#: ../console/gntblist.c:1270
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
 msgstr ""
-
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
-msgid "Group:"
-msgstr "그룹:"
-
-#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "새 인명"
-
-#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
-msgid "Select Buddy"
-msgstr "친구 고르기"
-
-#. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+"온라인: %d\n"
+"합계: %d"
+
+#: ../console/gntblist.c:1279
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "계정: %s (%s)"
+
+#: ../console/gntblist.c:1291
+#, c-format
 msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
+"\n"
+"Last Seen: %s ago"
 msgstr ""
-
-#. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
-msgid "User _details"
-msgstr "사용자 정보 감추기"
-
-#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "관계있는 친구(_A)"
-
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
-msgid "Buddies"
-msgstr "친구"
-
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "메시지를 보낼 수 없습니다."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
+"\n"
+"마지막 만남: %s 전"
+
+#: ../console/gntblist.c:1540
+#: ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
+msgid "New..."
+msgstr "상태 추가..."
+
+#: ../console/gntblist.c:1547
+#: ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
+msgid "Saved..."
+msgstr "다른 상태..."
+
+#: ../console/gntblist.c:1895
+#: ../console/gntplugin.c:216
+#: ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544
+#: ../gtk/gtkplugin.c:528
+msgid "Plugins"
+msgstr "플러그인"
+
+#: ../console/gntblist.c:2002
+#: ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
+msgid "_Name"
+msgstr "이름(_N)"
+
+#: ../console/gntblist.c:2007
+#: ../gtk/gtkdialogs.c:671
+#: ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
+msgid "_Account"
+msgstr "계정(_A)"
+
+#: ../console/gntblist.c:2015
+#: ../gtk/gtkdialogs.c:679
+msgid "New Instant Message"
+msgstr "새 인스턴트 메시지"
+
+#: ../console/gntblist.c:2017
+#: ../gtk/gtkdialogs.c:681
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "메시지로 대화할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#: ../console/gntblist.c:2020
+#: ../console/gntnotify.c:79
+#: ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684
+#: ../gtk/gtkdialogs.c:821
+#: ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:960
+#: ../libgaim/account.c:1148
+#: ../libgaim/protocols/gg/gg.c:497
+#: ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791
+#: ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337
+#: ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293
+#: ../libgaim/protocols/oscar/oscar.c:6042
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182
+#: ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462
+#: ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297
+#: ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
+msgid "OK"
+msgstr "확인"
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:2039
+#: ../gtk/gtkpounce.c:776
+msgid "Options"
+msgstr "설정"
+
+#: ../console/gntblist.c:2045
+msgid "Send IM..."
+msgstr "메시지 보내기..."
+
+#: ../console/gntblist.c:2049
+msgid "Toggle offline buddies"
+msgstr "오프라인 친구로 전환"
+
+#: ../console/gntblist.c:2053
+msgid "Sort by status"
+msgstr "상태순"
+
+#: ../console/gntblist.c:2057
+msgid "Sort alphabetically"
+msgstr "알파벳순"
+
+#: ../console/gntblist.c:2061
+msgid "Sort by log size"
+msgstr "로그 크기순"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s 님은 접속을 끊었습니다."
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
+"%s 님이 다음의 오류로 인해 접속을 끊었습니다:\n"
+"%s"
+
+#: ../console/gntconn.c:43
+#: ../gtk/gtkblist.c:3865
+#: ../libgaim/account.c:988
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "접속 오류"
+
+#: ../console/gntconv.c:102
+msgid "No such command."
+msgstr "그런 명령은 없습니다."
+
+#: ../console/gntconv.c:106
+#: ../gtk/gtkconv.c:505
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "문법 오류: 그 명령에 대한 인수의 수가 잘못되었습니다."
+
+#: ../console/gntconv.c:111
+#: ../gtk/gtkconv.c:510
+msgid "Your command failed for an unknown reason."
+msgstr "알 수 없는 이유로 명령 적용에 실패했습니다."
+
+#: ../console/gntconv.c:116
+#: ../gtk/gtkconv.c:516
+msgid "That command only works in chats, not IMs."
+msgstr "그 명령은 메시지가 아닌, 대화에서만 동작합니다."
+
+#: ../console/gntconv.c:119
+#: ../gtk/gtkconv.c:519
+msgid "That command only works in IMs, not chats."
+msgstr "그 명령은 대화가 아닌, 메시지에서만 동작합니다."
+
+#: ../console/gntconv.c:123
+#: ../gtk/gtkconv.c:523
+msgid "That command doesn't work on this protocol."
+msgstr "그 명령은 이 프로토콜에서는 동작하지 않습니다."
+
+#: ../console/gntconv.c:130
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "아직 지원되지 않는 명령입니다. 메시지를 보내지 못했습니다."
+
+#: ../console/gntconv.c:232
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:255
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:260
+#: ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
+"\n"
+"%s 님이 무언가를 입력하고 있습니다..."
+
+#: ../console/gntconv.c:399
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:501
+msgid "List of users:\n"
+msgstr "사용자 목록\n"
+
+#: ../console/gntconv.c:625
+#: ../gtk/gtkconv.c:386
+msgid "Supported debug options are:  version"
+msgstr "지원하는 디버그 옵션은:  버전"
+
+#: ../console/gntconv.c:660
+#: ../gtk/gtkconv.c:422
+msgid "No such command (in this context)."
+msgstr "(이 오른쪽 클릭 메뉴에서는) 그런 명령은 없습니다."
+
+#: ../console/gntconv.c:663
+#: ../gtk/gtkconv.c:425
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "메일"
-
-#. Configuration frame
-#: plugins/gevolution/gevolution.c:414
-msgid "Evolution Integration Configuration"
-msgstr "에볼루션 통합 설정"
-
-#. Label
-#: plugins/gevolution/gevolution.c:417
-msgid "Select all accounts that buddies should be auto-added to."
+"특정 명령에 관한 수준을 참조할 경우에는\n"
+"\"/help &lt;명령&gt;\" 를 이용해 주십시오.\n"
+"이 오른쪽 클릭 메뉴에서는 다음의 명령을 이용할 수 있습니다:\n"
+
+#: ../console/gntconv.c:702
+#: ../gtk/gtkconv.c:6824
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;메시지&gt;:  명령을 이용하지 않는 경우에도 메시지를 전송합니다."
+
+#: ../console/gntconv.c:705
+#: ../gtk/gtkconv.c:6827
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;동작&gt;:  친구 또는 대화에 IRC 형식의 동작을 전송합니다."
+
+#: ../console/gntconv.c:708
+#: ../gtk/gtkconv.c:6830
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;옵션&gt;:  이용 중인 대화 창에 다양한 디버그 정보를 전송합니다."
+
+#: ../console/gntconv.c:711
+#: ../gtk/gtkconv.c:6833
+msgid "clear: Clears the conversation scrollback."
+msgstr "비우기: 대화 창에 있는 이전의 메시지를 삭제합니다."
+
+#: ../console/gntconv.c:714
+#: ../gtk/gtkconv.c:6836
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;명령&gt;:  특정 명령에 대한 도움말을 표시합니다."
+
+#: ../console/gntconv.c:719
+msgid "plugins: Show the plugins window."
+msgstr "plugins: 플러그인 창을 표시합니다."
+
+#: ../console/gntconv.c:722
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: 친구 목록을 표시합니다."
+
+#: ../console/gntconv.c:725
+msgid "accounts: Show the accounts window."
+msgstr "accounts: 계정 창을 표시합니다."
+
+#: ../console/gntconv.c:728
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: 디버그 창을 표시합니다."
+
+#: ../console/gntconv.c:731
+msgid "prefs: Show the preference window."
+msgstr "prefs: 설정 창을 표시"
+
+#: ../console/gntconv.c:734
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: 저장 상태 창을 표시합니다."
+
+#: ../console/gntdebug.c:214
+#: ../console/gntui.c:72
+#: ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "디버그 창"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../console/gntdebug.c:235
+#: ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "비우기"
+
+#: ../console/gntdebug.c:240
+#: ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "일시정지"
+
+#: ../console/gntdebug.c:245
+#: ../gtk/gtkdebug.c:783
+#: ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "타임스탬프"
+
+#: ../console/gntgaim.c:227
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s 상세 정보는 `%s -h' 를 입력해 주십시오.\n"
+
+#: ../console/gntgaim.c:229
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
-msgid "Account"
-msgstr "계정"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gevolution/gevolution.c:530
-msgid "Evolution Integration"
-msgstr "에볼루션 통합"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-msgid "Provides integration with Evolution."
+"%s\n"
+"사용법: %s [옵션]...\n"
+"\n"
+"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
+"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
+"  -h, --help          이 도움말을 표시하고 종료\n"
+"  -n, --nologin       자동으로 로그인 하지 않음\n"
+"  -v, --version       현재 버전을 표시하고 종료\n"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "이메일"
+
+#: ../console/gntnotify.c:152
+#: ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "새로운 메일이 도착했습니다!"
+
+#: ../console/gntnotify.c:155
+#: ../libgaim/protocols/jabber/jabber.c:1155
+msgid "From"
+msgstr "보낸 사람"
+
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:481
+msgid "Subject"
+msgstr "제목"
+
+#: ../console/gntnotify.c:163
+#: ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259
+#: ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406
+#: ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "닫기"
+
+#: ../console/gntnotify.c:182
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) 에는 %d 개의 새 메일이 있습니다."
+msgstr[1] "%s (%s) 에는 %d 개의 새 메일이 있습니다."
+
+#: ../console/gntnotify.c:206
+#: ../gtk/gtknotify.c:322
+msgid "New Mail"
+msgstr "새로운 메일"
+
+#: ../console/gntnotify.c:230
+#: ../gtk/gtknotify.c:856
+#, c-format
+msgid "Info for %s"
+msgstr "%s 님의 정보"
+
+#: ../console/gntnotify.c:232
+#: ../gtk/gtknotify.c:858
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "친구 정보"
+
+#: ../console/gntnotify.c:306
+msgid "Continue"
+msgstr "계속"
+
+#: ../console/gntnotify.c:312
+#: ../gtk/gtkconv.c:1630
+#: ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "정보"
+
+#: ../console/gntnotify.c:315
+#: ../gtk/gtkconv.c:1591
+msgid "IM"
+msgstr "인스턴트 메시지"
+
+#: ../console/gntnotify.c:318
+msgid "Join"
+msgstr "참가"
+
+#: ../console/gntnotify.c:321
+#: ../libgaim/protocols/sametime/sametime.c:3494
+msgid "Invite"
+msgstr "초대"
+
+#: ../console/gntnotify.c:324
+msgid "(none)"
+msgstr "(없음)"
+
+#: ../console/gntplugin.c:102
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
 msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "아래에 사용자의 정보를 넣어주십시오."
-
-#: plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "계정 종류:"
-
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "아이디:"
-
-#. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "선택정보:"
-
-#. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
-msgid "Buddy Icon"
-msgstr "친구 아이콘"
-
-#: plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "성:"
-
-#: plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "이름:"
-
-#: plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "메일:"
-
-#: plugins/history.c:146
+"이름: %s\n"
+"버전: %s\n"
+"설명: %s\n"
+"저자: %s\n"
+"웹사이트: %s\n"
+"파일명: %s\n"
+
+#: ../console/gntplugin.c:155
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "그것을 설정하기 전에 적절한 플러그인을 로드해 주십시오."
+
+#: ../console/gntplugin.c:193
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:194
+msgid "Still need to do something about this."
+msgstr "아직 무언가 해야 할 일이 남은 것 같습니다."
+
+#: ../console/gntplugin.c:200
+msgid "No configuration options for this plugin."
+msgstr "이 플러그인에 대한 옵션이 설정되어 있지 않습니다."
+
+#: ../console/gntplugin.c:221
+msgid "You can (un)load plugins from the following list."
+msgstr "다음의 목록에 있는 플러그인을 로드하거나 해제할 수 있습니다."
+
+#: ../console/gntplugin.c:264
+msgid "Configure Plugin"
+msgstr "플러그인 설정"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "대기 시간 표시"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "오프라인 친구 표시"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "타임스탬프 표시"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "메시지를 입력 중일 때 친구에게 알림"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "로그 서식"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "메시지를 로그에 기록"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "대화를 로그에 기록"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "로그 상태 변경 이벤트"
+
+#. Conversations
+#: ../console/gntprefs.c:220
+#: ../gtk/gtkprefs.c:898
+#: ../gtk/gtkprefs.c:1915
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "대화 창"
+
+#: ../console/gntprefs.c:221
+#: ../gtk/gtkprefs.c:1355
+#: ../gtk/gtkprefs.c:1926
+msgid "Logging"
+msgstr "로그 기록"
+
+#: ../console/gntprefs.c:223
+#: ../console/gntui.c:74
+#: ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
+msgid "Preferences"
+msgstr "설정"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "아직 실행되지 않았습니다."
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "정말 %s 님을 삭제하시겠습니까?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "상태 삭제"
+
+#: ../console/gntstatus.c:167
+#: ../gtk/gtksavedstatuses.c:556
+msgid "Saved Statuses"
+msgstr "저장된 상태"
+
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463
+#: ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "제목"
+
+#: ../console/gntstatus.c:174
+#: ../gtk/gtksavedstatuses.c:478
+msgid "Type"
+msgstr "형식"
+
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563
+#: ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953
+#: ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062
+#: ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609
+#: ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625
+#: ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639
+#: ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
+#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
+msgid "Message"
+msgstr "메시지"
+
+#. Use
+#: ../console/gntstatus.c:186
+#: ../console/gntstatus.c:580
+msgid "Use"
+msgstr "사용"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "잘못된 제목입니다."
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "상태 제목을 입력해 주십시오."
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "중복된 제목입니다."
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "다른 제목을 입력해 주십시오."
+
+#: ../console/gntstatus.c:440
+msgid "Substatus"
+msgstr "하위 상태"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:443
+#: ../gtk/gtkblist.c:5277
+#: ../gtk/gtkblist.c:5593
+msgid "Account:"
+msgstr "계정:"
+
+#: ../console/gntstatus.c:451
+#: ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "상태:"
+
+#: ../console/gntstatus.c:466
+msgid "Message:"
+msgstr "메시지:"
+
+#: ../console/gntstatus.c:515
+msgid "Edit Status"
+msgstr "상태 편집"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534
+#: ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798
+#: ../gtk/gtkblist.c:2811
+#: ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942
+#: ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024
+#: ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596
+#: ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
+msgid "Status"
+msgstr "상태"
+
+#: ../console/gntstatus.c:557
+msgid "Use different status for following accounts"
+msgstr "다음의 계정으로 다른 상태를 사용"
+
+#. Save & Use
+#: ../console/gntstatus.c:591
+msgid "Save & Use"
+msgstr "저장 및 사용"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "상태"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s 님이 접속했습니다."
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s 님이 접속을 끊었습니다."
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s 님이 나에게 메시지를 보내 왔습니다."
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s 님이 별명을 불렀습니다. (%s)"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s 님이 메시지를 전송합니다. (%s)"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "친구가 접속/접속 해제했을 때"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "메시지를 받을 때"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "대화에서 누군가가 나를 호출했을 때"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "대화에서 누군가가 내 이름을 입력했을 때"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "다음의 경우에 Toaster와 함께 알림"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "비프음 포함!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "터미널 창 속성이 긴급으로 되었을 때"
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../console/plugins/gntgf.c:357
+#: ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for Gaim-Text."
+msgstr "Pidgin (터미널 버전)의 Toaster 플러그인"
+
+#: ../console/plugins/gnthistory.c:116
+#: ../gtk/plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s 님과 %s 의 대화</b><br>"
+
+#: ../console/plugins/gnthistory.c:138
+#: ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
+msgstr "로그 기능은 히스토리 플러그인이 필요합니다."
+
+#: ../console/plugins/gnthistory.c:139
+#: ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "대화 내역"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr "새 대화 연결시 지난 기록을 보입니다."
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/iconaway.c:101
-msgid "Iconify on Away"
-msgstr "자리비움 아이콘 표시"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "자리비움 상태일 때 대화창과 친구 목록을 아이콘화 합니다."
-
-#: plugins/idle.c:115
-msgid "Minutes"
-msgstr "분"
-
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
-msgid "I'dle Mak'er"
-msgstr "사용안함 만들기"
-
-#: plugins/idle.c:123 plugins/idle.c:181
-msgid "Set Account Idle Time"
-msgstr "계정을 사용하지 않은 시간"
-
-#: plugins/idle.c:126
-msgid "_Set"
-msgstr "설정(_S)"
-
-#: plugins/idle.c:127 plugins/idle.c:154
-msgid "_Cancel"
-msgstr "취소(_C)"
-
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
-msgid "Unset Account Idle Time"
-msgstr "계정을 사용하지 않은 시간"
-
-#: plugins/idle.c:153
-#, fuzzy
-msgid "_Unset"
-msgstr "사용(_U)"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "수동으로 내가 얼마나 사용하지 않았는지 정할 수 있게 합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC 테스트 서버"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-
-#: plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "메일 검사기"
-
-#: plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "새 로컬 메일이 있는지 검사합니다."
-
-#: plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-
-#. ---------- "Notify For" ----------
-#: plugins/notify.c:638
-msgid "Notify For"
-msgstr "다음 경우 알림"
-
-#: plugins/notify.c:642
-msgid "_IM windows"
-msgstr "메신저 창(_I)"
-
-#: plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "대화 창(_C)"
-
-#: plugins/notify.c:656
-msgid "_Focused windows"
-msgstr "선택된 창(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
-msgid "Notification Methods"
-msgstr "알림 방식"
-
-#: plugins/notify.c:671
-msgid "Prepend _string into window title:"
-msgstr "창 제목줄에 올 문자열(_S):"
-
-#. Count method button
-#: plugins/notify.c:690
-msgid "Insert c_ount of new messages into window title"
-msgstr "창 제목에 새로 온 메시지 갯수 넣음(_O)"
-
-#. Urgent method button
-#: plugins/notify.c:698
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "창 관리자 \"긴급(_U)\" 힌트 설정"
-
-#. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "메신저 대화 창"
-
-#. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
-msgid "Notification Removal"
-msgstr "알림 지움"
-
-#. Remove on focus button
-#: plugins/notify.c:719
-msgid "Remove when conversation window _gains focus"
-msgstr "대화창이 선택되면 지움(_G)"
-
-#. Remove on click button
-#: plugins/notify.c:726
-msgid "Remove when conversation window _receives click"
-msgstr "대화창을 클릭하면 지움(_R)"
-
-#. Remove on type button
-#: plugins/notify.c:734
-msgid "Remove when _typing in conversation window"
-msgstr "대화창에서 메시지를 입력하면 없앰(_T)"
-
-#. Remove on message send button
-#: plugins/notify.c:742
-msgid "Remove when a _message gets sent"
-msgstr "메시지 보내면 지움(_M)"
-
-#. Remove on conversation switch button
-#: plugins/notify.c:751
-msgid "Remove on switch to conversation ta_b"
-msgstr "대화 탭을 바꾸면 지움(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/notify.c:841
-msgid "Message Notification"
-msgstr "메시지 알림"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "읽지 않은 메시지를 알리는 여러 가지 방식을 제공합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/perl/perl.c:587
-msgid "Perl Plugin Loader"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
-msgid "Provides support for loading perl plugins."
-msgstr ""
-
-#: plugins/raw.c:151
-msgid "Raw"
-msgstr ""
-
-#: plugins/raw.c:153
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
-#: plugins/raw.c:154
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-
-#: plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-
-#: plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-
-#: plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-
-#: plugins/relnot.c:78 plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "새로운 버젼을 사용할 수 있음"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "새 버젼 알림"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "새 버젼을 일정 시간마다 검사합니다."
-
-#. *  description
-#: plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"새 버젼을 일정 시간 간격으로 검사해서 사용자에게 바뀐 내용을 알려줍니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/signals-test.c:730
-msgid "Signals Test"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
-msgid "Test to see that all signals are working properly."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr ""
-
-#: plugins/spellchk.c:1788
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1789
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
-msgid "Text Replacements"
-msgstr "내용 변환"
-
-#: plugins/spellchk.c:1972
-msgid "You type"
-msgstr "입력"
-
-#: plugins/spellchk.c:1984
-msgid "You send"
-msgstr "보냄"
-
-#: plugins/spellchk.c:1996
-msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
-msgid "Add a new text replacement"
-msgstr "변환할 내용 더하기"
-
-#: plugins/spellchk.c:2032
-msgid "You _type:"
-msgstr "입력한 것(_T):"
-
-#: plugins/spellchk.c:2048
-msgid "You _send:"
-msgstr "보내는 것(_S):"
-
-#: plugins/spellchk.c:2060
-msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
-msgid "Text replacement"
-msgstr "내용 변환"
-
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "사용자 정의된 규칙에 따라 내보내는 메시지의 내용을 변환합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s님이 자리를 비웠습니다."
-
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s님이 돌아왔습니다."
-
-#: plugins/statenotify.c:56
-#, c-format
-msgid "%s has become idle."
-msgstr "%s님이 사용안함 상태가 됩니다."
-
-#: plugins/statenotify.c:63
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s님이 사용안함 상태에서 돌아왔습니다."
-
-#: plugins/statenotify.c:74
-msgid "Notify When"
-msgstr "다음 경우에 알림"
-
-#: plugins/statenotify.c:77
-msgid "Buddy Goes _Away"
-msgstr "친구가 자리비움(_A)"
-
-#: plugins/statenotify.c:80
-msgid "Buddy Goes _Idle"
-msgstr "친구가 사용하지 않음(_I)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/statenotify.c:120
-msgid "Buddy State Notification"
-msgstr "친구 상태 알림"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr "친구가 자리비움이나 사용안함에서 돌아오거나 나갈 때 대화창에 알립니다."
-
-#: plugins/tcl/tcl.c:363
-msgid "Tcl Plugin Loader"
-msgstr ""
-
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
-msgid "Provides support for loading Tcl plugins"
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
-msgid "Buddy Ticker"
-msgstr "친구 표시기"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "친구 목록의 수평으로 흐르는 버전입니다."
-
-#: plugins/timestamp.c:202
-msgid "iChat Timestamp"
-msgstr "iChat 타임스탬프"
-
-#: plugins/timestamp.c:209
-msgid "Delay"
-msgstr "간격"
-
-#: plugins/timestamp.c:216
-msgid "minutes."
-msgstr "동안 사용하지 않음."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/timestamp.c:279
-msgid "Timestamp"
-msgstr "시간 표시"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "매 분마다 iChat 스타일로 대화창에 시간을 표시합니다."
-
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "불투명도:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "메신저 대화 창"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "메신저창 투명도(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "메신저창에 슬라이드 바 보이기(_S)"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "메신저창 투명도(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
-msgid "Always on top"
-msgstr "연락처 별칭"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "친구목록창"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "친구목록창을 투명하게(_B)"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "친구목록창을 투명하게(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
-msgid "Transparency"
-msgstr "투명"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr ""
-
-#. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"이 플러그인은 대화창과 친구 목록을 투명하게 할 수 있도록 합니다.\n"
+"로그를 기록하려면 [도구] -> [설정] -> [로그 기록] 을 선택해 주십시오.\n"
 "\n"
-"* Note: 이 플러그인은 Win2000이나 WinXP에서만 작동합니다."
-
-#: plugins/win32/winprefs/winprefs.c:385
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ 런타임 버전"
-
-#. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
-msgid "Startup"
-msgstr "시작"
-
-#: plugins/win32/winprefs/winprefs.c:394
-msgid "_Start Gaim on Windows startup"
-msgstr "윈도우가 시작될 때 게임 실행하기(_S)"
-
-#. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
-msgid "Buddy List"
-msgstr "친구 목록"
-
-#: plugins/win32/winprefs/winprefs.c:406
-msgid "_Dockable Buddy List"
-msgstr "친구 목록 도킹 가능하게(_D)"
-
-#. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
-msgstr "친구목록창을 항상 위에 놓기(_K)"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "안함"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "자리비움"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
-msgid "Only when docked"
-msgstr ""
-
-#. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
-msgid "Conversations"
-msgstr "대화"
-
-#: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
-msgid "_Flash window when messages are received"
-msgstr "메시지가 도착하면 윈도우를 깜빡이게(_F)"
-
-#: plugins/win32/winprefs/winprefs.c:443
-msgid "WinGaim Options"
-msgstr "윈게임 옵션"
-
-#: plugins/win32/winprefs/winprefs.c:445
-msgid "Options specific to Windows Gaim."
-msgstr "윈도우 게임의 옵션을 정합니다."
-
-#: plugins/win32/winprefs/winprefs.c:446
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
-msgid "accounts"
-msgstr "계정"
-
-#: src/account.c:915
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "열쇠글이 너무 오래됨"
-
-#: src/account.c:940
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "%s(%s)의 열쇠글을 넣으세요"
-
-#: src/account.c:947
-#, fuzzy
-msgid "Enter Password"
-msgstr "열쇠글 바꾸기"
-
-#: src/account.c:952
-#, fuzzy
-msgid "Save password"
-msgstr "새 열쇠글"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
-msgid "OK"
-msgstr "확인"
-
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
-msgid "Cancel"
-msgstr "취소"
-
-#: src/account.c:986 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "%s은(는) 잘못된 프로토콜 플러그인입니다."
-
-#: src/account.c:988 src/connection.c:99
-msgid "Connection Error"
-msgstr "연결 오류"
-
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
-msgid "New passwords do not match."
-msgstr "새 패스워드가 일치하지 않습니다."
-
-#: src/account.c:1061
-msgid "Fill out all fields completely."
-msgstr "모든 항목을 완전히 채우세요."
-
-#: src/account.c:1085
-msgid "Original password"
-msgstr "예전 열쇠글"
-
-#: src/account.c:1092
-msgid "New password"
-msgstr "새 열쇠글"
-
-#: src/account.c:1099
-msgid "New password (again)"
-msgstr "새 열쇠글 (다시)"
-
-#: src/account.c:1105
-#, c-format
-msgid "Change password for %s"
-msgstr "%s의 열쇠글 바꾸기"
-
-#: src/account.c:1113
-msgid "Please enter your current password and your new password."
-msgstr "예전 열쇠글과 새 열쇠글을 입력하십시오."
-
-#: src/account.c:1146
-#, c-format
-msgid "Change user information for %s"
-msgstr "%s 사용자의 정보 바꾸기"
-
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "저장"
-
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
-msgid "Unknown"
-msgstr "알려지지 않음"
-
-#: src/blist.c:545
-#, fuzzy
-msgid "buddy list"
-msgstr "친구 목록"
-
-#: src/blist.c:1162
-msgid "Chats"
-msgstr "채팅"
-
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%2$s 그룹의 %1$d명은 계정이 연결되지 않은 관계로 지워지지 않았습니다. 친구와 "
-"그룹이 모두 지워지지 않았습니다.\n"
-
-#: src/blist.c:1872
-msgid "Group not removed"
-msgstr "그룹이 지워지지 않음"
-
-#: src/connection.c:98
-msgid "Registration Error"
-msgstr "가입 오류"
-
-#: src/conversation.c:205
-#, fuzzy
-msgid "Unable to send message: The message is too large."
-msgstr "메시지를 보낼 수 없습니다. 메시지가 너무 큽니다."
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
-msgstr "%s 계정으로 메시지를 보낼 수 없음:"
-
-#: src/conversation.c:209
-msgid "The message is too large."
-msgstr "메시지가 너무 큽니다."
-
-#: src/conversation.c:218
-msgid "Unable to send message."
-msgstr "메시지를 보낼 수 없습니다."
-
-#: src/conversation.c:1497
-#, c-format
-msgid "%s entered the room."
-msgstr "%s님이 대화실에 들어왔습니다."
-
-#: src/conversation.c:1499
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>]님이 대화실에 들어왔습니다."
-
-#: src/conversation.c:1598
-#, c-format
-msgid "You are now known as %s"
-msgstr "%s(으)로 대화명을 바꾸었습니다."
-
-#: src/conversation.c:1613
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s님이 %s(으)로 대화명을 바꾸었습니다."
-
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s님이 대화실(%s)에서 나갔습니다."
-
-#: src/conversation.c:1671
-#, c-format
-msgid "%s left the room."
-msgstr "%s님이 대화실에서 나갔습니다."
-
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d 메시지)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr "대화실에서 나갔습니다 (%s)."
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"읽기 오류 %s: \n"
-"%s.\n"
-
-#: src/ft.c:192
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"쓰기 오류 %s: \n"
-"%s.\n"
-
-#: src/ft.c:196
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"접근 오류 %s: \n"
-"%s.\n"
-
-#: src/ft.c:229
-msgid "Cannot send a file of 0 bytes."
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/ft.c:239
-msgid "Cannot send a directory."
-msgstr "디렉토리는 보낼 수 없습니다."
-
-#: src/ft.c:248
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s 파일은 일반적인 파일이 아니므로 덮어씌우지 않습니다.\n"
-
-#: src/ft.c:306
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s님이 %s 파일을 보내려고 함(%s)"
-
-#: src/ft.c:313
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s님이 파일을 보내려고 함"
-
-#: src/ft.c:354
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "%s님의 파일 전송 요청을 수락할까요?"
-
-#: src/ft.c:358
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-
-#: src/ft.c:382
-#, fuzzy, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s 파일을 %s님에게 보내려는 중"
-
-#: src/ft.c:422
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s 은(/는) 잘못된 파일명입니다.\n"
-
-#: src/ft.c:443
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "%s 파일을 %s님에게 보내려는 중"
-
-#: src/ft.c:454
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "%s님의 파일 전송 요청을 수락할까요?"
-
-#: src/ft.c:608
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "%s 파일 전송 완료"
-
-#: src/ft.c:611
-msgid "File transfer complete"
-msgstr "파일 전송 완료"
-
-#: src/ft.c:995
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "%s 파일 전송 취소"
-
-#: src/ft.c:1000
-msgid "File transfer cancelled"
-msgstr "파일 전송이 취소됨"
-
-#: src/ft.c:1057
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s님이 %s 파일 전송 취소"
-
-#: src/ft.c:1062
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s님이 파일 전송을 취소했음"
-
-#: src/ft.c:1119
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
-msgstr "%s님에게 파일 전송을 취소합니다.\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
-msgstr "%s님에게서 파일 수신을 취소합니다.\n"
-
-#: src/gtkaccount.c:362
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>파일:</b> %s\n"
-"<b>파일 크기:</b> %s\n"
-"<b>이미지 크기:</b> %dx%d"
+"인스턴트 메시지 혹은 대화의 로그를 기록해 두면, 히스토리 플러그인의 기능을 이용 가능하게 됩니다."
+
+#: ../console/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "GntHistory"
+
+#: ../console/plugins/gnthistory.c:181
+#: ../gtk/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "새로운 대화를 시작할 때 최근 로그에 기록된 대화를 삽입합니다."
+
+#: ../console/plugins/gnthistory.c:182
+#: ../gtk/plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "새로운 대화가 시작되면 이전 대화의 맨 마지막 메시지를 앞 부분에 추가합니다."
+
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "마지막 로그"
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "마지막 로그: 과거의 로그에 있는 부분 문자열을 검색합니다."
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+#: ../console/plugins/lastlog.c:123
+#: ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr "Pidgin (터미널 버전)의 마지막 로그 플러그인입니다."
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "방향"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "트레이의 방향입니다."
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "별칭(_A)"
+
+#. join button
+#: ../gtk/gaimstock.c:138
+#: ../gtk/gtkblist.c:1186
+#: ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
+msgid "_Join"
+msgstr "참가(_J)"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "탭 닫기(_T)"
+
+#: ../gtk/gaimstock.c:140
+#: ../gtk/gtkblist.c:1069
+msgid "I_M"
+msgstr "인스턴트 메시지(_M)"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "정보 가져오기(_G)"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "초대(_I)"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "변경(_M)"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "메일 열기(_O)"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145
+#: ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "일시정지(_P)"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../gtk/gtkaccount.c:390
 msgid "Login Options"
-msgstr "로긴 옵션"
-
-#: src/gtkaccount.c:747 src/gtkft.c:623
-msgid "Protocol:"
-msgstr "프로토콜:"
-
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "아이디:"
-
-#: src/gtkaccount.c:825
-msgid "Password:"
-msgstr "열쇠글:"
-
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
-msgid "Alias:"
+msgstr "로그인 설정"
+
+#: ../gtk/gtkaccount.c:492
+msgid "Local alias:"
 msgstr "별칭:"
 
-#: src/gtkaccount.c:834
-msgid "Remember password"
-msgstr "열쇠글 기억하기"
-
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:554
 msgid "User Options"
-msgstr "사용자 옵션"
-
-#: src/gtkaccount.c:892
-msgid "New mail notifications"
-msgstr "새 메일 알림"
-
-#: src/gtkaccount.c:901
-#, fuzzy
-msgid "Buddy icon:"
-msgstr "친구 아이콘"
+msgstr "사용자 설정"
+
+#. Buddy icon
+#: ../gtk/gtkaccount.c:572
+msgid "Use this buddy icon for this account:"
+msgstr "다음 아이콘 사용:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../gtk/gtkaccount.c:684
 #, c-format
 msgid "%s Options"
-msgstr "%s 옵션"
-
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+msgstr "%s 설정"
+
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME 프록시 설정 사용"
+
+#: ../gtk/gtkaccount.c:882
 msgid "Use Global Proxy Settings"
-msgstr "기본 프록시 설정 사용하기"
-
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+msgstr "글로벌 프록시 설정 사용"
+
+#: ../gtk/gtkaccount.c:888
 msgid "No Proxy"
-msgstr "프록시 사용 안함"
-
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+msgstr "프록시 없음"
+
+#: ../gtk/gtkaccount.c:894
 msgid "HTTP"
-msgstr ""
-
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+msgstr "HTTP"
+
+#: ../gtk/gtkaccount.c:900
 msgid "SOCKS 4"
-msgstr ""
-
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+msgstr "SOCKS 4"
+
+#: ../gtk/gtkaccount.c:906
 msgid "SOCKS 5"
-msgstr ""
-
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+msgstr "SOCKS 5"
+
+#: ../gtk/gtkaccount.c:912
+#: ../gtk/gtkprefs.c:1100
 msgid "Use Environmental Settings"
-msgstr "기본환경 설정 사용하기"
-
-#: src/gtkaccount.c:1249
+msgstr "환경 설정 사용"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:951
+msgid "If you look real closely"
+msgstr "가까이 잘 보면"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../gtk/gtkaccount.c:954
 msgid "you can see the butterflies mating"
-msgstr ""
-
-#: src/gtkaccount.c:1253
-msgid "If you look real closely"
-msgstr ""
-
-#: src/gtkaccount.c:1269
+msgstr "나비가 친구가 되어 있는 것을 알 수 있습니다."
+
+#: ../gtk/gtkaccount.c:975
 msgid "Proxy Options"
-msgstr "프록시 옵션"
-
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+msgstr "프록시 설정"
+
+#: ../gtk/gtkaccount.c:989
+#: ../gtk/gtkprefs.c:1094
 msgid "Proxy _type:"
-msgstr "프록시 종류(_T):"
-
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+msgstr "프록시 형식(_T):"
+
+#: ../gtk/gtkaccount.c:998
+#: ../gtk/gtkprefs.c:1115
 msgid "_Host:"
-msgstr "호스트(_H):"
-
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+msgstr "호스트명(_H):"
+
+#: ../gtk/gtkaccount.c:1002
+#: ../gtk/gtkprefs.c:1133
 msgid "_Port:"
-msgstr "포트(_P):"
-
-#: src/gtkaccount.c:1308
+msgstr "포트 번호(_P):"
+
+#: ../gtk/gtkaccount.c:1010
 msgid "_Username:"
-msgstr "사용자이름(_U):"
-
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+msgstr "사용자명(_U):"
+
+#: ../gtk/gtkaccount.c:1017
+#: ../gtk/gtkprefs.c:1170
 msgid "Pa_ssword:"
-msgstr "열쇠글(_S):"
-
-#: src/gtkaccount.c:1700
+msgstr "비밀번호(_S):"
+
+#: ../gtk/gtkaccount.c:1428
 msgid "Add Account"
-msgstr "계정 더하기"
-
-#: src/gtkaccount.c:1702
-msgid "Modify Account"
-msgstr "계정 고치기"
+msgstr "계정 추가"
+
+#: ../gtk/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "기본 설정(_B)"
+
+#: ../gtk/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "고급 설정(_A)"
 
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../gtk/gtkaccount.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:860
 msgid "Register"
-msgstr "가입"
-
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "정말 %s을(를) 지울까요?"
-
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
-msgid "Delete"
-msgstr "지우기"
-
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
-msgid "Screen Name"
-msgstr "아이디"
-
-#: src/gtkaccount.c:2210
-#, fuzzy
+msgstr "등록"
+
+#: ../gtk/gtkaccount.c:1933
+#: ../gtk/gtkplugin.c:566
 msgid "Enabled"
-msgstr "실패"
-
-#: src/gtkaccount.c:2218
+msgstr "사용"
+
+#: ../gtk/gtkaccount.c:1961
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s님이 %s님을 친구 목록에 등록했습니다%s%s%s"
-
-#: src/gtkaccount.c:2564
+#: ../gtk/gtkaccount.c:2133
 msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
 "\n"
+"You have no IM accounts configured. To start connecting with Gaim press the <b>Add</b> button below and configure your first account. If you want Gaim to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"Do you wish to add him or her to your buddy list?"
+"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'>Pidgin에 오신 것을 환영합니다!</span>\n"
 "\n"
+"아직 IM 계정을 설정하지 않았습니다. Pidgin을 사용하여 접속을 시작하는 경우에는 아래에 있는 <b>추가</b> 버튼을 누른 후, 계정 정보를 입력해 주십시오. Pidgin을 사용하여 복수의 IM 계정을 접속하는 경우에는, 각 계정마다 <b>추가</b> 버튼을 눌러 설정해 주십시오.\n"
 "\n"
-"내 친구 목록에 더할까요?"
-
-#: src/gtkaccount.c:2572
-msgid "Add buddy to your list?"
-msgstr "내 친구 목록에 친구를 더할까요?"
-
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
-msgid "Add"
-msgstr "더하기"
-
-#: src/gtkblist.c:595
+"친구 목록 창에 있는 <b>계정 -> 추가/편집</b> 메뉴에서도 이 창을 열 수 있습니다."
+
+#: ../gtk/gtkaccount.c:2483
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s 님이 %s 님을 친구 목록 %s%s에 추가하고 싶어 합니다."
+
+#: ../gtk/gtkaccount.c:2506
+#: ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "친구로서 승인하시겠습니까?"
+
+#: ../gtk/gtkaccount.c:2507
+#: ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "승인"
+
+#: ../gtk/gtkaccount.c:2508
+#: ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "거부"
+
+#: ../gtk/gtkblist.c:709
 msgid "Join a Chat"
-msgstr "채팅 참여"
-
-#: src/gtkblist.c:616
-#, fuzzy
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "별칭과 목록에 더할 대화실에 알맞은 설명을 넣으세요.\n"
-
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+msgstr "대화 참가"
+
+#: ../gtk/gtkblist.c:730
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "참가할 대화에 대해 적당한 정보를 입력해 주십시오.\n"
+
+#: ../gtk/gtkblist.c:741
+#: ../gtk/gtkpounce.c:529
+#: ../gtk/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "계정(_A):"
 
-#: src/gtkblist.c:935
+#: ../gtk/gtkblist.c:1015
+#: ../gtk/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "거부(_B)"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "거부 안 함(_B)"
+
+#: ../gtk/gtkblist.c:1066
 msgid "Get _Info"
-msgstr "정보(_I)"
-
-#: src/gtkblist.c:938
-msgid "I_M"
-msgstr "메시지(_M)"
-
-#: src/gtkblist.c:944
+msgstr "정보 가져오기(_I)"
+
+#: ../gtk/gtkblist.c:1075
 msgid "_Send File"
-msgstr "파일 보내기(_S)"
-
-#: src/gtkblist.c:950
+msgstr "파일 전송(_S)"
+
+#: ../gtk/gtkblist.c:1082
 msgid "Add Buddy _Pounce"
-msgstr "친구알림 더하기(_P)"
-
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+msgstr "친구 알림 추가(_P)"
+
+#: ../gtk/gtkblist.c:1086
+#: ../gtk/gtkblist.c:1090
+#: ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
 msgid "View _Log"
-msgstr "지난 대화 보기(_L)"
-
-#: src/gtkblist.c:969
-#, fuzzy
-msgid "_Alias Buddy..."
-msgstr "친구 별칭"
-
-#: src/gtkblist.c:971
-#, fuzzy
-msgid "_Remove Buddy"
-msgstr "친구 지우기"
-
-#: src/gtkblist.c:973
-#, fuzzy
-msgid "Alias Contact..."
-msgstr "연락처 별칭"
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "연락처 지우기"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+msgstr "로그 보기(_L)"
+
+#: ../gtk/gtkblist.c:1103
+msgid "Alias..."
+msgstr "별칭..."
+
+#: ../gtk/gtkblist.c:1112
+#: ../gtk/gtkblist.c:1198
+#: ../gtk/gtkblist.c:1219
 msgid "_Alias..."
 msgstr "별칭(_A)..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../gtk/gtkblist.c:1114
+#: ../gtk/gtkblist.c:1200
+#: ../gtk/gtkblist.c:1221
 msgid "_Remove"
-msgstr "지우기(_R)"
-
-#: src/gtkblist.c:1028
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkblist.c:1161
 msgid "Add a _Buddy"
-msgstr "친구 더하기(_B)"
-
-#: src/gtkblist.c:1030
+msgstr "친구 추가(_B)"
+
+#: ../gtk/gtkblist.c:1163
 msgid "Add a C_hat"
-msgstr "채팅 더하기(_H)"
-
-#: src/gtkblist.c:1032
+msgstr "대화 추가(_H)"
+
+#: ../gtk/gtkblist.c:1166
 msgid "_Delete Group"
-msgstr "그룹 지우기(_D)"
-
-#: src/gtkblist.c:1034
+msgstr "그룹 삭제(_D)"
+
+#: ../gtk/gtkblist.c:1168
 msgid "_Rename"
 msgstr "이름 바꾸기(_R)"
 
-#. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
-msgid "_Join"
-msgstr "참여(_J)"
-
-#: src/gtkblist.c:1054
+#: ../gtk/gtkblist.c:1188
 msgid "Auto-Join"
-msgstr "자동 참여"
-
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+msgstr "자동 참가"
+
+#: ../gtk/gtkblist.c:1226
+#: ../gtk/gtkblist.c:1249
 msgid "_Collapse"
-msgstr "합치기(_C)"
-
-#: src/gtkblist.c:1120
+msgstr "숨기기(_C)"
+
+#: ../gtk/gtkblist.c:1254
 msgid "_Expand"
-msgstr "펼치기(_E)"
-
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+msgstr "보이기(_E)"
+
+#: ../gtk/gtkblist.c:1500
+#: ../gtk/gtkblist.c:1512
+#: ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
 msgid "/Tools/Mute Sounds"
-msgstr "음소거"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "현재 그 친구를 더할 수 있는 계정에 연결되어 있지 않습니다."
+msgstr "/도구/소리 끄기"
+
+#: ../gtk/gtkblist.c:1972
+#: ../gtk/gtkconv.c:4415
+#: ../gtk/gtkpounce.c:421
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "지금 친구 추가가 가능한 계정에 접속되어 있지 않습니다."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: ../gtk/gtkblist.c:2567
 msgid "/_Buddies"
 msgstr "/친구(_B)"
 
-#: src/gtkblist.c:2330
+#: ../gtk/gtkblist.c:2568
 msgid "/Buddies/New Instant _Message..."
-msgstr "/친구(B)/새 메시지(_M)..."
-
-#: src/gtkblist.c:2331
+msgstr "/친구/새 인스턴스 메시지(_M)..."
+
+#: ../gtk/gtkblist.c:2569
 msgid "/Buddies/Join a _Chat..."
-msgstr "/친구(B)/채팅에 참여하기(_C)..."
-
-#: src/gtkblist.c:2332
+msgstr "/친구/대화 참가(_C)..."
+
+#: ../gtk/gtkblist.c:2570
 msgid "/Buddies/Get User _Info..."
-msgstr "/친구(B)/사용자 정보 보기(_I)..."
-
-#: src/gtkblist.c:2333
+msgstr "/친구/사용자 정보 가져오기(_I)..."
+
+#: ../gtk/gtkblist.c:2571
 msgid "/Buddies/View User _Log..."
-msgstr "/친구(B)/사용자 기록 보기(_L)..."
-
-#: src/gtkblist.c:2335
+msgstr "/친구/사용자 로그 보기(_L)..."
+
+#: ../gtk/gtkblist.c:2573
 msgid "/Buddies/Show _Offline Buddies"
-msgstr "/친구(B)/접속안한 친구 보여주기(_O)"
-
-#: src/gtkblist.c:2336
+msgstr "/친구/오프라인 친구 표시(_O)"
+
+#: ../gtk/gtkblist.c:2574
 msgid "/Buddies/Show _Empty Groups"
-msgstr "/친구(B)/빈 그룹 보여주기(_E)"
-
-#: src/gtkblist.c:2337
-#, fuzzy
+msgstr "/친구/빈 그룹 표시(_E)"
+
+#: ../gtk/gtkblist.c:2575
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/친구(B)/접속안한 친구 보여주기"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/친구(B)/접속안한 친구 보여주기"
-
-#: src/gtkblist.c:2340
+msgstr "/친구/친구 상세 표시(_D)"
+
+#: ../gtk/gtkblist.c:2576
+msgid "/Buddies/Show Idle _Times"
+msgstr "/친구/대기 시간 표시(_T)"
+
+#: ../gtk/gtkblist.c:2577
+msgid "/Buddies/_Sort Buddies"
+msgstr "/친구/친구 정렬(_S)"
+
+#: ../gtk/gtkblist.c:2579
 msgid "/Buddies/_Add Buddy..."
-msgstr "/친구(B)/친구 더하기(_A)..."
-
-#: src/gtkblist.c:2341
+msgstr "/친구/친구 추가(_A)..."
+
+#: ../gtk/gtkblist.c:2580
 msgid "/Buddies/Add C_hat..."
-msgstr "/친구(B)/채팅 만들기(_H)..."
-
-#: src/gtkblist.c:2342
+msgstr "/친구/대화 추가(_H)..."
+
+#: ../gtk/gtkblist.c:2581
 msgid "/Buddies/Add _Group..."
-msgstr "/친구(B)/그룹 만들기(_G)..."
-
-#: src/gtkblist.c:2344
+msgstr "/친구/그룹 추가(_G)..."
+
+#: ../gtk/gtkblist.c:2583
 msgid "/Buddies/_Quit"
-msgstr "/친구(B)/나가기(_Q)"
+msgstr "/친구/종료(_Q)"
+
+#. Accounts menu
+#: ../gtk/gtkblist.c:2586
+msgid "/_Accounts"
+msgstr "/계정(_A)"
+
+#: ../gtk/gtkblist.c:2587
+#: ../gtk/gtkblist.c:6279
+msgid "/Accounts/Add\\/Edit"
+msgstr "/계정/추가\\/편집"
 
 #. Tools
-#: src/gtkblist.c:2347
+#: ../gtk/gtkblist.c:2590
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
-msgstr "/도구(T)/친구알림(_P)"
-
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/도구(T)/계정 명령(_T)"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/도구(T)/계정 설정(_C)"
-
-#: src/gtkblist.c:2352
-msgid "/Tools/Pr_eferences"
-msgstr "/도구(T)/기본설정"
-
-#: src/gtkblist.c:2353
-#, fuzzy
+#: ../gtk/gtkblist.c:2591
+msgid "/Tools/Buddy _Pounces"
+msgstr "/도구/친구 알림(_P)"
+
+#: ../gtk/gtkblist.c:2592
 msgid "/Tools/Plu_gins"
-msgstr "/도구(T)/프로토콜 명령"
-
-#: src/gtkblist.c:2354
+msgstr "/도구/플러그인(_G)"
+
+#: ../gtk/gtkblist.c:2593
+msgid "/Tools/Pr_eferences"
+msgstr "/도구/설정(_E)"
+
+#: ../gtk/gtkblist.c:2594
 msgid "/Tools/Pr_ivacy"
-msgstr "/도구(T)/프라이버시(_I)"
-
-#: src/gtkblist.c:2355
+msgstr "/도구/개인 정보(_I)"
+
+#: ../gtk/gtkblist.c:2596
 msgid "/Tools/_File Transfers"
-msgstr "/도구(T)/파일 전송(_F)"
-
-#: src/gtkblist.c:2356
+msgstr "/도구/파일 전송(_F)"
+
+#: ../gtk/gtkblist.c:2597
 msgid "/Tools/R_oom List"
-msgstr "/도구(T)/방 목록(_O)"
-
-#: src/gtkblist.c:2358
-#, fuzzy
+msgstr "/도구/대화실 목록(_O)"
+
+#: ../gtk/gtkblist.c:2598
+msgid "/Tools/System _Log"
+msgstr "/도구/시스템 로그(_L)"
+
+#: ../gtk/gtkblist.c:2600
 msgid "/Tools/Mute _Sounds"
-msgstr "음소거"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/도구(T)/시스템 로그 보기(_L)"
+msgstr "/도구/소리 끄기(_S)"
 
 #. Help
-#: src/gtkblist.c:2362
+#: ../gtk/gtkblist.c:2603
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/gtkblist.c:2363
+#: ../gtk/gtkblist.c:2604
 msgid "/Help/Online _Help"
-msgstr "/도움말(H)/온라인 도움말(_H)"
-
-#: src/gtkblist.c:2364
+msgstr "/도움말/온라인 도움말(_H)"
+
+#: ../gtk/gtkblist.c:2605
 msgid "/Help/_Debug Window"
-msgstr "/도움말(H)/디버그 창(_D)"
-
-#: src/gtkblist.c:2365
+msgstr "/도움말/디버그 창(_D)"
+
+#: ../gtk/gtkblist.c:2606
 msgid "/Help/_About"
-msgstr "/도움말(H)/게임은(_A)"
-
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+msgstr "/도움말/Pidgin 정보(_A)"
+
+#: ../gtk/gtkblist.c:2638
 #, c-format
 msgid ""
 "\n"
@@ -2033,1444 +1771,1667 @@
 "\n"
 "<b>계정:</b> %s"
 
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>연락처 별칭:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>별칭:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>대화명:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>접속:</b> "
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "친구의 별칭"
+
+#: ../gtk/gtkblist.c:2743
+msgid "Logged In"
+msgstr "접속 시간"
+
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "마지막에 만난 것은"
+
+#: ../gtk/gtkblist.c:2798
+#: ../gtk/gtkblist.c:3286
+#: ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990
+#: ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551
+#: ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177
+#: ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
+msgid "Offline"
+msgstr "오프라인"
+
+#: ../gtk/gtkblist.c:2809
+#: ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "설명"
+
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr "Spooky"
+
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr "Awesome"
+
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr "Rockin'"
+
+#: ../gtk/gtkblist.c:3302
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "대기 시간: %dh %02dm"
+
+#: ../gtk/gtkblist.c:3304
+#, c-format
+msgid "Idle %dm"
+msgstr "대기 시간: %dm"
+
+#: ../gtk/gtkblist.c:3435
+msgid "/Buddies/New Instant Message..."
+msgstr "/친구/새 인스턴트 메시지..."
+
+#: ../gtk/gtkblist.c:3436
+#: ../gtk/gtkblist.c:3469
+msgid "/Buddies/Join a Chat..."
+msgstr "/친구/대화 참가..."
+
+#: ../gtk/gtkblist.c:3437
+msgid "/Buddies/Get User Info..."
+msgstr "/친구/사용자 정보 가져오기..."
+
+#: ../gtk/gtkblist.c:3438
+msgid "/Buddies/Add Buddy..."
+msgstr "/친구/친구 추가..."
+
+#: ../gtk/gtkblist.c:3439
+#: ../gtk/gtkblist.c:3472
+msgid "/Buddies/Add Chat..."
+msgstr "/친구/대화 추가..."
+
+#: ../gtk/gtkblist.c:3440
+msgid "/Buddies/Add Group..."
+msgstr "/친구/그룹 추가..."
+
+#: ../gtk/gtkblist.c:3475
+msgid "/Tools/Buddy Pounces"
+msgstr "/도구/친구 알림"
+
+#: ../gtk/gtkblist.c:3478
+msgid "/Tools/Privacy"
+msgstr "/도구/개인 정보"
+
+#: ../gtk/gtkblist.c:3481
+msgid "/Tools/Room List"
+msgstr "/도구/대화실 목록"
+
+#: ../gtk/gtkblist.c:3578
+#: ../gtk/gtkdocklet.c:152
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%2$s 님으로부터 %1$d개의 읽지 않은 메일이 있습니다.\n"
+msgstr[1] "%2$s さんから %1$d個の未?のメッセ?ジがあります\n"
+
+#: ../gtk/gtkblist.c:3654
+msgid "Manually"
+msgstr "수동 정렬"
+
+#: ../gtk/gtkblist.c:3656
+msgid "Alphabetically"
+msgstr "알파벳순"
+
+#: ../gtk/gtkblist.c:3657
+msgid "By status"
+msgstr "상태순"
+
+#: ../gtk/gtkblist.c:3658
+msgid "By log size"
+msgstr "로그 크기순"
+
+#: ../gtk/gtkblist.c:3860
+#: ../gtk/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s 님은 접속을 끊었습니다."
+
+#: ../gtk/gtkblist.c:3869
+#: ../libgaim/protocols/sametime/sametime.c:3664
+msgid "Connect"
+msgstr "접속"
+
+#: ../gtk/gtkblist.c:3869
+msgid "Re-enable Account"
+msgstr "계정 재사용"
+
+#: ../gtk/gtkblist.c:3890
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s 님은 접속을 끊었습니다: %s</span>"
+
+#: ../gtk/gtkblist.c:4027
+msgid "<b>Username:</b>"
+msgstr "<b>사용자명</b>:"
+
+#: ../gtk/gtkblist.c:4034
+msgid "<b>Password:</b>"
+msgstr "<b>비밀번호</b>:"
+
+#: ../gtk/gtkblist.c:4045
+msgid "_Login"
+msgstr "로그인(_L)"
+
+#: ../gtk/gtkblist.c:4127
+msgid "/Accounts"
+msgstr "/계정"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../gtk/gtkblist.c:4141
 msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>사용안함:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr "<b>상태:</b> %s"
-
-#: src/gtkblist.c:2554
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>상태:</b> 오프라인"
-
-#: src/gtkblist.c:2577
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-
-#: src/gtkblist.c:2579
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>상태</b>: Awesome"
-
-#: src/gtkblist.c:2581
-#, fuzzy
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
+"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
 "\n"
-"<b>상태</b>: Rockin"
-
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "사용안함 (%d시간%02d분)"
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "사용안함 (%d분)"
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
-msgstr "사용안함"
-
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "오프라인"
-
-#: src/gtkblist.c:2968
-#, fuzzy
-msgid "/Buddies/New Instant Message..."
-msgstr "/친구(B)/새 메시지(_M)..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
-msgid "/Buddies/Join a Chat..."
-msgstr "/친구(B)/채팅에 참여하기..."
-
-#: src/gtkblist.c:2970
-#, fuzzy
-msgid "/Buddies/Get User Info..."
-msgstr "/친구(B)/사용자 정보 보기(_I)..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
-msgid "/Buddies/Add Buddy..."
-msgstr "/친구(B)/친구 더하기(_A)..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
-msgid "/Buddies/Add Chat..."
-msgstr "/친구(B)/채팅 만들기(_H)..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
-msgid "/Buddies/Add Group..."
-msgstr "/친구(B)/그룹 만들기(_G)..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/도구(T)/방 목록"
-
-#: src/gtkblist.c:3009
-msgid "/Tools/Privacy"
-msgstr "/도구(T)/프라이버시"
-
-#: src/gtkblist.c:3085
-#, fuzzy
-msgid "Manually"
-msgstr "수동"
-
-#: src/gtkblist.c:3087
-#, fuzzy
-msgid "Alphabetically"
-msgstr "알파벳 순"
-
-#: src/gtkblist.c:3088
-msgid "By status"
-msgstr "상태 순"
-
-#: src/gtkblist.c:3089
-msgid "By log size"
-msgstr "로그 크기 순"
-
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/도구(T)/친구알림"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/도구(T)/계정 명령"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Pidgin에 오신 것을 환영합니다!</span>\n"
+"\n"
+"아직 계정을 사용할 수 없습니다.<b>계정 -> 추가/편집</b> 메뉴에서 <b>계정</b> 창을 열어 IM 계정을 사용으로 선택해 주십시오. 계정을 사용으로 하면, 접속하여 상태를 설정한 후 친구와 대화할 수 있습니다."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../gtk/gtkblist.c:4368
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/친구(B)/접속안한 친구 보여주기"
-
-#: src/gtkblist.c:3324
+msgstr "/친구/오프라인 친구 표시"
+
+#: ../gtk/gtkblist.c:4371
 msgid "/Buddies/Show Empty Groups"
-msgstr "/친구(B)/빈 그룹 보여주기"
-
-#: src/gtkblist.c:3328
-#, fuzzy
+msgstr "/친구/빈 그룹 표시"
+
+#: ../gtk/gtkblist.c:4377
 msgid "/Buddies/Show Buddy Details"
-msgstr "/친구(B)/접속안한 친구 보여주기"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
-msgid "Add Buddy"
-msgstr "친구 더하기"
-
-#: src/gtkblist.c:4029
-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 ""
-"내 친구 목록에 더할 사람의 아이디를 넣으세요. 필요하면 별칭이나 대화명을 넣"
-"을 수도 있습니다. 별칭은 아이디가 사용되는 곳에 대신 표시됩니다.\n"
-
-#. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
-msgid "Account:"
-msgstr "계정:"
-
-#: src/gtkblist.c:4357
-#, fuzzy
+msgstr "/친구/친구 상세 표시"
+
+#: ../gtk/gtkblist.c:4380
+msgid "/Buddies/Show Idle Times"
+msgstr "/친구/대기 시간 표시"
+
+#: ../gtk/gtkblist.c:5073
+#: ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64
+#: ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294
+#: ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:68
+msgid "Buddies"
+msgstr "친구"
+
+#: ../gtk/gtkblist.c:5207
+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 "친구 목록에 추가하고자 하는 상대의 아이디를 입력해 주십시오. 친구의 별칭 또는 별명을 입력할 수 있습니다(선택 사항). 별칭은 가능한 경우 아이디 대신으로 표시됩니다.\n"
+
+#: ../gtk/gtkblist.c:5267
+#: ../gtk/gtkblist.c:5628
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "그룹:"
+
+#: ../gtk/gtkblist.c:5526
 msgid "This protocol does not support chat rooms."
-msgstr "지원하지 않는 버젼의 프로토콜"
-
-#: src/gtkblist.c:4373
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "현재 채팅을 할 수 있는 프로토콜에 로그인 되어 있지 않습니다."
-
-#: src/gtkblist.c:4390
-msgid "Add Chat"
-msgstr "채팅 더하기"
-
-#: src/gtkblist.c:4414
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr "별칭과 목록에 더할 대화실에 알맞은 설명을 넣으세요.\n"
-
-#: src/gtkblist.c:4493
-msgid "Add Group"
-msgstr "그룹 더하기"
-
-#: src/gtkblist.c:4494
+msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
+
+#: ../gtk/gtkblist.c:5542
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "대화가 가능한 프로토콜로 접속되어 있지 않습니다."
+
+#: ../gtk/gtkblist.c:5583
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "이 대화의 별칭과 친구 목록에 추가할 때의 적당한 정보를 입력해 주십시오.\n"
+
+#: ../gtk/gtkblist.c:5666
 msgid "Please enter the name of the group to be added."
-msgstr "더할 그룹의 이름을 넣으세요."
-
-#: src/gtkblist.c:5025
+msgstr "참가할 그룹명을 입력해 주십시오."
+
+#: ../gtk/gtkblist.c:6299
+msgid "<GaimMain>/Accounts/"
+msgstr "<PidginMain>/계정/"
+
+#: ../gtk/gtkblist.c:6324
+msgid "_Edit Account"
+msgstr "계정 편집(_E)"
+
+#: ../gtk/gtkblist.c:6357
+#: ../gtk/gtkblist.c:6363
+#: ../gtk/gtkconv.c:2858
 msgid "No actions available"
-msgstr "가능한 행동이 없음"
-
-#: src/gtkblist.c:5094
-#, fuzzy
+msgstr "이용 가능한 동작이 없습니다."
+
+#: ../gtk/gtkblist.c:6371
+msgid "_Disable"
+msgstr "사용 안 함(_D)"
+
+#: ../gtk/gtkblist.c:6383
+msgid "Enable Account"
+msgstr "계정 사용"
+
+#: ../gtk/gtkblist.c:6389
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr "<PidginMain>/계정/계정을 사용합니다."
+
+#: ../gtk/gtkblist.c:6438
 msgid "/Tools"
-msgstr "/도구(_T)"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "끊어짐."
-
-#: src/gtkconn.c:191
+msgstr "/도구"
+
+#: ../gtk/gtkblist.c:6508
+msgid "/Buddies/Sort Buddies"
+msgstr "/친구/친구 정렬"
+
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and re-enable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr ""
-
-#: src/gtkconv.c:334
-msgid "Supported debug options are:  version"
-msgstr ""
-
-#: src/gtkconv.c:371
-msgid "No such command (in this context)."
-msgstr ""
-
-#: src/gtkconv.c:374
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-
-#: src/gtkconv.c:446
-#, fuzzy
-msgid "No such command."
-msgstr "그런 채널이 없음"
-
-#: src/gtkconv.c:453
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+"%s\n"
+"\n"
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
-
-#: src/gtkconv.c:458
-#, fuzzy
-msgid "Your command failed for an unknown reason."
-msgstr "알 수 없는 이유로 접속이 끊어졌습니다."
-
-#: src/gtkconv.c:465
-msgid "That command only works in chats, not IMs."
-msgstr ""
-
-#: src/gtkconv.c:468
-msgid "That command only works in IMs, not chats."
-msgstr ""
-
-#: src/gtkconv.c:472
-msgid "That command doesn't work on this protocol."
-msgstr ""
-
-#: src/gtkconv.c:699 src/gtkconv.c:725
+"%s\n"
+"\n"
+"오류를 해결하고 계정을 다시 사용할 수 있을 때까지 Pidgin이 재접속하지 않습니다."
+
+#: ../gtk/gtkconv.c:766
+#: ../gtk/gtkconv.c:792
 msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: src/gtkconv.c:719
-#, fuzzy
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr "현재 그 친구를 더할 수 있는 계정에 연결되어 있지 않습니다."
-
-#: src/gtkconv.c:772
+msgstr "그 친구는 이 대화의 동일 프로토콜 상에 있지 않습니다."
+
+#: ../gtk/gtkconv.c:786
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "지금 그 친구를 초대 가능한 계정으로 접속되어 있지 않습니다."
+
+#: ../gtk/gtkconv.c:839
 msgid "Invite Buddy Into Chat Room"
-msgstr "대화실로 친구를 초대"
+msgstr "친구를 대화실로 초대"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-
-#: src/gtkconv.c:823
+#: ../gtk/gtkconv.c:869
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
+
+#: ../gtk/gtkconv.c:890
 msgid "_Buddy:"
 msgstr "친구(_B):"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../gtk/gtkconv.c:910
+#: ../gtk/gtksavedstatuses.c:1141
+#: ../gtk/gtksavedstatuses.c:1477
 msgid "_Message:"
 msgstr "메시지(_M):"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
-#, fuzzy
+#: ../gtk/gtkconv.c:967
+#: ../gtk/gtkconv.c:2420
+#: ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
-msgstr "%s 파일을 읽을 수 없습니다."
-
-#: src/gtkconv.c:906
+msgstr "파일을 열 수 없습니다."
+
+#: ../gtk/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>%s님과의 대화</h1>\n"
-
-#: src/gtkconv.c:930
+msgstr "<h1>%s 님과의 대화</h1>\n"
+
+#: ../gtk/gtkconv.c:997
 msgid "Save Conversation"
 msgstr "대화 저장"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1144
+#: ../gtk/gtkdebug.c:166
+#: ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "찾기"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1170
+#: ../gtk/gtkdebug.c:194
 msgid "_Search for:"
-msgstr "찾기(_S):"
-
-#: src/gtkconv.c:1227
+msgstr "검색 단어(_S):"
+
+#: ../gtk/gtkconv.c:1341
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: src/gtkconv.c:1489
-msgid "IM"
-msgstr "메시지"
-
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
-msgid "Send File"
-msgstr "파일 보내기"
-
-#: src/gtkconv.c:1502
+msgstr "로그 기록이 시작되었습니다. 지금부터 대화가 로그에 기록됩니다."
+
+#: ../gtk/gtkconv.c:1349
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "로그 기록이 중지되었습니다. 지금부터 대화가 로그에 기록되지 않습니다."
+
+#: ../gtk/gtkconv.c:1617
 msgid "Un-Ignore"
-msgstr "무시하지 않음"
-
-#: src/gtkconv.c:1505
+msgstr "무시 안 함"
+
+#: ../gtk/gtkconv.c:1620
 msgid "Ignore"
-msgstr "무시"
-
-#: src/gtkconv.c:1511
-msgid "Info"
-msgstr "정보"
-
-#: src/gtkconv.c:1517
-#, fuzzy
+msgstr "무시할 대상"
+
+#: ../gtk/gtkconv.c:1640
 msgid "Get Away Message"
-msgstr "새 자리비움 메시지"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "지우기"
-
-#: src/gtkconv.c:2236
-#, fuzzy
+msgstr "자리 비움 메시지"
+
+#: ../gtk/gtkconv.c:1663
+msgid "Last said"
+msgstr "마지막 메시지:"
+
+#: ../gtk/gtkconv.c:2428
 msgid "Unable to save icon file to disk."
 msgstr "아이콘 파일을 저장할 수 없습니다."
 
-#: src/gtkconv.c:2259
+#: ../gtk/gtkconv.c:2498
 msgid "Save Icon"
 msgstr "아이콘 저장"
 
-#: src/gtkconv.c:2308
+#: ../gtk/gtkconv.c:2547
 msgid "Animate"
-msgstr "동작"
-
-#: src/gtkconv.c:2313
+msgstr "애니메이션 사용"
+
+#: ../gtk/gtkconv.c:2552
 msgid "Hide Icon"
-msgstr "아이콘 숨김"
-
-#: src/gtkconv.c:2319
+msgstr "아이콘 숨기기"
+
+#: ../gtk/gtkconv.c:2555
 msgid "Save Icon As..."
-msgstr "새 이름으로 아이콘 저장..."
+msgstr "아이콘을 다른 이름으로 저장..."
+
+#: ../gtk/gtkconv.c:2559
+msgid "Set Custom Icon..."
+msgstr "사용자 아이콘 설정..."
+
+#: ../gtk/gtkconv.c:2566
+msgid "Remove Custom Icon"
+msgstr "사용자 아이콘 삭제"
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../gtk/gtkconv.c:2707
 msgid "/_Conversation"
 msgstr "/대화(_C)"
 
-#: src/gtkconv.c:2369
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/New Instant _Message..."
-msgstr "/대화(C)/새 메시지(_M)..."
-
-#: src/gtkconv.c:2374
+msgstr "/대화/새 인스턴트 메시지(_M)..."
+
+#: ../gtk/gtkconv.c:2714
 msgid "/Conversation/_Find..."
-msgstr "/대화(C)/찾기(_F)..."
-
-#: src/gtkconv.c:2376
+msgstr "/대화/찾기(_F)..."
+
+#: ../gtk/gtkconv.c:2716
 msgid "/Conversation/View _Log"
-msgstr "/대화(C)/기록 보기(_L)"
-
-#: src/gtkconv.c:2377
+msgstr "/대화/로그 보기(_L)"
+
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Save As..."
-msgstr "/대화(C)/다른 이름으로 저장(_S)..."
-
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/대화(C)/비우기"
-
-#: src/gtkconv.c:2383
+msgstr "/대화/다른 이름으로 저장(_S)..."
+
+#: ../gtk/gtkconv.c:2719
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/대화/화면 비우기(_R)"
+
+#: ../gtk/gtkconv.c:2723
 msgid "/Conversation/Se_nd File..."
-msgstr "/대화(C)/파일 보내기(_N)..."
-
-#: src/gtkconv.c:2384
+msgstr "/대화/파일 전송(_N)..."
+
+#: ../gtk/gtkconv.c:2724
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/대화(C)/친구알림 더하기(_P)..."
-
-#: src/gtkconv.c:2386
+msgstr "/대화/친구 알림 추가(_P)..."
+
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/_Get Info"
-msgstr "/대화(C)/정보 보기(_G)"
-
-#: src/gtkconv.c:2388
+msgstr "/대화/정보 가져오기(_G)"
+
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/In_vite..."
-msgstr "/대화(C)/초대(_V)..."
-
-#: src/gtkconv.c:2393
-#, fuzzy
+msgstr "/대화/초대(_V)..."
+
+#: ../gtk/gtkconv.c:2730
+msgid "/Conversation/M_ore"
+msgstr "/대화/자세히(_O)"
+
+#: ../gtk/gtkconv.c:2734
 msgid "/Conversation/Al_ias..."
-msgstr "/대화(C)/별칭..."
-
-#: src/gtkconv.c:2395
+msgstr "/대화/별칭(_I)..."
+
+#: ../gtk/gtkconv.c:2736
 msgid "/Conversation/_Block..."
-msgstr "/대화(C)/차단(_B)..."
-
-#: src/gtkconv.c:2397
+msgstr "/대화/거부(_B)..."
+
+#: ../gtk/gtkconv.c:2738
 msgid "/Conversation/_Add..."
-msgstr "/대화(C)/더하기(_A)..."
-
-#: src/gtkconv.c:2399
+msgstr "/대화/추가(_A)..."
+
+#: ../gtk/gtkconv.c:2740
 msgid "/Conversation/_Remove..."
-msgstr "/대화(C)/지우기(_R)..."
-
-#: src/gtkconv.c:2404
+msgstr "/대화/삭제(_R)..."
+
+#: ../gtk/gtkconv.c:2745
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/대화(C)/링크 넣기(_K)..."
-
-#: src/gtkconv.c:2406
+msgstr "/대화/링크 삽입(_K)..."
+
+#: ../gtk/gtkconv.c:2747
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/대화(C)/그림 넣기(E)..."
-
-#: src/gtkconv.c:2411
+msgstr "/대화/이미지 삽입(_E)..."
+
+#: ../gtk/gtkconv.c:2752
 msgid "/Conversation/_Close"
-msgstr "/대화(C)/닫기(_C)"
+msgstr "/대화/닫기(_C)"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../gtk/gtkconv.c:2756
 msgid "/_Options"
-msgstr "/옵션(_O)"
-
-#: src/gtkconv.c:2416
+msgstr "/설정(_O)"
+
+#: ../gtk/gtkconv.c:2757
 msgid "/Options/Enable _Logging"
-msgstr "/옵션(O)/기록하기(_L)"
-
-#: src/gtkconv.c:2417
+msgstr "/설정/로그 기록(_L)"
+
+#: ../gtk/gtkconv.c:2758
 msgid "/Options/Enable _Sounds"
-msgstr "/옵션(O)/소리 듣기(_S)"
-
-#: src/gtkconv.c:2418
-#, fuzzy
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/옵션(O)/꾸밈 도구모음 보이기"
-
-#: src/gtkconv.c:2419
-#, fuzzy
-msgid "/Options/Show Ti_mestamps"
-msgstr "iChat 타임스탬프"
-
-#: src/gtkconv.c:2420
-#, fuzzy
+msgstr "/설정/소리 사용(_S)"
+
+#: ../gtk/gtkconv.c:2759
 msgid "/Options/Show Buddy _Icon"
-msgstr "친구 아이콘 보여주기(_I)"
-
-#: src/gtkconv.c:2460
+msgstr "/설정/친구 아이콘 표시(_I)"
+
+#: ../gtk/gtkconv.c:2761
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/설정/서식 도구모음 표시(_T)"
+
+#: ../gtk/gtkconv.c:2762
+msgid "/Options/Show Ti_mestamps"
+msgstr "/설정/타임스탬프 표시(_M)"
+
+#: ../gtk/gtkconv.c:2837
+msgid "/Conversation/More"
+msgstr "/대화/자세히(_O)"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../gtk/gtkconv.c:2882
+#: ../gtk/gtkconv.c:2914
+msgid "/Conversation"
+msgstr "/대화"
+
+#: ../gtk/gtkconv.c:2922
 msgid "/Conversation/View Log"
-msgstr "/대화(C)/기록 보기"
-
-#: src/gtkconv.c:2466
-#, fuzzy
+msgstr "/대화/로그 보기"
+
+#: ../gtk/gtkconv.c:2928
 msgid "/Conversation/Send File..."
-msgstr "/대화(C)/초대..."
-
-#: src/gtkconv.c:2470
+msgstr "/대화/파일 전송..."
+
+#: ../gtk/gtkconv.c:2932
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/대화(C)/친구 알림 더하기..."
-
-#: src/gtkconv.c:2476
+msgstr "/대화/친구 알림 추가..."
+
+#: ../gtk/gtkconv.c:2938
 msgid "/Conversation/Get Info"
-msgstr "/대화(C)/정보 보기"
-
-#: src/gtkconv.c:2480
+msgstr "/대화/정보 가져오기..."
+
+#: ../gtk/gtkconv.c:2942
 msgid "/Conversation/Invite..."
-msgstr "/대화(C)/초대..."
-
-#: src/gtkconv.c:2486
+msgstr "/대화/초대..."
+
+#: ../gtk/gtkconv.c:2948
 msgid "/Conversation/Alias..."
-msgstr "/대화(C)/별칭..."
-
-#: src/gtkconv.c:2490
+msgstr "/대화/별칭..."
+
+#: ../gtk/gtkconv.c:2952
 msgid "/Conversation/Block..."
-msgstr "/대화(C)/차단..."
-
-#: src/gtkconv.c:2494
+msgstr "/대화/거부..."
+
+#: ../gtk/gtkconv.c:2956
 msgid "/Conversation/Add..."
-msgstr "/대화(C)/더하기..."
-
-#: src/gtkconv.c:2498
+msgstr "/대화/추가..."
+
+#: ../gtk/gtkconv.c:2960
 msgid "/Conversation/Remove..."
-msgstr "/대화(C)/지우기..."
-
-#: src/gtkconv.c:2504
+msgstr "/대화/삭제..."
+
+#: ../gtk/gtkconv.c:2966
 msgid "/Conversation/Insert Link..."
-msgstr "/대화(C)/링크 넣기..."
-
-#: src/gtkconv.c:2508
+msgstr "/대화/링크 삽입..."
+
+#: ../gtk/gtkconv.c:2970
 msgid "/Conversation/Insert Image..."
-msgstr "/대화(C)/그림 넣기..."
-
-#: src/gtkconv.c:2514
+msgstr "/대화/이미지 삽입..."
+
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Enable Logging"
-msgstr "/옵션(O)/기록하기(L)"
-
-#: src/gtkconv.c:2517
+msgstr "/설정/로그 기록"
+
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Enable Sounds"
-msgstr "/옵션(O)/소리 듣기(S)"
-
-#: src/gtkconv.c:2520
-#, fuzzy
+msgstr "/설정/소리 사용"
+
+#: ../gtk/gtkconv.c:2992
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/옵션(O)/꾸밈 도구모음 보이기"
-
-#: src/gtkconv.c:2523
-#, fuzzy
+msgstr "/설정/서식 도구모음 표시"
+
+#: ../gtk/gtkconv.c:2995
 msgid "/Options/Show Timestamps"
-msgstr "iChat 타임스탬프"
-
-#: src/gtkconv.c:2526
-#, fuzzy
+msgstr "/설정/타임스탬프 표시"
+
+#: ../gtk/gtkconv.c:2998
 msgid "/Options/Show Buddy Icon"
-msgstr "친구 아이콘 보여주기(_I)"
-
-#: src/gtkconv.c:2597
+msgstr "/설정/친구 아이콘 표시"
+
+#: ../gtk/gtkconv.c:3074
 msgid "User is typing..."
-msgstr "사용자가 입력중..."
-
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
-msgstr "사용자가 무언가를 입력하거나 쉬고 있음"
-
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+msgstr "사용자가 무언가를 입력하고 있습니다..."
+
+#: ../gtk/gtkconv.c:3077
+msgid "User has typed something and stopped"
+msgstr "사용자는 무언가를 입력하다가 일시중지 상태입니다."
+
+#. Build the Send To menu
+#: ../gtk/gtkconv.c:3260
 msgid "_Send To"
+msgstr "받을 사람(_S)"
+
+#: ../gtk/gtkconv.c:3967
+msgid "_Send"
 msgstr "보내기(_S)"
 
-#: src/gtkconv.c:3373
+#: ../gtk/gtkconv.c:4063
+#: ../libgaim/protocols/sametime/sametime.c:3606
 msgid "Topic:"
 msgstr "주제:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../gtk/gtkconv.c:4115
 msgid "0 people in room"
-msgstr "대화실에 아무도 없음"
-
-#: src/gtkconv.c:3500
-msgid "IM the user"
-msgstr "메신저 사용자"
-
-#: src/gtkconv.c:3513
-msgid "Ignore the user"
-msgstr "사용자 무시"
-
-#: src/gtkconv.c:3525
-msgid "Get the user's information"
-msgstr "사용자의 정보를 가져옴"
-
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+msgstr "아무도 없습니다."
+
+#: ../gtk/gtkconv.c:5181
+#: ../gtk/gtkconv.c:5302
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "방에 %d명이 있음"
-
-#: src/gtkconv.c:5582
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-
-#: src/gtkconv.c:5585
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-
-#: src/gtkconv.c:5588
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-
-#: src/gtkconv.c:5591
-#, fuzzy
-msgid "clear: Clears the conversation scrollback."
-msgstr "%s님이 대화창을 닫았습니다."
-
-#: src/gtkconv.c:5594
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr ""
-
-#: src/gtkconv.c:5709
-#, fuzzy
+msgstr[0] "대화실에 %d 명이 있습니다."
+msgstr[1] "대화실에 %d 명이 있습니다."
+
+#: ../gtk/gtkconv.c:5855
+#: ../gtk/gtkstatusbox.c:567
+msgid "Typing"
+msgstr "입력 중입니다."
+
+#: ../gtk/gtkconv.c:5861
+msgid "Stopped Typing"
+msgstr "입력을 중지했습니다."
+
+#: ../gtk/gtkconv.c:5866
+msgid "Nick Said"
+msgstr "Nick Said"
+
+#: ../gtk/gtkconv.c:5871
+#: ../gtk/gtkdocklet.c:513
+msgid "Unread Messages"
+msgstr "읽지 않은 메시지"
+
+#: ../gtk/gtkconv.c:5876
+msgid "New Event"
+msgstr "새 이벤트"
+
+#: ../gtk/gtkconv.c:6997
 msgid "Confirm close"
-msgstr "계정 확인"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "닫기 확인"
+
+#: ../gtk/gtkconv.c:7029
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "정말 %s을(를) 지울까요?"
-
-#: src/gtkconv.c:6408
+msgstr "아직 읽지 않은 메시지가 있습니다. 정말 창을 닫으시겠습니까?"
+
+#: ../gtk/gtkconv.c:7564
+msgid "Close other tabs"
+msgstr "다른 탭 닫기"
+
+#: ../gtk/gtkconv.c:7570
+msgid "Close all tabs"
+msgstr "모든 탭 닫기"
+
+#: ../gtk/gtkconv.c:7578
+msgid "Detach this tab"
+msgstr "이 탭을 분리"
+
+#: ../gtk/gtkconv.c:7584
+msgid "Close this tab"
+msgstr "이 탭을 닫기"
+
+#: ../gtk/gtkconv.c:7855
 msgid "Close conversation"
-msgstr "대화 닫기"
-
-#: src/gtkconv.c:6872
+msgstr "대화 창을 닫습니다."
+
+#: ../gtk/gtkconv.c:8319
 msgid "Last created window"
-msgstr "마지막으로 만들어진 창"
-
-#: src/gtkconv.c:6874
+msgstr "마지막에 생성한 창을 재이용"
+
+#: ../gtk/gtkconv.c:8321
 msgid "Separate IM and Chat windows"
-msgstr "메시지와 대화창을 나눔"
-
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+msgstr "메시지와 대화 창을 분리"
+
+#: ../gtk/gtkconv.c:8323
+#: ../gtk/gtkprefs.c:1303
 msgid "New window"
-msgstr "새 창"
-
-#: src/gtkconv.c:6878
+msgstr "새 창으로 열기"
+
+#: ../gtk/gtkconv.c:8325
 msgid "By group"
-msgstr "그룹으로"
-
-#: src/gtkconv.c:6880
+msgstr "그룹마다 공유"
+
+#: ../gtk/gtkconv.c:8327
 msgid "By account"
-msgstr "계정으로"
-
-#: src/gtkdebug.c:232
+msgstr "계정마다 공유"
+
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
-msgstr ""
-
-#: src/gtkdebug.c:586
-#, fuzzy
+msgstr "디버그 로그 저장"
+
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
-msgstr "넣기(_I)"
-
-#: src/gtkdebug.c:589
+msgstr "결과 반전"
+
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "디버그 창"
-
-#: src/gtkdebug.c:689
-#, fuzzy
-msgid "Clear"
-msgstr "닫기"
-
-#: src/gtkdebug.c:698
-msgid "Pause"
-msgstr "잠시 멈춤"
-
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "시간 표시"
-
-#: src/gtkdebug.c:724
-#, fuzzy
+msgstr "일치하는 단어 강조 표시"
+
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "아이콘만(_I)"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "문자만(_T)"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "둘 다(_B)"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
-msgstr "실패"
-
-#: src/gtkdebug.c:743
-#, fuzzy
+msgstr "필터"
+
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
-msgstr "자세한 옵션 보기"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "오른쪽 클릭 메뉴에 추가 옵션 표시"
+
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "수준"
+
+#: ../gtk/gtkdebug.c:852
+#: ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "디버그 필터 수준을 선택해 주십시오."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "모두"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "기타"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "경고"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "오류"
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "치명적 오류"
+
+#: ../gtk/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:110
 msgid "lead developer"
 msgstr "수석 개발자"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../gtk/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:68
+#: ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70
+#: ../gtk/gtkdialogs.c:71
+#: ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:75
+#: ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:78
+#: ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82
+#: ../gtk/gtkdialogs.c:83
 msgid "developer"
 msgstr "개발자"
 
-#: src/gtkdialogs.c:61
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
-msgstr "개발자 & 웹마스터"
-
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "WIN32 포팅"
-
-#: src/gtkdialogs.c:68
+msgstr "개발자/웹마스터"
+
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "지원"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../gtk/gtkdialogs.c:80
+msgid "support/QA"
+msgstr "지원/QA"
+
+#: ../gtk/gtkdialogs.c:102
+msgid "win32 port"
+msgstr "Win32 포팅"
+
+#: ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:104
 msgid "maintainer"
 msgstr "관리자"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: ../gtk/gtkdialogs.c:105
 msgid "libfaim maintainer"
-msgstr "예전 libfaim 관리자"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
+msgstr "libfaim 관리자"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:107
+msgid "hacker and designated driver [lazy bum]"
+msgstr "해커 및 지정 드라이버 [lazy bum]"
+
+#: ../gtk/gtkdialogs.c:108
 msgid "Jabber developer"
-msgstr "예전 재버(Jabber) 개발자"
-
-#: src/gtkdialogs.c:93
+msgstr "Jabber 개발자"
+
+#: ../gtk/gtkdialogs.c:109
 msgid "original author"
-msgstr "최초 저자"
-
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "해커와 공식적인 테스터 [lazy bum]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+msgstr "초기 제작자"
+
+#: ../gtk/gtkdialogs.c:116
+msgid "Arabic"
+msgstr "아라비아어"
+
+#: ../gtk/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:190
 msgid "Bulgarian"
 msgstr "불가리아어"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:120
+msgid "Bengali"
+msgstr "벵갈어"
+
+#: ../gtk/gtkdialogs.c:121
 msgid "Bosnian"
-msgstr "루마니아어"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "보스니아어"
+
+#: ../gtk/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:192
 msgid "Catalan"
-msgstr "카탈리아어"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+msgstr "카타로니아어"
+
+#: ../gtk/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:124
+msgid "Valencian-Catalan"
+msgstr "발렌시아-카타로니아어"
+
+#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:193
 msgid "Czech"
 msgstr "체코어"
 
-#: src/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:126
 msgid "Danish"
 msgstr "덴마크어"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:128
+#: ../gtk/gtkdialogs.c:194
 msgid "German"
 msgstr "독일어"
 
-#: src/gtkdialogs.c:106
+#: ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:131
+msgid "Dzongkha"
+msgstr "징카어"
+
+#: ../gtk/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:133
+msgid "Greek"
+msgstr "그리스어"
+
+#: ../gtk/gtkdialogs.c:134
 msgid "Australian English"
-msgstr ""
-
-#: src/gtkdialogs.c:107
+msgstr "영어 (호주)"
+
+#: ../gtk/gtkdialogs.c:135
+msgid "Canadian English"
+msgstr "영어 (캐나다)"
+
+#: ../gtk/gtkdialogs.c:136
 msgid "British English"
-msgstr ""
-
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr ""
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+msgstr "영어 (영국)"
+
+#: ../gtk/gtkdialogs.c:137
+msgid "Esperanto"
+msgstr "에스페란토어"
+
+#: ../gtk/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:198
 msgid "Spanish"
 msgstr "스페인어"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:140
+msgid "Euskera(Basque)"
+msgstr "유케라 (바스크어)"
+
+#: ../gtk/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:143
+msgid "Persian"
+msgstr "페르시아어"
+
+#: ../gtk/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:200
 msgid "Finnish"
 msgstr "핀란드어"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:204
 msgid "French"
 msgstr "프랑스어"
 
-#: src/gtkdialogs.c:112
+#: ../gtk/gtkdialogs.c:146
+msgid "Galician"
+msgstr "갈리시아어"
+
+#: ../gtk/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:148
+msgid "Gujarati"
+msgstr "구자라티어"
+
+#: ../gtk/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:205
 msgid "Hebrew"
-msgstr "히브루어"
-
-#: src/gtkdialogs.c:113
+msgstr "히브리어"
+
+#: ../gtk/gtkdialogs.c:150
 msgid "Hindi"
-msgstr "힌두어"
-
-#: src/gtkdialogs.c:114
+msgstr "힌디어"
+
+#: ../gtk/gtkdialogs.c:151
 msgid "Hungarian"
 msgstr "헝가리어"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:206
 msgid "Italian"
-msgstr "이탈리아어"
-
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+msgstr "이태리어"
+
+#: ../gtk/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
 msgid "Japanese"
 msgstr "일본어"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr ""
-
-#: src/gtkdialogs.c:118
-#, fuzzy
+#: ../gtk/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:210
 msgid "Georgian"
-msgstr "독일어"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+msgstr "그루지아어"
+
+#: ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:211
 msgid "Korean"
 msgstr "한국어"
 
-#: src/gtkdialogs.c:120
-#, fuzzy
+#: ../gtk/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:158
+msgid "Kurdish"
+msgstr "쿠르드어"
+
+#: ../gtk/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:213
+msgid "Lithuanian"
+msgstr "리투아니아어"
+
+#: ../gtk/gtkdialogs.c:160
+msgid "Macedonian"
+msgstr "마케도니아어"
+
+#: ../gtk/gtkdialogs.c:161
+msgid "Nepali"
+msgstr "네팔어"
+
+#: ../gtk/gtkdialogs.c:162
 msgid "Dutch, Flemish"
-msgstr "네델란드어; Flemish"
-
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr ""
-
-#: src/gtkdialogs.c:122
+msgstr "네덜란드, 프란다스어"
+
+#: ../gtk/gtkdialogs.c:163
 msgid "Norwegian"
 msgstr "노르웨이어"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:214
 msgid "Polish"
-msgstr "폴랜드어"
-
-#: src/gtkdialogs.c:125
+msgstr "폴란드어"
+
+#: ../gtk/gtkdialogs.c:166
 msgid "Portuguese"
 msgstr "포르투갈어"
 
-#: src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:167
 msgid "Portuguese-Brazil"
-msgstr "포르투갈어(브라질)"
-
-#: src/gtkdialogs.c:127
+msgstr "포르투갈-브라질어"
+
+#: ../gtk/gtkdialogs.c:168
 msgid "Romanian"
 msgstr "루마니아어"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:216
 msgid "Russian"
 msgstr "러시아어"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:171
 msgid "Serbian"
 msgstr "세르비아어"
 
-#: src/gtkdialogs.c:131
-#, fuzzy
-msgid "Slovenian"
-msgstr "슬로바키아어"
-
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
-msgid "Swedish"
-msgstr "스웨덴어"
-
-#: src/gtkdialogs.c:133
-msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:134
-msgid "Vietnamese"
-msgstr "베트남어"
-
-#: src/gtkdialogs.c:134
-#, fuzzy
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "그놈 Vi 팀"
-
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
-msgid "Simplified Chinese"
-msgstr "중국어(간체)"
-
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
-msgid "Traditional Chinese"
-msgstr "중국어(번체)"
-
-#: src/gtkdialogs.c:143
-msgid "Amharic"
-msgstr "에티오피아어"
-
-#: src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:217
 msgid "Slovak"
 msgstr "슬로바키아어"
 
-#: src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:218
+msgid "Slovenian"
+msgstr "슬로베니아어"
+
+#: ../gtk/gtkdialogs.c:174
+msgid "Albanian"
+msgstr "알바니아어"
+
+#: ../gtk/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:219
+msgid "Swedish"
+msgstr "스웨덴어"
+
+#: ../gtk/gtkdialogs.c:176
+msgid "Tamil"
+msgstr "타밀어"
+
+#: ../gtk/gtkdialogs.c:177
+msgid "Telugu"
+msgstr "텔루구어"
+
+#: ../gtk/gtkdialogs.c:178
+msgid "Thai"
+msgstr "타이어"
+
+#: ../gtk/gtkdialogs.c:179
+msgid "Turkish"
+msgstr "터키어"
+
+#: ../gtk/gtkdialogs.c:180
+msgid "Vietnamese"
+msgstr "베트남어"
+
+#: ../gtk/gtkdialogs.c:180
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh 및 Gnome-Vi 팀"
+
+#: ../gtk/gtkdialogs.c:181
+#: ../gtk/gtkdialogs.c:220
+msgid "Simplified Chinese"
+msgstr "중국어 (간체)"
+
+#: ../gtk/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:221
+msgid "Traditional Chinese"
+msgstr "중국어 (번체)"
+
+#: ../gtk/gtkdialogs.c:189
+msgid "Amharic"
+msgstr "아무하라어"
+
+#: ../gtk/gtkdialogs.c:301
 msgid "About Gaim"
-msgstr "게임은"
-
-#: src/gtkdialogs.c:226
-#, fuzzy
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"게임은 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
-"Zephyr, Gadu-Gadu를 한꺼번에 지원하는 모듈 기반의 메신저입니다.  Gtk+를 이용"
-"하여 만들어졌으며 GPL 라이센스를 따릅니다.<BR><BR>"
-
-#: src/gtkdialogs.c:235
+msgstr "Pidgin 정보"
+
+#: ../gtk/gtkdialogs.c:335
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "Pidgin은 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 그리고 QQ 프로토콜을 모두 이용할 수 있는 GTK+ 툴킷을 채용한 모듈형 메시지 클라이언트입니다.<BR><BR>GPL 라이센스(버전 2 이상)가 정하는 조항 하에 재배포 또는 변경이 가능합니다. GPL 복사가 본 Pidgin 패키지 내에 'COPYING' 라고 하는 파일명으로서 포함되어 있습니다. Pidgin의 저작권은 그 공헌자에게 귀속됩니다. 공헌자의 상세한 목록에 대해서는 'COPYRIGHT' 를 참조해 주십시오. 본 프로그램은 완전 무보증입니다.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-
-#: src/gtkdialogs.c:238
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #wingaim 채널<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:353
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "활동중인 개발자"
-
-#: src/gtkdialogs.c:259
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #gaim 채널<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:359
+msgid "Current Developers"
+msgstr "현재 개발자"
+
+#: ../gtk/gtkdialogs.c:374
 msgid "Crazy Patch Writers"
-msgstr "열성 패치 저자"
-
-#: src/gtkdialogs.c:274
+msgstr "Crazy Patch 제작자"
+
+#: ../gtk/gtkdialogs.c:389
 msgid "Retired Developers"
-msgstr "예전 개발자"
-
-#: src/gtkdialogs.c:289
+msgstr "이전 개발자"
+
+#: ../gtk/gtkdialogs.c:404
 msgid "Current Translators"
-msgstr "현재 옮긴이"
-
-#: src/gtkdialogs.c:309
+msgstr "현재 번역자"
+
+#: ../gtk/gtkdialogs.c:424
 msgid "Past Translators"
-msgstr "예전 옮긴이"
-
-#: src/gtkdialogs.c:327
-#, fuzzy
+msgstr "이전 번역자"
+
+#: ../gtk/gtkdialogs.c:442
 msgid "Debugging Information"
-msgstr "정보"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
-msgid "_Name"
-msgstr "이름"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
-msgid "_Account"
-msgstr "계정(_A)"
-
-#: src/gtkdialogs.c:502
-msgid "New Instant Message"
-msgstr "새 메시지"
-
-#: src/gtkdialogs.c:504
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "메시지를 보내려는 상대의 아이디를 넣어 주십시오."
-
-#: src/gtkdialogs.c:643
+msgstr "디버깅 정보"
+
+#: ../gtk/gtkdialogs.c:816
 msgid "Get User Info"
-msgstr "사용자 정보 보기"
-
-#: src/gtkdialogs.c:645
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "정보를 보길 원하는 사람의 아이디를 넣으세요.\n"
-
-#: src/gtkdialogs.c:699
-#, fuzzy
+msgstr "사용자 정보 가져오기"
+
+#: ../gtk/gtkdialogs.c:818
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:907
 msgid "View User Log"
-msgstr "사용자 정보 보기"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "정보를 보길 원하는 사람의 아이디를 넣으세요.\n"
-
-#: src/gtkdialogs.c:720
+msgstr "사용자 로그 보기"
+
+#: ../gtk/gtkdialogs.c:909
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "로그를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:928
 msgid "Alias Contact"
 msgstr "연락처 별칭"
 
-#: src/gtkdialogs.c:721
+#: ../gtk/gtkdialogs.c:929
 msgid "Enter an alias for this contact."
-msgstr "이 연락처가 사용할 별칭을 입력하세요."
-
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
-msgid "Alias"
-msgstr "별칭"
-
-#: src/gtkdialogs.c:741
+msgstr "이 연락처의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:949
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "%s의 별칭을 넣으세요."
-
-#: src/gtkdialogs.c:743
+msgstr "%s 의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:951
 msgid "Alias Buddy"
 msgstr "친구 별칭"
 
-#: src/gtkdialogs.c:762
+#: ../gtk/gtkdialogs.c:970
 msgid "Alias Chat"
-msgstr "채팅 별칭"
-
-#: src/gtkdialogs.c:763
+msgstr "대화 별칭"
+
+#: ../gtk/gtkdialogs.c:971
 msgid "Enter an alias for this chat."
-msgstr "이 대화에서 사용할 별칭을 입력하세요."
-
-#: src/gtkdialogs.c:800
-#, fuzzy, 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 그룹과 모든 그룹원을 지우려고 합니다. 계속할까요?"
-
-#: src/gtkdialogs.c:867
-#, 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 그룹과 모든 그룹원을 지우려고 합니다. 계속할까요?"
-
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+msgstr "이 대화의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:1008
+#, 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 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습니까?"
+msgstr[1] "친구 목록에서 %s 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1016
+msgid "Remove Contact"
+msgstr "연락처 삭제"
+
+#: ../gtk/gtkdialogs.c:1017
+msgid "_Remove Contact"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1047
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "%s 그룹과 %s 그룹을 하나로 통합하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1054
+msgid "Merge Groups"
+msgstr "그룹 통합"
+
+#: ../gtk/gtkdialogs.c:1055
+msgid "_Merge Groups"
+msgstr "그룹 통합(_M)"
+
+#: ../gtk/gtkdialogs.c:1105
+#, 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 그룹과 그 구성원을 모두 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1108
 msgid "Remove Group"
-msgstr "그룹 지우기"
-
-#: src/gtkdialogs.c:909
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "%s님을 친구 목록에서 삭제합니다. 계속할까요?"
-
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+msgstr "그룹 삭제"
+
+#: ../gtk/gtkdialogs.c:1109
+msgid "_Remove Group"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1142
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "친구 목록에서 %s 을(를) 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1145
 msgid "Remove Buddy"
-msgstr "친구 지우기"
-
-#: src/gtkdialogs.c:951
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "%s 대화 채널을 친구 목록에서 삭제합니다. 계속할까요?"
-
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+msgstr "친구 삭제"
+
+#: ../gtk/gtkdialogs.c:1146
+msgid "_Remove Buddy"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1167
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "친구 목록에서 %s 대화를 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1170
 msgid "Remove Chat"
-msgstr "채팅 지우기"
-
-#: src/gtkft.c:138
+msgstr "대화 삭제"
+
+#: ../gtk/gtkdialogs.c:1171
+msgid "_Remove Chat"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdocklet.c:149
+msgid "Right-click for more unread messages...\n"
+msgstr "읽지 않은 메시지를 표시할 경우에는 오른쪽 버튼을 눌러주십시오...\n"
+
+#: ../gtk/gtkdocklet.c:456
+msgid "Change Status"
+msgstr "상태 바꾸기"
+
+#: ../gtk/gtkdocklet.c:459
+#: ../gtk/gtkstatusbox.c:987
+#: ../libgaim/protocols/gg/gg.c:996
+#: ../libgaim/protocols/jabber/buddy.c:1403
+#: ../libgaim/protocols/msn/state.c:29
+#: ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37
+#: ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2851
+#: ../libgaim/protocols/yahoo/yahoo.c:2880
+#: ../libgaim/status.c:155
+msgid "Available"
+msgstr "사용 가능"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:463
+#: ../gtk/gtkprefs.c:1821
+#: ../gtk/gtkstatusbox.c:988
+#: ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:524
+#: ../libgaim/protocols/irc/msgs.c:226
+#: ../libgaim/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/novell/novell.c:2854
+#: ../libgaim/protocols/oscar/oscar.c:712
+#: ../libgaim/protocols/oscar/oscar.c:4498
+#: ../libgaim/protocols/oscar/oscar.c:5579
+#: ../libgaim/protocols/qq/qq.c:180
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3353
+#: ../libgaim/protocols/yahoo/yahoo.c:3426
+#: ../libgaim/status.c:158
+msgid "Away"
+msgstr "자리 비움"
+
+#: ../gtk/gtkdocklet.c:467
+#: ../gtk/gtkstatusbox.c:989
+#: ../libgaim/protocols/oscar/oscar.c:716
+#: ../libgaim/protocols/qq/qq.c:183
+#: ../libgaim/protocols/yahoo/yahoo.c:2874
+#: ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "숨김 상태"
+
+#: ../gtk/gtkdocklet.c:508
+msgid "Show Buddy List"
+msgstr "친구 목록 열기..."
+
+#: ../gtk/gtkdocklet.c:534
+msgid "New Message..."
+msgstr "새 메시지..."
+
+#: ../gtk/gtkdocklet.c:549
+msgid "Mute Sounds"
+msgstr "소리 끄기"
+
+#: ../gtk/gtkdocklet.c:556
+msgid "Blink on new message"
+msgstr "새로운 메시지가 도착하면 깜박거림"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:567
+msgid "Quit"
+msgstr "종료"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: src/gtkft.c:159 src/gtkft.c:1035
+msgstr "%.2f K바이트/초"
+
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "시작되지 않았습니다."
+
+#: ../gtk/gtkft.c:159
+#: ../libgaim/account.c:1714
+#: ../libgaim/protocols/gg/gg.c:1002
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:1397
+#: ../libgaim/protocols/jabber/buddy.c:1414
+#: ../libgaim/protocols/novell/novell.c:2866
+#: ../libgaim/protocols/qq/qq.c:230
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: ../gtk/gtkft.c:162
+#: ../gtk/gtkft.c:1118
 msgid "Finished"
-msgstr "완료"
-
-#: src/gtkft.c:162 src/gtkft.c:986
+msgstr "완료되었습니다."
+
+#: ../gtk/gtkft.c:165
+#: ../gtk/gtkft.c:1056
 msgid "Canceled"
-msgstr "취소"
-
-#: src/gtkft.c:165 src/gtkft.c:905
+msgstr "취소되었습니다."
+
+#: ../gtk/gtkft.c:168
+#: ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
-msgstr "전송이 시작되기를 기다리고 있음"
-
-#: src/gtkft.c:218
+msgstr "전송 시작을 기다리고 있습니다."
+
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "파일 전송 - %d%% / %d 개의 파일"
+
+#: ../gtk/gtkft.c:233
+#: ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "파일 전송"
+
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
-msgstr "<b>받는 계정:</b>"
-
-#: src/gtkft.c:220
+msgstr "<b>받는 사람:</b>"
+
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
-msgstr "<b>받음:</b>"
-
-#: src/gtkft.c:224
+msgstr "<b>수신 위치:</b>"
+
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
-msgstr "<b>보냄:</b>"
-
-#: src/gtkft.c:226
-#, fuzzy
+msgstr "<b>송신 위치:</b>"
+
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
-msgstr "<b>보냄:</b>"
-
-#: src/gtkft.c:442
+msgstr "<b>보낸 사람:</b>"
+
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
-msgstr ""
-
-#: src/gtkft.c:447
+msgstr "이 형식의 파일을 열기 위해 지정된 응용 프로그램이 없습니다."
+
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
-msgstr ""
-
-#: src/gtkft.c:467
-#, fuzzy, c-format
+msgstr "파일을 여는 중 오류가 발생했습니다."
+
+#: ../gtk/gtkft.c:539
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "%s 실행하기 오류: %s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "%s 실행 중 오류: %s"
+
+#: ../gtk/gtkft.c:548
+#, c-format
 msgid "Error running %s"
-msgstr "%s 대화실 참가 오류"
-
-#: src/gtkft.c:477
+msgstr "%s 실행 중 오류"
+
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
+
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "진행"
 
-#: src/gtkft.c:579
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "파일명"
 
-#: src/gtkft.c:586
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "크기"
 
-#: src/gtkft.c:593
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "남은 양"
 
-#: src/gtkft.c:624
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "파일명:"
 
-#: src/gtkft.c:625
-#, fuzzy
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
-msgstr "내부 사용자"
-
-#: src/gtkft.c:626
-msgid "Status:"
-msgstr "상태:"
-
-#: src/gtkft.c:627
+msgstr "로컬 파일:"
+
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "속도:"
 
-#: src/gtkft.c:628
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
-msgstr "지난 시간:"
-
-#: src/gtkft.c:629
+msgstr "경과 시간:"
+
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "남은 시간:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "창을 열어둠(_K)"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: ../gtk/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "전송이 완료되면 이 창을 닫음(_F)"
+
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
-msgstr "전송이 끝나면 깨끗이(_C)"
+msgstr "완료된 전송은 비우기(_L)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
-msgstr "파일전송 내용 감추기"
-
-#. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
-msgid "_Pause"
-msgstr "잠시 멈춤(_P)"
+msgstr "파일 전송 상세(_D)"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
-msgstr "계속(_R)"
-
-#: src/gtkft.c:988
+msgstr "복귀(_R)"
+
+#: ../gtk/gtkft.c:1058
 msgid "Failed"
-msgstr "실패"
-
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "문자열로 붙여넣기(_S)"
-
-#: src/gtkimhtml.c:1313
+msgstr "실패했습니다."
+
+#: ../gtk/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "문자열로 붙여넣기(_T)"
+
+#: ../gtk/gtkimhtml.c:810
+msgid "_Reset formatting"
+msgstr "서식 초기화(_R)"
+
+#: ../gtk/gtkimhtml.c:1295
 msgid "Hyperlink color"
-msgstr ""
-
-#: src/gtkimhtml.c:1314
+msgstr "하이퍼링크 색상"
+
+#: ../gtk/gtkimhtml.c:1296
 msgid "Color to draw hyperlinks."
-msgstr ""
-
-#: src/gtkimhtml.c:1317
+msgstr "하이퍼링크를 나타내는 색상입니다."
+
+#: ../gtk/gtkimhtml.c:1299
 msgid "Hyperlink prelight color"
-msgstr ""
-
-#: src/gtkimhtml.c:1318
+msgstr "하이퍼링크 (prelight) 색상"
+
+#: ../gtk/gtkimhtml.c:1300
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-
-#: src/gtkimhtml.c:1537
+msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
+
+#: ../gtk/gtkimhtml.c:1516
 msgid "_Copy E-Mail Address"
-msgstr "메일 주소 복사(_C)"
-
-#: src/gtkimhtml.c:1549
+msgstr "이메일 주소 복사(_C)"
+
+#: ../gtk/gtkimhtml.c:1528
 msgid "_Open Link in Browser"
-msgstr "브라우저에서 열기(_O)"
-
-#: src/gtkimhtml.c:1559
+msgstr "링크를 브라우저로 열기(_O)"
+
+#: ../gtk/gtkimhtml.c:1538
 msgid "_Copy Link Location"
-msgstr "바로가기 주소 복사(_C)"
-
-#: src/gtkimhtml.c:3234
+msgstr "링크 주소 복사(_C)"
+
+#: ../gtk/gtkimhtml.c:3271
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3237
+"<span size='larger' weight='bold'>알 수 없는 파일 형식</span>\n"
+"\n"
+"기본 PNG 이미지로 인식합니다."
+
+#: ../gtk/gtkimhtml.c:3274
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3250
-#, fuzzy, c-format
+"알 수 없는 파일 형식입니다.\n"
+"\n"
+"기본 PNG 이미지로 인식합니다."
+
+#: ../gtk/gtkimhtml.c:3287
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">메일을 받았습니다!</span>\n"
+"<span size='larger' weight='bold'>이미지 저장 중 오류</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
-#, fuzzy, c-format
+#: ../gtk/gtkimhtml.c:3290
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "이미지 저장 오류: %s"
-
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+msgstr ""
+"이미지 저장 중 오류\n"
+"\n"
+"%s"
+
+#: ../gtk/gtkimhtml.c:3370
+#: ../gtk/gtkimhtml.c:3382
 msgid "Save Image"
 msgstr "이미지 저장"
 
-#: src/gtkimhtml.c:3373
+#: ../gtk/gtkimhtml.c:3410
 msgid "_Save Image..."
 msgstr "이미지 저장(_S)..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "글꼴 선택"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
-msgstr "글자 색깔 선택"
-
-#: src/gtkimhtmltoolbar.c:305
+msgstr "글자색 선택"
+
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
-msgstr "글자 바탕색 선택"
-
-#: src/gtkimhtmltoolbar.c:394
+msgstr "배경색 선택"
+
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
-msgstr ""
-
-#: src/gtkimhtmltoolbar.c:402
+msgstr "URL(_U)"
+
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "설명(_D)"
 
-#: src/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr "넣으려는 바로가기의 URL과 설명을 넣으세요. 설명은 선택사항입니다."
-
-#: src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:405
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "삽입할 링크의 URL과 그 설명(선택 사항)을 입력해 주십시오."
+
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "넣으려는 바로가기의 URL을 넣으세요."
-
-#: src/gtkimhtmltoolbar.c:414
+msgstr "삽입할 링크의 URL을 입력해 주십시오."
+
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
-msgstr "링크 넣기"
-
-#: src/gtkimhtmltoolbar.c:418
+msgstr "링크 삽입"
+
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
-msgstr "넣기(_I)"
-
-#: src/gtkimhtmltoolbar.c:487
+msgstr "삽입(_I)"
+
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "그림 저장 실패: %s\n"
-
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+msgstr "이미지 저장에 실패했습니다: %s\n"
+
+#: ../gtk/gtkimhtmltoolbar.c:513
+#: ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
-msgstr "그림 넣기"
-
-#: src/gtkimhtmltoolbar.c:721
+msgstr "이미지 삽입"
+
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
-msgstr ""
+msgstr "이 테마에는 이용 가능한 이모티콘이 없습니다."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
-msgstr "웃어요!"
-
-#: src/gtkimhtmltoolbar.c:916
+msgstr "이모티콘!"
+
+#: ../gtk/gtkimhtmltoolbar.c:922
+#: ../gtk/plugins/convcolors.c:278
 msgid "Bold"
-msgstr "진하게"
-
-#: src/gtkimhtmltoolbar.c:927
+msgstr "굵게"
+
+#: ../gtk/gtkimhtmltoolbar.c:933
+#: ../gtk/plugins/convcolors.c:285
 msgid "Italic"
-msgstr "기울임"
-
-#: src/gtkimhtmltoolbar.c:938
+msgstr "기울림"
+
+#: ../gtk/gtkimhtmltoolbar.c:944
+#: ../gtk/plugins/convcolors.c:292
 msgid "Underline"
 msgstr "밑줄"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
-msgstr "글자 크기를 크게"
-
-#: src/gtkimhtmltoolbar.c:966
+msgstr "글자 크기 크게"
+
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
-msgstr "글자 크기를 작게"
-
-#: src/gtkimhtmltoolbar.c:983
-msgid "Font Face"
-msgstr "글꼴"
-
-#: src/gtkimhtmltoolbar.c:995
+msgstr "글자 크기 작게"
+
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "글꼴 종류"
+
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
-msgstr "글자색"
-
-#: src/gtkimhtmltoolbar.c:1007
+msgstr "글꼴 색상"
+
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
-msgstr "글자 바탕색"
-
-#: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
-msgid "Clear formatting"
-msgstr "꾸밈 지우기(_C)"
-
-#: src/gtkimhtmltoolbar.c:1038
+msgstr "배경색"
+
+#: ../gtk/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "서식을 초기화 합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
-msgstr "링크 넣기"
-
-#: src/gtkimhtmltoolbar.c:1048
+msgstr "링크를 삽입합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
-msgstr "그림 넣기"
-
-#: src/gtkimhtmltoolbar.c:1059
+msgstr "이미지를 삽입합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
-msgstr "스마일리 넣기"
-
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "%s님과의 대화"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "%s님과의 대화"
-
-#: src/gtklog.c:309
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:313
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+msgstr "이모티콘을 삽입합니다."
+
+#: ../gtk/gtklog.c:234
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s 에서의 대화 (%s)</span>"
+
+#: ../gtk/gtklog.c:237
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s 님과의 대화 (%s)</span>"
+
+#: ../gtk/gtklog.c:284
+msgid "%B %Y"
+msgstr "%Y년%B"
+
+#: ../gtk/gtklog.c:331
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "시스템 이벤트 로그는 설정 창에서 \"상태 변경을 모두 시스템 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:335
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "인스턴트 메시지 로그는 설정 창에서 \"인스턴트 메시지를 모두 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:338
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "대화 로그는 설정 창에서 \"대화를 모두 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:342
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "로그를 찾을 수 없습니다."
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../gtk/gtklog.c:357
+msgid "_Browse logs folder"
+msgstr "로그 폴더 찾아보기(_B)"
+
+#: ../gtk/gtklog.c:425
 msgid "Total log size:"
-msgstr "로그 크기 순"
-
-#: src/gtklog.c:472
-#, fuzzy, c-format
+msgstr "로그 전체 크기:"
+
+#: ../gtk/gtklog.c:494
+#, c-format
 msgid "Conversations in %s"
-msgstr "%s님과의 대화"
-
-#: src/gtklog.c:480 src/gtklog.c:531
+msgstr "%s 님과의 대화"
+
+#: ../gtk/gtklog.c:502
+#: ../gtk/gtklog.c:553
 #, c-format
 msgid "Conversations with %s"
-msgstr "%s님과의 대화"
-
-#: src/gtklog.c:556
+msgstr "%s 님과의 대화"
+
+#: ../gtk/gtklog.c:578
 msgid "System Log"
 msgstr "시스템 로그"
 
-#: src/gtkmain.c:326
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. 더 많은 정보를 원하면 `%s -h'를 입력하세요.\n"
-
-#: src/gtkmain.c:328
+msgstr "Pidgin %s. 상세 정보는 `%s -h' 를 입력하십시오.\n"
+
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3484,1135 +3445,3696 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "그놈 기본"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+"Pidgin %s\n"
+"사용법: %s [옵션]...\n"
+"\n"
+"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
+"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
+"  -h, --help          이 도움말을 표시하고 종료\n"
+"  -n, --nologin       자동으로 로그인 하지 않음\n"
+"  -l, --login[=NAME]  자동으로 로그인 (선택 인수 NAME 은\n"
+"                      사용할 계정을 지정, 쉼표로 분리)\n"
+"  -v, --version       현재 버전을 표시하고 종료\n"
+
+#: ../gtk/gtkmain.c:528
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"세그먼트 오류가 발생하여 Pidgin이\n"
+"core 파일 출력을 시험했습니다. 이것은 소프트웨어의\n"
+"버그이며, 사용자 실수가 아닙니다.\n"
+"\n"
+"이 문제가 재현 가능하면, 다음 사이트로부터\n"
+"Pidgin 개발자에게 버그로서 보고해 주십시오.\n"
+"%sbug.php\n"
+"\n"
+"문제를 재현하기 위한 순서와 core 파일로부터의\n"
+"버그 추적 정보도 첨부해 주십시오.\n"
+"버그 추적 정보의 취득 방법을 알 수 없는 경우에는\n"
+"다음 사이트에 있는 설명을 참조해 주십시오.\n"
+"%sgdb.php\n"
+"\n"
+"도움말이 필요하면 IM 으로\n"
+"SeanEgn 씨 또는 LSchiere 씨 (모두 AIM 경우) 에게\n"
+"말을 걸어봐 주십시오 그 외의 프로토콜 경우에 대해서는\n"
+"다음 사이트를 참조해 주십시오.\n"
+"%scontactinfo.php\n"
+
+#: ../gtk/gtknotify.c:328
+msgid "Open All Messages"
+msgstr "모든 메시지 열기"
+
+#: ../gtk/gtknotify.c:380
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
+
+#: ../gtk/gtknotify.c:474
+msgid "Sender"
+msgstr "보낸 사람"
+
+#: ../gtk/gtknotify.c:500
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s이(가) %d개의 새 메시지를 받았습니다."
-
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr ""
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr ""
-
-#: src/gtknotify.c:303
+msgstr[0] "%s 에는 %d 개의 새로운 메시지가 있습니다."
+msgstr[1] "%s 에는 %d 개의 새로운 메시지가 있습니다."
+
+#: ../gtk/gtknotify.c:511
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
+msgstr[1] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
+
+#: ../gtk/gtknotify.c:699
+#: ../libgaim/protocols/sametime/sametime.c:5548
+msgid "Search Results"
+msgstr "검색 결과"
+
+#: ../gtk/gtknotify.c:899
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "브라우저 명령 \"%s\" 이(가) 올바르지 않습니다."
+
+#: ../gtk/gtknotify.c:901
+#: ../gtk/gtknotify.c:913
+#: ../gtk/gtknotify.c:926
+#: ../gtk/gtknotify.c:1054
+msgid "Unable to open URL"
+msgstr "URL을 열 수 없습니다."
+
+#: ../gtk/gtknotify.c:911
+#: ../gtk/gtknotify.c:924
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" 실행 중 오류: %s"
+
+#: ../gtk/gtknotify.c:1055
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "브라우저 명령이 '수동설정'으로 되어 있지만, 명령이 지정되어 있지 않습니다."
+
+#: ../gtk/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "다음의 플러그인을 해제합니다."
+
+#: ../gtk/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "복수의 플러그인을 해제합니다."
+
+#: ../gtk/gtkplugin.c:285
+msgid "Unload Plugins"
+msgstr "플러그인 해제"
+
+#: ../gtk/gtkplugin.c:397
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
+"%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 ""
-"<span weight=\"bold\" size=\"larger\">메일을 받았습니다!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+"%s%s<span weight=\"bold\">제작자: </span> %s\n"
+"<span weight=\"bold\">웹사이트: </span> %s\n"
+"<span weight=\"bold\">파일명: </span> %s"
+
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">메일을 받았습니다!</span>\n"
-"\n"
-"%s"
-
-#: src/gtknotify.c:504
-msgid "Search Results"
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
 msgstr ""
-
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
-#, fuzzy, c-format
-msgid "Info for %s"
-msgstr "%s의 ICQ 정보"
-
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "친구 정보"
-
-#: src/gtknotify.c:687
-#, fuzzy, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "\"%s\" 브라우저 명령이 유효하지 않습니다."
-
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
-msgid "Unable to open URL"
-msgstr "USR을 열 수 없음"
-
-#: src/gtknotify.c:699 src/gtknotify.c:712
-#, fuzzy, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "%s 실행하기 오류: %s"
-
-#: src/gtknotify.c:839
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "수동 브라우저 명령을 골랐지만 명령이 비어 있습니다."
-
-#: src/gtkpounce.c:130
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">오류: %s\n"
+"업데이트가 있는 지 웹사이트에서 확인해 주십시오.</span>"
+
+#: ../gtk/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "플러그인 설정(_U)"
+
+#: ../gtk/gtkplugin.c:596
+msgid "<b>Plugin Details</b>"
+msgstr "<b>플러그인 상세</b>"
+
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
-msgstr "파일 선택하기"
-
-#: src/gtkpounce.c:161
+msgstr "파일 선택"
+
+#: ../gtk/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
-msgstr "알리려는 친구를 넣으세요."
-
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+msgstr "알림을 받을 친구를 입력해 주십시오."
+
+#: ../gtk/gtkpounce.c:505
 msgid "New Buddy Pounce"
-msgstr "새로운 친구알림"
-
-#: src/gtkpounce.c:391
+msgstr "새 친구 알림"
+
+#: ../gtk/gtkpounce.c:505
 msgid "Edit Buddy Pounce"
-msgstr "친구알림 고치기"
-
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
-msgstr "누구를"
-
-#: src/gtkpounce.c:435
+msgstr "친구 알림 편집"
+
+#. Create the "Pounce on Whom" frame.
+#: ../gtk/gtkpounce.c:522
+msgid "Pounce on Whom"
+msgstr "알림을 받을 친구"
+
+#: ../gtk/gtkpounce.c:549
 msgid "_Buddy name:"
 msgstr "친구 이름(_B):"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "언제"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "연결(_G)"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "연결 끊음(_O)"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "자리비움(_W)"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "자리비움에서 돌아옴(_R)"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "사용안함(_I)"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "사용안함에서 돌아옴(_N)"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "친구가 입력을 시작(_T)"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "친구가 입력을 멈춤(_Y)"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "알릴 행동"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "메신저 창 열기(_E)"
-
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
-msgstr "팝업 알림(_P)"
-
-#: src/gtkpounce.c:522
+#. Create the "Pounce When Buddy..." frame.
+#: ../gtk/gtkpounce.c:575
+msgid "Pounce When Buddy..."
+msgstr "친구로부터 알림을 받을 때..."
+
+#: ../gtk/gtkpounce.c:583
+msgid "Si_gns on"
+msgstr "접속했을 때(_G)"
+
+#: ../gtk/gtkpounce.c:585
+msgid "Signs o_ff"
+msgstr "접속을 해제했을 때(_F)"
+
+#: ../gtk/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "자리 비움이 되었을 때(_W)"
+
+#: ../gtk/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "자리 비움으로부터 복귀했을 때(_U)"
+
+#: ../gtk/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "대기 상태가 되었을 때(_I)"
+
+#: ../gtk/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "대기 상태로부터 복귀했을 때(_D)"
+
+#: ../gtk/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "입력 시작했을 때(_T)"
+
+#: ../gtk/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr "입력을 일시 중지했을 때(_A)"
+
+#: ../gtk/gtkpounce.c:599
+msgid "Stops t_yping"
+msgstr "입력을 멈추었을 때(_Y)"
+
+#: ../gtk/gtkpounce.c:601
+msgid "Sends a _message"
+msgstr "메시지 전송 시(_M)"
+
+#. Create the "Action" frame.
+#: ../gtk/gtkpounce.c:636
+msgid "Action"
+msgstr "알림을 받은 후 동작"
+
+#: ../gtk/gtkpounce.c:644
+msgid "Ope_n an IM window"
+msgstr "대화 창 열기(_N)"
+
+#: ../gtk/gtkpounce.c:646
+msgid "_Pop up a notification"
+msgstr "팝업으로 알림(_P)"
+
+#: ../gtk/gtkpounce.c:648
 msgid "Send a _message"
 msgstr "메시지 보내기(_M)"
 
-#: src/gtkpounce.c:524
+#: ../gtk/gtkpounce.c:650
 msgid "E_xecute a command"
 msgstr "명령 실행(_X)"
 
-#: src/gtkpounce.c:526
+#: ../gtk/gtkpounce.c:652
 msgid "P_lay a sound"
-msgstr "소리내기(_L)"
-
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "찾아보기(_R)..."
-
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "찾아보기(_W)..."
-
-#: src/gtkpounce.c:533
+msgstr "소리 재생(_L)"
+
+#: ../gtk/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "찾아보기(_E)..."
+
+#: ../gtk/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "찾아보기(_O)..."
+
+#: ../gtk/gtkpounce.c:660
 msgid "Pre_view"
 msgstr "미리보기(_V)"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "활성화 후에 이 알림을 저장(_E)"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "친구알림 지우기"
-
-#: src/gtkpounce.c:964
-#, fuzzy, c-format
+#: ../gtk/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "자신의 상태를 지정할 수 없을 때에만 알림을 받음(_O)"
+
+#: ../gtk/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "반복(_R)"
+
+#: ../gtk/gtkpounce.c:1095
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "정말 %2$s 님을 %1$s (으)로의 알림 설정을 삭제하시겠습니까?"
+
+#: ../gtk/gtkpounce.c:1243
+msgid "Pounce Target"
+msgstr "알림 받을 상대"
+
+#: ../gtk/gtkpounce.c:1278
+msgid "Recurring"
+msgstr "반복"
+
+#: ../gtk/gtkpounce.c:1325
+msgid "Buddy Pounces"
+msgstr "친구 알림"
+
+#: ../gtk/gtkpounce.c:1452
+#, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s님이 입력을 시작함"
-
-#: src/gtkpounce.c:966
-#, fuzzy, c-format
+msgstr "%s 님이 입력을 시작했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1454
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s 님이 입력을 일시정지했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1456
+#, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s님이 연결됨"
-
-#: src/gtkpounce.c:968
-#, fuzzy, c-format
+msgstr "%s 님이 접속했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1458
+#, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s님이 사용안함 상태에서 돌아옴"
-
-#: src/gtkpounce.c:970
-#, fuzzy, c-format
+msgstr "%s 대기로부터 복귀했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1460
+#, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s님이 자리비움 상태에서 돌아옴"
-
-#: src/gtkpounce.c:972
-#, fuzzy, c-format
+msgstr "%s 님이 자리 비움으로부터 복귀했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1462
+#, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s님이 입력을 멈춤"
-
-#: src/gtkpounce.c:974
-#, fuzzy, c-format
+msgstr "%s 님이 입력을 멈추었습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1464
+#, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s님의 연결이 끊김"
-
-#: src/gtkpounce.c:976
-#, fuzzy, c-format
+msgstr "%s 님이 접속을 해제했습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1466
+#, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s님이 사용안함 상태가 됨"
-
-#: src/gtkpounce.c:978
-#, fuzzy, c-format
+msgstr "%s 님이 대기 상태로 되었습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1468
+#, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s님이 자리를 비웠습니다."
-
-#: src/gtkpounce.c:979
+msgstr "%s 님이 자리 비움 상태로 되었습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1470
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s 님이 나에게 메시지를 보냈습니다. (%s)"
+
+#: ../gtk/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
-msgstr "알 수 없는 알림 이벤트입니다. 이것을 보고해주세요!"
-
-#: src/gtkprefs.c:623
-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 ""
-"아래 목록에서 사용할 스마일리 테마를 선택하십시오. 새로운 테마를 목록에 끌어"
-"다 놓아서 설치할 수도 있습니다."
-
-#: src/gtkprefs.c:658
+msgstr "알 수 없는 \"알림\" 이벤트입니다. 꼭 보고해 주십시오!"
+
+#: ../gtk/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "이모티콘 테마를 풀 수 없습니다."
+
+#: ../gtk/gtkprefs.c:638
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "아래의 목록으로부터 사용할 이모티콘 테마를 선택해 주십시오. 이 목록 중에 새로운 테마를 드래그앤드롭 하면 설치할 수 있습니다."
+
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "아이콘"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "설명"
-
-#: src/gtkprefs.c:805
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "모르는 슬래시 명령이면 일반 메시지로 보냄(_S)"
-
-#: src/gtkprefs.c:807
-#, fuzzy
-msgid "Show _formatting on incoming messages"
-msgstr "꾸밈 도구모음 보임(_F)"
-
-#: src/gtkprefs.c:809
-msgid "Show buddy _icons"
-msgstr "친구 아이콘 보여주기(_I)"
-
-#: src/gtkprefs.c:811
-msgid "Enable buddy ic_on animation"
-msgstr "친구 아이콘 애니메이션 켬(_O)"
-
-#: src/gtkprefs.c:813
-msgid "_Notify buddies that you are typing to them"
-msgstr "타이핑할 때 친구에게 알림(_N)"
-
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
-msgstr "틀린 철자를 강조(_H)"
-
-#: src/gtkprefs.c:834
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"사용하시는 프로토콜이 꾸미기를 지원할 경우 여러분이 보내는 메시지가 이런 식으"
-"로 보입니다. :)"
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "시스템 트레이 아이콘"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "시스템 트레이 아이콘 표시(_S):"
+
+#: ../gtk/gtkprefs.c:819
+#: ../gtk/gtkprefs.c:831
+#: ../gtk/gtkprefs.c:1646
+#: ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "항상"
+
+#: ../gtk/gtkprefs.c:820
+#: ../gtk/gtkprefs.c:829
+#: ../gtk/gtkprefs.c:1811
+#: ../gtk/gtkprefs.c:1825
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../libgaim/plugins/autoreply.c:360
+msgid "Never"
+msgstr "안 함"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "메시지를 받았을 때"
+
+#: ../gtk/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "대화 창 숨기기"
+
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "새 대화 창 숨기기(_H):"
+
+#: ../gtk/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:1826
+msgid "When away"
+msgstr "자리 비움일 때만"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
-msgid "Tab Options"
-msgstr "탭 옵션"
-
-#: src/gtkprefs.c:858
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "탭"
+
+#: ../gtk/gtkprefs.c:840
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "메신저와 채팅을 탭 창에서 보여줌(_T)"
-
-#: src/gtkprefs.c:872
+msgstr "탭 창에 메시지와 대화 표시(_T)"
+
+#: ../gtk/gtkprefs.c:854
 msgid "Show close b_utton on tabs"
-msgstr "탭에 닫기 단추 보여줌(_C)"
-
-#: src/gtkprefs.c:878
-#, fuzzy
+msgstr "탭에 닫기 버튼 표시(_U)"
+
+#: ../gtk/gtkprefs.c:857
 msgid "_Placement:"
-msgstr "탭 위치(_L):"
-
-#: src/gtkprefs.c:880
+msgstr "탭 위치(_P):"
+
+#: ../gtk/gtkprefs.c:859
 msgid "Top"
-msgstr "위"
-
-#: src/gtkprefs.c:881
+msgstr "위쪽"
+
+#: ../gtk/gtkprefs.c:860
 msgid "Bottom"
-msgstr "아래"
-
-#: src/gtkprefs.c:882
+msgstr "아래쪽"
+
+#: ../gtk/gtkprefs.c:861
 msgid "Left"
 msgstr "왼쪽"
 
-#: src/gtkprefs.c:883
+#: ../gtk/gtkprefs.c:862
 msgid "Right"
 msgstr "오른쪽"
 
-#: src/gtkprefs.c:885
+#: ../gtk/gtkprefs.c:864
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "왼쪽으로 수직방향"
+
+#: ../gtk/gtkprefs.c:865
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
-#, fuzzy
+msgstr "오른쪽으로 수직방향"
+
+#: ../gtk/gtkprefs.c:872
 msgid "N_ew conversations:"
-msgstr "대화 닫기"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "새 대화(_E):"
+
+#: ../gtk/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "수신 메시지의 서식 표시(_F)"
+
+#: ../gtk/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "친구 아이콘 표시(_I)"
+
+#: ../gtk/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "친구 아이콘 애니메이션 표시(_O)"
+
+#: ../gtk/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "메시지가 입력 중임을 친구에게 알림(_N)"
+
+#: ../gtk/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "틀린 철자 강조 표시(_M)"
+
+#: ../gtk/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "부드러운 스크롤 사용"
+
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "메시지를 받으면 창을 깜빡거림(_L)"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "기본 서식"
+
+#: ../gtk/gtkprefs.c:941
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "이것은 서식을 지원하는 프로토콜을 사용할 때, 보낸 메시지가 어떻게 표시되는지 나타냅니다. :)"
+
+#: ../gtk/gtkprefs.c:1015
+#: ../libgaim/protocols/oscar/oscar.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
 msgid "IP Address"
 msgstr "IP 주소"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "서버(_S):"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
-msgstr "IP 주소 바로 찾기(_A)"
-
-#: src/gtkprefs.c:955
+#: ../gtk/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "STUN 서버(_U):"
+
+#: ../gtk/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">예: stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "IP 주소를 자동으로 감지(_A)"
+
+#: ../gtk/gtkprefs.c:1042
 msgid "Public _IP:"
-msgstr "공개 _IP:"
-
-#: src/gtkprefs.c:979
+msgstr "공인 IP(_I):"
+
+#: ../gtk/gtkprefs.c:1071
 msgid "Ports"
 msgstr "포트"
 
-#: src/gtkprefs.c:982
+#: ../gtk/gtkprefs.c:1074
 msgid "_Manually specify range of ports to listen on"
-msgstr "받아들일 포트 범위를 수동으로 지정(_M)"
-
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
-msgstr "시작 포트(_P):"
-
-#: src/gtkprefs.c:992
-msgid "_End Port:"
-msgstr "끝 포트(_E):"
-
-#: src/gtkprefs.c:999
+msgstr "수동으로 감시할 포트 번호의 범위를 지정(_M)"
+
+#: ../gtk/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "시작 포트 번호(_S):"
+
+#: ../gtk/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "종료 포트 번호(_E):"
+
+#: ../gtk/gtkprefs.c:1092
 msgid "Proxy Server"
 msgstr "프록시 서버"
 
-#: src/gtkprefs.c:1003
+#: ../gtk/gtkprefs.c:1096
 msgid "No proxy"
-msgstr "프록시 사용 안함"
-
-#: src/gtkprefs.c:1059
+msgstr "프록시 없음"
+
+#: ../gtk/gtkprefs.c:1152
 msgid "_User:"
-msgstr "사용자(_U):"
-
-#: src/gtkprefs.c:1119
-msgid "Epiphany"
-msgstr ""
-
-#: src/gtkprefs.c:1120
-msgid "Firebird"
-msgstr "불새"
-
-#: src/gtkprefs.c:1121
-msgid "Firefox"
-msgstr "불여우"
-
-#: src/gtkprefs.c:1122
+msgstr "사용자명(_U):"
+
+#: ../gtk/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../gtk/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME 디폴트"
+
+#: ../gtk/gtkprefs.c:1222
 msgid "Galeon"
-msgstr "갈레온"
-
-#: src/gtkprefs.c:1123
-#, fuzzy
-msgid "GNOME Default"
-msgstr "그놈 기본"
-
-#: src/gtkprefs.c:1124
-msgid "Konqueror"
-msgstr "컨쿼러"
-
-#: src/gtkprefs.c:1125
-msgid "Mozilla"
-msgstr "모질라"
-
-#: src/gtkprefs.c:1126
-msgid "Netscape"
-msgstr "넷스케이프"
-
-#: src/gtkprefs.c:1127
-msgid "Opera"
-msgstr "오페라"
-
-#: src/gtkprefs.c:1136
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1234
 msgid "Manual"
-msgstr "수동"
-
-#: src/gtkprefs.c:1189
+msgstr "수동 설정"
+
+#: ../gtk/gtkprefs.c:1287
 msgid "Browser Selection"
 msgstr "브라우저 선택"
 
-#: src/gtkprefs.c:1193
+#: ../gtk/gtkprefs.c:1291
 msgid "_Browser:"
 msgstr "브라우저(_B):"
 
-#: src/gtkprefs.c:1201
+#: ../gtk/gtkprefs.c:1299
 msgid "_Open link in:"
-msgstr "브라우저에서 바로가기 열기(_O):"
-
-#: src/gtkprefs.c:1203
+msgstr "링크를 여는 방식(_O):"
+
+#: ../gtk/gtkprefs.c:1301
 msgid "Browser default"
-msgstr "기본 브라우저"
-
-#: src/gtkprefs.c:1204
+msgstr "브라우저 설정에 따름"
+
+#: ../gtk/gtkprefs.c:1302
 msgid "Existing window"
-msgstr "열려있는 창"
-
-#: src/gtkprefs.c:1206
+msgstr "기존 창에서 열기"
+
+#: ../gtk/gtkprefs.c:1304
 msgid "New tab"
-msgstr "새 탭"
-
-#: src/gtkprefs.c:1220
+msgstr "새 탭으로 열기"
+
+#: ../gtk/gtkprefs.c:1318
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"수동(_M):\n"
-"(%s은(는) URL)"
-
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
-msgid "Logging"
-msgstr "기록"
-
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
-msgstr "기록 양식(_F):"
-
-#: src/gtkprefs.c:1264
-#, fuzzy
+"수동 설정(_M):\n"
+"(URL은 %s (으)로 지정)"
+
+#: ../gtk/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "로그 서식(_F):"
+
+#: ../gtk/gtkprefs.c:1363
 msgid "Log all _instant messages"
-msgstr "모든 메신저 대화를 기록(_L)"
-
-#: src/gtkprefs.c:1266
+msgstr "메시지를 모두 기록에 기록(_L)"
+
+#: ../gtk/gtkprefs.c:1365
 msgid "Log all c_hats"
-msgstr "모든 대화를 기록(_H)"
-
-#: src/gtkprefs.c:1268
+msgstr "대화를 모두 로그에 기록(_H)"
+
+#: ../gtk/gtkprefs.c:1367
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "상태 변경을 모두 로그에 기록(_S)"
+
+#: ../gtk/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "소리 선택"
 
-#: src/gtkprefs.c:1454
+#: ../gtk/gtkprefs.c:1521
+msgid "Quietest"
+msgstr "가장 조용히"
+
+#: ../gtk/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "약간 조용히"
+
+#: ../gtk/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "조용히"
+
+#: ../gtk/gtkprefs.c:1527
+#: ../libgaim/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "표준"
+
+#: ../gtk/gtkprefs.c:1529
+msgid "Loud"
+msgstr "크게"
+
+#: ../gtk/gtkprefs.c:1531
+msgid "Louder"
+msgstr "약간 크게"
+
+#: ../gtk/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "가장 크게"
+
+#: ../gtk/gtkprefs.c:1596
 msgid "Sound Method"
-msgstr "소리 연주 방식"
-
-#: src/gtkprefs.c:1455
+msgstr "소리 출력 방식"
+
+#: ../gtk/gtkprefs.c:1597
 msgid "_Method:"
 msgstr "방식(_M):"
 
-#: src/gtkprefs.c:1457
+#: ../gtk/gtkprefs.c:1599
 msgid "Console beep"
 msgstr "비프음"
 
-#: src/gtkprefs.c:1459
+#: ../gtk/gtkprefs.c:1601
 msgid "Automatic"
-msgstr "자동"
-
-#: src/gtkprefs.c:1464
+msgstr "자동 선택"
+
+#: ../gtk/gtkprefs.c:1604
 msgid "Command"
-msgstr "명령"
-
-#: src/gtkprefs.c:1465
-#, fuzzy
+msgstr "명령 지정"
+
+#: ../gtk/gtkprefs.c:1605
 msgid "No sounds"
-msgstr "소리"
-
-#: src/gtkprefs.c:1473
+msgstr "소리 없음"
+
+#: ../gtk/gtkprefs.c:1613
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"소리 낼 명령어(_O):\n"
-"(%s은(는) 파일 이름)"
-
-#: src/gtkprefs.c:1499
+"소리 명령(_O)\n"
+"(파일명은 %s (으)로 지정)"
+
+#: ../gtk/gtkprefs.c:1639
 msgid "Sound Options"
-msgstr "소리 옵션"
-
-#: src/gtkprefs.c:1500
+msgstr "소리 설정"
+
+#: ../gtk/gtkprefs.c:1640
 msgid "Sounds when conversation has _focus"
-msgstr "대화창이 활성화 될 때 소리(_F)"
-
-#: src/gtkprefs.c:1502
-msgid "_Sounds while away"
-msgstr "자리비움시 소리 냄(_S)"
-
-#: src/gtkprefs.c:1512
+msgstr "대화 창이 활성되면 소리 재생(_F)"
+
+#: ../gtk/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "소리를 재생할 때:"
+
+#: ../gtk/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "자리에 있을 때에만"
+
+#: ../gtk/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "자리에 없을 때에만"
+
+#: ../gtk/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "음량:"
+
+#: ../gtk/gtkprefs.c:1681
 msgid "Sound Events"
-msgstr "소리"
-
-#: src/gtkprefs.c:1563
+msgstr "이벤트마다 소리 재생"
+
+#: ../gtk/gtkprefs.c:1732
 msgid "Play"
-msgstr "듣기"
-
-#: src/gtkprefs.c:1570
+msgstr "재생"
+
+#: ../gtk/gtkprefs.c:1739
 msgid "Event"
 msgstr "이벤트"
 
-#: src/gtkprefs.c:1589
+#: ../gtk/gtkprefs.c:1758
 msgid "Test"
-msgstr "테스트"
-
-#: src/gtkprefs.c:1593
+msgstr "미리 듣기"
+
+#: ../gtk/gtkprefs.c:1762
 msgid "Reset"
-msgstr "리셋"
-
-#: src/gtkprefs.c:1597
+msgstr "초기화"
+
+#: ../gtk/gtkprefs.c:1766
 msgid "Choose..."
-msgstr "고르기..."
-
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "자리비움"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "자리비움 중에 오는 새 메시지 쌓음(_Q)"
-
-#: src/gtkprefs.c:1655
+msgstr "선택..."
+
+#: ../gtk/gtkprefs.c:1809
+msgid "_Report idle time:"
+msgstr "대기 시간을 보고할 때(_R):"
+
+#: ../gtk/gtkprefs.c:1812
+msgid "From last sent message"
+msgstr "마지막에 메시지를 보냈을 때"
+
+#: ../gtk/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "키보드나 마우스 조작을 시작했을 때"
+
+#: ../gtk/gtkprefs.c:1823
 msgid "_Auto-reply:"
 msgstr "자동 응답(_A):"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "자리비움일 때"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+#: ../gtk/gtkprefs.c:1827
 msgid "When both away and idle"
-msgstr "자리비움이거나 사용안함 상태"
-
-#: src/gtkprefs.c:1662
-#, fuzzy
-msgid "_Report idle time"
-msgstr "사용 안한 시간 보여주기(_T)"
-
-#: src/gtkprefs.c:1665
+msgstr "자리 비움으로 대기 상태일 때"
+
+#. Auto-away stuff
+#: ../gtk/gtkprefs.c:1833
 msgid "Auto-away"
-msgstr "자동으로 자리비움"
-
-#: src/gtkprefs.c:1666
-#, fuzzy
+msgstr "자동 자리 비움"
+
+#: ../gtk/gtkprefs.c:1835
 msgid "Change status when _idle"
-msgstr "사용안함 상태시 자리비움 표시(_W)"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "대기 상태가 되면 상태 변경(_I)"
+
+#: ../gtk/gtkprefs.c:1839
 msgid "_Minutes before changing status:"
-msgstr "다음 시간(분) 후에 자리비움 표시(_M):"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "상태를 변경할 때까지의 시간(분)(_M):"
+
+#: ../gtk/gtkprefs.c:1847
 msgid "Change _status to:"
-msgstr "바꿀 주소:"
-
-#: src/gtkprefs.c:1728
+msgstr "다음 상태로 변경(_S):"
+
+#. Signon status stuff
+#: ../gtk/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "시작 시의 상태"
+
+#: ../gtk/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "마지막 종료 시의 상태 유지(_E)"
+
+#: ../gtk/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "시작 시에 적용할 상태(_P):"
+
+#: ../gtk/gtkprefs.c:1914
+msgid "Interface"
+msgstr "인터페이스"
+
+#: ../gtk/gtkprefs.c:1916
 msgid "Smiley Themes"
-msgstr "스마일리 테마"
-
-#: src/gtkprefs.c:1729
+msgstr "이모티콘 테마"
+
+#: ../gtk/gtkprefs.c:1917
 msgid "Sounds"
 msgstr "소리"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../gtk/gtkprefs.c:1918
+#: ../libgaim/protocols/silc/silc.c:1848
 msgid "Network"
 msgstr "네트워크"
 
-#: src/gtkprefs.c:1735
+#: ../gtk/gtkprefs.c:1923
 msgid "Browser"
 msgstr "브라우저"
 
-#: src/gtkprefs.c:1739
-msgid "Away / Idle"
-msgstr "자리비움 / 사용안함"
-
-#: src/gtkprivacy.c:79
+#: ../gtk/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "상태 / 대기"
+
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
-msgstr "모든 사용자가 연락할 수 있도록 허용"
-
-#: src/gtkprivacy.c:80
+msgstr "모든 사용자로부터 연락 허가"
+
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr "내 친구 목록에 있는 사용자만 연락할 수 있도록 허용"
-
-#: src/gtkprivacy.c:81
+msgstr "친구 목록에 등록되어 있는 사용자만 허가"
+
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
-msgstr "허용 목록에 있는 사용자만 연락할 수 있도록 허용"
-
-#: src/gtkprivacy.c:82
+msgstr "다음 사용자만 허가"
+
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
-msgstr "모든 사용자 차단"
-
-#: src/gtkprivacy.c:83
+msgstr "모든 사용자 거부"
+
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
-msgstr "아래에 사용자만 차단"
-
-#: src/gtkprivacy.c:398
+msgstr "다음 사용자만 거부"
+
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
-msgstr "프라이버시"
-
-#: src/gtkprivacy.c:411
+msgstr "개인 정보"
+
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
-msgstr "고친 프라이버시 설정은 바로 적용됩니다."
+msgstr "개인 정보 설정의 변경은 즉시 반영됩니다."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
-msgstr "설정할 계정:"
-
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+msgstr "설정할 개인 정보:"
+
+#: ../gtk/gtkprivacy.c:560
+#: ../gtk/gtkprivacy.c:576
 msgid "Permit User"
-msgstr "사용자 허용"
-
-#: src/gtkprivacy.c:590
+msgstr "허가할 사용자"
+
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
-msgstr "연락을 허용할 사용자를 입력하세요."
-
-#: src/gtkprivacy.c:591
+msgstr "연락을 허가할 사용자를 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "상대측에서의 연락을 허용할 사용자의 이름을 넣으세요."
-
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "허용"
-
-#: src/gtkprivacy.c:599
+msgstr "연락을 허가하지 않을 사용자의 이름을 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:565
+#: ../gtk/gtkprivacy.c:578
+msgid "_Permit"
+msgstr "허가(_P)"
+
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "%s님이 연락할 수 있게 허가할까요?"
-
-#: src/gtkprivacy.c:601
+msgstr "%s 님으로부터의 연락을 허가하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "정말 %s님이 연락할 수 있게 허가할까요?"
-
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+msgstr "정말 %s 님에게 연락을 허가하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:599
+#: ../gtk/gtkprivacy.c:612
 msgid "Block User"
-msgstr "사용자 차단"
-
-#: src/gtkprivacy.c:629
+msgstr "사용자 거부"
+
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
-msgstr "차단할 사용자를 입력하세요."
-
-#: src/gtkprivacy.c:630
+msgstr "거부할 사용자를 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
-msgstr "차단할 사용자의 이름을 넣으세요."
-
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "차단"
-
-#: src/gtkprivacy.c:637
+msgstr "거부하지 않을 사용자의 이름을 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
-msgstr "%s님을 차단할까요?"
-
-#: src/gtkprivacy.c:639
+msgstr "%s 님을 거부하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "정말 %s님을 차단할까요?"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+msgstr "정말 %s 님을 거부하시겠습니까?"
+
+#: ../gtk/gtkrequest.c:267
+#: ../libgaim/plugins/offlinemsg.c:159
+#: ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1918
+#: ../libgaim/protocols/silc/buddy.c:313
+#: ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303
 msgid "Yes"
-msgstr "확인"
-
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+msgstr "예"
+
+#: ../gtk/gtkrequest.c:268
+#: ../libgaim/plugins/offlinemsg.c:160
+#: ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1919
+#: ../libgaim/protocols/silc/buddy.c:314
+#: ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304
 msgid "No"
-msgstr "취소"
-
-#: src/gtkrequest.c:263
+msgstr "아니오"
+
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "적용"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
-msgid "Close"
-msgstr "닫기"
-
-#: src/gtkrequest.c:1796
+#: ../gtk/gtkrequest.c:1469
 msgid "That file already exists"
-msgstr "같은 파일이 이미 존재함"
-
-#: src/gtkrequest.c:1797
+msgstr "이미 존재하는 파일입니다."
+
+#: ../gtk/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
-msgstr "정말 덮어 쓸까요?"
-
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+msgstr "덮어쓰시겠습니까?"
+
+#: ../gtk/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "덮어쓰기"
+
+#: ../gtk/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "다른 이름 선택"
+
+#: ../gtk/gtkrequest.c:1514
+#: ../gtk/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "파일 저장..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../gtk/gtkrequest.c:1515
+#: ../gtk/gtkrequest.c:1560
 msgid "Open File..."
-msgstr "파일 열기..."
-
-#: src/gtkroomlist.c:331
+msgstr "파일 열기"
+
+#: ../gtk/gtkrequest.c:1607
+#: ../gtk/gtkrequest.c:1621
+msgid "Select Folder..."
+msgstr "폴더 선택..."
+
+#: ../gtk/gtkroomlist.c:308
+#: ../libgaim/protocols/oscar/oscar.c:2466
+msgid "_Add"
+msgstr "추가(_A)"
+
+#: ../gtk/gtkroomlist.c:376
 msgid "Room List"
-msgstr "방 목록"
+msgstr "대화실 목록"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../gtk/gtkroomlist.c:446
 msgid "_Get List"
 msgstr "목록 가져오기(_G)"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "제목"
-
-#: src/gtksavedstatuses.c:377
-msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
-#, fuzzy
-msgid "Message"
-msgstr "메시지(_M):"
-
-#: src/gtksavedstatuses.c:451
-#, fuzzy
-msgid "Saved Statuses"
-msgstr "서버 주소"
+#. add button
+#: ../gtk/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "대화 추가(_A)"
+
+#: ../gtk/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "정말 선택한 저장된 상태를 삭제하시겠습니까?"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../gtk/gtksavedstatuses.c:579
+#: ../gtk/gtksavedstatuses.c:1213
 msgid "_Use"
 msgstr "사용(_U)"
 
-#: src/gtksavedstatuses.c:584
+#: ../gtk/gtksavedstatuses.c:725
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "상태 순"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
-msgid "Status"
-msgstr "상태"
-
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+msgstr "그 제목은 이미 사용 중입니다. 중복되지 않는 제목을 입력해 주십시오."
+
+#: ../gtk/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "다른 상태"
+
+#: ../gtk/gtksavedstatuses.c:1106
 msgid "_Title:"
-msgstr "제목"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "제목(_T):"
+
+#: ../gtk/gtksavedstatuses.c:1125
+#: ../gtk/gtksavedstatuses.c:1446
 msgid "_Status:"
-msgstr "상태:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "상태(_S):"
+
+#. Different status message expander
+#: ../gtk/gtksavedstatuses.c:1157
 msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+msgstr "같은 계정으로 다른 상태를 이용(_D)"
+
+#. Save & Use button
+#: ../gtk/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "저장 후 사용(_V)"
+
+#: ../gtk/gtksavedstatuses.c:1427
+#, c-format
+msgid "Status for %s"
+msgstr "%s 의 상태"
+
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
-msgstr "친구가 접속"
-
-#: src/gtksound.c:62
+msgstr "친구가 로그인 했습니다."
+
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
-msgstr "친구가 접속을 끊음"
-
-#: src/gtksound.c:63
+msgstr "친구가 로그아웃 했습니다."
+
+#: ../gtk/gtksound.c:65
 msgid "Message received"
-msgstr "메시지 받음"
-
-#: src/gtksound.c:64
+msgstr "메시지를 받았습니다."
+
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
-msgstr "메시지 받아서 새 대화가 시작됨"
-
-#: src/gtksound.c:65
+msgstr "수신한 메시지와 대화가 시작되었습니다."
+
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
-msgstr "메시지 보냄"
-
-#: src/gtksound.c:66
+msgstr "메시지를 보냈습니다."
+
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
-msgstr "상대가 대화실에 들어옴"
-
-#: src/gtksound.c:67
+msgstr "대화에 참가하러 왔습니다."
+
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
-msgstr "상대가 대화실에서 떠남"
-
-#: src/gtksound.c:68
+msgstr "대화로부터 나갔습니다."
+
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
-msgstr "내가 대화실에서 이야기함"
-
-#: src/gtksound.c:69
+msgstr "대화로 이야기했습니다."
+
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
-msgstr "다른 사람이 대화실에서 이야기함"
-
-#: src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "대화실에서 누군가 내 이름을 부름"
-
-#: src/gtksound.c:414
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "선택된 파일(%s)이 없어 소리를 낼 수 없습니다."
-
-#: src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"소리 연주 방식이 '명령'으로 선택되었지만 비어 있어 소리를 낼 수 없습니다."
-
-#: src/gtksound.c:442
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr "설정된 명령(%s)이 실행될 수 없어 소리를 낼 수 없습니다."
-
-#: src/gtkstatusbox.c:197
-#, fuzzy
-msgid "Typing"
-msgstr "기록"
+msgstr "다른 사람이 대화로 이야기 했습니다."
+
+#: ../gtk/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "대화로 누군가가 나를 호출했습니다."
+
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer 오류"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 초기화에 실패했습니다."
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../gtk/gtkstatusbox.c:569
+#: ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1021
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:1267
+#: ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3742
+#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/yahoo/yahoo.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:1621
 msgid "Connecting"
-msgstr "연결하는 중"
-
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "메시지 받을 수 있음"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "보이지 않도록 함"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "오프라인"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "사용자정의"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "파일 저장..."
-
-#: src/gtkstock.c:117
-msgid "_Alias"
-msgstr "별칭(_A)"
-
-#: src/gtkstock.c:119
-msgid "_Invite"
-msgstr "초대(_I)"
-
-#: src/gtkstock.c:120
-msgid "_Modify"
-msgstr "고치기(_S)"
-
-#: src/gtkstock.c:121
-msgid "_Open Mail"
-msgstr "편지 열기(_O)"
-
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "경고(_W)"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+msgstr "접속 중입니다."
+
+#: ../gtk/gtkstatusbox.c:571
+msgid "Waiting for network connection"
+msgstr "네트워크 접속 대기 중입니다."
+
+#: ../gtk/gtkutils.c:1310
+#: ../gtk/gtkutils.c:1333
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "접속 중에 알 수 없는 오류가 발생하였습니다: %s."
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "%s 을(를) 불러올 때 오류가 발생했습니다: %s"
+
+#: ../gtk/gtkutils.c:1313
+#: ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
-msgstr "그림 저장 실패: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "이미지 불러오기에 실패했습니다."
+
+#: ../gtk/gtkutils.c:1410
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/gtkutils.c:1497
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+msgstr "폴더 %s 은(는) 전송할 수 없습니다."
+
+#: ../gtk/gtkutils.c:1412
+msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
+msgstr "Pidgin에서는 폴더 자체를 전송할 수 없습니다. 파일을 개별적으로 전송해 주십시오."
+
+#: ../gtk/gtkutils.c:1440
+#: ../gtk/gtkutils.c:1449
+#: ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
-msgstr "%s 은(/는) 잘못된 파일명입니다.\n"
-
-#: src/gtkutils.c:1526
-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 ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+msgstr "드래그 한 것은 이미지입니다."
+
+#: ../gtk/gtkutils.c:1441
+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 "이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이콘으로 이용할 수 있습니다."
+
+#: ../gtk/gtkutils.c:1445
+#: ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
-msgstr "친구 아이콘 보여주기(_I)"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "친구 아이콘으로 하기"
+
+#: ../gtk/gtkutils.c:1446
+#: ../gtk/gtkutils.c:1461
 msgid "Send image file"
-msgstr "메시지 보내기"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "파일로 보내기"
+
+#: ../gtk/gtkutils.c:1447
+#: ../gtk/gtkutils.c:1461
 msgid "Insert in message"
-msgstr "그림 넣기"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "메시지 안에 삽입"
+
+#: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "정말 덮어 쓸까요?"
-
-#: src/gtkutils.c:1540
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1542
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
+msgstr "이 사용자의 친구 아이콘으로 이미지를 설정하시겠습니까?"
+
+#: ../gtk/gtkutils.c:1455
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이콘으로 이용할 수 있습니다."
+
+#: ../gtk/gtkutils.c:1457
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "이 이미지를 메시지 안에 삽입하거나, 이 사용자의 친구 아이콘으로 이용할 수 있습니다."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
+#: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/gtkutils.c:1596
+msgstr "실행기는 전송할 수 없습니다."
+
+#: ../gtk/gtkutils.c:1511
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "드래그 한 것은 데스크탑 실행기입니다. 아마도 실행기 자신이 아닌, 실행기가 지시하고 있는 오브젝트를 전송하고자 할 것입니다."
+
+#: ../gtk/gtkutils.c:2343
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>파일:</b> %s\n"
+"<b>파일 크기:</b> %s\n"
+"<b>이미지 크기:</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2387
+#: ../gtk/gtkutils.c:2409
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:618
+msgid "Buddy Icon"
+msgstr "친구 아이콘"
+
+#: ../gtk/gtkutils.c:2653
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "파일 '%s' 은(는) %s (으)로는 너무 큽니다. 더 작은 이미지로 시도해 보십시오.\n"
+
+#: ../gtk/gtkutils.c:2655
+msgid "Icon Error"
+msgstr "아이콘 오류"
+
+#: ../gtk/gtkutils.c:2656
+msgid "Could not set icon"
+msgstr "아이콘을 전송할 수 없었습니다."
+
+#: ../gtk/gtkutils.c:2757
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "파일 '%s' 을(를) 열 수 없었습니다: %s"
+
+#: ../gtk/gtkutils.c:2806
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "이미지 '%s' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못된 이미지 파일인 것 같습니다."
+
+#: ../gtk/gtkwhiteboard.c:756
+#: ../gtk/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "파일 저장"
+
+#: ../gtk/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "색상 선택"
+
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "통계 표시"
+
+#: ../gtk/plugins/cap/cap.c:458
+#: ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "응답 확률:"
+
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "통계 설정"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+msgid "Maximum response timeout:"
+msgstr "최대 응답 시간 초과:"
+
+#: ../gtk/plugins/cap/cap.c:813
+#: ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+#: ../gtk/plugins/timestamp.c:149
+msgid "minutes"
+msgstr "분간"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr "최대 last-seen 차이:"
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "임계값:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/cap/cap.c:931
+msgid "Contact Availability Prediction"
+msgstr "연락 가능성 예측"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr "친구와 대화할 가능성을 예측하는 플러그인입니다."
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:934
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "연락 가능성을 예측하는 플러그인 (CAP) 을 사용하여 친구와 대화한 통계로부터 경험치를 표시합니다."
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "대기 중인 친구"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "자리 비움 중인 친구"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "\"장시간\" 자리 비움 상태의 친구"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "이동 중인 친구"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "오프라인 친구"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "상태별 점수"
+
+#: ../gtk/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 "<i>가장 큰 점수</i> 를 갖는 친구가 우선적으로 연락됩니다.\n"
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "점수가 같을 때에는 마지막 친구가 우선함"
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "계정별 점수"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "연락 우선 순위"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "친구의 여러 상태에 맞추어 우선 순위를 조절할 수 있습니다."
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "연락 우선 순위를 계산할 때에 친구의 상태 (대기/자리 비움/오프라인 등)의 점수를 변경할 수 있습니다."
+
+#: ../gtk/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Conversation Colors"
+
+#: ../gtk/plugins/convcolors.c:25
+#: ../gtk/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "대화 창안에 표시하는 메시지의 색상을 설정합니다."
+
+#: ../gtk/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "오류 메시지"
+
+#: ../gtk/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "강조 표시 메시지"
+
+#: ../gtk/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "시스템 메시지"
+
+#: ../gtk/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "보낸 메시지"
+
+#: ../gtk/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "받은 메시지"
+
+#: ../gtk/plugins/convcolors.c:201
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "%s (으)로 사용할 색상 선택"
+
+#: ../gtk/plugins/convcolors.c:300
+#: ../gtk/plugins/gaimrc.c:448
+#: ../libgaim/protocols/msn/msn.c:1532
+msgid "General"
+msgstr "일반"
+
+#: ../gtk/plugins/convcolors.c:301
+msgid "Ignore incoming format"
+msgstr "수신한 메시지 서식 무시"
+
+#: ../gtk/plugins/convcolors.c:302
+msgid "Apply in Chats"
+msgstr "대화 적용"
+
+#: ../gtk/plugins/convcolors.c:303
+msgid "Apply in IMs"
+msgstr "메시지에 적용"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "대화 횟수순으로 정렬"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Conversation Placement"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "창마다 대화 탭의 개수"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "대화 탭을 번호순으로 배치할 때 메시지와 대화 창을 분리"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "대화 탭을 배치할 때의 옵션입니다."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "대화 창마다에 대화 탭의 개수를 제한하여, 선택적으로 메시지와 대화 창을 분리합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Pidgin 데모 플러그인"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "다양한 동작을 실행하는 샘플 플러그인입니다 - 설명을 참조해 주십시오."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"이것은 다양한 동작을 실행하는 정말 대단한 플러그인입니다:\n"
+"- 로그인하면 프로그램의 제작자를 알려줍니다.\n"
+"- 수신한 모든 문자를 반전시킵니다.\n"
+"- 로그인하면 친구 목록의 사람들에게 메시지를 즉시 보냅니다."
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "커서 색상"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "두번째 커서 색상"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "하이퍼링크 색상"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView Expander 크기"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView 수평방향 분리자"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "메지시 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "대화 히스토리 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "로그 뷰어 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "질문 창의 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "알림 창의 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView의 Expander를 들여쓰기 함"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "글꼴 색상"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s (으)로 사용할 글꼴 선택"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "인터페이스 글꼴 선택"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ 인터페이스 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ 글자 바로 가기 테마"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "인터페이스 색상"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Widget 크기"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "글꼴"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "도구"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "이 설정을 \"%s%sgtkrc-2.0\" 에 저장"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "이 \"gtkrc\" 파일을 읽어들임"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Pidgin GTK+ 테마 정의"
+
+#: ../gtk/plugins/gaimrc.c:618
+#: ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "\"gtkrc\" 의 설정에 접근하는 기능을 제공합니다."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "마우스 제스처 설정"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "마우스 가운데 버튼"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "마우스 오른쪽 버튼"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "마우스 제스처를 시각적으로 표시(_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "마우스 제스처"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "마우스 제스처 기능을 제공합니다."
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+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 ""
+"대화 창에서 마우스 제스처 기능을 제공합니다.\n"
+"다음의 동작을 실행하는 경우에는, 마우스 가운데 버튼을 드래그 해 주십시오:\n"
+"\n"
+"아래→오른쪽으로 드래그 하면 대화를 닫습니다.\n"
+"위→왼쪽으로 드래그 하면 이전의 대화로 이동합니다.\n"
+"위→오른쪽으로 드래그 하면 다음의 대화로 이동합니다."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "인스턴트 메신저"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "아래의 주소록으로부터 친구를 선택하거나 또는 친구를 새로 추가해 주십시오."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libgaim/protocols/qq/group.c:123
+#: ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5621
+msgid "Search"
+msgstr "검색"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "새 친구"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "친구 선택"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "주소록으로부터 추가할 친구를 선택하거나 또는 새 친구를 작성해 주십시오."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "사용자 상세(_D)"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "친구와의 연대(_A)"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1162
+msgid "None"
+msgstr "없음"
+
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "이메일을 보낼 수 없음"
+
+#: ../gtk/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "환경변수 PATH 로부터 Evolution의 실행 형식을 찾을 수 없습니다."
+
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "이 친구의 이메일 주소가 없습니다."
+
+#: ../gtk/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "주소록에 추가"
+
+#: ../gtk/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "이메일 전송"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution과의 연대 설정"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "자동으로 친구로 추가할 계정을 모두 선택해 주십시오."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution과의 연대"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Evolution과의 연대 기능을 제공합니다."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "사용자 정보를 입력해 주십시오."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "친구 목록의 이름과 계정 형식을 입력해 주십시오."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "계정 형식:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "추가 정보:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "이름:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "성:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "이메일:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK 신호 시험"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163
+#: ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "모든 UI 신호가 정상적으로 동작하는지 시험합니다."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "History"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Iconify on Away"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85
+#: ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "자리를 벗어나면 친구 목록과 대화 창을 아이콘화 합니다."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "메일 확인"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "새 로컬 메일을 확인합니다."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "새로운 메일이 있으면 그것을 표시하기 위한 작은 상자를 친구 목록에 추가합니다."
+
+#: ../gtk/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Markerline"
+
+#: ../gtk/plugins/markerline.c:25
+#: ../gtk/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "대화 창 안에 있는 새 메시지에 밑줄을 그립니다."
+
+#: ../gtk/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "밑줄 적용 대상"
+
+#: ../gtk/plugins/markerline.c:250
+#: ../gtk/plugins/notify.c:674
+msgid "_IM windows"
+msgstr "메시지 창(_I)"
+
+#: ../gtk/plugins/markerline.c:254
+#: ../gtk/plugins/notify.c:681
+msgid "C_hat windows"
+msgstr "대화 창(_H)"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "음악 메시지 세션을 요구했습니다. 수락할 경우에는 MM 아이콘을 눌러 주십시오."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "음악 메시지 세션에 들어갔습니다."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "음악 메시지"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "실행 중인 명령에서 충돌이 발생했습니다:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "편집기 실행 오류"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "다음의 오류가 발생했습니다:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "음악 메시지 설정"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "점수 편집기 경로"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "합작하기 위한 음악 메시지 플러그인입니다."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "실시간으로 공통 점수를 편집함으로써 여러 명의 친구 사이에서 음악의 일부분을 동시에 연주할 수 있도록 하는 음악 메시지 플러그인입니다."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:670
+msgid "Notify For"
+msgstr "연락처"
+
+#: ../gtk/plugins/notify.c:689
+msgid "\t_Only when someone says your screen name"
+msgstr "\t누군가가 나의 아이디를 호출할 때만(_O)"
+
+#: ../gtk/plugins/notify.c:699
+msgid "_Focused windows"
+msgstr "활성 창(_F)"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:707
+msgid "Notification Methods"
+msgstr "알림 방식"
+
+#: ../gtk/plugins/notify.c:714
+msgid "Prepend _string into window title:"
+msgstr "문자열을 창 제목 앞부분에 추가(_S):"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:733
+msgid "Insert c_ount of new messages into window title"
+msgstr "새 메시지 수를 창 제목에 삽입(_O)"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:742
+msgid "Insert count of new message into _X property"
+msgstr "새 메시지 수를 X 속성에 삽입(_X)"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:750
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "창 관리자에게 \"긴급\" 힌트 설정(_U)"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:759
+msgid "R_aise conversation window"
+msgstr "대화 창을 전면으로 표시(_A)"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:767
+msgid "Notification Removal"
+msgstr "알림을 삭제할 시기"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:772
+msgid "Remove when conversation window _gains focus"
+msgstr "대화 창이 활성되면(_G)"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:779
+msgid "Remove when conversation window _receives click"
+msgstr "대화 창을 클릭하면(_R)"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:787
+msgid "Remove when _typing in conversation window"
+msgstr "대화 창에서 무언가를 입력하면(_T)"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:795
+msgid "Remove when a _message gets sent"
+msgstr "메시지를 전송하면(_M)"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove on switch to conversation ta_b"
+msgstr "대화 창의 탭이 전환되면(_B)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:893
+msgid "Message Notification"
+msgstr "Message Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:896
+#: ../gtk/plugins/notify.c:898
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "읽지 않은 메시지를 알리는 다양한 방법을 제공합니다."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raw 데이터"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Raw 데이터를 문자 형식의 프로토콜로 전송할 수 있습니다."
+
+#: ../gtk/plugins/raw.c:178
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "입력한 Raw 데이터를 문자 형식 프로토콜 (Jabber, MSN, IRC, TOC) 에 전송할 수 있습니다. 전송할 때에는 입력 상자 안에서 [엔터] 키를 눌러 주십시오. 디버그 창에서 전송 내용을 감시해 주십시오."
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "사용 중인 버전은 %s 입니다. 최신 버전은 %s 입니다.<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
 msgstr ""
-
-#: src/log.c:129
-msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+"<b>변경 로그:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "버전 %s 은(는) 다음 사이트로부터 받을 수 있습니다:<br><a href=\"http://pidgin.sourceforge.net/\">http://pidgin.sourceforge.net</a>"
+
+#: ../gtk/plugins/relnot.c:84
+#: ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "최신 버전 알림"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Release Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "최신 릴리즈의 정보를 주기적으로 확인합니다."
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "최신 릴리즈를 주기적으로 확인하여 변경 로그 (ChangeLog) 를 사용자에게 알립니다."
+
+#: ../gtk/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "문자열이 중복되고 있습니다."
+
+#: ../gtk/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "지정한 문자열은 이미 목록에 있습니다."
+
+#: ../gtk/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "문자열 대체"
+
+#: ../gtk/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "입력한 문자열"
+
+#: ../gtk/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "실제 전송할 문자열"
+
+#: ../gtk/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "단어만"
+
+#: ../gtk/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "대/소문자 구별"
+
+#: ../gtk/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "새로운 대체 추가"
+
+#: ../gtk/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "입력한 문자열(_T):"
+
+#: ../gtk/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "실제 전송할 문자열(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "대/소문자 구별(_E)"
+
+#: ../gtk/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "단어가 일치할 때 대체(_W)"
+
+#: ../gtk/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "일반적인 문자열의 대체 설정"
+
+#: ../gtk/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "전송 시에 정리하여 대체"
+
+#: ../gtk/plugins/spellchk.c:2367
+msgid "Text replacement"
+msgstr "Text replacement"
+
+#: ../gtk/plugins/spellchk.c:2369
+#: ../gtk/plugins/spellchk.c:2370
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "사용자가 정의한 규칙에 따라 실제로 전송할 메지시를 대체합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77
+#: ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Buddy Ticker"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358
+#: ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "친구 목록을 수평방향으로 스크롤하는 버전입니다."
+
+#: ../gtk/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "타임스탬프 표시 간격"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "Timestamp"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "iChat 형식의 타임스탬프를 표시합니다."
+
+#. *  description
+#: ../gtk/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "iChat 형식의 타임스탬프를 N분 마다 대화에 삽입합니다."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "타임스탬프 서식 설정"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "강제적으로 24시간제 적용(_F)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "표시할 조건:"
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "대화 창(_N):"
+
+#: ../gtk/plugins/timestamp_format.c:37
+#: ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "메시지가 지연되었을 때"
+
+#: ../gtk/plugins/timestamp_format.c:38
+#: ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "메시지가 지연되고 있는 대화 시"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "메시지 로그(_M):"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "메시지에 부여하는 타임스탬프의 서식을 정의합니다."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "이 플러그인을 사용하면 대화나 로그 메시지에 부여하는 타임스탬프의 형식을 정의할 수 있습니다."
+
+#: ../gtk/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>로그아웃 했습니다.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/xmppconsole.c:745
+#: ../gtk/plugins/xmppconsole.c:841
+#: ../gtk/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP 콘솔"
+
+#: ../gtk/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "계정: "
+
+#: ../gtk/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP에 접속되어 있지 않습니다.</font>"
+
+#: ../gtk/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "<iq/> stanza 를 삽입합니다."
+
+#: ../gtk/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "<presence/> stanza 를 삽입합니다."
+
+#: ../gtk/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "<message/> stanza 를 삽입합니다."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "낮은 수준의 XMPP stanza 를 전송 또는 수신합니다."
+
+#. *  description
+#: ../gtk/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "불투명도:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "메시지 대화 창"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "대화 창의 투명도(_I)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "대화 창 안에 슬라이드바 표시(_S)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "활성되면 대화 창의 투명도 해제"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "항상 맨 위에"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "친구 목록 창"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "친구 목록 투명도(_B)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "활성되면 친구 목록의 투명도 해제"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparency"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "친구 목록과 대화 창을 계단식으로 투명화 합니다."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
 msgstr ""
-
-#: src/log.c:577
+"이 플러그인은 가변식 투과를 사용하여 친구 목록과 대화 창을 투명하게 합니다.\n"
+"\n"
+"* 주: 이 플러그인은 윈도우즈 2000 이상에서만 동작합니다."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ 런타임 버전"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "시작"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "윈도우즈 시작 시 Pidgin 실행(_S)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "친구 목록을 결합할 수 있게(_D)"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "친구 목록을 맨 위로 배치한 상태 유지(_K):"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "결합했을 때만"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "대화에서 메시지를 받으면 창을 깜박거림(_F)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "WinPidgin 설정"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "윈도우즈 버전의 Pidgin 전용 옵션 기능을 제공합니다."
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr "윈도우즈 버전의 Pidgin에 특화된 옵션 기능 (대화 창의 조합) 을 제공합니다."
+
+#: ../libgaim/account.c:769
+msgid "accounts"
+msgstr "계정"
+
+#: ../libgaim/account.c:915
+msgid "Password is required to sign on."
+msgstr "접속하기 위해서는 비밀번호가 필요합니다."
+
+#: ../libgaim/account.c:940
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s (%s) 의 비밀번호를 입력해 주십시오."
+
+#: ../libgaim/account.c:947
+msgid "Enter Password"
+msgstr "비밀번호 입력"
+
+#: ../libgaim/account.c:952
+msgid "Save password"
+msgstr "비밀번호 저장"
+
+#: ../libgaim/account.c:986
+#: ../libgaim/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "프로토콜 %s 의 플러그인이 없습니다."
+
+#: ../libgaim/account.c:1085
+#: ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1317
+msgid "New passwords do not match."
+msgstr "새 비밀번호가 일치하지 않습니다."
+
+#: ../libgaim/account.c:1094
+msgid "Fill out all fields completely."
+msgstr "모든 항목을 완전히 채워 주십시오."
+
+#: ../libgaim/account.c:1117
+msgid "Original password"
+msgstr "기존 비밀번호"
+
+#: ../libgaim/account.c:1124
+msgid "New password"
+msgstr "새 비밀번호"
+
+#: ../libgaim/account.c:1131
+msgid "New password (again)"
+msgstr "비밀번호 (재확인)"
+
+#: ../libgaim/account.c:1137
+#, c-format
+msgid "Change password for %s"
+msgstr "%s 의 비밀번호 변경"
+
+#: ../libgaim/account.c:1145
+msgid "Please enter your current password and your new password."
+msgstr "현재 사용하고 있는 비밀번호와 새 비밀번호를 입력해 주십시오."
+
+#: ../libgaim/account.c:1175
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s 의 사용자 정보 변경"
+
+#: ../libgaim/account.c:1178
+#: ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "사용자 정보 설정"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "친구 목록"
+
+#: ../libgaim/blist.c:1919
+#, c-format
+msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
+msgstr[0] "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s (으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
+msgstr[1] "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s (으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "그룹을 삭제할 수 없습니다."
+
+#: ../libgaim/connection.c:106
+msgid "Registration Error"
+msgstr "등록 오류"
+
+#: ../libgaim/connection.c:292
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s 님이 접속했습니다."
+
+#: ../libgaim/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s 님이 접속을 끊었습니다."
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "메시지 전송 실패: 메시지가 너무 깁니다."
+
+#: ../libgaim/conversation.c:168
+#: ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "%s 님에게 메시지를 보낼 수 없습니다."
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "메시지가 너무 깁니다."
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "메시지를 보낼 수 없습니다."
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "메시지 전송"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "메시지 전송(_S)"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s 님이 대화실에 들어왔습니다."
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] 님이 대화실에 들어왔습니다."
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "나는 %s (으)로 인식되었습니다"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 님은 %s (으)로 인식되었습니다"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s 님이 대화실을 나갔습니다."
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s 님이 대화실 (%s) (으)로부터 나갔습니다."
+
+#: ../libgaim/desktopitem.c:286
+#: ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "이름 없음"
+
+#: ../libgaim/dbus-server.c:578
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "새 접속을 열 수 없습니다: %s"
+
+#: ../libgaim/dbus-server.c:590
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "이름 가져오기에 실패했습니다: %s"
+
+#: ../libgaim/dbus-server.c:603
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "서버명 가져오기에 실패했습니다: %s"
+
+#: ../libgaim/dnsquery.c:491
+msgid "Unable to create new resolver process\n"
+msgstr "새 resolver 프로세스를 생성할 수 없습니다.\n"
+
+#: ../libgaim/dnsquery.c:496
+msgid "Unable to send request to resolver process\n"
+msgstr "resolver 프로세스에 요구를 보낼 수 없습니다.\n"
+
+#: ../libgaim/dnsquery.c:529
+#: ../libgaim/dnsquery.c:677
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s 해석 중 오류:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:532
+#: ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s 해석 중 오류: %d"
+
+#: ../libgaim/dnsquery.c:554
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"resolver 프로세스로부터 읽는 중 오류:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:558
+msgid "EOF while reading from resolver process"
+msgstr "resolver 프로세스로부터 읽는 중 EOF"
+
+#: ../libgaim/dnsquery.c:735
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "스레드 생성에 실패했습니다: %s"
+
+#: ../libgaim/dnsquery.c:736
+msgid "Unknown reason"
+msgstr "이유를 알 수 없습니다."
+
+#: ../libgaim/ft.c:195
+#: ../libgaim/protocols/msn/msn.c:408
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s 읽는 중 오류 \n"
+"%s\n"
+
+#: ../libgaim/ft.c:199
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s 쓰는 중 오류: \n"
+"%s\n"
+
+#: ../libgaim/ft.c:203
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s 접근 중 오류:\n"
+"%s\n"
+
+#: ../libgaim/ft.c:239
+msgid "Directory is not writable."
+msgstr "디렉토리에 쓰기 권한이 없습니다."
+
+#: ../libgaim/ft.c:254
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 바이트 파일은 보낼 수 없습니다."
+
+#: ../libgaim/ft.c:264
+msgid "Cannot send a directory."
+msgstr "폴더는 전송할 수 없습니다."
+
+#: ../libgaim/ft.c:273
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s 은(는) 올바른 파일이 아닙니다. 덮어쓰기가 거부됩니다.\n"
+
+#: ../libgaim/ft.c:331
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 님이 %s (%s) 을(를) 전송하고자 합니다."
+
+#: ../libgaim/ft.c:338
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s 님이 파일을 전송하고자 합니다."
+
+#: ../libgaim/ft.c:379
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s 님으로부터의 파일 전송 요구를 승락하시겠습니까?"
+
+#: ../libgaim/ft.c:383
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"다음 사이트에서 파일을 다운로드 할 수 있습니다:\n"
+"리모트 호스트: %s\n"
+"리모트 포트: %d"
+
+#: ../libgaim/ft.c:416
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s 님이 파일 %s 의 전송을 요구하고 있습니다."
+
+#: ../libgaim/ft.c:468
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s 은(는) 올바른 파일명이 아닙니다.\n"
+
+#: ../libgaim/ft.c:489
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s 을(를) %s 에게 전송할 것을 전달하고 있습니다."
+
+#: ../libgaim/ft.c:501
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "%s 을(를) %s (으)로부터 전송을 시작하고 있습니다."
+
+#: ../libgaim/ft.c:655
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "파일 %s 의 전송이 완료되었습니다."
+
+#: ../libgaim/ft.c:658
+msgid "File transfer complete"
+msgstr "파일 전송이 완료되었습니다."
+
+#: ../libgaim/ft.c:1075
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "%s 의 전송이 취소되었습니다."
+
+#: ../libgaim/ft.c:1080
+msgid "File transfer cancelled"
+msgstr "파일 전송이 취소되었습니다."
+
+#: ../libgaim/ft.c:1138
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s 님이 %s 의 전송을 취소했습니다."
+
+#: ../libgaim/ft.c:1143
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s 님이 파일 전송을 취소했습니다."
+
+#: ../libgaim/ft.c:1200
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s (으)로의 파일 전송에 실패했습니다."
+
+#: ../libgaim/ft.c:1202
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s (으)로부터의 파일 전송에 실패했습니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "터미널로부터 명령 수행"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "\"aim\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "\"gg\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "\"icq\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "\"irc\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "\"msnim\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "\"sip\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "\"xmpp\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "\"ymsgr\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" 용 핸들"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"aim\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"gg\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"icq\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"irc\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"msnim\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"sip\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"xmpp\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"ymsgr\" URL을 처리하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "이 형식의 URL을 처리하기 위해 사용하는 명령을 터미널로부터 시작하는 경우에는 TRUE 입니다."
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "지정한 명령으로 \"aim\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "지정한 명령으로 \"gg\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "지정한 명령으로 \"icq\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "지정한 명령으로 \"irc\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "지정한 명령으로 \"msnim\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "지정한 명령으로 \"sip\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "지정한 명령으로 \"xmpp\" URL을 처리할까 말까"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "지정한 명령으로 \"ymsgr\" URL을 처리할까 말까"
+
+#: ../libgaim/log.c:181
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">로그 기록에는 읽기 함수가 없습니다.</font></b>"
+
+#: ../libgaim/log.c:562
+msgid "HTML"
+msgstr "HTML 형식"
+
+#: ../libgaim/log.c:573
+msgid "Plain text"
+msgstr "일반 문자열"
+
+#: ../libgaim/log.c:584
+msgid "Old Gaim"
+msgstr "구버전 Pidgin"
+
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "이 메시지의 로그를 기록하지 못했습니다."
+
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:906
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:957 src/log.c:1074
+#: ../libgaim/log.c:1115
+#, c-format
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+
+#: ../libgaim/log.c:1117
+#, c-format
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+
+#: ../libgaim/log.c:1175
+#: ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-
-#: src/log.c:967 src/log.c:1086
+msgstr "<font color=\"red\"><b>로그 파일을 찾을 수 없습니다!</b></font>"
+
+#: ../libgaim/log.c:1187
+#: ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr ""
-
-#: src/log.c:1019
+msgstr "<font color=\"red\"><b>파일을 읽지 못했습니다: %s</b></font>"
+
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr ""
-
-#: src/plugin.c:331
-#, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"%s 플러그인을 찾을 수 없습니다. 이 플러그인을 설치하고 다시 시도하세요."
-
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "게임이 플러그인을 읽어들일 수 없습니다."
-
-#: src/plugin.c:360
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+#: ../libgaim/plugin.c:282
+#: ../libgaim/protocols/jabber/buddy.c:1685
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2719
+msgid "Unknown error"
+msgstr "알 수 없는 오류"
+
+#: ../libgaim/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "%s 을(를) 사용하고 있으나, 이 플러그인은 %s 이(가) 필요합니다."
+
+#: ../libgaim/plugin.c:434
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "플러그인 매직 번호 (%d) 이(가) 일치하지 않습니다: %d 매직 번호 필요"
+
+#: ../libgaim/plugin.c:451
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI 버전 (%d.%d.x) 이(가) 일치하지 않습니다: %d.%d.x 버전 필요"
+
+#: ../libgaim/plugin.c:468
+msgid "Plugin does not implement all required functions"
+msgstr "플러그인이 필요한 모든 함수를 실행하지 못했습니다."
+
+#: ../libgaim/plugin.c:533
+#, c-format
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "요구하는 플러그인 %s 을(를) 찾을 수 없습니다. 이 플러그인을 설치한 후, 다시 시도해 보십시오."
+
+#: ../libgaim/plugin.c:538
+msgid "Gaim encountered errors loading the plugin."
+msgstr "플러그인을 읽어 들이는 중 오류가 발생했습니다."
+
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "%s 플러그인을 읽어들일 수 없습니다."
-
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "사용안함"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+msgstr "요구하는 플러그인 %s 을(를) 읽을 수 없었습니다."
+
+#: ../libgaim/plugin.c:564
+msgid "Gaim was unable to load your plugin."
+msgstr "플러그인을 읽을 수 없었습니다."
+
+#: ../libgaim/plugin.c:664
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "의존성이 있는 플러그인 %s 해제에 실패했습니다"
+
+#: ../libgaim/plugin.c:669
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "플러그인을 해제하는 동안에 오류가 발생했습니다."
+
+#: ../libgaim/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Autoaccept"
+
+#: ../libgaim/plugins/autoaccept.c:25
+#: ../libgaim/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "선택한 사용자로부터의 파일 요구를 자동으로 수락합니다."
+
+#: ../libgaim/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "\"%2$s\" 님으로부터 \"%1$s\" 파일 전송 수락을 완료했습니다."
+
+#: ../libgaim/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr "수락 완료"
+
+#: ../libgaim/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s 님으로부터 파일 전송을 수락하면"
+
+#: ../libgaim/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr "자동 수락 설정"
+
+#: ../libgaim/plugins/autoaccept.c:164
+#: ../libgaim/plugins/autoreply.c:225
+msgid "_Save"
+msgstr "저장(_S)"
+
+#: ../libgaim/plugins/autoaccept.c:165
+#: ../libgaim/plugins/autoreply.c:226
+#: ../libgaim/plugins/idle.c:170
+#: ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+#: ../libgaim/protocols/oscar/oscar.c:1432
+#: ../libgaim/protocols/oscar/oscar.c:2234
+#: ../libgaim/protocols/oscar/oscar.c:2280
+#: ../libgaim/protocols/oscar/oscar.c:5838
+#: ../libgaim/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:6068
+#: ../libgaim/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:6193
+#: ../libgaim/request.h:1350
+#: ../libgaim/request.h:1360
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: ../libgaim/plugins/autoaccept.c:166
+msgid "Ask"
+msgstr "물어보기"
+
+#: ../libgaim/plugins/autoaccept.c:167
+msgid "Auto Accept"
+msgstr "자동으로 수락"
+
+#: ../libgaim/plugins/autoaccept.c:168
+msgid "Auto Reject"
+msgstr "자동 거부"
+
+#: ../libgaim/plugins/autoaccept.c:181
+msgid "Autoaccept File Transfers..."
+msgstr "파일 전송의 자동 수락..."
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libgaim/plugins/autoaccept.c:211
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"파일 저장 위치\n"
+"(절대 경로로 지정)"
+
+#: ../libgaim/plugins/autoaccept.c:216
+msgid "Automatically reject from users not in buddy list"
+msgstr "친구 목록에 없는 사용자로부터의 요구는 거부"
+
+#: ../libgaim/plugins/autoaccept.c:220
 msgid ""
-"\n"
-"<b>Status:</b> %s"
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
 msgstr ""
+"자동 수락에 의한 파일이 전송을 완료하면 팝업으로 알림\n"
+"(파일을 전송한 상대와 대화가 없는 경우에만)"
+
+#: ../libgaim/plugins/autoreply.c:23
+msgid "Autoreply"
+msgstr "Autoreply"
+
+#: ../libgaim/plugins/autoreply.c:25
+msgid "Autoreply for all the protocols"
+msgstr "모든 프로토콜로 자동 응답합니다."
+
+#: ../libgaim/plugins/autoreply.c:26
+msgid "This plugin lets you set autoreply message for any protocol. You can set the global autoreply message from the Plugin-options dialog. To set some specific autoreply message for a particular buddy, right click on the buddy in the buddy-list window. To set autoreply messages for some account, go to the `Advanced' tab of the Account-edit dialog."
+msgstr "이 프로토콜을 사용하면 어떤 종류의 프로토콜로도 자동으로 응답할 수 있게 됩니다. [플러그인 설정]에서 공통으로 사용할 자동 응답 메시지를 지정할 수 있습니다. 특정 친구에 대해 자동 응답 메시지를 지정하려면, 친구 목록의 친구 위에서 오른쪽 클릭해 주십시오. 계정마다 자동 응답 메시지를 지정하려면, 계정 편집 창의 \"고급 설정\" 탭을 이용하십시오."
+
+#. XXX: There should be a way to reset to the default/account-default autoreply
+#: ../libgaim/plugins/autoreply.c:218
+#, c-format
+msgid "Set autoreply message for %s"
+msgstr "%s 에 대한 자동 응답 메시지"
+
+#: ../libgaim/plugins/autoreply.c:220
+msgid "Set Autoreply Message"
+msgstr "자동 응답 메시지 설정"
+
+#: ../libgaim/plugins/autoreply.c:221
+msgid "The following message will be sent to the buddy when the buddy sends you a message and autoreply is enabled."
+msgstr "자동 응답을 사용함으로 할 때 친구가 메시지를 보내 오면, 다음 메시지를 상대에게 전송합니다:"
+
+#: ../libgaim/plugins/autoreply.c:238
+msgid "Set _Autoreply Message"
+msgstr "자동 응답 메시지 설정(_A)"
+
+#: ../libgaim/plugins/autoreply.c:249
+msgid "Autoreply message"
+msgstr "자동 응답 메시지"
+
+#: ../libgaim/plugins/autoreply.c:336
+msgid "Send autoreply messages when"
+msgstr "자동 응답 메시지를 보낼 시기"
+
+#: ../libgaim/plugins/autoreply.c:340
+msgid "When my account is _away"
+msgstr "내가 자리 비움일 때(_A)"
+
+#: ../libgaim/plugins/autoreply.c:344
+msgid "When my account is _idle"
+msgstr "내가 대기 중일 때(_I)"
+
+#: ../libgaim/plugins/autoreply.c:348
+msgid "_Default reply"
+msgstr "기본 응답(_D)"
+
+#: ../libgaim/plugins/autoreply.c:354
+msgid "Status message"
+msgstr "상태 메시지"
+
+#: ../libgaim/plugins/autoreply.c:358
+msgid "Autoreply with status message"
+msgstr "상태 메시지를 추가하여 자동 응답"
+
+#: ../libgaim/plugins/autoreply.c:362
+msgid "Always when there is a status message"
+msgstr "항상"
+
+#: ../libgaim/plugins/autoreply.c:364
+msgid "Only when there's no autoreply message"
+msgstr "자동 응답이 없을 때만"
+
+#: ../libgaim/plugins/autoreply.c:369
+msgid "Delay between autoreplies"
+msgstr "자동 응답 간격"
+
+#: ../libgaim/plugins/autoreply.c:373
+msgid "_Minimum delay (mins)"
+msgstr "간격(분)(_M)"
+
+#: ../libgaim/plugins/autoreply.c:377
+msgid "Times to send autoreplies"
+msgstr "자동 응답 회수"
+
+#: ../libgaim/plugins/autoreply.c:381
+msgid "Ma_ximum count"
+msgstr "최대값(_X)"
+
+#: ../libgaim/plugins/autoreply.c:428
+msgid "I am currently not available. Please leave your message, and I will get back to you as soon as possible."
+msgstr "지금 저는 응답할 수 있는 상태가 아니므로, 메시지를 남겨 주십시오. 확인하는 대로 연락을 드리겠습니다."
+
+#: ../libgaim/plugins/buddynote.c:46
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1641
+msgid "Notes"
+msgstr "메모"
+
+#: ../libgaim/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr "아래에 메모를 입력해 주십시오..."
+
+#: ../libgaim/plugins/buddynote.c:61
+msgid "Edit Notes..."
+msgstr "메모 편집..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/buddynote.c:87
+msgid "Buddy Notes"
+msgstr "Buddy Notes"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/buddynote.c:89
+msgid "Store notes on particular buddies."
+msgstr "특정 친구에게 메모를 남깁니다."
+
+#. *  summary
+#: ../libgaim/plugins/buddynote.c:90
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr "친구 목록에 있는 친구에게 메모를 남기기 위한 기능을 추가합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "암호화 시험"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ciphertest.c:267
+#: ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "암호화 기능이 함께 제공되어 있는지 확인합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus 예제"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158
+#: ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus 플러그인 예제"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Pidgin 파일 제어"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251
+#: ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "Pidgin 명령을 파일에 기술해 둠으로써 Pidgin 자신을 제어할 수 있습니다."
+
+#: ../libgaim/plugins/idle.c:158
+#: ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "분"
+
+#. 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.
+#: ../libgaim/plugins/idle.c:165
+#: ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223
+#: ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: ../libgaim/plugins/idle.c:166
+#: ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "대기 시간 설정"
+
+#: ../libgaim/plugins/idle.c:169
+#: ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "설정(_S)"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "대기 중인 계정이 없습니다."
+
+#: ../libgaim/plugins/idle.c:199
+#: ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "대기 시간 해제"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "해제(_U)"
+
+#: ../libgaim/plugins/idle.c:224
+#: ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "모든 계정에 대해 대기 시간 설정"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "대기 중인 모든 계정에 대해 대기 시간 해제"
+
+#: ../libgaim/plugins/idle.c:317
+#: ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "대기 중의 시간을 수동으로 설정할 수 있습니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC 시험 클라이언트"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "클라이언트 측에서 IPC를 지원하는 시험용 플러그인입니다."
+
+#. *  description
+#: ../libgaim/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 "클라이언트 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 서버용 플러그인의 위치를 검출하여 등록된 명령을 호출합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC 시험 서버"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "서버 측에서 IPC를 지원하는 시험용 플러그인입니다."
+
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "서버 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 IPC 명령을 등록합니다."
+
+#. 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.
+#: ../libgaim/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr "(UTC)"
+
+#: ../libgaim/plugins/log_reader.c:1552
+msgid "User is offline."
+msgstr "사용자는 오프라인입니다."
+
+#: ../libgaim/plugins/log_reader.c:1558
+msgid "Auto-response sent:"
+msgstr "자동 응답 전송:"
+
+#: ../libgaim/plugins/log_reader.c:1568
+#: ../libgaim/plugins/log_reader.c:1571
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s 님이 접속을 끊었습니다."
+
+#: ../libgaim/plugins/log_reader.c:1585
+msgid "One or more messages may have been undeliverable."
+msgstr "하나 이상의 메시지가 전송 불가능한 상태로 되어 있습니다."
+
+#: ../libgaim/plugins/log_reader.c:1595
+msgid "You were disconnected from the server."
+msgstr "서버가 접속을 끊었습니다."
+
+#: ../libgaim/plugins/log_reader.c:1603
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "현재 접속되어 있지 않습니다. 로그인 할 때까지 메시지를 받을 수 없습니다."
+
+#: ../libgaim/plugins/log_reader.c:1618
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "메시지의 최대 크기를 초과하였기 때문에 전송할 수 없었습니다."
+
+#: ../libgaim/plugins/log_reader.c:1623
+msgid "Message could not be sent."
+msgstr "메시지를 전송할 수 없었습니다."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1976
+#: ../libgaim/plugins/log_reader.c:2085
+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.
+#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2090
+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.
+#: ../libgaim/plugins/log_reader.c:2001
+#: ../libgaim/plugins/log_reader.c:2094
+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.
+#: ../libgaim/plugins/log_reader.c:2014
+#: ../libgaim/plugins/log_reader.c:2099
+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.
+#: ../libgaim/plugins/log_reader.c:2026
+#: ../libgaim/plugins/log_reader.c:2103
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:2067
+msgid "General Log Reading Configuration"
+msgstr "일반"
+
+#: ../libgaim/plugins/log_reader.c:2071
+msgid "Fast size calculations"
+msgstr "빠르게 크기 계산"
+
+#: ../libgaim/plugins/log_reader.c:2075
+msgid "Use name heuristics"
+msgstr "이름 형식의 heuristics 사용"
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:2081
+msgid "Log Directory"
+msgstr "로그 기록 폴더"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:2126
+msgid "Log Reader"
+msgstr "Log Reader"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:2130
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "다른 메시지 클라이언트의 로그를 로그 뷰어로 표시"
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:2134
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"<b>상태</b>: Awesome"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
-msgid ""
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+msgstr ""
+"이 플러그인은 로그를 표시할 때 다른 메시지 클라이언트의 로그도 함께 표시 합니다. 현재 대응되는 클라이언트는 Adium, MSN Messenger, 그리고 Trillian 입니다.\n"
 "\n"
-"<b>Message:</b> %s"
-msgstr "<b>상태:</b> %s"
+"주의: 이 플러그인은 알파 버전이므로, 자주 오류가 발생될 수 있습니다. 이용에 따른 모든 책임은 사용자에게 있습니다."
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono 플러그인 로더"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Mono 용의 .NET 플러그인을 불러들입니다."
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/newline.c:68
+msgid "New Line"
+msgstr "New Line"
+
+#. *< name
+#. *< version
+#: ../libgaim/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr "표시한 메시지 앞에 개행 문자를 삽입합니다."
+
+#. *  summary
+#: ../libgaim/plugins/newline.c:71
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "메시지 앞에 개행 문자를 삽입하여, 대화 창의 아이디 아래에 메시지의 남는 부분을 표시하게 합니다."
+
+#: ../libgaim/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr "Offline Message Emulation"
+
+#: ../libgaim/plugins/offlinemsg.c:25
+#: ../libgaim/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr "오프라인 사용자에게 보내지 못한 메시지를 저장합니다."
+
+#: ../libgaim/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 "보내지 못한 남은 메시지를 저장합니다. \"친구 알림\" 창에서 편집 또는 삭제할 수 있습니다."
+
+#: ../libgaim/plugins/offlinemsg.c:152
+#, 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\" 님은 현재 오프라인 입니다. 전송하지 못한 남은 메시지를 저장하였다가, \"%s\" 님이 다시 로그온 했을 때 자동으로 재전송하시겠습니까?"
+
+#: ../libgaim/plugins/offlinemsg.c:156
+msgid "Offline Message"
+msgstr "오프라인 메시지"
+
+#: ../libgaim/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "\"친구 알림\" 창에서 편집 및 삭제할 수 있습니다."
+
+#: ../libgaim/plugins/offlinemsg.c:187
+msgid "Save offline messages in pounce"
+msgstr "오프라인 시의 메시지 저장"
+
+#: ../libgaim/plugins/offlinemsg.c:191
+msgid "Do not ask. Always save in pounce."
+msgstr "항상 저장"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Perl 플러그인 로더"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590
+#: ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "Perl 플러그인을 읽어들이는 기능을 제공합니다."
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "Psychic 모드"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "수신한 대화를 Psychic 모드로 표시합니다."
+
+#: ../libgaim/plugins/psychic.c:21
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "친구가 입력한 메시지를 대화 창에 직접 표시합니다. AIM, ICQ, Jabber, Sametime 그리고 Yahoo 에서 동작합니다."
+
+#: ../libgaim/plugins/psychic.c:66
+msgid "You feel a disturbance in the force..."
+msgstr "포스에 의해 혼란스러운 기분이 됩니다..."
+
+#: ../libgaim/plugins/psychic.c:85
+msgid "Only enable for users on the buddy list"
+msgstr "친구 목록에 등록되어 있는 사용자만 허가"
+
+#: ../libgaim/plugins/psychic.c:90
+msgid "Disable when away"
+msgstr "자리 비움 시 사용 안 함"
+
+#: ../libgaim/plugins/psychic.c:94
+msgid "Display notification message in conversations"
+msgstr "대화 창 안에 알림 메시지도 표시"
+
+#: ../libgaim/plugins/psychic.c:99
+msgid "Raise psychic conversations"
+msgstr "psychic 대화를 맨 위에 표시"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "신호 시험"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687
+#: ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "모든 신호가 정상적으로 동작하고 있는지 시험합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "심플 플러그인"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40
+#: ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "중요한 기능이 동작하고 있는지 시험합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97
+#: ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL 라이브러리 래퍼를 제공합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS를 이용한 SSL 기능을 제공합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412
+#: ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla 가 제공하는 NSS 를 이용하여 SSL 기능을 제공합니다."
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s 님은 자리에 있습니다."
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 님이 자리를 비웠습니다."
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s 님이 대기 상태가 되었습니다."
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s 님이 대기 상태에서 복귀했습니다."
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s 님이 접속했습니다."
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "알림 시기"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "친구가 자리 비움일 때(_A)"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "친구가 대기 중일 때(_I)"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "친구가 접속/접속 해제했을 때(_S)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "Buddy State Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145
+#: ../libgaim/plugins/statenotify.c:148
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "대화 상대가 자리 비움이거나, 대기 중에서 복귀 또는 자리에 있을 때 대화 창에 알립니다."
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Tcl 플러그인 로더"
+
+#: ../libgaim/plugins/tcl/tcl.c:415
+#: ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "Tcl 플러그인을 읽어들이는 기능을 제공합니다."
+
+#: ../libgaim/plugins/tcl/tcl.c:481
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "ActiveTCL 이 설치되어 있지 않은 것 같습니다. 이 플러그인을 사용하고자 하면, http://www.activestate.com 에 있는 ActiveTCL 을 설치해 주십시오.\n"
+
+#. Send a message about the connection error
+#: ../libgaim/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "수신한 메시지 접속을 확립할 수 없었습니다.\n"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:146
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "로컬 mDNS 서버를 사용한 접속을 확립할 수 없었습니다. 서버가 올바르게 작동되고 있습니까?"
 
 #. *< type
 #. *< ui_requirement
@@ -4624,350 +7146,419 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../libgaim/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:438
 msgid "Bonjour Protocol Plugin"
-msgstr "야후 프로토콜 플러그인"
+msgstr "Bonjour 프로토콜 플러그인"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:474
+#: ../libgaim/protocols/bonjour/bonjour.c:482
+#: ../libgaim/protocols/bonjour/bonjour.c:540
+#: ../libgaim/protocols/silc/silc.c:300
+msgid "Gaim User"
+msgstr "Pidgin 사용자"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "이름:"
+#: ../libgaim/protocols/bonjour/bonjour.c:578
+#: ../libgaim/protocols/silc/silc.c:931
+msgid "Hostname"
+msgstr "호스트명"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
-msgid "Port"
-msgstr "포트"
-
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: ../libgaim/protocols/bonjour/bonjour.c:582
+#: ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:807
 msgid "First name"
-msgstr "성:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "이름"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:585
+#: ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:812
 msgid "Last name"
-msgstr "이름:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
-msgid "Email"
-msgstr "메일"
-
-#: src/protocols/bonjour/bonjour.h:35
+msgstr "성"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:588
+#: ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:797
+#: ../libgaim/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:935
+msgid "E-mail"
+msgstr "이메일"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:591
+msgid "AIM Account"
+msgstr "AIM 계정"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:594
+msgid "Jabber Account"
+msgstr "Jabber 계정"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+msgstr "Bonjour"
+
+#: ../libgaim/protocols/bonjour/jabber.c:374
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s 님이 대화 계정을 닫았습니다."
+
+#: ../libgaim/protocols/bonjour/jabber.c:461
+msgid "Cannot open socket"
+msgstr "소켓을 열 수 없습니다."
+
+#: ../libgaim/protocols/bonjour/jabber.c:469
+msgid "Error setting socket options"
+msgstr "소켓 옵션을 설정할 수 없습니다."
+
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "포트에 소켓을 할당할 수 없었습니다."
+
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "소켓을 감시할 수 없었습니다."
+
+#: ../libgaim/protocols/bonjour/jabber.c:594
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
+
+#: ../libgaim/protocols/gg/gg.c:76
+#: ../libgaim/proxy.c:1791
+msgid "Invalid proxy settings"
+msgstr "잘못된 프록시 설정"
+
+#: ../libgaim/protocols/gg/gg.c:77
+#: ../libgaim/proxy.c:1791
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "지정한 프록시에 대한 호스트명 또는 포트 번호가 올바르지 않습니다."
+
+#: ../libgaim/protocols/gg/gg.c:115
+#: ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
+msgid "Token Error"
+msgstr "토큰 오류"
+
+#: ../libgaim/protocols/gg/gg.c:116
+#: ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
+msgid "Unable to fetch the token.\n"
+msgstr "토큰을 취득할 수 없습니다.\n"
+
+#: ../libgaim/protocols/gg/gg.c:269
+#: ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "친구 목록 보내기"
-
-#: src/protocols/gg/gg.c:137
+msgstr "친구 목록 저장..."
+
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "친구 목록이 비어 있어 파일에는 아무 것도 기록되지 않았습니다."
+
+#: ../libgaim/protocols/gg/gg.c:276
+#: ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "파일을 열 수 없었습니다."
+
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
-msgstr "열쇠글을 성공적으로 바꾸었습니다."
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "친구 목록을 성공적으로 저장했습니다!"
+
+#: ../libgaim/protocols/gg/gg.c:307
+#: ../libgaim/protocols/gg/gg.c:308
+msgid "Couldn't load buddylist"
+msgstr "친구 목록을 읽어들일 수 없었습니다."
+
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr "친구 별칭"
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "친구 목록 읽기..."
+
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
-msgstr "열쇠글을 성공적으로 바꾸었습니다."
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "친구 목록의 성공적으로 읽어들였습니다!"
+
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "친구 목록 보내기"
-
-#: src/protocols/gg/gg.c:254
+msgstr "친구 목록 저장..."
+
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "등록 정보 항목을 입력해 주십시오."
+
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
-msgstr "새 패스워드가 일치하지 않습니다."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "비밀번호가 일치하지 않습니다."
+
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "새 연결을 만들 수 없습니다."
-
-#: src/protocols/gg/gg.c:279
+msgstr "새 계정을 등록할 수 없습니다. 오류가 발생했습니다.\n"
+
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "새로운 Gadu-Gadu 계정을 등록했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
-msgstr "등록 성공"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
-msgstr "대화명"
-
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+msgstr "등록이 성공적으로 완료되었습니다!"
+
+#: ../libgaim/protocols/gg/gg.c:473
+#: ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/jabber/jabber.c:1352
+msgid "Password"
+msgstr "비밀번호"
+
+#: ../libgaim/protocols/gg/gg.c:478
+#: ../libgaim/protocols/gg/gg.c:769
+msgid "Password (retype)"
+msgstr "비밀번호 (재입력)"
+
+#: ../libgaim/protocols/gg/gg.c:483
+#: ../libgaim/protocols/gg/gg.c:774
+msgid "Enter current token"
+msgstr "현재의 토큰을 입력해 주십시오."
+
+#: ../libgaim/protocols/gg/gg.c:489
+#: ../libgaim/protocols/gg/gg.c:780
+msgid "Current token"
+msgstr "현재의 토큰"
+
+#: ../libgaim/protocols/gg/gg.c:493
+#: ../libgaim/protocols/gg/gg.c:494
+msgid "Register New Gadu-Gadu Account"
+msgstr "새로운 Gadu-Gadu 계정 등록"
+
+#: ../libgaim/protocols/gg/gg.c:495
+msgid "Please, fill in the following fields"
+msgstr "다음의 빈 칸을 입력해 주십시오."
+
+#: ../libgaim/protocols/gg/gg.c:632
+#: ../libgaim/protocols/gg/gg.c:1039
+#: ../libgaim/protocols/gg/gg.c:1113
+#: ../libgaim/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3777
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
-msgstr "시/군"
-
-#: src/protocols/gg/gg.c:417
+msgstr "도시"
+
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
+msgstr "생년"
+
+#: ../libgaim/protocols/gg/gg.c:640
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:46
+#: ../libgaim/protocols/qq/qq.c:224
+#: ../libgaim/protocols/qq/qq.c:227
+#: ../libgaim/protocols/qq/qq.c:230
+#: ../libgaim/protocols/qq/qq.c:234
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+msgid "Gender"
+msgstr "성별"
+
+#: ../libgaim/protocols/gg/gg.c:641
+msgid "Male or female"
+msgstr "남/여"
+
+#: ../libgaim/protocols/gg/gg.c:642
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:83
+#: ../libgaim/protocols/qq/qq.c:224
+msgid "Male"
+msgstr "남"
+
+#: ../libgaim/protocols/gg/gg.c:643
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:84
+#: ../libgaim/protocols/qq/qq.c:227
+msgid "Female"
+msgstr "여"
+
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
-msgstr "연결"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
+msgstr "온라인일 때 만"
+
+#: ../libgaim/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
-msgstr "사용안하는 친구를 회색으로(_D)"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
+msgstr "친구 찾기"
+
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
-msgstr "새 열쇠글을 입력하세요"
-
-#: src/protocols/gg/gg.c:465
+msgstr "검색 조건을 입력해 주십시오."
+
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
+msgstr "다음의 빈 칸을 입력해 주십시오."
+
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
-msgid "Unable to change password. Error occured.\n"
-msgstr "Gadu-Gadu 열쇠글을 바꿀 수 없음"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
+msgstr "현재 사용하고 있는 비밀번호와 지정한 비밀번호가 일치하지 않았습니다."
+
+#: ../libgaim/protocols/gg/gg.c:716
+msgid "Unable to change password. Error occurred.\n"
+msgstr "비밀번호를 변경할 수 없습니다. 오류가 발생했습니다.\n"
+
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
-msgstr "%s의 열쇠글 바꾸기"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
+msgstr "Gadu-Gadu 계정의 비밀번호 변경"
+
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
-msgstr "열쇠글을 성공적으로 바꾸었습니다."
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "알 수 없는 오류"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "방 목록을 처리할 수 없습니다."
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
+msgstr "비밀번호를 성공적으로 변경했습니다!"
+
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
-msgstr "열쇠글이 틀렸습니다."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "열쇠글"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "열쇠글 보냄"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s님은 현재 로그인하지 않았습니다."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "인증 중"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
+msgstr "현재의 비밀번호"
+
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "예전 열쇠글과 새 열쇠글을 입력하십시오."
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+msgstr "현재 사용하고 있는 비밀번호와 UIN 의 새 비밀번호를 입력해 주십시오:"
+
+#: ../libgaim/protocols/gg/gg.c:788
+#: ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu 열쇠글을 바꿀 수 없음"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+msgstr "Gadu-Gadu 비밀번호 변경"
+
+#: ../libgaim/protocols/gg/gg.c:863
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "친구 목록에서 대화실 지우기"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+msgstr "대화 선택: %s"
+
+#: ../libgaim/protocols/gg/gg.c:866
+#: ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
-msgstr "채팅 더하기(_H)"
-
-#: src/protocols/gg/gg.c:812
+msgstr "대화 추가..."
+
+#: ../libgaim/protocols/gg/gg.c:1028
+#: ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/oscar/oscar.c:2654
+#: ../libgaim/protocols/oscar/oscar.c:3693
+msgid "UIN"
+msgstr "UIN"
+
+#: ../libgaim/protocols/gg/gg.c:1031
+#: ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/buddy.c:1558
+#: ../libgaim/protocols/jabber/buddy.c:1734
+#: ../libgaim/protocols/oscar/oscar.c:3704
+#: ../libgaim/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "이름"
+
+#: ../libgaim/protocols/gg/gg.c:1044
+#: ../libgaim/protocols/gg/gg.c:1116
+msgid "Birth Year"
+msgstr "생년"
+
+#: ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/gg/gg.c:1167
+#: ../libgaim/protocols/oscar/oscar.c:3886
+msgid "Unable to display the search results."
+msgstr "검색 결과를 표시할 수 없습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1158
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu-Gadu 공개 폴더"
+
+#: ../libgaim/protocols/gg/gg.c:1159
+msgid "Search results"
+msgstr "검색 결과"
+
+#: ../libgaim/protocols/gg/gg.c:1202
+msgid "No matching users found"
+msgstr "일치하는 사용자를 찾지 못했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1203
+msgid "There are no users matching your search criteria."
+msgstr "검색 조건에 일치하는 사용자가 존재하지 않았습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1297
+#: ../libgaim/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr "소켓을 읽을 수 없습니다."
 
-#: src/protocols/gg/gg.c:959
-msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
-msgid "Search results"
-msgstr "찾은 결과를 얻을 수 없음"
-
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "연결"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "다른 용무 중"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
-msgid "Blocked"
-msgstr "차단"
-
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
-msgid "Add to chat"
-msgstr "채팅 더하기"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
-msgid "Unblock"
-msgstr "차단"
-
-#: src/protocols/gg/gg.c:1149
-#, fuzzy
-msgid "Chat _name:"
-msgstr "이름:"
-
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1382
+msgid "Buddy list downloaded"
+msgstr "친구 목록을 다운로드 했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1383
+msgid "Your buddy list was downloaded from the server."
+msgstr "친구 목록을 서버로부터 다운로드 했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1390
+msgid "Buddy list uploaded"
+msgstr "친구 목록을 업로드 했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1391
+msgid "Your buddy list was stored on the server."
+msgstr "친구 목록을 서버에 업로드 했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1496
+#: ../libgaim/protocols/gg/gg.c:1727
 msgid "Connection failed."
-msgstr "연결이 끊겼습니다."
-
-#: src/protocols/gg/gg.c:1357
-#, fuzzy
+msgstr "접속에 실패했습니다."
+
+#: ../libgaim/protocols/gg/gg.c:1633
+#: ../libgaim/protocols/msn/msn.c:563
+msgid "Blocked"
+msgstr "내가 거부됨"
+
+#: ../libgaim/protocols/gg/gg.c:1656
+msgid "Add to chat"
+msgstr "대화에 추가"
+
+#: ../libgaim/protocols/gg/gg.c:1665
+msgid "Unblock"
+msgstr "거부 안 함"
+
+#: ../libgaim/protocols/gg/gg.c:1669
+msgid "Block"
+msgstr "거부"
+
+#: ../libgaim/protocols/gg/gg.c:1686
+msgid "Chat _name:"
+msgstr "대화명(_N):"
+
+#: ../libgaim/protocols/gg/gg.c:1926
 msgid "Chat error"
-msgstr "읽기 오류"
-
-#: src/protocols/gg/gg.c:1358
-#, fuzzy
+msgstr "대화 오류"
+
+#: ../libgaim/protocols/gg/gg.c:1927
 msgid "This chat name is already in use"
-msgstr "같은 파일이 이미 존재함"
-
-#: src/protocols/gg/gg.c:1435
-#, fuzzy
+msgstr "이 대화명은 이미 사용 중입니다."
+
+#: ../libgaim/protocols/gg/gg.c:2010
 msgid "Not connected to the server."
-msgstr "서버와 연결이 끊겼습니다."
-
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "메일"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "새 재버 계정 등록"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "열쇠글 바꾸기"
-
-#: src/protocols/gg/gg.c:1520
-#, fuzzy
+msgstr "서버에 접속되어 있지 않습니다."
+
+#: ../libgaim/protocols/gg/gg.c:2033
+msgid "Find buddies..."
+msgstr "친구 찾기..."
+
+#: ../libgaim/protocols/gg/gg.c:2039
+msgid "Change password..."
+msgstr "비밀번호 변경..."
+
+#: ../libgaim/protocols/gg/gg.c:2045
 msgid "Upload buddylist to Server"
-msgstr "친구 목록을 서버로 보내기"
-
-#: src/protocols/gg/gg.c:1523
-#, fuzzy
+msgstr "친구 목록 업로드"
+
+#: ../libgaim/protocols/gg/gg.c:2049
 msgid "Download buddylist from Server"
-msgstr "서버에서 친구 목록 지우기"
-
-#: src/protocols/gg/gg.c:1526
-#, fuzzy
+msgstr "친구 목록 다운로드"
+
+#: ../libgaim/protocols/gg/gg.c:2053
 msgid "Delete buddylist from Server"
-msgstr "서버에서 친구 목록 지우기"
-
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
-msgstr "서버에서 친구 목록 가져오기"
+msgstr "서버로부터 친구 목록 삭제"
+
+#: ../libgaim/protocols/gg/gg.c:2057
+msgid "Save buddylist to file..."
+msgstr "친구 목록 내보내기..."
+
+#: ../libgaim/protocols/gg/gg.c:2061
+msgid "Load buddylist from file..."
+msgstr "친구 목록 가져오기..."
 
 #. magic
 #. major_version
@@ -4980,119 +7571,137 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:2159
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "가두-가두 프로토콜 플러그인"
+msgstr "Gadu-Gadu 프로토콜 플러그인"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../libgaim/protocols/gg/gg.c:2160
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "폴란드에서 인기있는 메신저입니다."
+
+#: ../libgaim/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
-msgstr "가두-가두 검색 엔진"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Gadu-Gadu 사용자"
+
+#: ../libgaim/protocols/irc/cmds.c:43
+#: ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
-msgstr "알려지지 않은 명령: %s"
-
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+msgstr "알 수 없는 명령: %s"
+
+#: ../libgaim/protocols/irc/cmds.c:505
+#: ../libgaim/protocols/jabber/chat.c:593
+#: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
-msgstr "현재 토픽: %s"
-
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+msgstr "현재 주제: %s"
+
+#: ../libgaim/protocols/irc/cmds.c:509
+#: ../libgaim/protocols/jabber/chat.c:597
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
-msgstr "토픽이 없음"
-
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+msgstr "주제가 설정되어 있지 않습니다."
+
+#: ../libgaim/protocols/irc/dcc_send.c:296
+#: ../libgaim/protocols/irc/dcc_send.c:337
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
-msgstr "파일 전송이 취소됨"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "파일 전송이 실패했습니다."
+
+#: ../libgaim/protocols/irc/dcc_send.c:297
+#: ../libgaim/protocols/irc/dcc_send.c:338
 msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: src/protocols/irc/irc.c:79
+msgstr "Pidgin이 감시 포트를 열 수 없었습니다."
+
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:79
+msgstr "MOTD 표시 중에 오류가 발생했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
-msgstr "MOTD를 사용할 수 없음"
-
-#: src/protocols/irc/irc.c:80
+msgstr "MOTD 를 사용할 수 없습니다."
+
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
-msgstr ""
-
-#: src/protocols/irc/irc.c:83
+msgstr "이 접속에 관련있는 MOTD 가 없습니다."
+
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
-msgstr "%s의 MOTD"
-
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+msgstr "%s 의 MOTD"
+
+#: ../libgaim/protocols/irc/irc.c:128
+#: ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:608
+#: ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
-msgstr "서버 끊어짐"
-
-#: src/protocols/irc/irc.c:188
+msgstr "서버가 접속을 끊었습니다."
+
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "MOTD 보기"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../libgaim/protocols/irc/irc.c:271
+#: ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "채널(_C):"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277
+#: ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
-msgstr "열쇠글(_P):"
-
-#: src/protocols/irc/irc.c:238
+msgstr "비밀번호(_P):"
+
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+msgstr "IRC 별명에 공백이 포함되어 있을 지도 모릅니다."
+
+#: ../libgaim/protocols/irc/irc.c:337
+#: ../libgaim/protocols/jabber/jabber.c:582
+#: ../libgaim/protocols/jabber/jabber.c:927
 msgid "SSL support unavailable"
-msgstr "SSL이 지원되지 않음"
-
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+msgstr "SSL 지원은 사용할 수 없습니다."
+
+#: ../libgaim/protocols/irc/irc.c:348
+#: ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
-msgstr "소켓을 만들 수 없음"
-
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+msgstr "소켓을 생성하지 못했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:412
+#: ../libgaim/protocols/jabber/jabber.c:460
+#: ../libgaim/protocols/oscar/oscar.c:1263
 msgid "Couldn't connect to host"
-msgstr "호스트에 연결할 수 없습니다."
-
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+msgstr "호스트에 접속하지 못했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:434
+#: ../libgaim/protocols/jabber/jabber.c:484
 msgid "Connection Failed"
-msgstr "연결 실패"
-
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+msgstr "접속에 실패했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:437
+#: ../libgaim/protocols/jabber/jabber.c:487
 msgid "SSL Handshake Failed"
-msgstr "SSL 악수 실패"
-
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+msgstr "SSL 핸드쉐이크에 실패했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:605
+#: ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
-msgstr "읽기 오류"
-
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+msgstr "읽기 오류입니다."
+
+#: ../libgaim/protocols/irc/irc.c:769
+#: ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
-msgstr "사용자"
-
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+msgstr "사용자 수"
+
+#: ../libgaim/protocols/irc/irc.c:772
+#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/silc/chat.c:1424
+#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "주제"
 
@@ -5104,34 +7713,62 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "IRC Protocol Plugin"
 msgstr "IRC 프로토콜 플러그인"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../libgaim/protocols/irc/irc.c:904
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "좀 덜 나쁜 IRC 프로토콜 플러그인"
-
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+msgstr "IRC 프로토콜 플러그인 (Sucks Less)"
+
+#. host to connect to
+#: ../libgaim/protocols/irc/irc.c:923
+#: ../libgaim/protocols/irc/msgs.c:239
+#: ../libgaim/protocols/jabber/jabber.c:1984
+#: ../libgaim/protocols/msn/msn.c:2056
+#: ../libgaim/protocols/oscar/libaim.c:133
+#: ../libgaim/protocols/oscar/libicq.c:133
+#: ../libgaim/protocols/qq/qq.c:758
+#: ../libgaim/protocols/sametime/sametime.c:5727
+#: ../libgaim/protocols/silc/ops.c:1244
+#: ../libgaim/protocols/silc/ops.c:1347
+#: ../libgaim/protocols/simple/simple.c:1836
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "서버"
 
-#: src/protocols/irc/irc.c:825
+#. port to connect to
+#: ../libgaim/protocols/irc/irc.c:926
+#: ../libgaim/protocols/msn/msn.c:2061
+#: ../libgaim/protocols/oscar/libaim.c:136
+#: ../libgaim/protocols/oscar/libicq.c:136
+#: ../libgaim/protocols/qq/qq.c:761
+#: ../libgaim/protocols/sametime/sametime.c:5732
+#: ../libgaim/protocols/silc/silc.c:1856
+#: ../libgaim/protocols/toc/toc.c:2351
+msgid "Port"
+msgstr "포트 번호"
+
+#: ../libgaim/protocols/irc/irc.c:929
 msgid "Encodings"
 msgstr "인코딩"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../libgaim/protocols/irc/irc.c:932
+#: ../libgaim/protocols/irc/msgs.c:232
+#: ../libgaim/protocols/jabber/jabber.c:782
+#: ../libgaim/protocols/silc/buddy.c:1532
+#: ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1194
+#: ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/ops.c:1343
+#: ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
-msgstr "사용자이름"
-
-#: src/protocols/irc/irc.c:831
+msgstr "사용자명"
+
+#: ../libgaim/protocols/irc/irc.c:935
+#: ../libgaim/protocols/irc/msgs.c:233
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "실명"
 
@@ -5139,1139 +7776,1202 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
+#: ../libgaim/protocols/irc/irc.c:943
 msgid "Use SSL"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:105
+msgstr "SSL 사용"
+
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
-msgstr "잘못된 모드"
-
-#: src/protocols/irc/msgs.c:116
+msgstr "모드 오류"
+
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
-msgstr "%s에서 밴되었습니다."
-
-#: src/protocols/irc/msgs.c:117
+msgstr "%s 님에게 차단되었습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
-msgstr "밴됨"
-
-#: src/protocols/irc/msgs.c:134
+msgstr "차단되었습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+msgstr "%s 을(를) 차단할 수 없습니다: 차단 목록이 다 찼습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:217
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+#: ../libgaim/protocols/irc/msgs.c:218
+msgid " <i>(identified)</i>"
+msgstr " <i>(identified)</i>"
+
+#: ../libgaim/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "별명"
 
-#: src/protocols/irc/msgs.c:216
-msgid " <i>(ircop)</i>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:217
-msgid " <i>(identified)</i>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
-msgid "Realname"
-msgstr "실명"
-
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../libgaim/protocols/irc/msgs.c:245
+#: ../libgaim/protocols/silc/ops.c:1272
 msgid "Currently on"
-msgstr "인증 중"
-
-#: src/protocols/irc/msgs.c:244
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>자리비움:</b> %s<br>"
-
-#: src/protocols/irc/msgs.c:246
+msgstr "채널"
+
+#: ../libgaim/protocols/irc/msgs.c:250
+msgid "Idle for"
+msgstr "대기 시간:"
+
+#: ../libgaim/protocols/irc/msgs.c:253
 msgid "Online since"
-msgstr "연결 시기"
-
-#: src/protocols/irc/msgs.c:249
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:317
+msgstr "입실 일시"
+
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>형용사 정의:</b>"
+
+#: ../libgaim/protocols/irc/msgs.c:257
+msgid "Glorious"
+msgstr "Glorious"
+
+#: ../libgaim/protocols/irc/msgs.c:333
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s님이 주제를 바꿈: %s"
-
-#: src/protocols/irc/msgs.c:322
+msgstr "%s 님이 주제를 변경했습니다: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:335
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s 님이 주제를 지웠습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:343
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:339
+msgstr "%s 의 주제: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:361
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "'%s'은(는) 알 수 없는 메시지입니다."
-
-#: src/protocols/irc/msgs.c:340
+msgstr "알 수 없는 메시지 '%s'"
+
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Unknown message"
 msgstr "알 수 없는 메시지"
 
-#: src/protocols/irc/msgs.c:340
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "게임은 IRC 서버가 보낸 메시지를 이해할 수 없습니다."
-
-#: src/protocols/irc/msgs.c:363
+msgstr "Pidgin이 전송한 메시지를 IRC 서버가 이해하지 못했습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:385
 #, c-format
 msgid "Users on %s: %s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:482
-#, fuzzy
+msgstr "%s 의 사용자 수: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:515
 msgid "Time Response"
-msgstr "시간"
-
-#: src/protocols/irc/msgs.c:483
+msgstr "시간 응답"
+
+#: ../libgaim/protocols/irc/msgs.c:516
 msgid "The IRC server's local time is:"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:494
+msgstr "IRC 서버의 로컬 시간:"
+
+#: ../libgaim/protocols/irc/msgs.c:527
 msgid "No such channel"
-msgstr "그런 채널이 없음"
+msgstr "그런 채널이 없습니다."
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../libgaim/protocols/irc/msgs.c:538
 msgid "no such channel"
-msgstr "그런 채널이 없음"
-
-#: src/protocols/irc/msgs.c:508
+msgstr "그런 채널이 없습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:541
 msgid "User is not logged in"
-msgstr "접속되지 않음"
-
-#: src/protocols/irc/msgs.c:513
+msgstr "사용자는 접속 중이 아닙니다."
+
+#: ../libgaim/protocols/irc/msgs.c:546
 msgid "No such nick or channel"
-msgstr "그런 대화명이나 채널이 없음"
-
-#: src/protocols/irc/msgs.c:533
+msgstr "그런 별명 또는 채널이 없습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:566
 msgid "Could not send"
-msgstr "보낼 수 없음"
-
-#: src/protocols/irc/msgs.c:589
+msgstr "보낼 수 없었습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:622
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s에는 초대받아야 들어갈 수 있습니다."
-
-#: src/protocols/irc/msgs.c:590
+msgstr "%s 에 참가하려면 초대할 필요가 있습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:623
 msgid "Invitation only"
-msgstr "초대자만"
-
-#: src/protocols/irc/msgs.c:692
+msgstr "초대만"
+
+#: ../libgaim/protocols/irc/msgs.c:732
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%s님에게 강제퇴장되었습니다: (%s)"
-
-#: src/protocols/irc/msgs.c:697
+msgstr "%s 에게 차였습니다: (%s)"
+
+#. Remove user from channel
+#: ../libgaim/protocols/irc/msgs.c:737
+#: ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s님에게 강제퇴장됨(%s)"
-
-#: src/protocols/irc/msgs.c:721
+msgstr "%s (%s) 에게 차였습니다"
+
+#: ../libgaim/protocols/irc/msgs.c:760
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:805
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-
-#: src/protocols/irc/msgs.c:844
+msgstr "모드 (%s %s) by %s"
+
+#: ../libgaim/protocols/irc/msgs.c:845
+#: ../libgaim/protocols/irc/msgs.c:846
+msgid "Invalid nickname"
+msgstr "잘못된 별명"
+
+#: ../libgaim/protocols/irc/msgs.c:847
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "지정한 별명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:852
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "지정한 계정명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Cannot change nick"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:844
+msgstr "별명을 변경할 수 없습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Could not change nick"
-msgstr "대화명을 바꿀 수 없음"
-
-#: src/protocols/irc/msgs.c:865
+msgstr "별명을 변경할 수 없었습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:912
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "%s%s 채널을 나갔음"
-
-#: src/protocols/irc/msgs.c:907
+msgstr "채널 %s%s (으)로부터 이탈했습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:954
 msgid "Error: invalid PONG from server"
-msgstr "오류: 서버에서 잘못된 PONG이 도착"
-
-#: src/protocols/irc/msgs.c:909
+msgstr "오류: 서버로부터의 잘못된 PONG 입니다."
+
+#: ../libgaim/protocols/irc/msgs.c:956
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:984
+msgstr "PING 응답 -- Lag: %lu 초"
+
+#: ../libgaim/protocols/irc/msgs.c:1037
 #, c-format
 msgid "Cannot join %s:"
-msgstr "%s에 참여할 수 없음:"
-
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+msgstr "%s 에 참가할 수 없습니다:"
+
+#: ../libgaim/protocols/irc/msgs.c:1038
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
-msgstr "채널에 참여할 수 없음"
-
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
+msgstr "채널에 참가할 수 없습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:1072
 msgid "Nick or channel is temporarily unavailable."
-msgstr "잠시 서비스가 사용 불가능합니다."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "일시적으로 별명 또는 채널을 이용할 수 없습니다."
+
+#: ../libgaim/protocols/irc/msgs.c:1084
 #, c-format
 msgid "Wallops from %s"
-msgstr ""
-
-#: src/protocols/irc/parse.c:114
+msgstr "%s 님으로부터의 wallops 입니다."
+
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr ""
-
-#: src/protocols/irc/parse.c:115
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-
-#: src/protocols/irc/parse.c:116
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:117
-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 ""
-
-#: src/protocols/irc/parse.c:118
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-
-#: src/protocols/irc/parse.c:119
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-
-#: src/protocols/irc/parse.c:120
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-
-#: src/protocols/irc/parse.c:121
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-
-#: src/protocols/irc/parse.c:123
+msgstr "action &lt;실행할 동작&gt;:  동작을 실행합니다."
+
+#: ../libgaim/protocols/irc/parse.c:117
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [메시지]:  자리 비움 메시지를 설정합니다. 또는 자리 비움으로부터 돌아온 것을 표시하기 위해 설정한 메시지를 해제합니다."
+
+#: ../libgaim/protocols/irc/parse.c:118
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: 명령을 chanserv 로 전송합니다."
+
+#: ../libgaim/protocols/irc/parse.c:119
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;별명1&gt; [별명2] ...:  채널 조작권을 박탈합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:120
+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;별명1&gt; [별명2] ...:  채널 조작권을 박탈하고, 채널이 모더레이트 (+m) 된 경우에 발언하지 않도록 합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:121
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;별명&gt; [대화실]:  지정한 채널 또는 현재의 채널로 초대합니다."
+
+#: ../libgaim/protocols/irc/parse.c:122
+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;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 지정하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
+
+#: ../libgaim/protocols/irc/parse.c:123
+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;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 지정하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
+
+#: ../libgaim/protocols/irc/parse.c:124
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;별명&gt; [메시지]:  채널로부터 퇴출시킵니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:125
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  네트워크 상의 대화실 목록을 표시합니다. <i>경고: 이것을 수행하면 접속을 끊는 서버가 있을 수 있습니다.</i>"
+
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr ""
-
-#: src/protocols/irc/parse.c:124
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-
-#: src/protocols/irc/parse.c:125
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-
-#: src/protocols/irc/parse.c:126
+msgstr "me &lt;실행할 동작&gt;:  지정한 동작을 실행합니다."
+
+#: ../libgaim/protocols/irc/parse.c:127
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: 명령을 memoserv 로 전송합니다."
+
+#: ../libgaim/protocols/irc/parse.c:128
+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;별명|채널&gt;:  채널 또는 사용자 모드를 설정/해제합니다."
+
+#: ../libgaim/protocols/irc/parse.c:129
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과 별도로) 개인 메시지를 보냅니다."
+
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
-
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+msgstr "names [채널]:  채널에 현재 있는 사용자 목록을 표시합니다."
+
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
-
-#: src/protocols/irc/parse.c:128
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:129
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-
-#: src/protocols/irc/parse.c:130
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-
-#: src/protocols/irc/parse.c:131
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-
-#: src/protocols/irc/parse.c:132
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-
-#: src/protocols/irc/parse.c:133
+msgstr "nick &lt;새 별명&gt;:  별명을 변경합니다."
+
+#: ../libgaim/protocols/irc/parse.c:132
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: 명령을 nickserv 로 전송합니다."
+
+#: ../libgaim/protocols/irc/parse.c:133
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;별명1&gt; [별명2] ...:  채널 조작권을 부여합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:134
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 사용할 일이 없을 것 입니다."
+
+#: ../libgaim/protocols/irc/parse.c:135
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: 명령을 operserv 로 전송합니다."
+
+#: ../libgaim/protocols/irc/parse.c:136
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [대화실] [메시지]:  현재의 채널 또는 지정한 채널로부터 메시지를 남기고 퇴장합니다."
+
+#: ../libgaim/protocols/irc/parse.c:137
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [별명]:  사용자 (또는 사용자가 지정하지 않은 경우에는 서버) 와 어느 정도 지연이 있는지 질의합니다."
+
+#: ../libgaim/protocols/irc/parse.c:138
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과는 별도로) 개인 메시지를 보냅니다."
+
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-
-#: src/protocols/irc/parse.c:134
+msgstr "quit [메시지]:  메시지를 남기고 서버와의 접속을 끊습니다."
+
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
-
-#: src/protocols/irc/parse.c:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:136
+msgstr "quote [...]:  서버에 저수준 명령을 보냅니다."
+
+#: ../libgaim/protocols/irc/parse.c:141
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;별명&gt; [메시지]:  대화실로부터 별명의 사람을 퇴출시킵니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
-msgstr ""
-
-#: src/protocols/irc/parse.c:137
+msgstr "time: IRC 서버의 현재 시각 (로컬 타임) 을 표시합니다."
+
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr ""
-
-#: src/protocols/irc/parse.c:138
+msgstr "topic [새 주제]:  채널 주제를 표시하거나 변경합니다."
+
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-
-#: src/protocols/irc/parse.c:139
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:140
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-
-#: src/protocols/irc/parse.c:141
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  사용자 모드를 설정 또는 해제합니다."
+
+#: ../libgaim/protocols/irc/parse.c:145
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [별명]: 사용자에게 CTCP VERSION 요청을 보냅니다."
+
+#: ../libgaim/protocols/irc/parse.c:146
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;별명1&gt; [별명2] ...:  채널 음성 권한을 부여합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+
+#: ../libgaim/protocols/irc/parse.c:147
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 사용할 일이 없을 것 입니다."
+
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-
-#: src/protocols/irc/parse.c:422
+msgstr "whois [서버명] &lt;별명&gt;:  사용자 정보를 가져옵니다."
+
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr ""
-
-#: src/protocols/irc/parse.c:423
+msgstr "%s (으)로부터의 응답 시간: %lu 초"
+
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
-msgstr ""
-
-#: src/protocols/irc/parse.c:423
+msgstr "PONG"
+
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
-msgstr ""
-
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+msgstr "CTCP PING 응답"
+
+#: ../libgaim/protocols/irc/parse.c:554
+#: ../libgaim/protocols/irc/parse.c:558
+#: ../libgaim/protocols/toc/toc.c:191
+#: ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710
+#: ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
-msgstr "끊어짐."
-
-#: src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:53
+msgstr "접속이 끊어졌습니다."
+
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-
-#: src/protocols/jabber/auth.c:114
+msgstr "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니다."
+
+#: ../libgaim/protocols/jabber/auth.c:112
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "서버로부터 유효하지 않은 응답이 왔습니다."
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
+
+#: ../libgaim/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "서버는 비밀번호가 없는 당신을 인증할 수 없었습니다."
+
+#: ../libgaim/protocols/jabber/auth.c:235
+#: ../libgaim/protocols/jabber/auth.c:236
+#: ../libgaim/protocols/jabber/auth.c:404
+#: ../libgaim/protocols/jabber/auth.c:405
+#: ../libgaim/protocols/jabber/auth.c:486
+#: ../libgaim/protocols/jabber/auth.c:487
 msgid "Plaintext Authentication"
-msgstr "암호화없는 인증"
-
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+msgstr "문자열 인증"
+
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:488
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. 이를 허가하고 인증을 계속 하시겠습니까?"
+
+#: ../libgaim/protocols/jabber/auth.c:243
+#: ../libgaim/protocols/jabber/auth.c:414
+#: ../libgaim/protocols/jabber/auth.c:496
 msgid "Server does not use any supported authentication method"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:396
+msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
+
+#. This should never happen!
+#: ../libgaim/protocols/jabber/auth.c:327
+#: ../libgaim/protocols/jabber/auth.c:449
+#: ../libgaim/protocols/jabber/auth.c:617
+#: ../libgaim/protocols/jabber/auth.c:751
+#: ../libgaim/protocols/jabber/auth.c:776
+#: ../libgaim/protocols/jabber/auth.c:795
+#: ../libgaim/protocols/jabber/jabber.c:113
+msgid "Invalid response from server."
+msgstr "서버로부터의 응답이 잘못되었습니다."
+
+#: ../libgaim/protocols/jabber/auth.c:638
 msgid "Invalid challenge from server"
-msgstr "서버로부터 유효하지 않은 시도"
-
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+msgstr "서버로부터의 잘못된 challenge 입니다."
+
+#: ../libgaim/protocols/jabber/auth.c:726
+msgid "SASL error"
+msgstr "SASL 오류"
+
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:783
+#: ../libgaim/protocols/sametime/sametime.c:4148
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
-msgstr "이름"
-
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+msgstr "전체 이름"
+
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/buddy.c:796
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "성"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:800
 msgid "Given Name"
 msgstr "이름"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/jabber.c:842
 msgid "URL"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+msgstr "URL"
+
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:852
 msgid "Street Address"
-msgstr "거리 주소"
-
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+msgstr "주소1"
+
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:848
 msgid "Extended Address"
-msgstr "나머지 주소"
-
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+msgstr "주소2"
+
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:856
 msgid "Locality"
-msgstr "위치"
-
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+msgstr "시/도"
+
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:860
 msgid "Region"
-msgstr "지역"
-
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+msgstr "구/군"
+
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:864
 msgid "Postal Code"
 msgstr "우편번호"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:869
+#: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "국가"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:880
+#: ../libgaim/protocols/jabber/buddy.c:887
 msgid "Telephone"
 msgstr "전화"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:898
+#: ../libgaim/protocols/jabber/buddy.c:906
+#: ../libgaim/protocols/jabber/buddy.c:1564
+#: ../libgaim/protocols/silc/ops.c:1075
+#: ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+msgid "E-Mail"
+msgstr "이메일"
+
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
-msgstr "기관 이름"
-
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+msgstr "조직명"
+
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:925
 msgid "Organization Unit"
-msgstr "기관 부서"
-
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+msgstr "부서"
+
+#: ../libgaim/protocols/jabber/buddy.c:287
+#: ../libgaim/protocols/jabber/buddy.c:934
 msgid "Role"
-msgstr "역할"
-
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+msgstr "직위"
+
+#: ../libgaim/protocols/jabber/buddy.c:288
+#: ../libgaim/protocols/jabber/buddy.c:817
+#: ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/oscar/oscar.c:3743
 msgid "Birthday"
-msgstr "생년월일"
-
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+msgstr "생일"
+
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
-msgstr "Jabber vCard 고치기"
-
-#: src/protocols/jabber/buddy.c:569
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"나열된 모든 항목은 선택사항입니다. 입력해도 무방하다고 생각하는 정보만 입력하"
-"세요."
-
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "재버 아이디"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+msgstr "Jabber vCard 편집"
+
+#: ../libgaim/protocols/jabber/buddy.c:584
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "다음 항목은 모두 선택 사항입니다. 원하는 정보만 입력하십시오."
+
+#: ../libgaim/protocols/jabber/buddy.c:652
+#: ../libgaim/protocols/jabber/buddy.c:691
+msgid "Client"
+msgstr "클라이언트"
+
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/buddy.c:695
+msgid "Operating System"
+msgstr "운영 체제"
+
+#: ../libgaim/protocols/jabber/buddy.c:666
+#: ../libgaim/protocols/jabber/jabber.c:1987
 msgid "Resource"
 msgstr "자원"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../libgaim/protocols/jabber/buddy.c:668
+#: ../libgaim/protocols/jabber/jabber.c:1226
+#: ../libgaim/protocols/jabber/jabber.c:1236
+#: ../libgaim/protocols/jabber/jabber.c:1246
+#: ../libgaim/protocols/jabber/jabber.c:1256
+#: ../libgaim/protocols/jabber/jabber.c:1266
+msgid "Priority"
+msgstr "우선 순위"
+
+#: ../libgaim/protocols/jabber/buddy.c:804
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
-msgstr "중간 이름"
-
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+msgstr "가운데 이름"
+
+#: ../libgaim/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3763
+#: ../libgaim/protocols/oscar/oscar.c:3776
+#: ../libgaim/protocols/qq/buddy_info.c:56
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
-msgstr "거리 주소"
-
-#: src/protocols/jabber/buddy.c:718
+msgstr "주소"
+
+#: ../libgaim/protocols/jabber/buddy.c:844
 msgid "P.O. Box"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:832
+msgstr "사서함"
+
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Photo"
 msgstr "사진"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Logo"
 msgstr "로고"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../libgaim/protocols/jabber/buddy.c:1344
 msgid "Un-hide From"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1038
+msgstr "이곳부터 보이기"
+
+#: ../libgaim/protocols/jabber/buddy.c:1348
 msgid "Temporarily Hide From"
-msgstr ""
+msgstr "일반적으로 이곳부터 숨김"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../libgaim/protocols/jabber/buddy.c:1356
 msgid "Cancel Presence Notification"
-msgstr "정보 표시 취소"
-
-#: src/protocols/jabber/buddy.c:1051
+msgstr "존재 알림을 멈춤"
+
+#: ../libgaim/protocols/jabber/buddy.c:1363
 msgid "(Re-)Request authorization"
-msgstr "인증 (다시)요청"
+msgstr "인증 재요구"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../libgaim/protocols/jabber/buddy.c:1372
 msgid "Unsubscribe"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
-msgid "Error"
-msgstr "오류"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+msgstr "구독 취소"
+
+#: ../libgaim/protocols/jabber/buddy.c:1405
+#: ../libgaim/protocols/jabber/jabber.c:1235
 msgid "Chatty"
-msgstr "채티"
-
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+msgstr "Chatty"
+
+#: ../libgaim/protocols/jabber/buddy.c:1409
+#: ../libgaim/status.c:159
 msgid "Extended Away"
-msgstr "자리비움"
-
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+msgstr "멀리 자리 비움"
+
+#: ../libgaim/protocols/jabber/buddy.c:1411
+#: ../libgaim/protocols/jabber/jabber.c:1265
+#: ../libgaim/protocols/oscar/oscar.c:706
+#: ../libgaim/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/sametime/sametime.c:3319
 msgid "Do Not Disturb"
-msgstr "방해금지"
-
-#: src/protocols/jabber/buddy.c:1235
-msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
-msgid "First Name"
+msgstr "방해하지 말아 주세요."
+
+#: ../libgaim/protocols/jabber/buddy.c:1556
+msgid "JID"
+msgstr "JID"
+
+#: ../libgaim/protocols/jabber/buddy.c:1560
+#: ../libgaim/protocols/jabber/buddy.c:1739
+#: ../libgaim/protocols/oscar/oscar.c:3705
+msgid "Last Name"
 msgstr "성"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
-msgid "Last Name"
-msgstr "이름"
-
-#: src/protocols/jabber/buddy.c:1346
+#: ../libgaim/protocols/jabber/buddy.c:1592
+msgid "The following are the results of your search"
+msgstr "검색 결과입니다."
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libgaim/protocols/jabber/buddy.c:1667
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "지정한 항목에 대한 검색 조건을 입력하여 연락처를 검색합니다. 주: 각 항목은 와일드카드를 사용한 검색(%)을 지원합니다."
+
+#: ../libgaim/protocols/jabber/buddy.c:1687
+msgid "Directory Query Failed"
+msgstr "디렉토리 검색에 실패했습니다."
+
+#: ../libgaim/protocols/jabber/buddy.c:1688
+msgid "Could not query the directory server."
+msgstr "디렉토리 서버를 검색하지 못했습니다."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "서버 정보: %s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1729
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "Jabber 사용자를 검색하려면 하나 이상의 빈 칸을 입력하십시오."
+
+#: ../libgaim/protocols/jabber/buddy.c:1749
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3708
+#: ../libgaim/protocols/oscar/oscar.c:3717
 msgid "E-Mail Address"
-msgstr "메일 주소"
-
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+msgstr "이메일 주소"
+
+#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1759
 msgid "Search for Jabber users"
-msgstr "메일 주소로 친구 찾기"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "Jabber 사용자 검색"
+
+#: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
-msgstr "잘못된 오류"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "디렉토리가 잘못되었습니다."
+
+#: ../libgaim/protocols/jabber/buddy.c:1790
 msgid "Enter a User Directory"
-msgstr "디렉토리는 보낼 수 없습니다."
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "사용자 디렉토리를 입력해 주십시오."
+
+#: ../libgaim/protocols/jabber/buddy.c:1791
 msgid "Select a user directory to search"
-msgstr "질의할 회의 서버 고르기"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "검색할 사용자 디렉토리 선택"
+
+#: ../libgaim/protocols/jabber/buddy.c:1794
 msgid "Search Directory"
-msgstr "찾기(_S):"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "검색할 디렉토리"
+
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5228
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
-msgstr "방(_R):"
-
-#: src/protocols/jabber/chat.c:47
+msgstr "대화실(_R):"
+
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "서버(_S):"
 
-#: src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "핸들(_H):"
 
-#: src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s은(는) 잘못된 방 이름임"
-
-#: src/protocols/jabber/chat.c:224
+msgstr "%s 은(는) 올바른 대화실명이 아닙니다."
+
+#: ../libgaim/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
-msgstr "잘못된 방 이름"
-
-#: src/protocols/jabber/chat.c:229
+msgstr "잘못된 대화실명"
+
+#: ../libgaim/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s은(는) 잘못된 서버 이름임"
-
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+msgstr "%s 은(는) 올바른 서버명이 아닙니다."
+
+#: ../libgaim/protocols/jabber/chat.c:232
+#: ../libgaim/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
-msgstr "잘못된 서버 이름"
-
-#: src/protocols/jabber/chat.c:235
-#, fuzzy, c-format
+msgstr "잘못된 서버명"
+
+#: ../libgaim/protocols/jabber/chat.c:237
+#, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s 은(/는) 잘못된 파일명입니다.\n"
-
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
-#, fuzzy
+msgstr "%s 은(는) 올바른 룸핸들이 아닙니다."
+
+#: ../libgaim/protocols/jabber/chat.c:238
+#: ../libgaim/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
-msgstr "잘못된 그룹 이름"
-
-#: src/protocols/jabber/chat.c:395
+msgstr "잘못된 룸핸들"
+
+#: ../libgaim/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "설정 오류"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../libgaim/protocols/jabber/chat.c:407
+#: ../libgaim/protocols/jabber/chat.c:550
 msgid "Unable to configure"
-msgstr "설정할 수 없음"
-
-#: src/protocols/jabber/chat.c:420
+msgstr "설정할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
-msgstr "방 설정 오류"
-
-#: src/protocols/jabber/chat.c:421
+msgstr "대화실 설정 오류"
+
+#: ../libgaim/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
-msgstr "이 방은 설정할 수 없음"
-
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+msgstr "이 대화실은 설정할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/chat.c:472
+#: ../libgaim/protocols/jabber/chat.c:541
 msgid "Registration error"
-msgstr "가입 오류"
-
-#: src/protocols/jabber/chat.c:628
+msgstr "등록 오류"
+
+#: ../libgaim/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "MUC 대화방이 아니면 별명을 바꿀 수 없음"
-
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
-#, fuzzy
+msgstr "non-MUC 대화실에서의 별명 변경은 지원하지 않고 있습니다."
+
+#: ../libgaim/protocols/jabber/chat.c:680
+#: ../libgaim/protocols/jabber/chat.c:691
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "방 목록을 받는 중 오류"
-
-#: src/protocols/jabber/chat.c:737
+msgstr "대화실 목록 가져오기 중 오류"
+
+#: ../libgaim/protocols/jabber/chat.c:739
 msgid "Invalid Server"
-msgstr "잘못된 서버"
-
-#: src/protocols/jabber/chat.c:775
+msgstr "잘못된 서버명"
+
+#: ../libgaim/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
-msgstr "회의 서버에 입장"
-
-#: src/protocols/jabber/chat.c:776
+msgstr "회의 서버 입력"
+
+#: ../libgaim/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
-msgstr "질의할 회의 서버 고르기"
-
-#: src/protocols/jabber/chat.c:779
+msgstr "질의할 회의 서버 선택"
+
+#: ../libgaim/protocols/jabber/chat.c:787
 msgid "Find Rooms"
-msgstr "방 찾기"
-
-#: src/protocols/jabber/jabber.c:79
+msgstr "대화실 찾기"
+
+#: ../libgaim/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:215
+msgstr "세션 초기화 오류"
+
+#: ../libgaim/protocols/jabber/jabber.c:241
+#: ../libgaim/protocols/jabber/jabber.c:294
+#: ../libgaim/protocols/jabber/jabber.c:322
 msgid "Write error"
 msgstr "쓰기 오류"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../libgaim/protocols/jabber/jabber.c:390
+#: ../libgaim/protocols/jabber/jabber.c:427
 msgid "Read Error"
 msgstr "읽기 오류"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../libgaim/protocols/jabber/jabber.c:504
 msgid "Unable to create socket"
-msgstr "소켓을 만들 수 없음"
-
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+msgstr "소켓을 생성할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:552
+#: ../libgaim/protocols/jabber/jabber.c:895
 msgid "Invalid Jabber ID"
-msgstr "잘못된 재버 아이디"
-
-#: src/protocols/jabber/jabber.c:473
+msgstr "잘못된 Jabber ID"
+
+#: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%s@%s의 등록 성공"
-
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+msgstr "%s@%s 의 등록이 성공적으로 완료되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:626
 msgid "Registration Successful"
-msgstr "등록 성공"
-
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+msgstr "등록 완료"
+
+#: ../libgaim/protocols/jabber/jabber.c:632
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Unknown Error"
 msgstr "알 수 없는 오류"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../libgaim/protocols/jabber/jabber.c:634
+#: ../libgaim/protocols/jabber/jabber.c:635
 msgid "Registration Failed"
-msgstr "가입 실패"
-
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+msgstr "등록 실패"
+
+#: ../libgaim/protocols/jabber/jabber.c:750
+#: ../libgaim/protocols/jabber/jabber.c:751
 msgid "Already Registered"
-msgstr "이미 가입되어 있음"
-
-#: src/protocols/jabber/jabber.c:643
-msgid "E-Mail"
-msgstr "메일"
-
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+msgstr "이미 등록되어 있습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:827
+#: ../libgaim/protocols/oscar/oscar.c:3765
+#: ../libgaim/protocols/oscar/oscar.c:3778
 msgid "State"
-msgstr "시/도"
-
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+msgstr "주"
+
+#: ../libgaim/protocols/jabber/jabber.c:832
+msgid "Postal code"
+msgstr "우편번호"
+
+#: ../libgaim/protocols/jabber/jabber.c:837
+#: ../libgaim/protocols/silc/ops.c:1069
+#: ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
-msgstr "전화번호"
-
-#: src/protocols/jabber/jabber.c:693
+msgstr "전화"
+
+#: ../libgaim/protocols/jabber/jabber.c:847
 msgid "Date"
 msgstr "날짜"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../libgaim/protocols/jabber/jabber.c:855
 msgid "Please fill out the information below to register your new account."
-msgstr "새 계정을 만드려면 아래의 정보를 채워주세요."
-
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+msgstr "새 계정을 등록하려면, 다음의 정보를 모두 입력해 주십시오."
+
+#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libgaim/protocols/jabber/jabber.c:859
 msgid "Register New Jabber Account"
-msgstr "새 재버 계정 등록"
-
-#: src/protocols/jabber/jabber.c:842
+msgstr "새 Jabber 계정 등록"
+
+#: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
-msgstr "스트림 초기화하는 중"
-
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+msgstr "스트림 초기화 중"
+
+#: ../libgaim/protocols/jabber/jabber.c:1030
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
-msgstr "인증 확인 중"
-
-#: src/protocols/jabber/jabber.c:857
+msgstr "인증 중"
+
+#: ../libgaim/protocols/jabber/jabber.c:1039
 msgid "Re-initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+msgstr "스트림 재초기화 중"
+
+#: ../libgaim/protocols/jabber/jabber.c:1109
+#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:5549
 msgid "Not Authorized"
-msgstr "인증 안됨"
-
-#: src/protocols/jabber/jabber.c:971
+msgstr "인증되어 있지 않습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "Both"
-msgstr "서로"
-
-#: src/protocols/jabber/jabber.c:973
+msgstr "둘 다"
+
+#: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:978
+msgstr "From (To pending)"
+
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "To"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:980
+msgstr "To"
+
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "보여주지 않음"
-
-#: src/protocols/jabber/jabber.c:984
+msgstr "None (To pending)"
+
+#: ../libgaim/protocols/jabber/jabber.c:1165
 msgid "Subscription"
-msgstr "등록"
-
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
-msgid "Priority"
-msgstr "포트"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "구독"
+
+#: ../libgaim/protocols/jabber/jabber.c:1295
 msgid "Password Changed"
-msgstr "열쇠글 바꿈"
-
-#: src/protocols/jabber/jabber.c:1094
+msgstr "비밀번호 변경"
+
+#: ../libgaim/protocols/jabber/jabber.c:1296
 msgid "Your password has been changed."
-msgstr "열쇠글을 바꾸었습니다."
-
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+msgstr "비밀번호가 변경되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libgaim/protocols/jabber/jabber.c:1301
 msgid "Error changing password"
-msgstr "열쇠글 바꾸기 오류"
-
-#: src/protocols/jabber/jabber.c:1155
+msgstr "비밀번호 변경 오류"
+
+#: ../libgaim/protocols/jabber/jabber.c:1357
 msgid "Password (again)"
-msgstr "새 열쇠글 (다시)"
-
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+msgstr "비밀번호 (재확인)"
+
+#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Change Jabber Password"
-msgstr "재버 열쇠글 바꾸기"
-
-#: src/protocols/jabber/jabber.c:1161
+msgstr "Jabber 비밀번호 변경"
+
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
-msgstr "새 열쇠글을 입력하세요"
-
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "사용자 정보 설정"
+msgstr "새 비밀번호를 입력해 주십시오."
+
+#: ../libgaim/protocols/jabber/jabber.c:1373
+#: ../libgaim/protocols/oscar/oscar.c:6355
+#: ../libgaim/protocols/silc/silc.c:1019
+msgid "Set User Info..."
+msgstr "사용자 정보 설정..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "열쇠글 바꾸기"
+#: ../libgaim/protocols/jabber/jabber.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:6366
+#: ../libgaim/protocols/silc/silc.c:1015
+msgid "Change Password..."
+msgstr "비밀번호 변경..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "찾기(_S):"
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/jabber/jabber.c:1383
+msgid "Search for Users..."
+msgstr "사용자 검색..."
+
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Bad Request"
-msgstr "잘못된 요청"
-
-#: src/protocols/jabber/jabber.c:1259
+msgstr "잘못된 요구입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Conflict"
-msgstr "충돌"
-
-#: src/protocols/jabber/jabber.c:1261
+msgstr "충돌하고 있습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1463
 msgid "Feature Not Implemented"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1263
+msgstr "아직 지원되지 않습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Forbidden"
-msgstr "숨김"
-
-#: src/protocols/jabber/jabber.c:1265
+msgstr "금지됨"
+
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+msgstr "다운됨"
+
+#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "Internal Server Error"
-msgstr "내부 서버 오류"
-
-#: src/protocols/jabber/jabber.c:1269
+msgstr "서버 내부 오류"
+
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1271
+msgstr "항목을 찾을 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Malformed Jabber ID"
-msgstr "잘못된 재버 아이디"
-
-#: src/protocols/jabber/jabber.c:1273
+msgstr "잘못된 Jabber ID"
+
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1275
+msgstr "수신할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Not Allowed"
-msgstr "허용되지 않음"
-
-#: src/protocols/jabber/jabber.c:1279
+msgstr "허가되지 않았습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1481
 msgid "Payment Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1281
+msgstr "유료입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1483
 msgid "Recipient Unavailable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1285
+msgstr "수신자가 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1487
 msgid "Registration Required"
-msgstr "가입 필요"
-
-#: src/protocols/jabber/jabber.c:1287
+msgstr "등록이 필요합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Remote Server Not Found"
-msgstr "원격 서버를 찾을 수 없음"
-
-#: src/protocols/jabber/jabber.c:1289
+msgstr "리모트 서버를 찾을 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1491
 msgid "Remote Server Timeout"
-msgstr "원격 서버 시간초과"
-
-#: src/protocols/jabber/jabber.c:1291
+msgstr "리모트 서버 시간이 초과되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Server Overloaded"
-msgstr "서버가 가득참"
-
-#: src/protocols/jabber/jabber.c:1293
+msgstr "서버 오버로드입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Service Unavailable"
-msgstr "서비스 불가능"
-
-#: src/protocols/jabber/jabber.c:1295
+msgstr "서비스를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1497
 msgid "Subscription Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1297
+msgstr "구독 신청이 필요합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1499
 msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1304
-#, fuzzy
+msgstr "예상치 못한 요청입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1506
 msgid "Authorization Aborted"
-msgstr "인증이 허락됨"
-
-#: src/protocols/jabber/jabber.c:1306
-#, fuzzy
+msgstr "인증이 거부되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1508
 msgid "Incorrect encoding in authorization"
-msgstr "<i>인증을 기다리고 있지 않음<i>"
-
-#: src/protocols/jabber/jabber.c:1309
+msgstr "인증에서 잘못된 인코딩입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1511
 msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1312
-#, fuzzy
+msgstr "잘못된 authzid 입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1514
 msgid "Invalid Authorization Mechanism"
-msgstr "인증이 거절됨"
-
-#: src/protocols/jabber/jabber.c:1315
-#, fuzzy
+msgstr "잘못된 인증 방식입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1517
 msgid "Authorization mechanism too weak"
-msgstr "인증이 거절됨"
-
-#: src/protocols/jabber/jabber.c:1320
-#, fuzzy
+msgstr "인증 방식이 너무 취약합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Temporary Authentication Failure"
-msgstr "인증 실패."
-
-#: src/protocols/jabber/jabber.c:1322
-#, fuzzy
+msgstr "임시적인 인증에 실패했습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Authentication Failure"
-msgstr "인증 실패."
-
-#: src/protocols/jabber/jabber.c:1326
+msgstr "인증에 실패했습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1328
+msgstr "잘못된 형식입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1331
-#, fuzzy
+msgstr "잘못된 이름 공간의 접두사입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Resource Conflict"
-msgstr "자원"
-
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
-#, fuzzy
+msgstr "자원 충돌"
+
+#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
-msgstr "연결 끊김"
-
-#: src/protocols/jabber/jabber.c:1335
-#, fuzzy
+msgstr "접속 시간이 초과되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Host Gone"
-msgstr "우편번호"
-
-#: src/protocols/jabber/jabber.c:1337
-#, fuzzy
+msgstr "호스트가 다운되었습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Host Unknown"
-msgstr "알려지지 않음"
-
-#: src/protocols/jabber/jabber.c:1339
-#, fuzzy
+msgstr "알 수 없는 호스트입니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "Improper Addressing"
-msgstr "직장 주소"
-
-#: src/protocols/jabber/jabber.c:1343
-#, fuzzy
+msgstr "적절하지 않은 주소 설정"
+
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Invalid ID"
-msgstr "잘못된 사용자"
-
-#: src/protocols/jabber/jabber.c:1345
-#, fuzzy
+msgstr "잘못된 ID"
+
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Invalid Namespace"
-msgstr "잘못된 사용자"
-
-#: src/protocols/jabber/jabber.c:1347
-#, fuzzy
+msgstr "잘못된 이름 공간"
+
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Invalid XML"
-msgstr "잘못된 SNAC"
-
-#: src/protocols/jabber/jabber.c:1349
+msgstr "잘못된 XML"
+
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Non-matching Hosts"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1353
+msgstr "일치하지 않는 호스트"
+
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Policy Violation"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1355
-#, fuzzy
+msgstr "정책 위반"
+
+#: ../libgaim/protocols/jabber/jabber.c:1558
 msgid "Remote Connection Failed"
-msgstr "리모콘"
-
-#: src/protocols/jabber/jabber.c:1357
-#, fuzzy
+msgstr "리모트 접속이 끊어졌습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1560
 msgid "Resource Constraint"
-msgstr "리모콘"
-
-#: src/protocols/jabber/jabber.c:1359
+msgstr "자원 제한"
+
+#: ../libgaim/protocols/jabber/jabber.c:1562
 msgid "Restricted XML"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1361
+msgstr "제한된 XML"
+
+#: ../libgaim/protocols/jabber/jabber.c:1564
 msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1363
-#, fuzzy
+msgstr "다른 호스트 표시"
+
+#: ../libgaim/protocols/jabber/jabber.c:1566
 msgid "System Shutdown"
-msgstr "시스템 로그"
-
-#: src/protocols/jabber/jabber.c:1365
+msgstr "시스템 끄기"
+
+#: ../libgaim/protocols/jabber/jabber.c:1568
 msgid "Undefined Condition"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1367
+msgstr "정의되지 않은 조건"
+
+#: ../libgaim/protocols/jabber/jabber.c:1570
 msgid "Unsupported Encoding"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1369
+msgstr "지원되지 않는 인코딩"
+
+#: ../libgaim/protocols/jabber/jabber.c:1572
 msgid "Unsupported Stanza Type"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1371
+msgstr "지원되지 않는 Stanza 형식"
+
+#: ../libgaim/protocols/jabber/jabber.c:1574
 msgid "Unsupported Version"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1373
+msgstr "지원되지 않는 버전"
+
+#: ../libgaim/protocols/jabber/jabber.c:1576
 msgid "XML Not Well Formed"
-msgstr "XML 양식이 잘못됨"
-
-#: src/protocols/jabber/jabber.c:1375
+msgstr "Well Formed XML 이 아닙니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1578
 msgid "Stream Error"
-msgstr "흐름 오류"
-
-#: src/protocols/jabber/jabber.c:1442
-#, fuzzy, c-format
+msgstr "스트림 오류"
+
+#: ../libgaim/protocols/jabber/jabber.c:1645
+#, c-format
 msgid "Unable to ban user %s"
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+msgstr "사용자 %s 님을 차단할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1665
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "알려지지 않은 명령: %s"
-
-#: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+msgstr "알 수 없는 회원: \"%s\""
+
+#: ../libgaim/protocols/jabber/jabber.c:1670
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/jabber/jabber.c:1521
-#, fuzzy, c-format
+msgstr "사용자 %s 님을 \"%s\" (으)로서 친구에 추가할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1689
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "알 수 없는 역할: \"%s\""
+
+#: ../libgaim/protocols/jabber/jabber.c:1696
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "사용자에게 역할 \"%s\" 을(를) 설정할 수 없습니다: %s"
+
+#: ../libgaim/protocols/jabber/jabber.c:1749
+#, c-format
 msgid "Unable to kick user %s"
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/jabber/jabber.c:1547
-#, fuzzy
+msgstr "사용자 %s 님을 차단할 수 없습니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "config:  Configure a chat room."
-msgstr "대화실에 참여"
-
-#: src/protocols/jabber/jabber.c:1551
-#, fuzzy
+msgstr "config:  대화실을 설정합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1784
 msgid "configure:  Configure a chat room."
-msgstr "대화실에 참여"
-
-#: src/protocols/jabber/jabber.c:1560
+msgstr "configure:  대화실을 설정합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1793
 msgid "part [room]:  Leave the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1565
+msgstr "part [대화실]:  대화실로부터 나갑니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1798
 msgid "register:  Register with a chat room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1571
+msgstr "register:  대화실을 등록합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1804
 msgid "topic [new topic]:  View or change the topic."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1577
+msgstr "topic [새 주제]:  주제를 표시 또는 변경합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1810
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1583
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1589
+msgstr "ban &lt;사용자&gt; [대화실]:  지정한 대화실로부터 사용자를 차단합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1816
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;사용자&gt; &lt;owner|admin|member|outcast|none&gt;: 사용자 관계를 설정합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1822
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;사용자&gt; &lt;moderator|participant|visitor|none&gt;: 대화실에서 역할을 설정합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1828
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1595
+msgstr "invite &lt;사용자&gt; [메시지]:  사용자를 대화실로 초대합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1834
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1601
+msgstr "join: &lt;대화실&gt; [서버]:  지정한 서버의 대화에 참가합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1840
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1606
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
+msgstr "kick &lt;사용자&gt; [대화실]:  지정한 서버를 대화실로부터 차단합니다."
+
+#: ../libgaim/protocols/jabber/jabber.c:1845
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;사용자&gt; &lt;메시지&gt;:  다른 사용자에게 개인적인 메시지를 보냅니다."
 
 #. *< type
 #. *< ui_requirement
@@ -6283,610 +8983,711 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../libgaim/protocols/jabber/jabber.c:1962
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Jabber Protocol Plugin"
-msgstr "Jabber 프로토콜 플러그인"
-
-#: src/protocols/jabber/jabber.c:1714
-msgid "Use TLS if available"
-msgstr "가능하면 TLS 사용"
-
-#: src/protocols/jabber/jabber.c:1719
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "Jabber 플러그인 프로토콜"
+
+#: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
-msgstr "임의로 구형 SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "구 SSL (포트 번호: 5223) 을 강제적으로 사용"
+
+#: ../libgaim/protocols/jabber/jabber.c:1995
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "암호화되지 않은 스트림으로 평문 인증정보 전달 허용"
-
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
+msgstr "암호화 되어 있지 않은 스트림을 통한 문자열 인증 허가"
+
+#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Connect port"
-msgstr "연결"
+msgstr "접속할 포트 번호"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../libgaim/protocols/jabber/jabber.c:2004
+#: ../libgaim/protocols/silc/silc.c:1852
 msgid "Connect server"
-msgstr "서버 연결"
-
-#: src/protocols/jabber/message.c:114
-#, fuzzy, c-format
+msgstr "서버에 접속"
+
+#: ../libgaim/protocols/jabber/message.c:117
+#, c-format
 msgid "Message from %s"
-msgstr "메시지 로그"
-
-#: src/protocols/jabber/message.c:178
-#, fuzzy, c-format
+msgstr "%s 님으로부터의 메시지"
+
+#: ../libgaim/protocols/jabber/message.c:181
+#, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s님이 주제를 바꿈: %s"
-
-#: src/protocols/jabber/message.c:180
-#, fuzzy, c-format
+msgstr "%s 은(는) 주제를 설정했습니다: %s"
+
+#: ../libgaim/protocols/jabber/message.c:183
+#, c-format
 msgid "The topic is: %s"
-msgstr "현재 토픽: %s"
-
-#: src/protocols/jabber/message.c:230
+msgstr "주제: %s"
+
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr ""
-
-#: src/protocols/jabber/message.c:233
-#, fuzzy
+msgstr "%s 님에게의 메시지 전송 실패: %s"
+
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
-msgstr "재버 오류"
-
-#: src/protocols/jabber/message.c:297
+msgstr "Jabber 메시지 오류"
+
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
-msgstr ""
-
-#: src/protocols/jabber/parser.c:131
-#, fuzzy
+msgstr " (코드 %s)"
+
+#: ../libgaim/protocols/jabber/parser.c:192
 msgid "XML Parse error"
-msgstr "쓰기 오류"
-
-#: src/protocols/jabber/presence.c:284
+msgstr "XML 해석 오류"
+
+#: ../libgaim/protocols/jabber/presence.c:280
 msgid "Unknown Error in presence"
-msgstr "알 수 없는 에러 발생"
-
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "%s(%s)님이 %s님을 친구 목록에 등록하려고 합니다."
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "인증"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "거부"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+msgstr "알 수 없는 오류가 발생했습니다."
+
+#: ../libgaim/protocols/jabber/presence.c:354
+#: ../libgaim/protocols/jabber/presence.c:355
 msgid "Create New Room"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:347
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:388
-#, fuzzy, c-format
+msgstr "새 대화실 만들기"
+
+#: ../libgaim/protocols/jabber/presence.c:356
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "새 대화실을 생성합니다. 대화실을 설정하시겠습니까? 아니면 기본값을 적용하시겠습니까?"
+
+#: ../libgaim/protocols/jabber/presence.c:359
+msgid "_Configure Room"
+msgstr "대화실 설정(_C)"
+
+#: ../libgaim/protocols/jabber/presence.c:361
+msgid "_Accept Defaults"
+msgstr "기본값 적용(_A)"
+
+#: ../libgaim/protocols/jabber/presence.c:399
+#, c-format
 msgid "Error in chat %s"
-msgstr "이미지 저장 오류: %s"
-
-#: src/protocols/jabber/presence.c:391
+msgstr "대화 %s 에서 오류"
+
+#: ../libgaim/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
-msgstr "%s 대화실 참가 오류"
-
-#: src/protocols/jabber/si.c:591
+msgstr "대화 %s 에 참가하는 중 오류"
+
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+msgstr "%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
+
+#: ../libgaim/protocols/jabber/si.c:766
+#: ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
-msgstr "파일 보내기 실패"
-
-#: src/protocols/msn/dialog.c:91
+msgstr "파일 전송 실패"
+
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%s 계정의 친구 목록 동기화 문제 (%s)"
-
-#: src/protocols/msn/dialog.c:97
-#, 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님이 내부 목록에는 \"%s\" 그룹에 있지만 서버에서는 들어있지 않습니다. 친구 "
-"추가할까요?"
-
-#: src/protocols/msn/dialog.c:105
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-
-#: src/protocols/msn/error.c:35
+msgstr "%s (%s) 에서 친구 목록의 동기가 발생했습니다."
+
+#: ../libgaim/protocols/msn/dialog.c:116
+#, c-format
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "로컬 친구 목록에 기록되어 있는 %s 님은 그룹 \"%s\" 에 소속되어 있으나, 서버 상의 목록에서는 그렇게 되어 있지 않습니다. 서버 상의 목록에 그 친구를 추가하시겠습니까?"
+
+#: ../libgaim/protocols/msn/dialog.c:124
+#, c-format
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "로컬 친구 목록에 기술되어 있는 %s 님은 서버 상의 목록에 존재하지 않습니다. 서버 상의 목록에 그 친구를 추가하시겠습니까?"
+
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
-msgstr "메시지를 분석할 수 없음"
-
-#: src/protocols/msn/error.c:38
+msgstr "메시지를 해독할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "구문 오류 (게임의 버그일 수 있음)"
-
-#: src/protocols/msn/error.c:42
+msgstr "문법 오류 (아마도 Pidgin의 버그일 수 있습니다.)"
+
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "잘못된 메일 주소"
-
-#: src/protocols/msn/error.c:45
+msgstr "이메일 주소가 잘못되었습니다."
+
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
-msgstr "사용자가 없음"
-
-#: src/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
-msgstr "도메인 이름이 빠졌음"
-
-#: src/protocols/msn/error.c:52
-msgid "Already Logged In"
-msgstr "이미 연결됨"
-
-#: src/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "잘못된 사용자 이름"
-
-#: src/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
-msgstr "잘못된 대화명"
-
-#: src/protocols/msn/error.c:61
-msgid "List Full"
-msgstr "목록이 꽉참"
-
-#: src/protocols/msn/error.c:64
+msgstr "사용자가 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:49
+msgid "Fully qualified domain name missing"
+msgstr "FQDN (Fully Qualified Domain Name) 이 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:52
+msgid "Already logged in"
+msgstr "이미 로그인되어 있습니다."
+
+#: ../libgaim/protocols/msn/error.c:55
+msgid "Invalid screen name"
+msgstr "잘못된 아이디입니다."
+
+#: ../libgaim/protocols/msn/error.c:58
+msgid "Invalid friendly name"
+msgstr "잘못된 공개명입니다."
+
+#: ../libgaim/protocols/msn/error.c:61
+msgid "List full"
+msgstr "목록이 가득 찼습니다."
+
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
-msgstr "이미 있음"
-
-#: src/protocols/msn/error.c:67
+msgstr "이미 거기에 있습니다."
+
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
-msgstr "목록에 없음"
-
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+msgstr "목록에 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
-msgstr "사용자가 접속중이 아님"
-
-#: src/protocols/msn/error.c:73
+msgstr "사용자는 오프라인입니다."
+
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
-msgstr "이미 해당 모드에 있음"
-
-#: src/protocols/msn/error.c:76
+msgstr "이미 그 모드입니다."
+
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
-msgstr "이미 반대 목록에 있음"
-
-#: src/protocols/msn/error.c:79
+msgstr "이미 목록의 반대편에 있습니다."
+
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
-msgstr "그룹이 너무 많음"
-
-#: src/protocols/msn/error.c:82
+msgstr "그룹이 너무 많습니다."
+
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
-msgstr "잘못된 그룹"
-
-#: src/protocols/msn/error.c:85
+msgstr "잘못된 그룹명입니다."
+
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
-msgstr "사용자가 그룹에 없음"
-
-#: src/protocols/msn/error.c:88
+msgstr "사용자가 그룹에 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
-msgstr "그룹 이름이 너무 김"
-
-#: src/protocols/msn/error.c:91
+msgstr "그룹명이 너무 깁니다."
+
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
-msgstr "0번 그룹을 지울 수 없음"
-
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "존재하지 않는 그룹에 연락처를 만들려고함"
-
-#: src/protocols/msn/error.c:99
+msgstr "그룹 0 은 삭제할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:95
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "존재하지 않는 그룹에 사용자를 추가하려고 했습니다."
+
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
-msgstr "스위치보드 실패"
-
-#: src/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
-msgstr "전송 알림 실패"
-
-#: src/protocols/msn/error.c:106
+msgstr "Switchboard 에 실패했습니다."
+
+#: ../libgaim/protocols/msn/error.c:102
+msgid "Notify transfer failed"
+msgstr "알림 전송에 실패했습니다."
+
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
-msgstr "필수 항목이 빠졌음"
-
-#: src/protocols/msn/error.c:109
+msgstr "필요한 파일이 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
-msgstr "FND를 너무 많이 받음"
-
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+msgstr "FND 에 너무 많이 히트했습니다."
+
+#: ../libgaim/protocols/msn/error.c:112
+#: ../libgaim/protocols/oscar/oscar.c:118
 msgid "Not logged in"
-msgstr "접속되지 않음"
-
-#: src/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
-msgstr "서비스를 일시적으로 사용할 수 없음"
-
-#: src/protocols/msn/error.c:119
+msgstr "로그인되어 있지 않습니다."
+
+#: ../libgaim/protocols/msn/error.c:116
+msgid "Service temporarily unavailable"
+msgstr "일시적으로 서비스를 사용할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "데이터베이스 서버 오류"
 
-#: src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
-msgstr "명령을 사용할 수 없음"
-
-#: src/protocols/msn/error.c:125
+msgstr "명령을 사용할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
-msgstr "파일 처리 오류"
-
-#: src/protocols/msn/error.c:128
+msgstr "파일 조작 오류"
+
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "메모리 할당 오류"
 
-#: src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
-msgstr "서버로 잘못된 CHL을 보냄"
-
-#: src/protocols/msn/error.c:135
+msgstr "잘못된 CHL 값이 서버에 전송되었습니다."
+
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "서버 바쁨"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138
+#: ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
-msgstr "서버에 연결할 수 없음"
-
-#: src/protocols/msn/error.c:141
-msgid "Peer Notification server down"
-msgstr "피어 알림 서버가 다운됨"
-
-#: src/protocols/msn/error.c:144
+msgstr "서버를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:141
+msgid "Peer notification server down"
+msgstr "Peer 알림 서버가 다운되었습니다."
+
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
-msgstr "데이터베이스 연결 오류"
-
-#: src/protocols/msn/error.c:148
+msgstr "데이터베이스 접속 오류"
+
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
-msgstr "서버가 곧 다운됨"
-
-#: src/protocols/msn/error.c:155
+msgstr "서버가 다운되고 있습니다."
+
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
-msgstr "연결중 오류 발생"
-
-#: src/protocols/msn/error.c:159
+msgstr "접속 생성 중 오류"
+
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "잘못되었거나 허용되지 않은 CVR 변수"
-
-#: src/protocols/msn/error.c:162
+msgstr "CVR 인수가 알 수 없거나 허가되지 않았습니다."
+
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
-msgstr "쓸 수 없습니다."
-
-#: src/protocols/msn/error.c:165
+msgstr "기록할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
-msgstr "세션 부하가 너무 큼"
-
-#: src/protocols/msn/error.c:168
+msgstr "세션의 부하가 초과되었습니다."
+
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
-msgstr "사용자가 너무 활동적임"
-
-#: src/protocols/msn/error.c:171
+msgstr "사용자가 너무 활동적입니다."
+
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "세션이 너무 많습니다."
 
-#: src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
-msgstr "패스포트 계정이 인증되지 않음"
-
-#: src/protocols/msn/error.c:177
+msgstr "패스포트가 인증되어 있지 않습니다."
+
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "잘못된 친구 파일"
 
-#: src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
-msgstr "예상치 못함"
-
-#: src/protocols/msn/error.c:185
+msgstr "예상치 못한 데이터"
+
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
-msgstr "너무 자주 친구 이름을 바꿈"
-
-#: src/protocols/msn/error.c:194
+msgstr "공개명이 너무 짧습니다."
+
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
-msgstr "서버가 바쁨"
-
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+msgstr "서버가 너무 바쁩니다."
+
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1355
+#: ../libgaim/protocols/silc/ops.c:1718
+#: ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
-msgstr "인증 실패"
-
-#: src/protocols/msn/error.c:201
+msgstr "인증에 실패했습니다."
+
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
-msgstr "오프라인일 때 허용 안함"
-
-#: src/protocols/msn/error.c:209
+msgstr "오프라인일 때에는 허가되지 않았습니다."
+
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
-msgstr "새로운 사용자를 허용하지 않음"
-
-#: src/protocols/msn/error.c:213
+msgstr "새 사용자를 접수할 수 없습니다."
+
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
-msgstr "부모의 승락을 받지 않은 아동 패스포트"
-
-#: src/protocols/msn/error.c:217
+msgstr "부모의 승인이 없는 어린이 패스포트입니다."
+
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
-msgstr "패스포트 계정이 아직 인증되지 않음"
-
-#: src/protocols/msn/error.c:220
+msgstr "아직 패스포트 계정은 확인되지 않았습니다."
+
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "잘못된 티켓"
 
-#: src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "알 수 없는 에러 코드 %d"
-
-#: src/protocols/msn/error.c:236
+msgstr "알 수 없는 오류 코드 %d"
+
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 오류: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:111
 msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: src/protocols/msn/msn.c:138
+msgstr "지금 신호를 전송했습니다!"
+
+#: ../libgaim/protocols/msn/msn.c:136
 msgid "Your new MSN friendly name is too long."
-msgstr "새로운 MSN 대화명이 너무 깁니다."
-
-#: src/protocols/msn/msn.c:246
+msgstr "새 MSN 의 공개명이 너무 깁니다."
+
+#: ../libgaim/protocols/msn/msn.c:244
 msgid "Set your friendly name."
-msgstr "대화명 입력하세요."
-
-#: src/protocols/msn/msn.c:247
+msgstr "공개명을 설정해 주십시오."
+
+#: ../libgaim/protocols/msn/msn.c:245
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "이것은 다른 MSN 친구들에게 보여지는 이름입니다."
-
-#: src/protocols/msn/msn.c:263
+msgstr "MSN 의 다른 친구가 나를 볼 때 표시되는 이름입니다."
+
+#: ../libgaim/protocols/msn/msn.c:261
 msgid "Set your home phone number."
-msgstr "집 전화번호를 넣으십시오."
-
-#: src/protocols/msn/msn.c:278
+msgstr "자택 전화번호를 설정해 주십시오."
+
+#: ../libgaim/protocols/msn/msn.c:276
 msgid "Set your work phone number."
-msgstr "직장 전화번호를 넣으십시오."
-
-#: src/protocols/msn/msn.c:293
+msgstr "직장 전화번호를 설정해 주십시오."
+
+#: ../libgaim/protocols/msn/msn.c:291
 msgid "Set your mobile phone number."
-msgstr "핸드폰 번호를 넣으십시오."
-
-#: src/protocols/msn/msn.c:306
+msgstr "이동 전화번호를 설정해 주십시오."
+
+#: ../libgaim/protocols/msn/msn.c:304
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN 호출을 허용할까요?"
-
-#: src/protocols/msn/msn.c:307
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"내 친구 목록의 사람들이 핸드폰이나 다른 모바일 기기로 MSN 호출을 보내도록 허"
-"용하겠습니까?"
-
-#: src/protocols/msn/msn.c:311
+msgstr "MSN 모바일 호출을 허가하시겠습니까?"
+
+#: ../libgaim/protocols/msn/msn.c:305
+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 "친구가 휴대 전화 등의 모바일 기기에 MSN 모바일 호출을 전송하는 것을 허가하시겠습니까?"
+
+#: ../libgaim/protocols/msn/msn.c:309
 msgid "Allow"
-msgstr "허용"
-
-#: src/protocols/msn/msn.c:312
+msgstr "허가"
+
+#: ../libgaim/protocols/msn/msn.c:310
 msgid "Disallow"
-msgstr "불가"
-
-#: src/protocols/msn/msn.c:328
+msgstr "허가하지 않음"
+
+#: ../libgaim/protocols/msn/msn.c:326
 msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: src/protocols/msn/msn.c:354
+msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
+
+#: ../libgaim/protocols/msn/msn.c:352
 msgid "Send a mobile message."
-msgstr "문자 메시지를 보냅니다."
-
-#: src/protocols/msn/msn.c:356
+msgstr "모바일 메시지를 전송합니다."
+
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Page"
-msgstr "페이지"
-
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr "<b>상태:</b> %s"
-
-#: src/protocols/msn/msn.c:551
+msgstr "호출"
+
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
-msgstr "친구 등록"
-
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+msgstr "내가 등록됨"
+
+#: ../libgaim/protocols/msn/msn.c:583
+#: ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:3460
 msgid "Be Right Back"
-msgstr "곧 돌아옴"
-
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
-msgstr "통화 중"
-
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
-msgstr "밥먹으러 감"
-
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "숨김"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "대화명 입력"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "집 전화번호 입력"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "직장 전화번호 입력"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "핸드폰 번호 설정"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "휴대기기 사용가능/불가"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "호출 허용/불가"
-
-#: src/protocols/msn/msn.c:647
+msgstr "곧 돌아옵니다."
+
+#: ../libgaim/protocols/msn/msn.c:587
+#: ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2857
+#: ../libgaim/protocols/novell/novell.c:2987
+#: ../libgaim/protocols/silc/buddy.c:1473
+#: ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2858
+#: ../libgaim/protocols/yahoo/yahoo.c:3463
+msgid "Busy"
+msgstr "다른 용무 중입니다."
+
+#: ../libgaim/protocols/msn/msn.c:591
+#: ../libgaim/protocols/yahoo/yahoo.c:2866
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
+msgid "On the Phone"
+msgstr "전화 중입니다."
+
+#: ../libgaim/protocols/msn/msn.c:595
+#: ../libgaim/protocols/yahoo/yahoo.c:2870
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
+msgid "Out to Lunch"
+msgstr "점심 식사 중입니다."
+
+#: ../libgaim/protocols/msn/msn.c:619
+msgid "Set Friendly Name..."
+msgstr "공개명 설정..."
+
+#: ../libgaim/protocols/msn/msn.c:624
+msgid "Set Home Phone Number..."
+msgstr "자택 전화번호 설정..."
+
+#: ../libgaim/protocols/msn/msn.c:628
+msgid "Set Work Phone Number..."
+msgstr "직장 전화번호 설정..."
+
+#: ../libgaim/protocols/msn/msn.c:632
+msgid "Set Mobile Phone Number..."
+msgstr "휴대 전화번호 설정..."
+
+#: ../libgaim/protocols/msn/msn.c:638
+msgid "Enable/Disable Mobile Devices..."
+msgstr "모바일 기기 사용/사용 안 함..."
+
+#: ../libgaim/protocols/msn/msn.c:643
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "모바일 호출 허가/허가 안 함..."
+
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "Hotmail의 받은 편지함 열기"
+
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
-msgstr "핸드폰으로 보내기"
-
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+msgstr "모바일 기기에 전송"
+
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3443
 msgid "Initiate _Chat"
 msgstr "대화 시작(_C)"
 
-#: src/protocols/msn/msn.c:717
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-
-#: src/protocols/msn/msn.c:745
-#, fuzzy
+#: ../libgaim/protocols/msn/msn.c:725
+msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "MSN 에서는 SSL 지원이 필요합니다. 지원하는 SSL 라이브러리를 설치해 주십시오. 자세한 정보는 http://pidgin.sf.net/faq-ssl.php 를 참조해 주십시오."
+
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
-msgstr "서버에 연결할 수 없습니다."
-
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>별칭:</b> %s<br>"
-
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
-#, fuzzy, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>상태:</b> %s"
-
-#: src/protocols/msn/msn.c:1471
-#, fuzzy
-msgid "MSN Profile"
-msgstr "프로필 설정"
-
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+msgstr "서버 접속에 실패했습니다."
+
+#: ../libgaim/protocols/msn/msn.c:1461
+#: ../libgaim/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
-msgstr "프로필을 받는 중 오류"
-
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+msgstr "프로파일을 가져오는 중 오류"
+
+#: ../libgaim/protocols/msn/msn.c:1539
+#: ../libgaim/protocols/oscar/oscar.c:3749
+#: ../libgaim/protocols/qq/buddy_info.c:45
+#: ../libgaim/protocols/qq/qq.c:219
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
-msgstr "나이"
-
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "성별"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
-msgid "Marital Status"
-msgstr "결혼여부"
-
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
+msgstr "연령"
+
+#: ../libgaim/protocols/msn/msn.c:1541
+#: ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+msgid "Occupation"
+msgstr "직업"
+
+#: ../libgaim/protocols/msn/msn.c:1542
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
+#: ../libgaim/protocols/zephyr/zephyr.c:799
+#: ../libgaim/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "위치"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Occupation"
+#: ../libgaim/protocols/msn/msn.c:1547
+#: ../libgaim/protocols/msn/msn.c:1739
+#: ../libgaim/protocols/msn/msn.c:1745
+#: ../libgaim/protocols/msn/msn.c:1752
+msgid "Hobbies and Interests"
+msgstr "취미와 관심 분야"
+
+#: ../libgaim/protocols/msn/msn.c:1553
+#: ../libgaim/protocols/msn/msn.c:1673
+#: ../libgaim/protocols/msn/msn.c:1679
+#: ../libgaim/protocols/msn/msn.c:1686
+#: ../libgaim/protocols/msn/msn.c:1694
+#: ../libgaim/protocols/msn/msn.c:1701
+msgid "A Little About Me"
+msgstr "간단 소개"
+
+#: ../libgaim/protocols/msn/msn.c:1570
+msgid "Social"
+msgstr "파티"
+
+#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+msgid "Marital Status"
+msgstr "기혼/미혼"
+
+#: ../libgaim/protocols/msn/msn.c:1573
+msgid "Interests"
+msgstr "취미"
+
+#: ../libgaim/protocols/msn/msn.c:1574
+msgid "Pets"
+msgstr "애완동물"
+
+#: ../libgaim/protocols/msn/msn.c:1575
+msgid "Hometown"
+msgstr "출신지"
+
+#: ../libgaim/protocols/msn/msn.c:1576
+msgid "Places Lived"
+msgstr "현주소"
+
+#: ../libgaim/protocols/msn/msn.c:1577
+msgid "Fashion"
+msgstr "패션"
+
+#: ../libgaim/protocols/msn/msn.c:1578
+msgid "Humor"
+msgstr "유머"
+
+#: ../libgaim/protocols/msn/msn.c:1579
+msgid "Music"
+msgstr "음악"
+
+#: ../libgaim/protocols/msn/msn.c:1580
+#: ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1767
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+msgid "Favorite Quote"
+msgstr "좌우명"
+
+#: ../libgaim/protocols/msn/msn.c:1597
+msgid "Contact Info"
+msgstr "연락처 정보"
+
+#: ../libgaim/protocols/msn/msn.c:1598
+msgid "Personal"
+msgstr "개인"
+
+#: ../libgaim/protocols/msn/msn.c:1601
+msgid "Significant Other"
+msgstr "소중한 사람"
+
+#: ../libgaim/protocols/msn/msn.c:1602
+msgid "Home Phone"
+msgstr "자택 전화1"
+
+#: ../libgaim/protocols/msn/msn.c:1603
+msgid "Home Phone 2"
+msgstr "자택 전화2"
+
+#: ../libgaim/protocols/msn/msn.c:1604
+#: ../libgaim/protocols/oscar/oscar.c:3768
+msgid "Home Address"
+msgstr "자택 주소"
+
+#: ../libgaim/protocols/msn/msn.c:1605
+msgid "Personal Mobile"
+msgstr "휴대 전화"
+
+#: ../libgaim/protocols/msn/msn.c:1606
+msgid "Home Fax"
+msgstr "자택 팩스"
+
+#: ../libgaim/protocols/msn/msn.c:1607
+msgid "Personal E-Mail"
+msgstr "개인 이메일"
+
+#: ../libgaim/protocols/msn/msn.c:1608
+msgid "Personal IM"
+msgstr "개인 메신저"
+
+#: ../libgaim/protocols/msn/msn.c:1610
+msgid "Anniversary"
+msgstr "기념일"
+
+#. Business
+#: ../libgaim/protocols/msn/msn.c:1626
+msgid "Work"
+msgstr "직종"
+
+#: ../libgaim/protocols/msn/msn.c:1628
+#: ../libgaim/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "직위"
+
+#: ../libgaim/protocols/msn/msn.c:1629
+#: ../libgaim/protocols/oscar/oscar.c:3789
+msgid "Company"
+msgstr "회사"
+
+#: ../libgaim/protocols/msn/msn.c:1630
+#: ../libgaim/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "부서"
+
+#: ../libgaim/protocols/msn/msn.c:1631
+msgid "Profession"
 msgstr "직업"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
-msgid "A Little About Me"
-msgstr "소개"
-
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: ../libgaim/protocols/msn/msn.c:1632
+msgid "Work Phone"
+msgstr "회사 전화1"
+
+#: ../libgaim/protocols/msn/msn.c:1633
+msgid "Work Phone 2"
+msgstr "회사 전화2"
+
+#: ../libgaim/protocols/msn/msn.c:1634
+#: ../libgaim/protocols/oscar/oscar.c:3781
+msgid "Work Address"
+msgstr "회사 주소"
+
+#: ../libgaim/protocols/msn/msn.c:1635
+msgid "Work Mobile"
+msgstr "회사 휴대 전화"
+
+#: ../libgaim/protocols/msn/msn.c:1636
+msgid "Work Pager"
+msgstr "회사 호출기"
+
+#: ../libgaim/protocols/msn/msn.c:1637
+msgid "Work Fax"
+msgstr "회사 팩스"
+
+#: ../libgaim/protocols/msn/msn.c:1638
+msgid "Work E-Mail"
+msgstr "회사 이메일"
+
+#: ../libgaim/protocols/msn/msn.c:1639
+msgid "Work IM"
+msgstr "회사 메신저"
+
+#: ../libgaim/protocols/msn/msn.c:1640
+msgid "Start Date"
+msgstr "시작 일자"
+
+#: ../libgaim/protocols/msn/msn.c:1710
+#: ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1723
+#: ../libgaim/protocols/msn/msn.c:1730
 msgid "Favorite Things"
 msgstr "좋아하는 것"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
-msgid "Hobbies and Interests"
-msgstr "취미/흥미"
-
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
-msgid "Favorite Quote"
-msgstr "좋아하는 문구"
-
-#: src/protocols/msn/msn.c:1696
+#: ../libgaim/protocols/msn/msn.c:1775
 msgid "Last Updated"
-msgstr "최종 갱신"
-
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+msgstr "마지막 갱신일"
+
+#: ../libgaim/protocols/msn/msn.c:1786
+#: ../libgaim/protocols/qq/buddy_info.c:60
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "홈페이지"
 
-#: src/protocols/msn/msn.c:1729
+#: ../libgaim/protocols/msn/msn.c:1807
 msgid "The user has not created a public profile."
-msgstr "이 사용자는 공개 프로필을 만들지 않았습니다."
-
-#: src/protocols/msn/msn.c:1730
-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 ""
-
-#: src/protocols/msn/msn.c:1734
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+msgstr "이 사용자는 프로파일을 공개하지 않았습니다."
+
+#: ../libgaim/protocols/msn/msn.c:1808
+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 이 보고했습니다. 이것은 그 사용자가 존재하지 않거나 혹은 공개하지 않았기 때문입니다."
+
+#: ../libgaim/protocols/msn/msn.c:1812
+msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Pidgin이 사용자 프로파일로부터 정보를 가져오지 못했습니다. 그 사용자는 존재하지 않는 것으로 판단됩니다."
+
+#: ../libgaim/protocols/msn/msn.c:1820
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
-msgstr "프로필 URL"
+msgstr "프로파일 URL"
 
 #. *< type
 #. *< ui_requirement
@@ -6898,294 +9699,651 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2037
 msgid "MSN Protocol Plugin"
 msgstr "MSN 프로토콜 플러그인"
 
-#: src/protocols/msn/msn.c:1963
-msgid "Login server"
-msgstr "로그인 서버"
-
-#: src/protocols/msn/msn.c:1972
+#: ../libgaim/protocols/msn/msn.c:2065
 msgid "Use HTTP Method"
-msgstr "HTTP 방식 사용"
-
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
-msgstr ""
-
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+msgstr "HTTP 방식 이용"
+
+#: ../libgaim/protocols/msn/msn.c:2070
+msgid "Show custom smileys"
+msgstr "사용자 이모티콘 표시"
+
+#: ../libgaim/protocols/msn/msn.c:2078
+msgid "nudge: nudge a user to get their attention"
+msgstr "신호: 사용자를 향해 경고음 발생"
+
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
-msgstr "연결할 수 없습니다"
-
-#: src/protocols/msn/notification.c:178
-#, fuzzy, c-format
+msgstr "접속할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:178
+#, c-format
 msgid "%s is not a valid group."
-msgstr "%s은(는) 잘못된 방 이름임"
-
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
-#, fuzzy
+msgstr "%s 은(는) 올바은 그룹이 아닙니다."
+
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
-msgstr "알 수 없는 에러"
-
-#: src/protocols/msn/notification.c:187
-#, fuzzy, c-format
+msgstr "알 수 없는 오류입니다."
+
+#: ../libgaim/protocols/msn/notification.c:187
+#, c-format
 msgid "%s on %s (%s)"
-msgstr "%s님이 %s 파일을 보내려고 함(%s)"
-
-#: src/protocols/msn/notification.c:498
-#, fuzzy, c-format
+msgstr "%2$s (%3$s) 의 %1$s"
+
+#: ../libgaim/protocols/msn/notification.c:498
+#, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/msn/notification.c:502
-#, fuzzy, c-format
+msgstr "%s (%s) 사용자를 추가할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:502
+#, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/msn/notification.c:506
-#, fuzzy, c-format
+msgstr "%s (%s) 사용자를 차단할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:506
+#, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/msn/notification.c:514
+msgstr "%s (%s) 사용자를 허가할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#: src/protocols/msn/notification.c:523
-#, fuzzy, c-format
+msgstr "친구 목록이 가득 차서, %s 님을 추가할 수 없었습니다."
+
+#: ../libgaim/protocols/msn/notification.c:523
+#, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s은(는) 잘못된 서버 이름임"
-
-#: src/protocols/msn/notification.c:815
-#, fuzzy
+msgstr "%s 님의 패스포트 계정이 올바르지 않습니다."
+
+#: ../libgaim/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "서비스를 일시적으로 이용할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
-msgstr "읽을 수 없음"
-
-#: src/protocols/msn/notification.c:870
-#, fuzzy
+msgstr "그룹명을 변경할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
-msgstr "소켓을 만들 수 없음"
-
-#: src/protocols/msn/notification.c:1303
+msgstr "그룹을 삭제할 수 없습니다."
+
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
+"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
+"\n"
+"유지보수가 완료되면 다시 접속이 가능합니다."
 msgstr[1] ""
-
-#: src/protocols/msn/servconn.c:129
+"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
+"\n"
+"유지보수가 완료되면 다시 접속이 가능합니다."
+
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
-msgstr "쓰기 오류"
-
-#: src/protocols/msn/servconn.c:131
+msgstr "쓰는 중 오류"
+
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
-msgstr "읽기 오류"
-
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "알 수 없는 오류"
-
-#: src/protocols/msn/servconn.c:136
+msgstr "읽는 중 오류"
+
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
-"Connection error from %s server (%s):\n"
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s 서버에서 알 수 연결 오류 (%s):\n"
+"서버 %s 에서 접속 오류:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
-msgstr "서버에서 지원하지 않는 프로토콜입니다."
-
-#: src/protocols/msn/session.c:321
+msgstr "서버는 이 프로토콜을 지원하지 않습니다."
+
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
-msgstr "HTTP 해석 오류입니다."
-
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+msgstr "HTTP 해석 중 오류가 발생했습니다."
+
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3467
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
-msgstr "다른 곳에서 같은 아이디로 로그인했습니다."
-
-#: src/protocols/msn/session.c:328
-#, fuzzy
+msgstr "다른 장소로부터 접속되어 있습니다."
+
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN 친구목록이 일시적으로 먹통이 되었습니다. 잠시 기다리거나 다시 시도하세요."
-
-#: src/protocols/msn/session.c:333
+msgstr "MSN 서버가 일시적으로 이용할 수 없게 되었습니다. 잠시 후 다시 시도해 보시기 바랍니다."
+
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
-msgstr "MSN 서버가 일시적으로 먹통이 되었습니다."
-
-#: src/protocols/msn/session.c:337
+msgstr "MSN 서버가 일시적으로 다운되어 있습니다."
+
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "인증 요청을 보낼 수 없음: %s"
-
-#: src/protocols/msn/session.c:342
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN 친구목록이 일시적으로 먹통이 되었습니다. 잠시 기다리거나 다시 시도하세요."
-
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+msgstr "인증할 수 없습니다: %s"
+
+#: ../libgaim/protocols/msn/session.c:324
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "사용 중인 MSN 친구 목록이 일시적으로 사용할수 없게 되었습니다. 잠시 후 다시 시도해 보시기 바랍니다."
+
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
-msgstr "악수하는 중"
-
-#: src/protocols/msn/session.c:364
+msgstr "통신에 접속 중입니다."
+
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
-msgstr "전송하는 중"
-
-#: src/protocols/msn/session.c:366
+msgstr "전송 중 입니다."
+
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
-msgstr "인증 시작하는 중"
-
-#: src/protocols/msn/session.c:367
+msgstr "인증 시작 중입니다."
+
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
-msgstr "쿠키 가져오는 중"
-
-#: src/protocols/msn/session.c:369
+msgstr "쿠키를 가져오는 중입니다."
+
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
-msgstr "쿠키 보내는 중"
-
-#: src/protocols/msn/session.c:370
+msgstr "쿠키를 보내는 중입니다."
+
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
-msgstr "친구 목록 변환하는 중"
-
-#: src/protocols/msn/state.c:34
+msgstr "친구 목록을 수신하고 있습니다."
+
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
-msgstr "자리비움"
-
-#: src/protocols/msn/switchboard.c:403
+msgstr "컴퓨터로부터 떨어져 있습니다."
+
+#: ../libgaim/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "전화 중입니다."
+
+#: ../libgaim/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "점심 식사 중입니다."
+
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "시간 초과로 메시지가 보내지지 않았습니다:"
-
-#: src/protocols/msn/switchboard.c:411
+msgstr "시간이 초과되어 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "숨어 있는 동안은 메시지를 보낼 수 없습니다:"
-
-#: src/protocols/msn/switchboard.c:415
+msgstr "숨김 상태에서는 메시지를 보낼 수 없습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
-msgstr "대상이 접속을 끊어서 메시지를 보낼 수 없습니다:"
-
-#: src/protocols/msn/switchboard.c:419
+msgstr "받는 사람이 오프라인이므로 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "연결 오류가 발생해서 메시지를 보낼 수 없습니다:"
-
-#: src/protocols/msn/switchboard.c:423
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr "스위치보드에 오류가 발생해서 메시지를 보낼 수 없습니다:"
-
-#: src/protocols/msn/switchboard.c:431
+msgstr "접속 오류로 인해 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:420
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "전송 시간이 너무 빨라서 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:424
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "교환 기관의 접속 오류로 인해 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "알 수 없는 오류로 메시지를 보낼 수 없습니다:"
-
-#: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
+
+#: ../libgaim/protocols/msn/switchboard.c:956
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s님이 파일을 보내려고 함"
-
-#: src/protocols/msn/userlist.c:85
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "%s(%s)님이 %s님을 친구 목록에 등록하려고 합니다."
-
-#: src/protocols/msn/userlist.c:275
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "%s(%s)님이 %s님을 친구 목록에 등록하려고 합니다."
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
-#, fuzzy, c-format
+msgstr "%s 님이 신호를 보내고 싶어 합니다!"
+
+#: ../libgaim/protocols/msn/userlist.c:250
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 님은 나를 친구 목록에 추가했습니다."
+
+#: ../libgaim/protocols/msn/userlist.c:319
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 님은 나를 친구 목록에서 삭제했습니다."
+
+#: ../libgaim/protocols/msn/userlist.c:641
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "%s 파일을 읽을 수 없습니다."
-
-#: src/protocols/msn/userlist.c:661
-#, fuzzy
+msgstr "\"%s\" 님을 추가할 수 없습니다."
+
+#: ../libgaim/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
-msgstr "새로운 포맷이 유효하지 않습니다."
-
-#: src/protocols/napster/napster.c:260
-msgid "Unable to read header from server"
-msgstr "서버에서 헤더를 읽을 수 없음"
-
-#: src/protocols/napster/napster.c:274
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "지정한 아이디가 잘못되었습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1879
+msgid "Required parameters not passed in"
+msgstr "필요한 인수가 전달되지 못했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1882
+msgid "Unable to write to network"
+msgstr "네트워크에 쓸 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1885
+msgid "Unable to read from network"
+msgstr "네트워크로부터 읽을 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1888
+msgid "Error communicating with server"
+msgstr "서버와 통신하는 중 오류가 발생했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1892
+msgid "Conference not found"
+msgstr "회의를 찾을 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1895
+msgid "Conference does not exist"
+msgstr "회의가 존재하지 않습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1899
+msgid "A folder with that name already exists"
+msgstr "같은 이름의 폴더가 이미 존재합니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1902
+msgid "Not supported"
+msgstr "지원되지 않습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1906
+msgid "Password has expired"
+msgstr "비밀번호 유효기간이 만료되었습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1909
+msgid "Incorrect password"
+msgstr "비밀번호가 틀립니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1912
+msgid "User not found"
+msgstr "사용자를 찾을 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1915
+msgid "Account has been disabled"
+msgstr "계정이 사용이 금지되었습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1918
+msgid "The server could not access the directory"
+msgstr "서버가 디렉토리에 접근하지 못했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1921
+msgid "Your system administrator has disabled this operation"
+msgstr "시스템 관리자가 이 조작을 금지시켰습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1924
+msgid "The server is unavailable; try again later"
+msgstr "서버를 이용할 수 없습니다; 잠시 후에 다시 시도해 보십시오."
+
+#: ../libgaim/protocols/novell/nmuser.c:1927
+msgid "Cannot add a contact to the same folder twice"
+msgstr "같은 폴더에 연락처를 두 번 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1930
+msgid "Cannot add yourself"
+msgstr "나 자신은 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1933
+msgid "Master archive is misconfigured"
+msgstr "Master archive 설정이 틀렸습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1937
+msgid "Incorrect screen name or password"
+msgstr "아이디 또는 비밀번호가 틀립니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1940
+msgid "Could not recognize the host of the screen name you entered"
+msgstr "입력한 아이디의 호스트를 인식할 수 없었습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1943
+msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgstr "틀린 비밀번호가 여러 번 입력되었기 때문에, 사용 중인 계정을 금지시킵니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1946
+msgid "You cannot add the same person twice to a conversation"
+msgstr "동일 인물은 대화에 두 번 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1950
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "연락 가능한 수의 최대값에 도달했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1953
+msgid "You have entered an incorrect screen name"
+msgstr "잘못된 아이디를 입력했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1956
+msgid "An error occurred while updating the directory"
+msgstr "폴더를 갱신하는 중 오류가 발생했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1959
+msgid "Incompatible protocol version"
+msgstr "호환되지 않는 버전의 프로토콜"
+
+#: ../libgaim/protocols/novell/nmuser.c:1962
+msgid "The user has blocked you"
+msgstr "사용자는 나를 차단했습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1965
+msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgstr "이 평가판에서는 한번에 10 사용자 이상은 로그인 할 수 없습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1968
+msgid "The user is either offline or you are blocked"
+msgstr "사용자는 오프라인 또는 차단되어 있습니다."
+
+#: ../libgaim/protocols/novell/nmuser.c:1971
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "알 수 없는 오류: 0x%X"
+
+#: ../libgaim/protocols/novell/novell.c:124
+#, c-format
+msgid "Login failed (%s)."
+msgstr "로그인에 실패했습니다. (%s)。"
+
+#: ../libgaim/protocols/novell/novell.c:247
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "메시지를 보낼 수 없습니다. 사용자의 상세 정보를 가져오지 못했습니다. (%s)。"
+
+#: ../libgaim/protocols/novell/novell.c:396
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s 님을 친구 목록 (%s) 에 추가할 수 없습니다."
+
+#. TODO: Improve this! message to who or for what conference?
+#: ../libgaim/protocols/novell/novell.c:422
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "메시지 (%s) 을(를) 보낼 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "사용자 (%s) 을(를) 초대할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:532
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s 메시지를 전송할 수 없습니다. 회의 (%s) 을(를) 작성할 수 없었습니다."
+
+#: ../libgaim/protocols/novell/novell.c:537
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "메시지를 전송할 수 없습니다. 회의 (%s) 을(를) 작성할 수 없었습니다."
+
+#: ../libgaim/protocols/novell/novell.c:584
+#, c-format
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "사용자 %s 을(를) 서버쪽 목록에 있는 폴더 %s (으)로 이동할 수 없습니다. 폴더 생성 오류입니다 (%s)."
+
+#: ../libgaim/protocols/novell/novell.c:632
+#, c-format
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "%s 을(를) 친구 목록에 추가할 수 없습니다. 서버쪽 목록 (%s) 의 폴더 생성 오류입니다."
+
+#: ../libgaim/protocols/novell/novell.c:705
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "사용자 %s (%s) 님의 상세 정보를 가져오지 못했습니다."
+
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "사용자를 친구 목록 (%s) 에 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:798
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s 님을 거부 목록 (%s) 에 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:851
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s 님을 허가 목록 (%s) 에 추가할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:919
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "%s 님을 개인 목록 (%s) (으)로부터 삭제할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1650
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "서버쪽 개인 설정 (%s) 을(를) 변경할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1012
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "회의 (%s) 을(를) 생성할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1695
+msgid "Error communicating with server. Closing connection."
+msgstr "서버와의 통신 중 오류입니다. 접속을 끊었습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1476
+msgid "Telephone Number"
+msgstr "전화번호"
+
+#: ../libgaim/protocols/novell/novell.c:1482
+msgid "Personal Title"
+msgstr "개인 제목"
+
+#: ../libgaim/protocols/novell/novell.c:1486
+msgid "Mailstop"
+msgstr "Mailstop"
+
+#: ../libgaim/protocols/novell/novell.c:1505
+#: ../libgaim/protocols/sametime/sametime.c:4142
+msgid "User ID"
+msgstr "사용자 ID"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+#: ../libgaim/protocols/novell/novell.c:1518
+msgid "Full name"
+msgstr "전체 이름"
+
+#: ../libgaim/protocols/novell/novell.c:1640
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise 회의 %d"
+
+#: ../libgaim/protocols/novell/novell.c:1671
+msgid "Unable to make SSL connection to server."
+msgstr "서버에 SSL 접속을 할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1723
+msgid "Authenticating..."
+msgstr "인증 중..."
+
+#: ../libgaim/protocols/novell/novell.c:1735
+msgid "Unable to connect to server."
+msgstr "서버에 접속할 수 없습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1738
+msgid "Waiting for response..."
+msgstr "응답을 기다리고 있습니다..."
+
+#: ../libgaim/protocols/novell/novell.c:1873
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s 님이 대화 창으로 초대되어 있습니다."
+
+#: ../libgaim/protocols/novell/novell.c:1901
+msgid "Invitation to Conversation"
+msgstr "회의 초대"
+
+#: ../libgaim/protocols/novell/novell.c:1902
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
 msgstr ""
-"서버에서 메시지를 읽을 수 없습니다: %s.  %hd 명령에, 길이는 %hd자입니다."
-
-#: src/protocols/napster/napster.c:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "알 수 없는 에러"
-
-#: src/protocols/napster/napster.c:339
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "사용자: %s, 파일: %s, 크기: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
+"%s (으)로부터의 초대:\n"
+"\n"
+"연락처: %s"
+
+#: ../libgaim/protocols/novell/novell.c:1904
+msgid "Would you like to join the conversation?"
+msgstr "회의에 참석하시겠습니까?"
+
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2013
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되었습니다."
+
+#: ../libgaim/protocols/novell/novell.c:2070
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s 님은 오프라인이기 때문에, 전송한 메시지를 받지 못했습니다."
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: ../libgaim/protocols/novell/novell.c:2168
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
+
+#: ../libgaim/protocols/novell/novell.c:2196
+msgid "Error. SSL support is not installed."
+msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
+
+#: ../libgaim/protocols/novell/novell.c:2505
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "이 회의는 폐회되었습니다. 메시지를 전송할 수 없습니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/novell/novell.c:3548
+#: ../libgaim/protocols/novell/novell.c:3550
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise 메신저 프로토콜 플러그인"
+
+#: ../libgaim/protocols/novell/novell.c:3569
+msgid "Server address"
+msgstr "서버 주소"
+
+#: ../libgaim/protocols/novell/novell.c:3573
+msgid "Server port"
+msgstr "서버 포트"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:379
+#: ../libgaim/protocols/yahoo/yahoo.c:2263
+#: ../libgaim/protocols/yahoo/yahoo.c:2421
+#: ../libgaim/protocols/yahoo/ycht.c:481
+#: ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074
+#: ../libgaim/proxy.c:1185
+#: ../libgaim/proxy.c:1285
+#: ../libgaim/proxy.c:1413
+msgid "Server closed the connection."
+msgstr "서버가 접속을 닫았습니다."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:381
+#: ../libgaim/protocols/yahoo/yahoo.c:2257
+#: ../libgaim/protocols/yahoo/yahoo.c:2415
+#: ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086
+#: ../libgaim/proxy.c:1197
+#: ../libgaim/proxy.c:1297
+#: ../libgaim/proxy.c:1425
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
 msgstr ""
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "서버와 연결이 끊겼습니다."
-
-#. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
-#, c-format
-msgid "%s requested your information"
-msgstr "%s님이 내 정보를 요청했음"
-
-#. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
-#, c-format
-msgid "%s requested a PING"
+"서버와의 접속에 실패했습니다:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:384
+#: ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210
+#: ../libgaim/proxy.c:1309
+#: ../libgaim/proxy.c:1381
+#: ../libgaim/proxy.c:1438
+msgid "Received invalid data on connection with server."
+msgstr "서버와 접속하는 동안에 잘못된 데이터를 받았습니다."
+
+#: ../libgaim/protocols/oscar/flap_connection.c:386
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
 msgstr ""
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
-msgid "Unable to connect."
-msgstr "연결할 수 없습니다."
-
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "그룹(_G):"
+"서버와의 접속을 확립하지 못했습니다:\n"
+"%s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/oscar/libaim.c:112
+#: ../libgaim/protocols/oscar/libaim.c:114
+msgid "AIM Protocol Plugin"
+msgstr "AIM 프로토콜 플러그인"
+
+#: ../libgaim/protocols/oscar/libaim.c:140
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"파일 전송은 항상 AIM/ICQ 프록시 서버 이용\n"
+"(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
 
 #. *< type
 #. *< ui_requirement
@@ -7197,360 +10355,1612 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
-msgid "NAPSTER Protocol Plugin"
-msgstr "냅스터 프로토콜 플러그인"
-
-#: src/protocols/novell/nmuser.c:1868
-msgid "Required parameters not passed in"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1871
-#, fuzzy
-msgid "Unable to write to network"
-msgstr "서버에 데이터를 보낼 수 없음"
-
-#: src/protocols/novell/nmuser.c:1874
-#, fuzzy
-msgid "Unable to read from network"
-msgstr "소켓을 읽을 수 없습니다."
-
-#: src/protocols/novell/nmuser.c:1877
-#, fuzzy
-msgid "Error communicating with server"
-msgstr "Gadu-Gadu 서버에 연결 오류"
-
-#: src/protocols/novell/nmuser.c:1881
-msgid "Conference not found"
+#: ../libgaim/protocols/oscar/libicq.c:112
+#: ../libgaim/protocols/oscar/libicq.c:114
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ 프로토콜 플러그인"
+
+#: ../libgaim/protocols/oscar/libicq.c:139
+#: ../libgaim/protocols/yahoo/yahoo.c:3945
+#: ../libgaim/protocols/zephyr/zephyr.c:2985
+msgid "Encoding"
+msgstr "인코딩"
+
+#: ../libgaim/protocols/oscar/libicq.c:143
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1884
-#, fuzzy
-msgid "Conference does not exist"
-msgstr "사용자가 없음"
-
-#: src/protocols/novell/nmuser.c:1888
-#, fuzzy
-msgid "A folder with that name already exists"
-msgstr "같은 파일이 이미 존재함"
-
-#: src/protocols/novell/nmuser.c:1891
-#, fuzzy
-msgid "Not supported"
-msgstr "지원"
-
-#: src/protocols/novell/nmuser.c:1895
-msgid "Password has expired"
-msgstr "열쇠글이 너무 오래됨"
-
-#: src/protocols/novell/nmuser.c:1898
-msgid "Invalid password"
-msgstr "잘못된 열쇠글"
-
-#: src/protocols/novell/nmuser.c:1901
-#, fuzzy
-msgid "User not found"
-msgstr "사용자가 그룹에 없음"
-
-#: src/protocols/novell/nmuser.c:1904
-msgid "Account has been disabled"
+"파일 전송은 항상 ICQ 프록시 서버 이용\n"
+"(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
+
+#: ../libgaim/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "리모트 사용자가 접속을 끊었습니다."
+
+#: ../libgaim/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "리모트 사용자가 내 요구를 거절했습니다."
+
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
+
+#: ../libgaim/protocols/oscar/odc.c:49
+msgid "Could not establish a connection with the remote user."
+msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
+
+#: ../libgaim/protocols/oscar/odc.c:560
+msgid "Direct IM established"
+msgstr "Direct IM 을 확립했습니다."
+
+#: ../libgaim/protocols/oscar/oft.c:657
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "파일 %s 은(는) %s 입니다. (%s 의 최대 크기를 초과했습니다.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:114
+msgid "Invalid error"
+msgstr "잘못된 오류"
+
+#: ../libgaim/protocols/oscar/oscar.c:115
+msgid "Invalid SNAC"
+msgstr "잘못된 SNAC"
+
+#: ../libgaim/protocols/oscar/oscar.c:116
+msgid "Rate to host"
+msgstr "호스트 속도"
+
+#: ../libgaim/protocols/oscar/oscar.c:117
+msgid "Rate to client"
+msgstr "클라이언트 속도"
+
+#: ../libgaim/protocols/oscar/oscar.c:119
+msgid "Service unavailable"
+msgstr "서비스를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:120
+msgid "Service not defined"
+msgstr "서비스가 정의되어 있지 않습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:121
+msgid "Obsolete SNAC"
+msgstr "구형 SNAC"
+
+#: ../libgaim/protocols/oscar/oscar.c:122
+msgid "Not supported by host"
+msgstr "호스트에서 지원하지 않습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:123
+msgid "Not supported by client"
+msgstr "클라이언트에서 지원하지 않습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:124
+msgid "Refused by client"
+msgstr "클라이언트에서 거부되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:125
+msgid "Reply too big"
+msgstr "회신이 너무 큽니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:126
+msgid "Responses lost"
+msgstr "응답이 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:127
+msgid "Request denied"
+msgstr "요청이 거부되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:128
+msgid "Busted SNAC payload"
+msgstr "SNAC payload 가 파괴되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:129
+msgid "Insufficient rights"
+msgstr "불충분한 요구입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:130
+msgid "In local permit/deny"
+msgstr "로컬 허가/거부"
+
+#: ../libgaim/protocols/oscar/oscar.c:131
+msgid "Too evil (sender)"
+msgstr "악성 (보낸 사람)"
+
+#: ../libgaim/protocols/oscar/oscar.c:132
+msgid "Too evil (receiver)"
+msgstr "악성 (받는 사람)"
+
+#: ../libgaim/protocols/oscar/oscar.c:133
+msgid "User temporarily unavailable"
+msgstr "사용자가 일시적으로 사용 불가능 상태입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:134
+msgid "No match"
+msgstr "일치하지 않습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:135
+msgid "List overflow"
+msgstr "목록 오버플로어"
+
+#: ../libgaim/protocols/oscar/oscar.c:136
+msgid "Request ambiguous"
+msgstr "요구가 모호합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:137
+msgid "Queue full"
+msgstr "큐가 다 찼습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:138
+msgid "Not while on AOL"
+msgstr "AOL 사용 중에는 불가능합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:327
+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 "(이 메시지를 받을 때 오류가 발생했습니다. 대화 중인 친구는 아마도 다른 인코딩을 사용하고 있는 것 같습니다. 상대가 사용하고 있는 인코딩을 알고 있으면, 계정 창의 고급 설정에서 이를 지정해 주십시오.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:436
+#, 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 "(이 메시지를 받을 때 오류가 발생했습니다. %s 님과는 상이한 인코딩으로 대화하고 있거나 혹은 %s 님이 비정상 클라이언트를 사용하고 있는 것 같습니다.)"
+
+#: ../libgaim/protocols/oscar/oscar.c:621
+msgid "Voice"
+msgstr "음성"
+
+#: ../libgaim/protocols/oscar/oscar.c:624
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+#: ../libgaim/protocols/oscar/oscar.c:627
+#: ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/silc/util.c:551
+msgid "Chat"
+msgstr "대화"
+
+#: ../libgaim/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:5959
+msgid "Get File"
+msgstr "파일 가져오기"
+
+#: ../libgaim/protocols/oscar/oscar.c:637
+msgid "Games"
+msgstr "게임"
+
+#: ../libgaim/protocols/oscar/oscar.c:640
+msgid "Add-Ins"
+msgstr "추가"
+
+#: ../libgaim/protocols/oscar/oscar.c:643
+msgid "Send Buddy List"
+msgstr "친구 목록 보내기"
+
+#: ../libgaim/protocols/oscar/oscar.c:646
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct 접속"
+
+#: ../libgaim/protocols/oscar/oscar.c:649
+msgid "AP User"
+msgstr "AP 사용자"
+
+#: ../libgaim/protocols/oscar/oscar.c:652
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: ../libgaim/protocols/oscar/oscar.c:655
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: ../libgaim/protocols/oscar/oscar.c:658
+msgid "ICQ Server Relay"
+msgstr "ICQ 서버 중계"
+
+#: ../libgaim/protocols/oscar/oscar.c:661
+msgid "Old ICQ UTF8"
+msgstr "구형 ICQ UTF8"
+
+#: ../libgaim/protocols/oscar/oscar.c:664
+msgid "Trillian Encryption"
+msgstr "Trillian 암호화"
+
+#: ../libgaim/protocols/oscar/oscar.c:667
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: ../libgaim/protocols/oscar/oscar.c:670
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: ../libgaim/protocols/oscar/oscar.c:673
+msgid "Security Enabled"
+msgstr "보안 사용"
+
+#: ../libgaim/protocols/oscar/oscar.c:676
+msgid "Video Chat"
+msgstr "영상 대화"
+
+#: ../libgaim/protocols/oscar/oscar.c:680
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#: ../libgaim/protocols/oscar/oscar.c:683
+msgid "Live Video"
+msgstr "라이브 영상"
+
+#: ../libgaim/protocols/oscar/oscar.c:686
+msgid "Camera"
+msgstr "카메라"
+
+#: ../libgaim/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:5735
+msgid "Free For Chat"
+msgstr "대화할 수 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:708
+#: ../libgaim/protocols/oscar/oscar.c:5767
+msgid "Not Available"
+msgstr "사용 불가"
+
+#: ../libgaim/protocols/oscar/oscar.c:710
+#: ../libgaim/protocols/oscar/oscar.c:5753
+msgid "Occupied"
+msgstr "사용 중입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:714
+msgid "Web Aware"
+msgstr "Web Aware"
+
+#: ../libgaim/protocols/oscar/oscar.c:718
+msgid "Online"
+msgstr "온라인"
+
+#: ../libgaim/protocols/oscar/oscar.c:824
+#: ../libgaim/protocols/oscar/oscar.c:2852
+msgid "Warning Level"
+msgstr "경고 수준"
+
+#: ../libgaim/protocols/oscar/oscar.c:834
+msgid "Buddy Comment"
+msgstr "친구의 코멘트"
+
+#: ../libgaim/protocols/oscar/oscar.c:974
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1907
-msgid "The server could not access the directory"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1910
-msgid "Your system administrator has disabled this operation"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1913
-msgid "The server is unavailable; try again later"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1916
-msgid "Cannot add a contact to the same folder twice"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1919
-msgid "Cannot add yourself"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1922
-msgid "Master archive is misconfigured"
+"인증 서버에 접속할 수 없었습니다:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:982
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1926
-#, fuzzy
-msgid "Invalid username or password"
-msgstr "잘못된 사용자 이름"
-
-#: src/protocols/novell/nmuser.c:1929
-msgid "Could not recognize the host of the username you entered"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1932
+"BOS 서버에 접속할 수 없었습니다:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:1022
+msgid "Screen name sent"
+msgstr "아이디를 보냈습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1027
+msgid "Connection established, cookie sent"
+msgstr "접속 완료. 쿠키를 보냈습니다."
+
+#. TODO: Don't call this with ssi
+#: ../libgaim/protocols/oscar/oscar.c:1056
+msgid "Finalizing connection"
+msgstr "최종 접속 조정 중"
+
+#: ../libgaim/protocols/oscar/oscar.c:1240
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "로그인 할 수 없습니다: 아이디가 틀렸기 때문에 %s (으)로서 접속할 수 없었습니다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백 또는 숫자만이 가능합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1325
+#: ../libgaim/protocols/yahoo/yahoo.c:1900
+msgid "Invalid screen name."
+msgstr "잘못된 아이디입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1332
+#: ../libgaim/protocols/qq/login_logout.c:483
+#: ../libgaim/protocols/simple/simple.c:1035
+#: ../libgaim/protocols/yahoo/yahoo.c:1923
+msgid "Incorrect password."
+msgstr "비밀번호가 틀립니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1337
+msgid "Your account is currently suspended."
+msgstr "사용 중인 계정은 현재 정지 중입니다."
+
+#. service temporarily unavailable
+#: ../libgaim/protocols/oscar/oscar.c:1341
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL 인스턴트 메신저 서비스는 일시적으로 이용할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1346
+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 "접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이대로 계속하면 더 오래 기다려야 합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1351
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "클라이언트 버전이 너무 오래 되었습니다. %s (으)로 업그레이드 하십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:1386
+msgid "Could Not Connect"
+msgstr "접속할 수 없었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1391
+msgid "Received authorization"
+msgstr "인증을 받았습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1414
+msgid "The SecurID key entered is invalid."
+msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1428
+msgid "Enter SecurID"
+msgstr "보안 ID 입력"
+
+#: ../libgaim/protocols/oscar/oscar.c:1429
+msgid "Enter the 6 digit number from the digital display."
+msgstr "디지털 표시 방식으로 6자리의 숫자를 입력해 주십시오."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2279
+#: ../libgaim/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6123
+#: ../libgaim/request.h:1350
+msgid "_OK"
+msgstr "확인(_O)"
+
+#: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1512
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "곧 접속이 끊깁니다. 이것이 수정되면 TOC 를 사용합니다. 갱신을 위해 %s 을(를) 선택하십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1515
+msgid "Gaim was unable to get a valid AIM login hash."
+msgstr "Pidgin이 올바른 AIM 로그인 hash를 가져올 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1601
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:1604
+msgid "Gaim was unable to get a valid login hash."
+msgstr "Pidgin이 올바른 로그인 hash를 가져올 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:1630
+msgid "Password sent"
+msgstr "비밀번호 전송 중"
+
+#: ../libgaim/protocols/oscar/oscar.c:1686
+msgid "Unable to initialize connection"
+msgstr "새로운 접속을 열 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2203
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "제가 당신을 친구 목록에 추가할 수 있도록 승인해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:2231
+msgid "Authorization Request Message:"
+msgstr "승인 요구 메시지:"
+
+#: ../libgaim/protocols/oscar/oscar.c:2232
+msgid "Please authorize me!"
+msgstr "저를 승인해 주세요!"
+
+#: ../libgaim/protocols/oscar/oscar.c:2271
+#: ../libgaim/protocols/oscar/oscar.c:2278
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/yahoo/yahoo.c:959
+msgid "No reason given."
+msgstr "이유를 알 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2277
+msgid "Authorization Denied Message:"
+msgstr "승인 거부 메시지:"
+
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#, c-format
 msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1935
-msgid "You cannot add the same person twice to a conversation"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1939
-msgid "You have reached your limit for the number of contacts allowed"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1942
-#, fuzzy
-msgid "You have entered an invalid username"
-msgstr "%s 은(/는) 잘못된 파일명입니다.\n"
-
-#: src/protocols/novell/nmuser.c:1945
-msgid "An error occurred while updating the directory"
+"사용자 %u 님이 다음 이유로 친구 목록에의 추가 요구를 거부했습니다:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2405
+msgid "ICQ authorization denied."
+msgstr "ICQ 인증이 거부되었습니다."
+
+#. Someone has granted you authorization
+#: ../libgaim/protocols/oscar/oscar.c:2412
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "사용자 %u 님이 내 친구 목록에의 추가 요구를 승인했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2420
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1948
-msgid "Incompatible protocol version"
+"특별한 메시지를 받았습니다.\n"
+"\n"
+"보낸 사람: %s [%s]\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2428
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1951
-msgid "The user has blocked you"
-msgstr "사용자를 차단하고 있음"
-
-#: src/protocols/novell/nmuser.c:1954
+"ICQ 호출을 받았습니다.\n"
+"\n"
+"보낸 사람: %s [%s]\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2436
+#, c-format
 msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+"You have received an ICQ e-mail from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/nmuser.c:1957
-msgid "The user is either offline or you are blocked"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1960
-#, fuzzy, c-format
-msgid "Unknown error: 0x%X"
-msgstr "알 수 없는 에러"
-
-#: src/protocols/novell/novell.c:117
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:232
-#, fuzzy, c-format
-msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "메시지를 보낼 수 없습니다. 메시지가 너무 큽니다."
-
-#: src/protocols/novell/novell.c:381
-#, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
-#, fuzzy, c-format
-msgid "Unable to send message (%s)."
-msgstr "메시지를 보낼 수 없습니다 (0x%X)."
-
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
-#, fuzzy, c-format
-msgid "Unable to invite user (%s)."
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/novell/novell.c:517
-#, fuzzy, c-format
-msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "메시지를 보낼 수 없습니다. 회의를 만들 수 없습니다 (0x%X)."
-
-#: src/protocols/novell/novell.c:522
-#, fuzzy, c-format
-msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "메시지를 보낼 수 없습니다. 회의를 만들 수 없습니다 (0x%X)."
-
-#: src/protocols/novell/novell.c:569
+"%s [%s] 님으로부터의 ICQ 이메일을 받았습니다.\n"
+"\n"
+"메시지는:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2457
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ 사용자 %u 님이 나에게 친구 목록을 보내고 있습니다: %s (%s)"
+
+#: ../libgaim/protocols/oscar/oscar.c:2463
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "이 상대를 친구 목록에 추가하시겠습니까?"
+
+#: ../libgaim/protocols/oscar/oscar.c:2467
+msgid "_Decline"
+msgstr "거절(_D)"
+
+#: ../libgaim/protocols/oscar/oscar.c:2551
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] "%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
+msgstr[1] "%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2560
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] "%2$s 님으로부터의 %1$hu개의 메시지는 너무 커서 받지 못했습니다."
+msgstr[1] "%2$s 님으로부터의 %1$hu개의 메시지는 너무 커서 받지 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2569
+#, 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] "속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2578
+#, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] "유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2587
+#, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgid_plural "You missed %hu messages from %s because you are too evil."
+msgstr[0] "유해한 자신이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "유해한 자신이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2596
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2718
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr "SNAC threw 오류: %s\n"
+
+#. Data is assumed to be the destination sn
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "메시지를 보낼 수 없습니다: %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libgaim/protocols/oscar/oscar.c:2763
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libgaim/protocols/oscar/oscar.c:2829
+msgid "Unknown reason."
+msgstr "원인을 알 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2761
+#: ../libgaim/protocols/sametime/sametime.c:2409
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s 님에게 메시지를 보낼 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#, c-format
+msgid "User information not available: %s"
+msgstr "사용자 정보를 이용할 수 없습니다: %s"
+
+#: ../libgaim/protocols/oscar/oscar.c:2828
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr "%s 사용자 정보를 이용할 수 없습니다:"
+
+#: ../libgaim/protocols/oscar/oscar.c:2857
+msgid "Online Since"
+msgstr "접속한 일시"
+
+#: ../libgaim/protocols/oscar/oscar.c:2862
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+msgid "Member Since"
+msgstr "멤버가 된 일시"
+
+#: ../libgaim/protocols/oscar/oscar.c:2867
+msgid "Capabilities"
+msgstr "기능"
+
+#: ../libgaim/protocols/oscar/oscar.c:2885
+msgid "Available Message"
+msgstr "가능한 메시지"
+
+#: ../libgaim/protocols/oscar/oscar.c:2911
+msgid "Profile"
+msgstr "프로파일"
+
+#: ../libgaim/protocols/oscar/oscar.c:2988
+msgid "Your AIM connection may be lost."
+msgstr "AIM 으로의 접속이 끊어진 것 같습니다."
+
+#. The conversion failed!
+#: ../libgaim/protocols/oscar/oscar.c:3175
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[메시지에 잘못된 문자가 포함되어 있기 때문에, 이 사용자로부터의 메시지를 표시할 수 없습니다.]"
+
+#: ../libgaim/protocols/oscar/oscar.c:3396
+msgid "Rate limiting error."
+msgstr "속도 제한 오류입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3397
+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 "속도 제한을 초과했기 때문에, 마지막 조작은 실행할 수 없었습니다. 10초 정도 후에 다시 시도해 보시기 바랍니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3469
+msgid "You have been signed off for an unknown reason."
+msgstr "원인은 알 수 없지만, 접속이 끊어졌습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3482
+#: ../libgaim/protocols/toc/toc.c:977
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "대화실 %s (으)로부터 접속이 끊어졌습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3723
+#: ../libgaim/protocols/silc/util.c:583
+msgid "Mobile Phone"
+msgstr "휴대 전화"
+
+#: ../libgaim/protocols/oscar/oscar.c:3753
+msgid "Personal Web Page"
+msgstr "개인 웹페이지"
+
+#: ../libgaim/protocols/oscar/oscar.c:3758
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "Additional Information"
+msgstr "추가 정보"
+
+#: ../libgaim/protocols/oscar/oscar.c:3766
+#: ../libgaim/protocols/oscar/oscar.c:3779
+msgid "Zip Code"
+msgstr "우편 번호"
+
+#: ../libgaim/protocols/oscar/oscar.c:3790
+msgid "Division"
+msgstr "소속"
+
+#: ../libgaim/protocols/oscar/oscar.c:3791
+msgid "Position"
+msgstr "직위"
+
+#: ../libgaim/protocols/oscar/oscar.c:3793
+msgid "Web Page"
+msgstr "웹페이지"
+
+#: ../libgaim/protocols/oscar/oscar.c:3796
+msgid "Work Information"
+msgstr "직업"
+
+#: ../libgaim/protocols/oscar/oscar.c:3852
+msgid "Pop-Up Message"
+msgstr "팝업 메시지"
+
+#: ../libgaim/protocols/oscar/oscar.c:3892
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "다음의 아이디는 %s 에 연관되어 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3897
+msgid "Screen name"
+msgstr "아이디"
+
+#: ../libgaim/protocols/oscar/oscar.c:3923
+#, c-format
+msgid "No results found for e-mail address %s"
+msgstr "이메일 주소 %s 에 대한 결과를 찾을 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3944
+#, c-format
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "%s 님을 확인하기 위해 질의 메일을 수신해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:3946
+msgid "Account Confirmation Requested"
+msgstr "계정 인증을 요구했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3977
+msgid "Error Changing Account Info"
+msgstr "계정 정보 변경 오류"
+
+#: ../libgaim/protocols/oscar/oscar.c:3980
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "오류 0x%04x: 요구된 아이디가 원본과 상이하여 조형할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3983
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr "오류 0x%04x: 요구된 아이디가 상이하여 조형할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3986
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "오류 0x%04x: 요구된 아이디가 너무 길어 조형할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3989
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "오류 0x%04x: 이 아이디에 대해 이미 요구가 있었기 때문에 이메일 주소를 변경할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3992
+#, 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 "오류 0x%04x: 많은 아이디에 할당되어 있기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3995
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "오류 0x%04x: 이 주소가 상이하기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3998
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "오류 0x%04x: 원인을 알 수 없는 오류입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4008
 #, c-format
 msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:617
-#, fuzzy, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/novell/novell.c:690
-#, fuzzy, c-format
-msgid "Could not get details for user %s (%s)."
-msgstr "메시지를 보낼 수 없습니다. 메시지가 너무 큽니다."
-
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
-#, fuzzy, c-format
-msgid "Unable to add user to privacy list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/novell/novell.c:783
-#, fuzzy, c-format
-msgid "Unable to add %s to deny list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/novell/novell.c:836
-#, fuzzy, c-format
-msgid "Unable to add %s to permit list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/novell/novell.c:904
-#, fuzzy, c-format
-msgid "Unable to remove %s from privacy list (%s)."
-msgstr "친구를 더할 수 없습니다."
-
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
-#, c-format
-msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:999
-#, fuzzy, c-format
-msgid "Unable to create conference (%s)."
-msgstr "소켓을 만들 수 없음"
-
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
-#, fuzzy
-msgid "Error communicating with server. Closing connection."
-msgstr "Gadu-Gadu 서버에 연결 오류"
-
-#: src/protocols/novell/novell.c:1452
-#, fuzzy
-msgid "Telephone Number"
-msgstr "전화"
-
-#: src/protocols/novell/novell.c:1456
-msgid "Department"
+"Your screen name is currently formatted as follows:\n"
+"%s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1458
-#, fuzzy
-msgid "Personal Title"
-msgstr "홈페이지"
-
-#: src/protocols/novell/novell.c:1462
-#, fuzzy
-msgid "Mailstop"
-msgstr "메일"
-
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
-msgid "Email Address"
-msgstr "메일 주소"
-
-#: src/protocols/novell/novell.c:1480
-#, fuzzy
-msgid "User ID"
-msgstr "사용자"
-
-#. tag = _("DN");
-#. value = nm_user_record_get_dn(user_record);
-#. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
-#. }
-#.
-#: src/protocols/novell/novell.c:1494
-msgid "Full name"
-msgstr "이름"
-
-#: src/protocols/novell/novell.c:1618
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "그룹와이즈 회의 %d"
-
-#: src/protocols/novell/novell.c:1643
-msgid "Unable to make SSL connection to server."
-msgstr "서버에 SSL 연결을 만들 수 없습니다."
-
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1707
-#, fuzzy
-msgid "Authenticating..."
-msgstr "인증 확인 중"
-
-#: src/protocols/novell/novell.c:1719
-msgid "Unable to connect to server."
-msgstr "서버에 연결할 수 없습니다."
-
-#: src/protocols/novell/novell.c:1722
-#, fuzzy
-msgid "Waiting for response..."
-msgstr "대답을 기다리는 중..."
-
-#: src/protocols/novell/novell.c:1857
-#, fuzzy, c-format
-msgid "%s has been invited to this conversation."
-msgstr "%s님이 대화창을 닫았습니다."
-
-#: src/protocols/novell/novell.c:1885
-#, fuzzy
-msgid "Invitation to Conversation"
-msgstr "대화 기록"
-
-#: src/protocols/novell/novell.c:1886
+"내 아이디는 현재 다음과 같이 조형되어 있습니다:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libgaim/protocols/oscar/oscar.c:4016
+msgid "Account Info"
+msgstr "계정 정보"
+
+#: ../libgaim/protocols/oscar/oscar.c:4014
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr "%s 님의 이메일 주소는 %s 입니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4189
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "IM 이미지가 전송되지 않았습니다. IM 이미지를 전송하려면 직접 연결로 해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:4441
+msgid "Unable to set AIM profile."
+msgstr "AIM 프로파일을 설정하지 못했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4442
+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 "로그인 수속이 완료되기 전에 사용자 프로파일을 설정하려고 하는 것 같습니다. 내 프로파일은 설정되지 않은 상태로 남아 있습니다. 접속이 완료되면 재시도해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:4456
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "프로파일 길이가 최대값 (%d 바이트) 에 도달하였기 때문에, Pidgin이 이를 종결했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4461
+msgid "Profile too long."
+msgstr "프로파일이 너무 깁니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4505
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "자리 비움 메시지 길이가 최대값 (%d 바이트) 에 도달하였기 때문에, Pidgin이 이를 종결했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4510
+msgid "Away message too long."
+msgstr "자리 비움 메시지가 너무 깁니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4579
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "아이디가 상이하기 때문에, 친구 %s 을(를) 추가할 수 없었습니다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백만 또는 숫자만이 가능합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4581
+#: ../libgaim/protocols/oscar/oscar.c:5004
+#: ../libgaim/protocols/oscar/oscar.c:5018
+msgid "Unable To Add"
+msgstr "추가할 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4685
+msgid "Unable To Retrieve Buddy List"
+msgstr "친구 목록을 가져올 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4686
+msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "Pidgin이 일시적으로 AIM 서버로부터 친구 목록을 가져올 수 없었습니다. 친구 목록이 유실된 것은 아닙니다. 아마도 몇 시간 후에는 이용이 가능할 것으로 예상합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:4890
+#: ../libgaim/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4896
+#: ../libgaim/protocols/oscar/oscar.c:5072
+#: ../libgaim/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5078
+msgid "Orphans"
+msgstr "고아"
+
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "치구 %s 님을 추가할 수 없었습니다. 친구 수가 너무 많습니다. 한 명을 삭제한 후, 재시도 해 보시기 바랍니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libgaim/protocols/oscar/oscar.c:5016
+msgid "(no name)"
+msgstr "(이름 없음)"
+
+#: ../libgaim/protocols/oscar/oscar.c:5016
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "알 수 없는 이유에 의해 친구 %s 을(를) 추가할 수 없었습니다. 일반적인 문제로서는, 친구 목록에 추가 가능한 친구 수를 초과한 경우일 수 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5109
+#, c-format
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "사용자 %s 님이 나를 친구 목록에 추가하는 것을 허가했습니다. 그들을 추가하시겠습니까?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5115
+msgid "Authorization Given"
+msgstr "승인을 받았습니다."
+
+#. Granted
+#: ../libgaim/protocols/oscar/oscar.c:5193
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "사용자 %s 님은 친구 목록 추가에 대한 내 요구를 승인했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5194
+msgid "Authorization Granted"
+msgstr "승인을 받았습니다."
+
+#. Denied
+#: ../libgaim/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
-"Invitation from: %s\n"
-"\n"
-"Sent: %s"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1888
-#, fuzzy
-msgid "Would you like to join the conversation?"
-msgstr "정말 덮어 쓸까요?"
-
-#: src/protocols/novell/novell.c:1995
-#, fuzzy
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "다른 곳에서 같은 아이디로 접속해 연결이 끊겼습니다."
-
-#: src/protocols/novell/novell.c:2051
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"%s"
 msgstr ""
-
-#. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
-#, fuzzy
+"사용자 %s 님은 다음의 이유로 친구 목록 추가에 대한 내 요구를 거부했습니다.:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:5198
+msgid "Authorization Denied"
+msgstr "인증이 거부되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5234
+#: ../libgaim/protocols/toc/toc.c:1378
+msgid "_Exchange:"
+msgstr "교환(_E):"
+
+#: ../libgaim/protocols/oscar/oscar.c:5274
+msgid "Invalid chat name specified."
+msgstr "잘못된 대화명이 지정되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5344
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "IM 이미지가 전송되지 못했습니다. AIM 대화로는 IM 이미지를 보낼 수 없습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5516
+#: ../libgaim/protocols/oscar/oscar.c:5521
+msgid "Away Message"
+msgstr "자리 비움 메시지"
+
+#: ../libgaim/protocols/oscar/oscar.c:5521
+msgid "<i>(retrieving)</i>"
+msgstr "<i>(가져오는 중)</i>"
+
+#: ../libgaim/protocols/oscar/oscar.c:5834
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s 님에 대한 친구 코멘트"
+
+#: ../libgaim/protocols/oscar/oscar.c:5835
+msgid "Buddy Comment:"
+msgstr "친구 코멘트:"
+
+#: ../libgaim/protocols/oscar/oscar.c:5881
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "%s 을(를) 이용한 Direct IM 접속의 시작을 선택했습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:5885
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "이유는, 내 IP 주소를 표시하게 되기 때문입니다. 이는 개인 정보에 관한 위험성이 커집니다. 계속 하시겠습니까?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5889
+msgid "C_onnect"
+msgstr "접속(_O)"
+
+#: ../libgaim/protocols/oscar/oscar.c:5924
+msgid "Get AIM Info"
+msgstr "AIM 정보 가져오기"
+
+#: ../libgaim/protocols/oscar/oscar.c:5930
+msgid "Edit Buddy Comment"
+msgstr "친구 코멘트 편집"
+
+#: ../libgaim/protocols/oscar/oscar.c:5938
+msgid "Get Status Msg"
+msgstr "상태 메시지 가져오기"
+
+#: ../libgaim/protocols/oscar/oscar.c:5951
+msgid "Direct IM"
+msgstr "Direct IM"
+
+#: ../libgaim/protocols/oscar/oscar.c:5973
+msgid "Re-request Authorization"
+msgstr "승인 재요청"
+
+#: ../libgaim/protocols/oscar/oscar.c:6032
+msgid "Require authorization"
+msgstr "승인이 필요합니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6035
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Web aware (이것을 사용하면 스팸을 수신하게 됩니다!)"
+
+#: ../libgaim/protocols/oscar/oscar.c:6040
+msgid "ICQ Privacy Options"
+msgstr "ICQ 개인 설정"
+
+#: ../libgaim/protocols/oscar/oscar.c:6057
+msgid "The new formatting is invalid."
+msgstr "새 서식이 잘못되었습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6058
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr "아이디의 서식은 대문자와 공백 문자만 변경할 수 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6065
+msgid "New screen name formatting:"
+msgstr "새 아이디 서식:"
+
+#: ../libgaim/protocols/oscar/oscar.c:6121
+msgid "Change Address To:"
+msgstr "변경할 주소:"
+
+#: ../libgaim/protocols/oscar/oscar.c:6166
+msgid "<i>you are not waiting for authorization</i>"
+msgstr "<i>승인을 기다리고 있지 않습니다.</i>"
+
+#: ../libgaim/protocols/oscar/oscar.c:6169
+msgid "You are awaiting authorization from the following buddies"
+msgstr "다음 친구로부터의 승인을 기다리고 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6170
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "오른쪽 클릭하여 \"승인 재요청\" 을 선택하면, 이들의 친구로부터 인증을 재요청할 수 있습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6187
+msgid "Find Buddy by E-Mail"
+msgstr "이메일로부터 친구 찾기"
+
+#: ../libgaim/protocols/oscar/oscar.c:6188
+msgid "Search for a buddy by e-mail address"
+msgstr "이메일 주소로부터 친구를 찾습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:6189
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "검색할 친구의 이메일 주소를 입력해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:6192
+msgid "_Search"
+msgstr "검색(_S)"
+
+#: ../libgaim/protocols/oscar/oscar.c:6361
+msgid "Set User Info (URL)..."
+msgstr "사용자 정보 설정(URL)..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6372
+msgid "Change Password (URL)"
+msgstr "비밀번호 변경 (URL)"
+
+#: ../libgaim/protocols/oscar/oscar.c:6376
+msgid "Configure IM Forwarding (URL)"
+msgstr "IM 포워딩 (URL) 설정"
+
+#. ICQ actions
+#: ../libgaim/protocols/oscar/oscar.c:6386
+msgid "Set Privacy Options..."
+msgstr "개인 설정 추가..."
+
+#. AIM actions
+#: ../libgaim/protocols/oscar/oscar.c:6393
+msgid "Format Screen Name..."
+msgstr "아이디 서식..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6397
+msgid "Confirm Account"
+msgstr "계정 확인"
+
+#: ../libgaim/protocols/oscar/oscar.c:6401
+msgid "Display Currently Registered E-Mail Address"
+msgstr "현재 등록되어 있는 이메일 주소 표시"
+
+#: ../libgaim/protocols/oscar/oscar.c:6405
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "현재 등록되어 있는 이메일 주소 변경..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6412
+msgid "Show Buddies Awaiting Authorization"
+msgstr "승인을 기다리는 친구 표시"
+
+#: ../libgaim/protocols/oscar/oscar.c:6418
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "이메일로 친구 검색..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6423
+msgid "Search for Buddy by Information"
+msgstr "정보로 친구 검색..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6491
+msgid "Use recent buddies group"
+msgstr "현재의 그룹 이용"
+
+#: ../libgaim/protocols/oscar/oscar.c:6494
+msgid "Show how long you have been idle"
+msgstr "대기 중 시간 표시"
+
+#: ../libgaim/protocols/oscar/peer.c:674
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Direct IM 으로 %s 은(는) %s:%hu 에게 질의가 들어와 있습니다."
+
+#: ../libgaim/protocols/oscar/peer.c:759
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s:%hu (으)로 연락처를 시험하고 있습니다."
+
+#: ../libgaim/protocols/oscar/peer.c:833
+msgid "Attempting to connect via proxy server."
+msgstr "프록시 서버를 통해 연락처를 시험하고 있습니다."
+
+#: ../libgaim/protocols/oscar/peer.c:1010
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s 은(는) 직접 %s 에 접속하도록 요구했습니다."
+
+#: ../libgaim/protocols/oscar/peer.c:1014
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "이를 수행하기 위해서는 2대의 컴퓨터를 직접 연결해야 하며, IM 이미지에 필요합니다. IP 주소가 노출되기 때문에, 개인에 대한 위험 사고가 발생할 수도 있습니다."
+
+#: ../libgaim/protocols/oscar/peer.c:1020
+msgid "_Connect"
+msgstr "접속(_C)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Primary Information"
+msgstr "주요 정보"
+
+#: ../libgaim/protocols/qq/buddy_info.c:41
+msgid "Personal Introduction"
+msgstr "개인 정보"
+
+#: ../libgaim/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr "QQ 번호"
+
+#: ../libgaim/protocols/qq/buddy_info.c:47
+msgid "Country/Region"
+msgstr "국가/지역"
+
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr "시/도"
+
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr "별자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr "십이간지"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr "혈액형"
+
+#: ../libgaim/protocols/qq/buddy_info.c:54
+msgid "College"
+msgstr "학력"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Email"
+msgstr "이메일"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "우편번호"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "휴대 전화"
+
+#: ../libgaim/protocols/qq/buddy_info.c:59
+msgid "Phone Number"
+msgstr "전화 번호"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr "물병자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Pisces"
+msgstr "물고기자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Aries"
+msgstr "양치기자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Taurus"
+msgstr "목동자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Gemini"
+msgstr "쌍동이자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Cancer"
+msgstr "게자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr "사자자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr "처녀자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr "천칭자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Scorpio"
+msgstr "전갈자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr "궁수자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr "양자리"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rat"
+msgstr "자(쥐)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr "축(소)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Tiger"
+msgstr "인(호랑이)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr "묘(토끼)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr "진(용)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Snake"
+msgstr "사(뱀)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Horse"
+msgstr "오(말)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr "미(양)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:72
+msgid "Monkey"
+msgstr "신(원숭이)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Rooster"
+msgstr "유(닭)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr "술(개)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:73
+msgid "Pig"
+msgstr "해(돼지)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:78
+msgid "Other"
+msgstr "기타"
+
+#: ../libgaim/protocols/qq/buddy_info.c:481
+#: ../libgaim/protocols/qq/buddy_info.c:482
+msgid "Modify my information"
+msgstr "정보 변경"
+
+#: ../libgaim/protocols/qq/buddy_info.c:483
+msgid "Update my information"
+msgstr "정보 갱신"
+
+#: ../libgaim/protocols/qq/buddy_info.c:506
+msgid "Your information has been updated"
+msgstr "정보를 변경했습니다."
+
+#: ../libgaim/protocols/qq/buddy_info.c:565
+msgid "You are attempting to set a custom face. Gaim currently only allows the standard faces. Please choose an image from "
+msgstr "사용자 이모티콘을 설정하려고 했습니다. Pidgin에서는 현재 표준 이모티콘만을 지원하고 있습니다. 다음으로부터 이미지를 선택해 주십시오:"
+
+#: ../libgaim/protocols/qq/buddy_info.c:582
+#: ../libgaim/protocols/qq/buddy_info.c:595
+msgid "Invalid QQ Face"
+msgstr "잘못된 QQ 이모티콘입니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
+#, c-format
+msgid "You rejected %d's request"
+msgstr "%d 개의 요구를 거부했습니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
+msgid "Input your reason:"
+msgstr "이유를 입력해 주십시오:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+msgid "Reject request"
+msgstr "요구 거부"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
+msgid "Sorry, you are not my type..."
+msgstr "죄송합니다, 제 스타일이 아닙니다..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85
+#: ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Reject"
+msgstr "거부"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:272
+msgid "Add buddy with auth request fails"
+msgstr "인증 첨부 친구의 추가에 실패했습니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:303
+msgid "You have successfully removed a buddy"
+msgstr "친구를 삭제했습니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:331
+msgid "You have successfully removed yourself from a buddy"
+msgstr "친구 목록으로부터 나 자신을 삭제했습니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#, c-format
+msgid "User %d needs authentication"
+msgstr "사용자 %d 님은 인증이 필요합니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+msgid "Input request here"
+msgstr "이곳에 요청 사항을 입력하십시오."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
+msgid "Would you be my friend?"
+msgstr "제 친구가 되어 주시지 않겠습니까?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
+msgid "Send"
+msgstr "보내기"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:406
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "%d 님을 친구 목록에 추가했습니다."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:503
+msgid "QQid Error"
+msgstr "QQid 오류"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:504
+msgid "Invalid QQid"
+msgstr "잘못된 QQid 입니다."
+
+#: ../libgaim/protocols/qq/group.c:65
+msgid "ID: "
+msgstr "ID: "
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Group ID"
+msgstr "그룹 ID"
+
+#: ../libgaim/protocols/qq/group.c:100
+msgid "Creator"
+msgstr "작성자"
+
+#: ../libgaim/protocols/qq/group.c:103
+msgid "Group Description"
+msgstr "그룹 설명"
+
+#: ../libgaim/protocols/qq/group.c:109
+msgid "Auth"
+msgstr "인증"
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libgaim/protocols/qq/group.c:120
+msgid "Please input external group ID"
+msgstr "외부 그룹 ID를 입력해 주십시오."
+
+#: ../libgaim/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr "영구적으로 사용 가능한 QQ 그룹만을 검색할 수 있습니다.\n"
+
+#: ../libgaim/protocols/qq/group_im.c:122
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "사용자 %d 님이 그룹 %d 에 참가했습니다."
+
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
+#, c-format
+msgid "Reason: %s"
+msgstr "이유: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
+msgid "QQ Qun Operation"
+msgstr "QQ Qun 조작"
+
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87
+#: ../libgaim/protocols/qq/sys_msg.c:230
+msgid "Approve"
+msgstr "인증"
+
+#: ../libgaim/protocols/qq/group_im.c:171
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 거부되었습니다."
+
+#: ../libgaim/protocols/qq/group_im.c:212
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 승인되었습니다."
+
+#: ../libgaim/protocols/qq/group_im.c:248
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "나 [%d] 은(는) 그룹 \"%d\" (으)로부터 퇴거했습니다."
+
+#: ../libgaim/protocols/qq/group_im.c:282
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "나 [%d] 은(는) 그룹 \"%d\" 에 추가되었습니다."
+
+#: ../libgaim/protocols/qq/group_im.c:283
+msgid "This group has been added to your buddy list"
+msgstr "이 그룹은 친구 목록에 추가되어 있습니다."
+
+#: ../libgaim/protocols/qq/group_internal.c:41
+msgid "I am not member"
+msgstr "저는 멤버가 아닙니다."
+
+#: ../libgaim/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr "저는 멤버입니다."
+
+#: ../libgaim/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr "저는 가입 신청 중입니다."
+
+#: ../libgaim/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr "저는 관리자입니다."
+
+#: ../libgaim/protocols/qq/group_internal.c:53
+msgid "Unknown status"
+msgstr "알 수 없는 상태"
+
+#: ../libgaim/protocols/qq/group_join.c:80
+msgid "This group does not allow others to join"
+msgstr "이 그룹에서는 다른 사람들의 참가를 허가하지 않고 있습니다."
+
+#: ../libgaim/protocols/qq/group_join.c:229
+msgid "You have successfully exited the group"
+msgstr "그룹으로부터 퇴거가 완료되었습니다."
+
+#: ../libgaim/protocols/qq/group_join.c:253
+msgid "QQ Group Auth"
+msgstr "QQ 그룹 인증"
+
+#: ../libgaim/protocols/qq/group_join.c:254
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "인증 조작이 QQ 서버에 의해 허가되었습니다."
+
+#: ../libgaim/protocols/qq/group_join.c:325
+msgid "You inputted a group id outside the acceptable range"
+msgstr "입력한 그룹 ID는 범위 밖입니다."
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid "Are you sure to exit this Qun?"
+msgstr "이 Qun 을 종료하시겠습니까?"
+
+#: ../libgaim/protocols/qq/group_join.c:358
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr "차단할 사용자의 이름을 넣으세요."
-
-#: src/protocols/novell/novell.c:2171
-msgid "Error. SSL support is not installed."
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
 msgstr ""
-
-#: src/protocols/novell/novell.c:2475
-msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
-
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-#, fuzzy
-msgid "Appear Offline"
-msgstr "오프라인"
+"주: 내가 작성자인 경우,\n"
+"이 조작에 의해 최종적으로 Qun 이 완전히 삭제됩니다."
+
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr "계속하기"
+
+#: ../libgaim/protocols/qq/group_network.c:90
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "코드 [0x%02X]: %s"
+
+#: ../libgaim/protocols/qq/group_network.c:91
+msgid "Group Operation Error"
+msgstr "그룹 조작 오류"
+
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
+msgid "Do you wanna approve the request?"
+msgstr "그 요청을 승인하시겠습니까?"
+
+#: ../libgaim/protocols/qq/group_opt.c:230
+msgid "You have successfully modify Qun member"
+msgstr "Qun 멤버 변경이 성공적으로 완료되었습니다."
+
+#: ../libgaim/protocols/qq/group_opt.c:300
+msgid "You have successfully modify Qun information"
+msgstr "Qun 정보 변경을 성공적으로 완료했습니다."
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "You have successfully created a Qun"
+msgstr "Qun 생성이 성공적으로 완료했습니다."
+
+#: ../libgaim/protocols/qq/group_opt.c:389
+msgid "Would you like to set up the Qun details now?"
+msgstr "지금 바로 Qun 의 상세 정보를 입력하시겠습니까?"
+
+#: ../libgaim/protocols/qq/group_opt.c:390
+msgid "Setup"
+msgstr "입력"
+
+#: ../libgaim/protocols/qq/im.c:423
+msgid "System Message"
+msgstr "시스템 메시지"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Server ACK"
+msgstr "서버 ACK"
+
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Send IM fail\n"
+msgstr "메일 전송 오류\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr "오류가 연속적으로 발생하고 있습니다. 접속이 끊어진 것 같습니다!"
+
+#: ../libgaim/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr "로그인 요청 오류!"
+
+#: ../libgaim/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr "로그인 할 수 없습니다. 디버그 로그를 확인해 주십시오."
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:139
+#: ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2351
+#: ../libgaim/protocols/yahoo/yahoo.c:2378
+#: ../libgaim/protocols/yahoo/yahoo.c:2485
+#: ../libgaim/protocols/yahoo/yahoo.c:2506
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "접속할 수 없습니다."
+
+#: ../libgaim/protocols/qq/qq.c:186
+#, c-format
+msgid "Unknown-%d"
+msgstr "알 수 없는 %d"
+
+#: ../libgaim/protocols/qq/qq.c:209
+#, c-format
+msgid "%s Address"
+msgstr "%s 주소"
+
+#: ../libgaim/protocols/qq/qq.c:240
+msgid "Level"
+msgstr "수준"
+
+#: ../libgaim/protocols/qq/qq.c:294
+msgid "QQ: Available"
+msgstr "QQ: 자리에 있음"
+
+#: ../libgaim/protocols/qq/qq.c:298
+msgid "QQ: Away"
+msgstr "QQ: 자리 비움"
+
+#: ../libgaim/protocols/qq/qq.c:302
+msgid "QQ: Invisible"
+msgstr "QQ: 숨은 상태"
+
+#: ../libgaim/protocols/qq/qq.c:306
+msgid "QQ: Offline"
+msgstr "QQ: 오프라인"
+
+#: ../libgaim/protocols/qq/qq.c:383
+msgid "Invalid name"
+msgstr "이름이 잘못되었습니다."
+
+#: ../libgaim/protocols/qq/qq.c:450
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>현재의 온라인</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:451
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>마지막 갱신</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:455
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>접속 모드</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:456
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>서버 IP</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:457
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>내 공용 IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:462
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>로그인 일시</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:463
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>마지막 로그인 IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:464
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>마지막 로그인 일시</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:468
+msgid "Login Information"
+msgstr "로그인 정보"
+
+#: ../libgaim/protocols/qq/qq.c:543
+msgid "Modify My Information"
+msgstr "내 정보 변경"
+
+#: ../libgaim/protocols/qq/qq.c:546
+#: ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "비밀번호 변경"
+
+#: ../libgaim/protocols/qq/qq.c:549
+msgid "Show Login Information"
+msgstr "로그인 정보 표시"
+
+#: ../libgaim/protocols/qq/qq.c:570
+msgid "Exit this QQ Qun"
+msgstr "이 QQ Qun 종료"
 
 #. *< type
 #. *< ui_requirement
@@ -7562,2033 +11972,1235 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
-msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:3561
-msgid "Server address"
-msgstr "서버 주소"
-
-#: src/protocols/novell/novell.c:3565
-msgid "Server port"
-msgstr "서버 포트"
-
-#: src/protocols/oscar/oscar.c:202
-msgid "Invalid error"
-msgstr "잘못된 오류"
-
-#: src/protocols/oscar/oscar.c:203
-msgid "Invalid SNAC"
-msgstr "잘못된 SNAC"
-
-#: src/protocols/oscar/oscar.c:204
-msgid "Rate to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:205
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:207
-msgid "Service unavailable"
-msgstr "서비스 불가능"
-
-#: src/protocols/oscar/oscar.c:208
-msgid "Service not defined"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:209
-msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:210
-msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:211
-msgid "Not supported by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:212
-msgid "Refused by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:213
-msgid "Reply too big"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:214
-msgid "Responses lost"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:215
-msgid "Request denied"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:216
-msgid "Busted SNAC payload"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:217
-msgid "Insufficient rights"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:218
-msgid "In local permit/deny"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:219
-msgid "Too evil (sender)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:220
-msgid "Too evil (receiver)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:221
-msgid "User temporarily unavailable"
-msgstr "사용자가 일시적으로 끊김"
-
-#: src/protocols/oscar/oscar.c:222
-msgid "No match"
-msgstr "맞지 않음"
-
-#: src/protocols/oscar/oscar.c:223
-msgid "List overflow"
-msgstr "목록 넘침"
-
-#: src/protocols/oscar/oscar.c:224
-msgid "Request ambiguous"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:225
-msgid "Queue full"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:226
-msgid "Not while on AOL"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
-#, fuzzy
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"(이 메시지에서 변환 오류가 발생했습니다.  계정 편집기에서 '인코딩' 옵션을 확"
-"인하세요.)"
-
-#: src/protocols/oscar/oscar.c:616
-msgid "Voice"
-msgstr "음성"
-
-#: src/protocols/oscar/oscar.c:619
-#, fuzzy
-msgid "AIM Direct IM"
-msgstr "직접 연결"
-
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
-msgid "Chat"
-msgstr "대화"
-
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
-msgid "Get File"
-msgstr "파일 받기"
-
-#: src/protocols/oscar/oscar.c:632
-msgid "Games"
-msgstr "게임"
-
-#: src/protocols/oscar/oscar.c:635
-msgid "Add-Ins"
-msgstr "애드인"
-
-#: src/protocols/oscar/oscar.c:638
-msgid "Send Buddy List"
-msgstr "친구 목록 보내기"
-
-#: src/protocols/oscar/oscar.c:641
-msgid "ICQ Direct Connect"
-msgstr "ICQ 직접 연결"
-
-#: src/protocols/oscar/oscar.c:644
-msgid "AP User"
-msgstr "AP 사용자"
-
-#: src/protocols/oscar/oscar.c:647
-msgid "ICQ RTF"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:650
-msgid "Nihilist"
-msgstr "허무주의자"
-
-#: src/protocols/oscar/oscar.c:653
-msgid "ICQ Server Relay"
-msgstr "ICQ 서버 릴레이"
-
-#: src/protocols/oscar/oscar.c:656
-msgid "Old ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:659
-msgid "Trillian Encryption"
-msgstr "트릴리안 암호화"
-
-#: src/protocols/oscar/oscar.c:662
-msgid "ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:665
-msgid "Hiptop"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:668
-msgid "Security Enabled"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:671
-#, fuzzy
-msgid "Video Chat"
-msgstr "채팅 더하기"
-
-#: src/protocols/oscar/oscar.c:675
-#, fuzzy
-msgid "iChat AV"
-msgstr "대화"
-
-#: src/protocols/oscar/oscar.c:678
-msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:681
-#, fuzzy
-msgid "Camera"
-msgstr "이름"
-
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
-msgid "Free For Chat"
-msgstr "대화할 수 있음"
-
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
-msgid "Not Available"
-msgstr "사용할 수 없음"
-
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
-msgid "Occupied"
-msgstr "사용하고 있음"
-
-#: src/protocols/oscar/oscar.c:709
-msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
-#, fuzzy
-msgid "Warning Level"
-msgstr "경고 수준 보여주기(_W)"
-
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "기능"
-
-#: src/protocols/oscar/oscar.c:801
-msgid "Buddy Comment"
-msgstr "친구 메모"
-
-#: src/protocols/oscar/oscar.c:958
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "%s와의 직접 연결이 끊겼습니다"
-
-#: src/protocols/oscar/oscar.c:960
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "%s와의 직접 연결에 실패했습니다"
-
-#: src/protocols/oscar/oscar.c:968
-#, fuzzy
-msgid "Direct Connect failed"
-msgstr "연결할 수 없습니다"
-
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "%s와 직접 연결됨"
-
-#: src/protocols/oscar/oscar.c:1126
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1547
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1552
-msgid "Unable to open Direct IM"
-msgstr "다이렉트 메시지를 열 수 없음"
-
-#: src/protocols/oscar/oscar.c:1587
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "%s님과 다이렉트 메시지 연결을 선택했습니다."
-
-#: src/protocols/oscar/oscar.c:1591
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"이것은 내 IP 주소를 알리기 때문에 프라이버시 문제를 일으킬 수도 있습니다. 계"
-"속 할까요?"
-
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "연결"
-
-#: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "%s 대화실과의 연결이 끊겼습니다."
-
-#: src/protocols/oscar/oscar.c:1684
-msgid "Chat is currently unavailable"
-msgstr "지금은 채팅할 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:1754
-msgid "Screen name sent"
-msgstr "아이디 보냄"
-
-#: src/protocols/oscar/oscar.c:1770
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1799
-msgid "Unable to login to AIM"
-msgstr "AIM에 로그인할 수 없습니다"
-
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
-msgid "Could Not Connect"
-msgstr "연결할 수 없습니다"
-
-#: src/protocols/oscar/oscar.c:1911
-msgid "Connection established, cookie sent"
-msgstr "연결한 후 쿠키를 보냈습니다"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
-msgid "Attempting connection redirect..."
-msgstr "인증 확인 중"
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
-msgid "Unable to establish file descriptor."
-msgstr "파일 기술자가 유효하지 않습니다."
-
-#: src/protocols/oscar/oscar.c:2211
-msgid "Unable to create new connection."
-msgstr "새 연결을 만들 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
-msgid "Unable to log into file transfer proxy."
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:2532
-#, fuzzy
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "리스너 소켓이 유효하지 않습니다."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "아이디나 패스워드가 틀렸습니다."
-
-#: src/protocols/oscar/oscar.c:2738
-msgid "Your account is currently suspended."
-msgstr "계정이 현재 사용 유보 상태입니다."
-
-#. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
-msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL 메신저 서비스가 잠시 사용될 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:2747
-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 ""
-"너무 자주 연결하고 끊고 하였습니다. 10분을 기다린 후 다시 시도하십시요. 계속 "
-"시도한다면 기다려야 하는 시간이 더 길어집니다."
-
-#: src/protocols/oscar/oscar.c:2752
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"사용하고 있는 클라이언트가 너무 오래되었습니다. 다음 위치에서 업그레이드하십"
-"시오. %s"
-
-#: src/protocols/oscar/oscar.c:2783
-msgid "Internal Error"
-msgstr "내부 오류"
-
-#: src/protocols/oscar/oscar.c:2853
-msgid "Received authorization"
-msgstr "인증정보 받음"
-
-#: src/protocols/oscar/oscar.c:2877
-msgid "The SecurID key entered is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2891
-msgid "Enter SecurID"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2892
-msgid "Enter the 6 digit number from the digital display."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "게임이 유효한 AIM 로그인 해시를 얻어올 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:3054
-msgid "Gaim was unable to get a valid login hash."
-msgstr "게임이 유효한 로그인 해시를 얻어올 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:3085
-msgid "Password sent"
-msgstr "열쇠글 보냄"
-
-#: src/protocols/oscar/oscar.c:4352
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4355
-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 ""
-
-#: src/protocols/oscar/oscar.c:4394
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "내가 친구 목록에 당신을 더하려고 합니다. 인증 바랍니다."
-
-#: src/protocols/oscar/oscar.c:4402
-msgid "Authorization Request Message:"
-msgstr "인증 요청 메시지:"
-
-#: src/protocols/oscar/oscar.c:4403
-msgid "Please authorize me!"
-msgstr "나를 인증해주세요!"
-
-#: src/protocols/oscar/oscar.c:4433
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr "%s님을 친구목록에 더하기 전에 인증이 필요합니다. 인증 요청을 보낼까요?"
-
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
-msgid "Request Authorization"
-msgstr "인증 요청"
-
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
-msgid "No reason given."
-msgstr "이유를 입력하지 않았습니다."
-
-#: src/protocols/oscar/oscar.c:4483
-msgid "Authorization Denied Message:"
-msgstr "인증 거절 메시지:"
-
-#: src/protocols/oscar/oscar.c:4590
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"%u 사용자가 다음 이유로 나를 자신의 친구 목록에 등록하려고 함:\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
-msgid "Authorization Request"
-msgstr "인증 요청"
-
-#: src/protocols/oscar/oscar.c:4612
-#, fuzzy, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
-msgstr ""
-"%u 사용자가 친구 등록 요청을 다음과 같은 이유로 거절했습니다: \n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4613
-msgid "ICQ authorization denied."
-msgstr "ICQ 인증이 거부되었습니다."
-
-#. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
-#, fuzzy, c-format
-msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "%u 사용자가 친구 등록을 허락했습니다."
-
-#: src/protocols/oscar/oscar.c:4628
-#, c-format
-msgid ""
-"You have received a special message\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-msgstr ""
-"특별한 메시지를 받음\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4636
-#, c-format
-msgid ""
-"You have received an ICQ page\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-msgstr ""
-"ICQ 호출을 받음\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4644
-#, c-format
-msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
-"\n"
-"Message is:\n"
-"%s"
-msgstr ""
-"%s [%s]님으로부터 ICQ 이메일을 받음\n"
-"\n"
-"내용:\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4665
-#, c-format
-msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4671
-#, fuzzy
-msgid "Do you want to add this buddy to your buddy list?"
-msgstr "내 친구 목록에 이 연락처를 더할까요?"
-
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
-msgstr "연결 끊김"
-
-#: src/protocols/oscar/oscar.c:4759
-#, c-format
-msgid "You missed %hu message from %s because it was invalid."
-msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] ""
-
-#: src/protocols/oscar/oscar.c:4768
-#, c-format
-msgid "You missed %hu message from %s because it was too large."
-msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] ""
-
-#: src/protocols/oscar/oscar.c:4777
+#: ../libgaim/protocols/qq/qq.c:731
+#: ../libgaim/protocols/qq/qq.c:733
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ 프로토콜\t플러그인"
+
+#: ../libgaim/protocols/qq/qq.c:752
+msgid "Login in TCP"
+msgstr "TCP 로 로그인"
+
+#: ../libgaim/protocols/qq/qq.c:755
+msgid "Login Hidden"
+msgstr "로그인 숨김"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:497
+msgid "Socket send error"
+msgstr "소켓 전송 오류"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:500
+msgid "Connection refused"
+msgstr "접속이 거부되었습니다."
+
+#: ../libgaim/protocols/qq/recv_core.c:309
+msgid "Socket error"
+msgstr "소켓 오류"
+
+#: ../libgaim/protocols/qq/recv_core.c:319
+msgid "Unable to read from socket"
+msgstr "소켓으로부터 읽을 수 없습니다."
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d 님이 파일 %s 을(를) 거절했습니다."
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "파일 보내기"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d 님이 %s 의 전송을 취소했습니다."
+
+#: ../libgaim/protocols/qq/sendqueue.c:122
+msgid "Connection lost"
+msgstr "접속을 닫았습니다."
+
+#. cancel login progress
+#: ../libgaim/protocols/qq/sendqueue.c:130
+msgid "Login failed, no reply"
+msgstr "로그인에 실패했습니다. 응답 없음."
+
+#: ../libgaim/protocols/qq/sys_msg.c:103
+msgid "Do you wanna add this buddy?"
+msgstr "이 상대를 추가하시겠습니까?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:155
+#, c-format
+msgid "You have been added by %s"
+msgstr "내가 %s 님에 의해 추가되었습니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:158
+msgid "Would like to add him?"
+msgstr "그를 추가하시겠습니까?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:164
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:179
+#, c-format
+msgid "User %s rejected your request"
+msgstr "사용자 %s 님이 내 요청을 거부했습니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:199
+#, c-format
+msgid "User %s has approved your request"
+msgstr "사용자 %s 님이 내 요청을 승인했습니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:222
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s 님이 나 [%s] 을(를) 친구로 추가하고 싶어 합니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:223
+#, c-format
+msgid "Message: %s"
+msgstr "메시지: %s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:244
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s 님은 친구 목록에 없습니다."
+
+#: ../libgaim/protocols/qq/sys_msg.c:246
+msgid "Would you like to add him?"
+msgstr "그를 추가하시겠습니까?"
+
+#: ../libgaim/protocols/sametime/sametime.c:417
+msgid "Connection closed (writing)"
+msgstr "쓰기 연결을 닫았습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1290
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>그룹명:</b> %s<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:1291
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes 그룹 ID:</b> %s<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:1293
+#, c-format
+msgid "Info for Group %s"
+msgstr "그룹 \"%s\" 정보"
+
+#: ../libgaim/protocols/sametime/sametime.c:1295
+msgid "Notes Address Book Information"
+msgstr "Notes 주소록 정보"
+
+#: ../libgaim/protocols/sametime/sametime.c:1327
+msgid "Invite Group to Conference..."
+msgstr "그룹을 회의에 초대..."
+
+#: ../libgaim/protocols/sametime/sametime.c:1337
+msgid "Get Notes Address Book Info"
+msgstr "Notes 주소록 정보 가져오기"
+
+#: ../libgaim/protocols/sametime/sametime.c:1504
+msgid "Sending Handshake"
+msgstr "핸드쉐이크 전송 중입니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1509
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "핸드쉐이크 응답을 기다리고 있습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1514
+msgid "Handshake Acknowledged, Sending Login"
+msgstr "핸드쉐이크 응답을 받았기 때문에, 로그인하고 있습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1519
+msgid "Waiting for Login Acknowledgement"
+msgstr "로그인 처리 응답을 기다리고 있습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1524
+msgid "Login Redirected"
+msgstr "로그인 처리가 리다이렉트 되었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1530
+msgid "Forcing Login"
+msgstr "강제적으로 로그인하고 있습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1534
+msgid "Login Acknowledged"
+msgstr "로그인 처리 응답을 받았습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1539
+msgid "Starting Services"
+msgstr "서비스 개시"
+
+#: ../libgaim/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "접속되었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1645
+#, c-format
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "Sametime 관리자가 서버 %s 에서 다음의 공지를 발표했습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1650
+msgid "Sametime Administrator Announcement"
+msgstr "Sametime 관리자 공지"
+
+#: ../libgaim/protocols/sametime/sametime.c:1702
+msgid "Connection reset"
+msgstr "접속 초기화"
+
+#: ../libgaim/protocols/sametime/sametime.c:1709
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "소켓으로부터 읽는 중 오류: %s"
+
+#. this is a regular connect, error out
+#: ../libgaim/protocols/sametime/sametime.c:1732
+#: ../libgaim/protocols/sametime/sametime.c:3745
+msgid "Unable to connect to host"
+msgstr "호스트에 접속할 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1770
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s (으)로부터의 공지"
+
+#: ../libgaim/protocols/sametime/sametime.c:1944
+msgid "Conference Closed"
+msgstr "회의를 폐회했습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:2403
+msgid "Unable to send message: "
+msgstr "메시지를 보낼 수 없습니다: "
+
+#: ../libgaim/protocols/sametime/sametime.c:2960
+msgid "Place Closed"
+msgstr "Place Closed"
+
+#: ../libgaim/protocols/sametime/sametime.c:3251
+msgid "Microphone"
+msgstr "마이크"
+
+#: ../libgaim/protocols/sametime/sametime.c:3252
+msgid "Speakers"
+msgstr "스피커"
+
+#: ../libgaim/protocols/sametime/sametime.c:3253
+msgid "Video Camera"
+msgstr "비디오 카메라"
+
+#: ../libgaim/protocols/sametime/sametime.c:3257
+msgid "File Transfer"
+msgstr "파일 전송"
+
+#: ../libgaim/protocols/sametime/sametime.c:3291
+#: ../libgaim/protocols/sametime/sametime.c:4165
+msgid "Supports"
+msgstr "지원"
+
+#: ../libgaim/protocols/sametime/sametime.c:3296
+#: ../libgaim/protocols/sametime/sametime.c:4139
+msgid "External User"
+msgstr "외부 사용자"
+
+#: ../libgaim/protocols/sametime/sametime.c:3402
+msgid "Create conference with user"
+msgstr "사용자를 포함한 회의 생성"
+
+#: ../libgaim/protocols/sametime/sametime.c:3403
+#, c-format
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "새로운 회의로 상정할 주제를 입력하고, %s 님에게 초대 메시지를 보내 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:3407
+msgid "New Conference"
+msgstr "새 회의"
+
+#: ../libgaim/protocols/sametime/sametime.c:3409
+msgid "Create"
+msgstr "생성"
+
+#: ../libgaim/protocols/sametime/sametime.c:3473
+msgid "Available Conferences"
+msgstr "참가 가능한 회의"
+
+#: ../libgaim/protocols/sametime/sametime.c:3479
+msgid "Create New Conference..."
+msgstr "새 회의 생성..."
+
+#: ../libgaim/protocols/sametime/sametime.c:3486
+msgid "Invite user to a conference"
+msgstr "회의에 초대"
+
+#: ../libgaim/protocols/sametime/sametime.c:3487
+#, 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 "다음 목록으로부터 사용자 %s 님을 초대할 회의를 선택해 주십시오. 새 회의를 생성할 경우에는 \"새 회의 생성\" 을 선택해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:3492
+msgid "Invite to Conference"
+msgstr "회의에 초대"
+
+#: ../libgaim/protocols/sametime/sametime.c:3582
+msgid "Invite to Conference..."
+msgstr "회의에 초대..."
+
+#: ../libgaim/protocols/sametime/sametime.c:3587
+msgid "Send TEST Announcement"
+msgstr "TEST 공지 전송"
+
+#: ../libgaim/protocols/sametime/sametime.c:3634
+msgid "No Sametime Community Server specified"
+msgstr "Sametime 커뮤니티 서버를 지정해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:3656
+#, 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 "계정 %s 에 대한 호스트명 또는 IP 주소가 지정되어 있지 않습니다. 다음 빈 칸을 입력한 후, 로그인 처리를 계속하시기 바랍니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:3661
+msgid "Meanwhile Connection Setup"
+msgstr "접속 설정"
+
+#: ../libgaim/protocols/sametime/sametime.c:3662
+msgid "No Sametime Community Server Specified"
+msgstr "Sametime 커뮤니티 서버를 지정해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:4155
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "알 수 없음 (0x%04x)<br>"
+
+#: ../libgaim/protocols/sametime/sametime.c:4157
+msgid "Last Known Client"
+msgstr "마지막 인식 클라이언트"
+
+#: ../libgaim/protocols/sametime/sametime.c:4321
+#: ../libgaim/protocols/sametime/sametime.c:5516
+msgid "User Name"
+msgstr "사용자명"
+
+#: ../libgaim/protocols/sametime/sametime.c:4324
+#: ../libgaim/protocols/sametime/sametime.c:5519
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+#: ../libgaim/protocols/sametime/sametime.c:4348
+msgid "An ambiguous user ID was entered"
+msgstr "모호한 사용자 ID 가 지정되었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:4349
+#, 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 "아마도 ID '%s' 은(는) 다음에 표시하는 사용자의 누군가를 참조하고 있는 것 같습니다. 친구 목록에 추가할 타당한 사용자를 다음 목록에서 선택해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:4354
+msgid "Select User"
+msgstr "사용자 선택"
+
+#: ../libgaim/protocols/sametime/sametime.c:4438
+msgid "Unable to add user: user not found"
+msgstr "사용자를 추가할 수 없습니다: 사용자를 찾을 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:4440
+#, 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 "ID '%s' 에 해당하는 사용자가 Sametime 커뮤니티 안에는 없었습니다. 친구 목록에서 이 항목을 삭제했습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:4445
+msgid "Unable to add user"
+msgstr "사용자를 추가할 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5031
 #, 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] ""
-
-#: src/protocols/oscar/oscar.c:4786
-#, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] ""
-
-#: src/protocols/oscar/oscar.c:4795
-#, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] ""
-
-#: src/protocols/oscar/oscar.c:4804
-#, c-format
-msgid "You missed %hu message from %s for an unknown reason."
-msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] ""
-
-#: src/protocols/oscar/oscar.c:4863
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>상태:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:4924
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC 오류: %s\n"
-
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
-#, fuzzy, c-format
-msgid "Unable to send message: %s"
-msgstr "메시지를 보낼 수 없습니다 (0x%X)."
-
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
-#, fuzzy
-msgid "Unknown reason."
-msgstr "알 수 없는 오류"
-
-#: src/protocols/oscar/oscar.c:4964
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "%s 계정으로 메시지를 보낼 수 없음:"
-
-#: src/protocols/oscar/oscar.c:5024
-#, fuzzy, c-format
-msgid "User information not available: %s"
-msgstr "%s님의 사용자 정보를 가져올 수 없음:"
-
-#: src/protocols/oscar/oscar.c:5027
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s님의 사용자 정보를 가져올 수 없음:"
-
-#: src/protocols/oscar/oscar.c:5054
-#, fuzzy
-msgid "Online Since"
-msgstr "연결 시기"
-
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
-msgid "Member Since"
-msgstr "가입시기"
-
-#: src/protocols/oscar/oscar.c:5142
-msgid "Your AIM connection may be lost."
-msgstr "AIM 접속이 끊어진 것 같습니다."
-
-#. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5554
-msgid "Rate limiting error."
-msgstr "제한 한계 오류."
-
-#: src/protocols/oscar/oscar.c:5555
-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 ""
-"지난 액션이 제한 한계를 넘어서 보내지지 않았습니다. 10초 후에 다시 시도하십시"
-"오."
-
-#: src/protocols/oscar/oscar.c:5631
-msgid "You have been signed off for an unknown reason."
-msgstr "알 수 없는 이유로 접속이 끊어졌습니다."
-
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "%s 대화실과의 연결이 끊겼습니다."
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
-msgid "Finalizing connection"
-msgstr "연결 마무리하는 중"
-
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
-msgid "Mobile Phone"
-msgstr "핸드폰"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "여성"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "남성"
-
-#: src/protocols/oscar/oscar.c:5995
-msgid "Personal Web Page"
-msgstr "홈페이지"
-
-#: src/protocols/oscar/oscar.c:5999
-msgid "Additional Information"
-msgstr "추가정보"
-
-#: src/protocols/oscar/oscar.c:6004
-msgid "Home Address"
-msgstr "집 주소"
-
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
-msgid "Zip Code"
-msgstr "우편번호"
-
-#: src/protocols/oscar/oscar.c:6012
-msgid "Work Address"
-msgstr "직장 주소"
-
-#: src/protocols/oscar/oscar.c:6020
-msgid "Work Information"
-msgstr "직장 정보"
-
-#: src/protocols/oscar/oscar.c:6021
-msgid "Company"
-msgstr "회사"
-
-#: src/protocols/oscar/oscar.c:6022
-msgid "Division"
-msgstr "파트"
-
-#: src/protocols/oscar/oscar.c:6023
-msgid "Position"
-msgstr "직위"
-
-#: src/protocols/oscar/oscar.c:6025
-msgid "Web Page"
-msgstr "홈페이지"
-
-#: src/protocols/oscar/oscar.c:6082
-msgid "Pop-Up Message"
-msgstr "팝업 메시지"
-
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6140
-#, c-format
-msgid "No results found for e-mail address %s"
-msgstr "%s 주소로 찾은 결과가 없음"
-
-#: src/protocols/oscar/oscar.c:6161
-#, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6163
-msgid "Account Confirmation Requested"
-msgstr "계정 확인 요청"
-
-#: src/protocols/oscar/oscar.c:6194
-msgid "Error Changing Account Info"
-msgstr "계정 정보 변경 중 오류"
-
-#: src/protocols/oscar/oscar.c:6197
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6200
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6203
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6206
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6209
-#, 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 ""
-
-#: src/protocols/oscar/oscar.c:6212
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6215
-#, c-format
-msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6225
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
-msgid "Account Info"
-msgstr "계정 정보"
-
-#: src/protocols/oscar/oscar.c:6231
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6298
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6480
-msgid "Unable to set AIM profile."
-msgstr "AIM 프로필을 설정할 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:6481
-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 ""
-
-#: src/protocols/oscar/oscar.c:6495
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:6500
-msgid "Profile too long."
-msgstr "프로파일이 너무 깁니다."
-
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
-msgid "Away message too long."
-msgstr "자리비움 메시지가 너무 깁니다."
-
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "AIM 자리비움 메시지를 설정할 수 없습니다."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6691
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
-msgid "Unable To Add"
-msgstr "더할 수 없음"
-
-#: src/protocols/oscar/oscar.c:6798
-msgid "Unable To Retrieve Buddy List"
-msgstr "친구목록을 받을 수 없음"
-
-#: src/protocols/oscar/oscar.c:6799
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
-msgid "Orphans"
-msgstr "고아"
-
-#: src/protocols/oscar/oscar.c:7090
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"내 친구 목록에 너무 많은 친구들이 있어서 %s님을 더할 수 없습니다. 하나를 지우"
-"고 다시 시도하세요."
-
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
-msgid "(no name)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7104
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
+"Error reading file %s: \n"
+"%s\n"
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:7187
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr "%s님이 나를 자신의 친구 목록에 등록하려고 합니다. 우리도 더할까요?"
-
-#: src/protocols/oscar/oscar.c:7193
-msgid "Authorization Given"
-msgstr "인증됨"
-
-#: src/protocols/oscar/oscar.c:7237
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"%s님이 다음과 같은 이유로 나를 자신의 친구목록에 등록하려고 함:\n"
-"%s"
-
-#. Granted
-#: src/protocols/oscar/oscar.c:7282
-#, fuzzy, c-format
-msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "%s님이 친구 등록을 허락했습니다."
-
-#: src/protocols/oscar/oscar.c:7283
-msgid "Authorization Granted"
-msgstr "인증이 허락됨"
-
-#. Denied
-#: src/protocols/oscar/oscar.c:7286
-#, fuzzy, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
-msgstr ""
-"%s님이 다음과 이유로 친구 등록을 거절했습니다:\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:7287
-msgid "Authorization Denied"
-msgstr "인증이 거절됨"
-
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
-#, fuzzy
-msgid "_Exchange:"
-msgstr "교환:"
-
-#: src/protocols/oscar/oscar.c:7360
-#, fuzzy
-msgid "Invalid chat name specified."
-msgstr "잘못된 가두-가두 UIN이 지정됨"
-
-#: src/protocols/oscar/oscar.c:7430
-msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7565
-#, fuzzy
-msgid "Away Message"
-msgstr "자리비움"
-
-#: src/protocols/oscar/oscar.c:7854
-#, fuzzy, c-format
-msgid "Buddy Comment for %s"
-msgstr "친구 메모"
-
-#: src/protocols/oscar/oscar.c:7855
-msgid "Buddy Comment:"
-msgstr "친구 메모:"
-
-#: src/protocols/oscar/oscar.c:7874
-msgid "Edit Buddy Comment"
-msgstr "친구 메모 고치기"
-
-#: src/protocols/oscar/oscar.c:7880
-msgid "Get Status Msg"
-msgstr "상태 메시지 보기"
-
-#: src/protocols/oscar/oscar.c:7892
-msgid "Direct IM"
-msgstr "직접 연결"
-
-#: src/protocols/oscar/oscar.c:7909
-msgid "Re-request Authorization"
-msgstr "인증 재요청"
-
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
-msgid "Require authorization"
-msgstr "인증 요청"
-
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
-msgid "Hide IP address"
-msgstr "IP 주소"
-
-#: src/protocols/oscar/oscar.c:7975
-#, fuzzy
-msgid "Web aware"
-msgstr "홈페이지"
-
-#: src/protocols/oscar/oscar.c:7980
-#, fuzzy
-msgid "ICQ Privacy Options"
-msgstr "프록시 옵션"
-
-#: src/protocols/oscar/oscar.c:7997
-msgid "The new formatting is invalid."
-msgstr "새로운 포맷이 유효하지 않습니다."
-
-#: src/protocols/oscar/oscar.c:7998
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:8005
-msgid "New screen name formatting:"
-msgstr "새 아이디 양식:"
-
-#: src/protocols/oscar/oscar.c:8057
-msgid "Change Address To:"
-msgstr "바꿀 주소:"
-
-#: src/protocols/oscar/oscar.c:8102
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>인증을 기다리고 있지 않음<i>"
-
-#: src/protocols/oscar/oscar.c:8105
-msgid "You are awaiting authorization from the following buddies"
-msgstr "다음 친구들의 인증을 기다리고 있음"
-
-#: src/protocols/oscar/oscar.c:8106
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"친구 이름 위에서 오른쪽 클릭하고 \"인증 재요청\"을 클릭해 인증을 재요청 할 "
-"수 있습니다."
-
-#: src/protocols/oscar/oscar.c:8123
-msgid "Find Buddy by E-Mail"
-msgstr "메일로 친구 찾기"
-
-#: src/protocols/oscar/oscar.c:8124
-msgid "Search for a buddy by e-mail address"
-msgstr "메일 주소로 친구 찾기"
-
-#: src/protocols/oscar/oscar.c:8125
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "찾으려는 친구의 메일 주소를 넣으세요."
-
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "사용자 정보 설정..."
-
-#: src/protocols/oscar/oscar.c:8218
-msgid "Set User Info (URL)..."
-msgstr "사용자 정보 설정 (URL)..."
-
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "열쇠글 바꾸기..."
-
-#: src/protocols/oscar/oscar.c:8229
-msgid "Change Password (URL)"
-msgstr "열쇠글 바꾸기 (URL)"
-
-#: src/protocols/oscar/oscar.c:8233
-msgid "Configure IM Forwarding (URL)"
-msgstr "메시지 포워딩 설정 (URL)"
-
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "자세한 옵션 보기"
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:8250
-msgid "Format Screen Name..."
-msgstr "아이디 양식..."
-
-#: src/protocols/oscar/oscar.c:8254
-msgid "Confirm Account"
-msgstr "계정 확인"
-
-#: src/protocols/oscar/oscar.c:8258
-msgid "Display Currently Registered Address"
-msgstr "현재 등록된 주소 보여주기"
-
-#: src/protocols/oscar/oscar.c:8262
-msgid "Change Currently Registered Address..."
-msgstr "현재 등록된 주소 바꾸기..."
-
-#: src/protocols/oscar/oscar.c:8269
-msgid "Show Buddies Awaiting Authorization"
-msgstr "인증을 기다리고 있는 친구 보여주기"
-
-#: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by E-Mail..."
-msgstr "메일로 친구 찾기..."
-
-#: src/protocols/oscar/oscar.c:8280
-msgid "Search for Buddy by Information"
-msgstr "정보로 친구 찾기"
-
-#: src/protocols/oscar/oscar.c:8350
-#, fuzzy
-msgid "Use recent buddies group"
-msgstr "사용자가 그룹에 없음"
-
-#: src/protocols/oscar/oscar.c:8353
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "수동으로 내가 얼마나 사용하지 않았는지 정할 수 있게 합니다."
-
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ 프로토콜 플러그인"
-
-#: src/protocols/oscar/oscar.c:8497
-msgid "Auth host"
-msgstr "인증 호스트"
-
-#: src/protocols/oscar/oscar.c:8500
-msgid "Auth port"
-msgstr "인증 포트"
-
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
-msgid "Encoding"
-msgstr "인코딩"
-
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
-msgid "Sending Handshake"
-msgstr "쿠키 보내는 중"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
-msgid "Waiting for Handshake Acknowledgement"
-msgstr "전송이 시작되기를 기다리고 있음"
-
-#: src/protocols/sametime/sametime.c:1144
-msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
-msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
-msgid "Login Redirected"
-msgstr "로그인 서버"
-
-#: src/protocols/sametime/sametime.c:1159
-msgid "Forcing Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1163
-msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "서버 연결"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "활성화"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "소켓을 만들 수 없음"
-
-#: src/protocols/simple/simple.c:1263
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 프로토콜 플러그인"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 프로토콜 플러그인"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "사용자"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "프록시 사용 안함"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "프록시 사용 안함"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+"파일 %s 을(를) 읽는 중 오류: \n"
+"%s\n"
+
+#: ../libgaim/protocols/sametime/sametime.c:5166
+msgid "Remotely Stored Buddy List"
+msgstr "리모트 친구 목록"
+
+#: ../libgaim/protocols/sametime/sametime.c:5171
+msgid "Buddy List Storage Mode"
+msgstr "친구 목록 저장 모드"
+
+#: ../libgaim/protocols/sametime/sametime.c:5174
+msgid "Local Buddy List Only"
+msgstr "로컬 친구 목록만"
+
+#: ../libgaim/protocols/sametime/sametime.c:5176
+msgid "Merge List from Server"
+msgstr "서버로부터 친구 목록 병합"
+
+#: ../libgaim/protocols/sametime/sametime.c:5178
+msgid "Merge and Save List to Server"
+msgstr "친구 목록을 병합하여 서버에 저장"
+
+#: ../libgaim/protocols/sametime/sametime.c:5180
+msgid "Synchronize List with Server"
+msgstr "서버의 친구 목록과 동기"
+
+#: ../libgaim/protocols/sametime/sametime.c:5229
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "계정 %s 의 Sametime 목록 가져오기"
+
+#: ../libgaim/protocols/sametime/sametime.c:5268
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "계정 %s 의 Sametime 목록 내보내기"
+
+#: ../libgaim/protocols/sametime/sametime.c:5321
+msgid "Unable to add group: group exists"
+msgstr "그룹을 추가할 수 없습니다: 그룹이 이미 존재합니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5322
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "이미 '%s' 이름의 그룹이 친구 목록에 있습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5325
+#: ../libgaim/protocols/sametime/sametime.c:5454
+msgid "Unable to add group"
+msgstr "그룹을 추가할 수 없었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5384
+msgid "Possible Matches"
+msgstr "가능성 있는 일치"
+
+#: ../libgaim/protocols/sametime/sametime.c:5400
+msgid "Notes Address Book group results"
+msgstr "Notes 주소록 그룹 결과"
+
+#: ../libgaim/protocols/sametime/sametime.c:5401
+#, 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 "아마도 ID '%s' 은(는) 다음에 표시하는 Notes 주소록의 어느 그룹을 참조하고 있는 것 같습니다. 친구 목록에 추가할 타당한 그룹을 다음 목록에서 선택해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Select Notes Address Book"
+msgstr "Notes 주소록 선택"
+
+#: ../libgaim/protocols/sametime/sametime.c:5448
+msgid "Unable to add group: group not found"
+msgstr "그룹을 추가할 수 없습니다: 찾을 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5450
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "ID '%s' 에 해당하는 그룹이 Sametime 커뮤니티 Notes 주소록 안에는 없었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5491
+msgid "Notes Address Book Group"
+msgstr "Notes 주소록 그룹"
+
+#: ../libgaim/protocols/sametime/sametime.c:5492
+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 "다음 빈 칸에 추가할 Notes 주소록 그룹명을 입력하고, 친구 목록에 그 그룹의 멤버를 추가해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:5540
+#, c-format
+msgid "Search results for '%s'"
+msgstr "'%s' 검색 결과"
+
+#: ../libgaim/protocols/sametime/sametime.c:5541
+#, 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 "아마도 ID '%s' 은(는) 다음에 표시하는 어느 사용자를 참조하고 있는 것 같습니다. 이 사용자들을 친구 목록에 추가하거나 또는 다음의 동작 버튼을 선택하여 그들에게 메시지를 보내는 것이 좋을 것 같습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5573
+msgid "No matches"
+msgstr "찾을 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5574
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "Sametime 커뮤니티에는 ID '%s' 와(과) 일치하는 사용자가 없었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5578
+msgid "No Matches"
+msgstr "찾을 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5615
+msgid "Search for a user"
+msgstr "사용자 검색"
+
+#: ../libgaim/protocols/sametime/sametime.c:5616
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "다음 빈 칸에 이름 또는 ID 의 일부분을 입력하고, Sametime 커뮤니티에 있는 사용자를 검색해 주십시오."
+
+#: ../libgaim/protocols/sametime/sametime.c:5619
+msgid "User Search"
+msgstr "사용자 검색"
+
+#: ../libgaim/protocols/sametime/sametime.c:5631
+msgid "Import Sametime List..."
+msgstr "Sametime 목록 가져오기..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5635
+msgid "Export Sametime List..."
+msgstr "Sametime 목록 내보내기..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5639
+msgid "Add Notes Address Book Group..."
+msgstr "Notes 주소록 그룹 추가..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5643
+msgid "User Search..."
+msgstr "사용자 검색..."
+
+#: ../libgaim/protocols/sametime/sametime.c:5740
+msgid "Force login (ignore server redirects)"
+msgstr "강제적으로 로그인 (서버로부터의 리다이렉트 무시)"
+
+#. pretend to be Sametime Connect
+#: ../libgaim/protocols/sametime/sametime.c:5750
+msgid "Hide client identity"
+msgstr "클라이언트 정보 숨김"
+
+#: ../libgaim/protocols/silc/buddy.c:52
+#: ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545
+#: ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
-#, fuzzy
+msgstr "사용자 %s 님은 네트워크 상에 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:53
+#: ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129
+#: ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139
+#: ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "내용 변환"
-
-#: src/protocols/silc/buddy.c:53
+msgstr "키 동의"
+
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:115
+msgstr "키 동의를 실행할 수 없습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:119
+msgstr "키 동의하는 동안 오류가 발생했습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:124
+msgstr "키 동의에 실패했습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:129
+msgstr "키 동의하는 동안 시간이 초과되었습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:134
+msgstr "키 동의가 중단되었습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:139
+msgstr "이미 키 동의가 시작되었습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+msgstr "키 동의를 자기자신으로는 시작할 수 없습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:258
+#: ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:293
-#, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:297
+msgstr "리모트 사용자는 네트워크 등에 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:294
+#, c-format
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "%s 님으로부터 키 동의 요청을 받았습니다. 동의하시겠습니까?"
+
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-
-#: src/protocols/silc/buddy.c:310
+"리모트 사용자가 키 동의를 요청하고 있습니다:\n"
+"리모트 호스트: %s\n"
+"리모트 포트: %d"
+
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
-#, fuzzy
+msgstr "키 동의 요청"
+
+#: ../libgaim/protocols/silc/buddy.c:387
+#: ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
-msgstr "열쇠글(_S)"
-
-#: src/protocols/silc/buddy.c:422
+msgstr "비밀번호 첨부 IM"
+
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:464
+msgstr "IM 키를 설정할 수 없습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
-msgstr "메시지 열쇠글 설정"
-
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+msgstr "IM 비밀번호 설정"
+
+#: ../libgaim/protocols/silc/buddy.c:512
+#: ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1494
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "Get Public Key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+msgstr "공개 키 가져오기"
+
+#: ../libgaim/protocols/silc/buddy.c:548
+#: ../libgaim/protocols/silc/ops.c:1495
+#: ../libgaim/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+msgstr "공개 키를 가져오지 못했습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
-#, fuzzy
+msgstr "공개 키 표시"
+
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr "대화명을 바꿀 수 없음"
-
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
-#, fuzzy
+msgstr "공개 키를 읽어들이지 못했습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:712
+#: ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295
+#: ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
-msgstr "정보"
-
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
-#, fuzzy
+msgstr "사용자 정보"
+
+#: ../libgaim/protocols/silc/buddy.c:713
+#: ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
-msgstr "%s 사용자의 정보 바꾸기"
-
-#: src/protocols/silc/buddy.c:734
+msgstr "사용자 정보를 가져오지 못했습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
+msgstr "친구 %s 은(는) 신뢰되지 않았습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:737
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "친구의 공개 키를 받을 때까지 친구 알림을 받을 수 없습니다. 공개 키를 가져오려면 [공개 키 가져오기...] 버튼을 눌러 주십시오."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "열기..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1040
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1130
-#, fuzzy
+msgstr "친구 %s 은(는)네트워크 상에 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/buddy.c:1076
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "친구를 추가하려면 공개 키를 가져와야 합니다. 공개 키를 가져오려면 [가져오기...] 버튼을 눌러 주십시오."
+
+#: ../libgaim/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "가져오기(_I).."
+
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
-msgstr "글자 색깔 선택"
-
-#: src/protocols/silc/buddy.c:1132
-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 ""
-
-#: src/protocols/silc/buddy.c:1134
-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 ""
-
-#: src/protocols/silc/buddy.c:1415
+msgstr "타당한 사용자 선택"
+
+#: ../libgaim/protocols/silc/buddy.c:1177
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "동일한 공개 키를 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당한 사용자를 목록에서 선택해 주십시오."
+
+#: ../libgaim/protocols/silc/buddy.c:1179
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "동일한 이름을 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당한 사용자를 목록에서 선택해 주십시오."
+
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+msgstr "분리됨"
+
+#: ../libgaim/protocols/silc/buddy.c:1471
+#: ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+msgstr "부적절"
+
+#: ../libgaim/protocols/silc/buddy.c:1475
+#: ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
-#, fuzzy
+msgstr "깨워 주세요"
+
+#: ../libgaim/protocols/silc/buddy.c:1477
+#: ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
-msgstr "활성화"
-
-#: src/protocols/silc/buddy.c:1427
+msgstr "활동적"
+
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
-#, fuzzy
+msgstr "로봇"
+
+#: ../libgaim/protocols/silc/buddy.c:1486
+#: ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
-msgstr "적용"
-
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+msgstr "행복함"
+
+#: ../libgaim/protocols/silc/buddy.c:1488
+#: ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+msgstr "슬픔"
+
+#: ../libgaim/protocols/silc/buddy.c:1490
+#: ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+msgstr "언짢음"
+
+#: ../libgaim/protocols/silc/buddy.c:1492
+#: ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+msgstr "질투남"
+
+#: ../libgaim/protocols/silc/buddy.c:1494
+#: ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
-#, fuzzy
+msgstr "부끄러움"
+
+#: ../libgaim/protocols/silc/buddy.c:1496
+#: ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
-msgstr "보이지 않도록 함"
-
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
-#, fuzzy
+msgstr "무적"
+
+#: ../libgaim/protocols/silc/buddy.c:1498
+#: ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
-msgstr "무시"
-
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+msgstr "연애"
+
+#: ../libgaim/protocols/silc/buddy.c:1500
+#: ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
-#, fuzzy
+msgstr "취침"
+
+#: ../libgaim/protocols/silc/buddy.c:1502
+#: ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
-msgstr "진하게"
-
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+msgstr "지루함"
+
+#: ../libgaim/protocols/silc/buddy.c:1504
+#: ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+msgstr "흥분됨"
+
+#: ../libgaim/protocols/silc/buddy.c:1506
+#: ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
-#, fuzzy
+msgstr "걱정됨"
+
+#: ../libgaim/protocols/silc/buddy.c:1538
+#: ../libgaim/protocols/silc/ops.c:1202
 msgid "User Modes"
-msgstr "사용자(_U)"
-
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+msgstr "사용자 모드"
+
+#: ../libgaim/protocols/silc/buddy.c:1550
+#: ../libgaim/protocols/silc/ops.c:1207
 msgid "Mood"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-#, fuzzy
-msgid "Status Text"
-msgstr "상태"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
-#, fuzzy
+msgstr "기분"
+
+#: ../libgaim/protocols/silc/buddy.c:1555
+#: ../libgaim/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
-msgstr "연락처 지우기"
-
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
-#, fuzzy
+msgstr "선호하는 연락처"
+
+#: ../libgaim/protocols/silc/buddy.c:1560
+#: ../libgaim/protocols/silc/ops.c:1224
 msgid "Preferred Language"
-msgstr "기본 설정"
-
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
-#, fuzzy
+msgstr "선호하는 언어"
+
+#: ../libgaim/protocols/silc/buddy.c:1565
+#: ../libgaim/protocols/silc/ops.c:1229
 msgid "Device"
-msgstr "연결 끊김"
-
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
-#, fuzzy
+msgstr "장치"
+
+#: ../libgaim/protocols/silc/buddy.c:1570
+#: ../libgaim/protocols/silc/ops.c:1234
+#: ../libgaim/protocols/silc/silc.c:736
+#: ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
-msgstr "시간"
-
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
-#, fuzzy
+msgstr "시간대"
+
+#: ../libgaim/protocols/silc/buddy.c:1575
+#: ../libgaim/protocols/silc/ops.c:1239
 msgid "Geolocation"
-msgstr "위치"
-
-#: src/protocols/silc/buddy.c:1567
+msgstr "지리적 위치"
+
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1572
+msgstr "IM 키 초기화"
+
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1576
-#, fuzzy
+msgstr "키 교환 첨부 IM"
+
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
-msgstr "열쇠글(_S)"
-
-#: src/protocols/silc/buddy.c:1588
+msgstr "비밀번호 첨부 IM"
+
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
-#, fuzzy
+msgstr "공개 키 가져오기..."
+
+#: ../libgaim/protocols/silc/buddy.c:1660
+#: ../libgaim/protocols/silc/ops.c:1624
 msgid "Kill User"
-msgstr "게임 사용자"
-
-#: src/protocols/silc/chat.c:38
+msgstr "사용자 강제 종료"
+
+#: ../libgaim/protocols/silc/buddy.c:1670
+#: ../libgaim/protocols/silc/chat.c:972
+msgid "Draw On Whiteboard"
+msgstr "화이트보드에 그리기"
+
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
-msgstr "열쇠글(_P):"
-
-#: src/protocols/silc/chat.c:79
+msgstr "Passphrase(_P):"
+
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr ""
-
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+msgstr "채널 %s 은(는) 네트워크 상에 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/chat.c:81
+#: ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "채널 정보"
 
-#: src/protocols/silc/chat.c:81
-#, fuzzy
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
-msgstr "%s 사용자의 정보 바꾸기"
-
-#: src/protocols/silc/chat.c:118
-#, fuzzy, c-format
+msgstr "채널 정보를 가져올 수 없습니다."
+
+#: ../libgaim/protocols/silc/chat.c:119
+#, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>별칭:</b> %s<br>"
-
-#: src/protocols/silc/chat.c:121
-#, fuzzy, c-format
+msgstr "<b>채널명:</b> %s"
+
+#: ../libgaim/protocols/silc/chat.c:122
+#, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<b>사용자:</b> %s<br>"
-
-#: src/protocols/silc/chat.c:128
+msgstr "<br><b>사용자 수:</b> %d"
+
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:137
+msgstr "<br><b>채널 설립자:</b> %s"
+
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:140
+msgstr "<br><b>채널 암호:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:145
+msgstr "<br><b>채널 HMAC:</b> %s"
+
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:150
+msgstr "<br><b>채널 주제:</b><br>%s"
+
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
-
-#: src/protocols/silc/chat.c:163
+msgstr "<br><b>채널 모드:</b> "
+
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:164
+msgstr "<br><b>설립자 키 지문:</b><br>%s"
+
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
-
-#: src/protocols/silc/chat.c:234
+msgstr "<br><b>설립자 키 Babbleprint:</b><br>%s"
+
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr ""
+msgstr "채널 공개 키 추가"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr ""
-
-#: src/protocols/silc/chat.c:398
-#, fuzzy
+msgstr "공개 키 열기..."
+
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
-msgstr "채널 열쇠글"
-
-#: src/protocols/silc/chat.c:405
+msgstr "채널 Passphrase"
+
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
-msgstr ""
-
-#: src/protocols/silc/chat.c:410
-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 ""
-
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
-#, fuzzy
+msgstr "채널 공개 키 목록"
+
+#: ../libgaim/protocols/silc/chat.c:412
+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 "채널 인증은 인증되어 있지 않은 접근으로부터 채널을 보호하기 위해 사용합니다. 그 인증 방식은 Passphrase 와 전자 서명을 기초로 하고 있습니다. Passphrase 가 설정되어 있으면 참가하기 위해 Passphrase 가 요구되고, 채널의 공개 키가 설정되어 있으면 공개 키 목록에 표시되어 있는 사용자만이 참가할 수 있습니다."
+
+#: ../libgaim/protocols/silc/chat.c:421
+#: ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459
+#: ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
-msgstr "암호화없는 인증"
-
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#, fuzzy
+msgstr "채널 인증"
+
+#: ../libgaim/protocols/silc/chat.c:423
+#: ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
-msgstr "지우기"
-
-#: src/protocols/silc/chat.c:576
+msgstr "추가 / 삭제"
+
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
-msgstr "그룹 이름"
-
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+msgstr "그룹명"
+
+#: ../libgaim/protocols/silc/chat.c:582
+#: ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
-msgstr "열쇠글"
-
-#: src/protocols/silc/chat.c:591
-#, fuzzy, c-format
+msgstr "Passphrase"
+
+#: ../libgaim/protocols/silc/chat.c:593
+#, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "더할 그룹의 이름을 넣으세요."
-
-#: src/protocols/silc/chat.c:593
+msgstr "채널 %s 의 개인 그룹명과 Passphrase 를 입력해 주십시오."
+
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
-msgstr ""
-
-#: src/protocols/silc/chat.c:720
+msgstr "개인 그룹 추가"
+
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "사용자 제한"
 
-#: src/protocols/silc/chat.c:721
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-
-#: src/protocols/silc/chat.c:863
-msgid "Get Info"
-msgstr "정보 보기"
-
-#: src/protocols/silc/chat.c:871
-#, fuzzy
+msgstr "채널에서 제한할 사용자를 설정해 주십시오. 0 으로 설정하면 사용자 제한이 초기화 됩니다."
+
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
-msgstr "초대"
-
-#: src/protocols/silc/chat.c:876
-#, fuzzy
+msgstr "초대 목록"
+
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
-msgstr "친구 목록"
-
-#: src/protocols/silc/chat.c:884
-#, fuzzy
+msgstr "차단 목록"
+
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
-msgstr "그룹 더하기"
-
-#: src/protocols/silc/chat.c:897
+msgstr "개인 그룹 추가"
+
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
-msgstr ""
-
-#: src/protocols/silc/chat.c:902
+msgstr "영속성 해제"
+
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
-msgstr ""
-
-#: src/protocols/silc/chat.c:910
-#, fuzzy
+msgstr "영속성 설정"
+
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
-msgstr "사용자 정보 입력"
-
-#: src/protocols/silc/chat.c:916
-#, fuzzy
+msgstr "사용자 제한 설정"
+
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
-msgstr "릴리스 알림"
-
-#: src/protocols/silc/chat.c:921
+msgstr "주제 제한 해제"
+
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
-msgstr ""
-
-#: src/protocols/silc/chat.c:928
+msgstr "주제 제한 설정"
+
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:933
+msgstr "개인 채널 해제"
+
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:940
+msgstr "개인 채널 설정"
+
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:945
+msgstr "보안 채널 해제"
+
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
-msgstr ""
-
-#: src/protocols/silc/chat.c:1008
-#, fuzzy, c-format
+msgstr "보안 채널 설정"
+
+#: ../libgaim/protocols/silc/chat.c:1034
+#, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "%s에서 밴되었습니다."
-
-#: src/protocols/silc/chat.c:1012
+msgstr "당신은 <I>%s</I> 채널의 설립자입니다."
+
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr ""
-
-#: src/protocols/silc/chat.c:1071
-#, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
-msgstr ""
-
-#: src/protocols/silc/chat.c:1073
-#, fuzzy
+msgstr "<I>%s</I> 채널의 설립자는 <I>%s</I> 입니다."
+
+#: ../libgaim/protocols/silc/chat.c:1097
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "개인 그룹에 참가하기 전에 채널 %s 에 참가해 주십시오."
+
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
-msgstr "그룹 이름 바꾸기"
-
-#: src/protocols/silc/chat.c:1074
-#, fuzzy
+msgstr "개인 그룹에 참가"
+
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
-msgstr "0번 그룹을 지울 수 없음"
-
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+msgstr "개인 그룹에 참가할 수 없습니다."
+
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
+msgid "Call Command"
+msgstr "명령 실행"
+
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
-msgstr ""
-
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
-#, fuzzy
+msgstr "명령을 실행할 수 없습니다."
+
+#: ../libgaim/protocols/silc/chat.c:1295
+#: ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
-msgstr "알려지지 않은 명령: %s"
-
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
-#, fuzzy
+msgstr "알 수 없는 명령입니다."
+
+#: ../libgaim/protocols/silc/ft.c:89
+#: ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96
+#: ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104
+#: ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210
+#: ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221
+#: ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
-msgstr "파일 전송"
-
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
-#, fuzzy
+msgstr "보안 파일 전송"
+
+#: ../libgaim/protocols/silc/ft.c:90
+#: ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97
+#: ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
-msgstr "서버에서 읽는 중 에러가 발생했습니다."
-
-#: src/protocols/silc/ft.c:94
+msgstr "파일 전송 중 오류"
+
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
-msgstr ""
-
-#: src/protocols/silc/ft.c:98
+msgstr "권한이 없습니다."
+
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr ""
-
-#: src/protocols/silc/ft.c:102
-#, fuzzy
+msgstr "키 동의에 실패했습니다."
+
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "사용자가 없음"
-
-#: src/protocols/silc/ft.c:206
-#, fuzzy
+msgstr "파일 전송 세션이 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
-msgstr "파일 전송"
-
-#: src/protocols/silc/ft.c:211
-#, fuzzy
+msgstr "파일 전송 세션이 활성화 되어 있지 않습니다."
+
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
-msgstr "%s님에게서 파일 수신을 취소합니다.\n"
-
-#: src/protocols/silc/ft.c:216
-#, fuzzy
+msgstr "이미 파일 전송이 시작되었습니다."
+
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "전송을 위해 연결할 수 없습니다."
-
-#: src/protocols/silc/ft.c:222
-#, fuzzy
+msgstr "파일 전송에 필요한 키 동의를 실행할 수 없었습니다."
+
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
-msgstr "전송을 위해 연결할 수 없습니다."
-
-#: src/protocols/silc/ft.c:341
-#, fuzzy
+msgstr "파일 전송을 시작할 수 없었습니다."
+
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
-msgstr "0 바이트의 파일은 보낼 수 없습니다."
-
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
-#, fuzzy, c-format
+msgstr "파일을 전송할 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:554
+#: ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
+#, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s님이 주제를 바꿈: %s"
-
-#: src/protocols/silc/ops.c:425
+msgstr "%s 은(는) <I>%s</I> 의 주제를 %s (으)로 변경했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr ""
-
-#: src/protocols/silc/ops.c:429
+msgstr "<I>%s</I> 은(는) 채널 <I>%s</I> 의 모드를 %s (으)로 변경했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr ""
-
-#: src/protocols/silc/ops.c:462
+msgstr "<I>%s</I> 은(는) 채널 <I>%s</I> 의 모든 모드를 삭제했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr ""
-
-#: src/protocols/silc/ops.c:470
+msgstr "<I>%s</I> 은(는) <I>%s 의</I> 모드를 %s (으)로 설정했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr ""
-
-#: src/protocols/silc/ops.c:499
-#, fuzzy, c-format
+msgstr "<I>%s</I> 은(는) <I>%s 의</I> 모든 모드를 삭제했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:712
+#, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "%s님에게 강제퇴장되었습니다: (%s)"
-
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
-#, fuzzy, c-format
+msgstr "<I>%s</I> (으)로부터 <I>%s</I> (%s) 에 의해 퇴출되었습니다."
+
+#: ../libgaim/protocols/silc/ops.c:742
+#: ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
+#, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "%s님에게 강제퇴장되었습니다: (%s)"
-
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
-#, fuzzy, c-format
+msgstr "%s (%s) 에 의해 강제 종료되었습니다."
+
+#: ../libgaim/protocols/silc/ops.c:773
+#: ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
+#, c-format
 msgid "Killed by %s (%s)"
-msgstr "%s님에게 강제퇴장됨(%s)"
-
-#: src/protocols/silc/ops.c:616
-#, fuzzy
+msgstr "%s (%s) 에 의해 강제 종료되었습니다."
+
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
-msgstr "연결 끊기"
-
-#: src/protocols/silc/ops.c:803
-#, fuzzy
+msgstr "서버 접속 해제"
+
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
-msgstr "개인정보"
-
-#: src/protocols/silc/ops.c:826
-#, fuzzy
+msgstr "개인 정보"
+
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
-msgstr "생년월일"
-
-#: src/protocols/silc/ops.c:830
-#, fuzzy
-msgid "Job Title"
-msgstr "제목"
-
-#: src/protocols/silc/ops.c:834
-#, fuzzy
+msgstr "생일"
+
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
-msgstr "역할"
-
-#: src/protocols/silc/ops.c:838
-#, fuzzy
+msgstr "직위"
+
+#: ../libgaim/protocols/silc/ops.c:1052
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
-msgstr "기관 부서"
-
-#: src/protocols/silc/ops.c:842
-#, fuzzy
+msgstr "조직"
+
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
-msgstr "초대"
-
-#: src/protocols/silc/ops.c:861
-#, fuzzy
-msgid "EMail"
-msgstr "메일"
-
-#: src/protocols/silc/ops.c:866
-#, fuzzy
+msgstr "그룹"
+
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
-msgstr "보여주지 않음"
-
-#: src/protocols/silc/ops.c:914
-#, fuzzy
+msgstr "비고"
+
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
-msgstr "채팅 참여"
-
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+msgstr "대화에 참가"
+
+#: ../libgaim/protocols/silc/ops.c:1183
+#: ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+msgid "Real Name"
+msgstr "실명"
+
+#: ../libgaim/protocols/silc/ops.c:1213
+msgid "Status Text"
+msgstr "상태 문자"
+
+#: ../libgaim/protocols/silc/ops.c:1285
+#: ../libgaim/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+msgstr "공개 키 지문"
+
+#: ../libgaim/protocols/silc/ops.c:1286
+#: ../libgaim/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1084
-#, fuzzy
-msgid "More..."
-msgstr "선택"
-
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
-#, fuzzy
+msgstr "공개 키 Babbleprint"
+
+#: ../libgaim/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "자세히(_M)..."
+
+#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
-msgstr "프록시 서버"
-
-#: src/protocols/silc/ops.c:1155
+msgstr "서버로부터 분리"
+
+#: ../libgaim/protocols/silc/ops.c:1371
 msgid "Cannot detach"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1166
+msgstr "분리할 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1198
-#, fuzzy
+msgstr "주제를 설정할 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
-msgstr "대화명을 바꿀 수 없음"
-
-#: src/protocols/silc/ops.c:1246
-#, fuzzy
+msgstr "별명 변경에 실패했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Roomlist"
-msgstr "방 목록"
-
-#: src/protocols/silc/ops.c:1246
-#, fuzzy
+msgstr "대화실 목록"
+
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
-msgstr "AIM 프로필을 설정할 수 없습니다."
-
-#: src/protocols/silc/ops.c:1291
+msgstr "대화실 목록을 가져올 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
-#, fuzzy
+msgstr "공개 키를 받지 못했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1532
 msgid "Server Information"
-msgstr "직장 정보"
-
-#: src/protocols/silc/ops.c:1305
-#, fuzzy
+msgstr "서버 정보"
+
+#: ../libgaim/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
-msgstr "%s 사용자의 정보 바꾸기"
-
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
-#, fuzzy
+msgstr "서버 정보를 가져올 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1558
 msgid "Server Statistics"
-msgstr "서버 주소"
-
-#: src/protocols/silc/ops.c:1335
-#, fuzzy
+msgstr "서버 통계 정보"
+
+#: ../libgaim/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
-msgstr "%s 사용자의 정보 바꾸기"
-
-#: src/protocols/silc/ops.c:1344
-#, fuzzy
+msgstr "서버 통계 정보를 가져올 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1559
 msgid "No server statistics available"
-msgstr "가능한 행동이 없음"
-
-#: src/protocols/silc/ops.c:1366
+msgstr "서버 통계 정보를 사용할 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9607,124 +13219,128 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-
-#: src/protocols/silc/ops.c:1389
+"로컬 서버 가동 시각: %s\n"
+"로컬 서버 가동 시간: %s\n"
+"로컬 서버 클라이언트 수: %d\n"
+"로컬 서버 채널 수: %d\n"
+"로컬 서버 오퍼레이터 수: %d\n"
+"로컬 라우터 오퍼레이터 수: %d\n"
+"로컬 셀 클라이언트 수: %d\n"
+"로컬 셀 채널 수: %d\n"
+"로컬 셀 서버 수: %d\n"
+"클라이언트 수 합계: %d\n"
+"채널 수 합계: %d\n"
+"서버 수 합계: %d\n"
+"라우터 수 합계: %d\n"
+"서버 오퍼레이터 수 합계: %d\n"
+"라우터 오퍼레이터 수 합계: %d\n"
+
+#: ../libgaim/protocols/silc/ops.c:1604
 msgid "Network Statistics"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
-#, fuzzy
+msgstr "네트워크 통계 정보"
+
+#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping"
-msgstr "기록"
-
-#: src/protocols/silc/ops.c:1397
-#, fuzzy
+msgstr "Ping"
+
+#: ../libgaim/protocols/silc/ops.c:1612
 msgid "Ping failed"
-msgstr "연결이 끊겼습니다."
-
-#: src/protocols/silc/ops.c:1402
-#, fuzzy
+msgstr "Ping 에 실패했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
-msgstr "서버에서 읽는 중 에러가 발생했습니다."
-
-#: src/protocols/silc/ops.c:1410
-#, fuzzy
+msgstr "서버로부터 Ping 응답을 받았습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1625
 msgid "Could not kill user"
-msgstr "보낼 수 없음"
-
-#: src/protocols/silc/ops.c:1494
-#, fuzzy
+msgstr "사용자를 강제 종료시킬 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
-msgstr "연결중 오류 발생"
-
-#: src/protocols/silc/ops.c:1499
+msgstr "SILC 서버에 접속하는 중 오류"
+
+#: ../libgaim/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1508
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-
-#: src/protocols/silc/ops.c:1543
-#, fuzzy
+msgstr "키 교환에 실패했습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1723
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "분리된 세션의 복귀에 실패했습니다. 새로운 접속을 확립하려면 [재접속] 버튼을 눌러 주십시오."
+
+#: ../libgaim/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
-msgstr "서버 연결"
-
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
-#, fuzzy
+msgstr "서버가 접속을 끊었습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1820
+#: ../libgaim/protocols/silc/ops.c:1867
+#: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
-msgstr "세션이 너무 많습니다."
-
-#: src/protocols/silc/ops.c:1607
-#, fuzzy
+msgstr "세션 복귀 중"
+
+#: ../libgaim/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
-msgstr "인증 확인 중"
-
-#: src/protocols/silc/ops.c:1654
-#, fuzzy
+msgstr "접속 인증 중"
+
+#: ../libgaim/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
-msgstr "서버 키를 읽는 중"
-
-#: src/protocols/silc/ops.c:1695
+msgstr "서버 공개 키 검증 중"
+
+#: ../libgaim/protocols/silc/ops.c:1910
 msgid "Passphrase required"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1724
+msgstr "Passphrase 요구"
+
+#: ../libgaim/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1727
+msgstr "실패: 버전 불일치, 클라이언트를 업그레이드 하십시오."
+
+#: ../libgaim/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1730
+msgstr "실패: 리모트에서 공개 키를 신뢰/지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1733
+msgstr "실패: 리모트에서 권장되는 KE 그룹을 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1736
+msgstr "실패: 리모트에서 권장되는 암호를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1739
+msgstr "실패: 리모트에서 권장되는 PKCS 를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1742
+msgstr "실패: 리모트에서 권장되는 해시 함수를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1744
+msgstr "실패: 리모트에서 권장되는 HMAC 를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1746
+msgstr "실패: 잘못된 서명입니다."
+
+#: ../libgaim/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1757
-#, fuzzy
+msgstr "실패: 잘못된 쿠키입니다."
+
+#: ../libgaim/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
-msgstr "인증 실패"
-
-#: src/protocols/silc/pk.c:103
-#, 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 ""
-
-#: src/protocols/silc/pk.c:108
+msgstr "실패: 인증에 실패했습니다."
+
+#: ../libgaim/protocols/silc/pk.c:103
+#, c-format
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "%s 의 공개 키를 받았지만, 로컬 사본과 일치하지 않습니다. 그래도 이 공개 키를 받으시겠습니까?"
+
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
-
-#: src/protocols/silc/pk.c:112
+msgstr "%s 의 공개 키를 받았습니다. 이 공개 키를 받으시겠습니까?"
+
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9732,303 +13348,333 @@
 "%s\n"
 "%s\n"
 msgstr ""
-
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+"%s 키의 지문과 Babbleprint 는 다음과 같습니다:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: ../libgaim/protocols/silc/pk.c:115
+#: ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
-msgstr ""
-
-#: src/protocols/silc/pk.c:119
-#, fuzzy
-msgid "View..."
-msgstr "새..."
-
-#: src/protocols/silc/pk.c:141
+msgstr "공개 키 검증"
+
+#: ../libgaim/protocols/silc/pk.c:119
+msgid "_View..."
+msgstr "표시(_V)..."
+
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
-msgstr ""
-
-#: src/protocols/silc/silc.c:154
-#, fuzzy
+msgstr "지원하지 않는 공개 키 형식"
+
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
-msgstr "연결이 끊겼습니다."
-
-#: src/protocols/silc/silc.c:186
-#, fuzzy
+msgstr "접속 실패"
+
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
-msgstr "연결중 오류 발생"
-
-#: src/protocols/silc/silc.c:197
+msgstr "SILC 클라이언트 접속을 초기화 할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
-msgstr ""
-
-#: src/protocols/silc/silc.c:270
+msgstr "키 교환 실행 중"
+
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
-msgstr ""
+msgstr "메모리가 부족합니다."
+
+#: ../libgaim/protocols/silc/silc.c:323
+msgid "Cannot initialize SILC protocol"
+msgstr "SILC 프로토콜을 초기화 할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:330
+msgid "Cannot find/access ~/.silc directory"
+msgstr "~/.silc 폴더를 검색/접근할 수 없습니다."
 
 #. Progress
-#: src/protocols/silc/silc.c:309
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
-msgstr "서버 연결"
-
-#: src/protocols/silc/silc.c:630
+msgstr "SILC 서버에 접속 중"
+
+#: ../libgaim/protocols/silc/silc.c:344
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
+
+#: ../libgaim/protocols/silc/silc.c:365
+msgid "Unable to create connection"
+msgstr "새로운 접속을 생성할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
-msgstr ""
-
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr ""
-
-#: src/protocols/silc/silc.c:657
+msgstr "현재의 기분"
+
+#: ../libgaim/protocols/silc/silc.c:680
+msgid "In love"
+msgstr "연애"
+
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
-
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+"\n"
+"선호하는 연락 방법"
+
+#: ../libgaim/protocols/silc/silc.c:699
+#: ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
-msgstr ""
-
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+msgstr "SMS"
+
+#: ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
-msgstr ""
-
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
-msgid "Video Conferencing"
-msgstr "비디오 회의"
-
-#: src/protocols/silc/silc.c:674
+msgstr "MMS"
+
+#: ../libgaim/protocols/silc/silc.c:703
+msgid "Video conferencing"
+msgstr "영상 회의"
+
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
-msgstr ""
-
-#: src/protocols/silc/silc.c:681
+msgstr "현재의 상태"
+
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "온라인 서비스"
 
-#: src/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
-msgstr ""
-
-#: src/protocols/silc/silc.c:690
+msgstr "어떤 서비스를 이용하고 있는지 다른 사람들에게 공개해 주십시오."
+
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
-msgstr ""
-
-#: src/protocols/silc/silc.c:697
+msgstr "어떤 컴퓨터를 이용하고 있는지 다른 사람들에게 공개해 주십시오."
+
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
-msgstr ""
-
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+msgstr "VCard 형식 파일"
+
+#: ../libgaim/protocols/silc/silc.c:743
+#: ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
-msgstr ""
-
-#: src/protocols/silc/silc.c:712
-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 ""
-
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+msgstr "사용자의 온라인 상태 속성"
+
+#: ../libgaim/protocols/silc/silc.c:745
+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 "온라인 상태 정보와 개인 정보를 다른 사용자에게 공개할 수 있습니다. 다른 사용자에게 공개하고 싶은 정보를 모두 입력해 주십시오."
+
+#: ../libgaim/protocols/silc/silc.c:785
+#: ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
-msgstr ""
-
-#: src/protocols/silc/silc.c:752
+msgstr "오늘의 메시지"
+
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
-msgstr ""
-
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+msgstr "\"오늘의 메시지\" 를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:786
+#: ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
-msgstr ""
-
-#: src/protocols/silc/silc.c:800
+msgstr "이 접속에 대응되는 \"오늘의 메시지\" 는 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:837
+#: ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952
+#: ../libgaim/protocols/silc/silc.c:953
+msgid "Create New SILC Key Pair"
+msgstr "새 SILC 키 쌍 생성"
+
+#: ../libgaim/protocols/silc/silc.c:837
+msgid "Passphrases do not match"
+msgstr "새 Passphrases 가 일치하지 않습니다."
+
+#: ../libgaim/protocols/silc/silc.c:881
+msgid "Key Pair Generation failed"
+msgstr "키 쌍 생성에 실패했습니다."
+
+#: ../libgaim/protocols/silc/silc.c:920
+msgid "Key length"
+msgstr "키 길이"
+
+#: ../libgaim/protocols/silc/silc.c:922
+msgid "Public key file"
+msgstr "공개 키 파일"
+
+#: ../libgaim/protocols/silc/silc.c:924
+msgid "Private key file"
+msgstr "개인 키 파일"
+
+#: ../libgaim/protocols/silc/silc.c:947
+msgid "Passphrase (retype)"
+msgstr "Passphrases (재확인)"
+
+#: ../libgaim/protocols/silc/silc.c:954
+msgid "Generate Key Pair"
+msgstr "키 쌍 생성"
+
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "온라인 상태"
 
-#: src/protocols/silc/silc.c:809
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
-msgstr ""
-
-#: src/protocols/silc/silc.c:882
+msgstr "\"오늘의 메시지\" 표시"
+
+#: ../libgaim/protocols/silc/silc.c:1011
+msgid "Create SILC Key Pair..."
+msgstr "SILC 키 쌍 생성..."
+
+#: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1033
+msgstr "사용자 <I>%s</I> 은(는) 네트워크 상에 존재하지 않습니다."
+
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
-msgstr "제목이 너무 김"
-
-#: src/protocols/silc/silc.c:1114
+msgstr "주제가 너무 깁니다."
+
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
-msgstr "별명을 지정해야 함"
-
-#: src/protocols/silc/silc.c:1216
+msgstr "별명을 지정해 주십시오."
+
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
-msgstr "%s 채널을 찾을 수 없음"
-
-#: src/protocols/silc/silc.c:1221
-#, fuzzy, c-format
+msgstr "채널 %s 을(를) 찾을 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:1489
+#, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s 채널 모드: %s"
-
-#: src/protocols/silc/silc.c:1223
+msgstr "%s 의 채널 모드: %s"
+
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "%s의 채널 모드가 설정되지 않음"
-
-#: src/protocols/silc/silc.c:1236
+msgstr "%s 에는 채널 모드가 설정되어 있지 않습니다."
+
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "%s의 cmodes 설정 실패"
-
-#: src/protocols/silc/silc.c:1266
+msgstr "%s 의 채널 모드 설정에 실패"
+
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "알 수 없는 명령: %s, (게임 버그일 수 있음)"
-
-#: src/protocols/silc/silc.c:1329
+msgstr "알 수 없는 명령: %s (아마도 Pidgin의 버그일 수 있습니다.)"
+
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1333
+msgstr "part [채널]:  지정한 채널로부터 퇴출합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1337
+msgstr "leave [채널]:  지정한 채널로부터 퇴출합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1342
+msgstr "topic [&lt;새 주제&gt;]:  주제를 표시하거나 변경합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1346
+msgstr "join &lt;채널&gt; [&lt;비밀번호&gt;]:  이 네트워크 채널에 참가합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1350
+msgstr "list:  이 네트워크 상의 채널 목록을 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+msgstr "whois &lt;별명&gt;:  지정한 별명의 사용자 정보를 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1358
+msgstr "msg &lt;별명&gt; &lt;메시지&gt;:  지정한 별명의 사용자에게 개인 메시지를 보냅니다."
+
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1362
+msgstr "query &lt;별명&gt; [&lt;메시지&gt;]:  지정한 별명의 사용자에게 개인 메시지를 보냅니다."
+
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1366
+msgstr "motd:  서버에 있는 \"오늘의 메시지\" 를 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1370
+msgstr "detach:  이 세션을 분리합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1374
+msgstr "quit [메시지]:  추가로 메시지를 남기고, 서버로부터 접속을 끊습니다."
+
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1380
+msgstr "call &lt;명령&gt;:  SILC 클라이언트 명령을 호출합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1384
+msgstr "kill &lt;별명&gt; [-pubkey|&lt;이유&gt;]:  별명의 사용자를 강제적으로 종료합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1388
+msgstr "nick &lt;새 별명&gt;:  사용 중인 별명을 변경합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1392
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1396
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1400
+msgstr "whowas &lt;별명&gt;:  별명의 사용자 정보를 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1660
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;채널&gt; [+|-&lt;모드&gt;] [인수]:  채널 모드를 표시하거나 변경합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1664
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;채널&gt; +|-&lt;모드&gt; &lt;별명&gt;:  지정한 채널에서 별명의 사용자 모드를 변경합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1404
+msgstr "umode &lt;사용자 모드&gt;:  네트워크에서의 모드를 설정합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1408
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1412
+msgstr "oper &lt;별명&gt; [-pubkey]:  서버의 조작권을 취득합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1676
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;채널&gt; [-|+]&lt;별명&gt;:  지정한 별명의 사용자를 초대하거나 또는 초대 목록으로부터 그 사용자를 추가/삭제합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1416
+msgstr "kick &lt;채널&gt; &lt;별명&gt; [명령]:  채널로부터 클라이언트를 퇴출시킵니다."
+
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1420
+msgstr "info [서버]:  서버 관리자의 상세 정보를 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1424
+msgstr "ban [&lt;채널&gt; +|-&lt;별명&gt;]:  클라이언트를 채널로부터 차단합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1428
+msgstr "getkey &lt;별명|서버&gt;:  클라이언트 또는 서버의 공개 키를 가져옵니다."
+
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1432
+msgstr "stats:  서버와 네트워크의 통계 정보를 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1437
+msgstr "ping:  접속되어 있는 서버에 PING 을 송신합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1441
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "인스턴트 메시지"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "모든 메신저 대화를 디지털 서명"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "모든 메신저 대화 서명을 인증"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "채널 메시지"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "모든 채널 메시지를 디지털 서명"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "모든 채널 메시지 서명을 인증"
+msgstr "users &lt;채널&gt;:  채널 내의 사용자 목록을 표시합니다."
+
+#: ../libgaim/protocols/silc/silc.c:1709
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;(복수의) 채널&gt;:  (복수의) 채널 내의 지정한 사용자 목록을 표시합니다."
 
 #. *< type
 #. *< ui_requirement
@@ -10039,337 +13685,198 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../libgaim/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "SILC 프로토콜 플러그인"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../libgaim/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "보안 인터넷 실시간 회의 (SILC) 프로토콜"
-
-#: src/protocols/silc/silc.c:1600
-#, fuzzy
+msgstr "Secure Internet Live Conferencing (SILC) 프로토콜"
+
+#: ../libgaim/protocols/silc/silc.c:1859
 msgid "Public Key file"
-msgstr "공개키 파일"
-
-#: src/protocols/silc/silc.c:1604
-#, fuzzy
+msgstr "공개 키 파일"
+
+#: ../libgaim/protocols/silc/silc.c:1863
 msgid "Private Key file"
-msgstr "비밀키 파일"
-
-#: src/protocols/silc/silc.c:1607
+msgstr "개인 키 파일"
+
+#: ../libgaim/protocols/silc/silc.c:1873
+msgid "Cipher"
+msgstr "암호"
+
+#: ../libgaim/protocols/silc/silc.c:1883
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "Public key authentication"
-msgstr "공개키 인증"
-
-#: src/protocols/silc/silc.c:1611
+msgstr "공개 키 인증"
+
+#: ../libgaim/protocols/silc/silc.c:1889
 msgid "Reject watching by other users"
-msgstr "다른 사용자의 구경 거절"
-
-#: src/protocols/silc/silc.c:1614
+msgstr "다른 사용자로부터의 감시 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1892
 msgid "Block invites"
-msgstr "초대 차단"
-
-#: src/protocols/silc/silc.c:1617
+msgstr "초대 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
-msgstr "키 교환 없는 메시지 차단"
-
-#: src/protocols/silc/silc.c:1620
+msgstr "키 교환이 없는 IM 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1898
 msgid "Reject online status attribute requests"
-msgstr "온라인 상태 정보 요청을 거절"
-
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+msgstr "온라인 상태의 속성 요구 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1901
+msgid "Block messages to whiteboard"
+msgstr "화이트보드 메시지 차단"
+
+#: ../libgaim/protocols/silc/silc.c:1904
+msgid "Automatically open whiteboard"
+msgstr "화이트보드 자동 공개"
+
+#: ../libgaim/protocols/silc/silc.c:1907
+msgid "Digitally sign and verify all messages"
+msgstr "전자 서명으로 모든 메시지 검증"
+
+#: ../libgaim/protocols/silc/util.c:207
+#: ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "SILC 키 쌍을 만드는 중..."
+msgstr "SILC 키 쌍 생성 중..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "실제이름: \t%s\n"
-
-#: src/protocols/silc/util.c:315
+msgstr "실명: \t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "사용자이름: \t%s\n"
-
-#: src/protocols/silc/util.c:317
-#, c-format
-msgid "EMail: \t\t%s\n"
+msgstr "사용자명: \t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
 msgstr "이메일: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "호스트 이름: \t%s\n"
-
-#: src/protocols/silc/util.c:321
+msgstr "호스트명: \t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "기관: \t%s\n"
-
-#: src/protocols/silc/util.c:323
+msgstr "조직: \t%s\n"
+
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "국가: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "알고리즘: \t%s\n"
 
-#: src/protocols/silc/util.c:325
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../libgaim/protocols/silc/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "키 길이: \t%d 비트\n"
 
-#: src/protocols/silc/util.c:327
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
 msgstr ""
-"공개키 지문:\n"
+"공개 키 지문:\n"
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+"공개 키 Babbleprint:\n"
+"%s"
+
+#: ../libgaim/protocols/silc/util.c:374
+#: ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
-msgstr "공개키 정보"
-
-#: src/protocols/silc/util.c:515
+msgstr "공개 키 정보"
+
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "호출"
 
-#: src/protocols/silc/util.c:539
+#: ../libgaim/protocols/silc/util.c:563
+msgid "Video Conferencing"
+msgstr "영상 회의"
+
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "컴퓨터"
 
-#: src/protocols/silc/util.c:543
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
-msgstr ""
-
-#: src/protocols/silc/util.c:545
+msgstr "PDA"
+
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "터미널"
 
-#: src/protocols/toc/toc.c:139
-#, c-format
-msgid "Looking up %s"
-msgstr "%s(을)를 찾는 중"
-
-#: src/protocols/toc/toc.c:148
-#, c-format
-msgid "Connect to %s failed"
-msgstr "%s로의 연결이 끊겼습니다."
-
-#: src/protocols/toc/toc.c:200
-#, c-format
-msgid "Signon: %s"
-msgstr "연결: %s"
-
-#: src/protocols/toc/toc.c:482
-#, c-format
-msgid "Unable to write file %s."
-msgstr "%s 파일에 기록할 수 없습니다."
-
-#: src/protocols/toc/toc.c:485
-#, c-format
-msgid "Unable to read file %s."
-msgstr "%s 파일을 읽을 수 없습니다."
-
-#: src/protocols/toc/toc.c:488
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "메시지가 너무 길어서 마지막 %s 바이트가 짤렸습니다."
-
-#: src/protocols/toc/toc.c:491
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s님은 현재 로그인하지 않았습니다."
-
-#: src/protocols/toc/toc.c:494
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "%s 경고는 허용되지 않습니다."
-
-#: src/protocols/toc/toc.c:497
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "서버의 속도한계를 넘었기 때문에 메시지를 보낼 수 없습니다."
-
-#: src/protocols/toc/toc.c:500
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "%s에 채팅 참여를 할 수 없습니다."
-
-#: src/protocols/toc/toc.c:503
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "%s님에게 너무 자주 메시지를 보내고 있습니다."
-
-#: src/protocols/toc/toc.c:506
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "%s님에게서 온 메시지가 너무 커서 보여줄 수 없습니다."
-
-#: src/protocols/toc/toc.c:509
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s님이 메시지를 너무 자주 보내서 보여줄 수 없습니다."
-
-#: src/protocols/toc/toc.c:512
-msgid "Failure."
-msgstr "실패."
-
-#: src/protocols/toc/toc.c:515
-msgid "Too many matches."
-msgstr "해당 항목이 너무 많습니다."
-
-#: src/protocols/toc/toc.c:518
-msgid "Need more qualifiers."
-msgstr "더 상세히 지정하십시요."
-
-#: src/protocols/toc/toc.c:521
-msgid "Dir service temporarily unavailable."
-msgstr "디렉토리 서비스를 일시적으로 사용할 수 없습니다."
-
-#: src/protocols/toc/toc.c:524
-msgid "E-mail lookup restricted."
-msgstr "메일 찾아보기가 금지되어 있습니다."
-
-#: src/protocols/toc/toc.c:527
-msgid "Keyword ignored."
-msgstr "키워드가 무시되었습니다."
-
-#: src/protocols/toc/toc.c:530
-msgid "No keywords."
-msgstr "키워드가 없습니다."
-
-#: src/protocols/toc/toc.c:533
-msgid "User has no directory information."
-msgstr "사용자가 디렉토리 정보를 갖고 있지 않습니다."
-
-#: src/protocols/toc/toc.c:537
-msgid "Country not supported."
-msgstr "지원되지 않는 국가입니다."
-
-#: src/protocols/toc/toc.c:540
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "알 수 없는 실패: %s."
-
-#: src/protocols/toc/toc.c:546
-msgid "The service is temporarily unavailable."
-msgstr "잠시 서비스가 사용 불가능합니다."
-
-#: src/protocols/toc/toc.c:549
-msgid "Your warning level is currently too high to log in."
-msgstr "로그인하기에는 경고 수준이 너무 높습니다."
-
-#: src/protocols/toc/toc.c:552
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"너무 자주 연결과 종료를 반복하였습니다. 10분을 기다린 후 다시 시도하십시요. "
-"계속 시도한다면 기다려야 하는 시간이 더 길어집니다."
-
-#: src/protocols/toc/toc.c:554
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "접속 중에 알 수 없는 오류가 발생하였습니다: %s."
-
-#: src/protocols/toc/toc.c:557
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "알 수 없는 오류, %d(이)가 발생하였습니다.  정보: %s"
-
-#: src/protocols/toc/toc.c:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "잘못된 그룹"
-
-#: src/protocols/toc/toc.c:668
-msgid "Connection Closed"
-msgstr "연결이 끊겼습니다."
-
-#: src/protocols/toc/toc.c:708
-msgid "Waiting for reply..."
-msgstr "대답을 기다리는 중..."
-
-#: src/protocols/toc/toc.c:786
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC가 일시중지 상태에서 다시 시작되었습니다. 이제 메시지를 보낼 수 있습니다."
-
-#: src/protocols/toc/toc.c:989
-msgid "Password Change Successful"
-msgstr "열쇠글을 성공적으로 바꾸었음"
-
-#: src/protocols/toc/toc.c:993
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC가 PAUSE 명령을 보냈습니다."
-
-#: src/protocols/toc/toc.c:994
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"TOC가 일시중지 명령을 보냈습니다. TOC는 일시중지 명령을 보내면 모든 메시지를 "
-"무시합니다. 그리고 만약 메시지를 보내면 강제로 접속종료될 수 있습니다. 이것"
-"은 일시적인 현상이니 신경쓰지 마십시오."
-
-#: src/protocols/toc/toc.c:1549
-msgid "Get Dir Info"
-msgstr "디렉토리 정보 보기"
-
-#: src/protocols/toc/toc.c:1689
-msgid "Set Dir Info"
-msgstr "디렉토리 정보 설정"
-
-#: src/protocols/toc/toc.c:1811
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "%s(을)를 쓰기 모드로 열 수 없습니다!"
-
-#: src/protocols/toc/toc.c:1847
-msgid "File transfer failed; other side probably canceled."
-msgstr ""
-
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
-msgid "Could not connect for transfer."
-msgstr "전송을 위해 연결할 수 없습니다."
-
-#: src/protocols/toc/toc.c:2089
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "파일 헤더를 쓸 수 없습니다. 파일 전송이 완료되지 않았을 것입니다."
-
-#: src/protocols/toc/toc.c:2189
-msgid "Gaim - Save As..."
-msgstr "게임 - 새 이름으로 저장..."
-
-#: src/protocols/toc/toc.c:2223
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s님이 %s에게 %d개의 파일 접수를 요청:%s (%.2f %s)%s%s"
-
-#: src/protocols/toc/toc.c:2230
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s님이 파일을 보내달라고 요청하였습니다"
+#: ../libgaim/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s 님이 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하시겠습니까?"
+
+#: ../libgaim/protocols/silc/wb.c:288
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s 님이 %s 에 있는 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하시겠습니까?"
+
+#: ../libgaim/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "화이트보드"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../libgaim/protocols/simple/simple.c:416
+msgid "Could not write"
+msgstr "쓸 수 없었습니다."
+
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
+msgid "Could not connect"
+msgstr "접속할 수 없었습니다."
+
+#: ../libgaim/protocols/simple/simple.c:1516
+#: ../libgaim/protocols/simple/simple.c:1558
+#: ../libgaim/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1622
+msgid "Could not create listen socket"
+msgstr "감시 소켓을 생성할 수 없었습니다."
+
+#: ../libgaim/protocols/simple/simple.c:1539
+msgid "Couldn't resolve host"
+msgstr "호스트명을 해석할 수 없었습니다."
+
+#: ../libgaim/protocols/simple/simple.c:1630
+msgid "Could not resolve hostname"
+msgstr "호스트명을 해석할 수 없었습니다."
+
+#: ../libgaim/protocols/simple/simple.c:1647
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "SIP 의 아이디에 공백 또는 @ 기호가 포함되어 있지 않은 것 같습니다."
 
 #. *< type
 #. *< ui_requirement
@@ -10379,224 +13886,245 @@
 #. *< id
 #. *< name
 #. *< version
+#: ../libgaim/protocols/simple/simple.c:1816
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE 프로토콜 플러그인"
+
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
-msgid "TOC Protocol Plugin"
-msgstr "TOC 프로토콜 플러그인"
-
-#: src/protocols/toc/toc.c:2337
-msgid "TOC host"
-msgstr "TOC 호스트"
-
-#: src/protocols/toc/toc.c:2341
-msgid "TOC port"
-msgstr "TOC 포트"
-
-#: src/protocols/yahoo/yahoo.c:706
-msgid "Your Yahoo! message did not get sent."
-msgstr "Yahoo! 메시지가 전달되지 않았습니다."
-
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
-msgid "Buzz!!"
-msgstr "따르릉!!"
-
-#: src/protocols/yahoo/yahoo.c:797
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr "%s 계정의 야후! 시스템 메시지:"
-
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: src/protocols/yahoo/yahoo.c:887
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "%s(%s)님이 %s님을 친구 목록에 등록하려고 합니다."
-
-#: src/protocols/yahoo/yahoo.c:893
-#, fuzzy
-msgid "Message (optional) :"
-msgstr "메시지 알림"
-
-#: src/protocols/yahoo/yahoo.c:935
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:938
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:941
-msgid "Add buddy rejected"
-msgstr "친구 더하기가 거절됨"
-
-#: src/protocols/yahoo/yahoo.c:1684
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1687
-msgid "Failed Yahoo! Authentication"
-msgstr "야후! 인증 실패함"
-
-#: src/protocols/yahoo/yahoo.c:1760
-#, 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 ""
-
-#: src/protocols/yahoo/yahoo.c:1763
-msgid "Ignore buddy?"
-msgstr "친구를 무시할까요?"
-
-#: src/protocols/yahoo/yahoo.c:1797
-msgid "Invalid username."
-msgstr "잘못된 사용자 이름입니다."
-
-#: src/protocols/yahoo/yahoo.c:1808
-msgid "Normal authentication failed!"
-msgstr "일반 인증 실패!"
-
-#: src/protocols/yahoo/yahoo.c:1809
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1817
-msgid "Incorrect password."
-msgstr "열쇠글이 틀렸습니다."
-
-#: src/protocols/yahoo/yahoo.c:1820
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "계정이 잠겼습니다. 야후! 웹사이트에 로그인해주세요."
-
-#: src/protocols/yahoo/yahoo.c:1823
-#, c-format
-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"알 수 없는 오류 %d번이 발생했습니다. 야후! 웹사이트에 로그인하면 해결될 것입"
-"니다."
-
-#: src/protocols/yahoo/yahoo.c:1877
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1880
-msgid "Could not add buddy to server list"
-msgstr "서버 목록에 친구를 더할 수 없음"
-
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
-msgid "Unable to read"
-msgstr "읽을 수 없음"
-
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
-msgid "Connection problem"
-msgstr "연결 오류"
-
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
-msgstr "집에 없음"
-
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
-msgstr "자리에 없음"
-
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
-msgstr "사무실에 없음"
-
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
-msgid "On Vacation"
-msgstr "휴가중"
-
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
-msgid "Stepped Out"
-msgstr "놀러갔음"
-
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
-msgid "Not on server list"
-msgstr "서버 목록에 없음"
-
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
-msgid "Appear Online"
-msgstr "오프라인"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "오프라인"
-
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "시/도"
-
-#: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "오프라인"
-
-#: src/protocols/yahoo/yahoo.c:2896
-msgid "Join in Chat"
-msgstr "채팅 참여"
-
-#: src/protocols/yahoo/yahoo.c:2901
-msgid "Initiate Conference"
-msgstr "회의 시작"
-
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
-msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2963
-msgid "Active which ID?"
-msgstr "ID를 활성화할까요?"
-
-#: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
-msgstr "대화에 참여할까요?"
-
-#: src/protocols/yahoo/yahoo.c:2982
-msgid "Activate ID..."
-msgstr "ID 활성화..."
-
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "채팅 참여..."
-
-#: src/protocols/yahoo/yahoo.c:3541
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3550
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+#: ../libgaim/protocols/simple/simple.c:1817
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE 프로토콜 플러그인"
+
+#: ../libgaim/protocols/simple/simple.c:1839
+msgid "Publish status (note: everyone may watch you)"
+msgstr "상태를 공개 (주: 다른 사용자가 모두 볼 수 있습니다.)"
+
+#: ../libgaim/protocols/simple/simple.c:1845
+msgid "Use UDP"
+msgstr "UDP 사용"
+
+#: ../libgaim/protocols/simple/simple.c:1847
+msgid "Use proxy"
+msgstr "프록시 사용"
+
+#: ../libgaim/protocols/simple/simple.c:1849
+msgid "Proxy"
+msgstr "프록시"
+
+#: ../libgaim/protocols/simple/simple.c:1851
+msgid "Auth User"
+msgstr "사용자 인증"
+
+#: ../libgaim/protocols/simple/simple.c:1853
+msgid "Auth Domain"
+msgstr "도메인 인증"
+
+#: ../libgaim/protocols/toc/toc.c:139
+#, c-format
+msgid "Looking up %s"
+msgstr "%s 검색 중"
+
+#: ../libgaim/protocols/toc/toc.c:148
+#, c-format
+msgid "Connect to %s failed"
+msgstr "%s (으)로의 접속에 실패했습니다."
+
+#: ../libgaim/protocols/toc/toc.c:201
+#, c-format
+msgid "Signon: %s"
+msgstr "접속: %s"
+
+#: ../libgaim/protocols/toc/toc.c:488
+#, c-format
+msgid "Unable to write file %s."
+msgstr "파일 %s 을(를) 쓸 수 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:491
+#, c-format
+msgid "Unable to read file %s."
+msgstr "파일 %s 을(를) 읽을 수 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:494
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr "메시지가 너무 길어 마지막 %s 바이트가 잘렸습니다."
+
+#: ../libgaim/protocols/toc/toc.c:497
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s 님은 현재 로그인 되어 있지 않습니다."
+
+#: ../libgaim/protocols/toc/toc.c:500
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "%s 경고는 허가되어 있지 않습니다."
+
+#: ../libgaim/protocols/toc/toc.c:503
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr "사용자 속도 제한을 초과하였기 때문에, 메시지가 유실되었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:506
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "%s 에서의 대화는 가능하지 않습니다."
+
+#: ../libgaim/protocols/toc/toc.c:509
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "너무 빨라 %s 메시지를 전송할 수 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:512
+#, c-format
+msgid "You missed an IM from %s because it was too big."
+msgstr "너무 커서 %s (으)로부터의 IM 을 무시했습니다."
+
+#: ../libgaim/protocols/toc/toc.c:515
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr "너무 빨라 %s 님으로부터의 IM 을 무시했습니다."
+
+#: ../libgaim/protocols/toc/toc.c:518
+msgid "Failure."
+msgstr "실패했습니다."
+
+#: ../libgaim/protocols/toc/toc.c:521
+msgid "Too many matches."
+msgstr "너무 많이 일치합니다."
+
+#: ../libgaim/protocols/toc/toc.c:524
+msgid "Need more qualifiers."
+msgstr "더 많은 수식어가 필요합니다."
+
+#: ../libgaim/protocols/toc/toc.c:527
+msgid "Dir service temporarily unavailable."
+msgstr "일시적으로 디렉토리 서비스를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:530
+msgid "E-mail lookup restricted."
+msgstr "이메일 검색이 거부되었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:533
+msgid "Keyword ignored."
+msgstr "검색어가 무시되었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:536
+msgid "No keywords."
+msgstr "검색어가 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:539
+msgid "User has no directory information."
+msgstr "디렉토리 정보가 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:543
+msgid "Country not supported."
+msgstr "지원되지 않는 국가입니다."
+
+#: ../libgaim/protocols/toc/toc.c:546
+#, c-format
+msgid "Failure unknown: %s."
+msgstr "원인을 알 수 없는 실패: %s"
+
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect screen name or password."
+msgstr "아이디 또는 비밀번호가 틀립니다."
+
+#: ../libgaim/protocols/toc/toc.c:552
+msgid "The service is temporarily unavailable."
+msgstr "일시적으로 서비스를 이용할 수 없습니다."
+
+#: ../libgaim/protocols/toc/toc.c:555
+msgid "Your warning level is currently too high to log in."
+msgstr "로그인 경고 수준이 너무 높습니다."
+
+#: ../libgaim/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 "접속과 해제를 반복 수행했습니다. 10분 정도 후에 재시도 하십시오. 이대로 계속하면 더 많이 시간을 기다려야 합니다."
+
+#: ../libgaim/protocols/toc/toc.c:560
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
+
+#: ../libgaim/protocols/toc/toc.c:563
+#, c-format
+msgid "An unknown error, %d, has occurred.  Info: %s"
+msgstr "알 수 없는 오류 %d 이(가) 발생했습니다 (정보: %s)."
+
+#: ../libgaim/protocols/toc/toc.c:590
+msgid "Invalid Groupname"
+msgstr "그룹명이 잘못되었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:674
+msgid "Connection Closed"
+msgstr "접속을 닫았습니다."
+
+#: ../libgaim/protocols/toc/toc.c:714
+msgid "Waiting for reply..."
+msgstr "응답을 기다리는 중입니다..."
+
+#: ../libgaim/protocols/toc/toc.c:792
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr "TOC 가 일시정지 상태에서 복귀했습니다. 메시지를 다시 보낼 수 있습니다."
+
+#: ../libgaim/protocols/toc/toc.c:995
+msgid "Password Change Successful"
+msgstr "비밀번호 변경이 성공적으로 완료되었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:999
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 가 PAUSE 명령을 보냈습니다."
+
+#: ../libgaim/protocols/toc/toc.c:1000
+msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgstr "이것이 발생한 경우, TOC 는 메시지 송신을 무시하기 때문에 메시지를 보낼 수 없습니다. Pidgin은 모든 송신 데이터를 차단합니다. 일시적인 현상이므로 잠시만 기다려 주십시오."
+
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "그룹(_G):"
+
+#: ../libgaim/protocols/toc/toc.c:1555
+msgid "Get Dir Info"
+msgstr "폴더 정보 가져오기"
+
+#: ../libgaim/protocols/toc/toc.c:1695
+msgid "Set Dir Info"
+msgstr "폴더 정보 설정"
+
+#: ../libgaim/protocols/toc/toc.c:1817
+#, c-format
+msgid "Could not open %s for writing!"
+msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
+
+#: ../libgaim/protocols/toc/toc.c:1853
+msgid "File transfer failed; other side probably canceled."
+msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
+
+#: ../libgaim/protocols/toc/toc.c:1898
+#: ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062
+#: ../libgaim/protocols/toc/toc.c:2150
+msgid "Could not connect for transfer."
+msgstr "전송할 수 없었습니다."
+
+#: ../libgaim/protocols/toc/toc.c:2095
+msgid "Could not write file header.  The file will not be transferred."
+msgstr "파일 헤더를 기록할 수 없습니다. 파일은 전송되지 않습니다."
+
+#: ../libgaim/protocols/toc/toc.c:2195
+msgid "Gaim - Save As..."
+msgstr "Pidgin - 다른 이름으로 저장..."
+
+#: ../libgaim/protocols/toc/toc.c:2229
+#, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr[0] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
+msgstr[1] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
+
+#: ../libgaim/protocols/toc/toc.c:2236
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s 님이 파일을 보내도록 요청하고 있습니다."
 
 #. *< type
 #. *< ui_requirement
@@ -10608,304 +14136,205 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
-msgid "Yahoo Protocol Plugin"
-msgstr "야후 프로토콜 플러그인"
-
-#: src/protocols/yahoo/yahoo.c:3658
-msgid "Yahoo Japan"
-msgstr "야후 일본"
-
-#: src/protocols/yahoo/yahoo.c:3661
-msgid "Pager host"
-msgstr "접속 호스트"
-
-#: src/protocols/yahoo/yahoo.c:3664
-msgid "Japan Pager host"
-msgstr "일본 호출 호스트"
-
-#: src/protocols/yahoo/yahoo.c:3667
-msgid "Pager port"
-msgstr "호출 포트"
-
-#: src/protocols/yahoo/yahoo.c:3670
-msgid "File transfer host"
-msgstr "파일 전송 호스트"
-
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "일본 파일 전송 호스트"
-
-#: src/protocols/yahoo/yahoo.c:3676
-msgid "File transfer port"
-msgstr "파일 전송 포트"
-
-#: src/protocols/yahoo/yahoo.c:3679
-#, fuzzy
-msgid "Chat Room Locale"
-msgstr "대화방 목록 Url"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
-msgstr "대화방 목록 Url"
-
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "YCHT 호스트"
-
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
-msgstr "YCHT 포트"
-
-#: src/protocols/yahoo/yahoo_profile.c:672
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP 주소:</b> %s<br>"
-
-#: src/protocols/yahoo/yahoo_profile.c:748
-msgid "Yahoo! Japan Profile"
-msgstr "야후! 일본 프로필"
-
-#: src/protocols/yahoo/yahoo_profile.c:749
-msgid "Yahoo! Profile"
-msgstr "야후! 프로필"
-
-#: src/protocols/yahoo/yahoo_profile.c:793
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:795
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:971
-msgid "Yahoo! ID"
-msgstr "야후! 아이디"
-
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
-msgid "Hobbies"
-msgstr "취미"
-
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
-msgid "Latest News"
-msgstr "최신 뉴스"
-
-#: src/protocols/yahoo/yahoo_profile.c:1086
-msgid "Home Page"
-msgstr "홈페이지"
-
-#: src/protocols/yahoo/yahoo_profile.c:1101
-msgid "Cool Link 1"
-msgstr "멋진 링크 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1106
-msgid "Cool Link 2"
-msgstr "멋진 링크 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1110
-msgid "Cool Link 3"
-msgstr "멋진 링크 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1123
-#, fuzzy
-msgid "Last Update"
-msgstr "최종 갱신"
-
-#: src/protocols/yahoo/yahoo_profile.c:1129
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s의 사용자 정보를 가져올 수 없음"
-
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:1154
-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 ""
-
-#: src/protocols/yahoo/yahoo_profile.c:1162
-msgid "The user's profile is empty."
-msgstr "사용자의 프로필이 비어있습니다."
-
-#: src/protocols/yahoo/yahoochat.c:202
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr "초대가 거절됨"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr "대화에 참여할 수 없음"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:435
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "%s 대화방에 들어왔습니다."
-
-#: src/protocols/yahoo/yahoochat.c:608
-msgid "Failed to join buddy in chat"
-msgstr "대화 참여 실패"
-
-#: src/protocols/yahoo/yahoochat.c:609
-msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1326
-msgid "Fetching the room list failed."
-msgstr "방 목록 처리에 실패했습니다."
-
-#: src/protocols/yahoo/yahoochat.c:1379
-msgid "Voices"
-msgstr "음성"
-
-#: src/protocols/yahoo/yahoochat.c:1382
-msgid "Webcams"
-msgstr "웹캠"
-
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr "방 목록을 처리할 수 없습니다."
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr "사용자 방"
-
-#: src/protocols/yahoo/ycht.c:400
-msgid "Connection problem with the YCHT server."
-msgstr "YCHT 서버 연결에 오류가 발생했습니다."
-
-#: src/protocols/zephyr/zephyr.c:331
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(이 메시지에서 변환 오류가 발생했습니다.\t 계정 편집기에서 '인코딩' 옵션을 확"
-"인하세요.)"
-
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "메시지를 보낼 수 없습니다 (0x%X)."
-
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>사용자:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
-msgid "<br>Hidden or not logged-in"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
-#, c-format
-msgid "<br>At %s since %s"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
-msgid "Anyone"
-msgstr "아무나"
-
-#: src/protocols/zephyr/zephyr.c:2273
-msgid "_Class:"
-msgstr "클래스(_C):"
-
-#: src/protocols/zephyr/zephyr.c:2279
-msgid "_Instance:"
-msgstr "인스턴스(_I):"
-
-#: src/protocols/zephyr/zephyr.c:2285
-msgid "_Recipient:"
-msgstr "받는사람(_R):"
-
-#: src/protocols/zephyr/zephyr.c:2296
-#, c-format
-msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2602
-msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2607
-msgid "zl &lt;nick&gt;: Locate user"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2612
-msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2617
-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2622
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2628
-msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2633
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2639
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2645
-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 ""
-
-#: src/protocols/zephyr/zephyr.c:2651
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2656
-msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2762
-msgid "Resubscribe"
-msgstr "재가입"
-
-#: src/protocols/zephyr/zephyr.c:2765
-msgid "Retrieve subscriptions from server"
-msgstr "서버로부터 가입 응답을 받음"
+#: ../libgaim/protocols/toc/toc.c:2326
+#: ../libgaim/protocols/toc/toc.c:2328
+msgid "TOC Protocol Plugin"
+msgstr "TOC 프로토콜 플러그인"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:793
+msgid "Your Yahoo! message did not get sent."
+msgstr "Yahoo! 메시지를 보낼 수 없었습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3732
+msgid "Buzz!!"
+msgstr "버저!!"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:898
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s 의 Yahoo! 시스템 메시지"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:958
+msgid "Authorization denied message:"
+msgstr "인증 거부 메시지:"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s 은(는) 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올라가) 거부했습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s 은(는) 다음의 이유로 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올라가) 거부했습니다:\" %s"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1043
+msgid "Add buddy rejected"
+msgstr "거부할 친구 추가"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo 서버가 인식할 수 없는 인증 방식의 사용을 요구해 왔습니다. 이 버전의 Pidgin은 아마도 Yahoo 에 접속을 할 수 없는 것 같습니다. %s (으)로 업데이트 가능한 지 확인하십시오."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1797
+msgid "Failed Yahoo! Authentication"
+msgstr "Yahoo! 인증 실패"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#, 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 "%s 을(를) 무시하려고 했지만, 사용자가 친구 목록에 있습니다. 그 사용자를 친구 목록에서 삭제하고 무시할 경우에는 \"예\" 를 눌러 주십시오."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1866
+msgid "Ignore buddy?"
+msgstr "친구를 무시하시겠습니까?"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1914
+msgid "Normal authentication failed!"
+msgstr "표준 인증에 실패했습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1915
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "표준 인증 방식으로 실패했습니다. 이것은 사용 중인 비밀번호가 틀리거나 혹은 Yahoo! 의 인증 절차가 변경된 경우입니다. Pidgin은 웹 메신저 인증 방식을 이용하여 로그인을 시험해 보지만, 이용 가능한 기능이 줄어들 수도 있습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1926
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "사용 중인 계정이 잠겨 있습니다. Yahoo! 웹사이트로 로그인 하십시오."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr "그룹 %2$s 의 친구 %1$s 을(를) 계정 %3$s (으)로 서버 목록에 추가할 수 없었습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1986
+msgid "Could not add buddy to server list"
+msgstr "친구를 서버 목록에 추가할 수 없었습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ 재생 가능 %s/%s/%s.swf ] %s"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2436
+msgid "Received unexpected HTTP response from server."
+msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2460
+#: ../libgaim/protocols/yahoo/yahoo.c:2632
+#: ../libgaim/protocols/yahoo/yahoo.c:2735
+#: ../libgaim/protocols/yahoo/yahoo.c:2745
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
+msgid "Connection problem"
+msgstr "접속 오류"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2860
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
+msgid "Not at Home"
+msgstr "집에 없음"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2862
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
+msgid "Not at Desk"
+msgstr "자리에 없음"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2864
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
+msgid "Not in Office"
+msgstr "사무실에 없음"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2868
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
+msgid "On Vacation"
+msgstr "휴가 중"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2872
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
+msgid "Stepped Out"
+msgstr "잠시 외출"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2965
+#: ../libgaim/protocols/yahoo/yahoo.c:2995
+msgid "Not on server list"
+msgstr "서버 목록에 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3012
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
+msgid "Appear Online"
+msgstr "온라인으로 표시"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3015
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
+msgid "Appear Permanently Offline"
+msgstr "일시적으로 오프라인으로 표시"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
+msgid "Presence"
+msgstr "자리에 있음"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
+msgid "Appear Offline"
+msgstr "오프라인으로 표시"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3085
+msgid "Don't Appear Permanently Offline"
+msgstr "일시적으로 오프라인으로 표시 안 함"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3133
+msgid "Join in Chat"
+msgstr "대화에 참가"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
+msgid "Initiate Conference"
+msgstr "회의에 초대"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3167
+msgid "Presence Settings"
+msgstr "자리 있음 상태 설정"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
+msgid "Start Doodling"
+msgstr "낙서 시작"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3205
+msgid "Active which ID?"
+msgstr "어느 ID 를 활성화 하시겠습니까?"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+msgid "Join who in chat?"
+msgstr "어느 대화에 참가하시겠습니까?"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3224
+msgid "Activate ID..."
+msgstr "ID 활성화..."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3228
+msgid "Join User in Chat..."
+msgstr "대화에 참가..."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3791
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3796
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3800
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 사용자에게 부저음 울림"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3804
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 사용자에게 낙서 요구"
 
 #. *< type
 #. *< ui_requirement
@@ -10917,1083 +14346,601 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
+#: ../libgaim/protocols/yahoo/yahoo.c:3901
+msgid "Yahoo Protocol Plugin"
+msgstr "Yahoo! 프로토콜 플러그인"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3918
+msgid "Yahoo Japan"
+msgstr "Yahoo Korea! 에 접속"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3921
+msgid "Pager server"
+msgstr "호출기 서버"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3924
+msgid "Japan Pager server"
+msgstr "한국 호출기 서버"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3927
+msgid "Pager port"
+msgstr "호출기 포트"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3930
+msgid "File transfer server"
+msgstr "파일 전송 서버"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3933
+msgid "Japan file transfer server"
+msgstr "한국 파일 전송 서버"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3936
+msgid "File transfer port"
+msgstr "파일 전송 포트"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3939
+msgid "Chat room locale"
+msgstr "대화실 위치"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3942
+msgid "Ignore conference and chatroom invitations"
+msgstr "회의 및 대화실 초대 무시"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+msgid "Chat room list URL"
+msgstr "대화실 URL 목록"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3953
+msgid "Yahoo Chat server"
+msgstr "Yahoo 대화 서버"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3956
+msgid "Yahoo Chat port"
+msgstr "Yahoo 대화 포트 번호"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 은(는) 회의 초대를 대화실 \"%s\" 에 거절했습니다 (이유는 \"%s\")."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "초대가 거부되었습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "대화 참가에 실패했습니다."
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "알 수 없는 대화실"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "아마도 대화실이 모두 찬 것 같습니다."
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "이용 불가"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "알 수 없는 오류입니다. 로그아웃 후 5초 정도 있다가 다시 대화실로 참가하십시오."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "나는 %s 에서 대화 중입니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "대화 중인 친구에게 참가할 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "아마도 대화에 아무도 없는 것 같습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "대화실 목록 가져오기에 실패했습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "음성"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "웹카메라"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "대화실 목록 가져올 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "사용자실"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+msgid "Sent Doodle request."
+msgstr "낙서 요청을 보냄"
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr "파일 기술자를 가져올 수 없습니다."
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+msgid "Write Error"
+msgstr "쓰기 오류"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo! Korea 프로파일"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+msgid "Yahoo! Profile"
+msgstr "Yahoo! 프로파일"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "죄송합니다. 이 버전에서는 성인 컨텐트를 포함하고 있으면, 마크가 붙은 프로파일은 이용할 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "이 프로파일의 열람을 희망하는 경우에는, 사용 중인 웹 브라우저로부터 다음의 링크를 방문해 주십시오:"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+msgid "Hobbies"
+msgstr "취미"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+msgid "Latest News"
+msgstr "최신 뉴스"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+msgid "Home Page"
+msgstr "홈페이지"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+msgid "Cool Link 1"
+msgstr "추천 링크 1"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+msgid "Cool Link 2"
+msgstr "추천 링크 2"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+msgid "Cool Link 3"
+msgstr "추천 링크 3"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+msgid "Last Update"
+msgstr "최종 갱신일"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "죄송합니다. 이 프로파일은 이 버전에서는 지원하지 않는 서식 혹은 언어입니다."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "사용자 프로파일을 가져올 수 없었습니다. 아마도 일시적인 서버쪽의 문제인 것 같습니다. 잠시 후 재시도 하십시오."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "사용자 프로파일을 가져올 수 없었습니다. 아마도 서버가 존재하지 않는 것 같습니다. 단, 가끔 Yahoo! 는 사용자 프로파일을 가져오지 못할 때가 있습니다. 사용자가 확실히 존재하면, 잠시 후 재시도 해 보십시오."
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+msgid "The user's profile is empty."
+msgstr "사용자 프로파일이 비어 있습니다."
+
+#: ../libgaim/protocols/yahoo/ycht.c:456
+msgid "Connection problem with the YCHT server."
+msgstr "YCHT 서버를 사용한 접속에 문제가 있습니다."
+
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"서버와의 접속이 끊어졌습니다.\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(이 메시지를 교환하는 동안 오류가 발생했습니다.\t 계정 편집기의 '인코딩' 설정을 확인해 주십시오.)"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:753
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "대화 %s,%s,%s 에 전송할 수 없습니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:787
+#: ../libgaim/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "사용자"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:792
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
+msgid "Hidden or not logged-in"
+msgstr "숨어 있거나 접속되어 있지 않습니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:798
+#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br> %s 에 %s 부터 있습니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:1546
+#: ../libgaim/protocols/zephyr/zephyr.c:1547
+msgid "Anyone"
+msgstr "모두"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2354
+msgid "_Class:"
+msgstr "클래스(_C):"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2360
+msgid "_Instance:"
+msgstr "인스턴스(_I):"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2366
+msgid "_Recipient:"
+msgstr "받는 사람(_R):"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s 에의 구독 시행 실패"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2690
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;별명&gt;: 사용자의 위치를 확인합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2695
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;별명&gt;: 사용자의 위치를 확인합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2700
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2705
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2710
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2716
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: 새 대화에 참가합니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2721
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;인스턴스&gt;: &lt;메시지,<i>인스턴스</i>,*&gt; 에 메시지를 보냅니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2727
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;클래스&gt; &lt;인스턴스&gt;: &lt;<i>클래스</i>,<i>인스턴스</i>,*&gt; 에 메시지를 보냅니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2733
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;<i>클래스</i>,<i>인스턴스</i>,<i>받는 사람</i>&gt; 에 메시지를 보냅니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2739
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;MESSAGE,<i>인스턴스</i>,<i>받는 사람</i>&gt; 에 메시지를 보냅니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2744
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;클래스&gt;: &lt;<i>클래스</i>,PERSONAL,*&gt; 에 메시지를 보냅니다."
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2850
+msgid "Resubscribe"
+msgstr "재구독"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2853
+msgid "Retrieve subscriptions from server"
+msgstr "서버로부터 구독을 가져옵니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/zephyr/zephyr.c:2940
+#: ../libgaim/protocols/zephyr/zephyr.c:2942
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 프로토콜 플러그인"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../libgaim/protocols/zephyr/zephyr.c:2961
+msgid "Use tzc"
+msgstr "tzc 사용"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2964
+msgid "tzc command"
+msgstr "tzc 명령"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2967
 msgid "Export to .anyone"
-msgstr ".anyone으로 내보내기"
-
-#: src/protocols/zephyr/zephyr.c:2877
+msgstr ".anyone 으로 내보내기"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2970
 msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs로 내보내기"
-
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+msgstr ".zephyr.subs 로 내보내기"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2973
 msgid "Import from .anyone"
-msgstr ".anyone으로 내보내기"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr ".anyone 으로부터 가져오기"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2976
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs로 내보내기"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
+msgstr ".zephyr.subs 로부터 가져오기"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2979
 msgid "Realm"
-msgstr "실명"
-
-#: src/protocols/zephyr/zephyr.c:2889
+msgstr "Realm"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2982
 msgid "Exposure"
 msgstr "노출"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
-#. Forbidden
-#: src/proxy.c:1036
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "접근 불가: 프록시 서버가 %d번 포트 터널링을 허용하지 않습니다."
-
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "프록시 연결 오류 %d"
-
-#: src/proxy.c:1874
-msgid "Invalid proxy settings"
-msgstr "잘못된 프록시 세팅"
-
-#: src/proxy.c:1874
+#: ../libgaim/proxy.c:442
+#: ../libgaim/proxy.c:864
+#: ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
+#, c-format
 msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+"Unable to create socket:\n"
+"%s"
 msgstr ""
-"지정한 프록시 종류에 알맞지 않은 호스트 이름이나 포트 번호가 사용되었습니다."
+"소켓을 생성할 수 없습니다:\n"
+"%s"
+
+#: ../libgaim/proxy.c:644
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "HTTP 프록시로부터의 응답을 해석할 수 없습니다: %s\n"
+
+#: ../libgaim/proxy.c:672
+#: ../libgaim/proxy.c:718
+#: ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP 프록시 접속 오류 %d"
+
+#: ../libgaim/proxy.c:764
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "접근이 거부되었습니다: HTTP 프록시 서버가 포트 번호 %d 의 터널링을 거부했습니다."
+
+#: ../libgaim/proxy.c:984
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s 을(를) 해석하는 중 오류"
+
+#: ../libgaim/proxy.c:1676
+msgid "Could not resolve host name"
+msgstr "호스트명을 해석할 수 없었습니다."
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libgaim/request.h:1341
+msgid "_Yes"
+msgstr "예(_Y)"
+
+#: ../libgaim/request.h:1341
+msgid "_No"
+msgstr "아니오(_N)"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "승락"
-
-#: src/server.c:243
+#: ../libgaim/request.h:1360
+msgid "_Accept"
+msgstr "허가(_A)"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libgaim/savedstatuses.c:46
+msgid "I'm not here right now"
+msgstr "지금 자리에 없습니다."
+
+#: ../libgaim/savedstatuses.c:525
+msgid "saved statuses"
+msgstr "저장된 상태"
+
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s님이 %s(으)로 대화명을 바꾸었습니다.\n"
-
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d 메시지)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 메시지)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+msgstr "%s 님을 %s 님으로 인식했습니다.\n"
+
+#: ../libgaim/server.c:674
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s님이 대화창을 닫았습니다."
-
-#: src/server.c:864
+msgstr ""
+"%s 님이 %s 님을 대화실 %s (으)로 초대하고 있습니다:\n"
+"%s"
+
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr ""
-
-#: src/server.c:868
+msgstr "%s 님이 %s 님을 대화실 %s (으)로 초대하고 있습니다:\n"
+
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
-msgstr "대화 초대에 승락할까요?"
-
-#: src/status.c:153
-#, fuzzy
+msgstr "대화실로의 초대를 수락하시겠습니까?"
+
+#: ../libgaim/status.c:153
 msgid "Unset"
-msgstr "초대"
-
-#: src/status.c:156
+msgstr "해제"
+
+#: ../libgaim/status.c:156
 msgid "Unavailable"
-msgstr "메시지 받을 수 없음"
-
-#: src/status.c:621
-#, c-format
-msgid "%s came back"
-msgstr "%s님이 돌아옴"
-
-#: src/status.c:626
-#, c-format
-msgid "%s went away"
-msgstr "%s님이 자리비움"
-
-#: src/status.c:1308
+msgstr "이용 불가"
+
+#: ../libgaim/status.c:160
+msgid "Mobile"
+msgstr "이동 중"
+
+#: ../libgaim/status.c:611
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s 님이 상태를 %s (으)로부터 %s (으)로 변경했습니다."
+
+#: ../libgaim/status.c:621
+#, c-format
+msgid "%s is now %s"
+msgstr "%s 님을 %s 님으로 인식했습니다."
+
+#: ../libgaim/status.c:626
+#, c-format
+msgid "%s is no longer %s"
+msgstr "이제 %s 님은 %s 님이 아닙니다."
+
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
-msgstr "%s님이 사용안함 상태가 됨"
-
-#: src/status.c:1323
+msgstr "%s 님이 대기 중이 되었습니다."
+
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
-msgstr "%s님이 사용안함 상태가 풀림"
-
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "자동으로 자리비움"
-
-#: src/util.c:2121
-#, fuzzy, c-format
+msgstr "%s 님이 대기 중으로부터 복귀했습니다."
+
+#: ../libgaim/status.c:1376
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s 님이 대기 중이 되었습니다."
+
+#: ../libgaim/status.c:1378
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s 님이 대기 중으로부터 복귀했습니다."
+
+#: ../libgaim/util.c:680
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../libgaim/util.c:2434
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"읽기 오류 %s: \n"
-"%s.\n"
-
-#: src/util.c:2122
-#, fuzzy, 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 ""
-"내 친구 목록 파싱 중에 오류가 발생했습니다. 이 파일을 읽지 않고 blist.xml~로 "
-"바꿉니다."
-
-#: src/util.c:2567
+msgstr "%s 을(를) 읽는 중 오류"
+
+#: ../libgaim/util.c:2435
+#, 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 "%s 을(를) 읽는 중 오류가 발생했습니다. 이 정보는 읽을 수 없습니다. 또한, 오래된 파일 이름을 \"%s~\" (으)로 변경했습니다."
+
+#: ../libgaim/util.c:2898
 msgid "Calculating..."
-msgstr "계산중..."
-
-#: src/util.c:2570
+msgstr "계산 중..."
+
+#: ../libgaim/util.c:2901
 msgid "Unknown."
-msgstr "알려지지 않음."
-
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "초"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "일"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "시간"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "분"
-
-#: src/util.c:3053
-msgid "g003: Error opening connection.\n"
-msgstr "g003: 연결중 에러 발생.\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "친구 목록 정렬"
-
-#~ msgid "_Sorting:"
-#~ msgstr "정렬(_S):"
-
-#~ msgid "Buddy Display"
-#~ msgstr "친구 보여주기"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "사용자 정보 보이기"
-
-#~ msgid "Gnome Default"
-#~ msgstr "그놈 기본"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "자리비움 메시지(_E):"
-
-#, fuzzy
-#~ msgid "Quit message"
-#~ msgstr "(1 메시지)"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "재접속시 자리비움 상태 되돌림"
-
-#~ msgid "Mail Server"
-#~ msgstr "메일 서버"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d개/총 %d개"
-
-#~ msgid "Check Mail"
-#~ msgstr "편지 확인"
-
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "매 X 초마다 메일을 확인합니다.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "자동 로그인"
-
-#~ msgid "New..."
-#~ msgstr "새..."
-
-#~ msgid "Back"
-#~ msgstr "돌아옴"
-
-#~ msgid "Signoff"
-#~ msgstr "연결 끊기"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "트레이 아이콘 설정"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "트레이 아이콘이 클릭되기 전까지는 새 메시지 숨김(_H)"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "기관 부서"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "AIM에 연결되지 않음"
-
-#~ msgid "No screenname given."
-#~ msgstr "아이디를 입력하지 않았습니다."
-
-#~ msgid "No roomname given."
-#~ msgstr "방 이름을 입력하지 않았습니다."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "잘못된 AIM URI"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "소켓을 읽을 수 없음"
-
-#~ msgid "Remote Control"
-#~ msgstr "리모콘"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "게임 프로그램을 위해 리모콘을 제공합니다."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "써드파티 프로그램이나 게임 원격 도구를 이용해 게임을 원격조종할 수 있게 합"
-#~ "니다."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "새 대화가 열렸을 때 이 플러그인은 현재 대화창에 지난 대화의 내용을 넣어줍"
-#~ "니다."
-
-#~ msgid "_Apply"
-#~ msgstr "적용(_A)"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "도킹된 친구목록을 항상 위에 놓기(_B)"
-
-#~ msgid "Away!"
-#~ msgstr "자리비움!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "이 메시지로 고치기"
-
-#~ msgid "I'm Back!"
-#~ msgstr "돌아왔다!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "정말 자리비움 메시지 %s을(를) 지울까요?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "자리비움 메시지 지움"
-
-#~ msgid "Set All Away"
-#~ msgstr "모든 자리비움 메시지 사용"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "자리비움 메시지의 제목은 비어 있으면 안 됩니다"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "메시지 타이틀을 넣거나 저장 없이 사용하시려면 \"사용\"을 누르세요."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "자리비움 메시지는 비어 있으면 안 됩니다"
-
-#~ msgid "New away message"
-#~ msgstr "새 자리비움 메시지"
-
-#~ msgid "Away title: "
-#~ msgstr "자리비움 제목: "
-
-#~ msgid "_Save"
-#~ msgstr "저장(_S)"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "저장 및 사용(_V)"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "친구 목록 오류"
-
-#, fuzzy
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr "게임이 실행되고 있지 않음 (on session 0)\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "AIM 사용하기: URIs:\n"
-#~ "아이디로 메시지 보내기:\n"
-#~ "\tgaim-remote rui 'aim:goim?screenname=Penguin&message=안녕+세계'\n"
-#~ "이 경우에서, 'Penguin'이 메시지를 보내고 싶은 아이디이고 '안녕 세계'가 보"
-#~ "낼\n"
-#~ "메시지입니다. 빈 칸이 필요한 곳에는 '+'를 대신 넣어야 합니다.\n"
-#~ "위에서 사용된 예제에 주목하세요 - 만일 쉘에서 이것을 실행한다면 '&'에\n"
-#~ "탈출문자(\\)가 필요합니다. 그렇지 않으면 명령은 그 시점에서 멈춥니다.\n"
-#~ "아래는 메시지 없이 아이디로 메시지창만 열 때:\n"
-#~ "\tgaim-remote uri aim:goim?screenname=Penguin\n"
-#~ "\n"
-#~ "대화방에 참여:\n"
-#~ "\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
-#~ "...'PenguinLounge' 대화방에 참여합니다.\n"
-#~ "\n"
-#~ "내 친구 목록에 친구 더하기:\n"
-#~ "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
-#~ "...내 친구 목록에 'Penguin'을 더합니다.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "간략한 옵션 보기"
-
-#~ msgid "Information"
-#~ msgstr "정보"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/친구(B)/끊기(_S)"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/도구(T)/자리비움(_A)"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/도구(T)/프로토콜 명령(_U)"
-
-#~ msgid "Rename Group"
-#~ msgstr "그룹 이름 바꾸기"
-
-#~ msgid "New group name"
-#~ msgstr "새 그룹 이름"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "선택된 그룹의 새 이름을 입력하세요."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>계정:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>경고:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "경고 (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/도구(T)/자리비움"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "선택된 친구에게 메시지 보내기"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "선택된 친구의 정보 가져오기"
-
-#~ msgid "_Chat"
-#~ msgstr "대화(_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "대화실에 참여"
-
-#~ msgid "_Away"
-#~ msgstr "자리비움(_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "자리비움 메시지 설정"
-
-#~ msgid "Done."
-#~ msgstr "완료."
-
-#~ msgid "Signon: "
-#~ msgstr "연결: "
-
-#~ msgid "Signon"
-#~ msgstr "연결"
-
-#~ msgid "Cancel All"
-#~ msgstr "모두 취소"
-
-#~ msgid "_Reconnect"
-#~ msgstr "재연결(_R)"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s의 접속이 끊어졌습니다.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "이유가 알려지지 않음."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "모두 재연결(_A)"
-
-#~ msgid "Time"
-#~ msgstr "시간"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "자리비움 메시지 보기"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/대화(C)/경고(_W)..."
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/대화(C)/별칭(_L)..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/옵션(O)/시간 보이기"
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/대화(C)/경고..."
-
-#~ msgid "Warn"
-#~ msgstr "경고"
-
-#~ msgid "Warn the user"
-#~ msgstr "사용자 경고"
-
-#~ msgid "Block the user"
-#~ msgstr "사용자 차단"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "파일 보냄"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "친구 목록에 더하기"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "친구 목록에서 사용자를 뺌"
-
-#~ msgid "Send"
-#~ msgstr "보내기"
-
-#~ msgid "Invite"
-#~ msgstr "초대"
-
-#~ msgid "Invite a user"
-#~ msgstr "사용자 초대"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "친구 목록에 대화실 만들기"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<메인>/대화(C)/닫기(C)"
-
-#~ msgid "former lead developer"
-#~ msgstr "예전 수석 개발자"
-
-#~ msgid "former maintainer"
-#~ msgstr "예전 관리자"
-
-#, fuzzy
-#~ msgid "Azerbaijani"
-#~ msgstr "세르비아어"
-
-#, fuzzy
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "노르웨이어"
-
-#, fuzzy
-#~ msgid "Albanian"
-#~ msgstr "루마니아어"
-
-#~ msgid "Chinese"
-#~ msgstr "중국어"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">게임 v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "아이디(_S)"
-
-#~ msgid "Warn User"
-#~ msgstr "사용자 경고"
-
-# c-format
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s님에게 경고할까요?</span>\n"
-#~ "\n"
-#~ "이것은 %s님의 경고 단계를 증가시키고 한계 비율을 엄격하게 적용할 것입니"
-#~ "다.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "익명으로 경고를 보낼까요(_A)?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>익명 경고는 문제를 덜 일으킬 수 있습니다.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "파일전송 내용 보이기"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "별칭이 설정되어 있지 않으면 대화명 보임(_I)"
-
-#~ msgid "Display"
-#~ msgstr "표시"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "메시지에 시간 보여주기(_T)"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "색깔 무시(_O)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "글꼴 무시(_F)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "글자 크기 무시(_Z)"
-
-#~ msgid "Default Formatting"
-#~ msgstr "기본 꾸밈"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "나가는 메시지를 기본 꾸밈으로 보냄(_S)"
-
-#~ msgid "Send Message"
-#~ msgstr "메시지 보내기"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "엔터키로 메시지 보냄(_S)"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "컨트롤-엔터로 메시지 보냄(_O)"
-
-#~ msgid "Window Closing"
-#~ msgstr "창 닫기"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Esc 키로 창 닫음"
-
-#~ msgid "Insertions"
-#~ msgstr "넣기"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "컨트롤-{B/I/U}키로 꾸밈양식 넣기(_F)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "컨트롤-(숫자)키로 이모티콘 넣기(_I)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "다음처럼 단추 보여주기(_B):"
-
-#~ msgid "Pictures"
-#~ msgstr "그림"
-
-#~ msgid "Text"
-#~ msgstr "글자"
-
-#~ msgid "Pictures and text"
-#~ msgstr "그림과 글자"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "메시지가 오면 창 올림(_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "경고 수준 보여주기(_W)"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "자동으로 연락처 펼침(_A)"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "탭/제목에 별명 보임(_A)"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "메시지 오면 창 올림(_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "대화가 진행되면 창 올림(_W)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "대화할 때 여러 색깔 대화명 사용(_M)"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "새로운 대화 위치:"
-
-#~ msgid "Message Logs"
-#~ msgstr "메시지 로그"
-
-#~ msgid "System Logs"
-#~ msgstr "시스템 로그"
-
-#~ msgid "_Enable system log"
-#~ msgstr "시스템 정보 기록(_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "친구의 접속/종료 기록(_S)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "친구의 사용안함/사용함 기록(_I)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "자신의 자리비움/돌아옴 기록(_B)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "자신의 연결/사용안함/자리비움 기록(_O)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "사용안한 시간 보고하기(_T):"
-
-#~ msgid "Gaim usage"
-#~ msgstr "게임 사용하지 않은 시간 보여주기"
-
-#~ msgid "X usage"
-#~ msgstr "X를 사용하지 않은 시간 보여주기"
-
-#~ msgid "Windows usage"
-#~ msgstr "창 사용"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">작성:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">웹 사이트:</span>\t%s\n"
-#~ "<span weight=\"bold\">파일명:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">작성:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">파일명:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "불러오기"
-
-#~ msgid "Summary"
-#~ msgstr "요약"
-
-#~ msgid "Details"
-#~ msgstr "정보"
-
-#~ msgid "_Edit"
-#~ msgstr "편집(_E)"
-
-#~ msgid "Interface"
-#~ msgstr "인터페이스"
-
-#~ msgid "Message Text"
-#~ msgstr "메시지 내용"
-
-#~ msgid "Shortcuts"
-#~ msgstr "단축키"
-
-#~ msgid "Away Messages"
-#~ msgstr "자리비움"
-
-#~ msgid "Plugins"
-#~ msgstr "플러그인"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "평문"
-
-#~ msgid "Please create an account."
-#~ msgstr "계정을 만드세요."
-
-#~ msgid "Login"
-#~ msgstr "접속"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>계정(_A):</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>열쇠글(_P):</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "계정(C)"
-
-#~ msgid "P_references"
-#~ msgstr "기본 설정(R)"
-
-#~ msgid "_Sign on"
-#~ msgstr "연결(_S)"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "기본설정을 읽을 수 없음"
-
-#~ msgid "Available for friends only"
-#~ msgstr "친구들에게만 메시지 받을 수 있음"
-
-#~ msgid "Away for friends only"
-#~ msgstr "친구들에게만 자리비움 표시"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "친구들에게만 보이지 않도록 함"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "호스트의 IP를 알 수 없습니다."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "소켓에서 읽는 중에 에러가 발생했습니다."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "소켓에 쓰는 중에 에러가 발생했습니다."
-
-#~ msgid "Authentication failed."
-#~ msgstr "인증 실패."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "알 수 없는 에러 코드."
-
-#~ msgid "Status: %s"
-#~ msgstr "상태: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "연결할 수 없습니다."
-
-#~ msgid "Reading data"
-#~ msgstr "데이터를 읽는 중"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "밸런서 악수"
-
-#~ msgid "Reading server key"
-#~ msgstr "서버 키를 읽는 중"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "키 해쉬를 교환하는 중"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "GG 라이브러리에서 치명적인 오류\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "서버에 핑을 보낼 수 없음"
-
-#~ msgid "Send as message"
-#~ msgstr "메시지로 보내기"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "GG 서버를 찾는 중"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "잘못된 가두-가두 UIN이 지정됨"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "잘못된 가두-가두 UIN으로 메시지를 보내려고 하고있습니다."
-
-#~ msgid "Birth Year"
-#~ msgstr "생년"
-
-#~ msgid "Sex"
-#~ msgstr "성별"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Gadu-Gadu 서버에 친구 목록이 없습니다."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "서버에서 친구 목록을 가져올 수 없습니다."
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu 서버에서 친구 목록을 성공적으로 가져왔습니다."
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu 서버로 친구 목록을 보낼 수 없습니다."
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu 서버에서 친구 목록을 지웠습니다."
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu 서버에서 친구 목록을 지울 수 없습니다."
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "열쇠글을 바꿀 수 없습니다."
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu 서버에 연결 오류"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "게임이 Gadu-Gadu HTTP 서버 연결 오류로 인해 요청이 완료되지 않았습니다.잠"
-#~ "시 후에 다시 시도하세요."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu 친구 목록을 가져올 수 없음"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "게임이 Gadu-Gadu 친구 목록 서버에 연결하지 못했습니다. 잠시 후에 다시 시도"
-#~ "하세요."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "친구 목록을 내보낼 수 없습니다."
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr ""
-#~ "게임이 친구 목록 서버에 연결하지 못했습니다. 잠시 후에 다시 시도하세요."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu 친구 목록을 지울 수 없음"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "디렉토리에 접근할 수 없음"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "게임이 디렉토리 서버에 접속할 수 없어 디렉토리 찾기에 실패했습니다. 잠시 "
-#~ "후에 다시 시도하세요."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "게임이 Gadu-Gadu 서버 연결 오류로 열쇠글을 바꾸지 못했습니다. 잠시 후에 다"
-#~ "시 시도하세요."
-
-#~ msgid "Directory Search"
-#~ msgstr "디렉토리에서 찾기"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "사용자 소개에 접근할 수 없습니다."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "게임이 디렉토리 서버 연결 오류로 인해 사용자 소개에 접근하지 못했습니다. "
-#~ "잠시 후에 다시 시도하세요."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "게임이 ICQ 연결 오류를 만났습니다."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "%s(%s%s%s%s%s)님이 내 인증을 요청합니다."
-
-#~ msgid "Send message through server"
-#~ msgstr "서버를 통해 메시지 보내기"
-
-#~ msgid "Connecting..."
-#~ msgstr "연결 중..."
-
-#~ msgid "Nick:"
-#~ msgstr "별명:"
-
-#~ msgid "Gaim User"
-#~ msgstr "게임 사용자"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "파일 전송 취소"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s의 친구 정보"
-
-#, fuzzy
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "잘못된 사용자 이름"
-
-#, fuzzy
-#~ msgid "Invalid nickname"
-#~ msgstr "잘못된 사용자 이름"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "재버 프로필"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "방 목록 오류"
-
-#~ msgid "Logged out"
-#~ msgstr "접속 끊음"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "운영체제 숨김"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "%s님이 나를 자신의 친구 목록에 등록하려고 합니다."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "대화창 닫음을 보여줌"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "시간 지남을 보여줌"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "대화가 비활성화되었거나 시간이 너무 지났습니다."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "다른 곳에서 같은 아이디로 로그인하여 연결이 끊김"
-
-#~ msgid "User Properties"
-#~ msgstr "사용자 등록정보"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "%s 파일 전송 완료"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "다른 곳에서 같은 아이디로 접속해 연결이 끊겼습니다."
-
-#, fuzzy
-#~ msgid "Not specified"
-#~ msgstr "예상치 못함"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s의 ICQ 정보"
-
-#, fuzzy
-#~ msgid "Visible"
-#~ msgstr "보이지 않도록 함"
-
-#~ msgid "Available Message:"
-#~ msgstr "유효한 메시지:"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "유효한 메시지 설정..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "채널을 떠날 수 없음"
-
-#~ msgid "Basic Profile"
-#~ msgstr "기본 프로필"
-
-#~ msgid "Profile Information"
-#~ msgstr "개인정보"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "인스턴트 메신저"
-
-#~ msgid "AIM"
-#~ msgstr "메시지"
-
-#~ msgid "Yahoo"
-#~ msgstr "야후"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Trepia 프로필 데이터를 설정합니다."
-
-#~ msgid "Profile"
-#~ msgstr "프로필"
-
-#~ msgid "Set Profile"
-#~ msgstr "프로필 설정"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "홈페이지 방문"
-
-#~ msgid "Local Users"
-#~ msgstr "내부 사용자"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia 프로토콜 플러그인"
-
-#~ msgid "Please enter your password"
-#~ msgstr "열쇠글을 입력하세요"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s님이 접속했습니다."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s님이 연결됨"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s님이 접속을 끊었습니다."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s님의 연결이 끊김"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%2$s님이 %1$s 계정에 경고를 주었습니다.\n"
-#~ "경고 수준이 %3$d%%가 되었습니다"
-
-#~ msgid "an anonymous person"
-#~ msgstr "익명 사용자"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "파일 확장자로 그림 타입을 예상하는 기능을 지원하지 않습니다.  기본은 PNG입"
-#~ "니다."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "기본 SILC 키쌍"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "SILC 공개키"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "SILC 비밀키"
+msgstr "알 수 없음."
+
+#: ../libgaim/util.c:2927
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 초"
+msgstr[1] "%d 초"
+
+#: ../libgaim/util.c:2939
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 일"
+msgstr[1] "%d 일"
+
+#: ../libgaim/util.c:2947
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s %d 시간"
+msgstr[1] "%s %d 시간"
+
+#: ../libgaim/util.c:2953
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 시간"
+msgstr[1] "%d 시간"
+
+#: ../libgaim/util.c:2961
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s %d 분"
+msgstr[1] "%s %d 분"
+
+#: ../libgaim/util.c:2967
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 분"
+msgstr[1] "%d 분"
+
+#: ../libgaim/util.c:3166
+#: ../libgaim/util.c:3464
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s (으)로 접속할 수 없습니다."
+
+#: ../libgaim/util.c:3292
+#, c-format
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "%s (으)로부터 받은 정보를 저장하기 위한 메모리를 확보하지 못했습니다. 웹 서버로부터 무언가 악의를 가지고 전송하고 있을 가능성이 있습니다."
+
+#: ../libgaim/util.c:3327
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s (으)로부터 읽는 중 오류: %s"
+
+#: ../libgaim/util.c:3358
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s (으)로 쓰는 중 오류: %s"
+
+#: ../libgaim/util.c:3383
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%s (으)로 접속할 수 없습니다: %s"
+
diff -r e42309469a4a -r 618a3748ff64 po/ru.po
--- a/po/ru.po	Mon May 21 20:02:18 2007 +0000
+++ b/po/ru.po	Mon May 21 20:58:23 2007 +0000
@@ -9,697 +9,22 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-04 14:02+0400\n"
-"PO-Revision-Date: 2007-04-04 14:30+0400\n"
+"POT-Creation-Date: 2007-05-07 11:26+0400\n"
+"PO-Revision-Date: 2007-05-11 15:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim - клиент обмена мгновенными сообщениями"
-
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Клиент обмена мгновенными сообщениями"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Обмен мгновенными сообщениями с использованием множества протоколов"
-
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../console/gntaccount.c:119
-msgid "Account was not added"
-msgstr "Учётная запись не была добавлена"
-
-#: ../console/gntaccount.c:120
-msgid "Screenname of an account must be non-empty."
-msgstr ""
-
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
-msgid "New mail notifications"
-msgstr "Уведомления о новой почте"
-
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
-msgid "Remember password"
-msgstr "Запомнить пароль"
-
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
-msgid "Modify Account"
-msgstr "Изменить учётную запись"
-
-#: ../console/gntaccount.c:474
-msgid "New Account"
-msgstr "Новая учётная запись"
-
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
-msgid "Protocol:"
-msgstr "Протокол:"
-
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
-msgid "Screen name:"
-msgstr "Идентификатор пользователя:"
-
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
-msgid "Alias:"
-msgstr "Псевдоним:"
-
-#. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1767
-#: ../libgaim/protocols/jabber/buddy.c:1801
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:864
-#: ../libgaim/protocols/jabber/jabber.c:1370
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6057
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
-msgid "Cancel"
-msgstr "Отменить"
-
-#. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
-msgid "Save"
-msgstr "Сохранить"
-
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Вы действительно хотите удалить %s?"
-
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
-msgid "Delete Account"
-msgstr "Удалить учётную запись"
-
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
-msgid "Accounts"
-msgstr "Учётные записи"
-
-#: ../console/gntaccount.c:650
-msgid "You can enable/disable accounts from the following list."
-msgstr "Вы можете включать/выключать учётные записи из следующего списка."
-
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Добавить"
-
-#: ../console/gntaccount.c:677
-msgid "Modify"
-msgstr "Изменить"
-
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
-
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
-msgid "Add buddy to your list?"
-msgstr "Добавить собеседника в список?"
-
-#: ../console/gntblist.c:264
-msgid "You must provide a screename for the buddy."
-msgstr ""
-
-#: ../console/gntblist.c:266
-msgid "You must provide a group."
-msgstr ""
-
-#: ../console/gntblist.c:268
-msgid "You must select an account."
-msgstr "Вы должны выбрать учётную запись."
-
-#: ../console/gntblist.c:272
-msgid "Error adding buddy"
-msgstr "Ошибка добавления собеседника"
-
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
-msgid "Screen Name"
-msgstr "Идентификатор пользователя"
-
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
-msgid "Alias"
-msgstr "Псевдоним"
-
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
-msgid "Group"
-msgstr "Группа"
-
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
-msgid "Account"
-msgstr "Учётная запись"
-
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
-msgid "Add Buddy"
-msgstr "Добавить собеседника"
-
-#: ../console/gntblist.c:312
-msgid "Please enter buddy information."
-msgstr "Введите информацию о собеседнике."
-
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
-msgid "Chats"
-msgstr "Чаты"
-
-#. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:795
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
-msgid "Name"
-msgstr "Имя"
-
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
-msgid "Add Chat"
-msgstr "Добавить чат"
-
-#: ../console/gntblist.c:379
-msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-msgid "Error adding group"
-msgstr "Ошибка добавления группы"
-
-#: ../console/gntblist.c:391
-msgid "You must give a name for the group to add."
-msgstr "Вы должны дать имя добавляемой группе."
-
-#: ../console/gntblist.c:404
-msgid "A group with the name already exists."
-msgstr "Группа с таким именем уже существует."
-
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
-msgid "Add Group"
-msgstr "Добавить группу"
-
-#: ../console/gntblist.c:411
-msgid "Enter the name of the group"
-msgstr "Введите имя группы"
-
-#: ../console/gntblist.c:736
-msgid "Edit Chat"
-msgstr "Изменить чат"
-
-#: ../console/gntblist.c:736
-msgid "Please Update the necessary fields."
-msgstr ""
-
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
-msgid "Edit"
-msgstr "Изменить"
-
-#: ../console/gntblist.c:751
-msgid "Auto-join"
-msgstr "Присоединяться автоматически"
-
-#: ../console/gntblist.c:760
-msgid "Edit Settings"
-msgstr "Изменить настройки"
-
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Получить информацию"
-
-#: ../console/gntblist.c:811
-msgid "Add Buddy Pounce"
-msgstr "Добавить правило"
-
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
-msgid "Send File"
-msgstr "Отправить файл"
-
-#: ../console/gntblist.c:822
-msgid "View Log"
-msgstr "Просмотреть журнал"
-
-#: ../console/gntblist.c:902
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "Введите новое имя для %s"
-
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
-msgid "Rename"
-msgstr "Переименовать"
-
-#: ../console/gntblist.c:904
-msgid "Enter empty string to reset the name."
-msgstr "Введите пустую строку для сброса имени."
-
-#: ../console/gntblist.c:977
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
-"Удаление этого контакта приведёт к удалению всех входящих в него собеседников"
-
-#: ../console/gntblist.c:985
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-"Удаление этой группы приведёт к удалению всех входящих в неё собеседников"
-
-#: ../console/gntblist.c:990
-#, c-format
-msgid "Are you sure you want to remove %s?"
-msgstr "Вы действительно хотите удалить %s?"
-
-#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
-msgid "Confirm Remove"
-msgstr "Подтвердить удаление"
-
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
-msgid "Remove"
-msgstr "Удалить"
-
-#. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
-msgid "Buddy List"
-msgstr "Список собеседников"
-
-#: ../console/gntblist.c:1123
-msgid "Place tagged"
-msgstr "Место помечено"
-
-#: ../console/gntblist.c:1128
-msgid "Toggle Tag"
-msgstr "Обратить пометку"
-
-#. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:820
-#: ../libgaim/protocols/jabber/buddy.c:1568
-#: ../libgaim/protocols/jabber/buddy.c:1750
-#: ../libgaim/protocols/jabber/jabber.c:805
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
-msgid "Nickname"
-msgstr "Псевдоним"
-
-#. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:646
-#: ../libgaim/protocols/jabber/buddy.c:686 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
-msgid "Idle"
-msgstr "Бездействие"
-
-#: ../console/gntblist.c:1270
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"В сети: %d\n"
-"Всего: %d"
-
-#: ../console/gntblist.c:1279
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Учётная запись: %s (%s)"
-
-#: ../console/gntblist.c:1291
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Последнее появление: %s назад"
-
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
-msgid "New..."
-msgstr "Новый..."
-
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
-msgid "Saved..."
-msgstr "Сохранённый..."
-
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
-msgid "Plugins"
-msgstr "Модули"
-
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
-msgid "_Name"
-msgstr "_Имя"
-
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
-msgid "_Account"
-msgstr "_Учётная запись"
-
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
-msgid "New Instant Message"
-msgstr "Новое мгновенное сообщение"
-
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
-"бы отправить сообщение."
-
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1369
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6056
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
-msgid "OK"
-msgstr "OK"
-
-#. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
-msgid "Options"
-msgstr "Параметры"
-
-#: ../console/gntblist.c:2045
-msgid "Send IM..."
-msgstr "Отправить сообщение..."
-
-#: ../console/gntblist.c:2049
-msgid "Toggle offline buddies"
-msgstr "Обратить показывание собеседников не в сети"
-
-#: ../console/gntblist.c:2053
-msgid "Sort by status"
-msgstr "Сортировать по статусу"
-
-#: ../console/gntblist.c:2057
-msgid "Sort alphabetically"
-msgstr "Сортировать по алфавиту"
-
-#: ../console/gntblist.c:2061
-msgid "Sort by log size"
-msgstr "Сортировать по размеру журнала"
-
-#: ../console/gntconn.c:36
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../console/gntconn.c:39
-#, c-format
-msgid "%s disconnected."
-msgstr "Соединение с %s разорвано."
-
-#: ../console/gntconn.c:40
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"Соединение с %s было разорвано из-за следующей ошибки:\n"
-"%s"
-
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
-msgid "Connection Error"
-msgstr "Ошибка соединения"
-
-#: ../console/gntconv.c:102
-msgid "No such command."
-msgstr "Нет такой команды."
-
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Синтаксическая ошибка:  Вы ввели неверное количество аргументов для этой "
-"команды."
-
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
-msgid "Your command failed for an unknown reason."
-msgstr "Ваша команда не была выполнена по неизвестной причине."
-
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
-msgid "That command only works in chats, not IMs."
-msgstr "Эта команда работает только в чатах, не в беседах."
-
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
-msgid "That command only works in IMs, not chats."
-msgstr "Эта команда работает только в беседах, не в чатах."
-
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
-msgid "That command doesn't work on this protocol."
-msgstr "Эта команда не работает с этим протоколом."
-
-#: ../console/gntconv.c:130
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr ""
-
-#: ../console/gntconv.c:232
-#, c-format
-msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
-
-#: ../console/gntconv.c:255
-#, c-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
-#, c-format
-msgid ""
-"\n"
-"%s is typing..."
-msgstr ""
-"\n"
-"%s набирает сообщение..."
-
-#: ../console/gntconv.c:399
-msgid "<AUTO-REPLY> "
-msgstr "<AUTO-REPLY> "
-
-#. Print the list of users in the room
-#: ../console/gntconv.c:501
-msgid "List of users:\n"
-msgstr "Список пользователей:\n"
-
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
-msgid "Supported debug options are:  version"
-msgstr "Поддерживаемые параметры отладки:  version"
-
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
-msgid "No such command (in this context)."
-msgstr "Нет такой команды (в этом контексте)."
-
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
-"Следующие команды доступны в этом контексте:\n"
-
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
-
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
-"беседу."
-
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Очистить окно беседы."
-
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
-
-#: ../console/gntconv.c:719
-msgid "plugins: Show the plugins window."
-msgstr "plugins: Вывести окно модулей."
-
-#: ../console/gntconv.c:722
-msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Вывести список собеседников."
-
-#: ../console/gntconv.c:725
-msgid "accounts: Show the accounts window."
-msgstr "accounts: Вывести окно учётных записей."
-
-#: ../console/gntconv.c:728
-msgid "debugwin: Show the debug window."
-msgstr "debugwin: Вывести окно отладки."
-
-#: ../console/gntconv.c:731
-msgid "prefs: Show the preference window."
-msgstr "prefs: Вывести окно настроек."
-
-#: ../console/gntconv.c:734
-msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Вывести окно сохранённых статусов."
-
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
-msgid "Debug Window"
-msgstr "Окно отладки"
-
-#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
-#. * it's necessary to make the width of the debug window resizable ... like I said,
-#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
-#.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
-msgid "Clear"
-msgstr "Очистить"
-
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "Пауза"
-
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Время"
-
-#: ../console/gntgaim.c:227
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Наберите `%s -h' для получения дополнительной информации.\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -720,75 +45,901 @@
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#, 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 ""
+
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/silc/ops.c:1451
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../finch/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Учётная запись не была добавлена"
+
+#: ../finch/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr ""
+
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+msgid "New mail notifications"
+msgstr "Уведомления о новой почте"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+msgid "Remember password"
+msgstr "Запомнить пароль"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1441
+#: ../pidgin/gtkblist.c:3947
+msgid "Modify Account"
+msgstr "Изменить учётную запись"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "Новая учётная запись"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Протокол:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Идентификатор пользователя:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5377
+#: ../pidgin/gtkblist.c:5740
+msgid "Alias:"
+msgstr "Псевдоним:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1879
+#: ../pidgin/gtkaccount.c:2470 ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+msgid "Cancel"
+msgstr "Отменить"
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1871
+#: ../pidgin/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Вы действительно хотите удалить %s?"
+
+#: ../finch/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Удалить учётную запись"
+
+#. Delete button
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1878 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2296 ../pidgin/gtkdocklet.c:541
+msgid "Accounts"
+msgstr "Учётные записи"
+
+#: ../finch/gntaccount.c:652
+msgid "You can enable/disable accounts from the following list."
+msgstr "Вы можете включать/выключать учётные записи из следующего списка."
+
+#. Add button
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2469
+#: ../pidgin/gtkblist.c:5795 ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Добавить"
+
+#. Modify button
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+msgid "Modify"
+msgstr "Изменить"
+
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2416
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
+
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2468
+msgid "Add buddy to your list?"
+msgstr "Добавить собеседника в список?"
+
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2520
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
+
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2543 ../pidgin/gtkaccount.c:2549
+msgid "Authorize buddy?"
+msgstr "Авторизовать собеседника?"
+
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+msgid "Authorize"
+msgstr "Авторизовать"
+
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+msgid "Deny"
+msgstr "Отказать"
+
+#: ../finch/gntblist.c:278
+msgid "You must provide a screename for the buddy."
+msgstr ""
+
+#: ../finch/gntblist.c:280
+msgid "You must provide a group."
+msgstr ""
+
+#: ../finch/gntblist.c:282
+msgid "You must select an account."
+msgstr "Вы должны выбрать учётную запись."
+
+#: ../finch/gntblist.c:286
+msgid "Error adding buddy"
+msgstr "Ошибка добавления собеседника"
+
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1954 ../pidgin/gtksavedstatuses.c:924
+msgid "Screen Name"
+msgstr "Идентификатор пользователя"
+
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1360
+#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Псевдоним"
+
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+msgid "Group"
+msgstr "Группа"
+
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2948 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+msgid "Account"
+msgstr "Учётная запись"
+
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5310
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "Добавить собеседника"
+
+#: ../finch/gntblist.c:327
+msgid "Please enter buddy information."
+msgstr "Введите информацию о собеседнике."
+
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+msgid "Chats"
+msgstr "Чаты"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1533 ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Имя"
+
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5686
+msgid "Add Chat"
+msgstr "Добавить чат"
+
+#: ../finch/gntblist.c:398
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+msgid "Error adding group"
+msgstr "Ошибка добавления группы"
+
+#: ../finch/gntblist.c:412
+msgid "You must give a name for the group to add."
+msgstr "Вы должны дать имя добавляемой группе."
+
+#: ../finch/gntblist.c:425
+msgid "A group with the name already exists."
+msgstr "Группа с таким именем уже существует."
+
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5792
+msgid "Add Group"
+msgstr "Добавить группу"
+
+#: ../finch/gntblist.c:432
+msgid "Enter the name of the group"
+msgstr "Введите имя группы"
+
+#: ../finch/gntblist.c:761
+msgid "Edit Chat"
+msgstr "Изменить чат"
+
+#: ../finch/gntblist.c:761
+msgid "Please Update the necessary fields."
+msgstr "Обновите нужные поля."
+
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+msgid "Edit"
+msgstr "Изменить"
+
+#: ../finch/gntblist.c:778
+msgid "Auto-join"
+msgstr "Присоединяться автоматически"
+
+#: ../finch/gntblist.c:787
+msgid "Edit Settings"
+msgstr "Изменить настройки"
+
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+msgid "Get Info"
+msgstr "Получить информацию"
+
+#: ../finch/gntblist.c:855
+msgid "Add Buddy Pounce"
+msgstr "Добавить правило"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+msgid "Send File"
+msgstr "Отправить файл"
+
+#: ../finch/gntblist.c:866
+msgid "View Log"
+msgstr "Просмотреть журнал"
+
+#: ../finch/gntblist.c:947
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Введите новое имя для %s"
+
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
+msgid "Rename"
+msgstr "Переименовать"
+
+#: ../finch/gntblist.c:950
+msgid "Enter empty string to reset the name."
+msgstr "Введите пустую строку для сброса имени."
+
+#: ../finch/gntblist.c:1026
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+"Удаление этого контакта приведёт к удалению всех входящих в него собеседников"
+
+#: ../finch/gntblist.c:1034
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+"Удаление этой группы приведёт к удалению всех входящих в неё собеседников"
+
+#: ../finch/gntblist.c:1039
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Вы действительно хотите удалить %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1042
+msgid "Confirm Remove"
+msgstr "Подтвердить удаление"
+
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+msgid "Remove"
+msgstr "Удалить"
+
+#. Buddy List
+#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4189
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Список собеседников"
+
+#: ../finch/gntblist.c:1203
+msgid "Place tagged"
+msgstr "Место помечено"
+
+#: ../finch/gntblist.c:1208
+msgid "Toggle Tag"
+msgstr "Обратить пометку"
+
+#. General
+#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1368 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2972
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:533 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2992
+#: ../pidgin/gtkblist.c:3381 ../pidgin/gtkprefs.c:1809
+msgid "Idle"
+msgstr "Бездействие"
+
+#: ../finch/gntblist.c:1350
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"В сети: %d\n"
+"Всего: %d"
+
+#: ../finch/gntblist.c:1359
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Учётная запись: %s (%s)"
+
+#: ../finch/gntblist.c:1371
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Последнее появление: %s назад"
+
+#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../pidgin/gtkstatusbox.c:1064
+msgid "New..."
+msgstr "Новый..."
+
+#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../pidgin/gtkstatusbox.c:1065
+msgid "Saved..."
+msgstr "Сохранённый..."
+
+#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+msgid "Plugins"
+msgstr "Модули"
+
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+msgid "_Name"
+msgstr "_Имя"
+
+#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+msgid "_Account"
+msgstr "_Учётная запись"
+
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
+msgid "New Instant Message"
+msgstr "Новое мгновенное сообщение"
+
+#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
+"бы отправить сообщение."
+
+#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3946
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "OK"
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+msgid "Options"
+msgstr "Параметры"
+
+#: ../finch/gntblist.c:2167
+msgid "Send IM..."
+msgstr "Отправить мгновенное сообщение..."
+
+#: ../finch/gntblist.c:2171
+msgid "Toggle offline buddies"
+msgstr "Обратить показывание собеседников не в сети"
+
+#: ../finch/gntblist.c:2177
+msgid "Sort by status"
+msgstr "Сортировать по статусу"
+
+#: ../finch/gntblist.c:2181
+msgid "Sort alphabetically"
+msgstr "Сортировать по алфавиту"
+
+#: ../finch/gntblist.c:2185
+msgid "Sort by log size"
+msgstr "Сортировать по размеру журнала"
+
+#: ../finch/gntconn.c:38
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../finch/gntconn.c:41
+#, c-format
+msgid "%s disconnected."
+msgstr "Соединение с %s разорвано."
+
+#: ../finch/gntconn.c:42
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"Соединение с %s было разорвано из-за следующей ошибки:\n"
+"%s"
+
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3943
+msgid "Connection Error"
+msgstr "Ошибка соединения"
+
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3948
+msgid "Connect"
+msgstr "Установить соединение"
+
+#: ../finch/gntconv.c:103
+msgid "No such command."
+msgstr "Нет такой команды."
+
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+"Синтаксическая ошибка:  Вы ввели неверное количество аргументов для этой "
+"команды."
+
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgid "Your command failed for an unknown reason."
+msgstr "Ваша команда не была выполнена по неизвестной причине."
+
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+msgid "That command only works in chats, not IMs."
+msgstr "Эта команда работает только в чатах, не в мгновенных сообщениях."
+
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+msgid "That command only works in IMs, not chats."
+msgstr "Эта команда работает только в мгновенных сообщениях, не в чатах."
+
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+msgid "That command doesn't work on this protocol."
+msgstr "Эта команда не работает с этим протоколом."
+
+#: ../finch/gntconv.c:131
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Команды пока не поддерживаются. Сообщение НЕ было отправлено."
+
+#: ../finch/gntconv.c:217
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:240
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s набирает сообщение..."
+
+#: ../finch/gntconv.c:390
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:492
+msgid "List of users:\n"
+msgstr "Список пользователей:\n"
+
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+msgid "Supported debug options are:  version"
+msgstr "Поддерживаемые параметры отладки:  version"
+
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+msgid "No such command (in this context)."
+msgstr "Нет такой команды (в этом контексте)."
+
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
+"Следующие команды доступны в этом контексте:\n"
+
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
+
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
+"беседу."
+
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Очистить окно беседы."
+
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
+
+#: ../finch/gntconv.c:710
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Вывести окно модулей."
+
+#: ../finch/gntconv.c:713
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Вывести список собеседников."
+
+#: ../finch/gntconv.c:716
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Вывести окно учётных записей."
+
+#: ../finch/gntconv.c:719
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Вывести окно отладки."
+
+#: ../finch/gntconv.c:722
+msgid "prefs: Show the preference window."
+msgstr "prefs: Вывести окно настроек."
+
+#: ../finch/gntconv.c:725
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Вывести окно сохранённых статусов."
+
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+msgid "Debug Window"
+msgstr "Окно отладки"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+msgid "Clear"
+msgstr "Очистить"
+
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+msgid "Pause"
+msgstr "Пауза"
+
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
+msgid "Timestamps"
+msgstr "Время"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Передача файлов - %d%% из %d файлов"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Передача файлов"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Прогресс"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Имя файла"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Размер"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Скорость"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Осталось"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1210
+#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3036
+#: ../pidgin/gtkblist.c:3049 ../pidgin/gtkblist.c:3051
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+msgid "Status"
+msgstr "Статус"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Закрывать это окно по завершении всех передач"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Очищать завершённые передачи"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Остановить"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2443 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Закрыть"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Ожидание начала передачи"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "Отменено"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Не удалось"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/s"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Завершено"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "Передача"
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "Адреса e-mail"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
 msgstr "Вам пришла почта!"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1160
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From"
 msgstr "От"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Тема"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) имеет %d новое сообщение."
-msgstr[1] "%s (%s) имеет %d новых сообщений."
-
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+msgstr[1] "%s (%s) имеет %d новых сообщения."
+msgstr[2] "%s (%s) имеет %d новых сообщений."
+
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Новая почта"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Информация о собеседнике"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "Информация"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "Мгновенное сообщение"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Присоединиться"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -805,291 +956,458 @@
 "Веб-сайт: %s\n"
 "Имя файла: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 
-#: ../console/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../console/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr ""
-
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr ""
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
-msgstr ""
-
-#: ../console/gntplugin.c:264
+msgstr "Вы можете загружать/выгружать модули из следующего списка."
+
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "Настроить модуль"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+msgid "Please enter a buddy to pounce."
+msgstr "Введите собеседника для слежения."
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "New Buddy Pounce"
+msgstr "Новое правило"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "Edit Buddy Pounce"
+msgstr "Изменить правило"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "За кем следить"
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5404
+#: ../pidgin/gtkblist.c:5720
+msgid "Account:"
+msgstr "Учётная запись:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Имя собеседника:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+msgid "Pounce When Buddy..."
+msgstr "Выполнять, когда собеседник..."
+
+#: ../finch/gntpounce.c:373
+msgid "Signs on"
+msgstr "Входит"
+
+#: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Выходит"
+
+#: ../finch/gntpounce.c:375
+msgid "Goes away"
+msgstr "Отходит"
+
+#: ../finch/gntpounce.c:376
+msgid "Returns from away"
+msgstr "Возвращается"
+
+#: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Начинает бездействовать"
+
+#: ../finch/gntpounce.c:378
+msgid "Is no longer idle"
+msgstr "Перестаёт бездействовать"
+
+#: ../finch/gntpounce.c:379
+msgid "Starts typing"
+msgstr "Начинает набор сообщения"
+
+#: ../finch/gntpounce.c:380
+msgid "Pauses while typing"
+msgstr "Приостанавливает набор сообщения"
+
+#: ../finch/gntpounce.c:381
+msgid "Stops typing"
+msgstr "Прекращает набор сообщения"
+
+#: ../finch/gntpounce.c:382
+msgid "Sends a message"
+msgstr "Отправляет сообщение"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+msgid "Action"
+msgstr "Действие"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Открыть окно мгновенных сообщений"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Вывести уведомление"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Отправить сообщение"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Выполнить команду"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Воспроизвести звук"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Выполнять только при статусе, отличном от \"Доступен\""
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+msgid "Recurring"
+msgstr "Повторение"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Вы действительно хотите удалить правило %s для %s?"
+
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+msgid "Buddy Pounces"
+msgstr "Правила"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s начал набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s приостановил набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s в сети (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s перестал бездействовать (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s вернулся (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s прекратил набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s не в сети (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s начал бездействовать (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s отошёл (%s)"
+
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s отправил вам сообщение (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+msgid "Unknown pounce event. Please report this!"
+msgstr "Неизвестное событие слежения. Сообщите об этом!"
+
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+msgid "From last sent message"
+msgstr "С момента последней отправки сообщения"
+
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Никогда"
+
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "Показывать время бездействия"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "Показывать собеседников не в сети"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "Показывать время сообщений"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "Уведомлять собеседников о наборе сообщения"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "Формат журнала"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "Записывать мгновенные сообщения"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "Записывать чаты"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "Записывать изменения статуса"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Журналы"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Настройки"
-
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "Ещё не реализовано."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
+msgid "Save File..."
+msgstr "Сохранить файл..."
+
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
+msgid "Open File..."
+msgstr "Открыть файл..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Вы действительно хотите удалить \"%s\""
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Удалить статус"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Сохранённые статусы"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Название"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Тип"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1232
-#: ../libgaim/protocols/jabber/jabber.c:1242
-#: ../libgaim/protocols/jabber/jabber.c:1252
-#: ../libgaim/protocols/jabber/jabber.c:1262
-#: ../libgaim/protocols/jabber/jabber.c:1272
-#: ../libgaim/protocols/jabber/jabber.c:1284
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5515
-#: ../libgaim/protocols/oscar/oscar.c:5743
-#: ../libgaim/protocols/oscar/oscar.c:5755
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/oscar/oscar.c:5775
-#: ../libgaim/protocols/oscar/oscar.c:5782
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5469
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5701
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Сообщение"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Применить"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Неверное название"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr ""
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Повторяющееся название"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Введите другое название для статуса."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Подстатус"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "Учётная запись:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Сообщение:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Изменить статус"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:676
-#: ../libgaim/protocols/jabber/jabber.c:1200
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/oscar/oscar.c:3769
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Статус"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Использовать отличающийся статус для следующих учётных записей"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Сохранить и применить"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "Статусы"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Модуль буфера обмена"
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s в сети"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s не в сети"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s отправил вам сообщение"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s произнёс ваше имя в %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s отправил сообщение в %s"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "Собеседник входит/выходит"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "Вы принимаете мгновенное сообщение"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "Кто-то говорит в чате"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "Кто-то произносит ваше имя в чате"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 msgid "GntGf"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr ""
-
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+msgid "Toaster plugin"
+msgstr ""
+
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Беседа с %s на %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1097,4618 +1415,267 @@
 "the same conversation type(s)."
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt-история"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Показывает записи недавних бесед в новых беседах."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr ""
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr ""
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Ориентация"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "Ориентация лотка."
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "_Псевдоним"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "П_рисоединиться"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "_Закрыть вкладки"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "Сооб_щение"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "Получить _информацию"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "П_ригласить"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_Изменить"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "Открыть _почту"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Пауза"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Параметры входа"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Локальный псевдоним:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "Параметры пользователя"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "Использовать этот значок собеседника для этой учётной записи:"
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "Параметры %s"
-
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "Использовать настройки прокси GNOME"
-
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "Использовать глобальные настройки прокси"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "Нет прокси"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "Использовать настройки окружения"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "Если приглядитесь"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "вы можете увидеть спаривающихся бабочек"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "Параметры прокси"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "_Тип прокси:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Узел:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "П_орт:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Имя пользователя:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "Па_роль:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Добавить учётную запись"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Основные"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "_Дополнительные"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:863
-msgid "Register"
-msgstr "Зарегистрировать"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "Включено"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "Протокол"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr "Авторизовать собеседника?"
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr "Авторизовать"
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr "Отказать"
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "Присоединиться к чату"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Введите соответствующую информацию о чате, к которому вы хотели бы "
-"присоединиться.\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "У_чётная запись:"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Блокировать"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "Раз_блокировать"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "_Информация"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "Отправить _файл"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "Добавить п_равило"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Просмотреть _журнал"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Псевдоним..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "_Псевдоним..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "_Удалить"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "Добавить _собеседника"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "Добавить _чат"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Удалить группу"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "Пере_именовать"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Присоединяться автоматически"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "_Свернуть"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "Р_азвернуть"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/Инструменты/Отключить звуки"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/_Собеседники"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Собеседники/Новое мгновенное сооб_щение..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Собеседники/Присоединиться к _чату..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/Собеседники/Получить пользовательскую _информацию..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/Собеседники/Просмотреть _журнал пользователя..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников _не в сети"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Собеседники/Показывать п_устые группы"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Собеседники/Показывать _подробности о собеседнике"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Собеседники/Показывать _время бездействия"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Собеседники/_Сортировать собеседников"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Собеседники/_Добавить собеседника..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/Собеседники/Добавить ч_ат..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/Собеседники/Добавить _группу..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/Собеседники/В_ыйти"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Учётные записи"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6280
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Учётные записи/Добавить\\/Изменить"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Инструменты"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Инструменты/_Слежение за собеседниками"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Инструменты/_Модули"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Инструменты/_Настройки"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Инструменты/К_онфиденциальность"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Инструменты/Передача _файлов"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Инструменты/Список _комнат"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/Инструменты/Системный _журнал"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/Инструменты/Отключить _звуки"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/_Помощь"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Помощь/Помощь в _сети"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/Помощь/Окно _отладки"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Помощь/О _программе"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Учётная запись:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr "Псевдоним собеседника"
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "В сети"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "Последнее появление"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5565 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Не в сети"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:943
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Описание"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Бездействует %dч %02dм"
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "Бездействует %dм"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/Собеседники/Новое мгновенное сообщение..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/Собеседники/Присоединиться к чату..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/Собеседники/Получить пользовательскую информацию..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/Собеседники/Добавить собеседника..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/Собеседники/Добавить чат..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/Собеседники/Добавить группу..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/Инструменты/Слежение за собеседниками"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/Инструменты/Конфиденциальность"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/Инструменты/Список комнат"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d непрочитанное сообщение от %s\n"
-msgstr[1] "%d непрочитанных сообщений от %s\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "Вручную"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "По алфавиту"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "По статусу"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "По размеру журнала"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "Соединение с %s разорвано"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "Установить соединение"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "Повторно включить учётную запись"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>Имя пользователя:</b>"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>Пароль:</b>"
-
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr ""
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Учётные записи"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников не в сети"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Собеседники/Показывать пустые группы"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Собеседники/Показывать подробности о собеседнике"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/Собеседники/Показывать время бездействия"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Собеседники"
-
-#: ../gtk/gtkblist.c:5207
-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 ""
-"Введите идентификатор пользователя персоны, которую вы хотели бы добавить в "
-"список собеседников. Вы можете ввести необязательный псевдоним для этого "
-"собеседника. Псевдоним будет показываться вместо идентификатора "
-"пользователя, когда это возможно.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Группа:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "Этот протокол не поддерживает чаты."
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
-"добавить в список собеседников.\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "Введите имя добавляемой группы."
-
-#: ../gtk/gtkblist.c:6301
-msgid "<GaimMain>/Accounts/"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6326
-msgid "_Edit Account"
-msgstr "_Изменить учётную запись"
-
-#: ../gtk/gtkblist.c:6342 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "Нет доступных действий"
-
-#: ../gtk/gtkblist.c:6350
-msgid "_Disable"
-msgstr "_Выключить"
-
-#: ../gtk/gtkblist.c:6362
-msgid "Enable Account"
-msgstr "Включить учётную запись"
-
-#: ../gtk/gtkblist.c:6368
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6417
-msgid "/Tools"
-msgstr "/Инструменты"
-
-#: ../gtk/gtkblist.c:6487
-msgid "/Buddies/Sort Buddies"
-msgstr "/Собеседники/Сортировать собеседников"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: ../gtk/gtkconv.c:786
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr "Пригласить собеседника в чат"
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Введите имя пользователя, которого вы хотите пригласить, вместе с "
-"необязательным текстом приглашения."
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "_Собеседник:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "Сооб_щение:"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Не удаётся открыть файл."
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Беседа с %s</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "Сохранить беседу"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "Найти"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "_Искать:"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
-
-#: ../gtk/gtkconv.c:1349
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
-"записаны."
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "Не игнорировать"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "Игнорировать"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "Получить сообщение об отсутствии"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "Последнее сказанное"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "Не удаётся сохранить файл значка на диск."
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "Сохранить значок"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr "Анимировать"
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "Скрыть значок"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "Сохранить значок как..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "Установить собственный значок..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "Удалить собственный значок"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/_Беседа"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Беседа/Новое мгновенное сооб_щение..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Беседа/_Найти..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/Беседа/Просмотреть _журнал"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Беседа/Со_хранить как..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Беседа/О_чистить"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Беседа/Отправить _файл..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Беседа/Добавить п_равило..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Беседа/Получить _информацию"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Беседа/Приг_ласить..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Беседа/_Ещё"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Беседа/_Псевдоним..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/Беседа/_Блокировать..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Беседа/_Добавить..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Беседа/_Удалить..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Беседа/Вставить _ссылку..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Беседа/Вставить из_ображение..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Беседа/_Закрыть"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/_Параметры"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/Параметры/Вести _журнал"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Параметры/Воспроизводить _звуки"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Параметры/Показывать з_начок собеседника"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Параметры/Показывать _панели форматирования"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Параметры/Показывать _время сообщений"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Беседа/Ещё"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Беседа"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Беседа/Просмотреть журнал"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Беседа/Отправить файл..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Беседа/Добавить правило..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Беседа/Получить информацию"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Беседа/Пригласить..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Беседа/Псевдоним..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Беседа/Блокировать..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Беседа/Добавить..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Беседа/Удалить..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Беседа/Вставить ссылку..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Беседа/Вставить изображение..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/Параметры/Вести журнал"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Параметры/Воспроизводить звуки"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Параметры/Показывать панели форматирования"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Параметры/Показывать время сообщений"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/Параметры/Показывать значок собеседника"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "Пользователь набирает сообщение..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "Пользователь что-то набрал и остановился"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Адресат"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "Тема:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "0 пользователей в комнате"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d пользователь в комнате"
-msgstr[1] "%d пользователей в комнате"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Набирает сообщение"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Прекратил набор сообщения"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Произнесено имя"
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Непрочитанные сообщения"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr "Новое событие"
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "Подтвердить закрытие"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "Закрыть другие вкладки"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "Закрыть все вкладки"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "Отделить эту вкладку"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "Закрыть эту вкладку"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "Закрыть беседу"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr "Последнее созданное окно"
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "Отдельные окна мгновенных сообщений и чатов"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "Новое окно"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "По группе"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "По учётной записи"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Сохранить отладочную информацию в журнал"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "Инвертировать"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "Подсветить совпадения"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "Только _значки"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Только _текст"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "Значки _и текст"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "Фильтр"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Уровень "
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr ""
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Все"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "Разное"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Ошибка "
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Неисправимая ошибка"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "ведущий разработчик"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "разработчик"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "разработчик и веб-мастер"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "поддержка"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "поддержка и контроль качества"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "порт win32"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "сопровождающий"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "сопровождающий libfaim"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-разработчик"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "оригинальный автор"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Арабский"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Болгарский"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Бенгальский"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Боснийский"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Каталанский"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Валенсийский-каталанский"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Чешский"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Датский"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Немецкий"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr "Дзонг-кэ"
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Греческий"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Австралийский английский"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Канадский английский"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Британский английский"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Эсперанто"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Испанский"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Баскский"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Персидский"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Финский"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Французский"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Галисийский"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Гуджарати"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Иврит"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Хинди"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Венгерский"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Итальянский"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Японский"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Грузинский"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Корейский"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "Курдский"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Литовский"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Македонский"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Непальский"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Нидерландский, фламандский"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Норвежский"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Польский"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Португальский"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Португальский-бразильский"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Румынский"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Русский"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Сербский"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Словацкий"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Словенский"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Албанский"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Шведский"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Тамильский"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "Телугу"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Тайский"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Турецкий"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Вьетнамский"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh и команда Gnome-Vi"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Упрощённый китайский"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Традиционный китайский"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "Амхарский"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "О Gaim"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim - модульный клиент обмена сообщениями, позволяющий использовать AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно.  Написан с "
-"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
-"условиям GPL (версии 2 или более поздней).  Копия GPL содержится в файле "
-"'COPYING', распространяемом с Gaim.  Авторские права на Gaim принадлежат "
-"участникам проекта.  Полный список участников проекта смотрите в файле "
-"'COPYRIGHT'.  Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim на irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim на irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "Текущие разработчики"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr "Одержимые писатели заплаток"
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "Разработчики, отошедшие от дел"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "Текущие переводчики"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "Предыдущие переводчики"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "Отладочная информация"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "Получить пользовательскую информацию"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Введите идентификатор пользователя или псевдоним персоны, информацию о "
-"которой вы хотели бы просмотреть."
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "Просмотреть журнал пользователя"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
-"хотели бы просмотреть."
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr "Псевдоним контакта"
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "Введите псевдоним для этого контакта."
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Введите псевдоним для %s."
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr "Псевдоним собеседника"
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr "Псевдоним чата"
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "Введите псевдоним для этого чата."
-
-#: ../gtk/gtkdialogs.c:1008
-#, 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 и %d другого собеседника из списка "
-"собеседников. Хотите продолжить?"
-msgstr[1] ""
-"Вы удалите контакт, содержащий %s и %d других собеседников из списка "
-"собеседников. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Удалить контакт"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Удалить контакт"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Объединить группы"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Объединить группы"
-
-#: ../gtk/gtkdialogs.c:1105
-#, 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 и всех её членов из списка собеседников. Хотите "
-"продолжить?"
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "Удалить группу"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "_Удалить группу"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "Удалить собеседника"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "_Удалить собеседника"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "Удалить чат"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "_Удалить чат"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr ""
-"Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "Изменить статус"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1409
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Доступен"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1413
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4512
-#: ../libgaim/protocols/oscar/oscar.c:5593 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Отошёл"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Невидимый"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "Показывать список собеседников"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Новое сообщение..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "Отключить звуки"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "Мерцать при наличии нового сообщения"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "Выйти"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Не начато"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/jabber/buddy.c:1420
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "Завершено"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "Отменено"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "Ожидание начала передачи"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Передача файлов - %d%% из %d файлов"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Передача файлов"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Приём как:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Приём от:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Отправка для:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Отправка как:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr "Нет приложения, сопоставленного этому типу файла."
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "Произошла ошибка при открытии файла."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Ошибка запуска %s: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "Ошибка выполнения %s"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr "Процесс возвратил код ошибки %d"
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "Прогресс"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Имя файла"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Размер"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "Осталось"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Локальный файл:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Скорость:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Прошло времени:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Осталось времени:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "_Закрывать это окно по завершении всех передач"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "О_чищать завершённые передачи"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "_Подробности о передаче файлов"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Возобновить"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Не удалось"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Вставить как простой _текст"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "Восстановить _форматирование"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "Цвет гиперссылки"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "Цвет для отображения гиперссылок."
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr "Цвет подсветки гиперссылки"
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "_Скопировать адрес e-mail"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_Открыть ссылку в браузере"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Скопировать ссылку"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Нераспознанный тип файла</span>\n"
-"\n"
-"Принимается за PNG."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Нераспознанный тип файла\n"
-"\n"
-"Принимается за PNG."
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Ошибка сохранения изображения</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Ошибка сохранения изображения\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Сохранить изображение"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "_Сохранить изображение..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Выбрать шрифт"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Выбрать цвет текста"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Выбрать цвет фона"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Описание"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Введите URL и описание ссылки, которую вы хотите вставить. Описание "
-"необязательно."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Введите URL ссылки, которую вы хотите вставить."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Вставить ссылку"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Вставить"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Не удалось сохранить изображение: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Вставить изображение"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Эта тема не имеет доступных смайликов."
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Смайл!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Жирный"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Наклонный"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Подчёркнутый"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Больший размер шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Меньший размер шрифта "
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Облик шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Цвет шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Цвет фона"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Восстановить форматирование"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Вставить ссылку"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Вставить изображение"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Вставить смайлик"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Беседа в %s на %s</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Беседа с %s на %s</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:338
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Журналы не найдены"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr ""
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Общий размер журналов:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Беседы в %s"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Беседы с %s"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Системный журнал"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Наберите `%s -h' для получения дополнительной информации.\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Использование: %s [КЛЮЧ]...\n"
-"\n"
-"  -c, --config=КАТ    использовать каталог КАТ для файлов конфигурации\n"
-"  -d, --debug         выводить отладочную информацию на стандартный вывод\n"
-"  -h, --help          показать эту справку и выйти\n"
-"  -n, --nologin       не входить автоматически\n"
-"  -l, --login[=ИМЯ]   войти автоматически (необязательный аргумент ИМЯ\n"
-"                      задаёт одну или несколько учётных записей,\n"
-"                      разделённых запятыми)\n"
-"  -v, --version       показать текущую версию и выйти\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Открыть все сообщения"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Отправитель"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s имеет %d новое сообщение."
-msgstr[1] "%s имеет %d новых сообщений."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "Результаты поиска"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Команда запуска браузера \"%s\" неверна."
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "Не удаётся открыть URL"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Ошибка запуска \"%s\": %s"
-
-#: ../gtk/gtknotify.c:1055
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Был выбран браузер \"Другой\", но команда не была задана."
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "Следующие модули будут выгружены."
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "Несколько модулей будет выгружено."
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "Выгрузить модули"
-
-#: ../gtk/gtkplugin.c:397
-#, 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\">Автор:</span>\t\t%s\n"
-"<span weight=\"bold\">Веб-сайт:</span>\t%s\n"
-"<span weight=\"bold\">Имя файла:</span>\t%s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "_Настроить модуль"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Подробности о модуле</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "Выбрать файл"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "Введите собеседника для слежения."
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "Новое правило"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "Изменить правило"
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "За кем следить"
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "_Имя собеседника:"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Выполнять, когда собеседник..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "_Входит"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "В_ыходит"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "Отхо_дит"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "Во_звращается"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "Начинает безде_йствовать"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "Перестаёт бездействоват_ь"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "Начинает н_абор сообщения"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "Приостанавливает на_бор сообщения"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Прекращает набо_р сообщения"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "Отправляет сооб_щение"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Действие"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Открыть ок_но беседы"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "Вывести уведом_ление"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Отправить _сообщение"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "Выполнить ко_манду"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Воспроизвести зв_ук"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "_Открыть..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "От_крыть..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "Т_ест"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Повторение"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Вы действительно хотите удалить правило %s для %s?"
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "Объект слежения"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Повторение"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Правила"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s начал набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s приостановил набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s в сети (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s перестал бездействовать (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s вернулся (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s прекратил набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s не в сети (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s начал бездействовать (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s отошёл (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s отправил вам сообщение (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "Неизвестное событие слежения. Сообщите об этом!"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "Не удалось распаковать тему смайликов."
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
-"быть установлены перетаскиванием их в список тем."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Значок"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Значок системного лотка"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Показывать значок системного лотка:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "Всегда"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "Никогда"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "При наличии непрочитанных сообщений"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "Скрытие окон бесед"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "_Скрывать новые беседы:"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "Во время отсутствия"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Вкладки"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Показывать мгновенные сообщения и чаты в окнах с _вкладками"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Показывать _кнопку закрытия на вкладках"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Расположение:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "Вверху"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Внизу"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "Слева"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "Справа"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Слева вертикально"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Справа вертикально"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "_Новые беседы:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Показывать _форматирование во входящих сообщениях"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Показывать _значки собеседников"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Разрешить _анимацию значков собеседников"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "Подсвечивать слова с _ошибками"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Использовать плавную прокрутку"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "_Мерцать окном при принятии мгновенных сообщений"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Форматирование по умолчанию"
-
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Так будет выглядеть текст ваших сообщений с использованием протоколов, "
-"поддерживающих форматирование. :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3703
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP-адрес"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN-сервер:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "Определять IP-адрес _автоматически"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "Публичный _IP:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Порты"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "Указать диапазон прослушиваемых портов _вручную"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Начальный порт:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Конечный порт:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Прокси-сервер"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Нет прокси"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Пользователь:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "Браузер GNOME по умолчанию"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "Другой"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "Выбор браузера"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "_Браузер:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "_Открывать ссылку в:"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "По умолчанию"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "Существующее окно"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "Новая вкладка"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Вручную:\n"
-"(%s для URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "_Формат журнала:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "Записывать все _мгновенные сообщения"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "Записывать все _чаты"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "Записывать все изменения _статуса в системный журнал"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Выбор звука"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "Очень тихо"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "Тихо"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "Ниже среднего"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Нормально"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "Выше среднего"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "Громко"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "Очень громко"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Метод воспроизведения звука"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "_Метод:"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Сигнал динамиком"
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Автоматически"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "Команда"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "Нет звуков"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"_Команда воспроизведения звука:\n"
-"(%s для имени файла)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Параметры звука"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "Звуки, когда окно беседы в _фокусе"
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "Воспроизводить звуки:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Только во время присутствия"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Только во время отсутствия"
-
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "Громкость:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Звуковые события"
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "Воспроизводить"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr "Событие"
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "Тест"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr "Сброс"
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Выбрать..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "Сообщать _время бездействия:"
-
-#: ../gtk/gtkprefs.c:1812
-msgid "From last sent message"
-msgstr "С момента последней отправки сообщения"
-
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "Основываясь на использовании клавиатуры или мыши"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "_Автоматический ответ:"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "Во время отсутствия и бездействия"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "Авто-\"Отошёл\""
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "Менять статус при _бездействии"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "_Минут до изменения статуса:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Менять _статус на:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "Статус при запуске"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "Использовать при запуске статус, бывший до в_ыхода"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "_Применить при запуске статус:"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "Интерфейс"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr "Темы смайликов"
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Звуки"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "Сеть"
-
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "Браузер"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "Статус / Бездействие"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Разрешить доступ всем пользователям"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Разрешить доступ только пользователям из списка собеседников"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Разрешить доступ только пользователям, указанным ниже"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Блокировать всех пользователей"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Блокировать только пользователей, указанных ниже"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Конфиденциальность"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Изменения настроек конфиденциальности вступают в силу немедленно."
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Установить конфиденциальность для:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Допустить пользователя"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Укажите пользователя, которого вы допускаете к общению с вами."
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Введите имя пользователя, которого вы хотите допустить к общению с вами."
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Допустить"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Позволить %s общаться с вами?"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Вы действительно хотите позволить %s общаться с вами?"
-
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Блокировать пользователя"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Укажите блокируемого пользователя."
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Введите имя пользователя, которого вы хотите блокировать."
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Блокировать %s?"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Вы действительно хотите блокировать %s?"
-
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Да"
-
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Нет"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Применить"
-
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "Такой файл уже существует"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "Хотите перезаписать его?"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "Выбрать новое имя"
-
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "Сохранить файл..."
-
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "Открыть файл..."
-
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "Выбрать папку..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "_Добавить"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Список комнат"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "_Получить список"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "_Добавить чат"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Вы действительно хотите удалить выбранные сохранённые статусы?"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "_Применить"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Название уже используется. Вы должны выбрать уникальное название."
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "Отличающийся"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "_Название:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "_Статус:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "Использовать _отличающийся статус для некоторых учётных записей"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "Сохранить _и применить"
-
-#: ../gtk/gtksavedstatuses.c:1427
-#, c-format
-msgid "Status for %s"
-msgstr "Статус для %s"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Собеседник входит в сеть"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Собеседник выходит из сети"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Принято сообщение"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Принято сообщение, начинающее беседу"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Сообщение отправлено"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Пользователь входит в чат"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Пользователь выходит из чата"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Вы говорите в чате"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Другие говорят в чате"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Кто-то произносит ваше имя в чате"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "Ошибка GStreamer"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "Не удалось инициализировать GStreamer."
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1026
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "Соединение"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "Ожидание сетевого соединения"
-
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Произошла следующая ошибка при загрузке %s: %s"
-
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "Не удалось загрузить изображение"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Нельзя отправить папку %s."
-
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "Вы перетащили изображение"
-
-#: ../gtk/gtkutils.c:1441
-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 ""
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "Установить в качестве значка собеседника"
-
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Отправить файл изображения"
-
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Вставить в сообщение"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr ""
-"Хотите установить это изображение в качестве значка собеседника для этого "
-"пользователя?"
-
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. 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
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr "Нельзя отправить ярлык"
-
-#: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../gtk/gtkutils.c:2343
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Файл:</b> %s\n"
-"<b>Размер файла:</b> %s\n"
-"<b>Размер изображения:</b> %dx%d"
-
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr "Значок собеседника"
-
-#: ../gtk/gtkutils.c:2657
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-
-#: ../gtk/gtkutils.c:2659
-msgid "Icon Error"
-msgstr "Ошибка значка"
-
-#: ../gtk/gtkutils.c:2660
-msgid "Could not set icon"
-msgstr "Не удалось установить значок"
-
-#: ../gtk/gtkutils.c:2761
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Не удалось открыть файл '%s': %s"
-
-#: ../gtk/gtkutils.c:2810
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Сохранить файл"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "Выбрать цвет"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Вывести статистику"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Вероятность отклика:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Настройка статистики"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr "Максимальное время ожидания отклика:"
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "минут"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr ""
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Пороговая величина:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr ""
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr ""
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Собеседник бездействует"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Собеседник отошёл"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr ""
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Собеседник не в сети"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr ""
-
-#: ../gtk/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 ""
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Приоритет контакта"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Цвета беседы"
-
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Изменяет цвета в окне беседы."
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Сообщения об ошибках"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Подсвеченные сообщения"
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Системные сообщения"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Отправленные сообщения"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Полученные сообщения"
-
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Выберите цвет для %s"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "Основные"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr "Игнорировать входящий формат"
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "Применять в чатах"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr "Применять в мгновенных сообщениях"
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "По количеству бесед"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Расположение бесед"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Количество бесед в окне"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr ""
-"Разделять окна мгновенных сообщений и чатов при расположении по количеству"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "Экстра-расположение"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Дополнительные параметры расположения бесед."
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Ограничивает количество бесед в окне, с возможностью разделения мгновенных "
-"сообщений и чатов."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Демонстрационный модуль Gaim"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr ""
-"Демонстрационный модуль, который делает всякие вещи - смотрите описание."
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Это действительно замечательный модуль, который делает множество вещей:\n"
-"- Сообщает вам, кто написал эту программу, когда вы входите\n"
-"- Переворачивает весь приходящий текст\n"
-"- Отправляет сообщение пользователям из вашего списка сразу после их "
-"подключения"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Цвет курсора"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Вторичный цвет курсора"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Цвет гиперссылки"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Размер расширителя GtkTreeView"
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "Горизонтальное разделение GtkTreeView"
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Область ввода окна беседы"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "История бесед"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Система просмотра журналов"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Диалог запроса"
-
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Диалог уведомления"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "Выберите цвет"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "Выберите шрифт для %s"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "Выберите шрифт"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "Шрифт интерфейса GTK+"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Цвета интерфейса"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Размер виджетов"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Шрифты"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Инструменты"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Записать настройки в %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "Повторно прочитать файлы gtkrc"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Управление темой GTK+ для Gaim"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Настройка жестов мышью"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Средняя кнопка мыши"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Правая кнопка мыши"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Визуальное отображение жестов"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Жесты мышью"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Предоставляет поддержку жестов мышью."
-
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
-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 ""
-"Позволяет использовать жесты мышью в окнах бесед.\n"
-"Передвигайте мышь, удерживая нажатой среднюю кнопку, для выполнения "
-"следующих действий:\n"
-"\n"
-"Вниз и вправо для закрытия беседы.\n"
-"Вверх и влево для перехода к предыдущей беседе.\n"
-"Вверх и вправо для перехода к следующей беседе."
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Обмен мгновенными сообщениями"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1766
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:140
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "Искать"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Новая персона"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "Выбрать собеседника"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Выберите персону из адресной книги, к которой следует добавить этого "
-"собеседника, или создайте новую персону."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "Подробности о пользователе"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "Соотнести собеседника"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1167
-msgid "None"
-msgstr "Нет"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Не удаётся отправить e-mail"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "Исполняемый файл evolution не был найден в PATH."
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "Добавить в адресную книгу"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "Отправить e-mail"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Настройка интеграции с Evolution"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Выберите все учётные записи, собеседники которых должны быть добавлены "
-"автоматически."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Интеграция с Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Предоставляет интеграцию с Evolution."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Ниже введите информацию о персоне."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Ниже введите идентификатор пользователя собеседника и тип учётной записи."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Тип учётной записи:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Необязательная информация:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Имя:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Фамилия:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "Проверка сигналов GTK"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Проверяет, все ли сигналы интерфейса пользователя работают исправно."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "История"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Сворачивание при отсутствии"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Сворачивает список собеседников и все беседы, когда вы отсутствуете."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Проверка почты"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Проверяет наличие новой локальной почты."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Добавляет небольшую область к списку собеседников, в которой сообщается о "
-"наличии новой почты."
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Разделительная линия"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Проводит линию, отделяющую новые сообщения в беседе."
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Проводить разделительную линию в "
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "Окна _мгновенных сообщений"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "Окна _чатов"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Произошёл конфликт при выполнении команды:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Ошибка запуска редактора"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "Произошла следующая ошибка:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Применить"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr "Уведомление для"
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Только тогда, когда кто-то произносит ваше имя"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "Окна в _фокусе"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Методы уведомления"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "Добавлять _строку в начало заголовка окна:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "Вставлять _количество новых сообщений в заголовок окна"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "Вставлять количество новых сообщений в свойства _X"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Установить подсказку \"С_РОЧНО\" оконного менеджера"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "_Поднимать окно беседы"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "Удаление уведомлений"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "Удалять, когда окно беседы оказывается в ф_окусе"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "Удалять, когда окно беседы получает _щелчок"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "Удалять при _наборе сообщения в окне беседы"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "Удалять при отпр_авке сообщения"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "Удалять при переключении на _вкладку беседы"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Уведомление о сообщении"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "Необработанный"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте."
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
-"в области ввода. Смотрите за окном отладки."
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Вы используете Gaim версии %s. Последняя доступная версия %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Список изменений:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Вы можете получить версию %s здесь:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Доступна новая версия"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Уведомление о выпуске"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Периодически проверяет наличие новых версий."
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Периодически проверяет наличие новых версий и уведомляет о них пользователя, "
-"приводя список изменений."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Удаление повторов"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "Указанное слово уже присутствует в списке исправлений."
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "Замещение текста"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "Вы набираете"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "Вы отправляете"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "Только целые слова"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "Учитывать регистр"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "Добавить новое замещение текста"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "Вы _набираете:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "Вы _отправляете:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Точное совпадение регистра"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "Замещать только _целые слова"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Основные параметры замещения текста"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Разрешить замещение последнего слова при отправке"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Замещение текста"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Замещает текст в исходящих сообщениях в соответствии с правилами, "
-"определёнными пользователем."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Лента собеседников"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Горизонтальная прокрутка списка собеседников."
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Выводить отметки времени каждые"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Отметка времени"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "Выводит отметки времени в стиле iChat."
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Выводит отметки времени в стиле iChat каждые N минут."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Параметры формата времени"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr ""
-"_Принудительно использовать (традиционный для Gaim) 24-часовой формат времени"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Показывать дату..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Беседы:"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Для задержанных сообщений"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Для задержанных сообщений и в чатах"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Журналы сообщений:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Форматы времени сообщений"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Изменяет форматы времени сообщений."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Этот модуль позволяет пользователю изменять форматы времени сообщений для "
-"бесед и журналов."
-
-#: ../gtk/plugins/xmppconsole.c:665
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/xmppconsole.c:745 ../gtk/plugins/xmppconsole.c:841
-#: ../gtk/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "Консоль XMPP"
-
-#: ../gtk/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "Учётная запись: "
-
-#: ../gtk/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
-
-#: ../gtk/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "Вставить станс <iq/>."
-
-#: ../gtk/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "Вставить станс <presence/>."
-
-#: ../gtk/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "Вставить станс <message/>."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr ""
-
-#. *  description
-#: ../gtk/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Непрозрачность:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Окна бесед"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Прозрачность окна беседы"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Показывать _полосу прокрутки в окнах бесед"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Убирать прозрачность окна беседы в фокусе"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Всегда наверху"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Окно списка собеседников"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Прозрачность окна _списка собеседников"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Убирать прозрачность окна списка собеседников в фокусе"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Прозрачность"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Варьируемая прозрачность для списка собеседников и бесед."
-
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Этот модуль включает варьируемую альфа-прозрачность окон бесед и списка "
-"собеседников.\n"
-"\n"
-"* Замечание: Этот модуль требует Win2000 или выше."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "Версия GTK+"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Загрузка"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "_Запускать Gaim при загрузке Windows"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "Закреплённый _список собеседников"
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "Держать окно списка собеседников _наверху:"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr "Только тогда, когда закреплено"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "_Мерцать окном при принятии сообщений в чатах"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "Параметры WinGaim"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Специфичные для Windows параметры Gaim."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-"Специфичные для Windows параметры Gaim, такие как закрепление списка "
-"собеседников."
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr ""
+
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "учётные записи"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Для подключения требуется пароль."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Введите пароль для %s (%s)"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Отсутствует модуль протокола для %s"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1322
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1332
 msgid "New passwords do not match."
 msgstr "Новые пароли не совпадают."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Заполните все поля."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Исходный пароль"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Новый пароль"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Новый пароль (ещё раз)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Изменить пароль для %s"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Введите ваш текущий и ваш новый пароли."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Изменить пользовательскую информацию для %s"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Установить пользовательскую информацию"
 
-#: ../libgaim/blist.c:548
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5200 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Собеседники"
+
+#: ../libpurple/blist.c:550
 msgid "buddy list"
 msgstr "список собеседников"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d собеседник из группы %s не был удалён, так как он принадлежит учётной "
-"записи, которая в настоящий момент выключена или неактивна. Этот собеседник "
-"и группа не были удалены.\n"
-msgstr[1] ""
-"%d собеседников из группы %s не были удалены, так как они принадлежат "
-"учётным записям, которые в настоящий момент выключены или неактивны. Эти "
-"собеседники и группа не были удалены.\n"
-
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "Группа не удалена"
-
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Ошибка регистрации"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s вошёл"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s вышел"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "Не удаётся отправить сообщение: Сообщение слишком велико."
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Не удаётся отправить сообщение для %s."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "Сообщение слишком велико."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "Не удаётся отправить сообщение."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Отправить сообщение"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "_Отправить сообщение"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s вошёл в комнату."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] вошёл в комнату."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s вышел из комнаты."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Нет имени"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не удалось получить соединение: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Не удалось получить имя: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Не удалось получить имя сервера: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Нет имени"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:496
+msgstr "Не удаётся создать новый процесс разрешителя имён\n"
+
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+msgstr "Не удаётся отправить запрос разрешителю имён\n"
+
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+"Ошибка разрешения имени %s:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:554
+msgstr "Ошибка разрешения имени %s: %d"
+
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-
-#: ../libgaim/dnsquery.c:558
+"Ошибка чтения из процесса разрешителя имён:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:735
+msgstr "EOF при чтении из процесса разрешителя имён"
+
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Ошибка создания нити: %s"
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Причина неизвестна"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:429
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5717,7 +1684,7 @@
 "Ошибка чтения %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5726,7 +1693,7 @@
 "Ошибка записи %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5735,39 +1702,39 @@
 "Ошибка доступа %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr "Нельзя отправить файл размером 0 байт."
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr "Нельзя отправить каталог."
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s не является обычным файлом. Не будет перезаписан.\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s хочет отправить вам %s (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s хочет отправить вам файл"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Удовлетворить запрос передачи файлов от %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5778,245 +1745,245 @@
 "Удалённый узел: %s\n"
 "Удалённый порт: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s предлагает отправку файла %s"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s не является допустимым именем файла.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Предложение отправки %s для %s"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Запуск передачи %s от %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Передача файла %s завершена"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "Передача файлов завершена"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Вы отменили передачу %s"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "Передача файлов отменена"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s отменил передачу %s"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s отменил передачу файлов"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Не удалось произвести передачу файлов для %s."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Не удалось произвести передачу файлов от %s."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Выполнить команду в терминале"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"aim\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"gg\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"icq\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"irc\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"msnim\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"sip\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"xmpp\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"ymsgr\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Обработчик для \"aim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Обработчик для \"gg\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Обработчик для \"icq\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Обработчик для \"irc\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Обработчик для \"msnim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Обработчик для \"sip\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Обработчик для \"xmpp\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Обработчик для \"ymsgr\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../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 ""
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"aim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"gg\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"icq\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"irc\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"msnim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"sip\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"xmpp\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"ymsgr\" URL"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Служба ведения журнала не имеет функции чтения</"
 "font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Старый Gaim"
-
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr "Старый плоский формат"
+
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: ../libgaim/log.c:1041
+msgstr "Не удалось выполнить ведение журнала этой беседы."
+
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6025,7 +1992,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6034,51 +2001,44 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Не удаётся найти путь к журналу!</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Не удалось прочитать файл: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1691
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
-
-#: ../libgaim/plugin.c:380
+msgstr "Вы используете %s, а этот модуль требует %s."
+
+#: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
-msgstr ""
-
-#: ../libgaim/plugin.c:448
+msgstr "Этот модуль не имеет ID."
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libgaim/plugin.c:465
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Несоответствие версии ABI %d.%d.x (необходима %d.%d.x)"
 
-#: ../libgaim/plugin.c:482
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr ""
 
-#: ../libgaim/plugin.c:547
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -6087,92 +2047,91 @@
 "Требуемый модуль %s не был найден. Установите этот модуль и попытайтесь "
 "снова."
 
-#: ../libgaim/plugin.c:552
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim столкнулся с ошибками при загрузке модуля."
-
-#: ../libgaim/plugin.c:574
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Не удаётся загрузить модуль"
+
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Не удалось загрузить требуемый модуль %s."
 
-#: ../libgaim/plugin.c:578
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim не удалось загрузить ваш модуль."
-
-#: ../libgaim/plugin.c:678
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Не удаётся загрузить ваш модуль."
+
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Не удалось выгрузить зависимый модуль %s."
 
-#: ../libgaim/plugin.c:683
-msgid "Gaim encountered errors unloading the plugin."
-msgstr "Gaim столкнулся с ошибками при выгрузке модуля."
-
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "При выгрузке модуля произошли ошибки."
+
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Автоматический приём"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Удовлетворяет запросы передачи файлов от выбранных пользователей "
 "автоматически."
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Автоматический приём файла \"%s\" от \"%s\" завершён."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Автоматический приём завершён"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "При поступлении запроса передачи файлов от %s"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Настроить автоматический приём"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5852
-#: ../libgaim/protocols/oscar/oscar.c:5904
-#: ../libgaim/protocols/oscar/oscar.c:6082
-#: ../libgaim/protocols/oscar/oscar.c:6138
-#: ../libgaim/protocols/oscar/oscar.c:6207 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:6082
+#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Спросить"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Принять автоматически"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Отвергнуть автоматически"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Автоматический приём файлов..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -6180,11 +2139,11 @@
 "Сохранять файлы в\n"
 "(укажите полный путь)"
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Отвергать автоматически от пользователей не из списка собеседников"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -6193,132 +2152,39 @@
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#: ../libgaim/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Автоматический ответ для всех протоколов."
-
-#: ../libgaim/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Установить автоматический ответ для %s"
-
-#: ../libgaim/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Установить автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-
-#: ../libgaim/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Установить _автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Когда отвечать автоматически"
-
-#: ../libgaim/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "При _статусе учётной записи, отличном от \"Доступен\""
-
-#: ../libgaim/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "При _бездействии учётной записи"
-
-#: ../libgaim/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Ответ по умолчанию"
-
-#: ../libgaim/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Статусное сообщение"
-
-#: ../libgaim/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Отвечать статусным сообщением"
-
-#: ../libgaim/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Всегда, при наличии статусного сообщения"
-
-#: ../libgaim/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Только при отсутствии автоматического ответа"
-
-#: ../libgaim/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Задержка между ответами"
-
-#: ../libgaim/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Минимальная задержка (минут)"
-
-#: ../libgaim/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Количество отправляемых ответов"
-
-#: ../libgaim/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "М_аксимальное количество"
-
-#: ../libgaim/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1639
 msgid "Notes"
 msgstr "Заметки"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr ""
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr ""
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr ""
 
-#. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -6328,7 +2194,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Проверка шифров"
 
@@ -6336,9 +2202,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Проверяет шифры, поставляемые с Gaim."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Проверяет шифры, поставляемые с libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -6346,7 +2212,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Пример DBus"
 
@@ -6354,7 +2220,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Пример модуля DBus"
 
@@ -6364,58 +2231,58 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Управление Gaim из файла"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Управление из файла"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Позволяет управлять Gaim с помощью ввода команд в файл."
-
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Предоставляет управление с помощью ввода команд в файл."
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Минуты"
 
 #. 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.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../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 "Мастер бездействия"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Установить время бездействия учётной записи"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Установить"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ни одна из учётных записей не бездействует."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Сбросить время бездействия учётной записи"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Сбросить"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Установить время бездействия для всех учётных записей"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Сбросить время бездействия для всех бездействующих учётных записей"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Позволяет настраивать время бездействия вручную."
 
@@ -6425,19 +2292,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Тестовый клиент IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Тестовый модуль поддержки IPC в качестве клиента."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../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."
@@ -6451,118 +2318,160 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Тестовый сервер IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Тестовый модуль поддержки IPC в качестве сервера."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Тестовый модуль поддержки IPC в качестве сервера. Регистрирует команды IPC."
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  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 ""
+
 #. 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.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Пользователь не в сети."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Автоматический отклик отправлен:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s не в сети."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "Одно или несколько сообщений могли быть недоставленными."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Вы были отсоединены от сервера."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Сообщение не может быть отправлено, так как был превышен максимальный размер."
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Сообщение не может быть отправлено."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 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.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 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.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 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.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 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.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Основные настройки системы чтения журналов"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Быстрое вычисление размера"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Каталог журнала"
 
@@ -6572,21 +2481,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Система чтения журналов"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Включает журналы других клиентов обмена сообщениями в систему просмотра "
 "журналов."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6595,12 +2504,12 @@
 "at your own risk!"
 msgstr ""
 
-#: ../libgaim/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Загрузчик модулей Mono"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
-#: ../libgaim/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr ""
 
@@ -6613,18 +2522,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Новая строка"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Добавляет новую строку к началу выводимого сообщения."
 
-#. *  summary
-#: ../libgaim/plugins/newline.c:71
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -6632,40 +2541,60 @@
 "Добавляет новую строку к началу каждого сообщения, вследствие чего в окне "
 "беседы само сообщение выводится ниже идентификатора пользователя."
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../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 ""
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, 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 ""
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Да"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Нет"
+
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -6675,48 +2604,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Загрузчик модулей Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Предоставляет поддержку загрузки модулей perl."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Включить только для пользователей из списка собеседников"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Выключать во время отсутствия"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Выводить уведомительное сообщение в беседах"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr ""
 
@@ -6726,7 +2655,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Проверка сигналов"
 
@@ -6734,7 +2663,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Проверяет, все ли сигналы работают исправно."
 
@@ -6744,7 +2674,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Простой модуль"
 
@@ -6752,7 +2682,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Проверяет, всё ли работает."
 
@@ -6762,7 +2692,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6770,7 +2700,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Предоставляет обёртку вокруг библиотек поддержки SSL."
 
@@ -6780,7 +2710,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6788,8 +2718,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "Предоставляет поддержку SSL посредством GNUTLS."
 
@@ -6799,7 +2729,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -6807,48 +2737,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Предоставляет поддержку SSL посредством Mozilla NSS."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s возвращается."
-
-#: ../libgaim/plugins/statenotify.c:52
+msgstr "%s вернулся."
+
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s отходит."
-
-#: ../libgaim/plugins/statenotify.c:62
+msgstr "%s отошёл."
+
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
-msgstr "%s начинает бездействовать."
-
-#: ../libgaim/plugins/statenotify.c:64
+msgstr "%s начал бездействовать."
+
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s перестаёт бездействовать."
-
-#: ../libgaim/plugins/statenotify.c:73
+msgstr "%s перестал бездействовать."
+
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s в сети."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Когда уведомлять"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Собеседник _отходит"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Собеседник начинает _бездействовать"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Собеседник _входит/выходит"
 
@@ -6858,7 +2789,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Уведомление о статусе собеседника"
 
@@ -6866,39 +2797,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
 "Уведомляет в окне беседы, когда собеседник отходит или возвращается, "
-"начинает или перестает бездействовать."
-
-#: ../libgaim/plugins/tcl/tcl.c:415
+"начинает или перестаёт бездействовать."
+
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Загрузчик модулей Tcl"
 
-#: ../libgaim/plugins/tcl/tcl.c:417 ../libgaim/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Предоставляет поддержку модулей на языке Tcl"
 
-#: ../libgaim/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Не удаётся прослушивать входящие соединения\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Не удаётся установить соединение с локальным mDNS-сервером. Он работает?"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4496
+#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
+msgid "Away"
+msgstr "Отошёл"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6909,384 +2860,414 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Модуль протокола Bonjour"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Пользователь Gaim"
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
+msgid "Purple Person"
+msgstr ""
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Имя узла"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:800
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "Учётная запись AIM"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "Jabber Account"
 msgstr "Учётная запись Jabber"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s закрыл беседу."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Не удаётся открыть сокет"
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Ошибка установки параметров сокета"
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "Не удалось связать сокет с портом"
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "Не удалось осуществить прослушивание сокета"
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Имя узла или номер порта, указанные для данного типа прокси, неверны."
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Ошибка маркера"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../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 "Не удаётся загрузить маркер.\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Сохранить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Список собеседников пуст, в файл ничего не было записано."
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Не удалось открыть файл"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Список собеседников сохранён успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Не удалось загрузить список собеседников"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Загрузить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Список собеседников загружен успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Сохранить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Заполните поля регистрационной формы."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Не удаётся зарегистрировать новую учётную запись. Произошла ошибка.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Новая учётная запись Gadu-Gadu зарегистрирована"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Регистрация завершена успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:789
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1367
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Пароль (наберите ещё раз)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Введите текущий маркер"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Текущий маркер"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зарегистрировать новую учётную запись Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Заполните следующие поля"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:825
-#: ../libgaim/protocols/oscar/oscar.c:3778
-#: ../libgaim/protocols/oscar/oscar.c:3791
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Город"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Год рождения"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3728
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Пол"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Мужчина или женщина"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3728
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Мужчина"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3728
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Женщина"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Только в сети"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Найти собеседников"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Заполните поля."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Не удаётся изменить пароль. Произошла ошибка.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Изменить пароль для учётной записи Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Пароль был успешно изменён!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введите текущий и новый пароли для UIN: "
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Изменить пароль Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Выберите чат для собеседника: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Добавить к чату..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3036 ../pidgin/gtkblist.c:3360
+#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+msgid "Offline"
+msgstr "Не в сети"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+msgid "Available"
+msgstr "Доступен"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/jabber/buddy.c:1740
-#: ../libgaim/protocols/oscar/oscar.c:3706
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Год рождения"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3900
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "Не удаётся отобразить результаты поиска."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Публичный каталог Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Пользователи не найдены"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Нет пользователей, соответствующих критериям поиска."
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Не удаётся прочитать сокет"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Список собеседников загружен"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Список собеседников был загружен с сервера."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Список собеседников сохранён"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Список собеседников был сохранён на сервере."
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Не удалось установить соединение."
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:548
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Добавить к чату"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Разблокировать"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Блокировать"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Ошибка чата"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Нет соединения с сервером."
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Найти собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Change password..."
 msgstr "Изменить пароль..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
 msgstr "Сохранить список собеседников на сервере"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Загрузить список собеседников с сервера"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Удалить список собеседников с сервера"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Сохранить список собеседников в файл..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
@@ -7301,122 +3282,147 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Модуль протокола Gadu-Gadu"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Пользователь Gadu-Gadu"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "текущая тема: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Тема не установлена"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "Gaim не удалось открыть порт для прослушивания."
-
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Не удалось открыть порт для прослушивания."
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Ошибка отображения MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Нет доступного MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Нет MOTD, соотнесённого с этим соединением."
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "Сервер разорвал соединение"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Просмотреть MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Канал:"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "Псевдонимы IRC не могут содержать пробелы"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:585
-#: ../libgaim/protocols/jabber/jabber.c:930
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+msgid "Connecting"
+msgstr "Соединение"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:595
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "Не удалось выполнить согласование SSL"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Тема"
 
@@ -7428,204 +3434,212 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "Модуль протокола IRC"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Наименее плохой модуль протокола IRC"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1989
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Сервер"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Порт"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "Кодировки"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:785
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:309
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Настоящее имя"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:180
 msgid "Bad mode"
 msgstr "Неверный режим"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:191
 #, c-format
 msgid "You are banned from %s."
 msgstr "Вас выгнали из %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Banned"
 msgstr "Изгнан"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:209
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:294
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператор IRC)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:295
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентифицирован)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3696
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:296
+#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:322
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Сейчас на"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:327
 msgid "Idle for"
 msgstr "Бездействует"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Online since"
 msgstr "В сети с"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Glorious"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s сменил тему на: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:412
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s очистил тему."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема для %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:438
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Неизвестное сообщение '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:439
 msgid "Unknown message"
 msgstr "Неизвестное сообщение"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim отправил сообщение, которое не понял сервер IRC."
-
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:439
+msgid "The IRC server received a message it did not understand."
+msgstr "Сервер IRC не понял полученное сообщение."
+
+#: ../libpurple/protocols/irc/msgs.c:460
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Пользователи на %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:557
 msgid "Time Response"
 msgstr "Отклик времени"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:558
 msgid "The IRC server's local time is:"
 msgstr "Локальное время сервера IRC:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:569
 msgid "No such channel"
 msgstr "Нет такого канала"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "no such channel"
 msgstr "нет такого канала"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:583
 msgid "User is not logged in"
 msgstr "Пользователь не в сети"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:588
 msgid "No such nick or channel"
 msgstr "Нет такого псевдонима или канала"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "Could not send"
 msgstr "Не удалось отправить"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:664
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Присоединение к %s требует приглашения."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:665
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:777
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Вы были удалены оператором %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:782 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Удалён оператором %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:805
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:890 ../libpurple/protocols/irc/msgs.c:891
 msgid "Invalid nickname"
 msgstr "Неверный псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:892
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7633,7 +3647,7 @@
 "Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
 "недопустимые символы."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:897
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7641,51 +3655,52 @@
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:957
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы покинули канал%s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:999
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:1001
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1082
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Не удаётся присоединиться к %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1083
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1117
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Псевдоним или канал временно недоступен."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1129
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7693,11 +3708,11 @@
 "away [сообщение]:  Установить сообщение об отсутствии. Если сообщение не "
 "задано, удалить сообщение об отсутствии."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Послать команду для chanserv"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -7705,7 +3720,7 @@
 "deop &lt;псевдоним1&gt; [псевдоним2] ...:  Забрать у пользователя статус "
 "оператора канала. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -7715,7 +3730,7 @@
 "голоса на канале, лишая его возможности говорить, если канал модерируемый "
 "(+m). Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -7723,19 +3738,19 @@
 "invite &lt;псевдоним&gt; [комната]:  Пригласить пользователя присоединиться "
 "к вам на указанном или текущем канале."
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -7743,7 +3758,7 @@
 "kick &lt;псевдоним&gt; [сообщение]:  Удалить пользователя с канала. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -7751,15 +3766,15 @@
 "list:  Вывести список каналов в сети. <i>Имейте в виду, что некоторые "
 "серверы за это могут разорвать соединение с вами.</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Послать команду для memoserv"
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -7767,28 +3782,28 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;псевдоним|канал&gt;:  Установить или "
 "снять режим пользователя или канала."
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [канал]:  Вывести список пользователей, присутствующих сейчас на "
 "канале."
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Послать команду для nickserv"
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -7796,17 +3811,17 @@
 "op &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус оператора "
 "канала. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Послать команду для operserv"
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -7814,7 +3829,7 @@
 "part [комната] [сообщение]:  Покинуть указанный или текущий канал. Сообщение "
 "необязательно."
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -7822,22 +3837,22 @@
 "ping [псевдоним]:  Запросить величину задержки связи с пользователем (или с "
 "сервером, если пользователь не указан)."
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером. Сообщение необязательно."
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Послать команду без обработки непосредственно серверу."
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -7845,24 +3860,24 @@
 "remove &lt;псевдоним&gt; [сообщение]:  Удалить пользователя из комнаты. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Выводит текущее локальное время на сервере IRC."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему канала."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Установить или снять режим пользователя."
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -7870,60 +3885,63 @@
 "voice &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус голоса "
 "на канале. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [сервер] &lt;псевдоним&gt;:  Получить информацию о пользователе."
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;псевдоним&gt;:  Получить информацию о пользователе, вышедшем из "
+"сети."
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Время ответа от %s: %lu секунд"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "Ответ CTCP PING"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../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 "Соединение разорвано."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
 
-#: ../libgaim/protocols/jabber/auth.c:226
-msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/auth.c:229
-#: ../libgaim/protocols/jabber/auth.c:230
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-#: ../libgaim/protocols/jabber/auth.c:231
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -7931,825 +3949,860 @@
 "Этот сервер требует аутентификацию простым текстом через нешифрованное "
 "соединение. Позволить это и продолжить аутентификацию?"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Неверный отклик от сервера."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:789
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:802
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:806
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:858
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:854
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:862
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Населённый пункт"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Регион"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:870
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Почтовый код"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:875
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Страна"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:886
-#: ../libgaim/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:904
-#: ../libgaim/protocols/jabber/buddy.c:912
-#: ../libgaim/protocols/jabber/buddy.c:1570
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Название организации"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Должность"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:823 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Дата рождения"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Описание"
+
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "Изменить Jabber vCard"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Все нижеследующие пункты необязательны. Заполняйте по своему усмотрению."
 
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Клиент"
 
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Операционная система"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "Ресурс"
 
-#: ../libgaim/protocols/jabber/buddy.c:670
-#: ../libgaim/protocols/jabber/jabber.c:1231
-#: ../libgaim/protocols/jabber/jabber.c:1241
-#: ../libgaim/protocols/jabber/jabber.c:1251
-#: ../libgaim/protocols/jabber/jabber.c:1261
-#: ../libgaim/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../libgaim/protocols/jabber/buddy.c:810
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Отчество"
 
-#: ../libgaim/protocols/jabber/buddy.c:843
-#: ../libgaim/protocols/jabber/jabber.c:820
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/oscar/oscar.c:3790
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:850
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Фотография"
 
-#: ../libgaim/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Логотип"
 
-#: ../libgaim/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: ../libgaim/protocols/jabber/buddy.c:1354
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1240
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1250
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: ../libgaim/protocols/jabber/buddy.c:1415 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: ../libgaim/protocols/jabber/buddy.c:1417
-#: ../libgaim/protocols/jabber/jabber.c:1270
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5774
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1566
-#: ../libgaim/protocols/jabber/buddy.c:1745
-#: ../libgaim/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/jabber/buddy.c:1598
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "Следующее является результатами вашего поиска"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1673
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1693
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "Не удалось опросить каталог"
 
-#: ../libgaim/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "Не удалось опросить сервер каталога."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1728
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Инструкции сервера: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1735
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3710
-#: ../libgaim/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "Адрес e-mail"
 
-#: ../libgaim/protocols/jabber/buddy.c:1764
-#: ../libgaim/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Искать пользователей Jabber"
 
-#: ../libgaim/protocols/jabber/buddy.c:1779
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Искать"
+
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "Неверный каталог"
 
-#: ../libgaim/protocols/jabber/buddy.c:1796
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "Введите каталог пользователей"
 
-#: ../libgaim/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "Выберите каталог пользователей для поиска"
 
-#: ../libgaim/protocols/jabber/buddy.c:1800
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "Поиск в каталоге"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5242
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Комната:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Имя:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s не является допустимым именем комнаты"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Неверное имя комнаты"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s не является допустимым именем сервера"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s не является допустимым именем комнаты"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Неверное имя комнаты"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Ошибка настройки"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Не удаётся настроить"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "Ошибка настройки комнаты"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "Эта комната не имеет возможности настройки"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "Ошибка регистрации"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Изменение псевдонима не поддерживается в чатах не-MUC"
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Ошибка загрузки списка комнат"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Неверный сервер"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Войти на сервер конференций"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Выберите сервер конференций для опроса"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Ошибка инициализации сессии"
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Ошибка записи"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Ошибка чтения"
 
-#: ../libgaim/protocols/jabber/jabber.c:507
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "Не удаётся создать сокет"
 
-#: ../libgaim/protocols/jabber/jabber.c:555
-#: ../libgaim/protocols/jabber/jabber.c:898
+#: ../libpurple/protocols/jabber/jabber.c:565
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#: ../libgaim/protocols/jabber/jabber.c:628
-#: ../libgaim/protocols/jabber/jabber.c:629
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
 
-#: ../libgaim/protocols/jabber/jabber.c:635
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: ../libgaim/protocols/jabber/jabber.c:637
-#: ../libgaim/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "Регистрация завершилась неудачно"
 
-#: ../libgaim/protocols/jabber/jabber.c:753
-#: ../libgaim/protocols/jabber/jabber.c:754
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "Уже зарегистрировано"
 
-#: ../libgaim/protocols/jabber/jabber.c:830
-#: ../libgaim/protocols/oscar/oscar.c:3779
-#: ../libgaim/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Область"
 
-#: ../libgaim/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "Почтовый код"
 
-#: ../libgaim/protocols/jabber/jabber.c:840
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../libgaim/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "Дата"
 
-#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
 
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "Зарегистрировать новую учётную запись Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1489
+msgid "Register"
+msgstr "Зарегистрировать"
+
+#: ../libpurple/protocols/jabber/jabber.c:1044
 msgid "Initializing Stream"
 msgstr "Инициализация потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1035
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1049
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Re-initializing Stream"
 msgstr "Повторная инициализация потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1114
-#: ../libgaim/protocols/jabber/jabber.c:1484
-#: ../libgaim/protocols/jabber/jabber.c:1525
-#: ../libgaim/protocols/jabber/jabber.c:1559
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5563
+#: ../libpurple/protocols/jabber/jabber.c:1124
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5517
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#: ../libgaim/protocols/jabber/jabber.c:1156
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "Both"
 msgstr "Обе"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "To"
 msgstr "Для"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Нет"
+
+#: ../libpurple/protocols/jabber/jabber.c:1180
 msgid "Subscription"
 msgstr "Подписка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libpurple/protocols/jabber/jabber.c:1310
 msgid "Password Changed"
 msgstr "Пароль изменён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1311
 msgid "Your password has been changed."
 msgstr "Пароль был изменён."
 
-#: ../libgaim/protocols/jabber/jabber.c:1305
-#: ../libgaim/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1316
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libpurple/protocols/jabber/jabber.c:1372
 msgid "Password (again)"
 msgstr "Пароль (ещё раз)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1367
-#: ../libgaim/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Change Jabber Password"
 msgstr "Изменить пароль Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Please enter your new password"
 msgstr "Введите новый пароль"
 
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6369
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Установить пользовательскую информацию..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1383
-#: ../libgaim/protocols/oscar/oscar.c:6380
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Изменить пароль..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1400
 msgid "Search for Users..."
 msgstr "Искать пользователей..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1478
 msgid "Bad Request"
 msgstr "Неверный запрос"
 
-#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1480
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: ../libgaim/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Feature Not Implemented"
 msgstr "Функция не реализована"
 
-#: ../libgaim/protocols/jabber/jabber.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: ../libgaim/protocols/jabber/jabber.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Gone"
 msgstr "Ушёл"
 
-#: ../libgaim/protocols/jabber/jabber.c:1474
-#: ../libgaim/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
-#: ../libgaim/protocols/jabber/jabber.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Item Not Found"
 msgstr "Элемент не найден"
 
-#: ../libgaim/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Malformed Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1480
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Not Acceptable"
 msgstr "Недопустимо"
 
-#: ../libgaim/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Not Allowed"
 msgstr "Не разрешено"
 
-#: ../libgaim/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Payment Required"
 msgstr "Требуется плата"
 
-#: ../libgaim/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Recipient Unavailable"
 msgstr "Получатель недоступен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Registration Required"
 msgstr "Требуется регистрация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1508
 msgid "Remote Server Not Found"
 msgstr "Удалённый сервер не найден"
 
-#: ../libgaim/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Remote Server Timeout"
 msgstr "Истекло время ожидания удалённого сервера"
 
-#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Server Overloaded"
 msgstr "Сервер перегружен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Service Unavailable"
 msgstr "Служба недоступна"
 
-#: ../libgaim/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Subscription Required"
 msgstr "Требуется подписка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Unexpected Request"
 msgstr "Непредвиденный запрос"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization Aborted"
 msgstr "Авторизация прервана"
 
-#: ../libgaim/protocols/jabber/jabber.c:1513
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Incorrect encoding in authorization"
 msgstr "Неправильная кодировка в авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Invalid authzid"
 msgstr "Неверный идентификатор авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Invalid Authorization Mechanism"
 msgstr "Неверный механизм авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Authorization mechanism too weak"
 msgstr "Механизм авторизации слишком слаб"
 
-#: ../libgaim/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Temporary Authentication Failure"
 msgstr "Временная ошибка аутентификации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Authentication Failure"
 msgstr "Ошибка аутентификации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Bad Format"
 msgstr "Неверный формат"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Bad Namespace Prefix"
 msgstr "Неверный префикс пространства имён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1555
 msgid "Resource Conflict"
 msgstr "Конфликт ресурсов"
 
-#: ../libgaim/protocols/jabber/jabber.c:1541
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Истекло время ожидания соединения"
 
-#: ../libgaim/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Host Gone"
 msgstr "Узел ушёл"
 
-#: ../libgaim/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1561
 msgid "Host Unknown"
 msgstr "Узел неизвестен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1547
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Improper Addressing"
 msgstr "Неправильная адресация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Invalid ID"
 msgstr "Неверный ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Invalid Namespace"
 msgstr "Неверное пространство имён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid XML"
 msgstr "Неверный XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Non-matching Hosts"
 msgstr "Несочетаемые узлы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Policy Violation"
 msgstr "Нарушение правил"
 
-#: ../libgaim/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Remote Connection Failed"
 msgstr "Не удалось установить удалённое соединение"
 
-#: ../libgaim/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Resource Constraint"
 msgstr "Недостаток ресурсов"
 
-#: ../libgaim/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "See Other Host"
 msgstr "Обратитесь к другому узлу"
 
-#: ../libgaim/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "System Shutdown"
 msgstr "Выключение системы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Undefined Condition"
 msgstr "Неопределённое состояние"
 
-#: ../libgaim/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Unsupported Encoding"
 msgstr "Неподдерживаемая кодировка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Unsupported Stanza Type"
 msgstr "Неподдерживаемый тип строфы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Version"
 msgstr "Неподдерживаемая версия"
 
-#: ../libgaim/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "XML Not Well Formed"
 msgstr "XML не сформирован должным образом"
 
-#: ../libgaim/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Stream Error"
 msgstr "Ошибка потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Не удаётся выгнать пользователя %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1691
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1694
+#: ../libpurple/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1717
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/jabber/jabber.c:1770
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не удаётся удалить пользователя %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1785
+#: ../libpurple/protocols/jabber/jabber.c:1801
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: ../libgaim/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [комната]:  Выгнать пользователя из комнаты."
 
-#: ../libgaim/protocols/jabber/jabber.c:1821
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1827
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1833
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1839
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: ../libgaim/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -8766,73 +4819,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1967
-#: ../libgaim/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Модуль протокола Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "Принудительно использовать старый (порт 5223) SSL"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
-#: ../libgaim/protocols/jabber/jabber.c:2005
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "Соединяться на порт"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2009
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Соединяться с сервером"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "Сообщение от %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s установил тему: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "Тема: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Не удалось доставить сообщение для %s: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Ошибка сообщения Jabber"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (Код %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8840,40 +4893,41 @@
 "Вы создаёте новую комнату. Хотите настроить её или принять установки по "
 "умолчанию?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "_Настроить комнату"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Ошибка в чате %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Ошибка присоединения к чату %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Не удаётся отправить файл для %s, пользователь не поддерживает приём файлов"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Не удалось отправить файл"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -8882,7 +4936,7 @@
 "%s в локальном списке в группе \"%s\", но не в списке на сервере. Хотите "
 "добавить этого собеседника?"
 
-#: ../libgaim/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -8891,582 +4945,597 @@
 "%s в локальном списке, но не в списке на сервере. Хотите добавить этого "
 "собеседника?"
 
-#: ../libgaim/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "Не удаётся сделать разбор сообщения"
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Синтаксическая ошибка (вероятно, ошибка Gaim)"
-
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Синтаксическая ошибка (вероятно, ошибка в клиенте)"
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Неверный адрес e-mail"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Пользователь не существует"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Пропущено полное доменное имя"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Уже в сети"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Неверный идентификатор пользователя"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Неверное дружеское имя"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Список полон"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Уже там"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Отсутствует в списке"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Пользователь не в сети"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Уже в этом режиме"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Уже в противоположном списке"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Слишком много групп"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Неверная группа"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Пользователь не в группе"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Имя группы слишком велико"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Нельзя удалить нулевую группу"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Попытка добавления пользователя в несуществующую группу"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "Ошибка коммутационной панели"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Не удалось передать уведомление"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Необходимые поля пропущены"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Слишком много попаданий в FND"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Не в сети"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Служба временно недоступна"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Ошибка сервера базы данных"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Команда отключена"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Ошибка файловой операции"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Ошибка выделения памяти"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "На сервер отправлено неверное значение CHL"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Сервер занят"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Сервер недоступен"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Ошибка соединения с базой данных"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Ошибка создания соединения"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Параметры CVR неизвестны или недопустимы"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Не удаётся записать"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Перегрузка сессии"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Пользователь слишком активен"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Слишком много сессий"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Паспорт не проверен"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Не предусмотрено"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Сервер слишком занят"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Аутентификация завершилась неудачно"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Не разрешено не в сети"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Новые пользователи не принимаются"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Паспортная учётная запись ещё не проверена"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Неверный билет"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Неизвестный код ошибки %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Ошибка MSN: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "Введите ваше дружеское имя."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Это имя, под которым вас будут видеть другие пользователи MSN."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "Введите номер вашего домашнего телефона."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "Введите номер вашего рабочего телефона."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "Введите номер вашего мобильного телефона."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:314
 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 ""
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "Запретить"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "Страница"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:538
 msgid "Has you"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:568 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:572 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "Занят"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:576
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:580
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Friendly Name..."
 msgstr "Ввести дружеское имя..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:613
 msgid "Set Home Phone Number..."
 msgstr "Ввести номер домашнего телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:617
 msgid "Set Work Phone Number..."
 msgstr "Ввести номер рабочего телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:621
 msgid "Set Mobile Phone Number..."
 msgstr "Ввести номер мобильного телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:627
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Разрешить/запретить мобильные устройства..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Разрешить/запретить мобильные страницы..."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:642
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:666
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:676
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Создать _чат"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL. "
-"За дополнительной информацией обращайтесь на http://gaim.sf.net/faq-ssl.php."
-
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:714
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
+
+#: ../libpurple/protocols/msn/msn.c:739
 msgid "Failed to connect to server."
 msgstr "Не удалось соединиться с сервером."
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1459 ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3751
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1530 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Основные"
+
+#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Возраст"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Занятость"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1540
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1545 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "Hobbies and Interests"
 msgstr "Хобби и интересы"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1551 ../libpurple/protocols/msn/msn.c:1671
+#: ../libpurple/protocols/msn/msn.c:1677 ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1692 ../libpurple/protocols/msn/msn.c:1699
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Social"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Interests"
 msgstr "Интересы"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Pets"
 msgstr "Домашние животные"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Hometown"
 msgstr "Родной город"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Places Lived"
 msgstr "Места проживания"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Fashion"
 msgstr "Мода"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Humor"
 msgstr "Юмор"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1577
 msgid "Music"
 msgstr "Музыка"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1578 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Любимая цитата"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Contact Info"
 msgstr "Контактная информация"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal"
 msgstr "Персональное"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Significant Other"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1601
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Personal Mobile"
 msgstr "Персональный мобильный телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Home Fax"
 msgstr "Домашний факс"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal E-Mail"
 msgstr "Персональный e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1606
 msgid "Personal IM"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1608
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work"
 msgstr "Работа"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Название работы"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Компания"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Profession"
 msgstr "Профессия"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone"
 msgstr "Рабочий телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Work Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Mobile"
 msgstr "Рабочий мобильный телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Pager"
 msgstr "Рабочий пейджер"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work Fax"
 msgstr "Рабочий факс"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work E-Mail"
 msgstr "Рабочий e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Work IM"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Start Date"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1714
+#: ../libpurple/protocols/msn/msn.c:1721 ../libpurple/protocols/msn/msn.c:1728
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1773
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1806
 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 ""
 
-#: ../libgaim/protocols/msn/msn.c:1812
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1810
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1818
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL профиля"
 
@@ -9480,96 +5549,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2104 ../libpurple/protocols/msn/msn.c:2106
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2140
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2145
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2153
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Не удаётся установить соединение"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s не является допустимой группой."
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Не удаётся добавить пользователя на %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Не удаётся заблокировать пользователя на %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Не удаётся допустить пользователя на %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s не может быть добавлен, так как список собеседников полон."
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s не является допустимой паспортной учётной записью."
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Служба временно недоступна."
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Не удаётся переименовать группу"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Не удаётся удалить группу"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1303
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9587,16 +5656,17 @@
 "sign in."
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../libgaim/protocols/msn/servconn.c:135
+msgstr[2] ""
+
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Ошибка записи"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Ошибка чтения"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -9605,217 +5675,213 @@
 "Ошибка соединения от сервера %s:\n"
 "%s"
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Наш протокол не поддерживается сервером."
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Ошибка разбора HTTP."
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Вы подключены из другого места."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Серверы MSN временно выключаются."
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Не удаётся аутентифицировать: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Согласование"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "Передача"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Запуск аутентификации"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Получение данных"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Отправка данных"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Отошёл от компьютера"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Сообщение могло быть не отправлено, так как истекло время ожидания:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Сообщение не может быть отправлено, не разрешено при статусе \"Невидимый\":"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка соединения:"
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "Сообщение не может быть отправлено, так как отправка происходит слишком "
 "быстро:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
 "панели:"
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s добавил вас в свой список собеседников."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s удалил вас из своего списка собеседников."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Не удаётся добавить \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "Указанный идентификатор пользователя недопустим."
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr "Требуемые параметры не переданы"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "Не удаётся писать в сеть"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "Не удаётся читать из сети"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr "Ошибка связи с сервером"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr "Конференция не найдена"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr "Конференция не существует"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr "Папка с таким именем уже существует"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr "Срок действия пароля истёк"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr "Сервер не смог получить доступ к каталогу"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr "Ваш системный администратор отключил эту операцию"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr "Сервер недоступен; повторите попытку позже"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Нельзя добавить контакт в ту же папку дважды"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr "Нельзя добавить себя самого"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr "Главный архив не настроен"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "Неправильный идентификатор пользователя или пароль"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Не удалось узнать узел введённого идентификатора пользователя"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -9823,31 +5889,31 @@
 "Ваша учётная запись была отключена, так как было введено слишком много "
 "неправильных паролей"
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Вы не можете добавить одну и ту же персону в беседу дважды"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Вы достигли предела допустимого количества контактов"
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr "Вы ввели неправильный идентификатор пользователя"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
 msgstr "Произошла ошибка при обновлении каталога"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr "Несовместимая версия протокола"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr "Пользователь заблокировал вас"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -9855,56 +5921,56 @@
 "Эта ознакомительная версия не позволяет входить одновременно более, чем "
 "десяти пользователям"
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
 msgstr "Пользователь не в сети или заблокировал вас"
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Неизвестная ошибка: 0x%X"
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Не удалось войти в сеть (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Не удаётся отправить сообщение. Не удалось получить подробности для "
 "пользователя (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Не удаётся добавить %s в список собеседников (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Не удаётся отправить сообщение (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Не удаётся пригласить пользователя (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Не удаётся отправить сообщение для %s. Не удалось создать конференцию (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Не удаётся отправить сообщение. Не удалось создать конференцию (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -9913,7 +5979,7 @@
 "Не удаётся переместить пользователя %s в папку %s в списке на стороне "
 "сервера. Ошибка при создании папки (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -9922,107 +5988,107 @@
 "Не удаётся добавить %s в список собеседников. Ошибка создания папки в списке "
 "на стороне сервера (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Не удалось получить подробности для пользователя %s (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Не удаётся добавить пользователя в список конфиденциальности (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Не удаётся добавить %s в список запрета (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Не удаётся добавить %s в список допуска (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Не удаётся удалить %s из списка конфиденциальности (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "Не удаётся изменить установки конфиденциальности на стороне сервера (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Не удаётся создать конференцию (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Ошибка связи с сервером. Закрытие соединения."
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Номер телефона"
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Звание"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Пользовательский ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Полное Имя"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Конференция GroupWise %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Не удаётся установить SSL-соединение с сервером."
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Не удаётся соединиться с сервером."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s был приглашён к этой беседе."
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Приглашение к беседе"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -10033,16 +6099,16 @@
 "\n"
 "Отправлено: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Вы были отключены, так как вошли с другой машины."
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -10051,10 +6117,10 @@
 "отправили."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -10062,11 +6128,11 @@
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Ошибка. Поддержка SSL не установлена."
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
@@ -10082,33 +6148,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Модуль протокола Novell GroupWise Messenger"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Порт сервера"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "Сервер разорвал соединение."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10117,13 +6183,14 @@
 "Соединение с сервером потеряно:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "При соединении с сервером получены недопустимые данные."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10142,19 +6209,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Модуль протокола AIM"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Всегда использовать прокси-сервер AIM/ICQ для передачи файлов\n"
-"(медленнее, но не раскрывает ваш IP-адрес)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10165,152 +6224,144 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Модуль протокола ICQ"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Всегда использовать прокси-сервер ICQ для передачи файлов\n"
-"(медленнее, но не раскрывает ваш IP-адрес)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Удалённый пользователь разорвал соединение."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Удалённый пользователь отклонил ваш запрос."
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Соединение с удалённым пользователем потеряно:<br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "При соединении с удалённым пользователем получены недопустимые данные."
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Не удалось установить соединение с удалённым пользователем."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Прямое соединение установлено"
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Недопустимая ошибка"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Неверный SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Оценить узел"
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Оценить клиента"
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Служба недоступна"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Служба не определена"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "Устаревший SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "Не поддерживается узлом"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "Не поддерживается клиентом"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "Отвергнуто клиентом"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Ответ слишком велик"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "Отклики потеряны"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Запрос отвергнут"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Недостаточные права"
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Слишком надоедлив (отправитель)"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Слишком надоедлив (получатель)"
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Пользователь временно недоступен"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Нет совпадения"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Переполнение списка"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Неясный запрос"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Очередь полна"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Не в AOL"
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10318,7 +6369,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -10327,125 +6378,145 @@
 "(Произошла ошибка при приёме этого сообщения. Либо у вас и %s выбраны разные "
 "кодировки, либо клиент %s содержит ошибки.)"
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Значок собеседника"
+
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Голос"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "Прямое соединение AIM"
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Чат"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get File"
 msgstr "Получить файл"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Игры"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Дополнения"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Отправить список собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "Прямое соединение ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "Пользователь AP"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Нигилист"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "Релейный сервер ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Старый ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Шифрование Trillian"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Безопасность включена"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Видеочат"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Живое видео"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Камера"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5695
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5716
 msgid "Occupied"
 msgstr "Занят"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Статус на веб-страницах"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+msgid "Invisible"
+msgstr "Невидимый"
+
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "В сети"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP-адрес"
+
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Комментарий собеседника"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10454,7 +6525,7 @@
 "Не удалось установить соединение с сервером аутентификации:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10463,20 +6534,20 @@
 "Не удалось установить соединение с BOS-сервером:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Идентификатор пользователя отправлен"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Соединение установлено, данные отправлены"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10484,28 +6555,29 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "Неверный идентификатор пользователя."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "Неправильный пароль."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -10513,45 +6585,44 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Получена авторизация"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5851
-#: ../libgaim/protocols/oscar/oscar.c:6081
-#: ../libgaim/protocols/oscar/oscar.c:6137 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10560,54 +6631,54 @@
 "Соединение с вами вскоре может быть разорвано. Возможно, вы захотите "
 "использовать TOC, пока это не будет исправлено. Смотрите обновления на %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim не удалось получить допустимый хэш входа AIM."
-
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
+msgid "Unable to get a valid AIM login hash."
+msgstr "Не удаётся получить допустимый хэш входа AIM."
+
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim не удалось получить допустимый хэш входа."
-
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1613
+msgid "Unable to get a valid login hash."
+msgstr "Не удаётся получить допустимый хэш входа."
+
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "Не удаётся инициализировать соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5211
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10618,18 +6689,18 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Пользователь %u дал своё согласие добавить его в ваш список собеседников."
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10642,7 +6713,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10655,7 +6726,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10668,36 +6739,43 @@
 "Сообщение:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Пользователь ICQ %u отправил вам собеседника: %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого собеседника в список собеседников?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Добавить"
+
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
-msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
-
-#: ../libgaim/protocols/oscar/oscar.c:2560
+msgstr[1] "Вы не получили %hu сообщения от %s, так как они были некорректны."
+msgstr[2] "Вы не получили %hu сообщений от %s, так как они были некорректны."
+
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, так как оно было слишком велико."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, так как они были слишком велики."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10706,94 +6784,96 @@
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, так как был превышен предел оценки."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, так как был превышен предел оценки."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, потому что он слишком надоедлив."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, потому что он слишком надоедлив."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, потому что вы слишком надоедливы."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, потому что вы слишком надоедливы."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Вы не получили %hu сообщение от %s по неизвестной причине."
-msgstr[1] "Вы не получили %hu сообщений от %s по неизвестной причине."
-
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC вызвал ошибку: %s\n"
+msgstr[1] "Вы не получили %hu сообщения от %s по неизвестной причине."
+msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не удаётся отправить сообщение: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Причина неизвестна."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Не удаётся отправить сообщение для %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "Пользовательская информация недоступна: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Пользовательская информация для %s недоступна:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "В сети с"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Член с"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Возможности"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Статусное сообщение"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть потеряно."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10801,11 +6881,7 @@
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
-msgid "Rate limiting error."
-msgstr "Ошибка ограничения предела."
-
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10813,84 +6889,86 @@
 "Последнее предпринятое вами действие не может быть выполнено, так как вы "
 "превысили предел. Подождите 10 секунд и попытайтесь снова."
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Вы были отключены по неизвестной причине."
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3725
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../libgaim/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: ../libgaim/protocols/oscar/oscar.c:3772
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: ../libgaim/protocols/oscar/oscar.c:3780
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Должность"
 
-#: ../libgaim/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: ../libgaim/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: ../libgaim/protocols/oscar/oscar.c:3866
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: ../libgaim/protocols/oscar/oscar.c:3906
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Следующий идентификатор пользователя соотнесён с %s"
 msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:3911
+msgstr[2] "Следующие идентификаторы пользователей соотнесены с %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Идентификатор пользователя"
 
-#: ../libgaim/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3960
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: ../libgaim/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: ../libgaim/protocols/oscar/oscar.c:3994
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10899,14 +6977,14 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: ../libgaim/protocols/oscar/oscar.c:3997
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как он недопустим."
 
-#: ../libgaim/protocols/oscar/oscar.c:4000
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10915,7 +6993,7 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: ../libgaim/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -10924,7 +7002,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
 "идентификатора пользователя уже есть ожидающий запрос."
 
-#: ../libgaim/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -10933,7 +7011,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
 "соотнесено слишком много идентификаторов пользователей."
 
-#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -10942,42 +7020,32 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
 "неверен."
 
-#: ../libgaim/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: ../libgaim/protocols/oscar/oscar.c:4022
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Сейчас ваш идентификатор пользователя отформатирован следующим образом:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4023
-#: ../libgaim/protocols/oscar/oscar.c:4030
-msgid "Account Info"
-msgstr "Информация об учётной записи"
-
-#: ../libgaim/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4203
+#: ../libpurple/protocols/oscar/oscar.c:4022
+msgid "Account Info"
+msgstr "Информация об учётной записи"
+
+#: ../libpurple/protocols/oscar/oscar.c:4193
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: ../libgaim/protocols/oscar/oscar.c:4455
+#: ../libpurple/protocols/oscar/oscar.c:4438
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4439
 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 "
@@ -10987,43 +7055,48 @@
 "входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
 "раз, когда будете полностью подключены."
 
-#: ../libgaim/protocols/oscar/oscar.c:4470
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4453
+#, 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.  Gaim has "
-"truncated it for you."
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
-"Максимальный размер профиля в %d байт был превышен. Gaim урезал его для вас."
+"Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
 msgstr[1] ""
-"Максимальный размер профиля в %d байт был превышен. Gaim урезал его для вас."
-
-#: ../libgaim/protocols/oscar/oscar.c:4475
+"Максимальный размер профиля в %d байта был превышен. Профиль был урезан."
+msgstr[2] ""
+"Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
+
+#: ../libpurple/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: ../libgaim/protocols/oscar/oscar.c:4519
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4503
+#, 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.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
-"Максимальный размер сообщения об отсутствии в %d байт был превышен. Gaim "
-"урезал его для вас."
+"Максимальный размер сообщения об отсутствии в %d байт был превышен. "
+"Сообщение об отсутствии было урезано."
 msgstr[1] ""
-"Максимальный размер сообщения об отсутствии в %d байт был превышен. Gaim "
-"урезал его для вас."
-
-#: ../libgaim/protocols/oscar/oscar.c:4524
+"Максимальный размер сообщения об отсутствии в %d байта был превышен. "
+"Сообщение об отсутствии было урезано."
+msgstr[2] ""
+"Максимальный размер сообщения об отсутствии в %d байт был превышен. "
+"Сообщение об отсутствии было урезано."
+
+#: ../libpurple/protocols/oscar/oscar.c:4508
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: ../libgaim/protocols/oscar/oscar.c:4593
+#: ../libpurple/protocols/oscar/oscar.c:4577
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -11031,36 +7104,35 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4595
-#: ../libgaim/protocols/oscar/oscar.c:5018
-#: ../libgaim/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: ../libgaim/protocols/oscar/oscar.c:4699
+#: ../libpurple/protocols/oscar/oscar.c:4683
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:4700
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim временно не удалось загрузить ваш список собеседников с серверов AIM. "
-"Список собеседников не потерян и, вероятно, станет доступен в течение "
-"нескольких часов."
-
-#: ../libgaim/protocols/oscar/oscar.c:4904
-#: ../libgaim/protocols/oscar/oscar.c:4905
-#: ../libgaim/protocols/oscar/oscar.c:4910
-#: ../libgaim/protocols/oscar/oscar.c:5086
-#: ../libgaim/protocols/oscar/oscar.c:5087
-#: ../libgaim/protocols/oscar/oscar.c:5092
+#: ../libpurple/protocols/oscar/oscar.c:4684
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr ""
+"Временно не удалось загрузить ваш список собеседников с серверов AIM. Список "
+"собеседников не потерян и, вероятно, станет доступен в течение нескольких "
+"часов."
+
+#: ../libpurple/protocols/oscar/oscar.c:4888
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4894
+#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5076
 msgid "Orphans"
 msgstr "Сироты"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5000
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -11069,12 +7141,12 @@
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
 "много собеседников. Удалите один и попытайтесь снова."
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
-#: ../libgaim/protocols/oscar/oscar.c:5030
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5014
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5030
+#: ../libpurple/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -11085,7 +7157,7 @@
 "причиной этого является то, что вы имеете максимальное количество допустимых "
 "собеседников в списке собеседников."
 
-#: ../libgaim/protocols/oscar/oscar.c:5123
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -11094,22 +7166,22 @@
 "Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
 "добавить его?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5194
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
-#: ../libgaim/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5195
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11120,48 +7192,53 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5199
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: ../libgaim/protocols/oscar/oscar.c:5248 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5235
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Обмен:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: ../libgaim/protocols/oscar/oscar.c:5358
+#: ../libpurple/protocols/oscar/oscar.c:5345
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:5530
-#: ../libgaim/protocols/oscar/oscar.c:5535
+#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "Away Message"
 msgstr "Сообщение об отсутствии"
 
-#: ../libgaim/protocols/oscar/oscar.c:5535
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(загрузка)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5848
+#: ../libpurple/protocols/oscar/oscar.c:5689
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5797
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5798
 msgid "Buddy Comment:"
 msgstr "Комментарий собеседника:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5895
+#: ../libpurple/protocols/oscar/oscar.c:5845
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Вы выбрали открытие прямого соединения с %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11169,69 +7246,65 @@
 "Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
 "Хотите продолжить?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5903
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "C_onnect"
 msgstr "_Установить соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Get AIM Info"
 msgstr "Получить информацию AIM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5944
+#: ../libpurple/protocols/oscar/oscar.c:5896
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-#: ../libgaim/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: ../libgaim/protocols/oscar/oscar.c:5965
+#: ../libpurple/protocols/oscar/oscar.c:5917
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Require authorization"
 msgstr "Требовать авторизацию"
 
-#: ../libgaim/protocols/oscar/oscar.c:6049
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "ICQ Privacy Options"
 msgstr "Параметры конфиденциальности ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:6071
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: ../libgaim/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/oscar/oscar.c:6026
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: ../libgaim/protocols/oscar/oscar.c:6079
-msgid "New screen name formatting:"
-msgstr "Новое форматирование идентификатора пользователя:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6135
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6128
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6129
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11239,660 +7312,679 @@
 "Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: ../libgaim/protocols/oscar/oscar.c:6201
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6202
+#: ../libpurple/protocols/oscar/oscar.c:6147
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать собеседника по адресу e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6203
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail собеседника, которого вы ищете."
 
-#: ../libgaim/protocols/oscar/oscar.c:6206
+#: ../libpurple/protocols/oscar/oscar.c:6151
 msgid "_Search"
 msgstr "_Искать"
 
-#: ../libgaim/protocols/oscar/oscar.c:6375
+#: ../libpurple/protocols/oscar/oscar.c:6309
 msgid "Set User Info (URL)..."
 msgstr "Установить пользовательскую информацию (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6320
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6390
+#: ../libpurple/protocols/oscar/oscar.c:6324
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6407
-msgid "Format Screen Name..."
-msgstr "Форматировать идентификатор пользователя..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6341
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: ../libgaim/protocols/oscar/oscar.c:6415
+#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Показать текущий зарегистрированный адрес e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Изменить текущий зарегистрированный адрес e-mail..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Искать собеседника по адресу e-mail..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6437
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6505
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6508
+#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Show how long you have been idle"
 msgstr "Показывать, как долго вы бездействовали"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6590
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Всегда использовать прокси-сервер ICQ для передачи файлов\n"
+"(медленнее, но не раскрывает ваш IP-адрес)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Попытка соединения с %s:%hu."
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "Попытка соединения через прокси-сервер."
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s только что запросил прямое соединение с %s"
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Установить соединение"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Номер QQ"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Страна/Регион"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Область/Штат"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Символ гороскопа"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Знак зодиака"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Группа крови"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Номер сотового телефона"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Номер телефона"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Водолей"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Рыбы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Овен"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Телец"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Близнецы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Рак"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Лев"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Дева"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Весы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Скорпион"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Стрелец"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Козерог"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Крыса"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Бык"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Тигр"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Кролик"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Дракон"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Змея"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Лошадь"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Коза"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Обезьяна"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Петух"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Собака"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Свинья"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Другое"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Изменить мою информацию"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Обновить мою информацию"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Ваша информация была обновлена"
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
-msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Вы отвергли запрос %d"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Введите причину:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Отвергнуть запрос"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Извините, вы не в моём вкусе..."
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Отвергнуть"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Введите запрос здесь"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Отправить"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Вы добавили %d в список собеседников"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "Ошибка QQid"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Неверный QQid"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID группы"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Создатель"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Описание группы"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "Введите внешний ID группы"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:124
-#: ../libgaim/protocols/qq/group_im.c:173
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Причина: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_im.c:175
-#: ../libgaim/protocols/qq/group_im.c:215
-#: ../libgaim/protocols/qq/group_im.c:250
-#: ../libgaim/protocols/qq/group_im.c:284
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:213
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:284
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "Эта группа была добавлена в список собеседников"
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Неизвестный статус"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Код [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:429
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Системное сообщение"
 
-#: ../libgaim/protocols/qq/im.c:573
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:573
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Не удаётся установить соединение."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Неизвестно-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "Адрес %s"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Уровень"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Доступен"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Отошёл"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Невидимый"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Не в сети"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Неверное имя"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Изменить мою информацию"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr ""
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -11903,273 +7995,275 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Соединение отвергнуто"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Ошибка сокета"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Не удаётся прочитать из сокета"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d отменил передачу %s"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "Соединение потеряно"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "Не удалось войти в сеть, нет ответа"
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Хотите добавить этого собеседника?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Вы были добавлены %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Хотите добавить его?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s добавил вас [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:194
+#, c-format
 msgid "User %s rejected your request"
 msgstr "Пользователь %s отверг ваш запрос"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:214
+#, c-format
 msgid "User %s has approved your request"
-msgstr "Удалённый пользователь отклонил ваш запрос."
-
-#: ../libgaim/protocols/qq/sys_msg.c:222
+msgstr "Пользователь %s удовлетворил ваш запрос"
+
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s хочет добавить вас [%s] в качестве друга"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s отсутствует в списке собеседников"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Хотите добавить его?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Соединение разорвано (запись)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Название группы:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Информация для группы %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Запуск служб"
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Соединение установлено"
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Сброс соединения"
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Ошибка при чтении из сокета: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Не удаётся соединиться с узлом"
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Объявление от %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Конференция закрыта"
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Не удаётся отправить сообщение: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Место закрыто"
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Микрофон"
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Колонки"
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Видеокамера"
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Передача файлов"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Поддерживается"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Внешний пользователь"
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Создать конференцию с пользователем"
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Новая конференция"
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Создать"
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Доступные конференции"
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Создать новую конференцию..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Пригласить пользователя в конференцию"
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12177,61 +8271,65 @@
 "this user to."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Пригласить в конференцию"
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Пригласить в конференцию..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+msgid "Topic:"
+msgstr "Тема:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Неизвестно (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Последний известный клиент"
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12241,26 +8339,26 @@
 "Выберите из списка ниже одного из них для добавления его в список "
 "собеседников."
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Выберите пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Не удаётся добавить пользователя: пользователь не найден"
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12269,63 +8367,63 @@
 "Ошибка чтения файла %s: \n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Сохраняемый удалённо список собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Режим хранения списка собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Только локальный список собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Объединить со списком с сервера"
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Объединить и сохранить список на сервере"
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Синхронизировать со списком с сервера"
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Импортировать список Sametime для учётной записи %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Экспортировать список Sametime для учётной записи %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "Не удаётся добавить группу: группа существует"
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Группа с именем '%s' уже присутствует в списке собеседников."
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Не удаётся добавить группу"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "Вероятные совпадения"
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12333,37 +8431,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Не удаётся добавить группу: группа не найдена"
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5475
 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Результаты поиска для '%s'"
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12374,106 +8472,117 @@
 "можете добавить этих пользователей в список собеседников или отправить им "
 "сообщения с помощью кнопок действия ниже."
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "Результаты поиска"
+
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "Нет совпадений"
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "Нет совпадений"
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "Искать пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "Поиск пользователей"
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "Поиск пользователей..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Пользователь %s не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Не удаётся выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Произошла ошибка во время согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Истекло время ожидания во время согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Согласование ключей было прервано"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Согласование ключей уже начато"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Согласование ключей не может быть начато с самим собой"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Удалённый пользователь больше не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -12482,7 +8591,7 @@
 "Получен запрос согласования ключей от %s. Хотите выполнить согласование "
 "ключей?"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12493,60 +8602,69 @@
 "Удалённый узел: %s\n"
 "Удалённый порт: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Запрос согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Получить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:549
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Не удаётся загрузить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Показать публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Не удалось загрузить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Пользовательская информация"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:714
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Не удаётся получить пользовательскую информацию"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Собеседник %s не проверен"
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -12556,16 +8674,16 @@
 "для получения публичного ключа."
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Собеседник %s не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -12573,15 +8691,15 @@
 "Чтобы добавить собеседника, вы должны импортировать его публичный ключ. "
 "Нажмите \"Импортировать...\" для импортирования публичного ключа."
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Импортировать..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Выберите корректного пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -12589,7 +8707,7 @@
 "Было найдено несколько пользователей с одинаковыми публичными ключами. "
 "Выберите из списка одного из них для добавления в список собеседников."
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -12597,213 +8715,238 @@
 "Было найдено несколько пользователей с одинаковыми именами. Выберите из "
 "списка одного из них для добавления в список собеседников."
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Независимый"
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Недомогающий"
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Разбудите меня"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Гиперактивный"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Робот"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Счастливый"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Печальный"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Рассерженный"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Ревнующий"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Стыдящийся"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Скучающий"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Возбуждённый"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Режимы пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Настроение"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Предпочитаемый контакт"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Предпочитаемый язык"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Устройство"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Географическое положение"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Получить публичный ключ..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1667
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Убить пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Парольная фраза:"
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Канал %s отсутствует в сети"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Информация о канале"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Не удаётся получить информацию о канале"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Имя канала:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Количество пользователей:</b> %d"
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Основатель канала::</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Шифр канала:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC канала:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Тема канала:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Режимы канала:</b> "
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Добавить публичный ключ канала"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Открыть публичный ключ..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Парольная фраза канала"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Список публичных ключей канала"
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12812,319 +8955,333 @@
 "able to join."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Аутентификация канала"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Добавить / Удалить"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Введите имя личной группы и парольную фразу канала %s."
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Добавить личную группу канала"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Предел количества пользователей"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Установить предел количества пользователей на канале. Установите в ноль для "
 "сброса предела количества пользователей."
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Список приглашённых"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Список изгнанных"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Добавить личную группу"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Сбросить перманентно"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Установить перманентно"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Установить предел количества пользователей"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Сбросить ограничение темы"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Установить ограничение темы"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Сбросить личный канал"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Установить личный канал"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Сбросить секретный канал"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Установить секретный канал"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Вы являетесь основателем канала на <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Присоединиться к личной группе"
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Не удаётся присоединиться к личной группе"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Вызвать команду"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Не удаётся вызвать команду"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Безопасная передача файлов"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Ошибка во время передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Сессия передачи файлов не существует"
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Нет активных сессий передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Передача файлов уже начата"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Не удалось выполнить согласование ключей для передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Не удалось начать передачу файлов"
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Не удаётся отправить файл"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s изменил тему <I>%s</I> на: %s"
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> установил режим канала <I>%s</I> в: %s"
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> снял все режимы канала <I>%s</I>"
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> установил режимы <I>%s</I> в: %s"
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> снял все режимы <I>%s</I>"
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Вы были удалены из <I>%s</I> оператором <I>%s</I> (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Вы были убиты оператором %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Убит оператором %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Отключиться от сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Персональная информация"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "День рождения"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Должность"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Организация"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Заметки"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Присоединиться к чату"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Настоящее имя"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Текст статуса"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Ещё..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Разорвать соединение с сервером"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "Не удаётся разорвать соединение"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Не удаётся установить тему"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Список комнат"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Не удаётся получить список комнат"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "Не было получено публичных ключей"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Информация о сервере"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Не удаётся получить информацию о сервере"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Статистика сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Не удаётся получить статистику сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "Нет доступной статистики сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13144,103 +9301,105 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "Статистика сети"
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "Не удалось убить пользователя"
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Ошибка во время соединения с сервером SILC"
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "Не удалось выполнить обмен ключами"
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
 "создания нового соединения."
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "Соединение разорвано сервером"
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Возобновление сессии"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Аутентификация соединения"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Проверка публичного ключа сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Требуется парольная фраза"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ошибка: Несоответствие версии, обновите своего клиента"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Ошибка: Неправильная подпись"
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Ошибка: Неверные данные"
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Ошибка: Аутентификация завершилась неудачно"
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13249,12 +9408,12 @@
 "Получен публичный ключ %s. Локальная копия не совпадает с этим ключом. Всё "
 "ещё хотите принять этот публичный ключ?"
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Получен публичный ключ %s. Хотите принять этот публичный ключ?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13263,65 +9422,73 @@
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Проверить публичный ключ"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Просмотреть..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Неподдерживаемый тип публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr "Не удаётся инициализировать соединение клиента SILC"
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr "Выполнение обмена ключами"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Не удаётся инициализировать протокол SILC"
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Соединение с сервером SILC"
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr "Не удаётся создать соединение"
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "Ваше текущее настроение"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+msgid "Normal"
+msgstr "Нормально"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "Влюблённый"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13329,224 +9496,230 @@
 "\n"
 "Предпочитаемые вами способы контакта"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "Видеоконференция"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "Ваш текущий статус"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "Сетевые службы"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr "Позволить другим видеть, какие службы вы используете"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr "Позволить другим видеть, какой компьютер вы используете"
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "Ваш файл VCard"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr "Атрибуты сетевого статуса пользователя"
 
-#: ../libgaim/protocols/silc/silc.c:745
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 "Вы можете позволить другим пользователям видеть информацию о вашем сетевом "
-"статусе и вашу персональную информацию. Введите информацию, которую вы "
-"хотели бы"
-
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+"статусе и вашу персональную информацию. Введите информацию о себе, которую "
+"вы хотели бы сделать доступной для просмотра другими пользователями."
+
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Сообщение дня"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Нет доступного сообщения дня"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Нет сообщения дня, соотнесённого с этим соединением"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Создать новую пару ключей SILC"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "Парольные фразы не совпадают"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Не удалось выполнить генерацию пары ключей"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Длина ключа"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Файл публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Файл личного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Парольная фраза (наберите ещё раз)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Сгенерировать пару ключей"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Сетевой статус"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "Просмотреть сообщение дня"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "Создать пару ключей SILC..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Пользователь <I>%s</I> не присутствует в сети"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Тема слишком велика"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Вы должны указать псевдоним"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "канал %s не найден"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "режимы канала для %s: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "нет установленных режимов канала на %s"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Не удалось установить режимы канала для %s"
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Неизвестная команда: %s, (возможно, ошибка Gaim)"
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1530
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Неизвестная команда: %s, (возможно, ошибка в клиенте)"
+
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [канал]:  Покинуть чат"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [канал]:  Покинуть чат"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;новая тема&gt;]:  Просмотреть или изменить тему"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;канал&gt; [&lt;пароль&gt;]:  Присоединиться к чату в этой сети"
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  Вывести список каналов в этой сети"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;псевдоним&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;псевдоним&gt; [&lt;сообщение&gt;]:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Просмотреть сообщение дня сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Прервать эту сессию"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером, сообщение необязательно"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;команда&gt;:  Вызвать любую команду клиента silc"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;псевдоним&gt; [-публичный ключ|&lt;причина&gt;]:  Убить пользователя"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -13554,57 +9727,57 @@
 "cumode &lt;канал&gt; +|-&lt;режимы&gt; &lt;псевдоним&gt;:  Изменить режимы "
 "пользователя на канале"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;режимы пользователя&gt;:  Установить свои режимы в сети"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;псевдоним&gt; [-публичный ключ]:  Получить привилегии оператора "
 "сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;канал&gt; &lt;псевдоним&gt; [комментарий]:  Удалить пользователя с "
 "канала"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [сервер]:  Просмотреть административные подробности о сервере"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;канал&gt; +|-&lt;псевдоним&gt;]:  Выгнать пользователя с канала"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;псевдоним|сервер&gt;:  Загрузить публичный ключ пользователя или "
 "сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Просмотреть статистику сервера и сети"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Послать PING серверу"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;канал&gt;:  Вывести список пользователей, присутствующих на канале"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13619,111 +9792,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "Модуль протокола SILC"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+msgid "Network"
+msgstr "Сеть"
+
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Файл публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Файл личного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Шифр"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Аутентификация публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Запретить просмотр другими пользователями"
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Блокировать приглашения"
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Блокировать сообщения без обмена ключами"
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Отвергать запросы атрибута сетевого статуса"
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Делать цифровую подпись и проверку всех сообщений"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
 #. 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)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Настоящее имя: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Имя пользователя: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Имя узла: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Организация: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Страна: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Алгоритм: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Длина ключа: \t%d бит\n"
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13731,79 +9909,80 @@
 "\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Информация о публичном ключе"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr "Видеоконференция"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Компьютер"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Терминал"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Не удалось записать"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1486
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Не удалось создать сокет для прослушивания"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
-msgstr "Не удалось определить адрес узла"
-
-#: ../libgaim/protocols/simple/simple.c:1630
+msgstr "Не удалось разрешить имя узла"
+
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
-msgstr "Не удалось определить адрес узла"
-
-#: ../libgaim/protocols/simple/simple.c:1647
+msgstr "Не удалось разрешить имя узла"
+
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Идентификаторы пользователей SIP не могут содержать пробелы или символы @"
@@ -13816,158 +9995,158 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "Использовать UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "Использовать прокси"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Поиск %s"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Не удалось установить соединение с %s"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Подключение: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Не удаётся записать файл %s."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Не удаётся прочитать файл %s."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Сообщение слишком велико, последние %s байт обрезаны."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s сейчас не в сети."
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Предупреждение %s не разрешено."
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Сообщение было отброшено, вы превышаете предел скорости сервера."
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Чат в %s недоступен."
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Вы отправляете сообщения к %s слишком часто."
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Вы не получили сообщение от %s, так как оно было слишком велико."
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Вы не получили сообщение от %s, так как оно отправлялось слишком часто."
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Ошибка."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Слишком много совпадений."
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Необходима большая точность."
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Служба каталогов временно недоступна."
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "Поиск e-mail запрещён."
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Ключевое слово проигнорировано."
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Нет ключевых слов."
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Пользователь не имеет информации каталога."
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Страна не поддерживается."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Неизвестная ошибка: %s."
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Неправильный идентификатор пользователя или пароль."
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Служба временно недоступна."
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Ваш уровень предупреждения сейчас слишком велик для входа."
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../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."
@@ -13975,90 +10154,80 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Произошла неизвестная ошибка подключения: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Произошла неизвестная ошибка %d. Информация: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Неверное имя группы"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Соединение разорвано"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Ожидание ответа..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Пароль изменён успешно"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Группа:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Получить информацию каталога"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Установить информацию каталога"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Не удалось открыть %s для записи!"
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Не удалось установить соединение для передачи."
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Не удалось записать заголовок файла. Файл не будет передан."
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Сохранить как..."
-
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Сохранить как..."
+
+#: ../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"
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../libgaim/protocols/toc/toc.c:2236
+msgstr[2] ""
+
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s запрашивает передачу файла ему"
@@ -14073,34 +10242,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:878
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (повторно) не разрешил добавить его в ваш список."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14108,182 +10277,175 @@
 msgstr ""
 "%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Аутентификация Yahoo! завершилась неудачно"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, 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 ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "Обычная аутентификация завершилась неудачно!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "Не дома"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "Не в офисе"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "Присутствие"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "Присоединиться в чате"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "Настройки присутствия"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "Активировать какой ID?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "К кому присоединиться в чате?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "Активировать ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
+msgid "You have just sent a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Вывести список комнат в сети Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -14297,161 +10459,161 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "Сервер пейджера"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "Сервер пейджера Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "Сервер передачи файлов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "Сервер передачи файлов Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "Языковой формат чата"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Сервер чата Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Порт чата Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Приглашение отвергнуто"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Не удалось присоединиться к чату"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Неизвестная комната"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Может быть, комната полна?"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Недоступен"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Вы разговариваете в %s."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Не удалось присоединиться к собеседнику в чате"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Может быть, он не в чате?"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr "Не удалось загрузить список комнат."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "Не удаётся загрузить список комнат."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "Комнаты пользователя"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Не удаётся установить дескриптор файла."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "Ошибка записи"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Профиль Yahoo! Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Профиль Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -14459,74 +10621,74 @@
 "Если вы хотите просмотреть этот профиль, вам придётся открыть эту ссылку в "
 "вашем браузере:"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Хобби"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Последние новости"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Домашняя страница"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Ссылка 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Ссылка 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Ссылка 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Последнее обновление"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Пользовательская информация для %s недоступна"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "Профиль пользователя пуст."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Проблема с соединением с сервером YCHT."
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -14535,7 +10697,7 @@
 "Соединение с сервером потеряно\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -14543,105 +10705,105 @@
 "(Произошла ошибка при преобразовании этого сообщения.\t Проверьте параметр "
 "\"Кодировка\" в редакторе учётных записей)"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Не удаётся отправить в чат %s,%s,%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "Пользователь"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "Скрыт или не в сети"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>В %s с %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "Любой"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr "_Класс:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "_Инстанция:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "_Получатель:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Попытка подписки к %s,%s,%s завершилась неудачно"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;псевдоним&gt;: Найти пользователя"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;псевдоним&gt;: Найти пользователя"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 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 ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "Подписаться повторно"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr "Загрузить подписки с сервера"
 
@@ -14655,45 +10817,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Модуль протокола Zephyr"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "Использовать tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "Команда tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "Экспортировать в .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "Экспортировать в .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "Импортировать из .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "Импортировать из .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr ""
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14702,66 +10864,66 @@
 "Не удаётся создать сокет:\n"
 "%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с HTTP-прокси %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Доступ запрещён: прокси-сервер HTTP запрещает туннелирование порта %d."
 
-#: ../libgaim/proxy.c:984
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:995
+#, c-format
 msgid "Error resolving %s"
-msgstr "Ошибка чтения %s"
-
-#: ../libgaim/proxy.c:1676
+msgstr "Ошибка разрешения имени %s"
+
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
-msgstr "Не удалось определить адрес узла"
+msgstr "Не удалось разрешить имя узла"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Нет"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Принять"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "сохранённые статусы"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s теперь известен как %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14770,73 +10932,73 @@
 "%s приглашает %s в чат %s:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s приглашает %s в чат %s\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:683
 msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Не установлен"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:157
 msgid "Unavailable"
 msgstr "Недоступен"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr ""
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s изменил статус с %s на %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:620
 #, c-format
 msgid "%s is now %s"
 msgstr "%s теперь %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:625
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s больше не %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1257
 #, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1274
 #, c-format
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1336
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s начал бездействовать"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1338
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s перестал бездействовать"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "Ошибка чтения %s"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -14845,79 +11007,4230 @@
 "Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
 "переименован в %s~."
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2970
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2973
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунда"
-msgstr[1] "%d секунд"
-
-#: ../libgaim/util.c:2939
+msgstr[1] "%d секунды"
+msgstr[2] "%d секунд"
+
+#: ../libpurple/util.c:3011
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d день"
-msgstr[1] "%d дней"
-
-#: ../libgaim/util.c:2947
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
+
+#: ../libpurple/util.c:3019
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d час"
-msgstr[1] "%s, %d часов"
-
-#: ../libgaim/util.c:2953
+msgstr[1] "%s, %d часа"
+msgstr[2] "%s, %d часов"
+
+#: ../libpurple/util.c:3025
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
-msgstr[1] "%d часов"
-
-#: ../libgaim/util.c:2961
+msgstr[1] "%d часа"
+msgstr[2] "%d часов"
+
+#: ../libpurple/util.c:3033
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d минута"
-msgstr[1] "%s, %d минут"
-
-#: ../libgaim/util.c:2967
+msgstr[1] "%s, %d минуты"
+msgstr[2] "%s, %d минут"
+
+#: ../libpurple/util.c:3039
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
-msgstr[1] "%d минут"
-
-#: ../libgaim/util.c:3171 ../libgaim/util.c:3469
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
+
+#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Не удаётся соединиться с %s"
 
-#: ../libgaim/util.c:3297
+#: ../libpurple/util.c:3431
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libgaim/util.c:3332
+#: ../libpurple/util.c:3466
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Ошибка чтения из %s: %s"
 
-#: ../libgaim/util.c:3363
+#: ../libpurple/util.c:3497
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Ошибка записи в %s: %s"
 
-#: ../libgaim/util.c:3388
+#: ../libpurple/util.c:3522
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Не удаётся соединиться с %s: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Клиент обмена мгновенными сообщениями"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Клиент обмена мгновенными сообщениями Pidgin"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Обмен мгновенными сообщениями с использованием множества протоколов"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Ориентация"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Ориентация лотка."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:398
+msgid "Login Options"
+msgstr "Параметры входа"
+
+#: ../pidgin/gtkaccount.c:500
+msgid "Local alias:"
+msgstr "Локальный псевдоним:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:562
+msgid "User Options"
+msgstr "Параметры пользователя"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:580
+msgid "Use this buddy icon for this account:"
+msgstr "Использовать этот значок собеседника для этой учётной записи:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:700
+#, c-format
+msgid "%s Options"
+msgstr "Параметры %s"
+
+#: ../pidgin/gtkaccount.c:897
+msgid "Use GNOME Proxy Settings"
+msgstr "Использовать настройки прокси GNOME"
+
+#: ../pidgin/gtkaccount.c:898
+msgid "Use Global Proxy Settings"
+msgstr "Использовать глобальные настройки прокси"
+
+#: ../pidgin/gtkaccount.c:904
+msgid "No Proxy"
+msgstr "Нет прокси"
+
+#: ../pidgin/gtkaccount.c:910
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:916
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:922
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Использовать настройки окружения"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:967
+msgid "If you look real closely"
+msgstr "Если приглядитесь"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:970
+msgid "you can see the butterflies mating"
+msgstr "вы можете увидеть спаривающихся бабочек"
+
+#: ../pidgin/gtkaccount.c:991
+msgid "Proxy Options"
+msgstr "Параметры прокси"
+
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "_Тип прокси:"
+
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Узел:"
+
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "П_орт:"
+
+#: ../pidgin/gtkaccount.c:1026
+msgid "_Username:"
+msgstr "_Имя пользователя:"
+
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "Па_роль:"
+
+#: ../pidgin/gtkaccount.c:1439
+msgid "Add Account"
+msgstr "Добавить учётную запись"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Basic"
+msgstr "_Основные"
+
+#: ../pidgin/gtkaccount.c:1474
+msgid "_Advanced"
+msgstr "_Дополнительные"
+
+#: ../pidgin/gtkaccount.c:1946 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../pidgin/gtkaccount.c:1974
+msgid "Protocol"
+msgstr "Протокол"
+
+#: ../pidgin/gtkaccount.c:2168
+#, 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"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Добро пожаловать в %s!</span>\n"
+"\n"
+"У вас нет ни одной учётной записи. Чтобы начать использование %s, нажмите "
+"кнопку <b>Добавить</b> и добавьте вашу первую учётную запись. Если вы хотите "
+"использовать %s с несколькими учётными записями, нажмите <b>Добавить</b> ещё "
+"раз для каждой из них.\n"
+"\n"
+"Вы можете вернуться к этому окну для добавления, изменения или удаления "
+"учётных записей позже через меню <b>Учётные записи->Добавить/Изменить</b> "
+"окна списка собеседников."
+
+#: ../pidgin/gtkblist.c:722
+msgid "Join a Chat"
+msgstr "Присоединиться к чату"
+
+#: ../pidgin/gtkblist.c:743
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Введите соответствующую информацию о чате, к которому вы хотели бы "
+"присоединиться.\n"
+
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "У_чётная запись:"
+
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+msgid "_Block"
+msgstr "_Блокировать"
+
+#: ../pidgin/gtkblist.c:1028
+msgid "Un_block"
+msgstr "Раз_блокировать"
+
+#: ../pidgin/gtkblist.c:1079
+msgid "Get _Info"
+msgstr "_Информация"
+
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
+msgid "I_M"
+msgstr "Мгновенное сооб_щение"
+
+#: ../pidgin/gtkblist.c:1088
+msgid "_Send File"
+msgstr "Отправить _файл"
+
+#: ../pidgin/gtkblist.c:1095
+msgid "Add Buddy _Pounce"
+msgstr "Добавить п_равило"
+
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+msgid "View _Log"
+msgstr "Просмотреть _журнал"
+
+#: ../pidgin/gtkblist.c:1115
+msgid "Alias..."
+msgstr "Псевдоним..."
+
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1234
+msgid "_Alias..."
+msgstr "_Псевдоним..."
+
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1236
+msgid "_Remove"
+msgstr "_Удалить"
+
+#: ../pidgin/gtkblist.c:1175
+msgid "Add a _Buddy"
+msgstr "Добавить _собеседника"
+
+#: ../pidgin/gtkblist.c:1178
+msgid "Add a C_hat"
+msgstr "Добавить _чат"
+
+#: ../pidgin/gtkblist.c:1181
+msgid "_Delete Group"
+msgstr "_Удалить группу"
+
+#: ../pidgin/gtkblist.c:1183
+msgid "_Rename"
+msgstr "Пере_именовать"
+
+#. join button
+#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+msgid "_Join"
+msgstr "П_рисоединиться"
+
+#: ../pidgin/gtkblist.c:1203
+msgid "Auto-Join"
+msgstr "Присоединяться автоматически"
+
+#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+msgid "_Collapse"
+msgstr "_Свернуть"
+
+#: ../pidgin/gtkblist.c:1269
+msgid "_Expand"
+msgstr "Р_азвернуть"
+
+#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:4490 ../pidgin/gtkblist.c:4500
+msgid "/Tools/Mute Sounds"
+msgstr "/Инструменты/Отключить звуки"
+
+#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2815
+msgid "/_Buddies"
+msgstr "/_Собеседники"
+
+#: ../pidgin/gtkblist.c:2816
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Собеседники/Новое мгновенное сооб_щение..."
+
+#: ../pidgin/gtkblist.c:2817
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Собеседники/Присоединиться к _чату..."
+
+#: ../pidgin/gtkblist.c:2818
+msgid "/Buddies/Get User _Info..."
+msgstr "/Собеседники/Получить пользовательскую _информацию..."
+
+#: ../pidgin/gtkblist.c:2819
+msgid "/Buddies/View User _Log..."
+msgstr "/Собеседники/Просмотреть _журнал пользователя..."
+
+#: ../pidgin/gtkblist.c:2821
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Собеседники/Показывать собеседников _не в сети"
+
+#: ../pidgin/gtkblist.c:2822
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Собеседники/Показывать п_устые группы"
+
+#: ../pidgin/gtkblist.c:2823
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Собеседники/Показывать _подробности о собеседнике"
+
+#: ../pidgin/gtkblist.c:2824
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Собеседники/Показывать _время бездействия"
+
+#: ../pidgin/gtkblist.c:2825
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Собеседники/_Сортировать собеседников"
+
+#: ../pidgin/gtkblist.c:2827
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Собеседники/_Добавить собеседника..."
+
+#: ../pidgin/gtkblist.c:2828
+msgid "/Buddies/Add C_hat..."
+msgstr "/Собеседники/Добавить ч_ат..."
+
+#: ../pidgin/gtkblist.c:2829
+msgid "/Buddies/Add _Group..."
+msgstr "/Собеседники/Добавить _группу..."
+
+#: ../pidgin/gtkblist.c:2831
+msgid "/Buddies/_Quit"
+msgstr "/Собеседники/В_ыйти"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2834
+msgid "/_Accounts"
+msgstr "/_Учётные записи"
+
+#: ../pidgin/gtkblist.c:2835 ../pidgin/gtkblist.c:6413
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Учётные записи/Добавить\\/Изменить"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2838
+msgid "/_Tools"
+msgstr "/_Инструменты"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Инструменты/_Слежение за собеседниками"
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Tools/Plu_gins"
+msgstr "/Инструменты/_Модули"
+
+#: ../pidgin/gtkblist.c:2841
+msgid "/Tools/Pr_eferences"
+msgstr "/Инструменты/_Настройки"
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Tools/Pr_ivacy"
+msgstr "/Инструменты/К_онфиденциальность"
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Tools/_File Transfers"
+msgstr "/Инструменты/Передача _файлов"
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Tools/R_oom List"
+msgstr "/Инструменты/Список _комнат"
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Tools/System _Log"
+msgstr "/Инструменты/Системный _журнал"
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Tools/Mute _Sounds"
+msgstr "/Инструменты/Отключить _звуки"
+
+#. Help
+#: ../pidgin/gtkblist.c:2851
+msgid "/_Help"
+msgstr "/_Помощь"
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Help/Online _Help"
+msgstr "/Помощь/Помощь в _сети"
+
+#: ../pidgin/gtkblist.c:2853
+msgid "/Help/_Debug Window"
+msgstr "/Помощь/Окно _отладки"
+
+#: ../pidgin/gtkblist.c:2854
+msgid "/Help/_About"
+msgstr "/Помощь/О _программе"
+
+#: ../pidgin/gtkblist.c:2882
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Учётная запись:</b> %s"
+
+#: ../pidgin/gtkblist.c:2960
+msgid "Buddy Alias"
+msgstr "Псевдоним собеседника"
+
+#: ../pidgin/gtkblist.c:2981
+msgid "Logged In"
+msgstr "В сети"
+
+#: ../pidgin/gtkblist.c:3027
+msgid "Last Seen"
+msgstr "Последнее появление"
+
+#: ../pidgin/gtkblist.c:3047
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3049
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3051
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3376
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Бездействует %dч %02dм"
+
+#: ../pidgin/gtkblist.c:3378
+#, c-format
+msgid "Idle %dm"
+msgstr "Бездействует %dм"
+
+#: ../pidgin/gtkblist.c:3515
+msgid "/Buddies/New Instant Message..."
+msgstr "/Собеседники/Новое мгновенное сообщение..."
+
+#: ../pidgin/gtkblist.c:3516 ../pidgin/gtkblist.c:3549
+msgid "/Buddies/Join a Chat..."
+msgstr "/Собеседники/Присоединиться к чату..."
+
+#: ../pidgin/gtkblist.c:3517
+msgid "/Buddies/Get User Info..."
+msgstr "/Собеседники/Получить пользовательскую информацию..."
+
+#: ../pidgin/gtkblist.c:3518
+msgid "/Buddies/Add Buddy..."
+msgstr "/Собеседники/Добавить собеседника..."
+
+#: ../pidgin/gtkblist.c:3519 ../pidgin/gtkblist.c:3552
+msgid "/Buddies/Add Chat..."
+msgstr "/Собеседники/Добавить чат..."
+
+#: ../pidgin/gtkblist.c:3520
+msgid "/Buddies/Add Group..."
+msgstr "/Собеседники/Добавить группу..."
+
+#: ../pidgin/gtkblist.c:3555
+msgid "/Tools/Privacy"
+msgstr "/Инструменты/Конфиденциальность"
+
+#: ../pidgin/gtkblist.c:3558
+msgid "/Tools/Room List"
+msgstr "/Инструменты/Список комнат"
+
+#: ../pidgin/gtkblist.c:3655 ../pidgin/gtkdocklet.c:156
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d непрочитанное сообщение от %s\n"
+msgstr[1] "%d непрочитанных сообщения от %s\n"
+msgstr[2] "%d непрочитанных сообщений от %s\n"
+
+#: ../pidgin/gtkblist.c:3732
+msgid "Manually"
+msgstr "Вручную"
+
+#: ../pidgin/gtkblist.c:3734
+msgid "Alphabetically"
+msgstr "По алфавиту"
+
+#: ../pidgin/gtkblist.c:3735
+msgid "By status"
+msgstr "По статусу"
+
+#: ../pidgin/gtkblist.c:3736
+msgid "By log size"
+msgstr "По размеру журнала"
+
+#: ../pidgin/gtkblist.c:3938 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "Соединение с %s разорвано"
+
+#: ../pidgin/gtkblist.c:3948
+msgid "Re-enable Account"
+msgstr "Повторно включить учётную запись"
+
+#: ../pidgin/gtkblist.c:3969
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
+
+#: ../pidgin/gtkblist.c:4122
+msgid "<b>Username:</b>"
+msgstr "<b>Имя пользователя:</b>"
+
+#: ../pidgin/gtkblist.c:4129
+msgid "<b>Password:</b>"
+msgstr "<b>Пароль:</b>"
+
+#: ../pidgin/gtkblist.c:4140
+msgid "_Login"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4225
+msgid "/Accounts"
+msgstr "/Учётные записи"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4239
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Добро пожаловать в %s!</span>\n"
+"\n"
+"Не включено ни одной учётной записи. Включите ваши учётные записи из окна "
+"<b>Учётные записи</b>, доступного через меню <b>Учётные записи->Добавить/"
+"Изменить</b>. Сделав это, вы сможете войти в сеть, установить свой статус и "
+"начать общение с друзьями."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4484
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Собеседники/Показывать собеседников не в сети"
+
+#: ../pidgin/gtkblist.c:4487
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Собеседники/Показывать пустые группы"
+
+#: ../pidgin/gtkblist.c:4493
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Собеседники/Показывать подробности о собеседнике"
+
+#: ../pidgin/gtkblist.c:4496
+msgid "/Buddies/Show Idle Times"
+msgstr "/Собеседники/Показывать время бездействия"
+
+#: ../pidgin/gtkblist.c:5334
+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 ""
+"Введите идентификатор пользователя персоны, которую вы хотели бы добавить в "
+"список собеседников. Вы можете ввести необязательный псевдоним для этого "
+"собеседника. Псевдоним будет показываться вместо идентификатора "
+"пользователя, когда это возможно.\n"
+
+#: ../pidgin/gtkblist.c:5394 ../pidgin/gtkblist.c:5755
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Группа:"
+
+#: ../pidgin/gtkblist.c:5653
+msgid "This protocol does not support chat rooms."
+msgstr "Этот протокол не поддерживает чаты."
+
+#: ../pidgin/gtkblist.c:5669
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
+
+#: ../pidgin/gtkblist.c:5710
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
+"добавить в список собеседников.\n"
+
+#: ../pidgin/gtkblist.c:5793
+msgid "Please enter the name of the group to be added."
+msgstr "Введите имя добавляемой группы."
+
+#: ../pidgin/gtkblist.c:6433
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6457
+msgid "_Edit Account"
+msgstr "_Изменить учётную запись"
+
+#: ../pidgin/gtkblist.c:6470 ../pidgin/gtkconv.c:2900
+msgid "No actions available"
+msgstr "Нет доступных действий"
+
+#: ../pidgin/gtkblist.c:6478
+msgid "_Disable"
+msgstr "_Выключить"
+
+#: ../pidgin/gtkblist.c:6490
+msgid "Enable Account"
+msgstr "Включить учётную запись"
+
+#: ../pidgin/gtkblist.c:6496
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6545
+msgid "/Tools"
+msgstr "/Инструменты"
+
+#: ../pidgin/gtkblist.c:6615
+msgid "/Buddies/Sort Buddies"
+msgstr "/Собеседники/Сортировать собеседников"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:802
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "Пригласить собеседника в чат"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Введите имя пользователя, которого вы хотите пригласить, вместе с "
+"необязательным текстом приглашения."
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "_Собеседник:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
+msgid "_Message:"
+msgstr "Сооб_щение:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Не удаётся открыть файл."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Беседа с %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Сохранить беседу"
+
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+msgid "Find"
+msgstr "Найти"
+
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Искать:"
+
+#: ../pidgin/gtkconv.c:1340
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
+
+#: ../pidgin/gtkconv.c:1348
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
+"записаны."
+
+#: ../pidgin/gtkconv.c:1596
+msgid "Un-Ignore"
+msgstr "Не игнорировать"
+
+#: ../pidgin/gtkconv.c:1599
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: ../pidgin/gtkconv.c:1619
+msgid "Get Away Message"
+msgstr "Получить сообщение об отсутствии"
+
+#: ../pidgin/gtkconv.c:1642
+msgid "Last said"
+msgstr "Последнее сказанное"
+
+#: ../pidgin/gtkconv.c:2484
+msgid "Unable to save icon file to disk."
+msgstr "Не удаётся сохранить файл значка на диск."
+
+#: ../pidgin/gtkconv.c:2535
+msgid "Save Icon"
+msgstr "Сохранить значок"
+
+#: ../pidgin/gtkconv.c:2587
+msgid "Animate"
+msgstr "Анимировать"
+
+#: ../pidgin/gtkconv.c:2592
+msgid "Hide Icon"
+msgstr "Скрыть значок"
+
+#: ../pidgin/gtkconv.c:2595
+msgid "Save Icon As..."
+msgstr "Сохранить значок как..."
+
+#: ../pidgin/gtkconv.c:2599
+msgid "Set Custom Icon..."
+msgstr "Установить собственный значок..."
+
+#: ../pidgin/gtkconv.c:2612
+msgid "Remove Custom Icon"
+msgstr "Удалить собственный значок"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2754
+msgid "/_Conversation"
+msgstr "/_Беседа"
+
+#: ../pidgin/gtkconv.c:2756
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Беседа/Новое мгновенное сооб_щение..."
+
+#: ../pidgin/gtkconv.c:2761
+msgid "/Conversation/_Find..."
+msgstr "/Беседа/_Найти..."
+
+#: ../pidgin/gtkconv.c:2763
+msgid "/Conversation/View _Log"
+msgstr "/Беседа/Просмотреть _журнал"
+
+#: ../pidgin/gtkconv.c:2764
+msgid "/Conversation/_Save As..."
+msgstr "/Беседа/Со_хранить как..."
+
+#: ../pidgin/gtkconv.c:2766
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Беседа/О_чистить"
+
+#: ../pidgin/gtkconv.c:2770
+msgid "/Conversation/Se_nd File..."
+msgstr "/Беседа/Отправить _файл..."
+
+#: ../pidgin/gtkconv.c:2771
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Беседа/Добавить п_равило..."
+
+#: ../pidgin/gtkconv.c:2773
+msgid "/Conversation/_Get Info"
+msgstr "/Беседа/Получить _информацию"
+
+#: ../pidgin/gtkconv.c:2775
+msgid "/Conversation/In_vite..."
+msgstr "/Беседа/Приг_ласить..."
+
+#: ../pidgin/gtkconv.c:2777
+msgid "/Conversation/M_ore"
+msgstr "/Беседа/_Ещё"
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/Al_ias..."
+msgstr "/Беседа/_Псевдоним..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/_Block..."
+msgstr "/Беседа/_Блокировать..."
+
+#: ../pidgin/gtkconv.c:2785
+msgid "/Conversation/_Unblock..."
+msgstr "/Беседа/Раз_блокировать..."
+
+#: ../pidgin/gtkconv.c:2787
+msgid "/Conversation/_Add..."
+msgstr "/Беседа/_Добавить..."
+
+#: ../pidgin/gtkconv.c:2789
+msgid "/Conversation/_Remove..."
+msgstr "/Беседа/_Удалить..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Close"
+msgstr "/Беседа/_Закрыть"
+
+#. Options
+#: ../pidgin/gtkconv.c:2798
+msgid "/_Options"
+msgstr "/_Параметры"
+
+#: ../pidgin/gtkconv.c:2799
+msgid "/Options/Enable _Logging"
+msgstr "/Параметры/Вести _журнал"
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Options/Enable _Sounds"
+msgstr "/Параметры/Воспроизводить _звуки"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Параметры/Показывать з_начок собеседника"
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Параметры/Показывать _панели форматирования"
+
+#: ../pidgin/gtkconv.c:2804
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Параметры/Показывать _время сообщений"
+
+#: ../pidgin/gtkconv.c:2879
+msgid "/Conversation/More"
+msgstr "/Беседа/Ещё"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+msgid "/Conversation"
+msgstr "/Беседа"
+
+#: ../pidgin/gtkconv.c:2964
+msgid "/Conversation/View Log"
+msgstr "/Беседа/Просмотреть журнал"
+
+#: ../pidgin/gtkconv.c:2970
+msgid "/Conversation/Send File..."
+msgstr "/Беседа/Отправить файл..."
+
+#: ../pidgin/gtkconv.c:2974
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Беседа/Добавить правило..."
+
+#: ../pidgin/gtkconv.c:2980
+msgid "/Conversation/Get Info"
+msgstr "/Беседа/Получить информацию"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/Invite..."
+msgstr "/Беседа/Пригласить..."
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Alias..."
+msgstr "/Беседа/Псевдоним..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Block..."
+msgstr "/Беседа/Блокировать..."
+
+#: ../pidgin/gtkconv.c:2998
+msgid "/Conversation/Unblock..."
+msgstr "/Беседа/Разблокировать..."
+
+#: ../pidgin/gtkconv.c:3002
+msgid "/Conversation/Add..."
+msgstr "/Беседа/Добавить..."
+
+#: ../pidgin/gtkconv.c:3006
+msgid "/Conversation/Remove..."
+msgstr "/Беседа/Удалить..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Options/Enable Logging"
+msgstr "/Параметры/Вести журнал"
+
+#: ../pidgin/gtkconv.c:3013
+msgid "/Options/Enable Sounds"
+msgstr "/Параметры/Воспроизводить звуки"
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Параметры/Показывать панели форматирования"
+
+#: ../pidgin/gtkconv.c:3029
+msgid "/Options/Show Timestamps"
+msgstr "/Параметры/Показывать время сообщений"
+
+#: ../pidgin/gtkconv.c:3032
+msgid "/Options/Show Buddy Icon"
+msgstr "/Параметры/Показывать значок собеседника"
+
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+msgid "User is typing..."
+msgstr "Пользователь набирает сообщение..."
+
+#: ../pidgin/gtkconv.c:3159
+msgid "User has typed something and stopped"
+msgstr "Пользователь что-то набрал и остановился"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3341
+msgid "_Send To"
+msgstr "_Адресат"
+
+#: ../pidgin/gtkconv.c:4049
+msgid "_Send"
+msgstr "_Отправить"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4197
+msgid "0 people in room"
+msgstr "0 пользователей в комнате"
+
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d пользователь в комнате"
+msgstr[1] "%d пользователя в комнате"
+msgstr[2] "%d пользователей в комнате"
+
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+msgid "Typing"
+msgstr "Набирает сообщение"
+
+#: ../pidgin/gtkconv.c:6054
+msgid "Stopped Typing"
+msgstr "Прекратил набор сообщения"
+
+#: ../pidgin/gtkconv.c:6059
+msgid "Nick Said"
+msgstr "Произнесено имя"
+
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+msgid "Unread Messages"
+msgstr "Непрочитанные сообщения"
+
+#: ../pidgin/gtkconv.c:6069
+msgid "New Event"
+msgstr "Новое событие"
+
+#: ../pidgin/gtkconv.c:7196
+msgid "Confirm close"
+msgstr "Подтвердить закрытие"
+
+#: ../pidgin/gtkconv.c:7228
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
+
+#: ../pidgin/gtkconv.c:7763
+msgid "Close other tabs"
+msgstr "Закрыть другие вкладки"
+
+#: ../pidgin/gtkconv.c:7769
+msgid "Close all tabs"
+msgstr "Закрыть все вкладки"
+
+#: ../pidgin/gtkconv.c:7777
+msgid "Detach this tab"
+msgstr "Отделить эту вкладку"
+
+#: ../pidgin/gtkconv.c:7783
+msgid "Close this tab"
+msgstr "Закрыть эту вкладку"
+
+#: ../pidgin/gtkconv.c:8086
+msgid "Close conversation"
+msgstr "Закрыть беседу"
+
+#: ../pidgin/gtkconv.c:8550
+msgid "Last created window"
+msgstr "Последнее созданное окно"
+
+#: ../pidgin/gtkconv.c:8552
+msgid "Separate IM and Chat windows"
+msgstr "Отдельные окна мгновенных сообщений и чатов"
+
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Новое окно"
+
+#: ../pidgin/gtkconv.c:8556
+msgid "By group"
+msgstr "По группе"
+
+#: ../pidgin/gtkconv.c:8558
+msgid "By account"
+msgstr "По учётной записи"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Сохранить отладочную информацию в журнал"
+
+#: ../pidgin/gtkdebug.c:596
+msgid "Invert"
+msgstr "Инвертировать"
+
+#: ../pidgin/gtkdebug.c:599
+msgid "Highlight matches"
+msgstr "Подсветить совпадения"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Icon Only"
+msgstr "Только _значки"
+
+#: ../pidgin/gtkdebug.c:667
+msgid "_Text Only"
+msgstr "Только _текст"
+
+#: ../pidgin/gtkdebug.c:668
+msgid "_Both Icon & Text"
+msgstr "Значки _и текст"
+
+#: ../pidgin/gtkdebug.c:804
+msgid "Filter"
+msgstr "Фильтр"
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Right click for more options."
+msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
+
+#: ../pidgin/gtkdebug.c:853
+msgid "Level "
+msgstr "Уровень "
+
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:862
+msgid "All"
+msgstr "Все"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Misc"
+msgstr "Разное"
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: ../pidgin/gtkdebug.c:866
+msgid "Error "
+msgstr "Ошибка "
+
+#: ../pidgin/gtkdebug.c:867
+msgid "Fatal Error"
+msgstr "Неисправимая ошибка"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "ведущий разработчик"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+msgid "developer"
+msgstr "разработчик"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "разработчик и веб-мастер"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support"
+msgstr "поддержка"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support/QA"
+msgstr "поддержка и контроль качества"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "порт win32"
+
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "сопровождающий"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "сопровождающий libfaim"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "Jabber developer"
+msgstr "Jabber-разработчик"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "оригинальный автор"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "Арабский"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "Болгарский"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr "Бенгальский"
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "Боснийский"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+msgid "Catalan"
+msgstr "Каталанский"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "Валенсийский-каталанский"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+msgid "Czech"
+msgstr "Чешский"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "Датский"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "Немецкий"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr "Дзонг-кэ"
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "Греческий"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Австралийский английский"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Канадский английский"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Британский английский"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Spanish"
+msgstr "Испанский"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr "Баскский"
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "Персидский"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "Finnish"
+msgstr "Финский"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "French"
+msgstr "Французский"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Galician"
+msgstr "Галисийский"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+msgid "Gujarati"
+msgstr "Гуджарати"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+msgid "Hebrew"
+msgstr "Иврит"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "Хинди"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "Венгерский"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Indonesian"
+msgstr "Индонезийский"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Italian"
+msgstr "Итальянский"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+msgid "Japanese"
+msgstr "Японский"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+msgid "Georgian"
+msgstr "Грузинский"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+msgid "Korean"
+msgstr "Корейский"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+msgid "Kurdish"
+msgstr "Курдский"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Lithuanian"
+msgstr "Литовский"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "Македонский"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "Букмол"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "Непальский"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Dutch, Flemish"
+msgstr "Нидерландский, фламандский"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Norwegian"
+msgstr "Норвежский"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+msgid "Polish"
+msgstr "Польский"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "Португальский-бразильский"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "Пашто"
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Romanian"
+msgstr "Румынский"
+
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Russian"
+msgstr "Русский"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Slovak"
+msgstr "Словацкий"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+msgid "Slovenian"
+msgstr "Словенский"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Albanian"
+msgstr "Албанский"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+msgid "Serbian"
+msgstr "Сербский"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+msgid "Swedish"
+msgstr "Шведский"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "Тамильский"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "Тайский"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Турецкий"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Вьетнамский"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh и команда Gnome-Vi"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+msgid "Simplified Chinese"
+msgstr "Упрощённый китайский"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Гонконгский китайский"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
+msgid "Traditional Chinese"
+msgstr "Традиционный китайский"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Amharic"
+msgstr "Амхарский"
+
+#: ../pidgin/gtkdialogs.c:327
+#, c-format
+msgid "About %s"
+msgstr "О %s"
+
+#: ../pidgin/gtkdialogs.c:363
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"%s - модульный клиент обмена сообщениями, позволяющий использовать AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно.  Написан с "
+"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
+"условиям GPL (версии 2 или более поздней).  Копия GPL содержится в файле "
+"'COPYING', распространяемом с %s.  Авторские права на %s принадлежат "
+"участникам проекта.  Полный список участников проекта смотрите в файле "
+"'COPYRIGHT'.  Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:378
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 на irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
+msgid "Current Developers"
+msgstr "Текущие разработчики"
+
+#: ../pidgin/gtkdialogs.c:402
+msgid "Crazy Patch Writers"
+msgstr "Одержимые писатели заплаток"
+
+#: ../pidgin/gtkdialogs.c:417
+msgid "Retired Developers"
+msgstr "Разработчики, отошедшие от дел"
+
+#: ../pidgin/gtkdialogs.c:432
+msgid "Artists"
+msgstr "Художники"
+
+#: ../pidgin/gtkdialogs.c:447
+msgid "Current Translators"
+msgstr "Текущие переводчики"
+
+#: ../pidgin/gtkdialogs.c:467
+msgid "Past Translators"
+msgstr "Предыдущие переводчики"
+
+#: ../pidgin/gtkdialogs.c:485
+msgid "Debugging Information"
+msgstr "Отладочная информация"
+
+#: ../pidgin/gtkdialogs.c:854
+msgid "Get User Info"
+msgstr "Получить пользовательскую информацию"
+
+#: ../pidgin/gtkdialogs.c:856
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, информацию о "
+"которой вы хотели бы просмотреть."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Просмотреть журнал пользователя"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
+"хотели бы просмотреть."
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Alias Contact"
+msgstr "Псевдоним контакта"
+
+#: ../pidgin/gtkdialogs.c:969
+msgid "Enter an alias for this contact."
+msgstr "Введите псевдоним для этого контакта."
+
+#: ../pidgin/gtkdialogs.c:991
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Введите псевдоним для %s."
+
+#: ../pidgin/gtkdialogs.c:993
+msgid "Alias Buddy"
+msgstr "Псевдоним собеседника"
+
+#: ../pidgin/gtkdialogs.c:1014
+msgid "Alias Chat"
+msgstr "Псевдоним чата"
+
+#: ../pidgin/gtkdialogs.c:1015
+msgid "Enter an alias for this chat."
+msgstr "Введите псевдоним для этого чата."
+
+#: ../pidgin/gtkdialogs.c:1054
+#, 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 и %d другого собеседника из списка "
+"собеседников. Хотите продолжить?"
+msgstr[1] ""
+"Вы удалите контакт, содержащий %s и %d других собеседника из списка "
+"собеседников. Хотите продолжить?"
+msgstr[2] ""
+"Вы удалите контакт, содержащий %s и %d других собеседников из списка "
+"собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1062
+msgid "Remove Contact"
+msgstr "Удалить контакт"
+
+#: ../pidgin/gtkdialogs.c:1065
+msgid "_Remove Contact"
+msgstr "_Удалить контакт"
+
+#: ../pidgin/gtkdialogs.c:1096
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1103
+msgid "Merge Groups"
+msgstr "Объединить группы"
+
+#: ../pidgin/gtkdialogs.c:1106
+msgid "_Merge Groups"
+msgstr "_Объединить группы"
+
+#: ../pidgin/gtkdialogs.c:1156
+#, 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 и всех её членов из списка собеседников. Хотите "
+"продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1159
+msgid "Remove Group"
+msgstr "Удалить группу"
+
+#: ../pidgin/gtkdialogs.c:1162
+msgid "_Remove Group"
+msgstr "_Удалить группу"
+
+#: ../pidgin/gtkdialogs.c:1195
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1198
+msgid "Remove Buddy"
+msgstr "Удалить собеседника"
+
+#: ../pidgin/gtkdialogs.c:1201
+msgid "_Remove Buddy"
+msgstr "_Удалить собеседника"
+
+#: ../pidgin/gtkdialogs.c:1222
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1225
+msgid "Remove Chat"
+msgstr "Удалить чат"
+
+#: ../pidgin/gtkdialogs.c:1228
+msgid "_Remove Chat"
+msgstr "_Удалить чат"
+
+#: ../pidgin/gtkdocklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
+
+#: ../pidgin/gtkdocklet.c:454
+msgid "Change Status"
+msgstr "Изменить статус"
+
+#: ../pidgin/gtkdocklet.c:506
+msgid "Show Buddy List"
+msgstr "Показывать список собеседников"
+
+#: ../pidgin/gtkdocklet.c:532
+msgid "New Message..."
+msgstr "Новое сообщение..."
+
+#: ../pidgin/gtkdocklet.c:547
+msgid "Mute Sounds"
+msgstr "Отключить звуки"
+
+#: ../pidgin/gtkdocklet.c:554
+msgid "Blink on new message"
+msgstr "Мерцать при наличии нового сообщения"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:565
+msgid "Quit"
+msgstr "Выйти"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Не начато"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Приём как:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Приём от:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Отправка для:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Отправка как:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Нет приложения, сопоставленного этому типу файла."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Произошла ошибка при открытии файла."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Ошибка запуска %s: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Ошибка выполнения %s"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Процесс возвратил код ошибки %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Локальный файл:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Скорость:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Прошло времени:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Осталось времени:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "_Закрывать это окно по завершении всех передач"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "О_чищать завершённые передачи"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "_Подробности о передаче файлов"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+msgid "_Pause"
+msgstr "_Пауза"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Возобновить"
+
+#: ../pidgin/gtkimhtml.c:792
+msgid "Paste as Plain _Text"
+msgstr "Вставить как простой _текст"
+
+#: ../pidgin/gtkimhtml.c:809
+msgid "_Reset formatting"
+msgstr "Восстановить _форматирование"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Цвет гиперссылки"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Цвет для отображения гиперссылок."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "Цвет подсветки гиперссылки"
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "_Скопировать адрес e-mail"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Открыть ссылку в браузере"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "_Скопировать ссылку"
+
+#: ../pidgin/gtkimhtml.c:3202
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Нераспознанный тип файла</span>\n"
+"\n"
+"Принимается за PNG."
+
+#: ../pidgin/gtkimhtml.c:3205
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Нераспознанный тип файла\n"
+"\n"
+"Принимается за PNG."
+
+#: ../pidgin/gtkimhtml.c:3218
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Ошибка сохранения изображения</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3221
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Ошибка сохранения изображения\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+msgid "Save Image"
+msgstr "Сохранить изображение"
+
+#: ../pidgin/gtkimhtml.c:3341
+msgid "_Save Image..."
+msgstr "_Сохранить изображение..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Выбрать шрифт"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Выбрать цвет текста"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Выбрать цвет фона"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Описание"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Введите URL и описание ссылки, которую вы хотите вставить. Описание "
+"необязательно."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Введите URL ссылки, которую вы хотите вставить."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Вставить ссылку"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "_Вставить"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Не удалось сохранить изображение: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Вставить изображение"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Эта тема не имеет доступных смайликов."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Смайл!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Жирный"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Наклонный"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Подчёркнутый"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Больший размер шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Меньший размер шрифта "
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Облик шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Цвет шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Цвет фона"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Восстановить форматирование"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Вставить ссылку"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Вставить изображение"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Вставить смайлик"
+
+#: ../pidgin/gtklog.c:267
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить журнал беседы с %s, начатый в %"
+"s?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить журнал беседы в %s, начатый в %"
+"s?"
+
+#: ../pidgin/gtklog.c:283
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить системный журнал, начатый в %s?"
+
+#: ../pidgin/gtklog.c:427
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Беседа в %s на %s</span>"
+
+#: ../pidgin/gtklog.c:430
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Беседа с %s на %s</span>"
+
+#: ../pidgin/gtklog.c:477
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:524
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:528
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:531
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:535
+msgid "No logs were found"
+msgstr "Журналы не найдены"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:550
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../pidgin/gtklog.c:614
+msgid "Total log size:"
+msgstr "Общий размер журналов:"
+
+#: ../pidgin/gtklog.c:683
+#, c-format
+msgid "Conversations in %s"
+msgstr "Беседы в %s"
+
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#, c-format
+msgid "Conversations with %s"
+msgstr "Беседы с %s"
+
+#: ../pidgin/gtklog.c:778
+msgid "System Log"
+msgstr "Системный журнал"
+
+#: ../pidgin/gtkmain.c:373
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Наберите `%s -h' для получения дополнительной информации.\n"
+
+#: ../pidgin/gtkmain.c:375
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Использование: %s [КЛЮЧ]...\n"
+"\n"
+"  -c, --config=КАТ    использовать каталог КАТ для файлов конфигурации\n"
+"  -d, --debug         выводить отладочную информацию на стандартный вывод\n"
+"  -h, --help          показать эту справку и выйти\n"
+"  -n, --nologin       не входить автоматически\n"
+"  -l, --login[=ИМЯ]   войти автоматически (необязательный аргумент ИМЯ\n"
+"                      задаёт одну или несколько учётных записей,\n"
+"                      разделённых запятыми)\n"
+"  -v, --version       показать текущую версию и выйти\n"
+
+#: ../pidgin/gtkmain.c:498
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Открыть все сообщения"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Отправитель"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s имеет %d новое сообщение."
+msgstr[1] "%s имеет %d новых сообщения."
+msgstr[2] "%s имеет %d новых сообщений."
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Команда запуска браузера \"%s\" неверна."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Не удаётся открыть URL"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Ошибка запуска \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Был выбран браузер \"Другой\", но команда не была задана."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Следующие модули будут выгружены."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Несколько модулей будет выгружено."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Выгрузить модули"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Автор:</span>\t\t%s\n"
+"<span weight=\"bold\">Веб-сайт:</span>\t%s\n"
+"<span weight=\"bold\">Имя файла:</span>\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "_Настроить модуль"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Подробности о модуле</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Выбрать файл"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:524
+msgid "Pounce on Whom"
+msgstr "За кем следить"
+
+#: ../pidgin/gtkpounce.c:551
+msgid "_Buddy name:"
+msgstr "_Имя собеседника:"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Si_gns on"
+msgstr "_Входит"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Signs o_ff"
+msgstr "В_ыходит"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "Отхо_дит"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "Во_звращается"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Becomes _idle"
+msgstr "Начинает безде_йствовать"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "Перестаёт бездействоват_ь"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "Starts _typing"
+msgstr "Начинает н_абор сообщения"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "P_auses while typing"
+msgstr "Приостанавливает на_бор сообщения"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "Прекращает набо_р сообщения"
+
+#: ../pidgin/gtkpounce.c:603
+msgid "Sends a _message"
+msgstr "Отправляет сооб_щение"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "Ope_n an IM window"
+msgstr "Открыть ок_но мгновенных сообщений"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "_Pop up a notification"
+msgstr "Вывести уведом_ление"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "Send a _message"
+msgstr "Отправить _сообщение"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "E_xecute a command"
+msgstr "Выполнить ко_манду"
+
+#: ../pidgin/gtkpounce.c:654
+msgid "P_lay a sound"
+msgstr "Воспроизвести зв_ук"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Brows_e..."
+msgstr "_Открыть..."
+
+#: ../pidgin/gtkpounce.c:661
+msgid "Br_owse..."
+msgstr "От_крыть..."
+
+#: ../pidgin/gtkpounce.c:662
+msgid "Pre_view"
+msgstr "Т_ест"
+
+#: ../pidgin/gtkpounce.c:786
+msgid "P_ounce only when my status is not available"
+msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
+
+#: ../pidgin/gtkpounce.c:791
+msgid "_Recurring"
+msgstr "_Повторение"
+
+#: ../pidgin/gtkpounce.c:1247
+msgid "Pounce Target"
+msgstr "Объект слежения"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "Не удалось распаковать тему смайликов."
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
+"быть установлены перетаскиванием их в список тем."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Значок"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Значок системного лотка"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Показывать значок системного лотка:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Всегда"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "При наличии непрочитанных сообщений"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Скрытие окон бесед"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Скрывать новые беседы:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+msgid "When away"
+msgstr "Во время отсутствия"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Показывать мгновенные сообщения и чаты в окнах с _вкладками"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Показывать _кнопку закрытия на вкладках"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Расположение:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "Вверху"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Внизу"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "Слева"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "Справа"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Слева вертикально"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Справа вертикально"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "_Новые беседы:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Показывать _форматирование во входящих сообщениях"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Показывать _значки собеседников"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Разрешить _анимацию значков собеседников"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "Подсвечивать слова с _ошибками"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Использовать плавную прокрутку"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Мерцать окном при принятии мгновенных сообщений"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Форматирование по умолчанию"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Так будет выглядеть текст ваших сообщений с использованием протоколов, "
+"поддерживающих форматирование. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN-сервер:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "Определять IP-адрес _автоматически"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "Публичный _IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Порты"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "Указать диапазон прослушиваемых портов _вручную"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "_Начальный порт:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "_Конечный порт:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Прокси-сервер"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Нет прокси"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Пользователь:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "Браузер GNOME по умолчанию"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "Другой"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Выбор браузера"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Браузер:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Открывать ссылку в:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "По умолчанию"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "Существующее окно"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "Новая вкладка"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Вручную:\n"
+"(%s для URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "_Формат журнала:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Записывать все _мгновенные сообщения"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Записывать все _чаты"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Записывать все изменения _статуса в системный журнал"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Выбор звука"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quietest"
+msgstr "Очень тихо"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quieter"
+msgstr "Тихо"
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Quiet"
+msgstr "Ниже среднего"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Loud"
+msgstr "Выше среднего"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Louder"
+msgstr "Громко"
+
+#: ../pidgin/gtkprefs.c:1535
+msgid "Loudest"
+msgstr "Очень громко"
+
+#: ../pidgin/gtkprefs.c:1598
+msgid "Sound Method"
+msgstr "Метод воспроизведения звука"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "_Method:"
+msgstr "_Метод:"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Сигнал динамиком"
+
+#: ../pidgin/gtkprefs.c:1603
+msgid "Automatic"
+msgstr "Автоматически"
+
+#: ../pidgin/gtkprefs.c:1606
+msgid "Command"
+msgstr "Команда"
+
+#: ../pidgin/gtkprefs.c:1607
+msgid "No sounds"
+msgstr "Нет звуков"
+
+#: ../pidgin/gtkprefs.c:1615
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"_Команда воспроизведения звука:\n"
+"(%s для имени файла)"
+
+#: ../pidgin/gtkprefs.c:1641
+msgid "Sound Options"
+msgstr "Параметры звука"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Sounds when conversation has _focus"
+msgstr "Звуки, когда окно беседы в _фокусе"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Enable sounds:"
+msgstr "Воспроизводить звуки:"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Only when available"
+msgstr "Только во время присутствия"
+
+#: ../pidgin/gtkprefs.c:1647
+msgid "Only when not available"
+msgstr "Только во время отсутствия"
+
+#: ../pidgin/gtkprefs.c:1655
+msgid "Volume:"
+msgstr "Громкость:"
+
+#: ../pidgin/gtkprefs.c:1683
+msgid "Sound Events"
+msgstr "Звуковые события"
+
+#: ../pidgin/gtkprefs.c:1734
+msgid "Play"
+msgstr "Воспроизводить"
+
+#: ../pidgin/gtkprefs.c:1741
+msgid "Event"
+msgstr "Событие"
+
+#: ../pidgin/gtkprefs.c:1760
+msgid "Test"
+msgstr "Тест"
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "Reset"
+msgstr "Сброс"
+
+#: ../pidgin/gtkprefs.c:1768
+msgid "Choose..."
+msgstr "Выбрать..."
+
+#: ../pidgin/gtkprefs.c:1811
+msgid "_Report idle time:"
+msgstr "Сообщать _время бездействия:"
+
+#: ../pidgin/gtkprefs.c:1816
+msgid "Based on keyboard or mouse use"
+msgstr "Основываясь на использовании клавиатуры или мыши"
+
+#: ../pidgin/gtkprefs.c:1825
+msgid "_Auto-reply:"
+msgstr "_Автоматический ответ:"
+
+#: ../pidgin/gtkprefs.c:1829
+msgid "When both away and idle"
+msgstr "Во время отсутствия и бездействия"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1835
+msgid "Auto-away"
+msgstr "Авто-\"Отошёл\""
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "Change status when _idle"
+msgstr "Менять статус при _бездействии"
+
+#: ../pidgin/gtkprefs.c:1841
+msgid "_Minutes before changing status:"
+msgstr "_Минут до изменения статуса:"
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Change _status to:"
+msgstr "Менять _статус на:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1870
+msgid "Status at Startup"
+msgstr "Статус при запуске"
+
+#: ../pidgin/gtkprefs.c:1872
+msgid "Use status from last _exit at startup"
+msgstr "Использовать при запуске статус, бывший до в_ыхода"
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Status to a_pply at startup:"
+msgstr "_Применить при запуске статус:"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../pidgin/gtkprefs.c:1918
+msgid "Smiley Themes"
+msgstr "Темы смайликов"
+
+#: ../pidgin/gtkprefs.c:1919
+msgid "Sounds"
+msgstr "Звуки"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Browser"
+msgstr "Браузер"
+
+#: ../pidgin/gtkprefs.c:1929
+msgid "Status / Idle"
+msgstr "Статус / Бездействие"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Разрешить доступ всем пользователям"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Разрешить доступ только пользователям из списка собеседников"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Разрешить доступ только пользователям, указанным ниже"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Блокировать всех пользователей"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Блокировать только пользователей, указанных ниже"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Конфиденциальность"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Изменения настроек конфиденциальности вступают в силу немедленно."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Установить конфиденциальность для:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "Допустить пользователя"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Укажите пользователя, которого вы допускаете к общению с вами."
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Введите имя пользователя, которого вы хотите допустить к общению с вами."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgid "_Permit"
+msgstr "_Допустить"
+
+#: ../pidgin/gtkprivacy.c:571
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Позволить %s общаться с вами?"
+
+#: ../pidgin/gtkprivacy.c:573
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Вы действительно хотите позволить %s общаться с вами?"
+
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+msgid "Block User"
+msgstr "Блокировать пользователя"
+
+#: ../pidgin/gtkprivacy.c:603
+msgid "Type a user to block."
+msgstr "Укажите блокируемого пользователя."
+
+#: ../pidgin/gtkprivacy.c:604
+msgid "Please enter the name of the user you wish to block."
+msgstr "Введите имя пользователя, которого вы хотите блокировать."
+
+#: ../pidgin/gtkprivacy.c:612
+#, c-format
+msgid "Block %s?"
+msgstr "Блокировать %s?"
+
+#: ../pidgin/gtkprivacy.c:614
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Вы действительно хотите блокировать %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Применить"
+
+#: ../pidgin/gtkrequest.c:1481
+msgid "That file already exists"
+msgstr "Такой файл уже существует"
+
+#: ../pidgin/gtkrequest.c:1482
+msgid "Would you like to overwrite it?"
+msgstr "Хотите перезаписать его?"
+
+#: ../pidgin/gtkrequest.c:1485
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#: ../pidgin/gtkrequest.c:1486
+msgid "Choose New Name"
+msgstr "Выбрать новое имя"
+
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgid "Select Folder..."
+msgstr "Выбрать папку..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Список комнат"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Получить список"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Добавить чат"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Вы действительно хотите удалить выбранные сохранённые статусы?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+msgid "_Use"
+msgstr "_Применить"
+
+#: ../pidgin/gtksavedstatuses.c:726
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Название уже используется. Вы должны выбрать уникальное название."
+
+#: ../pidgin/gtksavedstatuses.c:914
+msgid "Different"
+msgstr "Отличающийся"
+
+#: ../pidgin/gtksavedstatuses.c:1107
+msgid "_Title:"
+msgstr "_Название:"
+
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+msgid "_Status:"
+msgstr "_Статус:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "Use a _different status for some accounts"
+msgstr "Использовать _отличающийся статус для некоторых учётных записей"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1222
+msgid "Sa_ve & Use"
+msgstr "Сохранить _и применить"
+
+#: ../pidgin/gtksavedstatuses.c:1428
+#, c-format
+msgid "Status for %s"
+msgstr "Статус для %s"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Собеседник входит в сеть"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Собеседник выходит из сети"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Принято сообщение"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Принято сообщение, начинающее беседу"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Сообщение отправлено"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Пользователь входит в чат"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Пользователь выходит из чата"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Вы говорите в чате"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Другие говорят в чате"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Кто-то произносит ваше имя в чате"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Ошибка GStreamer"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "Не удалось инициализировать GStreamer."
+
+#: ../pidgin/gtkstatusbox.c:661
+msgid "Waiting for network connection"
+msgstr "Ожидание сетевого соединения"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Произошла следующая ошибка при загрузке %s: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "Не удалось загрузить изображение"
+
+#: ../pidgin/gtkutils.c:1419
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Нельзя отправить папку %s."
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
+msgid "You have dragged an image"
+msgstr "Вы перетащили изображение"
+
+#: ../pidgin/gtkutils.c:1453
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+msgid "Set as buddy icon"
+msgstr "Установить в качестве значка собеседника"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+msgid "Send image file"
+msgstr "Отправить файл изображения"
+
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+msgid "Insert in message"
+msgstr "Вставить в сообщение"
+
+#: ../pidgin/gtkutils.c:1465
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+"Хотите установить это изображение в качестве значка собеседника для этого "
+"пользователя?"
+
+#: ../pidgin/gtkutils.c:1472
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1474
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. 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:1532
+msgid "Cannot send launcher"
+msgstr "Нельзя отправить ярлык"
+
+#: ../pidgin/gtkutils.c:1532
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2302
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Файл:</b> %s\n"
+"<b>Размер файла:</b> %s\n"
+"<b>Размер изображения:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2592
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2594
+msgid "Icon Error"
+msgstr "Ошибка значка"
+
+#: ../pidgin/gtkutils.c:2595
+msgid "Could not set icon"
+msgstr "Не удалось установить значок"
+
+#: ../pidgin/gtkutils.c:2695
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Не удалось открыть файл '%s': %s"
+
+#: ../pidgin/gtkutils.c:2744
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgid "Save File"
+msgstr "Сохранить файл"
+
+#: ../pidgin/gtkwhiteboard.c:867
+msgid "Select color"
+msgstr "Выбрать цвет"
+
+#: ../pidgin/pidginstock.c:81
+msgid "_Alias"
+msgstr "_Псевдоним"
+
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "_Закрыть вкладки"
+
+#: ../pidgin/pidginstock.c:85
+msgid "_Get Info"
+msgstr "Получить _информацию"
+
+#: ../pidgin/pidginstock.c:86
+msgid "_Invite"
+msgstr "П_ригласить"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Modify"
+msgstr "_Изменить"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Open Mail"
+msgstr "Открыть _почту"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Вывести статистику"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Вероятность отклика:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Настройка статистики"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "Максимальное время ожидания отклика:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "минут"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Пороговая величина:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Собеседник бездействует"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Собеседник отошёл"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr ""
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Собеседник не в сети"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr ""
+
+#: ../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 ""
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:187
+msgid "Contact Priority"
+msgstr "Приоритет контакта"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:190
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:192
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Цвета беседы"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Изменяет цвета в окне беседы."
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Сообщения об ошибках"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Подсвеченные сообщения"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Системные сообщения"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Отправленные сообщения"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Полученные сообщения"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Выберите цвет для %s"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Игнорировать входящий формат"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Применять в чатах"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Применять в мгновенных сообщениях"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "По количеству бесед"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Расположение бесед"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Количество бесед в окне"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+"Разделять окна мгновенных сообщений и чатов при расположении по количеству"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:141
+msgid "ExtPlacement"
+msgstr "Экстра-расположение"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:143
+msgid "Extra conversation placement options."
+msgstr "Дополнительные параметры расположения бесед."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:145
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Ограничивает количество бесед в окне, с возможностью разделения мгновенных "
+"сообщений и чатов."
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Настройка жестов мышью"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Средняя кнопка мыши"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Правая кнопка мыши"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Визуальное отображение жестов"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Жесты мышью"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "Предоставляет поддержку жестов мышью."
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Позволяет использовать жесты мышью в окнах бесед.\n"
+"Передвигайте мышь, удерживая нажатой среднюю кнопку, для выполнения "
+"следующих действий:\n"
+"\n"
+"Вниз и вправо для закрытия беседы.\n"
+"Вверх и влево для перехода к предыдущей беседе.\n"
+"Вверх и вправо для перехода к следующей беседе."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Обмен мгновенными сообщениями"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Новая персона"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Выбрать собеседника"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Выберите персону из адресной книги, к которой следует добавить этого "
+"собеседника, или создайте новую персону."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Подробности о пользователе"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "Соотнести собеседника"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Не удаётся отправить e-mail"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "Исполняемый файл evolution не был найден в PATH."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Добавить в адресную книгу"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "Отправить e-mail"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Настройка интеграции с Evolution"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+"Выберите все учётные записи, собеседники которых должны быть добавлены "
+"автоматически."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Evolution Integration"
+msgstr "Интеграция с Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
+msgid "Provides integration with Evolution."
+msgstr "Предоставляет интеграцию с Evolution."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Ниже введите информацию о персоне."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr ""
+"Ниже введите идентификатор пользователя собеседника и тип учётной записи."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Тип учётной записи:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Необязательная информация:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Имя:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Фамилия:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Проверка сигналов GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Проверяет, все ли сигналы интерфейса пользователя работают исправно."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "История"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Сворачивание при отсутствии"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Сворачивает список собеседников и все беседы, когда вы отсутствуете."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Проверка почты"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Проверяет наличие новой локальной почты."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Добавляет небольшую область к списку собеседников, в которой сообщается о "
+"наличии новой почты."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Разделительная линия"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Проводит линию, отделяющую новые сообщения в беседе."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Проводить разделительную линию в "
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "Окна _мгновенных сообщений"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "Окна _чатов"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Произошёл конфликт при выполнении команды:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "Ошибка запуска редактора"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "Произошла следующая ошибка:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Применить"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Уведомление для"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Только тогда, когда кто-то произносит ваше имя"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "Окна в _фокусе"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Методы уведомления"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "Добавлять _строку в начало заголовка окна:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Вставлять _количество новых сообщений в заголовок окна"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "Вставлять количество новых сообщений в свойства _X"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Установить подсказку \"С_РОЧНО\" оконного менеджера"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "_Поднимать окно беседы"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Удаление уведомлений"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Удалять, когда окно беседы оказывается в ф_окусе"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Удалять, когда окно беседы получает _щелчок"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Удалять при _наборе сообщения в окне беседы"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Удалять при отпр_авке сообщения"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Удалять при переключении на _вкладку беседы"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "Уведомление о сообщении"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Демонстрационный модуль Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+"Демонстрационный модуль, который делает всякие вещи - смотрите описание."
+
+#. *  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"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Это действительно замечательный модуль, который делает множество вещей:\n"
+"- Сообщает вам, кто написал эту программу, когда вы входите\n"
+"- Переворачивает весь приходящий текст\n"
+"- Отправляет сообщение пользователям из вашего списка сразу после их "
+"подключения"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Цвет курсора"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Вторичный цвет курсора"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Цвет гиперссылки"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Размер расширителя GtkTreeView"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Горизонтальное разделение GtkTreeView"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Область ввода окна беседы"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "История бесед"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Система просмотра журналов"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "Диалог запроса"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Диалог уведомления"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "Выберите цвет"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Выберите шрифт для %s"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "Выберите шрифт"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "Шрифт интерфейса GTK+"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Цвета интерфейса"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "Размер виджетов"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Шрифты"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Инструменты"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Записать настройки в %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Повторно прочитать файлы gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:622
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Управление темой GTK+ для Pidgin"
+
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Необработанный"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+"Позволяет вам отправлять необработанный ввод, используя протоколы, "
+"базирующиеся на тексте."
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Позволяет вам отправлять необработанный ввод, используя протоколы, "
+"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
+"в области ввода. Смотрите за окном отладки."
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Вы используете %s версии %s. Последняя доступная версия %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Список изменений:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr ""
+"Вы можете получить версию %s здесь:<br><a href=\"http://pidgin.im/\">http://"
+"pidgin.im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Доступна новая версия"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Уведомление о выпуске"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Периодически проверяет наличие новых версий."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Периодически проверяет наличие новых версий и уведомляет о них пользователя, "
+"приводя список изменений."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Удаление повторов"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "Указанное слово уже присутствует в списке исправлений."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Замещение текста"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "Вы набираете"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "Вы отправляете"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Только целые слова"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Учитывать регистр"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Добавить новое замещение текста"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "Вы _набираете:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "Вы _отправляете:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_Точное совпадение регистра"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "Замещать только _целые слова"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Основные параметры замещения текста"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Разрешить замещение последнего слова при отправке"
+
+#: ../pidgin/plugins/spellchk.c:2373
+msgid "Text replacement"
+msgstr "Замещение текста"
+
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Замещает текст в исходящих сообщениях в соответствии с правилами, "
+"определёнными пользователем."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Лента собеседников"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Горизонтальная прокрутка списка собеседников."
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Выводить отметки времени каждые"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Отметка времени"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "Выводит отметки времени в стиле iChat."
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Выводит отметки времени в стиле iChat каждые N минут."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Параметры формата времени"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr ""
+"_Принудительно использовать (традиционный для %s) 24-часовой формат времени"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Показывать дату..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Беседы:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Для задержанных сообщений"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Для задержанных сообщений и в чатах"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "_Журналы сообщений:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:151
+msgid "Message Timestamp Formats"
+msgstr "Форматы времени сообщений"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:154
+msgid "Customizes the message timestamp formats."
+msgstr "Изменяет форматы времени сообщений."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:156
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Этот модуль позволяет пользователю изменять форматы времени сообщений для "
+"бесед и журналов."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Непрозрачность:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Окна бесед"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_Прозрачность окна беседы"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Показывать _полосу прокрутки в окнах бесед"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Убирать прозрачность окна беседы в фокусе"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Всегда наверху"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Окно списка собеседников"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Прозрачность окна _списка собеседников"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Убирать прозрачность окна списка собеседников в фокусе"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+msgid "Transparency"
+msgstr "Прозрачность"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Варьируемая прозрачность для списка собеседников и бесед."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Этот модуль включает варьируемую альфа-прозрачность окон бесед и списка "
+"собеседников.\n"
+"\n"
+"* Замечание: Этот модуль требует Win2000 или выше."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "Версия GTK+"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Загрузка"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "_Запускать %s при загрузке Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "Закреплённый _список собеседников"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "Держать окно списка собеседников _наверху:"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr "Только тогда, когда закреплено"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "_Мерцать окном при принятии сообщений в чатах"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Параметры Pidgin для Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "Параметры, специфичные для Pidgin для Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
+"собеседников."
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "Консоль XMPP"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Учётная запись: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Вставить станс <iq/>."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "Вставить станс <presence/>."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "Вставить станс <message/>."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
diff -r e42309469a4a -r 618a3748ff64 po/th.po
--- a/po/th.po	Mon May 21 20:02:18 2007 +0000
+++ b/po/th.po	Mon May 21 20:58:23 2007 +0000
@@ -3065,7 +3065,7 @@
 #: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
 #, c-format
 msgid "%d person in room"
-msgstr "���ͧ�� %s ��"
+msgstr "���ͧ�� %d ��"
 
 #: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
 msgid "Typing"