/pidgin/main: 22541f58aef9: Merged in rlaager/pidgin/release-2.x...

[Gary Kramlich]

Changeset: 22541f58aef9bf63d2fbddc96b1f9b706b2e7a6c
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-07-01 16:19 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/22541f58aef9

Description:

Merged in rlaager/pidgin/release-2.x.y (pull request #61)

Fix pounce grammar in Finch

diffstat:

 finch/gntpounce.c                              |  2 +-
 pidgin/plugins/win32/transparency/win2ktrans.c |  3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diffs (25 lines):

diff --git a/finch/gntpounce.c b/finch/gntpounce.c
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -342,7 +342,7 @@ finch_pounce_editor_show(PurpleAccount *
 	g_signal_connect(G_OBJECT(window), "destroy",
 					 G_CALLBACK(delete_win_cb), dialog);
 
-	gnt_box_add_widget(GNT_BOX(window), gnt_label_new_with_format(_("Pounce Who"), GNT_TEXT_FLAG_BOLD));
+	gnt_box_add_widget(GNT_BOX(window), gnt_label_new_with_format(_("Pounce on Whom"), GNT_TEXT_FLAG_BOLD));
 
 	/* Account: */
 	gnt_box_add_widget(GNT_BOX(window), gnt_label_new(_("Account:")));
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -682,8 +682,7 @@ static PurplePluginInfo info =
 					/**  summary        */
 	N_("Variable Transparency for the buddy list and conversations."),
 					/**  description    */
-	N_("This plugin enables variable alpha transparency on conversation windows and the buddy list.\n\n"
-	"* Note: This plugin requires Win2000 or greater."),
+	N_("This plugin enables variable alpha transparency on conversation windows and the buddy list."),
 	"Herman Bloggs <hermanator12002 at yahoo.com>",	/**< author         */
 	PURPLE_WEBSITE,			/**< homepage       */
 	plugin_load,			/**< load           */