pidgin3: comparison src/protocols/oscar/oscar.c

-:73c610c283f5
+:d75ee349aaa4
 static int oscar_sendfile_request(aim_session_t *sess,
 		struct oscar_file_transfer *oft);
 static int oscar_sendfile_timeout(aim_session_t *sess, aim_frame_t *fr, ...);
 static char *msgerrreason[] = {
-	"Invalid error",
+	N_("Invalid error"),
-	"Invalid SNAC",
+	N_("Invalid SNAC"),
-	"Rate to host",
+	N_("Rate to host"),
-	"Rate to client",
+	N_("Rate to client"),
-	"Not logged in",
+	N_("Not logged in"),
-	"Service unavailable",
+	N_("Service unavailable"),
-	"Service not defined",
+	N_("Service not defined"),
-	"Obsolete SNAC",
+	N_("Obsolete SNAC"),
-	"Not supported by host",
+	N_("Not supported by host"),
-	"Not supported by client",
+	N_("Not supported by client"),
-	"Refused by client",
+	N_("Refused by client"),
-	"Reply too big",
+	N_("Reply too big"),
-	"Responses lost",
+	N_("Responses lost"),
-	"Request denied",
+	N_("Request denied"),
-	"Busted SNAC payload",
+	N_("Busted SNAC payload"),
-	"Insufficient rights",
+	N_("Insufficient rights"),
-	"In local permit/deny",
+	N_("In local permit/deny"),
-	"Too evil (sender)",
+	N_("Too evil (sender)"),
-	"Too evil (receiver)",
+	N_("Too evil (receiver)"),
-	"User temporarily unavailable",
+	N_("User temporarily unavailable"),
-	"No match",
+	N_("No match"),
-	"List overflow",
+	N_("List overflow"),
-	"Request ambiguous",
+	N_("Request ambiguous"),
-	"Queue full",
+	N_("Queue full"),
-	"Not while on AOL"
+	N_("Not while on AOL")
 };
 static int msgerrreasonlen = 25;
 /*
 * This is called to clean up whenever a file transfer is no longer in progress,
 	va_end(ap);
 	debug_printf("inside auth_resp (Screen name: %s)\n", info->sn);
 	if (info->errorcode || !info->bosip || !info->cookie) {
+		char buf[256];
 		switch (info->errorcode) {
 		case 0x05:
 			/* Incorrect nick/password */
 			hide_login_progress(gc, _("Incorrect nickname or password."));
 			plugin_event(event_error, (void *)980, 0, 0, 0);
 			hide_login_progress(gc, _("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."));
 			plugin_event(event_error, (void *)983, 0, 0, 0);
 			break;
 		case 0x1c:
 			/* client too old */
-			hide_login_progress(gc, _("The client version you are using is too old. Please upgrade at " WEBSITE));
+			g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), WEBSITE);
+			hide_login_progress(gc, buf);
 			plugin_event(event_error, (void *)989, 0, 0, 0);
 			break;
 		default:
 			hide_login_progress(gc, _("Authentication Failed"));
 			break;
 		if (x == 2)
 			break;
 		in = '\0';
 	}
 	if (in != '\n') {
+		char buf[256];
+		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  You may want to use TOC until "
+			"this is fixed.  Check %s for updates."), WEBSITE);
 		do_error_dialog(_("Gaim was Unable to get a valid AIM login hash."),
-				_("You may be disconnected shortly.  You may want to use TOC until "
+				buf, GAIM_WARNING);
-				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 		gaim_input_remove(pos->inpa);
 		close(pos->fd);
 		g_free(pos);
 		return;
 	}
 static void straight_to_hell(gpointer data, gint source, GaimInputCondition cond) {
 	struct pieceofcrap *pos = data;
 	char buf[BUF_LONG];
 	if (source < 0) {
+		char buf[256];
+		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  You may want to use TOC until "
+			"this is fixed.  Check %s for updates."), WEBSITE);
 		do_error_dialog(_("Gaim was Unable to get a valid AIM login hash."),
-				_("You may be disconnected shortly.  You may want to use TOC until "
+				buf, GAIM_WARNING);
-				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 		if (pos->modname)
 			g_free(pos->modname);
 		g_free(pos);
 		return;
 	}
 	pos->len = len;
 	pos->modname = modname ? g_strdup(modname) : NULL;
 	fd = proxy_connect("gaim.sourceforge.net", 80, straight_to_hell, pos);
 	if (fd < 0) {
+		char buf[256];
 		if (pos->modname)
 			g_free(pos->modname);
 		g_free(pos);
+		g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly.  You may want to use TOC until "
+			"this is fixed.  Check %s for updates."), WEBSITE);
 		do_error_dialog(_("Gaim was Unable to get valid login hash."),
-				_("You may be disconnected shortly.  You may want to use TOC until "
+				 buf, GAIM_WARNING);
-				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 	}
 	pos->fd = fd;
 	return 1;
 }
 	debug_printf("snac threw error (reason 0x%04x: %s)\n", reason,
 			(reason < msgerrreasonlen) ? msgerrreason[reason] : "unknown");
 	m = g_strdup_printf(_("SNAC threw error: %s\n"),
-			reason < msgerrreasonlen ? msgerrreason[reason] : "Unknown error");
+			reason < msgerrreasonlen ? gettext(msgerrreason[reason]) : _("Unknown error"));
 	do_error_dialog(m, NULL, GAIM_ERROR);
 	g_free(m);
 	return 1;
 }
 	va_end(ap);
 	/* If this was a file transfer request, data is a cookie. */
 	if ((oft = find_oft_by_cookie(gc, data))) {
 		transfer_abort(oft->xfer,
-				(reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."));
+				(reason < msgerrreasonlen) ? gettext(msgerrreason[reason]) : _("No reason was given."));
 		oscar_file_transfer_disconnect(sess, oft->conn);
 		return 1;
 	}
 	/* Data is assumed to be the destination sn. */
 	snprintf(buf, sizeof(buf), _("Your message to %s did not get sent:"), data);
-	do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? gettext(msgerrreason[reason]) : _("No reason was given."), GAIM_ERROR);
 	return 1;
 }
 static int gaim_parse_mtn(aim_session_t *sess, aim_frame_t *fr, ...) {
 	reason = (fu16_t)va_arg(ap, unsigned int);
 	destn = va_arg(ap, char *);
 	va_end(ap);
 	snprintf(buf, sizeof(buf), _("User information for %s unavailable:"), destn);
-	do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? gettext(msgerrreason[reason]) : _("No reason was given."), GAIM_ERROR);
 	return 1;
 }
 static char *images(int flags) {
 	debug_printf("account confirmation returned status 0x%04x (%s)\n", status,
 			status ? "unknown" : "email sent");
 	if (!status) {
 		g_snprintf(msg, sizeof(msg), "You should receive an email asking to confirm %s.",
 				gc->username);
-		do_error_dialog("Account Confirmation Requested", msg, GAIM_INFO);
+		do_error_dialog(_("Account Confirmation Requested"), msg, GAIM_INFO);
 	}
 	return 1;
 }
 		return 1;
 	}
 	if (sn) {
 		char *dialog_msg = g_strdup_printf(_("Your screen name is currently formated as follows:\n%s"), sn);
-		do_error_dialog("Account Info", dialog_msg, GAIM_INFO);
+		do_error_dialog(_("Account Info"), dialog_msg, GAIM_INFO);
 		g_free(dialog_msg);
 	}
 	if (email) {
 		char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"), gc->username, email);
-		do_error_dialog("Account Info", dialog_msg, GAIM_INFO);
+		do_error_dialog(_("Account Info"), dialog_msg, GAIM_INFO);
 		g_free(dialog_msg);
 	}
 	return 1;
 }

Mercurial > pidgin3 / file comparison

comparison: src/protocols/oscar/oscar.c

src/protocols/oscar/oscar.c