[popfile-commit] windows installer.nsi,1.261,1.262

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

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

Modified Files:
	installer.nsi 
Log Message:
Mention the additional compiler warnings about PFI_LANG_NSISDL_PLURAL
and how to interpret them. Replace spurious tab characters with spaces.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.261
retrieving revision 1.262
diff -C2 -d -r1.261 -r1.262
*** installer.nsi	2 Sep 2005 17:07:04 -0000	1.261
--- installer.nsi	13 Oct 2005 12:01:36 -0000	1.262
***************
*** 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'
***************
*** 1614,1620 ****
    ; 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
--- 1618,1624 ----
    ; 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
***************
*** 1626,1630 ****
  
  got_name:
! 	Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
--- 1630,1634 ----
  
  got_name:
!   Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
***************
*** 1632,1636 ****
  get_usertype:
    UserInfo::GetAccountType
! 	Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" not_admin
--- 1636,1640 ----
  get_usertype:
    UserInfo::GetAccountType
!   Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" not_admin