+++ /dev/null
-*** src/protocols/yahoo/yahoo.c.orig Thu Jan 22 09:57:03 2004
---- src/protocols/yahoo/yahoo.c Thu Jan 22 10:15:11 2004
-***************
-*** 20,25 ****
---- 20,26 ----
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-+ #include <limits.h>
- #include "internal.h"
-
- #include "account.h"
-***************
-*** 131,138 ****
---- 132,146 ----
- while (pos + 1 < len) {
- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
- break;
-+ if (x >= sizeof(key)-1) {
-+ x++; pos++;
-+ continue;
-+
-+ }
- key[x++] = data[pos++];
- }
-+ if (x >= sizeof(key)-1)
-+ x = 0;
- key[x] = 0;
- pos += 2;
- pair->key = strtol(key, NULL, 10);
-***************
-*** 868,899 ****
- }
- }
-
- #define OUT_CHARSET "utf-8"
-
- static char *yahoo_decode(const char *text)
- {
- char *converted;
-! char *p, *n, *new;
-!
-! n = new = g_malloc(strlen (text) + 1);
-!
-! for (p = (char *)text; *p; p++, n++) {
- if (*p == '\\') {
-! sscanf(p + 1, "%3o\n", (int *)n);
-! p += 3;
-! }
-! else
-! *n = *p;
- }
--
- *n = '\0';
--
- converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
- g_free(new);
-
- return converted;
- }
-
- static void yahoo_process_mail(GaimConnection *gc, struct yahoo_packet *pkt)
- {
- GaimAccount *account = gaim_connection_get_account(gc);
---- 876,941 ----
- }
- }
-
-+
-+ static void octal(const char **p, const char *end, unsigned char *n)
-+ {
-+ int i, c;
-+
-+ for (i = 0, c = 0; i < 3 && *p < end; ++i, ++*p) {
-+ c <<= 3;
-+ switch (**p) {
-+ case '0': break;
-+ case '1': c += 1; break;
-+ case '2': c += 2; break;
-+ case '3': c += 3; break;
-+ case '4': c += 4; break;
-+ case '5': c += 5; break;
-+ case '6': c += 6; break;
-+ case '7': c += 7; break;
-+ default:
-+ if (i == 0) {
-+ *n = **p;
-+ ++*p;
-+ return;
-+ }
-+ c >>= 3;
-+ goto done;
-+ }
-+ }
-+ done:
-+ *n = (c > UCHAR_MAX) ? '?' : c;
-+ return;
-+ }
-+
- #define OUT_CHARSET "utf-8"
-
- static char *yahoo_decode(const char *text)
- {
- char *converted;
-! unsigned char *n, *new;
-! size_t len;
-! const char *p, *end;
-!
-! len = strlen (text);
-! p = text;
-! end = &text[len];
-! n = new = g_malloc(len + 1);
-! while (p < end) {
- if (*p == '\\') {
-! ++p;
-! octal(&p, end, n);
-! } else
-! *n = *p++;
-! ++n;
- }
- *n = '\0';
- converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
- g_free(new);
-
- return converted;
- }
-
-+
- static void yahoo_process_mail(GaimConnection *gc, struct yahoo_packet *pkt)
- {
- GaimAccount *account = gaim_connection_get_account(gc);
-***************
-*** 1903,1934 ****
-
- static void yahoo_web_pending(gpointer data, gint source, GaimInputCondition cond)
- {
- GaimConnection *gc = data;
- GaimAccount *account = gaim_connection_get_account(gc);
- struct yahoo_data *yd = gc->proto_data;
-! char buf[1024], buf2[256], *i = buf, *r = buf2;
-! int len, o = 0;
-
- len = read(source, buf, sizeof(buf));
-! if (len <= 0 || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
- gaim_connection_error(gc, _("Unable to read"));
- return;
- }
-!
-! while ((i = strstr(i, "Set-Cookie: ")) && 0 < 2) {
-! i += strlen("Set-Cookie: ");
-! for (;*i != ';'; r++, i++) {
-! *r = *i;
-! }
-! *r=';';
-! r++;
-! *r=' ';
-! r++;
-! o++;
-! }
-! /* Get rid of that "; " */
-! *(r-2) = '\0';
-! yd->auth = g_strdup(buf2);
- gaim_input_remove(gc->inpa);
- close(source);
- /* Now we have our cookies to login with. I'll go get the milk. */
---- 1945,1974 ----
-
- static void yahoo_web_pending(gpointer data, gint source, GaimInputCondition cond)
- {
-+ static const char http302[] = "HTTP/1.0 302";
-+ static const char setcookie[] = "Set-Cookie: ";
- GaimConnection *gc = data;
- GaimAccount *account = gaim_connection_get_account(gc);
- struct yahoo_data *yd = gc->proto_data;
-! char buf[1024], *i = buf;
-! int len;
-! GString *s;
-
- len = read(source, buf, sizeof(buf));
-! if (len <= 0 || (len >= sizeof(http302)-1 &&
-! memcmp(http302, buf, sizeof(http302)-1) != 0)) {
- gaim_connection_error(gc, _("Unable to read"));
- return;
- }
-! s = g_string_sized_new(len);
-! buf[len] = '\0';
-! while ((i = strstr(i, setcookie)) != NULL) {
-! i += sizeof(setcookie)-1;
-! for (;*i != ';'; i++)
-! g_string_append_c(s, *i);
-! g_string_append(s, "; ");
-! }
-! yd->auth = g_string_free(s, FALSE);
- gaim_input_remove(gc->inpa);
- close(source);
- /* Now we have our cookies to login with. I'll go get the milk. */
-***************
-*** 1974,1988 ****
- const char *c = buf;
- char *d;
- char name[64], value[64];
- while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
- c = strstr(c, "name=\"") + strlen("name=\"");
-! for (d = name; *c!='"'; c++, d++)
- *d = *c;
- *d = '\0';
- d = strstr(c, "value=\"") + strlen("value=\"");
- if (strchr(c, '>') < d)
- break;
-! for (c = d, d = value; *c!='"'; c++, d++)
- *d = *c;
- *d = '\0';
- g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
---- 2014,2030 ----
- const char *c = buf;
- char *d;
- char name[64], value[64];
-+ int count = sizeof(name)-1;
- while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
- c = strstr(c, "name=\"") + strlen("name=\"");
-! for (d = name; *c!='"' && count; c++, d++, count--)
- *d = *c;
- *d = '\0';
-+ count = sizeof(value)-1;
- d = strstr(c, "value=\"") + strlen("value=\"");
- if (strchr(c, '>') < d)
- break;
-! for (c = d, d = value; *c!='"' && count; c++, d++, count--)
- *d = *c;
- *d = '\0';
- g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
-*** src/proxy.c.orig Thu Jan 22 08:27:26 2004
---- src/proxy.c Thu Jan 22 08:28:05 2004
-***************
-*** 974,980 ****
-
- gaim_input_remove(phb->inpa);
-
-! while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
- if (inputline[pos - 1] == '\n')
- nlc++;
- else if (inputline[pos - 1] != '\r')
---- 974,980 ----
-
- gaim_input_remove(phb->inpa);
-
-! while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
- if (inputline[pos - 1] == '\n')
- nlc++;
- else if (inputline[pos - 1] != '\r')
-*** src/util.c.orig Fri Jan 9 22:04:56 2004
---- src/util.c Thu Jan 22 08:26:14 2004
-***************
-*** 247,270 ****
- /**************************************************************************
- * Quoted Printable Functions
- **************************************************************************/
-! void
-! gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
- {
-! char *p, *n, *new;
-
-! n = new = g_malloc(strlen (str) + 1);
-
-! for (p = (char *)str; *p; p++, n++) {
- if (*p == '=') {
-! sscanf(p + 1, "%2x\n", (int *)n);
-! p += 2;
-! }
-! else if (*p == '_')
- *n = ' ';
- else
- *n = *p;
- }
--
- *n = '\0';
-
- if (ret_len)
---- 247,317 ----
- /**************************************************************************
- * Quoted Printable Functions
- **************************************************************************/
-! static void hex(const char **p, const char *end, unsigned char *n)
- {
-! int i, c;
-
-! for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
-! c <<= 4;
-! switch (**p) {
-! case '0': break;
-! case '1': c += 1; break;
-! case '2': c += 2; break;
-! case '3': c += 3; break;
-! case '4': c += 4; break;
-! case '5': c += 5; break;
-! case '6': c += 6; break;
-! case '7': c += 7; break;
-! case '8': c += 8; break;
-! case '9': c += 9; break;
-! case 'a': c += 10; break;
-! case 'b': c += 11; break;
-! case 'c': c += 12; break;
-! case 'd': c += 13; break;
-! case 'e': c += 14; break;
-! case 'f': c += 15; break;
-! case 'A': c += 10; break;
-! case 'B': c += 11; break;
-! case 'C': c += 12; break;
-! case 'D': c += 13; break;
-! case 'E': c += 14; break;
-! case 'F': c += 15; break;
-! default:
-! if (i == 0) {
-! *n = **p;
-! ++*p;
-! return;
-! }
-! c >>= 4;
-! goto done;
-! }
-! }
-! done:
-! *n = (c > UCHAR_MAX) ? '?' : c;
-! return;
-! }
-
-! void
-! gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
-! {
-! const char *p, *end;
-! unsigned char *n, *new;
-! size_t len;
-!
-! len = strlen (str);
-! n = new = g_malloc(len + 1);
-! p = str;
-! end = &p[len];
-! while (p < end) {
- if (*p == '=') {
-! ++p;
-! hex(&p, end, n);
-! } else if (*p == '_')
- *n = ' ';
- else
- *n = *p;
-+ ++n;
- }
- *n = '\0';
-
- if (ret_len)
-***************
-*** 1962,1968 ****
- char **ret_path)
- {
- char scan_info[255];
-! char port_str[5];
- int f;
- const char *turl;
- char host[256], path[256];
---- 2009,2015 ----
- char **ret_path)
- {
- char scan_info[255];
-! char port_str[6];
- int f;
- const char *turl;
- char host[256], path[256];
-***************
-*** 1982,1997 ****
- }
-
- g_snprintf(scan_info, sizeof(scan_info),
-! "%%[%s]:%%[%s]/%%[%s]", addr_ctrl, port_ctrl, page_ctrl);
-
- f = sscanf(url, scan_info, host, port_str, path);
-
- if (f == 1)
- {
- g_snprintf(scan_info, sizeof(scan_info),
-! "%%[%s]/%%[%s]",
- addr_ctrl, page_ctrl);
- f = sscanf(url, scan_info, host, path);
- g_snprintf(port_str, sizeof(port_str), "80");
- }
-
---- 2029,2049 ----
- }
-
- g_snprintf(scan_info, sizeof(scan_info),
-! "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
-! addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-! port_ctrl[sizeof(port_ctrl)-1] = '\0';
-! page_ctrl[sizeof(page_ctrl)-1] = '\0';
-
- f = sscanf(url, scan_info, host, port_str, path);
-
- if (f == 1)
- {
- g_snprintf(scan_info, sizeof(scan_info),
-! "%%255[%s]/%%255[%s]",
- addr_ctrl, page_ctrl);
- f = sscanf(url, scan_info, host, path);
-+ addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-+ page_ctrl[sizeof(page_ctrl)-1] = '\0';
- g_snprintf(port_str, sizeof(port_str), "80");
- }
-
-***************
-*** 2081,2089 ****
- static size_t
- parse_content_len(const char *data, size_t data_len)
- {
-! size_t content_len = 0;
-
-! sscanf(data, "Content-Length: %d", (int *)&content_len);
-
- return content_len;
- }
---- 2133,2146 ----
- static size_t
- parse_content_len(const char *data, size_t data_len)
- {
-! int content_len = 0;
-! char *tmp;
-
-! tmp = g_malloc(data_len + 1);
-! memcpy(tmp, data, data_len);
-! tmp[data_len] = '\0';
-! sscanf(tmp, "Content-Length: %d", &content_len);
-! g_free(tmp);
-
- return content_len;
- }
+++ /dev/null
---- gaim-0.56/src/protocols/gg/Makefile.am.wiget Wed Apr 17 10:51:06 2002
-+++ gaim-0.56/src/protocols/gg/Makefile.am Wed Apr 17 14:57:10 2002
-@@ -2,27 +2,24 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libgg_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-+
-
- if STATIC_GG
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libgg.a
--
--libgg_a_SOURCES = libgg.c \
-- libgg.h \
-- common.c \
-- iconv_string.c \
-- iconv_string.h \
-- gg.c
-+noinst_LTLIBRARIES = libgg-static.la
-+libgg_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libgg.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libgg_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libgg_la_SOURCES = libgg.c \
- libgg.h \
-@@ -30,5 +27,6 @@
- iconv_string.c \
- iconv_string.h \
- gg.c
-+
-+libgg_static_la_SOURCES = $(libgg_la_SOURCES)
-
--endif
---- gaim-0.56/src/protocols/irc/Makefile.am.wiget Wed Apr 17 11:17:13 2002
-+++ gaim-0.56/src/protocols/irc/Makefile.am Wed Apr 17 13:15:31 2002
-@@ -2,23 +2,24 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libirc_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_IRC
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libirc.a
--
--libirc_a_SOURCES = irc.c
-+noinst_LTLIBRARIES = libirc-static.la
-+libirc_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libirc.la
- noinst_LIBRARIES =
-+libirc_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libirc_la_SOURCES = irc.c
-
--endif
-+libirc_static_la_SOURCES = $(libirc_la_SOURCES)
---- gaim-0.56/src/protocols/jabber/Makefile.am.wiget Wed Apr 17 12:23:09 2002
-+++ gaim-0.56/src/protocols/jabber/Makefile.am Wed Apr 17 13:15:21 2002
-@@ -2,62 +2,23 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libjabber_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_JABBER
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libjabber.a
--
--libjabber_a_SOURCES = \
-- asciitab.h \
-- expat.c \
-- genhash.c \
-- hashtable.c \
-- hashtable.h \
-- karma.c \
-- iasciitab.h \
-- latin1tab.h \
-- lib.h \
-- libxode.h \
-- nametab.h \
-- pool.c \
-- sha.c \
-- snprintf.c \
-- socket.c \
-- str.c \
-- utf8tab.h \
-- xhash.c \
-- xmldef.h \
-- xmlnode.c \
-- xmlparse.c \
-- xmlparse.h \
-- xmlrole.c \
-- xmlrole.h \
-- xmltok.c \
-- xmltok.h \
-- xmltok_impl.h \
-- xstream.c \
-- \
-- jabber.h \
-- jconn.c \
-- jid.c \
-- jpacket.c \
-- jutil.c \
-- log.c \
-- log.h \
-- pproxy.c \
-- rate.c \
-- \
-- jabber.c
-+noinst_LTLIBRARIES = libjabber-static.la
-+libjabber_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libjabber.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libjabber_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libjabber_la_SOURCES = \
- asciitab.h \
-@@ -101,4 +62,4 @@
- \
- jabber.c
-
--endif
-+libjabber_static_la_SOURCES = $(libjabber_la_SOURCES)
---- gaim-0.56/src/protocols/msn/Makefile.am.wiget Wed Apr 17 12:24:06 2002
-+++ gaim-0.56/src/protocols/msn/Makefile.am Wed Apr 17 13:15:06 2002
-@@ -2,23 +2,24 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libmsn_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_MSN
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libmsn.a
--
--libmsn_a_SOURCES = msn.c
-+noinst_LTLIBRARIES = libmsn-static.la
-+libmsn_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libmsn.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libmsn_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libmsn_la_SOURCES = msn.c
-
--endif
-+libmsn_static_la_SOURCES = $(libmsn_la_SOURCES)
---- gaim-0.56/src/protocols/napster/Makefile.am.wiget Wed Apr 17 12:25:01 2002
-+++ gaim-0.56/src/protocols/napster/Makefile.am Wed Apr 17 13:14:34 2002
-@@ -1,22 +1,23 @@
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libnapster_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_NAPSTER
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libnapster.a
--
--libnapster_a_SOURCES = napster.c
-+noinst_LTLIBRARIES = libnapster-static.la
-+libnapster_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libnapster.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libnapster_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libnapster_la_SOURCES = napster.c
-
--endif
-+libnapster_static_la_SOURCES = $(libnapster_la_SOURCES)
---- gaim-0.56/src/protocols/oscar/Makefile.am.wiget Wed Apr 17 12:18:01 2002
-+++ gaim-0.56/src/protocols/oscar/Makefile.am Wed Apr 17 13:16:00 2002
-@@ -3,51 +3,23 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--liboscar_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_OSCAR
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = liboscar.a
--
--liboscar_a_SOURCES = admin.c \
-- adverts.c \
-- auth.c \
-- bos.c \
-- buddylist.c \
-- chat.c \
-- chatnav.c \
-- conn.c \
-- ft.c \
-- icq.c \
-- im.c \
-- info.c \
-- invite.c \
-- meta.c \
-- misc.c \
-- msgcookie.c \
-- popups.c \
-- rxhandlers.c \
-- rxqueue.c \
-- search.c \
-- service.c \
-- snac.c \
-- ssi.c \
-- stats.c \
-- tlv.c \
-- translate.c \
-- txqueue.c \
-- util.c \
-- oscar.c
--
-+noinst_LTLIBRARIES = liboscar-static.la
-+liboscar_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = liboscar.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+liboscar_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- liboscar_la_SOURCES = admin.c \
- adverts.c \
-@@ -79,4 +51,4 @@
- util.c \
- oscar.c
-
--endif
-+liboscar_static_la_SOURCES = $(liboscar_la_SOURCES)
---- gaim-0.56/src/protocols/toc/Makefile.am.wiget Wed Apr 17 11:27:30 2002
-+++ gaim-0.56/src/protocols/toc/Makefile.am Wed Apr 17 13:16:30 2002
-@@ -2,23 +2,24 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libtoc_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_TOC
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libtoc.a
--
--libtoc_a_SOURCES = toc.c
-+noinst_LTLIBRARIES = libtoc-static.la
-+libtoc_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libtoc.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libtoc_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libtoc_la_SOURCES = toc.c
-
--endif
-+libtoc_static_la_SOURCES = $(libtoc_la_SOURCES)
---- gaim-0.56/src/protocols/yahoo/Makefile.am.wiget Wed Apr 17 11:26:03 2002
-+++ gaim-0.56/src/protocols/yahoo/Makefile.am Wed Apr 17 13:17:12 2002
-@@ -2,23 +2,24 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libyahoo_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_YAHOO
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libyahoo.a
--
--libyahoo_a_SOURCES = crypt.c yahoo.c
-+noinst_LTLIBRARIES = libyahoo-static.la
-+libyahoo_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libyahoo.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libyahoo_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libyahoo_la_SOURCES = crypt.c yahoo.c
-
--endif
-+libyahoo_static_la_SOURCES = $(libyahoo_la_SOURCES)
---- gaim-0.56/src/protocols/zephyr/Makefile.am.wiget Wed Apr 17 11:18:58 2002
-+++ gaim-0.56/src/protocols/zephyr/Makefile.am Wed Apr 17 13:17:45 2002
-@@ -1,86 +1,24 @@
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src -I\$(top_srcdir)/src/protocols -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) $(st) $(DEBUG_CFLAGS)
-+AM_CFLAGS = -I\$(top_srcdir)/src -I\$(top_srcdir)/src/protocols -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) $(st) $(DEBUG_CFLAGS)
-
--LIBS = @LIBS@ $(KRB4_LDFLAGS) $(KRB4_LIBS)
--libzephyr_la_LDFLAGS = -module -avoid-version
-+libzephyr_la_LIBADD = $(KRB4_LDFLAGS) $(KRB4_LIBS)
-
- if STATIC_ZEPHYR
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libzephyr.a
--
--libzephyr_a_SOURCES = \
-- ZAsyncLocate.c \
-- ZCkAuth.c \
-- ZCkIfNot.c \
-- ZClosePort.c \
-- ZCmpUID.c \
-- ZCmpUIDP.c \
-- ZFlsLocs.c \
-- ZFlsSubs.c \
-- ZFmtAuth.c \
-- ZFmtList.c \
-- ZFmtNotice.c \
-- ZFmtRaw.c \
-- ZFmtRawLst.c \
-- ZFmtSmRLst.c \
-- ZFmtSmRaw.c \
-- ZFreeNot.c \
-- ZGetLocs.c \
-- ZGetSender.c \
-- ZGetSubs.c \
-- ZGetWGPort.c \
-- ZIfNotice.c \
-- ZInit.c \
-- ZLocations.c \
-- ZMakeAscii.c \
-- ZMkAuth.c \
-- ZNewLocU.c \
-- ZOpenPort.c \
-- ZParseNot.c \
-- ZPeekIfNot.c \
-- ZPeekNot.c \
-- ZPeekPkt.c \
-- ZPending.c \
-- ZReadAscii.c \
-- ZRecvNot.c \
-- ZRecvPkt.c \
-- ZRetSubs.c \
-- ZSendList.c \
-- ZSendNot.c \
-- ZSendPkt.c \
-- ZSendRLst.c \
-- ZSendRaw.c \
-- ZSetDest.c \
-- ZSetFD.c \
-- ZSetSrv.c \
-- ZSubs.c \
-- ZVariables.c \
-- ZWait4Not.c \
-- ZhmStat.c \
-- Zinternal.c \
-- com_err.h \
-- error_message.c \
-- error_table.h \
-- et_name.c \
-- init_et.c \
-- internal.h \
-- mit-copyright.h \
-- mit-sipb-copyright.h \
-- sysdep.h \
-- zephyr.h \
-- zephyr_err.c \
-- zephyr_err.h \
-- \
-- zephyr.c
-+noinst_LTLIBRARIES = libzephyr-static.la
-+libzephyr_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libzephyr.la
- noinst_LIBRARIES =
-+libzephyr_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libzephyr_la_SOURCES = \
- ZAsyncLocate.c \
-@@ -147,4 +85,4 @@
- \
- zephyr.c
-
--endif
-+libzephyr_static_la_SOURCES = $(libzephyr_la_SOURCES)
---- gaim-0.56/src/protocols/icq/Makefile.am.wiget Wed Apr 17 11:13:04 2002
-+++ gaim-0.56/src/protocols/icq/Makefile.am Wed Apr 17 13:12:08 2002
-@@ -7,64 +7,23 @@
-
- pkgdir = $(libdir)/gaim
-
--CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
--libicq_la_LDFLAGS = -module -avoid-version
-+AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-
- if STATIC_ICQ
-
- st = -DSTATIC
- pkg_LTLIBRARIES =
--noinst_LIBRARIES = libicq.a
--
--libicq_a_SOURCES = chatsession.c \
-- chatsession.h \
-- contacts.c \
-- contacts.h \
-- cyrillic.c \
-- eventhandle.c \
-- eventhandle.h \
-- filesession.c \
-- filesession.h \
-- icq.h \
-- icqbyteorder.c \
-- icqbyteorder.h \
-- icqevent.c \
-- icqevent.h \
-- icqlib.c \
-- icqlib.h \
-- icqpacket.c \
-- icqpacket.h \
-- icqtypes.h \
-- list.c \
-- list.h \
-- proxy.c \
-- queue.c \
-- queue.h \
-- socketmanager.c \
-- socketmanager.h \
-- stdpackets.c \
-- stdpackets.h \
-- tcp.c \
-- tcp.h \
-- tcpchathandle.c \
-- tcpfilehandle.c \
-- tcphandle.c \
-- tcplink.c \
-- tcplink.h \
-- timeout.c \
-- timeout.h \
-- udp.c \
-- udp.h \
-- udphandle.c \
-- util.c \
-- util.h \
-- gaim_icq.c
-+noinst_LTLIBRARIES = libicq-static.la
-+libicq_la_LDFLAGS =
-
- else
-
- st =
- pkg_LTLIBRARIES = libicq.la
--noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+libicq_la_LDFLAGS = -module -avoid-version
-+
-+endif
-
- libicq_la_SOURCES = chatsession.c \
- chatsession.h \
-@@ -110,4 +69,4 @@
- util.h \
- gaim_icq.c
-
--endif
-+libicq_static_la_SOURCES = $(libicq_la_SOURCES)
---- gaim-0.56/configure.ac.wiget Wed Apr 17 14:16:27 2002
-+++ gaim-0.56/configure.ac Wed Apr 17 14:28:02 2002
-@@ -58,7 +58,7 @@
- extern_init=
- load_proto=
- for i in $STATIC_PRPLS ; do
-- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i-static.la"
- extern_init="$extern_init extern void ${i}_init(struct prpl *);"
- load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));"
- case $i in
-@@ -392,6 +392,10 @@
- AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
- AC_CHECK_HEADERS(termios.h)
-
-+dnl workaround
-+AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes)
-+AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes)
-+
- AC_OUTPUT([Makefile
- doc/Makefile
- intl/Makefile
+++ /dev/null
---- gaim/po/zh_TW.po.old Mon Sep 9 08:07:12 2002
-+++ gaim/po/zh_TW.po Fri Oct 25 17:19:00 2002
-@@ -8,7 +8,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: 0.1 for gaim-0.5.7\n"
--"POT-Creation-Date: 2002-09-09 01:49-0400\n"
-+"POT-Creation-Date: 2002-08-25 22:01-0400\n"
- "PO-Revision-Date: 2002-05-18 04:21+0800\n"
- "Last-Translator: Paladin Liu <paladin@ms1.hinet.net>\n"
- "Language-Team: z10n <z10n>\n"
-@@ -26,11 +26,11 @@
- msgid "Gaim Chat"
- msgstr "Gaim - 聊天"
-
--#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2721
-+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
- #: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
--#: src/conversation.c:2873 src/dialogs.c:567 src/dialogs.c:3899
--#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:439
--#: src/prpl.c:686 src/server.c:1072
-+#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-+#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-+#: src/prpl.c:685 src/server.c:1072
- msgid "Close"
- msgstr "關閉"
-
-@@ -44,15 +44,15 @@
- msgstr ""
-
- #. Put the buttons in the box
--#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2832
--#: src/buddy_chat.c:1454 src/conversation.c:2397 src/conversation.c:2888
-+#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-+#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
- #: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
- #: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
- msgid "Add"
- msgstr "增加"
-
--#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2834
--#: src/buddy_chat.c:1456 src/conversation.c:2383 src/conversation.c:2885
-+#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-+#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
- #: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
- msgid "Remove"
- msgstr "移除"
-@@ -96,6 +96,35 @@
- msgid "Change"
- msgstr "Channel:"
-
-+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
-+msgid "Available"
-+msgstr ""
-+
-+#: src/protocols/gg/gg.c:72
-+msgid "Available for friends only"
-+msgstr "只有好友可以看到我上線"
-+
-+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
-+#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-+msgid "Away"
-+msgstr "離開"
-+
-+#: src/protocols/gg/gg.c:74
-+msgid "Away for friends only"
-+msgstr "離開（只有好友可以看到我）"
-+
-+#: src/protocols/gg/gg.c:75
-+msgid "Invisible"
-+msgstr "隱身"
-+
-+#: src/protocols/gg/gg.c:76
-+msgid "Invisible for friends only"
-+msgstr "隱身（只好好友可以看到我）"
-+
-+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
-+msgid "Unavailable"
-+msgstr ""
-+
- #: src/protocols/gg/gg.c:182
- msgid "Unable to resolve hostname."
- msgstr "無法解析主機名稱。"
-@@ -124,7 +153,7 @@
- msgid "Unknown Error Code."
- msgstr "未知的錯誤代碼。"
-
--#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2053
-+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
- #, c-format
- msgid "Status: %s"
- msgstr "狀態：%s"
-@@ -250,7 +279,7 @@
- msgstr "性別"
-
- #. Line 5
--#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
-+#: src/protocols/gg/gg.c:729 src/dialogs.c:1624 src/dialogs.c:2332
- msgid "City"
- msgstr "城市"
-
-@@ -328,8 +357,9 @@
- #. } else if (!strcmp(act, _("Set Dir Info"))) {
- #. show_set_dir(gc);
- #.
--#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
--#: src/protocols/jabber/jabber.c:3759 src/protocols/jabber/jabber.c:3772
-+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-+#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
-+#: src/dialogs.c:1741
- msgid "Change Password"
- msgstr "修改密碼"
-
-@@ -350,7 +380,7 @@
- msgstr "透過伺服器傳送訊息"
-
- #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
--#: src/protocols/jabber/jabber.c:2871 src/protocols/oscar/oscar.c:3593
-+#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
- #: src/protocols/toc/toc.c:1219
- msgid "Get Info"
- msgstr "取得資訊"
-@@ -389,7 +419,7 @@
- "connection?"
- msgstr "%s 要求和您用 DCC 來聊天。您想接受他的邀請嗎？"
-
--#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:316
-+#: src/protocols/irc/irc.c:1001 src/protocols/msn/msn.c:315
- msgid "Unable to write"
- msgstr "無法寫入"
-
-@@ -416,7 +446,7 @@
- msgid "Channel:"
- msgstr "Channel:"
-
--#: src/multi.c:549 src/protocols/irc/irc.c:1675
-+#: src/protocols/irc/irc.c:1675 src/multi.c:549
- msgid "Password:"
- msgstr "密碼："
-
-@@ -437,43 +467,34 @@
- msgid "New password same as old password! Password NOT Changed!"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:1103
-+#: src/protocols/jabber/jabber.c:1092
- msgid "Unknown"
- msgstr "未知"
-
--#: src/protocols/jabber/jabber.c:1125
--msgid "Unavailable"
--msgstr ""
--
--#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2587 src/buddy.c:2732
--#: src/protocols/jabber/jabber.c:1129
--msgid "Away"
--msgstr "離開"
--
--#: src/buddy.c:2892 src/protocols/jabber/jabber.c:1131
--#: src/protocols/jabber/jabber.c:1149
-+#: src/protocols/jabber/jabber.c:1120 src/protocols/jabber/jabber.c:1138
-+#: src/buddy.c:2887
- msgid "Online"
- msgstr "上線"
-
--#: src/protocols/jabber/jabber.c:1133
-+#: src/protocols/jabber/jabber.c:1122
- msgid "Extended Away"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:1135
-+#: src/protocols/jabber/jabber.c:1124
- msgid "Do Not Disturb"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:1445
-+#: src/protocols/jabber/jabber.c:1434
- #, c-format
- msgid "Error %s: %s"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:1448
-+#: src/protocols/jabber/jabber.c:1437
- #, fuzzy
- msgid "Unknown Error in presence"
- msgstr "未知的錯誤代碼。"
-
--#: src/protocols/jabber/jabber.c:1618
-+#: src/protocols/jabber/jabber.c:1607
- #, fuzzy, c-format
- msgid "The user %s wants to add you to their buddy list."
- msgstr ""
-@@ -481,381 +502,379 @@
- "\n"
- "您想將他（她）加入到您的好友名單中嗎？"
-
--#: src/protocols/jabber/jabber.c:1643
-+#: src/protocols/jabber/jabber.c:1632
- msgid "No such user"
- msgstr "沒有這個使用者"
-
--#: src/protocols/jabber/jabber.c:1645 src/protocols/jabber/jabber.c:2352
--#: src/protocols/jabber/jabber.c:2517
-+#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-+#: src/protocols/jabber/jabber.c:2506
- msgid "Jabber Error"
- msgstr "Jabber 錯誤"
-
--#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1730
--#: src/protocols/msn/msn.c:1111
-+#: src/protocols/jabber/jabber.c:1719 src/protocols/msn/msn.c:1110
-+#: src/dialogs.c:887
- msgid "Buddies"
- msgstr "好友"
-
--#: src/protocols/jabber/jabber.c:1793
-+#: src/protocols/jabber/jabber.c:1782
- msgid "Authenticating"
- msgstr "認證中"
-
--#: src/protocols/jabber/jabber.c:1830
-+#: src/protocols/jabber/jabber.c:1819
- msgid "Unknown login error"
- msgstr "未知的登入錯誤"
-
--#: src/protocols/jabber/jabber.c:2021
-+#: src/protocols/jabber/jabber.c:2010
- #, fuzzy
- msgid "Password successfully changed."
- msgstr "密碼修改成功"
-
--#: src/protocols/jabber/jabber.c:2023
-+#: src/protocols/jabber/jabber.c:2012
- #, fuzzy
- msgid "Password Change"
- msgstr "Gaim - 修改密碼"
-
--#: src/protocols/jabber/jabber.c:2065 src/protocols/jabber/jabber.c:3687
-+#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
- msgid "Connection lost"
- msgstr "失去連線"
-
--#: src/protocols/jabber/jabber.c:2067 src/protocols/jabber/jabber.c:2099
--#: src/protocols/jabber/jabber.c:3689 src/protocols/jabber/jabber.c:3735
--#: src/protocols/msn/msn.c:1744 src/protocols/msn/msn.c:1773
-+#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-+#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-+#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
- msgid "Unable to connect"
- msgstr "無法連線"
-
--#: src/protocols/jabber/jabber.c:2073
-+#: src/protocols/jabber/jabber.c:2062
- msgid "Connected"
- msgstr "連線成功"
-
--#: src/protocols/jabber/jabber.c:2076
-+#: src/protocols/jabber/jabber.c:2065
- msgid "Requesting Authentication Method"
- msgstr "要求認證的方式"
-
- #. we have no chats yet
--#: src/protocols/jabber/jabber.c:2094 src/protocols/msn/msn.c:1765
-+#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
- msgid "Connecting"
- msgstr "連線中"
-
--#: src/protocols/jabber/jabber.c:2351 src/protocols/jabber/jabber.c:2516
-+#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
- #, fuzzy
- msgid "Invalid Jabber I.D."
- msgstr "無效的名稱"
-
--#: src/protocols/jabber/jabber.c:2484
-+#: src/protocols/jabber/jabber.c:2473
- msgid "Room:"
- msgstr "聊天室："
-
--#: src/protocols/jabber/jabber.c:2488
-+#: src/protocols/jabber/jabber.c:2477
- msgid "Server:"
- msgstr "伺服器："
-
--#: src/protocols/jabber/jabber.c:2493
-+#: src/protocols/jabber/jabber.c:2482
- msgid "Handle:"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:2550
-+#: src/protocols/jabber/jabber.c:2539
- #, fuzzy
- msgid "Chats"
- msgstr "聊天"
-
--#: src/protocols/jabber/jabber.c:2865
-+#: src/protocols/jabber/jabber.c:2854
- #, fuzzy
- msgid "View Error Msg"
- msgstr "觀看日誌"
-
--#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2876
--#: src/protocols/oscar/oscar.c:3606
-+#: src/protocols/jabber/jabber.c:2865 src/protocols/oscar/oscar.c:3606
-+#: src/buddy_chat.c:886
- msgid "Get Away Msg"
- msgstr "取得離線訊息"
-
--#: src/protocols/jabber/jabber.c:2893
-+#: src/protocols/jabber/jabber.c:2882
- msgid "Remove From Roster"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:3087
-+#: src/protocols/jabber/jabber.c:3076
- msgid "Full Name"
- msgstr "全名"
-
--#: src/protocols/jabber/jabber.c:3088
-+#: src/protocols/jabber/jabber.c:3077
- msgid "Family Name"
- msgstr "姓"
-
--#: src/protocols/jabber/jabber.c:3089
-+#: src/protocols/jabber/jabber.c:3078
- msgid "Given Name"
- msgstr "給予一個名字"
-
--#: src/protocols/jabber/jabber.c:3090
-+#: src/protocols/jabber/jabber.c:3079
- msgid "Nickname"
- msgstr "暱稱"
-
--#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3091
-+#: src/protocols/jabber/jabber.c:3080 src/dialogs.c:2525
- msgid "URL"
- msgstr "URL"
-
--#: src/protocols/jabber/jabber.c:3092
-+#: src/protocols/jabber/jabber.c:3081
- msgid "Street Address"
- msgstr "街道地址"
-
--#: src/protocols/jabber/jabber.c:3093
-+#: src/protocols/jabber/jabber.c:3082
- msgid "Extended Address"
- msgstr "其他地址"
-
--#: src/protocols/jabber/jabber.c:3094
-+#: src/protocols/jabber/jabber.c:3083
- msgid "Locality"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:3095
-+#: src/protocols/jabber/jabber.c:3084
- msgid "Region"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:3096
-+#: src/protocols/jabber/jabber.c:3085
- msgid "Postal Code"
- msgstr "郵遞區號"
-
- #. Line 7
--#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3097
-+#: src/protocols/jabber/jabber.c:3086 src/dialogs.c:1646 src/dialogs.c:2354
- msgid "Country"
- msgstr "國家"
-
--#: src/protocols/jabber/jabber.c:3098
-+#: src/protocols/jabber/jabber.c:3087
- msgid "Telephone"
- msgstr "電話"
-
--#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3099
-+#: src/protocols/jabber/jabber.c:3088 src/dialogs.c:2430
- msgid "Email"
- msgstr "電子郵件"
-
--#: src/protocols/jabber/jabber.c:3100
-+#: src/protocols/jabber/jabber.c:3089
- msgid "Organization Name"
- msgstr "組織名稱"
-
--#: src/protocols/jabber/jabber.c:3101
-+#: src/protocols/jabber/jabber.c:3090
- msgid "Organization Unit"
- msgstr "組織單位"
-
--#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3102
-+#: src/protocols/jabber/jabber.c:3091 src/prefs.c:2000
- msgid "Title"
- msgstr "離開原因的標題"
-
--#: src/protocols/jabber/jabber.c:3103
-+#: src/protocols/jabber/jabber.c:3092
- msgid "Role"
- msgstr ""
-
--#: src/protocols/jabber/jabber.c:3104
-+#: src/protocols/jabber/jabber.c:3093
- msgid "Birthday"
- msgstr "生日"
-
- #. Right side: frame with description and the filepath of plugin
--#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3105
-+#: src/protocols/jabber/jabber.c:3094 src/dialogs.c:2533 src/plugins.c:211
- msgid "Description"
- msgstr "描述"
-
--#: src/protocols/jabber/jabber.c:3130
-+#: src/protocols/jabber/jabber.c:3119
- msgid ""
- "All items below are optional. Enter only the information with which you feel "
- "comfortable"
--msgstr ""
--"以ä¸\8bæ\89\80æ\9c\89ç\9a\84æ¬\84ä½\8dé\83½æ\98¯é\81¸æ\93\87æ\80§ç\9a\84ã\80\82æ\82¨å\8fªè¦\81輸å\85¥æ\82¨æ\83³è¼¸å\85¥æ\82¨æ\83³å¡"
--"«å\85¥ç\9a\84è¨\8aæ\81¯å\8d³å\8f¯"
-+msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
-
--#: src/protocols/jabber/jabber.c:3131
-+#: src/protocols/jabber/jabber.c:3120
- msgid "User Identity"
- msgstr "使用者識別"
-
--#: src/protocols/jabber/jabber.c:3543
-+#: src/protocols/jabber/jabber.c:3532
- msgid "Gaim - Edit Jabber vCard"
- msgstr "Gaim - 編輯 Jabber vCard"
-
--#: src/protocols/jabber/jabber.c:3617
-+#: src/protocols/jabber/jabber.c:3606
- msgid "Server Registration successful!"
- msgstr "伺服器註冊成功！"
-
--#: src/protocols/jabber/jabber.c:3644
-+#: src/protocols/jabber/jabber.c:3633
- msgid "Unknown registration error"
- msgstr "未知的註冊錯誤"
-
--#: src/protocols/jabber/jabber.c:3753 src/protocols/jabber/jabber.c:3768
-+#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
- msgid "Set User Info"
- msgstr "設定使用者資訊"
-
--#: src/protocols/msn/msn.c:231
-+#: src/protocols/msn/msn.c:230
- msgid "Syntax Error (probably a Gaim bug)"
- msgstr ""
-
--#: src/protocols/msn/msn.c:234
-+#: src/protocols/msn/msn.c:233
- msgid "Invalid Parameter (probably a Gaim bug)"
- msgstr ""
-
--#: src/protocols/msn/msn.c:237
-+#: src/protocols/msn/msn.c:236
- #, fuzzy
- msgid "Invalid User"
- msgstr "無效的名稱"
-
--#: src/protocols/msn/msn.c:240
-+#: src/protocols/msn/msn.c:239
- msgid "Fully Qualified Domain Name missing"
- msgstr ""
-
--#: src/protocols/msn/msn.c:243
-+#: src/protocols/msn/msn.c:242
- msgid "Already Login"
- msgstr ""
-
--#: src/protocols/msn/msn.c:246
-+#: src/protocols/msn/msn.c:245
- #, fuzzy
- msgid "Invalid Username"
- msgstr "無效的名稱"
-
--#: src/protocols/msn/msn.c:249
-+#: src/protocols/msn/msn.c:248
- #, fuzzy
- msgid "Invalid Friendly Name"
- msgstr "無效的名稱"
-
--#: src/protocols/msn/msn.c:252
-+#: src/protocols/msn/msn.c:251
- msgid "List Full"
- msgstr ""
-
--#: src/protocols/msn/msn.c:255
-+#: src/protocols/msn/msn.c:254
- msgid "Already there"
- msgstr ""
-
--#: src/protocols/msn/msn.c:258
-+#: src/protocols/msn/msn.c:257
- #, fuzzy
- msgid "Not on list"
- msgstr "失去連線"
-
--#: src/protocols/msn/msn.c:261
-+#: src/protocols/msn/msn.c:260
- msgid "User is offline"
- msgstr ""
-
--#: src/protocols/msn/msn.c:264
-+#: src/protocols/msn/msn.c:263
- msgid "Already in the mode"
- msgstr ""
-
--#: src/protocols/msn/msn.c:267
-+#: src/protocols/msn/msn.c:266
- msgid "Already in opposite list"
- msgstr ""
-
--#: src/protocols/msn/msn.c:270
-+#: src/protocols/msn/msn.c:269
- msgid "Switchboard failed"
- msgstr ""
-
--#: src/protocols/msn/msn.c:273
-+#: src/protocols/msn/msn.c:272
- msgid "Notify Transfer failed"
- msgstr ""
-
--#: src/protocols/msn/msn.c:277
-+#: src/protocols/msn/msn.c:276
- msgid "Required fields missing"
- msgstr ""
-
--#: src/protocols/msn/msn.c:280
-+#: src/protocols/msn/msn.c:279
- #, fuzzy
- msgid "Not logged in"
- msgstr "%s 登入。"
-
--#: src/protocols/msn/msn.c:284
-+#: src/protocols/msn/msn.c:283
- #, fuzzy
- msgid "Internal server error"
- msgstr "內部錯誤"
-
--#: src/protocols/msn/msn.c:287
-+#: src/protocols/msn/msn.c:286
- msgid "Database server error"
- msgstr ""
-
--#: src/protocols/msn/msn.c:290
-+#: src/protocols/msn/msn.c:289
- #, fuzzy
- msgid "File operation error"
- msgstr "內部連結錯誤\n"
-
--#: src/protocols/msn/msn.c:293
-+#: src/protocols/msn/msn.c:292
- #, fuzzy
- msgid "Memory allocation error"
- msgstr "主要連結錯誤\n"
-
--#: src/protocols/msn/msn.c:297
-+#: src/protocols/msn/msn.c:296
- #, fuzzy
- msgid "Server busy"
- msgstr "伺服器："
-
--#: src/protocols/msn/msn.c:300
-+#: src/protocols/msn/msn.c:299
- #, fuzzy
- msgid "Server unavailable"
- msgstr "目錄服務暫時不存在。"
-
--#: src/protocols/msn/msn.c:303
-+#: src/protocols/msn/msn.c:302
- msgid "Peer Notification server down"
- msgstr ""
-
--#: src/protocols/msn/msn.c:306
-+#: src/protocols/msn/msn.c:305
- #, fuzzy
- msgid "Database connect error"
- msgstr "內部連結錯誤\n"
-
--#: src/protocols/msn/msn.c:309
-+#: src/protocols/msn/msn.c:308
- msgid "Server is going down (abandon ship)"
- msgstr ""
-
--#: src/protocols/msn/msn.c:313
-+#: src/protocols/msn/msn.c:312
- #, fuzzy
- msgid "Error creating connection"
- msgstr "g003: 連線開啟錯誤。\n"
-
--#: src/protocols/msn/msn.c:319
-+#: src/protocols/msn/msn.c:318
- msgid "Session overload"
- msgstr ""
-
--#: src/protocols/msn/msn.c:322
-+#: src/protocols/msn/msn.c:321
- msgid "User is too active"
- msgstr ""
-
--#: src/protocols/msn/msn.c:325
-+#: src/protocols/msn/msn.c:324
- #, fuzzy
- msgid "Too many sessions"
- msgstr "匹配太多。"
-
--#: src/protocols/msn/msn.c:328
-+#: src/protocols/msn/msn.c:327
- msgid "Not expected"
- msgstr ""
-
--#: src/protocols/msn/msn.c:331
-+#: src/protocols/msn/msn.c:330
- msgid "Bad friend file"
- msgstr ""
-
--#: src/protocols/msn/msn.c:335
-+#: src/protocols/msn/msn.c:334
- #, fuzzy
- msgid "Authentication failed"
- msgstr "認證失敗。"
-
--#: src/protocols/msn/msn.c:338
-+#: src/protocols/msn/msn.c:337
- msgid "Not allowed when offline"
- msgstr ""
-
--#: src/protocols/msn/msn.c:341
-+#: src/protocols/msn/msn.c:340
- msgid "Not accepting new users"
- msgstr ""
-
--#: src/protocols/msn/msn.c:344
-+#: src/protocols/msn/msn.c:343
- msgid "User unverified"
- msgstr ""
-
--#: src/protocols/msn/msn.c:347
-+#: src/protocols/msn/msn.c:346
- #, fuzzy
- msgid "Unknown Error Code"
- msgstr "未知的錯誤代碼。"
-
--#: src/protocols/msn/msn.c:352 src/protocols/msn/msn.c:559
--#: src/protocols/msn/msn.c:814 src/protocols/msn/msn.c:2120
--#: src/protocols/msn/msn.c:2289 src/protocols/msn/msn.c:2342
-+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
- msgid "MSN Error"
- msgstr "MSN 錯誤"
-
--#: src/protocols/msn/msn.c:559
-+#: src/protocols/msn/msn.c:558
- msgid "A message may not have been received."
- msgstr ""
-
--#: src/protocols/msn/msn.c:814
-+#: src/protocols/msn/msn.c:813
- msgid "Gaim was unable to send a message"
- msgstr "Gaim 無法送出訊息"
-
--#: src/protocols/msn/msn.c:918
-+#: src/protocols/msn/msn.c:917
- #, fuzzy, c-format
- msgid "The user %s (%s) wants to add %s to his or her buddy list."
- msgstr ""
-@@ -863,97 +882,93 @@
- "\n"
- "您想將他（她）加入到您的好友名單中嗎？"
-
--#: src/protocols/msn/msn.c:1075
-+#: src/protocols/msn/msn.c:1074
- #, c-format
- msgid "The user %s (%s) wants to add you to their buddy list"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1176
-+#: src/protocols/msn/msn.c:1175
- msgid "You have been disconnected. You have signed on from another location."
- msgstr "您被中斷連線，因為您由其他的地方登入。"
-
--#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1682
-+#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
- #, fuzzy
- msgid "Error reading from server"
- msgstr "讀取 Socket 時發生錯誤。"
-
--#: src/protocols/msn/msn.c:1571
-+#: src/protocols/msn/msn.c:1568
- msgid "Requesting to send password"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1621
-+#: src/protocols/msn/msn.c:1618
- #, fuzzy
- msgid "Unable to send password"
- msgstr "無法讀取 Socket"
-
--#: src/protocols/msn/msn.c:1626
-+#: src/protocols/msn/msn.c:1623
- #, fuzzy
- msgid "Password sent"
- msgstr "密 碼："
-
--#: src/protocols/msn/msn.c:1751
-+#: src/protocols/msn/msn.c:1748
- #, fuzzy
- msgid "Unable to write to server"
- msgstr "無法連線到伺服器。"
-
--#: src/protocols/msn/msn.c:1757
-+#: src/protocols/msn/msn.c:1754
- #, fuzzy
- msgid "Synching with server"
- msgstr "向伺服器註冊"
-
--#: src/protocols/msn/msn.c:1922
--msgid "Available"
--msgstr ""
--
--#: src/protocols/msn/msn.c:1923
-+#: src/protocols/msn/msn.c:1920
- msgid "Away From Computer"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1924
-+#: src/protocols/msn/msn.c:1921
- msgid "Be Right Back"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1925
-+#: src/protocols/msn/msn.c:1922
- #, fuzzy
- msgid "Busy"
- msgstr "好友"
-
--#: src/protocols/msn/msn.c:1926
-+#: src/protocols/msn/msn.c:1923
- msgid "On The Phone"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1927
-+#: src/protocols/msn/msn.c:1924
- msgid "Out To Lunch"
- msgstr ""
-
--#: src/protocols/msn/msn.c:1928
-+#: src/protocols/msn/msn.c:1925
- #, fuzzy
- msgid "Hidden"
- msgstr "隱藏圖示"
-
--#: src/protocols/msn/msn.c:2044
-+#: src/protocols/msn/msn.c:2041
- msgid "Reset friendly name"
- msgstr ""
-
--#: src/protocols/msn/msn.c:2120
-+#: src/protocols/msn/msn.c:2114
- msgid "Friendly name too long."
- msgstr ""
-
--#: src/protocols/msn/msn.c:2135 src/protocols/msn/msn.c:2156
-+#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
- #, fuzzy
- msgid "Set Friendly Name"
- msgstr "姓"
-
--#: src/protocols/msn/msn.c:2136
-+#: src/protocols/msn/msn.c:2130
- #, fuzzy
- msgid "Set Friendly Name:"
- msgstr "帳 號："
-
--#: src/protocols/msn/msn.c:2137
-+#: src/protocols/msn/msn.c:2131
- msgid "Reset All Friendly Names"
- msgstr ""
-
--#: src/protocols/msn/msn.c:2289 src/protocols/msn/msn.c:2342
-+#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
- msgid "Invalid name"
- msgstr "無效的名稱"
-
-@@ -1051,9 +1066,8 @@
- "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 ""
--"æ\82¨ç\9a\84é\80£ç·\9aï¼\8fæ\96·ç·\9aå\8b\95ä½\9c太é\81\8eé »ç¹\81ã\80\82è«\8bç\89å¾\85å\8d\81å\88\86é\90\98å¾\8cå\86\8dè¡\8cé\87\8d試ã\80"
--"\82å¦\82æ\9e\9cæ\82¨ä¾\9dç\84¶ç¹¼çº\8cå\98\97試è\91\97é\80£ç·\9aï¼\8cé\82£éº¼æ\82¨ç\9a\84ç\89å¾\85æ\99\82é\96\93å°\87æ\9c\83æ\9b´å\8a ç"
--"\9a\84延é\95·ã\80\82"
-+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-+"線，那麼您的等待時間將會更加的延長。"
-
- #. client too old
- #: src/protocols/oscar/oscar.c:653
-@@ -1080,8 +1094,7 @@
- "the following reason:\n"
- "%s"
- msgstr ""
--"使用者 %lu "
--"因為下列原因，拒絕了您將其加入好友清單的要求：\n"
-+"使用者 %lu 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
- "%s"
-
- #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2456
-@@ -1114,73 +1127,57 @@
- #: src/protocols/oscar/oscar.c:1595
- #, fuzzy, c-format
- msgid "You missed %d message from %s because it was too large."
--msgstr ""
--"您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
-
- #: src/protocols/oscar/oscar.c:1596
- #, fuzzy, c-format
- msgid "You missed %d messages from %s because they were too large."
--msgstr ""
--"您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息太大了。"
-
- #: src/protocols/oscar/oscar.c:1605
- #, fuzzy, c-format
- msgid "You missed %d message from %s because the rate limit has been exceeded."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為訊息的發送速率到了上限。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為訊息的發送速率到了上限。"
-
- #: src/protocols/oscar/oscar.c:1606
- #, fuzzy, c-format
- msgid ""
- "You missed %d messages from %s because the rate limit has been exceeded."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為訊息的發送速率到了上限。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為訊息的發送速率到了上限。"
-
- #: src/protocols/oscar/oscar.c:1615
- #, fuzzy, c-format
- msgid "You missed %d message from %s because it was too evil."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為這個訊息可能不懷好意。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
-
- #: src/protocols/oscar/oscar.c:1616
- #, fuzzy, c-format
- msgid "You missed %d messages from %s because they are too evil."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為這些訊息可能不懷好意。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這些訊息可能不懷好意。"
-
- #: src/protocols/oscar/oscar.c:1625
- #, fuzzy, c-format
- msgid "You missed %d message from %s because you are too evil."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為這個訊息可能不懷好意。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
-
- #: src/protocols/oscar/oscar.c:1626
- #, fuzzy, c-format
- msgid "You missed %d messages from %s because you are too evil."
--msgstr ""
--"您遺失了由 %s 送來的 %d "
--"個訊息，因為這個訊息可能不懷好意。"
-+msgstr "您遺失了由 %s 送來的 %d 個訊息，因為這個訊息可能不懷好意。"
-
- #: src/protocols/oscar/oscar.c:1634
- #, fuzzy, c-format
- msgid "You missed %d message from %s for unknown reasons."
--msgstr ""
--"您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
-+msgstr "您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
-
- #: src/protocols/oscar/oscar.c:1635
- #, fuzzy, c-format
- msgid "You missed %d messages from %s for unknown reasons."
--msgstr ""
--"您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
-+msgstr "您因為不明的原因，而遺失了由 %s 送來的 %d 個訊息。"
-
--#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
--#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
--#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
-+#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
-+#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
-+#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3076 src/dialogs.c:3082
- msgid "Gaim - Error"
- msgstr "Gaim - 錯誤"
-
-@@ -1217,82 +1214,82 @@
- msgid "User information for %s unavailable: %s"
- msgstr "使用者 %s 的個人資訊並不存在：%s"
-
--#: src/buddy.c:2136 src/protocols/oscar/oscar.c:1802
-+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2131
- msgid "Buddy Icon"
- msgstr "好友圖示"
-
--#: src/buddy.c:2139 src/protocols/oscar/oscar.c:1805
-+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2134
- msgid "Voice"
- msgstr "聲音"
-
--#: src/buddy.c:2142 src/protocols/oscar/oscar.c:1808
-+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2137
- msgid "IM Image"
- msgstr "即時訊息圖片"
-
--#: src/buddy.c:498 src/buddy.c:2145 src/buddy.c:2586 src/prefs.c:2926
--#: src/protocols/oscar/oscar.c:1811
-+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:498 src/buddy.c:2140
-+#: src/buddy.c:2581 src/prefs.c:2926
- msgid "Chat"
- msgstr "聊天"
-
--#: src/buddy.c:2148 src/protocols/oscar/oscar.c:1814
-+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2143
- msgid "Get File"
- msgstr "接收文件"
-
--#: src/buddy.c:2151 src/protocols/oscar/oscar.c:1817
-+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2146
- msgid "Send File"
- msgstr "傳送檔案"
-
--#: src/buddy.c:2155 src/protocols/oscar/oscar.c:1821
-+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2150
- msgid "Games"
- msgstr "遊戲"
-
--#: src/buddy.c:2158 src/protocols/oscar/oscar.c:1824
-+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2153
- msgid "Stocks"
- msgstr "股票"
-
--#: src/buddy.c:2161 src/protocols/oscar/oscar.c:1827
-+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2156
- msgid "Send Buddy List"
- msgstr "送出好友清單"
-
--#: src/buddy.c:2164 src/protocols/oscar/oscar.c:1830
-+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2159
- msgid "EveryBuddy Bug"
- msgstr ""
-
--#: src/buddy.c:2167 src/protocols/oscar/oscar.c:1833
-+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2162
- msgid "AP User"
- msgstr ""
-
--#: src/buddy.c:2170 src/protocols/oscar/oscar.c:1836
-+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2165
- msgid "ICQ RTF"
- msgstr ""
-
--#: src/buddy.c:2173 src/protocols/oscar/oscar.c:1839
-+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2168
- msgid "Nihilist"
- msgstr ""
-
--#: src/buddy.c:2176 src/protocols/oscar/oscar.c:1842
-+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2171
- msgid "ICQ Server Relay"
- msgstr "ICQ 伺服器轉送"
-
--#: src/buddy.c:2179 src/protocols/oscar/oscar.c:1845
-+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2174
- msgid "ICQ Unknown"
- msgstr "ICQ 未知"
-
--#: src/buddy.c:2182 src/protocols/oscar/oscar.c:1848
-+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2177
- msgid "Trillian Encryption"
- msgstr ""
-
- #: src/protocols/oscar/oscar.c:1886
- msgid ""
--"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
--"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
--"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
--"SRC=\"admin_icon.gif\"> : Administrator <br><IMG SRC=\"ab_icon.gif\"> : "
--"ActiveBuddy Interactive Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless "
--"Device User<br>"
-+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-+"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-+"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-+"Administrator <br><IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive "
-+"Agent<br><IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"
- msgstr ""
-
- #: src/protocols/oscar/oscar.c:1914
-+#, c-format
- msgid ""
- "Username : <B>%s</B> %s <BR>\n"
- "Warning Level : <B>%d %%</B><BR>\n"
-@@ -1328,15 +1325,13 @@
- msgid ""
- "The last message was not sent because you are over the rate limit. Please "
- "wait 10 seconds and try again."
--msgstr ""
--"è¨\8aæ\81¯ä¸¦æ\9cªé\80\81å\87ºï¼\8cå\9b ç\82ºæ\82¨å·²ç¶\93é\81\94å\88°ç\99¼é\80\81è¨\8aæ\81¯é\80\9fç\8e\87ç\9a\84ä¸\8aé\99\90ã\80\82è«\8bç"
--"\89å¾\85å\8d\81ç§\92å¾\8cå\86\8d試ä¸\80次ã\80\82"
-+msgstr "訊息並未送出，因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
-
--#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
--#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
--#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
--#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
--#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
-+#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3541
-+#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
-+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
-+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
-+#: src/protocols/toc/toc.c:1888 src/dialogs.c:3604
- msgid "Error"
- msgstr "錯誤"
-
-@@ -1367,9 +1362,8 @@
- "let them see your IP address, and may be a security risk. Do you wish to "
- "continue?"
- msgstr ""
--"您選擇和 %s "
--"開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP "
--"位址，同時存在著系統安全上的顧慮。您確定要繼續嗎？"
-+"您選擇和 %s 開啟一個即時訊息。這樣子的做法會讓對方知道您的 IP 位址，同時存在"
-+"著系統安全上的顧慮。您確定要繼續嗎？"
-
- #: src/protocols/oscar/oscar.c:3568
- #, c-format
-@@ -1381,8 +1375,8 @@
- #: src/protocols/oscar/oscar.c:3575
- #, c-format
- msgid ""
--"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status "
--"message.</I><BR>"
-+"<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
-+"</I><BR>"
- msgstr ""
-
- #: src/protocols/oscar/oscar.c:3600
-@@ -1445,8 +1439,7 @@
- #: src/protocols/toc/toc.c:425
- #, c-format
- msgid "You missed an IM from %s because it was sent too fast."
--msgstr ""
--"您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
-+msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
-
- #: src/protocols/toc/toc.c:428
- msgid "Failure."
-@@ -1502,9 +1495,8 @@
- "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 ""
--"æ\82¨ç\9a\84é\80£ç·\9aï¼\8fæ\96·ç·\9aå\8b\95ä½\9c太é\81\8eé »ç¹\81ã\80\82è«\8bç\89å¾\85å\8d\81å\88\86é\90\98å¾\8cå\86\8dè¡\8cé\87\8d試ã\80"
--"\82å¦\82æ\9e\9cæ\82¨ä¾\9dç\84¶ç¹¼çº\8cå\98\97試è\91\97é\80£ç·\9aï¼\8cé\82£éº¼æ\82¨ç\9a\84ç\89å¾\85æ\99\82é\96\93å°\87æ\9c\83æ\9b´å\8a ç"
--"\9a\84延é\95·ã\80\82"
-+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-+"線，那麼您的等待時間將會更加的延長。"
-
- #: src/protocols/toc/toc.c:471
- #, c-format
-@@ -1526,8 +1518,7 @@
-
- #: src/protocols/toc/toc.c:598
- msgid "TOC has come back from its pause. You may now send messages again."
--msgstr ""
--"TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
-+msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
-
- #: src/protocols/toc/toc.c:599
- msgid "TOC Resume"
-@@ -1541,7 +1532,7 @@
- msgid "Password Change Successful"
- msgstr "密碼修改成功"
-
--#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
-+#: src/protocols/toc/toc.c:782 src/dialogs.c:1730
- msgid "Gaim - Password Change"
- msgstr "Gaim - 修改密碼"
-
-@@ -1630,6 +1621,13 @@
- "\n"
- "網址："
-
-+#: src/about.c:137
-+msgid ""
-+"\n"
-+"\n"
-+"IRC: #gaim on irc.freenode.net"
-+msgstr ""
-+
- #: src/about.c:147
- msgid ""
- "Active Developers\n"
-@@ -1658,7 +1656,7 @@
- msgid "Web Site"
- msgstr "網址"
-
--#: src/aim.c:153 src/buddy.c:2714
-+#: src/aim.c:153 src/buddy.c:2709
- msgid "Signoff"
- msgstr "登出"
-
-@@ -1682,11 +1680,11 @@
- msgid "Password: "
- msgstr "密 碼："
-
--#: src/aim.c:318 src/buddy.c:2718
-+#: src/aim.c:318 src/buddy.c:2713
- msgid "Quit"
- msgstr "退 出"
-
--#: src/aim.c:323 src/aim.c:831 src/buddy.c:2744
-+#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
- msgid "Accounts"
- msgstr "帳 號"
-
-@@ -1702,11 +1700,11 @@
- msgid "Options"
- msgstr "選 項"
-
--#: src/aim.c:360 src/aim.c:834 src/buddy.c:2762
-+#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
- msgid "Plugins"
- msgstr "插 件"
-
--#: src/aim.c:828 src/buddy.c:2754
-+#: src/aim.c:828 src/buddy.c:2749
- msgid "Preferences"
- msgstr "偏好設定"
-
-@@ -1764,17 +1762,17 @@
- msgid "Set All Away"
- msgstr "全部設為離開"
-
--#: src/buddy.c:493 src/buddy.c:2833 src/dialogs.c:942 src/dialogs.c:1089
-+#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
- msgid "Group"
- msgstr "群組"
-
--#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2584
-+#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
- #: src/buddy_chat.c:861 src/buddy_chat.c:1278
- msgid "IM"
- msgstr "即時訊息"
-
--#: src/buddy.c:500 src/buddy.c:2585 src/buddy_chat.c:877 src/buddy_chat.c:1286
--#: src/buddy_chat.c:1462 src/conversation.c:2906
-+#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-+#: src/buddy_chat.c:1462 src/conversation.c:2897
- msgid "Info"
- msgstr "訊息內容"
-
-@@ -1800,7 +1798,7 @@
- msgid "Un-Alias"
- msgstr "取消別名"
-
--#: src/buddy.c:1645 src/buddy.c:2737
-+#: src/buddy.c:1645 src/buddy.c:2732
- msgid "Buddy Pounce"
- msgstr ""
-
-@@ -1816,21 +1814,22 @@
- msgid "[Click to edit]"
- msgstr "[ 編輯 ]"
-
--#: src/buddy.c:2259
-+#: src/buddy.c:2254
- #, c-format
- msgid "Logged in: %s\n"
- msgstr "登入：%s\n"
-
--#: src/buddy.c:2271
-+#: src/buddy.c:2266
-+#, c-format
- msgid "Warnings: %d%%\n"
- msgstr "警告：%d%%\n"
-
--#: src/buddy.c:2283
-+#: src/buddy.c:2278
- #, c-format
- msgid "Capabilities: %s\n"
- msgstr "通訊協定相容性：%s\n"
-
--#: src/buddy.c:2287
-+#: src/buddy.c:2282
- #, c-format
- msgid ""
- "Alias: %s \n"
-@@ -1841,127 +1840,127 @@
- "帳號: %s\n"
- "%s%s%s%s%s%s"
-
--#: src/buddy.c:2291
-+#: src/buddy.c:2286
- msgid "Idle: "
- msgstr "閒置時間："
-
--#: src/buddy.c:2364 src/buddy.c:2369
-+#: src/buddy.c:2359 src/buddy.c:2364
- #, c-format
- msgid "%s logged in."
- msgstr "%s 登入。"
-
--#: src/buddy.c:2429 src/buddy.c:2434
-+#: src/buddy.c:2424 src/buddy.c:2429
- #, c-format
- msgid "%s logged out."
- msgstr "%s 登出。"
-
--#: src/buddy.c:2619
-+#: src/buddy.c:2614
- msgid "Information on selected Buddy"
- msgstr "顯示被選取好友的資訊"
-
--#: src/buddy.c:2620 src/dialogs.c:697
-+#: src/buddy.c:2615 src/dialogs.c:697
- msgid "Send Instant Message"
- msgstr "送出即時訊息"
-
--#: src/buddy.c:2621
-+#: src/buddy.c:2616
- msgid "Start/join a Buddy Chat"
- msgstr "開始或加入好友的聊天"
-
--#: src/buddy.c:2622
-+#: src/buddy.c:2617
- msgid "Activate Away Message"
- msgstr "開啟離開訊息"
-
--#: src/buddy.c:2694
-+#: src/buddy.c:2689
- msgid "File"
- msgstr "檔案"
-
--#: src/buddy.c:2698
-+#: src/buddy.c:2693
- msgid "Add A Buddy"
- msgstr "新增一個好友"
-
--#: src/buddy.c:2700
-+#: src/buddy.c:2695
- msgid "Join A Chat"
- msgstr "加入聊天"
-
--#: src/buddy.c:2702
-+#: src/buddy.c:2697
- msgid "New Instant Message"
- msgstr "新的即時訊息"
-
--#: src/buddy.c:2704 src/dialogs.c:759
-+#: src/buddy.c:2699 src/dialogs.c:759
- msgid "Get User Info"
- msgstr "取得使用者資訊"
-
--#: src/buddy.c:2709
-+#: src/buddy.c:2704
- msgid "Import Buddy List"
- msgstr "匯入好友清單"
-
--#: src/buddy.c:2727
-+#: src/buddy.c:2722
- msgid "Tools"
- msgstr "工具"
-
--#: src/buddy.c:2750
-+#: src/buddy.c:2745
- msgid "Protocol Actions"
- msgstr "Protocol 相關設定"
-
--#: src/buddy.c:2756
-+#: src/buddy.c:2751
- msgid "View System Log"
- msgstr "觀看系統日誌"
-
--#: src/buddy.c:2768
-+#: src/buddy.c:2763
- msgid "Perl"
- msgstr "Perl 插件"
-
--#: src/buddy.c:2771
-+#: src/buddy.c:2766
- msgid "Load Script"
- msgstr "讀取命令稿"
-
--#: src/buddy.c:2775
-+#: src/buddy.c:2770
- msgid "Unload All Scripts"
- msgstr "清除所有讀入的命令稿"
-
--#: src/buddy.c:2779
-+#: src/buddy.c:2774
- msgid "List Scripts"
- msgstr "列出命令稿"
-
--#: src/buddy.c:2787
-+#: src/buddy.c:2782
- msgid "Help"
- msgstr "輔助說明"
-
--#: src/buddy.c:2792
-+#: src/buddy.c:2787
- #, fuzzy
- msgid "Online Help"
- msgstr "上線"
-
--#: src/buddy.c:2793
-+#: src/buddy.c:2788
- #, fuzzy
- msgid "Debug Window"
- msgstr "顯示除錯視窗"
-
--#: src/buddy.c:2794
-+#: src/buddy.c:2789
- msgid "About Gaim"
- msgstr "關於 Gaim"
-
--#: src/buddy.c:2812 src/prefs.c:2905
-+#: src/buddy.c:2807 src/prefs.c:2905
- msgid "Buddy List"
- msgstr "好友清單"
-
--#: src/buddy.c:2865
-+#: src/buddy.c:2860
- msgid "Add a new Buddy"
- msgstr "新增一個好友"
-
--#: src/buddy.c:2866
-+#: src/buddy.c:2861
- msgid "Add a new Group"
- msgstr "新增一個群組"
-
--#: src/buddy.c:2867
-+#: src/buddy.c:2862
- msgid "Remove selected Buddy/Group"
- msgstr "移除被選取的好友或群組"
-
--#: src/buddy.c:2894
-+#: src/buddy.c:2889
- msgid "Edit Buddies"
- msgstr "修改好友清單"
-
--#: src/buddy.c:2937
-+#: src/buddy.c:2932
- msgid "Gaim - Buddy List"
- msgstr "Gaim - 好友清單"
-
-@@ -2056,199 +2055,199 @@
- msgstr "悄悄話"
-
- #: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
--#: src/conversation.c:2917
-+#: src/conversation.c:2908
- msgid "Send"
- msgstr "送出"
-
--#: src/buddy_chat.c:1458 src/conversation.c:2894
-+#: src/buddy_chat.c:1458 src/conversation.c:2885
- msgid "Block"
- msgstr "堵住他的嘴！"
-
--#: src/buddy_chat.c:1460 src/conversation.c:2900 src/dialogs.c:424
-+#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
- #: src/dialogs.c:453
- msgid "Warn"
- msgstr "警告"
-
--#: src/conversation.c:432
-+#: src/conversation.c:431
- msgid "Gaim - Save Conversation"
- msgstr "Gaim - 儲存聊天內容"
-
--#: src/conversation.c:493
-+#: src/conversation.c:492
- msgid "Gaim - Insert Image"
- msgstr "Gaim - 加入影像"
-
--#: src/conversation.c:1337
-+#: src/conversation.c:1336
- msgid "Unable to send message: too large"
- msgstr "無法送出訊息：太大了"
-
--#: src/conversation.c:1337 src/conversation.c:1341
-+#: src/conversation.c:1336 src/conversation.c:1340
- msgid "Message Error"
- msgstr "訊息錯誤"
-
--#: src/conversation.c:1341
-+#: src/conversation.c:1340
- msgid "Unable to send message: Unknown reason"
- msgstr "無法送出訊息：未知原因"
-
--#: src/conversation.c:1560
-+#: src/conversation.c:1559
- #, c-format
- msgid "Currently at %d, "
- msgstr "目前在 %d，"
-
--#: src/conversation.c:1568
-+#: src/conversation.c:1567
- #, c-format
- msgid "Setting position to %d\n"
- msgstr ""
-
--#: src/conversation.c:2177 src/prefs.c:1308
-+#: src/conversation.c:2170 src/prefs.c:1308
- msgid "Bold Text"
- msgstr "粗體文字"
-
--#: src/conversation.c:2177
-+#: src/conversation.c:2170
- msgid "Bold"
- msgstr "粗體"
-
--#: src/conversation.c:2181
-+#: src/conversation.c:2174
- msgid "Italics Text"
- msgstr "斜體文字"
-
--#: src/conversation.c:2182
-+#: src/conversation.c:2175
- msgid "Italics"
- msgstr "斜體"
-
--#: src/conversation.c:2185 src/prefs.c:1320
-+#: src/conversation.c:2178 src/prefs.c:1320
- msgid "Underline Text"
- msgstr "底線文字"
-
--#: src/conversation.c:2186
-+#: src/conversation.c:2179
- msgid "Underline"
- msgstr "底線"
-
--#: src/conversation.c:2190 src/prefs.c:1326
-+#: src/conversation.c:2183 src/prefs.c:1326
- msgid "Strike through Text"
- msgstr "刪除的文字"
-
--#: src/conversation.c:2190
-+#: src/conversation.c:2183
- msgid "Strike"
- msgstr "刪除"
-
--#: src/conversation.c:2196
-+#: src/conversation.c:2189
- msgid "Decrease font size"
- msgstr "縮小字體"
-
--#: src/conversation.c:2196
-+#: src/conversation.c:2189
- msgid "Small"
- msgstr "小"
-
--#: src/conversation.c:2199
-+#: src/conversation.c:2192
- msgid "Normal font size"
- msgstr "正常字體大小"
-
--#: src/conversation.c:2199
-+#: src/conversation.c:2192
- msgid "Normal"
- msgstr "正常"
-
--#: src/conversation.c:2202
-+#: src/conversation.c:2195
- msgid "Increase font size"
- msgstr "增大字體"
-
--#: src/conversation.c:2202
-+#: src/conversation.c:2195
- msgid "Big"
- msgstr "大"
-
--#: src/conversation.c:2209 src/dialogs.c:2883 src/dialogs.c:2907
-+#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
- msgid "Select Font"
- msgstr "選擇字型"
-
--#: src/conversation.c:2210
-+#: src/conversation.c:2203
- msgid "Font"
- msgstr "字型"
-
--#: src/conversation.c:2213 src/prefs.c:1356
-+#: src/conversation.c:2206 src/prefs.c:1356
- msgid "Text Color"
- msgstr "文字顏色"
-
--#: src/conversation.c:2214 src/conversation.c:2218
-+#: src/conversation.c:2207 src/conversation.c:2211
- msgid "Color"
- msgstr "顏色"
-
--#: src/conversation.c:2218 src/prefs.c:1374
-+#: src/conversation.c:2211 src/prefs.c:1374
- msgid "Background Color"
- msgstr "背景顏色"
-
--#: src/conversation.c:2225 src/dialogs.c:2506
-+#: src/conversation.c:2218 src/dialogs.c:2506
- msgid "Insert Link"
- msgstr "加入連結"
-
--#: src/conversation.c:2226
-+#: src/conversation.c:2219
- msgid "Link"
- msgstr "連結"
-
--#: src/conversation.c:2229
-+#: src/conversation.c:2222
- msgid "Insert smiley face"
- msgstr "加入一個笑臉"
-
--#: src/conversation.c:2229
-+#: src/conversation.c:2222
- msgid "Smiley"
- msgstr "微笑"
-
--#: src/conversation.c:2232
-+#: src/conversation.c:2225
- msgid "Insert IM Image"
- msgstr "加入即時訊息影像"
-
--#: src/conversation.c:2232
-+#: src/conversation.c:2225
- msgid "Image"
- msgstr "影像"
-
--#: src/conversation.c:2239
-+#: src/conversation.c:2232
- msgid "Enable logging"
- msgstr "開始記錄日誌"
-
--#: src/conversation.c:2240 src/prefs.c:254
-+#: src/conversation.c:2233 src/prefs.c:254
- msgid "Logging"
- msgstr "登入中"
-
--#: src/conversation.c:2249
-+#: src/conversation.c:2242
- msgid "Save Conversation"
- msgstr "儲存交談內容"
-
--#: src/conversation.c:2250 src/dialogs.c:1682 src/dialogs.c:1866
-+#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
- #: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
- msgid "Save"
- msgstr "儲存"
-
--#: src/conversation.c:2254
-+#: src/conversation.c:2247
- msgid "Toggle Sound"
- msgstr ""
-
--#: src/conversation.c:2255
-+#: src/conversation.c:2248
- msgid "Sound"
- msgstr "音效"
-
--#: src/conversation.c:2738
-+#: src/conversation.c:2729
- msgid "Gaim - Conversations"
- msgstr "Gaim - 交談"
-
--#: src/conversation.c:2825
-+#: src/conversation.c:2816
- msgid "Send message as: "
- msgstr "送出訊息為："
-
--#: src/conversation.c:3462
-+#: src/conversation.c:3453
- msgid "Gaim - Save Icon"
- msgstr "Gaim - 儲存圖示"
-
--#: src/conversation.c:3496
-+#: src/conversation.c:3487
- msgid "Disable Animation"
- msgstr "關閉動畫"
-
--#: src/conversation.c:3501
-+#: src/conversation.c:3492
- msgid "Enable Animation"
- msgstr "開啟動畫"
-
--#: src/conversation.c:3507
-+#: src/conversation.c:3498
- msgid "Hide Icon"
- msgstr "隱藏圖示"
-
--#: src/conversation.c:3513
-+#: src/conversation.c:3504
- msgid "Save Icon As..."
- msgstr "儲存圖示為…"
-
-@@ -2642,12 +2641,12 @@
- msgid "Gaim - Select Perl Script"
- msgstr "Gaim - 選擇 Perl 命令稿"
-
--#: src/gaimrc.c:1242
-+#: src/gaimrc.c:1235
- #, c-format
- msgid "Could not open config file %s."
- msgstr "無法開啟設定檔 %s。"
-
--#: src/gaimrc.c:1243
-+#: src/gaimrc.c:1236
- msgid "Preferences Error"
- msgstr "偏好設定錯誤"
-
-@@ -2723,8 +2722,8 @@
- "You cannot log this account in; you do not have the protocol it uses loaded, "
- "or the protocol does not have a login function."
- msgstr ""
--"æ\82¨ç\84¡æ³\95使ç\94¨é\80\99å\80\8b帳è\99\9fä¾\86ç\99»å\85¥ï¼\9bæ\82¨å\8f¯è\83½æ²\92æ\9c\89è¨å®\9aé\80\99å\80\8b帳è\99\9fæ\89\80ä½"
--"¿ç\94¨ç\9a\84 Protocolï¼\8cæ\88\96è\80\85é\80\99å\80\8b Protocol 並æ²\92æ\9c\89æ\8f\90ä¾\9bç\99»å\85¥ç\9a\84å\8a\9fè\83½ã\80\82"
-+"您無法使用這個帳號來登入；您可能沒有設定這個帳號所使用的 Protocol，或者這個 "
-+"Protocol 並沒有提供登入的功能。"
-
- #: src/multi.c:949
- msgid "Login Error"
-@@ -2968,8 +2967,7 @@
- "Not all protocols can use these proxy options. Please see the README file "
- "for details."
- msgstr ""
--"並ä¸\8dæ\98¯æ\89\80æ\9c\89ç\9a\84é\80\9aè¨\8aå\8d\94å®\9aé\83½å\8f¯ä»¥ä½¿ç\94¨é\80\99äº\9b代ç\90\86伺æ\9c\8då\99¨ç\9a\84é\81¸é \85ã\80"
--"\82\n"
-+"並不是所有的通訊協定都可以使用這些代理伺服器的選項。\n"
- "請參考 README 來獲得更進一步的資訊。"
-
- #: src/prefs.c:393
-@@ -3480,16 +3478,16 @@
- msgid "Gaim - New Mail"
- msgstr "Gaim - 新郵件"
-
--#: src/prpl.c:446
-+#: src/prpl.c:445
- msgid "Open Mail"
- msgstr "開啟郵件"
-
--#: src/prpl.c:571
-+#: src/prpl.c:570
- #, c-format
- msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
- msgstr ""
-
--#: src/prpl.c:579
-+#: src/prpl.c:578
- msgid ""
- "\n"
- "\n"
-@@ -3499,21 +3497,21 @@
- "\n"
- "您想將他（她）加入到您的好友名單中嗎？"
-
--#: src/prpl.c:622
-+#: src/prpl.c:621
- msgid ""
- "You do not currently have any protocols available that are able to register "
- "new accounts."
- msgstr ""
-
--#: src/prpl.c:659
-+#: src/prpl.c:658
- msgid "Gaim - Registration"
- msgstr "Gaim - 註冊"
-
--#: src/prpl.c:674
-+#: src/prpl.c:673
- msgid "Registration Information"
- msgstr "註冊資訊"
-
--#: src/prpl.c:691
-+#: src/prpl.c:690
- msgid "Register"
- msgstr "註冊"
-
-@@ -3590,18 +3588,6 @@
- msgid "Someone says your name in chat"
- msgstr ""
-
--#~ msgid "Available for friends only"
--#~ msgstr "只有好友可以看到我上線"
--
--#~ msgid "Away for friends only"
--#~ msgstr "離開（只有好友可以看到我）"
--
--#~ msgid "Invisible"
--#~ msgstr "隱身"
--
--#~ msgid "Invisible for friends only"
--#~ msgstr "隱身（只好好友可以看到我）"
--
- #~ msgid "Enable sounds"
- #~ msgstr "開啟音效"
-
projects / packages / pidgin.git / commitdiff