diff options
author | Michael McConville <mmcconville@mykolab.com> | 2015-06-21 16:30:41 -0500 |
---|---|---|
committer | Michael McConville <mmcconville@mykolab.com> | 2015-06-21 16:30:41 -0500 |
commit | 662fb30f8b7eae59a1a546929a21aae8f75d4ade (patch) | |
tree | 71185d9e7ab57dfb96ec5e435f7001477a9e821e | |
parent | 59439c8a3224adfe6c55e0210bfa61e4d0d5f11a (diff) | |
download | pidgin-662fb30f8b7eae59a1a546929a21aae8f75d4ade.tar.gz |
Remove Yahoo! Japan
29 files changed, 73 insertions, 788 deletions
diff --git a/libpurple/accounts.c b/libpurple/accounts.c index 19c652ac45..69b4cefc01 100644 --- a/libpurple/accounts.c +++ b/libpurple/accounts.c @@ -89,38 +89,6 @@ purple_accounts_schedule_save(void) save_timer = purple_timeout_add_seconds(5, save_cb, NULL); } -/********************************************************************* - * Reading from disk * - *********************************************************************/ -static void -migrate_yahoo_japan(PurpleAccount *account) -{ - /* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it - * to use the new yahoojp protocol. Also remove the account-specific settings - * we no longer need */ - - if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) { - if(purple_account_get_bool(account, "yahoojp", FALSE)) { - const char *serverjp = purple_account_get_string(account, "serverjp", NULL); - const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL); - - g_return_if_fail(serverjp != NULL); - g_return_if_fail(xferjp_host != NULL); - - purple_account_set_string(account, "server", serverjp); - purple_account_set_string(account, "xfer_host", xferjp_host); - - purple_account_set_protocol_id(account, "prpl-yahoojp"); - } - - /* these should always be nuked */ - purple_account_remove_setting(account, "yahoojp"); - purple_account_remove_setting(account, "serverjp"); - purple_account_remove_setting(account, "xferjp_host"); - - } -} - static void migrate_icq_server(PurpleAccount *account) { @@ -226,9 +194,6 @@ parse_settings(PurpleXmlNode *node, PurpleAccount *account) } /* we do this here because we need access to account settings to determine - * if we can/should migrate an old Yahoo! JAPAN account */ - migrate_yahoo_japan(account); - /* we do this here because we need access to account settings to determine * if we can/should migrate an ICQ account's server setting */ migrate_icq_server(account); /* we do this here because we need to do it before the user views the diff --git a/libpurple/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am index ce4f709357..45cfb86f32 100644 --- a/libpurple/protocols/yahoo/Makefile.am +++ b/libpurple/protocols/yahoo/Makefile.am @@ -9,8 +9,6 @@ YAHOOSOURCES = \ yahoochat.c \ yahoo.c \ yahoo.h \ - yahoojp.c \ - yahoojp.h \ yahoo_aliases.c \ yahoo_aliases.h \ yahoo_doodle.h \ diff --git a/libpurple/protocols/yahoo/Makefile.mingw b/libpurple/protocols/yahoo/Makefile.mingw index 3436980068..95e2237008 100644 --- a/libpurple/protocols/yahoo/Makefile.mingw +++ b/libpurple/protocols/yahoo/Makefile.mingw @@ -40,7 +40,6 @@ LIB_PATHS += -L. \ ## C_SRC = util.c \ yahoo.c \ - yahoojp.c \ yahoochat.c \ yahoo_aliases.c \ yahoo_doodle.c \ diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c index d6554fadeb..f06d2c0b24 100644 --- a/libpurple/protocols/yahoo/util.c +++ b/libpurple/protocols/yahoo/util.c @@ -121,14 +121,10 @@ gchar* yahoo_get_cookies(PurpleConnection *gc) char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean utf8) { - YahooData *yd = purple_connection_get_protocol_data(gc); char *ret; const char *to_codeset; GError *error = NULL; - if (yd->jp) - return g_strdup(str); - if (utf8) /* FIXME: maybe don't use utf8 if it'll fit in latin1 */ return g_strdup(str); @@ -161,7 +157,6 @@ char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean utf8) */ char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8) { - YahooData *yd = purple_connection_get_protocol_data(gc); char *ret; const char *from_codeset; GError *error = NULL; @@ -173,10 +168,7 @@ char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8) "to be UTF-8, but it was not. Will try another encoding.\n"); } - if (yd->jp) - from_codeset = "SHIFT_JIS"; - else - from_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset", "ISO-8859-1"); + from_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset", "ISO-8859-1"); ret = g_convert_with_fallback(str, -1, "UTF-8", from_codeset, NULL, NULL, NULL, &error); if (!ret) { diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c index 4fd01d61e8..62f3b99756 100644 --- a/libpurple/protocols/yahoo/yahoo.c +++ b/libpurple/protocols/yahoo/yahoo.c @@ -29,7 +29,6 @@ #include "ymsg.h" #include "yahoo.h" -#include "yahoojp.h" #include "yahoochat.h" #include "yahoo_aliases.h" #include "yahoo_doodle.h" @@ -37,7 +36,6 @@ #include "yahoo_picture.h" static PurpleProtocol *yahoo_protocol = NULL; -static PurpleProtocol *yahoojp_protocol = NULL; static GSList *cmds = NULL; @@ -386,20 +384,14 @@ static gboolean plugin_load(PurplePlugin *plugin, GError **error) { yahoo_protocol_register_type(plugin); - yahoojp_protocol_register_type(plugin); yahoo_protocol = purple_protocols_add(YAHOO_TYPE_PROTOCOL, error); if (!yahoo_protocol) return FALSE; - yahoojp_protocol = purple_protocols_add(YAHOOJP_TYPE_PROTOCOL, error); - if (!yahoojp_protocol) - return FALSE; - yahoo_init_colorht(); yahoo_register_commands(); - yahoojp_register_commands(); purple_signal_connect(purple_get_core(), "uri-handler", yahoo_protocol, PURPLE_CALLBACK(yahoo_uri_handler), NULL); @@ -410,14 +402,10 @@ plugin_load(PurplePlugin *plugin, GError **error) static gboolean plugin_unload(PurplePlugin *plugin, GError **error) { - yahoojp_unregister_commands(); yahoo_unregister_commands(); yahoo_dest_colorht(); - if (!purple_protocols_remove(yahoojp_protocol, error)) - return FALSE; - if (!purple_protocols_remove(yahoo_protocol, error)) return FALSE; diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c index 49fdb41faf..d2863c5e65 100644 --- a/libpurple/protocols/yahoo/yahoo_aliases.c +++ b/libpurple/protocols/yahoo/yahoo_aliases.c @@ -40,8 +40,6 @@ /* I hate hardcoding this stuff, but Yahoo never sends us anything to use. Someone in the know may be able to tweak this URL */ #define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOO_CLIENT_VERSION "&useutf8=1&legenc=codepage-1252" #define YAHOO_ALIAS_UPDATE_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252" -#define YAHOOJP_ALIAS_FETCH_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&diffs=1&t=0&tags=short&rt=0&prog-ver=" YAHOOJP_CLIENT_VERSION -#define YAHOOJP_ALIAS_UPDATE_URL "http://address.yahoo.co.jp/yab/jp?v=XM&prog=ymsgr&.intl=jp&sync=1&tags=short&noclear=1" void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias); @@ -130,10 +128,7 @@ yahoo_fetch_aliases_cb(PurpleHttpConnection *http_conn, alias = NULL; /* Yahoo stores first and last names separately, lets put them together into a full name */ - if (yd->jp) - full_name = g_strstrip(g_strdup_printf("%s %s", (ln != NULL ? ln : "") , (fn != NULL ? fn : ""))); - else - full_name = g_strstrip(g_strdup_printf("%s %s", (fn != NULL ? fn : "") , (ln != NULL ? ln : ""))); + full_name = g_strstrip(g_strdup_printf("%s %s", (fn != NULL ? fn : "") , (ln != NULL ? ln : ""))); nick_name = (nn != NULL ? g_strstrip(g_strdup(nn)) : NULL); if (nick_name != NULL) @@ -199,8 +194,7 @@ yahoo_fetch_aliases(PurpleConnection *gc) PurpleHttpRequest *req; PurpleHttpCookieJar *cookiejar; - req = purple_http_request_new(yd->jp ? YAHOOJP_ALIAS_FETCH_URL : - YAHOO_ALIAS_FETCH_URL); + req = purple_http_request_new(YAHOO_ALIAS_FETCH_URL); /* XXX: see the other note about user-agent */ purple_http_request_header_set(req, "User-Agent", "Mozilla/4.0 (compatible; MSIE 5.5)"); @@ -282,7 +276,7 @@ yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias) PurpleHttpRequest *req; PurpleHttpCookieJar *cookiejar; YahooData *yd; - gchar *content; + gchar *content, *escaped_alias; struct callback_data *cb; YahooFriend *f; @@ -306,51 +300,28 @@ yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias) cb->id = g_strdup(yahoo_friend_get_alias_id(f)); cb->gc = gc; + escaped_alias = g_markup_escape_text(alias, -1); + if (cb->id == NULL) { /* No id for this buddy, so create an address book entry */ purple_debug_info("yahoo", "Creating '%s' as new alias for user '%s'\n", alias, who); - if (yd->jp) { - gchar *alias_jp = g_convert(alias, -1, "EUC-JP", "UTF-8", NULL, NULL, NULL); - gchar *converted_alias_jp = yahoo_convert_to_numeric(alias_jp); - content = g_strdup_printf("<ab k=\"%s\" cc=\"9\">\n" - "<ct a=\"1\" yi='%s' nn='%s' />\n</ab>\r\n", - purple_account_get_username(purple_connection_get_account(gc)), - who, converted_alias_jp); - g_free(converted_alias_jp); - g_free(alias_jp); - } else { - gchar *escaped_alias = g_markup_escape_text(alias, -1); - content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"9\">\n" - "<ct a=\"1\" yi='%s' nn='%s' />\n</ab>\r\n", - purple_account_get_username(purple_connection_get_account(gc)), - who, escaped_alias); - g_free(escaped_alias); - } + content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"9\">\n" + "<ct a=\"1\" yi='%s' nn='%s' />\n</ab>\r\n", + purple_account_get_username(purple_connection_get_account(gc)), + who, escaped_alias); + g_free(escaped_alias); } else { purple_debug_info("yahoo", "Updating '%s' as new alias for user '%s'\n", alias, who); - if (yd->jp) { - gchar *alias_jp = g_convert(alias, -1, "EUC-JP", "UTF-8", NULL, NULL, NULL); - gchar *converted_alias_jp = yahoo_convert_to_numeric(alias_jp); - content = g_strdup_printf("<ab k=\"%s\" cc=\"1\">\n" - "<ct e=\"1\" yi='%s' id='%s' nn='%s' pr='0' />\n</ab>\r\n", - purple_account_get_username(purple_connection_get_account(gc)), - who, cb->id, converted_alias_jp); - g_free(converted_alias_jp); - g_free(alias_jp); - } else { - gchar *escaped_alias = g_markup_escape_text(alias, -1); - content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"1\">\n" - "<ct e=\"1\" yi='%s' id='%s' nn='%s' pr='0' />\n</ab>\r\n", - purple_account_get_username(purple_connection_get_account(gc)), - who, cb->id, escaped_alias); - g_free(escaped_alias); - } + content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"1\">\n" + "<ct e=\"1\" yi='%s' id='%s' nn='%s' pr='0' />\n</ab>\r\n", + purple_account_get_username(purple_connection_get_account(gc)), + who, cb->id, escaped_alias); + g_free(escaped_alias); } - req = purple_http_request_new(yd->jp ? YAHOOJP_ALIAS_UPDATE_URL: - YAHOO_ALIAS_UPDATE_URL); + req = purple_http_request_new(YAHOO_ALIAS_UPDATE_URL); purple_http_request_set_method(req, "POST"); /* XXX: We get rs="ERROR:-100:No Login", when we set * YAHOO_CLIENT_USERAGENT (Mozilla/5.0) here. @@ -478,8 +449,7 @@ yahoo_set_userinfo_cb(PurpleConnection *gc, PurpleRequestFields *fields) } #endif - req = purple_http_request_new(yd->jp ? YAHOOJP_USERINFO_URL : - YAHOO_USERINFO_URL); + req = purple_http_request_new(YAHOO_USERINFO_URL); purple_http_request_set_method(req, "POST"); /* XXX: see the previous comment for user-agent */ purple_http_request_header_set(req, "User-Agent", diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c index 8dbca63382..4acf0decb2 100644 --- a/libpurple/protocols/yahoo/yahoo_filexfer.c +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c @@ -727,18 +727,9 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt) xd->is_relay = TRUE; account = purple_connection_get_account(gc); - if (yd->jp) - { - purple_dnsquery_a(account, YAHOOJP_XFER_RELAY_HOST, - YAHOOJP_XFER_RELAY_PORT, - yahoo_xfer_dns_connected_15, xfer); - } - else - { - purple_dnsquery_a(account, YAHOO_XFER_RELAY_HOST, - YAHOO_XFER_RELAY_PORT, - yahoo_xfer_dns_connected_15, xfer); - } + purple_dnsquery_a(account, YAHOO_XFER_RELAY_HOST, + YAHOO_XFER_RELAY_PORT, + yahoo_xfer_dns_connected_15, xfer); return; } diff --git a/libpurple/protocols/yahoo/yahoo_packet.c b/libpurple/protocols/yahoo/yahoo_packet.c index 2afdb00edb..face78616b 100644 --- a/libpurple/protocols/yahoo/yahoo_packet.c +++ b/libpurple/protocols/yahoo/yahoo_packet.c @@ -314,8 +314,7 @@ yahoo_packet_send_can_write(gpointer data, gint source, PurpleInputCondition con } -size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, - gboolean jp, guchar **buf) +size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, guchar **buf) { size_t pktlen = yahoo_packet_length(pkt); size_t len = YAHOO_PACKET_HDRLEN + pktlen; @@ -328,8 +327,6 @@ size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, if (wm) pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER); - else if (jp) - pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN); else pos += yahoo_put16(data + pos, YAHOO_PROTO_VER); pos += yahoo_put16(data + pos, 0x0000); @@ -354,7 +351,7 @@ int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd) if (yd->fd < 0) return -1; - len = yahoo_packet_build(pkt, 0, yd->wm, yd->jp, &data); + len = yahoo_packet_build(pkt, 0, yd->wm, &data); yahoo_packet_dump(data, len); if (yd->txhandler == 0) diff --git a/libpurple/protocols/yahoo/yahoo_packet.h b/libpurple/protocols/yahoo/yahoo_packet.h index 6fdbd3438b..df9b074a50 100644 --- a/libpurple/protocols/yahoo/yahoo_packet.h +++ b/libpurple/protocols/yahoo/yahoo_packet.h @@ -128,7 +128,6 @@ struct yahoo_packet { #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065 #define YAHOO_PROTO_VER 0x0010 -#define YAHOO_PROTO_VER_JAPAN 0x0010 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4) @@ -139,8 +138,7 @@ void yahoo_packet_hash_str(struct yahoo_packet *pkt, int key, const char *value) void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value); int yahoo_packet_send(struct yahoo_packet *pkt, YahooData *yd); int yahoo_packet_send_and_free(struct yahoo_packet *pkt, YahooData *yd); -size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, gboolean jp, -guchar **buf); +size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, guchar **buf); void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len); void yahoo_packet_write(struct yahoo_packet *pkt, guchar *data); void yahoo_packet_dump(guchar *data, int len); diff --git a/libpurple/protocols/yahoo/yahoo_picture.c b/libpurple/protocols/yahoo/yahoo_picture.c index 0c4d51bfc8..c3c21c8ae8 100644 --- a/libpurple/protocols/yahoo/yahoo_picture.c +++ b/libpurple/protocols/yahoo/yahoo_picture.c @@ -404,7 +404,7 @@ yahoo_buddy_icon_build_packet(struct yahoo_buddy_icon_upload_data *d) yahoo_packet_hash_str(pkt, 27, d->filename); yahoo_packet_hash_str(pkt, 14, ""); /* 4 padding for the 29 key name */ - pkt_buf_len = yahoo_packet_build(pkt, 4, FALSE, yd->jp, &pkt_buf); + pkt_buf_len = yahoo_packet_build(pkt, 4, FALSE, &pkt_buf); yahoo_packet_free(pkt); /* There's no magic here, we just need to prepend in reverse order */ @@ -428,8 +428,7 @@ yahoo_buddy_icon_upload(PurpleConnection *gc, req = purple_http_request_new(NULL); purple_http_request_set_url_printf(req, "http://%s/notifyft", - purple_account_get_string(account, "xfer_host", yd->jp ? - YAHOOJP_XFER_HOST : YAHOO_XFER_HOST)); + purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST)); purple_http_request_set_method(req, "POST"); cjar = purple_http_request_get_cookie_jar(req); purple_http_cookie_jar_set(cjar, "T", yd->cookie_t); diff --git a/libpurple/protocols/yahoo/yahoo_profile.c b/libpurple/protocols/yahoo/yahoo_profile.c index 5666b8d68b..cc825f822c 100644 --- a/libpurple/protocols/yahoo/yahoo_profile.c +++ b/libpurple/protocols/yahoo/yahoo_profile.c @@ -413,7 +413,7 @@ static const profile_strings_node_t profile_strings[] = { NULL }, { JA, "ja", "EUC-JP", - "Yahoo! JAPAN ID:", + "Yahoo! ID:", "非公開", "無回答", "メール:", @@ -426,11 +426,7 @@ static const profile_strings_node_t profile_strings[] = { "趣味:", "最近の出来事:", NULL, -#if 0 - "おすすめサイト", -#else - "自己PR", /* "Self description" comes before "Links" for yahoo.co.jp */ -#endif + "おすすめサイト", /* XXX: this used to have a Yahoo Japan-specific annotation */ NULL, NULL, NULL, @@ -796,8 +792,7 @@ yahoo_got_info(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, user_info = purple_notify_user_info_new(); - title = yd->jp ? _("Yahoo! Japan Profile") : - _("Yahoo! Profile"); + title = _("Yahoo! Profile"); /* Get the tooltip info string */ yahoo_extract_user_info_text(user_info, info_data); @@ -821,7 +816,7 @@ yahoo_got_info(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* Construct the correct profile URL */ s = g_string_sized_new(80); /* wild guess */ - g_string_printf(s, "%s%s", (yd->jp? YAHOOJP_PROFILE_URL: YAHOO_PROFILE_URL), + g_string_printf(s, "%s%s", YAHOO_PROFILE_URL, info_data->name); profile_url_text = g_string_free(s, FALSE); s = NULL; @@ -949,7 +944,6 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, gpointer _info2_data) { YahooGetInfoStepTwoData *info2_data = _info2_data; - YahooData *yd; gboolean found = FALSE; /* Temporary variables */ @@ -979,8 +973,6 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, g_return_if_fail(strings != NULL); - yd = purple_connection_get_protocol_data(info_data->gc); - fudged_buffer = purple_strcasereplace(url_buffer, "</dd>", "</dd><br>"); /* nuke the html, it's easier than trying to parse the horrid stuff */ stripped = purple_markup_strip_html(fudged_buffer); @@ -1023,7 +1015,7 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* extract their Yahoo! ID and put it in. Don't bother marking has_info as * true, since the Yahoo! ID will always be there */ if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->yahoo_id_string, (yd->jp ? 2 : 10), "\n", 0, + strings->yahoo_id_string, 10, "\n", 0, NULL, _("Yahoo! ID"), 0, NULL, NULL)) ; #endif @@ -1053,7 +1045,7 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* extract their Email address and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->my_email_string, (yd->jp ? 4 : 1), " ", 0, + strings->my_email_string, 1, " ", 0, strings->private_string, _("Email"), 0, NULL, NULL); /* extract the Nickname if it exists */ @@ -1063,27 +1055,27 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* extract their RealName and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->realname_string, (yd->jp ? 3 : 1), "\n", '\n', + strings->realname_string, 1, "\n", '\n', NULL, _("Real Name"), 0, NULL, NULL); /* extract their Location and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->location_string, (yd->jp ? 4 : 2), "\n", '\n', + strings->location_string, 2, "\n", '\n', NULL, _("Location"), 0, NULL, NULL); /* extract their Age and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->age_string, (yd->jp ? 2 : 3), "\n", '\n', + strings->age_string, 3, "\n", '\n', NULL, _("Age"), 0, NULL, NULL); /* extract their MaritalStatus and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->maritalstatus_string, (yd->jp ? 2 : 3), "\n", '\n', + strings->maritalstatus_string, 3, "\n", '\n', strings->no_answer_string, _("Marital Status"), 0, NULL, NULL); /* extract their Gender and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->gender_string, (yd->jp ? 2 : 3), "\n", '\n', + strings->gender_string, 3, "\n", '\n', strings->no_answer_string, _("Gender"), 0, NULL, NULL); /* extract their Occupation and put it in */ @@ -1096,12 +1088,11 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, * can also not appear. The way we delimit them is to successively * look for the next one that _could_ appear, and if all else fails, * we end the section by looking for the 'Links' heading, which is the - * next thing to follow this bunch. (For Yahoo Japan, we check for - * the "Description" ("Self PR") heading instead of "Links".) + * next thing to follow this bunch. */ if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->hobbies_string, (yd->jp ? 3 : 1), strings->latest_news_string, + strings->hobbies_string, 1, strings->latest_news_string, '\n', "\n", _("Hobbies"), 0, NULL, NULL)) { if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, @@ -1123,7 +1114,7 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, '\n', "\n", _("Latest News"), 0, NULL, NULL)) { found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - strings->latest_news_string, (yd->jp ? 2 : 1), strings->links_string, + strings->latest_news_string, 1, strings->links_string, '\n', "\n", _("Latest News"), 0, NULL, NULL); } else @@ -1135,8 +1126,6 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* Home Page will either be "No home page specified", * or "Home Page: " and a link. - * For Yahoo! Japan, if there is no home page specified, - * neither "No home page specified" nor "Home Page:" is shown. */ if (strings->home_page_string) { p = !strings->no_home_page_specified_string? NULL: @@ -1182,8 +1171,8 @@ yahoo_got_photo(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, /* extract the Last Updated date and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, - last_updated_utf8_string, (yd->jp ? 2 : 1), (yd->jp ? "\n" : " "), (yd->jp ? 0 : '\n'), NULL, - _("Last Update"), 0, NULL, (yd->jp ? NULL : yahoo_info_date_reformat)); + last_updated_utf8_string, 1, " ", '\n', NULL, + _("Last Update"), 0, NULL, yahoo_info_date_reformat); } } /* if (profile_state == PROFILE_STATE_DEFAULT) */ @@ -1266,5 +1255,5 @@ void yahoo_get_info(PurpleConnection *gc, const char *name) purple_http_connection_set_add(yd->http_reqs, purple_http_get_printf(gc, yahoo_got_info, data, "%s%s", - (yd->jp ? YAHOOJP_PROFILE_URL : YAHOO_PROFILE_URL), name)); + YAHOO_PROFILE_URL, name)); } diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c index 5f1ec47bb8..32412baabc 100644 --- a/libpurple/protocols/yahoo/yahoochat.c +++ b/libpurple/protocols/yahoo/yahoochat.c @@ -67,12 +67,11 @@ static void yahoo_chat_online(PurpleConnection *gc) pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE, yd->session_id); yahoo_packet_hash(pkt, "sssss", - 109, purple_connection_get_display_name(gc), - 1, purple_connection_get_display_name(gc), - 6, "abcde", - /* I'm not sure this is the correct way to set this. */ - 98, rll, - 135, yd->jp ? YAHOO_CLIENT_VERSION : YAHOOJP_CLIENT_VERSION); + 109, purple_connection_get_display_name(gc), + 1, purple_connection_get_display_name(gc), + 6, "abcde", + 98, rll, + 135, YAHOO_CLIENT_VERSION); yahoo_packet_send_and_free(pkt, yd); } @@ -1516,15 +1515,8 @@ PurpleRoomlist *yahoo_roomlist_get_list(PurpleConnection *gc) account = purple_connection_get_account(gc); - /* for Yahoo Japan, it appears there is only one valid URL and locale */ - if(purple_account_get_bool(account, "yahoojp", FALSE)) { - rll = YAHOOJP_ROOMLIST_LOCALE; - rlurl = YAHOOJP_ROOMLIST_URL; - } - else { /* but for the rest of the world that isn't the case */ - rll = purple_account_get_string(account, "room_list_locale", YAHOO_ROOMLIST_LOCALE); - rlurl = purple_account_get_string(account, "room_list", YAHOO_ROOMLIST_URL); - } + rll = purple_account_get_string(account, "room_list_locale", YAHOO_ROOMLIST_LOCALE); + rlurl = purple_account_get_string(account, "room_list", YAHOO_ROOMLIST_URL); url = g_strdup_printf("%s?chatcat=0&intl=%s", rlurl, rll); diff --git a/libpurple/protocols/yahoo/ymsg.c b/libpurple/protocols/yahoo/ymsg.c index 3873568234..8ad9d85d2a 100644 --- a/libpurple/protocols/yahoo/ymsg.c +++ b/libpurple/protocols/yahoo/ymsg.c @@ -76,11 +76,6 @@ yahoo_login_page_cb(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, gpointer _unused); #endif /* TRY_WEBMESSENGER_LOGIN */ -static gboolean yahoo_is_japan(PurpleAccount *account) -{ - return purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoojp"); -} - static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f) { char *status = NULL; @@ -1725,6 +1720,7 @@ static char *yahoo_decode(const char *text) *n = '\0'; + /* XXX: Is this related to Yahoo! Japan? If so, it should be removed. -mmcco */ if (strstr(text, "\033$B")) converted = g_convert(new, n - new, OUT_CHARSET, "iso-2022-jp", NULL, NULL, NULL); if (!converted) @@ -1737,11 +1733,10 @@ static char *yahoo_decode(const char *text) static void yahoo_process_mail(PurpleConnection *gc, struct yahoo_packet *pkt) { PurpleAccount *account = purple_connection_get_account(gc); - YahooData *yd = purple_connection_get_protocol_data(gc); const char *who = NULL; const char *email = NULL; const char *subj = NULL; - const char *yahoo_mail_url = (yd->jp? YAHOOJP_MAIL_URL: YAHOO_MAIL_URL); + const char *yahoo_mail_url = YAHOO_MAIL_URL; int count = 0; GSList *l = pkt->hash; @@ -1865,12 +1860,12 @@ static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt) 277, yd->cookie_y, 278, yd->cookie_t, 307, base64_string, - 244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID, + 244, YAHOO_CLIENT_VERSION_ID, 2, name, 2, "1", 59, yd->cookie_b, - 98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"), - 135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION); + 98, purple_account_get_string(account, "room_list_locale", "us"), + 135, YAHOO_CLIENT_VERSION); } else { /* don't try to send an empty B cookie - the server will be mad */ yahoo_packet_hash(pkt, "sssssssss", 1, name, @@ -1878,11 +1873,11 @@ static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt) 277, yd->cookie_y, 278, yd->cookie_t, 307, base64_string, - 244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID, + 244, YAHOO_CLIENT_VERSION_ID, 2, name, 2, "1", - 98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"), - 135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION); + 98, purple_account_get_string(account, "room_list_locale", "us"), + 135, YAHOO_CLIENT_VERSION); } if (yd->picture_checksum) @@ -2096,14 +2091,10 @@ static void yahoo_auth16_stage1_cb(PurpleHttpConnection *http_conn, g_free(token); } else { - /* OK to login, correct information provided */ - gboolean yahoojp = yahoo_is_japan(account); PurpleHttpRequest *req; req = purple_http_request_new(NULL); - purple_http_request_set_url_printf(req, - yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, - token); + purple_http_request_set_url_printf(req, YAHOO_LOGIN_URL, token); purple_http_request_header_set(req, "User-Agent", YAHOO_CLIENT_USERAGENT); purple_http_connection_set_add(yd->http_reqs, @@ -2119,12 +2110,10 @@ static void yahoo_auth16_stage1_cb(PurpleHttpConnection *http_conn, static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed) { YahooData *yd = purple_connection_get_protocol_data(gc); - PurpleAccount *account = purple_connection_get_account(gc); PurpleHttpRequest *req; struct yahoo_auth_data *auth_data = NULL; char *encoded_username; char *encoded_password; - gboolean yahoojp = yahoo_is_japan(account); purple_debug_info("yahoo", "Authentication: In yahoo_auth16_stage1\n"); @@ -2141,8 +2130,7 @@ static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed) encoded_password = g_strdup(purple_url_encode(purple_connection_get_password(gc))); req = purple_http_request_new(NULL); - purple_http_request_set_url_printf(req, - yahoojp ? YAHOOJP_TOKEN_URL : YAHOO_TOKEN_URL, + purple_http_request_set_url_printf(req, YAHOO_TOKEN_URL, encoded_username, encoded_password, purple_url_encode(seed)); purple_http_request_header_set(req, "User-Agent", YAHOO_CLIENT_USERAGENT); purple_http_connection_set_add(yd->http_reqs, purple_http_request(gc, @@ -2508,7 +2496,7 @@ static void yahoo_p2p_write_pkt(gint source, struct yahoo_packet *pkt) guchar *raw_packet; /*build the raw packet and send it to the host*/ - pkt_len = yahoo_packet_build(pkt, 0, 0, 0, &raw_packet); + pkt_len = yahoo_packet_build(pkt, 0, 0, &raw_packet); written = write(source, raw_packet, pkt_len); if (written < 0 || (gsize)written != pkt_len) purple_debug_warning("yahoo","p2p: couldn't write to the source\n"); @@ -3706,15 +3694,10 @@ static void yahoo_got_pager_server(PurpleHttpConnection *http_conn, purple_debug_error("yahoo", "Unable to retrieve server info: %s\n", purple_http_response_get_error(response)); - if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */ + if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port, + yahoo_got_connected, gc) == NULL) { purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, - _("Unable to connect: The server returned an empty response.")); - } else { - if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port, - yahoo_got_connected, gc) == NULL) { - purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, - _("Unable to connect")); - } + _("Unable to connect")); } } else { got_data = purple_http_response_get_data(response, NULL); @@ -3741,16 +3724,11 @@ static void yahoo_got_pager_server(PurpleHttpConnection *http_conn, purple_debug_error("yahoo", "No CS address retrieved! Server " "response:\n%s\n", got_data); - if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */ + if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port, + yahoo_got_connected, gc) == NULL) { purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, - _("Unable to connect: The server's response did not contain " - "the necessary information")); - } else - if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port, - yahoo_got_connected, gc) == NULL) { - purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, - _("Unable to connect")); - } + _("Unable to connect")); + } } } @@ -3775,7 +3753,6 @@ void yahoo_login(PurpleAccount *account) { purple_connection_set_display_name(gc, purple_account_get_username(account)); yd->gc = gc; - yd->jp = yahoo_is_japan(account); yd->yahoo_local_p2p_server_fd = -1; yd->fd = -1; yd->txhandler = 0; @@ -3800,8 +3777,7 @@ void yahoo_login(PurpleAccount *account) { /* Get the pager server. Actually start connecting in the callback since we * must have the contents of the HTTP response to proceed. */ - req = purple_http_request_new(yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : - YAHOO_PAGER_HOST_REQ_URL); + req = purple_http_request_new(YAHOO_PAGER_HOST_REQ_URL); purple_http_request_header_set(req, "User-Agent", YAHOO_CLIENT_USERAGENT); purple_http_connection_set_add(yd->http_reqs, purple_http_request(gc, req, yahoo_got_pager_server, yd)); @@ -4329,7 +4305,6 @@ yahoo_get_inbox_token_cb(PurpleHttpConnection *http_conn, PurpleConnection *gc = purple_http_conn_get_purple_connection(http_conn); gchar *url; - YahooData *yd = purple_connection_get_protocol_data(gc); PURPLE_ASSERT_CONNECTION_IS_VALID(gc); @@ -4337,7 +4312,7 @@ yahoo_get_inbox_token_cb(PurpleHttpConnection *http_conn, purple_debug_error("yahoo", "Requesting mail login token failed: %s\n", purple_http_response_get_error(response)); - url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL); + url = g_strdup(YAHOO_MAIL_URL); } else { /* Should we not be hardcoding the rd url? */ gchar *token; @@ -4361,7 +4336,6 @@ yahoo_get_inbox_token_cb(PurpleHttpConnection *http_conn, static void yahoo_show_inbox(PurpleProtocolAction *action) { /* Setup a cookie that can be used by the browser */ - /* XXX I have no idea how this will work with Yahoo! Japan. */ PurpleConnection *gc = action->connection; YahooData *yd = purple_connection_get_protocol_data(gc); diff --git a/libpurple/protocols/yahoo/ymsg.h b/libpurple/protocols/yahoo/ymsg.h index 8c35439ed2..7f1e93e605 100644 --- a/libpurple/protocols/yahoo/ymsg.h +++ b/libpurple/protocols/yahoo/ymsg.h @@ -1,5 +1,5 @@ /** - * @file ymsg.h The Yahoo! and Yahoo! JAPAN Protocols + * @file ymsg.h The Yahoo! Protocol * * purple * @@ -47,20 +47,6 @@ #define YAHOO_ROOMLIST_URL "http://insider.msg.yahoo.com/ycontent/" #define YAHOO_ROOMLIST_LOCALE "us" -/* Yahoo! JAPAN stuff */ -#define YAHOOJP_PAGER_HOST_REQ_URL "http://cs1.yahoo.co.jp/capacity" -#define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s" -#define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s" -#define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/" -#define YAHOOJP_MAIL_URL "http://mail.yahoo.co.jp/" -#define YAHOOJP_XFER_HOST "filetransfer.msg.yahoo.co.jp" -#define YAHOOJP_WEBCAM_HOST "wc.yahoo.co.jp" -/* not sure, must test: */ -#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp" -#define YAHOOJP_XFER_RELAY_PORT 80 -#define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/" -#define YAHOOJP_ROOMLIST_LOCALE "ja" - #define YAHOO_AUDIBLE_URL "http://l.yimg.com/pu/dl/aud" #define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg" @@ -68,7 +54,6 @@ #define YAHOO_SMS_CARRIER_URL "http://validate.msg.yahoo.com" #define YAHOO_USERINFO_URL "http://address.yahoo.com/yab/us?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252" -#define YAHOOJP_USERINFO_URL "http://address.yahoo.co.jp/yab/jp?v=XM&sync=1&tags=short&useutf8=1&noclear=1&legenc=codepage-1252" #define YAHOO_PICURL_SETTING "picture_url" #define YAHOO_PICCKSUM_SETTING "picture_checksum" @@ -92,9 +77,6 @@ #define YAHOO_CLIENT_VERSION_ID "4194239" #define YAHOO_CLIENT_VERSION "9.0.0.2162" -#define YAHOOJP_CLIENT_VERSION_ID "4186047" -#define YAHOOJP_CLIENT_VERSION "9.0.0.1727" - #define YAHOO_CLIENT_USERAGENT "Mozilla/5.0" #define YAHOO_CLIENT_USERAGENT_ALIAS "Mozilla/4.0 (compatible; MSIE 5.5)" @@ -222,7 +204,6 @@ typedef struct { char *cookie_t; char *cookie_b; int session_id; - gboolean jp; gboolean wm; /* connected w/ web messenger method */ /* picture aka buddy icon stuff */ char *picture_url; @@ -331,8 +312,8 @@ yahoo_account_use_http_proxy(PurpleConnection *conn); * @param gc The connection handle. * @param str The null terminated utf8 string to encode. * @param utf8 Whether to return a UTF-8 string. - * @return A g_malloc'ed string in the appropriate encoding. If jd->jp or - * utf8 is true then the string is copied verbatim. Otherwise the + * @return A g_malloc'ed string in the appropriate encoding. If utf8 + * is true then the string is copied verbatim. Otherwise the * encoding from account settings is used. */ gchar *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean utf8); diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in index a5a03fde71..19709a8af4 100644 --- a/pidgin/pixmaps/emotes/default/24/default.theme.in +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in @@ -319,98 +319,6 @@ male-fighter2.png o=> O=> female-fighter.png o-+ O-+ yin-yang.png (%) -# Following Yahoo! Messenger 8.1 -[Yahoo JAPAN] -happy.png :) :-) -question.png :-/ :-\\ -shocked.png :-O :O :-o :o -devil.png >:) -angel.png O:-) o:-) 0:-) -sick.png :-& -sleepy.png (:| -hypnotized.png @-) -on-the-phone.png :)] -sad.png :( :-( -amorous.png :x :-x :X :-X -angry.png X-( x-( X( x( -crying.png :(( -glasses-nerdy.png :-B :-b -quiet.png :-$ -drool.png =P~ =p~ -lying.png :^O :^o -call-me.png :-c -wink.png ;) ;-) -embarrassed.png :"> -mean.png :-> :> -laugh.png :)) :-)) -bye.png =; -arrogant.png [-( -thinking.png :-? -waiting.png :-w :-W -at-wits-end.png ~x( ~X( -excited.png :D :-D :d :-d -tongue.png :-P :P :-p :p -glasses-cool.png B-) b-) -neutral.png :| :-| -sleeping.png I-) i-) |-) -clown.png :o) :O) -doh.png #-o #-O -weep.png :-< -go-away.png :-h -lashes.png ;;) -kiss.png :-* :* -confused.png :-S :-s -sarcastic.png /:) -eyeroll.png 8-| -silly.png 8-} -clap.png =D> =d> -mad-tongue.png >:P >:p -time-out.png :-t :-T -hug-left.png >:D< >:d< -love-over.png =(( -hot.png #:-S #:-s -rotfl.png =)) :-j :-J -loser.png L-) l-) -party.png <:-P <:-p -nervous.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 ~:> -coffee.png ~o) ~O) -cow.png 3:-O 3:-o -dance.png \\:D/ \\:d/ -rose.png @};- -dont-know.png :-L :-l -skeleton.png 8-X 8-x -lamp.png *-:) -monkey.png :(|) -coins.png $-) -peace.png :)>- -pig.png :@) -pray.png [-o< [-O< -pumpkin.png (~~) -shame.png [-X [-x -flag.png **== -clover.png %%- -musical-note.png :-" -giggle.png ;)) -worship.png ^:)^ -star.png (*) -waving.png >:/ -talktohand.png :-@ - -# Only available after activating the Yahoo! Fighter IMVironment -male-fighter1.png o-> O-> -male-fighter2.png o=> O=> -female-fighter.png o-+ O-+ -yin-yang.png (%) - # MXit standard emoticons [MXit] diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in index 998b1c1b4f..db406da064 100644 --- a/pidgin/pixmaps/emotes/small/16/small.theme.in +++ b/pidgin/pixmaps/emotes/small/16/small.theme.in @@ -185,42 +185,6 @@ shame.png [-X [-x musical-note.png :-" star.png (*) -# Following Yahoo! Messenger 8.1 -[Yahoo JAPAN] -happy.png :) :-) -question.png :-/ :-\\ -shocked.png :-O :O :-o :o -devil.png >:) -angel.png O:-) o:-) 0:-) -sick.png :-& -sleepy.png (:| -sad.png :( :-( -amorous.png :x :-x :X :-X -angry.png X-( x-( X( x( -crying.png :(( -wink.png ;) ;-) -thinking.png :-? -excited.png :D :-D :d :-d -tongue.png :-P :P :-p :p -glasses-cool.png B-) b-) -neutral.png :| :-| -sleeping.png I-) i-) |-) -kiss.png :-* :* -confused.png :-S :-s -sarcastic.png /:) -eyeroll.png 8-| -hug-left.png >:D< >:d< -party.png <:-P <:-p - -# Hidden Yahoo emotes -coffee.png ~o) ~O) -rose.png @};- -dont-know.png :-L :-l -lamp.png *-:) -shame.png [-X [-x -musical-note.png :-" -star.png (*) - # MXit standard emoticons [MXit] diff --git a/po/POTFILES.in b/po/POTFILES.in index 30c96b2fc2..1c87324c3f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -188,7 +188,6 @@ libpurple/protocols/yahoo/yahoo_filexfer.c libpurple/protocols/yahoo/yahoo_packet.c libpurple/protocols/yahoo/yahoo_profile.c libpurple/protocols/yahoo/yahoochat.c -libpurple/protocols/yahoo/yahoojp.c libpurple/protocols/yahoo/ycht.c libpurple/protocols/yahoo/ymsg.c libpurple/protocols/zephyr/zephyr.c @@ -6620,7 +6620,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -10057,7 +10056,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "" @@ -13274,17 +13272,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13308,59 +13303,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13643,10 +13612,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6513,7 +6513,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9950,7 +9949,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2999 msgid "Encoding" msgstr "" @@ -13167,17 +13165,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13201,59 +13196,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13536,10 +13505,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" diff --git a/po/es_AR.po b/po/es_AR.po index f82b722b65..283ee532e9 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -6513,7 +6513,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9950,7 +9949,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2999 msgid "Encoding" msgstr "" @@ -13167,17 +13165,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13201,59 +13196,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13536,10 +13505,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6621,7 +6621,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -10058,7 +10057,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "" @@ -13275,17 +13273,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13309,59 +13304,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13644,10 +13613,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6509,7 +6509,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3709 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9941,7 +9940,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2982 msgid "Encoding" msgstr "" @@ -13149,17 +13147,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13183,59 +13178,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:928 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13514,10 +13483,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6513,7 +6513,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9950,7 +9949,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2999 msgid "Encoding" msgstr "" @@ -13167,17 +13165,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13201,59 +13196,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13536,10 +13505,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6515,7 +6515,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3709 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9955,7 +9954,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2990 msgid "Encoding" msgstr "" @@ -13181,17 +13179,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13215,59 +13210,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:928 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13546,10 +13515,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" diff --git a/po/ms_MY.po b/po/ms_MY.po index 39b62b5cca..c2359bb5fa 100644 --- a/po/ms_MY.po +++ b/po/ms_MY.po @@ -6618,7 +6618,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -10051,7 +10050,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2997 msgid "Encoding" msgstr "" @@ -13259,17 +13257,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13293,59 +13288,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13628,10 +13597,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6985,7 +6985,6 @@ msgstr "ping <identyfikator_Jabbera>: Wysyła ping do użytkownika/skład #: ../libpurple/protocols/jabber/jabber.c:3714 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "buzz: szepcze do użytkownika, aby uzyskać jego uwagę" @@ -9939,7 +9938,6 @@ msgstr "Wtyczka protokołu ICQ" #: ../libpurple/protocols/oscar/libicq.c:165 #: ../libpurple/protocols/yahoo/libyahoo.c:318 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 #: ../libpurple/protocols/zephyr/zephyr.c:3030 msgid "Encoding" msgstr "Kodowanie" @@ -12745,17 +12743,14 @@ msgid "Auth Domain" msgstr "Domena uwierzytelnienia" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "join <pokój>: dołącza do pokoju konferencji w sieci Yahoo!" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "list: wyświetla listę pokoi w sieci Yahoo!" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "doodle: prosi użytkownika o rozpoczęcia sesji Doodle" @@ -12779,54 +12774,29 @@ msgid "Yahoo! Protocol Plugin" msgstr "Wtyczka protokołu Yahoo!" #: ../libpurple/protocols/yahoo/libyahoo.c:309 -#: ../libpurple/protocols/yahoo/libyahoojp.c:207 msgid "Pager port" msgstr "Port pagera" #: ../libpurple/protocols/yahoo/libyahoo.c:312 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "File transfer server" msgstr "Serwer przesyłania plików" #: ../libpurple/protocols/yahoo/libyahoo.c:315 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "Chat room locale" msgstr "Lokalizacja pokoju konferencji" #: ../libpurple/protocols/yahoo/libyahoo.c:321 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Ignore conference and chatroom invitations" msgstr "Ignorowanie zaproszeń do konferencji" #: ../libpurple/protocols/yahoo/libyahoo.c:325 -#: ../libpurple/protocols/yahoo/libyahoojp.c:223 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "Użycie pośrednika konta dla połączeń HTTP i HTTPS" #: ../libpurple/protocols/yahoo/libyahoo.c:328 -#: ../libpurple/protocols/yahoo/libyahoojp.c:226 msgid "Chat room list URL" msgstr "Adres URL listy pokoi konferencji" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "Identyfikator Yahoo! Japan..." - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:182 -#: ../libpurple/protocols/yahoo/libyahoojp.c:184 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Wtyczka protokołu Yahoo! Japan" - #: ../libpurple/protocols/yahoo/libymsg.c:929 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13084,10 +13054,6 @@ msgstr "Nieobsługiwana metoda" msgid "Write Error" msgstr "Błąd zapisu" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:799 -msgid "Yahoo! Japan Profile" -msgstr "Profil Yahoo! Japan" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:800 msgid "Yahoo! Profile" msgstr "Profil Yahoo!" @@ -6513,7 +6513,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9950,7 +9949,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2999 msgid "Encoding" msgstr "" @@ -13167,17 +13165,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13201,59 +13196,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13536,10 +13505,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6509,7 +6509,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3709 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9941,7 +9940,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2990 msgid "Encoding" msgstr "" @@ -13149,17 +13147,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13183,59 +13178,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:928 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13514,10 +13483,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" @@ -6510,7 +6510,6 @@ msgstr "" #: ../libpurple/protocols/jabber/jabber.c:3717 #: ../libpurple/protocols/yahoo/libyahoo.c:53 -#: ../libpurple/protocols/yahoo/libyahoojp.c:50 msgid "buzz: Buzz a user to get their attention" msgstr "" @@ -9943,7 +9942,6 @@ msgstr "" #: ../libpurple/protocols/oscar/libicq.c:162 #: ../libpurple/protocols/yahoo/libyahoo.c:326 -#: ../libpurple/protocols/yahoo/libyahoojp.c:222 #: ../libpurple/protocols/zephyr/zephyr.c:2999 msgid "Encoding" msgstr "" @@ -13151,17 +13149,14 @@ msgid "Auth Domain" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:44 -#: ../libpurple/protocols/yahoo/libyahoojp.c:41 msgid "join <room>: Join a chat room on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:49 -#: ../libpurple/protocols/yahoo/libyahoojp.c:46 msgid "list: List rooms on the Yahoo network" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:57 -#: ../libpurple/protocols/yahoo/libyahoojp.c:54 msgid "doodle: Request user to start a Doodle session" msgstr "" @@ -13185,59 +13180,33 @@ msgid "Yahoo! Protocol Plugin" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:314 -#: ../libpurple/protocols/yahoo/libyahoojp.c:210 msgid "Pager port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:317 -#: ../libpurple/protocols/yahoo/libyahoojp.c:213 msgid "File transfer server" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:320 -#: ../libpurple/protocols/yahoo/libyahoojp.c:216 msgid "File transfer port" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:323 -#: ../libpurple/protocols/yahoo/libyahoojp.c:219 msgid "Chat room locale" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:329 -#: ../libpurple/protocols/yahoo/libyahoojp.c:225 msgid "Ignore conference and chatroom invitations" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:332 -#: ../libpurple/protocols/yahoo/libyahoojp.c:228 msgid "Use account proxy for HTTP and HTTPS connections" msgstr "" #: ../libpurple/protocols/yahoo/libyahoo.c:336 -#: ../libpurple/protocols/yahoo/libyahoojp.c:232 msgid "Chat room list URL" msgstr "" -#: ../libpurple/protocols/yahoo/libyahoojp.c:62 -msgid "Yahoo JAPAN ID..." -msgstr "" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#. * summary -#. * description -#: ../libpurple/protocols/yahoo/libyahoojp.c:185 -#: ../libpurple/protocols/yahoo/libyahoojp.c:187 -msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "" - #: ../libpurple/protocols/yahoo/libymsg.c:926 #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -13520,10 +13489,6 @@ msgstr "" msgid "Write Error" msgstr "" -#: ../libpurple/protocols/yahoo/yahoo_profile.c:797 -msgid "Yahoo! Japan Profile" -msgstr "" - #: ../libpurple/protocols/yahoo/yahoo_profile.c:798 msgid "Yahoo! Profile" msgstr "" |