From 80c2fae5c12994a335b38800333a5ed42f3630da Mon Sep 17 00:00:00 2001 From: pabs3 Date: Tue, 13 Jan 2009 16:54:39 +0000 Subject: [PATCH] Remove some gratuitous use of non-ANSI characters that were making the Unicode patch harder to review. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5905 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/MUI2.nsh | 4 ++-- Contrib/Modern UI/License.txt | 4 ++-- Contrib/Modern UI/System.nsh | 4 ++-- Contrib/MultiUser/MultiUser.nsh | 2 +- Examples/VersionInfo.nsi | 2 +- Examples/bigtest.nsi | 6 +++--- Include/LangFile.nsh | 2 +- Include/StrFunc.nsh | 6 +++--- Include/VB6RunTime.nsh | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Contrib/Modern UI 2/MUI2.nsh b/Contrib/Modern UI 2/MUI2.nsh index 914bb713..2e4a31c2 100644 --- a/Contrib/Modern UI 2/MUI2.nsh +++ b/Contrib/Modern UI 2/MUI2.nsh @@ -1,11 +1,11 @@ /* NSIS Modern User Interface - Version 2.0 -Copyright © 2002-2008 Joost Verburg +Copyright 2002-2008 Joost Verburg */ -!echo "NSIS Modern User Interface version 2.0 - © 2002-2008 Joost Verburg" +!echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2008 Joost Verburg" ;-------------------------------- diff --git a/Contrib/Modern UI/License.txt b/Contrib/Modern UI/License.txt index c9cc1d8d..29415136 100644 --- a/Contrib/Modern UI/License.txt +++ b/Contrib/Modern UI/License.txt @@ -1,4 +1,4 @@ -Copyright © 2002-2008 Joost Verburg +Copyright 2002-2008 Joost Verburg This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -7,4 +7,4 @@ Permission is granted to anyone to use this software for any purpose, including 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any distribution. \ No newline at end of file +3. This notice may not be removed or altered from any distribution. diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index e3fb027a..f4a652b1 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1,11 +1,11 @@ /* NSIS Modern User Interface - Version 1.8 -Copyright © 2002-2008 Joost Verburg +Copyright 2002-2008 Joost Verburg */ -!echo "NSIS Modern User Interface version 1.8 - © 2002-2008 Joost Verburg" +!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2008 Joost Verburg" ;-------------------------------- diff --git a/Contrib/MultiUser/MultiUser.nsh b/Contrib/MultiUser/MultiUser.nsh index d585b625..f4c3f574 100644 --- a/Contrib/MultiUser/MultiUser.nsh +++ b/Contrib/MultiUser/MultiUser.nsh @@ -4,7 +4,7 @@ MultiUser.nsh Installer configuration for multi-user Windows environments -Copyright © 2008 Joost Verburg +Copyright 2008 Joost Verburg */ diff --git a/Examples/VersionInfo.nsi b/Examples/VersionInfo.nsi index 035c5d31..1ff449d1 100644 --- a/Examples/VersionInfo.nsi +++ b/Examples/VersionInfo.nsi @@ -18,7 +18,7 @@ LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A test comment" VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Fake company" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company" - VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© Fake company" + VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright Fake company" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Test Application" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.2.3" diff --git a/Examples/bigtest.nsi b/Examples/bigtest.nsi index 2923e65e..62f5211c 100644 --- a/Examples/bigtest.nsi +++ b/Examples/bigtest.nsi @@ -128,12 +128,12 @@ SectionIn 1 4 3 INIDelSuccess: ClearErrors - ReadRegStr $1 HKCR "software\microsoft" xyz_¢¢_does_not_exist + ReadRegStr $1 HKCR "software\microsoft" xyz_cc_does_not_exist IfErrors 0 NoError - MessageBox MB_OK "could not read from HKCR\software\microsoft\xyz_¢¢_does_not_exist" + MessageBox MB_OK "could not read from HKCR\software\microsoft\xyz_cc_does_not_exist" Goto ErrorYay NoError: - MessageBox MB_OK "read '$1' from HKCR\software\microsoft\xyz_¢¢_does_not_exist" + MessageBox MB_OK "read '$1' from HKCR\software\microsoft\xyz_cc_does_not_exist" ErrorYay: SectionEnd diff --git a/Include/LangFile.nsh b/Include/LangFile.nsh index 45b3a03b..1b342398 100644 --- a/Include/LangFile.nsh +++ b/Include/LangFile.nsh @@ -5,7 +5,7 @@ LangFile.nsh Header file to create langauge files that can be included with a single command. -Copyright © 2008 Joost Verburg +Copyright 2008 Joost Verburg * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT can be called from the script to include a language diff --git a/Include/StrFunc.nsh b/Include/StrFunc.nsh index ed3b8cdd..f6c4b3e4 100644 --- a/Include/StrFunc.nsh +++ b/Include/StrFunc.nsh @@ -49,7 +49,7 @@ o-----------------------------------------------------------------------------o !verbose push !verbose 4 - !echo `${STRFUNC_INITMSGPRE}NSIS ${STRFUNC} ${STRFUNC_VER} - © ${STRFUNC_CREDITS}${STRFUNC_INITMSGPOST}` + !echo `${STRFUNC_INITMSGPRE}NSIS ${STRFUNC} ${STRFUNC_VER} - Copyright ${STRFUNC_CREDITS}${STRFUNC_INITMSGPOST}` !verbose pop ;Header File Function Init Message Prefix and Postfix @@ -82,13 +82,13 @@ o-----------------------------------------------------------------------------o !verbose 4 !ifndef `Un${ShortName}` - !echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}` + !echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - Copyright ${Credits}${STRFUNC_FUNCMSGPOST}` !verbose pop !define `Un${ShortName}` `!insertmacro FUNCTION_STRING_Un${ShortName}_Call` !define `Un${ShortName}_INCLUDED` Function `un.${ShortName}` !else - !echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}` + !echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - Copyright ${Credits}${STRFUNC_FUNCMSGPOST}` !verbose pop !undef `${ShortName}` !define `${ShortName}` `!insertmacro FUNCTION_STRING_${ShortName}_Call` diff --git a/Include/VB6RunTime.nsh b/Include/VB6RunTime.nsh index 4505f08b..5bf20e44 100644 --- a/Include/VB6RunTime.nsh +++ b/Include/VB6RunTime.nsh @@ -4,7 +4,7 @@ VB6RunTime.nsh Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update -Copyright © 2008 Joost Verburg +Copyright 2008 Joost Verburg To obtain the run-time files, download and extract http://nsis.sourceforge.net/vb6runtime.zip