[popfile-commit] windows installer.nsi,1.242.4.3,1.242.4.4

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32668

Modified Files:
      Tag: b0_22_2
	installer.nsi 
Log Message:
Explain how to decode the language IDs used in NSIS compiler messages.

Change GPL license to remove the option for the person using POPFile
to license it under any version of the GPL other than v2

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.242.4.3
retrieving revision 1.242.4.4
diff -C2 -d -r1.242.4.3 -r1.242.4.4
*** installer.nsi	19 Dec 2005 11:45:36 -0000	1.242.4.3
--- installer.nsi	6 Feb 2006 16:53:18 -0000	1.242.4.4
***************
*** 27,31 ****
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
--- 27,31 ----
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms of version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
***************
*** 72,75 ****
--- 72,79 ----
  ; (if the default multi-language installer is compiled).
  ;
+ ; There may be further warnings which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or
+ ; more language tables. The 'pfi-languages.nsh' file lists all of the language table codes
+ ; used by the POPFile installer and other NSIS-based utilities.
+ ;
  ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI
  ; 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese'
***************
*** 1616,1622 ****
    ; do not support different account types, we treat this error as if user has 'Admin' rights.
  
! 	ClearErrors
! 	UserInfo::GetName
! 	IfErrors 0 got_name
  
    ; Assume Win9x system, so user has 'Admin' rights
--- 1620,1626 ----
    ; do not support different account types, we treat this error as if user has 'Admin' rights.
  
!   ClearErrors
!   UserInfo::GetName
!   IfErrors 0 got_name
  
    ; Assume Win9x system, so user has 'Admin' rights
***************
*** 1628,1632 ****
  
  got_name:
! 	Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
--- 1632,1636 ----
  
  got_name:
!   Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
***************
*** 1634,1638 ****
  get_usertype:
    UserInfo::GetAccountType
! 	Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" not_admin
--- 1638,1642 ----
  get_usertype:
    UserInfo::GetAccountType
!   Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" not_admin