# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1107495632 0
# Node ID ce89d4e568d3e0b9ddb7bae3a3a29764e212dfe2
# Parent  2b05acfeec653869fa3435486c2a1a1cb16bdee8
[gaim-migrate @ 11961]
sf patch #1115924, from Richard Laager
Update a copyright and change some minor grammar things in the
Windows installher

committer: Tailor Script <tailor@pidgin.im>

diff -r 2b05acfeec65 -r ce89d4e568d3 COPYRIGHT
--- a/COPYRIGHT	Fri Feb 04 04:50:08 2005 +0000
+++ b/COPYRIGHT	Fri Feb 04 05:40:32 2005 +0000
@@ -1,5 +1,5 @@
 Gaim
-Copyright (C) 1998-2004 by the following:
+Copyright (C) 1998-2005 by the following:
 
 If you have contributed to Gaim, you deserve to be on this list.
 Contact us (see: AUTHORS) and we'll add you.
diff -r 2b05acfeec65 -r ce89d4e568d3 src/win32/nsis/translations/english.nsh
--- a/src/win32/nsis/translations/english.nsh	Fri Feb 04 04:50:08 2005 +0000
+++ b/src/win32/nsis/translations/english.nsh	Fri Feb 04 05:40:32 2005 +0000
@@ -13,12 +13,12 @@
 
 ; Startup Checks
 !insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING			"An instance of Gaim is currently running. Exit Gaim then try again."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING			"An instance of Gaim is currently running. Exit Gaim and then try again."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON			"Next >"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (required)"