pidgin: 4d24837d: String changes. I'm kind of blindly mak...
markdoliner at pidgin.im
markdoliner at pidgin.im
Fri Nov 14 15:00:38 EST 2008
-----------------------------------------------------------------
Revision: 4d24837d2aa60fa9273795d61abd66a4a39ba4bd
Ancestor: d8e13dc0df949475c94b4857e88aef9ed818aef6
Author: markdoliner at pidgin.im
Date: 2008-11-14T19:58:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4d24837d2aa60fa9273795d61abd66a4a39ba4bd
Modified files:
libpurple/protocols/msn/msn.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq_base.c
libpurple/protocols/qq/qq_network.c
libpurple/protocols/qq/qq_process.c
ChangeLog:
String changes. I'm kind of blindly making changes to the qq strings
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c 59ed480efeda3a36ddf1c0146ab12a25bddc938e
+++ libpurple/protocols/msn/msn.c 4660931f5d7e8df0b8d6a0723e616f36183fdd6a
@@ -2558,8 +2558,8 @@ static PurplePluginInfo info =
"prpl-msn", /**< id */
"MSN", /**< name */
DISPLAY_VERSION, /**< version */
- N_("Windows Live Messenger Protocol Plugin"), /**< summary */
- N_("Windows Live Messenger Protocol Plugin"), /**< description */
+ N_("Windows Live Messenger Protocol Plugin"), /**< summary */
+ N_("Windows Live Messenger Protocol Plugin"), /**< description */
NULL, /**< author */
PURPLE_WEBSITE, /**< homepage */
============================================================
--- libpurple/protocols/oscar/oscar.c b85a13700ff626e2ccbc8e65173ed1666bc8977d
+++ libpurple/protocols/oscar/oscar.c fccf04c11d8a2b4ecb784e6fdfd6473da13a9030
@@ -4807,7 +4807,7 @@ oscar_add_buddy(PurpleConnection *gc, Pu
gchar *buf;
buf = g_strdup_printf(_("Could not add the buddy %s because the username is invalid. Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."), buddy->name);
if (!purple_conv_present_error(buddy->name, account, buf))
- purple_notify_error(gc, NULL, _("Unable To Add"), buf);
+ purple_notify_error(gc, NULL, _("Unable to Add"), buf);
g_free(buf);
/* Remove from local list */
@@ -4926,7 +4926,7 @@ static int purple_ssi_parseerr(OscarData
purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason);
if (reason == 0x0005) {
- purple_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"),
+ purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"),
_("The AIM servers were temporarily unable to send your buddy list. Your buddy list is not lost, and will probably become available in a few minutes."));
if (od->getblisttimer > 0)
purple_timeout_remove(od->getblisttimer);
@@ -5277,7 +5277,7 @@ static int purple_ssi_parseack(OscarData
gchar *buf;
buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)")));
if ((retval->name != NULL) && !purple_conv_present_error(retval->name, purple_connection_get_account(gc), buf))
- purple_notify_error(gc, NULL, _("Unable To Add"), buf);
+ purple_notify_error(gc, NULL, _("Unable to Add"), buf);
g_free(buf);
}
@@ -5292,7 +5292,7 @@ static int purple_ssi_parseack(OscarData
buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason."),
(retval->name ? retval->name : _("(no name)")));
if ((retval->name != NULL) && !purple_conv_present_error(retval->name, purple_connection_get_account(gc), buf))
- purple_notify_error(gc, NULL, _("Unable To Add"), buf);
+ purple_notify_error(gc, NULL, _("Unable to Add"), buf);
g_free(buf);
} break;
}
============================================================
--- libpurple/protocols/qq/buddy_info.c 982317469e0b12fe78bf786f841cc437b4e5020c
+++ libpurple/protocols/qq/buddy_info.c 3d85c12cb9f540a534b6709f5bf158199ec25899
@@ -418,8 +418,8 @@ static void info_modify_dialogue(PurpleC
utf8_title = g_strdup(_("Modify Address"));
utf8_prim = g_strdup_printf("%s for %s", _("Modify Address"), segments[0]);
case QQ_FIELD_EXT:
- utf8_title = g_strdup(_("Modify Extend Information"));
- utf8_prim = g_strdup_printf("%s for %s", _("Modify Extend Information"), segments[0]);
+ utf8_title = g_strdup(_("Modify Extended Information"));
+ utf8_prim = g_strdup_printf("%s for %s", _("Modify Extended Information"), segments[0]);
break;
case QQ_FIELD_BASE:
default:
@@ -457,7 +457,7 @@ void qq_process_change_info(PurpleConnec
data[data_len] = '\0';
if (qd->uid != atoi((gchar *) data)) { /* return should be my uid */
purple_debug_info("QQ", "Failed Updating info\n");
- qq_got_attention(gc, _("Failed changing buddy information."));
+ qq_got_attention(gc, _("Could not change buddy information."));
}
}
@@ -509,8 +509,8 @@ void qq_change_icon_cb(PurpleConnection
filename = segments[index];
index = strcspn (filename, "0123456789");
if (index < 0 || index >= strlen(filename)) {
- error = g_strdup_printf(_("Can not get face number in file name (%s)"), filename);
- purple_notify_error(gc, _("QQ Buddy"), _("Failed change icon"), error);
+ error = g_strdup_printf(_("Can not get face number from filename '%s'"), filename);
+ purple_notify_error(gc, _("QQ Buddy"), _("Unable to Change Icon"), error);
g_free(error);
return;
}
============================================================
--- libpurple/protocols/qq/group_join.c e1e5a869322baa31c1cbea66ca376567a8619280
+++ libpurple/protocols/qq/group_join.c 7bfa66c4c40f30096221c51423451d411f75377c
@@ -219,11 +219,11 @@ void qq_process_group_cmd_join_group_aut
rmd = qq_room_data_find(gc, id);
if (rmd != NULL) {
- msg = g_strdup_printf(_("Successed join to Qun %s (%d)"), rmd->title_utf8, rmd->ext_id);
+ msg = g_strdup_printf(_("Successfully joined Qun %s (%d)"), rmd->title_utf8, rmd->ext_id);
qq_got_attention(gc, msg);
g_free(msg);
} else {
- qq_got_attention(gc, _("Successed join to Qun"));
+ qq_got_attention(gc, _("Successfully joined Qun"));
}
}
============================================================
--- libpurple/protocols/qq/group_opt.c dff1da47191a63360cdfdf3d302b8adb2c198e39
+++ libpurple/protocols/qq/group_opt.c 58ca1f29687b7b50130547f75fc033f3ccf156af
@@ -204,7 +204,7 @@ void qq_group_process_modify_members_rep
purple_debug_info("QQ", "Succeed in modify members for room %d\n", rmd->ext_id);
- qq_room_got_chat_in(gc, id, 0, _("Successed changing Qun member"), now);
+ qq_room_got_chat_in(gc, id, 0, _("Successfully changed Qun member"), now);
}
void qq_room_change_info(PurpleConnection *gc, qq_room_data *rmd)
@@ -248,7 +248,7 @@ void qq_group_process_modify_info_reply(
purple_debug_info("QQ", "Succeed modify room info of %d\n", id);
- qq_room_got_chat_in(gc, id, 0, _("Successed changing Qun information"), now);
+ qq_room_got_chat_in(gc, id, 0, _("Successfully changed Qun information"), now);
}
/* we create a very simple room first, and then let the user to modify */
@@ -347,7 +347,7 @@ void qq_group_process_create_group_reply
purple_request_action(gc, _("QQ Qun Operation"),
_("You have successfully created a Qun"),
- _("Would you like to set up the detail information now?"),
+ _("Would you like to set detailed information now?"),
1,
purple_connection_get_account(gc), NULL, NULL,
add_req, 2,
@@ -520,7 +520,7 @@ void qq_process_room_buddy_approved(guin
rmd->my_role = QQ_ROOM_ROLE_YES;
}
- msg = g_strdup_printf(_("<b>Joinning Qun %d is approved by Admin %d for %s</b>"),
+ msg = g_strdup_printf(_("<b>Joinning Qun %d is approved by admin %d for %s</b>"),
ext_id, admin_uid, reason);
now = time(NULL);
qq_room_got_chat_in(gc, id, 0, msg, now);
============================================================
--- libpurple/protocols/qq/qq.c 869326bf0056afefea606b852c256005972504ae
+++ libpurple/protocols/qq/qq.c 9852c7fa1857bb1c7365ff6f5e9825b5bad9ebaf
@@ -863,7 +863,7 @@ static GList *qq_actions(PurplePlugin *p
act = purple_plugin_action_new(_("Modify Information"), action_modify_info_base);
m = g_list_append(m, act);
- act = purple_plugin_action_new(_("Modify Extend Information"), action_modify_info_ext);
+ act = purple_plugin_action_new(_("Modify Extended Information"), action_modify_info_ext);
m = g_list_append(m, act);
act = purple_plugin_action_new(_("Modify Address"), action_modify_info_addr);
@@ -1110,9 +1110,9 @@ static PurplePluginInfo info = {
"QQ", /**< name */
DISPLAY_VERSION, /**< version */
/** summary */
- N_("QQ Protocol Plugin"),
+ N_("QQ Protocol Plugin"),
/** description */
- N_("QQ Protocol Plugin"),
+ N_("QQ Protocol Plugin"),
NULL, /**< author */
PURPLE_WEBSITE, /**< homepage */
@@ -1199,10 +1199,10 @@ static void init_plugin(PurplePlugin *pl
option = purple_account_option_bool_new(_("Show server news"), "show_news", TRUE);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
- option = purple_account_option_int_new(_("Keep alive interval(s)"), "keep_alive_interval", 60);
+ option = purple_account_option_int_new(_("Keep alive interval (seconds)"), "keep_alive_interval", 60);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
- option = purple_account_option_int_new(_("Update interval(s)"), "update_interval", 300);
+ option = purple_account_option_int_new(_("Update interval (seconds)"), "update_interval", 300);
prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
purple_prefs_add_none("/plugins/prpl/qq");
============================================================
--- libpurple/protocols/qq/qq_base.c 0fde318dcc1d9809e43e1dd559733750312fa290
+++ libpurple/protocols/qq/qq_base.c 4ff5bd880f06f342ceb6ecdcd851fcaa4b058f79
@@ -71,7 +71,7 @@ static gint8 process_login_ok(PurpleConn
if (len < 139) {
purple_connection_error_reason(gc,
PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
- _("Can not decrypt get server reply"));
+ _("Can not decrypt server reply"));
return QQ_LOGIN_REPLY_ERR;
}
@@ -404,18 +404,18 @@ guint8 qq_process_login( PurpleConnectio
return process_login_redirect(gc, data, data_len);
case 0x0A: /* extend redirect used in QQ2006 */
- error = g_strdup( _("Not support Redirect_EX now") );
+ error = g_strdup( _("Redirect_EX is not currently supported") );
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 0x05: /* invalid password */
if (!purple_account_get_remember_password(gc->account)) {
purple_account_set_password(gc->account, NULL);
}
- error = g_strdup( _("Error password"));
+ error = g_strdup( _("Incorrect password."));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 0x06: /* need activation */
- error = g_strdup( _("Need active"));
+ error = g_strdup( _("Activation required"));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
@@ -789,7 +789,7 @@ static void request_token_ex_code(Purple
qd->send_seq++;
qq_send_cmd_encrypted(gc, QQ_CMD_TOKEN_EX, qd->send_seq, buf, bytes, TRUE);
- purple_connection_update_progress(gc, _("Checking code of captcha ..."), 3, QQ_CONNECT_STEPS);
+ purple_connection_update_progress(gc, _("Checking code of captcha ..."), 3, QQ_CONNECT_STEPS);
}
typedef struct {
@@ -873,7 +873,7 @@ void qq_captcha_input_dialog(PurpleConne
purple_request_fields(account,
_("QQ Captcha Verifing"),
_("QQ Captcha Verifing"),
- _("Please fill code according to image"),
+ _("Enter the text from the image"),
fields,
_("OK"), G_CALLBACK(captcha_input_ok_cb),
_("Cancel"), G_CALLBACK(captcha_input_cancel_cb),
@@ -1094,16 +1094,16 @@ guint8 qq_process_check_pwd( PurpleConne
if (!purple_account_get_remember_password(gc->account)) {
purple_account_set_password(gc->account, NULL);
}
- error = g_strdup(_("Error password"));
+ error = g_strdup(_("Incorrect password."));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 0x33: /* need activation */
case 0x51: /* need activation */
- error = g_strdup(_("Need active"));
+ error = g_strdup(_("Activation required"));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 0xBF: /* uid is not exist */
- error = g_strdup(_("invalid user name"));
+ error = g_strdup(_("Invalid username."));
reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
break;
default:
============================================================
--- libpurple/protocols/qq/qq_network.c a311ad38c51cb9b2c614babcbb2f192c058dd5a7
+++ libpurple/protocols/qq/qq_network.c c207298448ccbd1c68b97ddf8fbd23cc4cc6915c
@@ -204,7 +204,7 @@ gboolean qq_connect_later(gpointer data)
if ( set_new_server(qd) != TRUE) {
purple_connection_error_reason(gc,
PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Failed to connect all servers"));
+ _("Unable to connect."));
return FALSE;
}
qd->connect_retry = QQ_CONNECT_MAX;
============================================================
--- libpurple/protocols/qq/qq_process.c 134a2afc30bec0df90a5a49c7b18fb7eee8f9ee0
+++ libpurple/protocols/qq/qq_process.c 8a2195315198ea68ab927f83105a4f42c53577ac
@@ -960,7 +960,7 @@ guint8 qq_proc_login_cmds(PurpleConnecti
return ret_8;
}
- purple_connection_update_progress(gc, _("Logined"), QQ_CONNECT_STEPS - 1, QQ_CONNECT_STEPS);
+ purple_connection_update_progress(gc, _("Logging in"), QQ_CONNECT_STEPS - 1, QQ_CONNECT_STEPS);
purple_debug_info("QQ", "Login repliess OK; everything is fine\n");
purple_connection_set_state(gc, PURPLE_CONNECTED);
qd->is_login = TRUE; /* must be defined after sev_finish_login */
More information about the Commits
mailing list