[popfile-commit] windows/add-ons addssl.nsi,1.3.4.5,1.3.4.6

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

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

Modified Files:
      Tag: b0_22_2
	addssl.nsi 
Log Message:
Avoid the need to patch the standard NSIS MUI Japanese language file
in order to change the language selection menu entry from "Japanese"
to "Nihongo".

Index: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -C2 -d -r1.3.4.5 -r1.3.4.6
*** addssl.nsi	19 Nov 2006 20:35:50 -0000	1.3.4.5
--- addssl.nsi	5 Dec 2006 20:33:50 -0000	1.3.4.6
***************
*** 53,68 ****
  #--------------------------------------------------------------------------
  
!   ; This version of the script has been tested with the "NSIS v2.21" compiler,
!   ; released 20 October 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef v2.21_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.21 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
--- 53,68 ----
  #--------------------------------------------------------------------------
  
!   ; This version of the script has been tested with the "NSIS v2.22" compiler,
!   ; released 27 November 2006. This particular compiler can be downloaded from
!   ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download
  
    !define ${NSIS_VERSION}_found
  
!   !ifndef v2.22_found
        !warning \
            "$\r$\n\
            $\r$\n***   NSIS COMPILER WARNING:\
            $\r$\n***\
!           $\r$\n***   This script has only been tested using the NSIS v2.22 compiler\
            $\r$\n***   and may not work properly with this NSIS ${NSIS_VERSION} compiler\
            $\r$\n***\
***************
*** 133,137 ****
    ;
    ; POPFile 0.22.3 and 0.22.4 are based upon ActivePerl 5.8.7 (Builds 813 & 815 respectively).
!   ; Up until 18 July 2006 is was safe for POPFile 0.22.3 and 0.22.4 to use the latest versions
    ; of the SSL files.
    ;
--- 133,137 ----
    ;
    ; POPFile 0.22.3 and 0.22.4 are based upon ActivePerl 5.8.7 (Builds 813 & 815 respectively).
!   ; Up until 18 July 2006 it was safe for POPFile 0.22.3 and 0.22.4 to use the latest versions
    ; of the SSL files.
    ;
***************
*** 182,188 ****
  # 'Japanese-pfi.nsh' file generates this warning).
  #
- # 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'
- # [see 'SMALL NSIS PATCH REQUIRED' in the '..\pfi-languages.nsh' file]
  #--------------------------------------------------------------------------
  
--- 182,185 ----
***************
*** 233,237 ****
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.2.2"
  
    ; Mention the wizard's version number in the window title
--- 230,234 ----
    Name                   "POPFile SSL Setup"
  
!   !define C_PFI_VERSION  "0.2.4"
  
    ; Mention the wizard's version number in the window title
***************
*** 502,506 ****
    ; At least one language must be specified for the wizard (the default is "English")
  
!   !insertmacro PFI_LANG_LOAD "English"
  
    ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English'
--- 499,503 ----
    ; At least one language must be specified for the wizard (the default is "English")
  
!   !insertmacro PFI_LANG_LOAD "English" "-"
  
    ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English'