/pidgin/main: b46d29bc9b35: Standardize the formatting we use to...

Mark Doliner mark at kingant.net
Wed Jun 25 00:02:47 EDT 2014


Changeset: b46d29bc9b356e8782f19d16ef35e6f369cd57ef
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-06-24 21:02 -0700
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/b46d29bc9b35

Description:

Standardize the formatting we use to document hints for translators.

diffstat:

 finch/plugins/lastlog.c                 |  2 +-
 libpurple/protocols/oscar/clientlogin.c |  8 +++++---
 pidgin/plugins/disco/gtkdisco.c         |  4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (60 lines):

diff --git a/finch/plugins/lastlog.c b/finch/plugins/lastlog.c
--- a/finch/plugins/lastlog.c
+++ b/finch/plugins/lastlog.c
@@ -96,7 +96,7 @@ plugin_load(PurplePlugin *plugin)
 {
 	cmd = purple_cmd_register("lastlog", "s", PURPLE_CMD_P_DEFAULT,
 			PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
-			/* Translator Note: The "backlog" is the conversation buffer/history. */
+			/* Translators: The "backlog" here refers to the the conversation buffer/history. */
 			lastlog_cb, _("lastlog: Searches for a substring in the backlog."), NULL);
 	return TRUE;
 }
diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c
--- a/libpurple/protocols/oscar/clientlogin.c
+++ b/libpurple/protocols/oscar/clientlogin.c
@@ -114,8 +114,11 @@ static gchar *generate_error_message(Pur
 	}
 
 	if (details && *details) {
+		/* Translators: The first %s is a URL. The second is a brief error
+		   message. */
 		err = g_strdup_printf(_("Received unexpected response from %s: %s"), url, details);
 	} else {
+		/* Translators: %s in this string is a URL */
 		err = g_strdup_printf(_("Received unexpected response from %s"), url);
 	}
 
@@ -182,7 +185,6 @@ static gboolean parse_start_oscar_sessio
 		char *msg;
 		purple_debug_error("oscar", "startOSCARSession could not parse "
 				"response as XML: %s\n", response);
-		/* Note to translators: %s in this string is a URL */
 		msg = generate_error_message(response_node,
 				get_start_oscar_session_url(od));
 		purple_connection_error(gc,
@@ -338,8 +340,8 @@ start_oscar_session_cb(PurpleHttpConnect
 
 	if (!purple_http_response_is_successful(response)) {
 		gchar *tmp;
-		/* Note to translators: The first %s is a URL, the second is an
-		   error message. */
+		/* Translators: The first %s is a URL, the second is a brief error
+		   message. */
 		tmp = g_strdup_printf(_("Error requesting %s: %s"),
 				get_start_oscar_session_url(od),
 				purple_http_response_get_error(response));
diff --git a/pidgin/plugins/disco/gtkdisco.c b/pidgin/plugins/disco/gtkdisco.c
--- a/pidgin/plugins/disco/gtkdisco.c
+++ b/pidgin/plugins/disco/gtkdisco.c
@@ -242,8 +242,8 @@ static void browse_button_cb(GtkWidget *
 		/* This shouldn't ever happen since the account is connected */
 		server = g_strdup("jabber.org");
 
-	/* Note to translators: The string "Enter an XMPP Server" is asking the
-	   user to type the name of an XMPP server which will then be queried */
+	/* Translators: The string "Enter an XMPP Server" is asking the user to
+	   type the name of an XMPP server which will then be queried */
 	dialog->prompt_handle = purple_request_input(my_plugin, _("Server name request"), _("Enter an XMPP Server"),
 			_("Select an XMPP server to query"),
 			server, FALSE, FALSE, NULL,



More information about the Commits mailing list