/pidgin/main: bfa933a6abf9: Merge my changes on release-2.x.y in...

[Richard Laager]

Changeset: bfa933a6abf9b8148befcfcdda535a2f569d89d8
Author:	 Richard Laager <rlaager at pidgin.im>
Date:	 2015-08-05 12:43 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/bfa933a6abf9

Description:

Merge my changes on release-2.x.y into default

diffstat:

 pidgin/plugins/notify.c                        |  2 ++
 pidgin/win32/nsis/nsis_translations.desktop.in |  2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (24 lines):

diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -821,6 +821,8 @@ get_config_frame(PurplePlugin *plugin)
 	                 G_CALLBACK(method_toggle_cb), "method_raise");
 
 	/* Present conversation method button */
+	/* Translators: "Present" as used here is a verb. The plugin presents
+	 * the window to the user. */
 	toggle = gtk_check_button_new_with_mnemonic(_("_Present conversation window"));
 	gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
diff --git a/pidgin/win32/nsis/nsis_translations.desktop.in b/pidgin/win32/nsis/nsis_translations.desktop.in
--- a/pidgin/win32/nsis/nsis_translations.desktop.in
+++ b/pidgin/win32/nsis/nsis_translations.desktop.in
@@ -39,7 +39,7 @@ Encoding=UTF-8
 
 _PIDGINPROMPTCONTINUEWITHOUTUNINSTALL=Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version.
 
-_PIDGINPROMPTFORCENOGTK=Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be already present).$\rAre you sure you want to skip installing the GTK+ Runtime?
+_PIDGINPROMPTFORCENOGTK=Pidgin requires a compatible GTK+ Runtime (which does not appear to be installed).$\rAre you sure you want to skip installing the GTK+ Runtime?
 
 #Installer Subsection Text
 _URIHANDLERSSECTIONTITLE=URI Handlers