Mercurial > pidgin

changeset 19704:d3d9e3978d82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clear up translation ambiguity with the attention API.
author Richard Laager <rlaager@wiktel.com>
date Mon, 10 Sep 2007 20:07:45 +0000
parents 45d028a68774
children 5d44126c0205 7aaebdb013c9
files libpurple/protocols/msn/msn.c libpurple/protocols/myspace/zap.c libpurple/protocols/yahoo/yahoo.c libpurple/server.c
diffstat 4 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Mon Sep 10 20:04:49 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Sep 10 20:07:45 2007 +0000
@@ -129,8 +129,8 @@
 	if (!list) {
 		attn = g_new0(PurpleAttentionType, 1);
 		attn->name = _("nudge");
-		attn->incoming_description = _("nudged");
-		attn->outgoing_description = _("Nudging");
+		attn->incoming_description = _("%s has nudged you!");
+		attn->outgoing_description = _("Nudging %s...");
 		list = g_list_append(list, attn);
 	}
 
--- a/libpurple/protocols/myspace/zap.c	Mon Sep 10 20:04:49 2007 +0000
+++ b/libpurple/protocols/myspace/zap.c	Mon Sep 10 20:07:45 2007 +0000
@@ -41,16 +41,16 @@
 		types = g_list_append(types, attn);
 
 		/* TODO: icons for each zap */
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("zap"), _("zapped"), _("Zapping"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("whack"), _("whacked"), _("Whacking"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("torch"), _("torched"), _("Torching"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("smooch"), _("smooched"), _("Smooching"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("hug"), _("hugged"), _("Hugging"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("bslap"), _("bslapped"), _("Bslapping"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("goose"), _("goosed"), _("Goosing"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("hi-five"), _("hi-fived"), _("Hi-fiving"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("punk"), _("punk'd"), _("Punking"));
-		_MSIM_ADD_NEW_ATTENTION(NULL, _("raspberry"), _("raspberried"), _("Raspberry'ing"));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Zap"), _("%s has zapped you!"), _("Zapping %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Whack"), _("%s has whacked you!"), _("Whacking %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Torch"), _("%s has torched you!"), _("Torching %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Smooch"), _("%s has smooched you!"), _("Smooching %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Hug"), _("%s has hugged you!"), _("Hugging %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Slap"), _("%s has slapped you!"), _("Slapping %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Goose"), _("%s has goosed you!"), _("Goosing %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("High-five"), _("%s has high-fived you!"), _("High-fiving %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Punk"), _("%s has punk'd you!"), _("Punking %s..."));
+		_MSIM_ADD_NEW_ATTENTION(NULL, _("Raspberry"), _("%s has raspberried you!"), _("Raspberrying %s..."));
 	}
 
 	return types;
--- a/libpurple/protocols/yahoo/yahoo.c	Mon Sep 10 20:04:49 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Sep 10 20:07:45 2007 +0000
@@ -4130,8 +4130,8 @@
 		/* This is index number YAHOO_BUZZ. */
 		attn = g_new0(PurpleAttentionType, 1);
 		attn->name = _("buzz");
-		attn->incoming_description = _("buzzed");
-		attn->outgoing_description = _("Buzzing");
+		attn->incoming_description = _("%s has buzzed you!");
+		attn->outgoing_description = _("Buzzing %s...");
 		list = g_list_append(list, attn);
 	} 
 
--- a/libpurple/server.c	Mon Sep 10 20:04:49 2007 +0000
+++ b/libpurple/server.c	Mon Sep 10 20:07:45 2007 +0000
@@ -290,9 +290,9 @@
 	attn = purple_get_attention_type_from_code(gc->account, type_code);
 
 	if (attn && attn->outgoing_description) {
-		description = g_strdup_printf(_("Attention! %s %s."), attn->outgoing_description, who);
+		description = g_strdup_printf(attn->outgoing_description, who);
 	} else {
-		description = g_strdup(_("Attention!"));
+		description = g_strdup_printf(_("Requesting %s's attention..."), who);
 	}
 	
 	flags = PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_SYSTEM;
@@ -328,9 +328,9 @@
 	 * it next to the attention command. And if it is null, display a generic icon. */
 
 	if (attn && attn->incoming_description) {
-		description = g_strdup_printf(_("Attention! You have been %s."), attn->incoming_description);
+		description = g_strdup_printf(attn->incoming_description, who);
 	} else {
-		description = g_strdup(_("Attention!"));
+		description = g_strdup(_("%s has requested your attention!"));
 	}
 
 	purple_debug_info("server", "serv_got_attention: got '%s' from %s\n",