Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joseph C. <tex...@us...> - 2005-10-02 23:26:24
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30686 Removed Files: Tag: b0_22_2 popfile.ico trayicon.ico Log Message: Remove other corrupt icons (format ASCII). --- popfile.ico DELETED --- --- trayicon.ico DELETED --- |
|
From: Brian S. <xue...@us...> - 2005-10-02 23:22:43
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6283 Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Converted from English-only to multi-language. Updated to mention the forthcoming 0.22.3 release and use the latest language files. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** addssl.nsi 3 Dec 2004 22:28:27 -0000 1.3 --- addssl.nsi 2 Oct 2005 14:58:45 -0000 1.3.4.1 *************** *** 1,6 **** #-------------------------------------------------------------------------- # ! # addssl.nsi --- This is the NSIS script used to create a utility which downloads and ! # installs SSL support for an existing POPFile 0.22.0 (or later) installation. # # The version of Module.pm distributed with POPFile 0.22.0 results in extremely --- 1,18 ---- #-------------------------------------------------------------------------- # ! # addssl.nsi --- This is the NSIS script used to create a utility which installs ! # SSL support for an existing POPFile 0.22.0 (or later) installation. ! # ! # Normally the SSL support files are downloaded from the University of Winnipeg ! # repository. However these files are no longer compatible with the minimal Perl ! # shipped with POPFile 0.22.0, 0.22.1 or 0.22.2 so this utility includes a set ! # of compatible SSL files which will be installed instead. The minimal Perl's ! # version number (obtained from the 'perl58.dll' file) is used to determine the ! # action to be taken. ! # ! # The Windows installer for POPFile 0.22.3 (or later) is able to download and ! # install SSL support. Normally SSL support is downloaded at the same time that ! # POPFile is installed, but SSL support can be added or updated later by using ! # the command "setup.exe /SSL" to run the installer (instead of "setup.exe"). # # The version of Module.pm distributed with POPFile 0.22.0 results in extremely *************** *** 8,14 **** # will apply a patch to update Module.pm v1.40 to v1.41 (the original file will # be backed up as Module.pm.bk1). The patch is only applied if v1.40 is found. - # A patch status message is always displayed. # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 20,28 ---- # will apply a patch to update Module.pm v1.40 to v1.41 (the original file will # be backed up as Module.pm.bk1). The patch is only applied if v1.40 is found. # ! # An 'include' file is used to ensure this utility and the main POPFile ! # installer download and install the same SSL support files. ! # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 30,35 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. ;------------------------------------------------ --- 44,66 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found ;------------------------------------------------ *************** *** 39,44 **** ; This script uses a special NSIS plugin (untgz) to extract files from the *.tar.gz archives. ; ! ; The 'NSIS Archives' page for the 'untgz' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/archive/nsisweb.php?page=74&instances=0,32 ; ; Alternative download links can be found at the 'untgz' author's site: --- 70,75 ---- ; This script uses a special NSIS plugin (untgz) to extract files from the *.tar.gz archives. ; ! ; The 'NSIS Wiki' page for the 'untgz' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/wiki/UnTGZ ; ; Alternative download links can be found at the 'untgz' author's site: *************** *** 48,51 **** --- 79,113 ---- ; (${NSISDIR}\Plugins\). The 'untgz' source and example files can be unzipped to the ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. + ; + ; Tested with versions 1.0.5, 1.0.6, 1.0.7 and 1.0.8 of the 'untgz' plugin. + + ;------------------------------------------------ + ; POPFile 0.22.x Compatibility Problem + ;------------------------------------------------ + + ; With effect from 22 June 2005 the SSL components in the University of Winnipeg repository + ; are no longer compatible with POPFile 0.22.0, 0.22.1 or 0.22.2 because the files have been + ; updated to work with ActivePerl 5.8.7 Build 813. POPFile 0.22.0 and 0.22.1 use a minimal + ; Perl based upon ActivePerl 5.8.3 Build 809 and 0.22.2 uses a minimal Perl based upon 5.8.4 + ; Build 810. These minimal Perl systems will crash when attempting to use the University of + ; Winnipeg SSL files. + ; + ; In order to support POPFile 0.22.0, 0.22.1 and 0.22.2 the wizard includes an older set of + ; SSL files which were downloaded from the University of Winnipeg repository in January 2005. + ; In order to simplify the code, the normal Internet download operation is replaced by "File" + ; commands which store the old SSL files in the folder used to hold the downloaded files; + ; these old files can then be handled as if they had been downloaded from the University of + ; Winnipeg. + ; + ; The following local SSL files are compatible with POPFile 0.22.x: + ; + ; (1) ssl-0.22.x\IO-Socket-SSL.tar.gz (dated 01-Aug-2003) + ; (2) ssl-0.22.x\Net_SSLeay.pm.tar.gz (dated 23-Dec-2004) + ; (3) ssl-0.22.x\libeay32.dll (dated 23-Dec-2004) + ; (4) ssl-0.22.x\ssleay32.dll (dated 23-Dec-2004) + ; + ; POPFile 0.22.3 is based upon ActivePerl 5.8.7 Build 813 so it will be safe to download the + ; latest versions of the SSL files if the 'SSL Setup' wizard is used to add SSL support to a + ; system which uses a minimal Perl version of 5.8.7 or higher. ;------------------------------------------------ *************** *** 58,61 **** --- 120,135 ---- ; where Module.pm was CVS version 1.40 and Module_ssl.pm was CVS version 1.41. + #-------------------------------------------------------------------------- + # Compile-time command-line switches (used by 'makensis.exe') + #-------------------------------------------------------------------------- + # + # /DENGLISH_MODE + # + # To build an 'SSL Setup' wizard that only displays English messages (so there is no need to + # ensure all of the non-English *-pfi.nsh files are up-to-date), supply the command-line + # switch /DENGLISH_MODE when compiling this script. + # + #-------------------------------------------------------------------------- + ;------------------------------------------------ ; Define PFI_VERBOSE to get more compiler output *************** *** 92,96 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.10" ; Mention the wizard's version number in the window title --- 166,170 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.1.1" ; Mention the wizard's version number in the window title *************** *** 104,118 **** #-------------------------------------------------------------------------- - # URLs used to download the necessary SSL support archives and files - # (all from the University of Winnipeg Repository) - #-------------------------------------------------------------------------- - - !define C_UWR_IO_SOCKET_SSL "http://theoryx5.uwinnipeg.ca/ppms/x86/IO-Socket-SSL.tar.gz" - !define C_UWR_NET_SSLEAY "http://theoryx5.uwinnipeg.ca/ppms/x86/Net_SSLeay.pm.tar.gz" - !define C_UWR_DLL_SSLEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/ssleay32.dll" - !define C_UWR_DLL_LIBEAY32 "http://theoryx5.uwinnipeg.ca/ppms/scripts/libeay32.dll" - - - #-------------------------------------------------------------------------- # User Registers (Global) #-------------------------------------------------------------------------- --- 178,181 ---- *************** *** 123,130 **** Var G_MPLIBDIR ; full path to the folder used for most of the minimal Perl files - Var G_SSL_FILEURL ; full URL used to download SSL file - Var G_PLS_FIELD_1 ; used to customize some language strings - Var G_PLS_FIELD_2 ; ditto ; NSIS provides 20 general purpose user registers: --- 186,190 ---- *************** *** 151,185 **** #-------------------------------------------------------------------------- ! # Version Information settings (for the wizard's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! ! VIProductVersion "${C_PFI_VERSION}.0" ! ! VIAddVersionKey "ProductName" "POPFile SSL Setup wizard" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2004 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22.x" ! VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build" "English-Mode" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define ADDSSL ! !include "..\pfi-library.nsh" --- 211,252 ---- #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define ADDSSL ! !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- ! # Version Information settings (for the wizard's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_PFI_VERSION}.0" ! VIAddVersionKey "ProductName" "POPFile SSL Setup wizard" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22 or later" ! VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! ! !ifndef ENGLISH_MODE ! VIAddVersionKey "Build" "Multi-Language" ! !else ! VIAddVersionKey "Build" "English-Mode" ! !endif ! ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! !ifdef C_PFI_LIBRARY_VERSION ! VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" ! !endif ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" *************** *** 251,254 **** --- 318,336 ---- !define MUI_CUSTOMFUNCTION_GUIINIT PFIGUIInit + ;---------------------------------------------------------------- + ; Language Settings for MUI pages + ;---------------------------------------------------------------- + + ; Override the standard "Installer Language" title to avoid confusion. + + !define MUI_LANGDLL_WINDOWTITLE "SSL Setup" + + ; Use the language selected when POPFile was last installed or updated + ; (if the language setting is not found, the user will be asked to select a language) + + !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" + !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + #-------------------------------------------------------------------------- *************** *** 336,444 **** #-------------------------------------------------------------------------- ! !insertmacro MUI_LANGUAGE "English" ! ! ;-------------------------------------------------------------------------- ! ; Current build only supports English and uses local strings ! ; instead of language strings from languages\*-pfi.nsh files ! ;-------------------------------------------------------------------------- ! ! !macro PLS_TEXT NAME VALUE ! LangString ${NAME} ${LANG_ENGLISH} "${VALUE}" ! !macroend ! ! ;-------------------------------------------------------------------------- ! ; WELCOME page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PSS_LANG_WELCOME_TEXT "This utility will download and install the files needed to allow POPFile to use SSL when accessing mail servers.${IO_NL}${IO_NL}This version does not configure any email accounts to use SSL, it just installs the necessary Perl components and DLLs.${IO_NL}${IO_NL}This product downloads software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL} PLEASE SHUT DOWN POPFILE NOW${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL}$_CLICK" ! ! ;-------------------------------------------------------------------------- ! ; LICENSE page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_LICENSE_SUBHDR "Please review the license terms before using $(^NameDA)." ! !insertmacro PLS_TEXT PSS_LANG_LICENSE_BOTTOM "If you accept the terms of the agreement, click the check box below. You must accept the agreement to use $(^NameDA). $_CLICK" ! ! ;-------------------------------------------------------------------------- ! ; Source DIRECTORY page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TITLE "Choose existing POPFile installation" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_SUBTITLE "SSL support should only be added to an existing POPFile 0.22.x installation" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TEXT_TOP "SSL support must be installed using the same installation folder as POPFile 0.22.x.${MB_NL}${MB_NL}This utility will add SSL support to the version of POPFile which is installed in the following folder. To install in a different POPFile 0.22.x installation, click Browse and select another folder. $_CLICK" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_TEXT_DESTN "Existing POPFile 0.22.x installation folder" ! ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_MB_WARN_1 "POPFile 0.22.x does NOT seem to be installed in${MB_NL}${MB_NL}$G_PLS_FIELD_1" ! !insertmacro PLS_TEXT PSS_LANG_DESTNDIR_MB_WARN_2 "Are you sure you want to use this folder ?" ! ! ;-------------------------------------------------------------------------- ! ; INSTFILES page ! ;-------------------------------------------------------------------------- ! ! ; Initial page header ! ! !insertmacro PLS_TEXT PSS_LANG_STD_HDR "Installing SSL support (for POPFile 0.22.x)" ! !insertmacro PLS_TEXT PSS_LANG_STD_SUBHDR "Please wait while the SSL files are downloaded and installed..." ! ! ; Successful completion page header ! ! !insertmacro PLS_TEXT PSS_LANG_END_HDR "POPFile SSL Support installation completed" ! !insertmacro PLS_TEXT PSS_LANG_END_SUBHDR "SSL support for POPFile has been installed successfully" ! ! ; Unsuccessful completion page header ! ! !insertmacro PLS_TEXT PSS_LANG_ABORT_HDR "POPFile SSL Support installation failed" ! !insertmacro PLS_TEXT PSS_LANG_ABORT_SUBHDR "The attempt to add SSL support to POPFile has failed" ! ! ; Progress reports ! ! !insertmacro PLS_TEXT PSS_LANG_PROG_INITIALISE "Initializing..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_STARTDOWNLOAD "Downloading $G_PLS_FIELD_1 file from $G_PLS_FIELD_2" ! !insertmacro PLS_TEXT PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" ! !insertmacro PLS_TEXT PSS_LANG_PROG_FILECOPY "Copying $G_PLS_FIELD_2 files..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_FILEEXTRACT "Extracting files from $G_PLS_FIELD_2 archive..." ! !insertmacro PLS_TEXT PSS_LANG_PROG_SUCCESS "POPFile 0.22.x SSL support installed" ! !insertmacro PLS_TEXT PSS_LANG_PROG_SAVELOG "Saving install log file..." ! ! !insertmacro PLS_TEXT PSS_LANG_TAKE_A_FEW_SECONDS "(this may take a few seconds)" ! ! ;-------------------------------------------------------------------------- ! ; FINISH page ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_FINISH_TITLE "Completing the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PSS_LANG_FINISH_TEXT "SSL support for POPFile 0.22.x has been installed.${IO_NL}${IO_NL}You can now start POPFile and configure POPFile and your email client to use SSL.${IO_NL}${IO_NL}Click Finish to close this wizard." ! ! !insertmacro PLS_TEXT PSS_LANG_FINISH_README "Important information" ! ! ;-------------------------------------------------------------------------- ! ; Miscellaneous strings ! ;-------------------------------------------------------------------------- ! ! !insertmacro PLS_TEXT PSS_LANG_MUTEX "Another copy of the SSL Setup wizard is running!" ! ! !insertmacro PLS_TEXT PSS_LANG_COMPAT_NOTFOUND "Warning: Cannot find compatible version of POPFile !" ! ! !insertmacro PLS_TEXT PSS_LANG_ABORT_WARNING "Are you sure you want to quit the $(^NameDA) Wizard?" ! ! !insertmacro PLS_TEXT PSS_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" ! !insertmacro PLS_TEXT PSS_LANG_MB_NSISDLFAIL_2 "(error: $G_PLS_FIELD_2)" ! !insertmacro PLS_TEXT PSS_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PLS_TEXT PSS_LANG_PREPAREPATCH "Updating Module.pm (to avoid slow speed SSL downloads)" ! !insertmacro PLS_TEXT PSS_LANG_PATCHSTATUS "Module.pm patch status: $G_PLS_FIELD_1" ! !insertmacro PLS_TEXT PSS_LANG_PATCHCOMPLETED "Module.pm file has been updated" ! !insertmacro PLS_TEXT PSS_LANG_PATCHFAILED "Module.pm file has not been updated" ! ; Strings required by the PFI Library functions ! !insertmacro PLS_TEXT PFI_LANG_INST_LOG_SHUTDOWN "Shutting down POPFile using port" ! !insertmacro PLS_TEXT PFI_LANG_TAKE_A_FEW_SECONDS "This may take a few seconds..." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_1 "Unable to shutdown '$G_PLS_FIELD_1' automatically." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_2 "Please shutdown '$G_PLS_FIELD_1' manually now." ! !insertmacro PLS_TEXT PFI_LANG_MBMANSHUT_3 "When '$G_PLS_FIELD_1' has been shutdown, click 'OK' to continue." --- 418,434 ---- #-------------------------------------------------------------------------- ! ;----------------------------------------- ! ; Select the languages to be supported by the wizard ! ;----------------------------------------- ! ; 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' ! !ifndef ENGLISH_MODE ! !include "..\pfi-languages.nsh" ! !endif *************** *** 469,473 **** --- 459,483 ---- ; for BZIP2 and LZMA compression) + !insertmacro MUI_RESERVEFILE_LANGDLL !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" + ReserveFile "${NSISDIR}\Plugins\System.dll" + ReserveFile "${NSISDIR}\Plugins\untgz.dll" + ReserveFile "${NSISDIR}\Plugins\vpatch.dll" + + + #-------------------------------------------------------------------------- + # Installer Function: .onInit - the wizard starts by offering a choice of languages + #-------------------------------------------------------------------------- + + Function .onInit + + ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' + + !ifndef ENGLISH_MODE + !insertmacro MUI_LANGDLL_DISPLAY + !endif + + FunctionEnd *************** *** 496,505 **** mutex_ok: - - ; The wizard does not contain the SSL support files so we provide an estimate which - ; includes a slack space allowance (based upon the development system's statistics) - - SectionSetSize 0 2560 - Pop ${L_RESERVED} --- 506,509 ---- *************** *** 510,542 **** #-------------------------------------------------------------------------- ! # Installer Section: POPFile SSL Support #-------------------------------------------------------------------------- ! Section "SSL" SecSSL ! ! !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result ! ! Push ${L_RESULT} SetDetailsPrint listonly DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup wizard v${C_PFI_VERSION}" DetailPrint "----------------------------------------------------" - ; Download the archives and OpenSSL DLLs - - Push "${C_UWR_IO_SOCKET_SSL}" - Call GetSSLFile - - Push "${C_UWR_NET_SSLEAY}" - Call GetSSLFile - - Push "${C_UWR_DLL_SSLEAY32}" - Call GetSSLFile - - Push "${C_UWR_DLL_LIBEAY32}" - Call GetSSLFile - ; Make sure we do not try to add SSL support to an installation which is in use --- 514,530 ---- #-------------------------------------------------------------------------- ! # Installer Section: Prepare to download and install the SSL Support files #-------------------------------------------------------------------------- ! Section "-prepare" + SetDetailsPrint textonly + DetailPrint "$(PFI_LANG_INST_PROG_UPGRADE) $(PFI_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup v${C_PFI_VERSION}" DetailPrint "----------------------------------------------------" ; Make sure we do not try to add SSL support to an installation which is in use *************** *** 548,633 **** SetOutPath $G_ROOTDIR File "addssl.txt" - - ; Now install the files required for SSL support - - StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" - - StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\IO\Socket" DetailPrint "" - CreateDirectory $G_PLS_FIELD_1 - SetDetailsPrint both - StrCpy $G_PLS_FIELD_2 "IO-Socket-SSL.tar.gz" - DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" - SetDetailsPrint listonly - untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" - StrCmp ${L_RESULT} "success" label_a error_exit ! label_a: ! DetailPrint "" ! StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" ! CreateDirectory $G_PLS_FIELD_1 ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" ! DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" ! SetDetailsPrint listonly ! untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "SSLeay.pm" ! StrCmp ${L_RESULT} "success" label_b error_exit - label_b: - DetailPrint "" - StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net\SSLeay" - CreateDirectory $G_PLS_FIELD_1 - SetDetailsPrint both - StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" - DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" - SetDetailsPrint listonly - untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" "Handle.pm" - StrCmp ${L_RESULT} "success" label_c error_exit ! label_c: ! DetailPrint "" ! StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\auto\Net\SSLeay" ! CreateDirectory $G_PLS_FIELD_1 ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "OpenSSL DLL" ! DetailPrint "$(PSS_LANG_PROG_FILECOPY)" ! SetDetailsPrint listonly ! CopyFiles /SILENT "$PLUGINSDIR\ssleay32.dll" "$G_PLS_FIELD_1\ssleay32.dll" ! CopyFiles /SILENT "$PLUGINSDIR\libeay32.dll" "$G_PLS_FIELD_1\libeay32.dll" ! DetailPrint "" ! SetDetailsPrint both ! StrCpy $G_PLS_FIELD_2 "Net_SSLeay.pm.tar.gz" ! DetailPrint "$(PSS_LANG_PROG_FILEEXTRACT)" ! SetDetailsPrint listonly ! untgz::extractV -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\Net_SSLeay.pm.tar.gz" -x ".exists" "*.html" "*.pl" "*.pm" -- ! StrCmp ${L_RESULT} "success" check_bs_file ! ! error_exit: ! SetDetailsPrint listonly ! DetailPrint "" ! SetDetailsPrint both ! DetailPrint "$(PSS_LANG_MB_UNPACKFAIL)" ! SetDetailsPrint listonly ! DetailPrint "" ! MessageBox MB_OK|MB_ICONSTOP "$(PSS_LANG_MB_UNPACKFAIL)" ! ! error_timestamp: ! Call GetDateTimeStamp ! Pop $G_PLS_FIELD_1 ! DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" ! DetailPrint "----------------------------------------------------" ! Abort ! check_bs_file: - ; The current 'untgz' plugin (v1.0.5) does not extract empty files (i.e. file size is 0 bytes) - ; so we cheat a little to ensure all $G_MPLIBDIR\auto\Net\SSLeay\SSLeay.* files are extracted ! IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" ! done: ! DetailPrint "" ; Now patch Module.pm (if it needs to be patched) --- 536,557 ---- SetOutPath $G_ROOTDIR File "addssl.txt" DetailPrint "" ! SectionEnd ! #-------------------------------------------------------------------------- ! # Installer Section: Download and install POPFile SSL Support files ! # (the 'include' file contains more than just the 'Section' code) ! #-------------------------------------------------------------------------- ! !include "..\getssl.nsh" ! #-------------------------------------------------------------------------- ! # Installer Section: Apply the SSL speed-up patch if necessary then tidy up ! #-------------------------------------------------------------------------- ! Section "-tidyup" ; Now patch Module.pm (if it needs to be patched) *************** *** 650,654 **** StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log StrCmp $G_PLS_FIELD_1 "OK" 0 show_status ! !insertmacro BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm" SetDetailsPrint none Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm" --- 574,578 ---- StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log StrCmp $G_PLS_FIELD_1 "OK" 0 show_status ! !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm" SetDetailsPrint none Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm" *************** *** 661,665 **** SetDetailsPrint listonly DetailPrint "" ! Goto error_timestamp success: --- 585,594 ---- SetDetailsPrint listonly DetailPrint "" ! Call PFI_GetDateTimeStamp ! Pop $G_PLS_FIELD_1 ! DetailPrint "----------------------------------------------------" ! DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" ! DetailPrint "----------------------------------------------------" ! Abort success: *************** *** 676,680 **** SetDetailsPrint listonly DetailPrint "" ! Call GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" --- 605,609 ---- SetDetailsPrint listonly DetailPrint "" ! Call PFI_GetDateTimeStamp Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------------" *************** *** 686,694 **** SetDetailsPrint textonly ! DetailPrint "$(PSS_LANG_PROG_SAVELOG)" SetDetailsPrint none ! !insertmacro BACKUP_123 "$G_ROOTDIR" "addssl.log" Push "$G_ROOTDIR\addssl.log" ! Call DumpLog SetDetailsPrint both --- 615,623 ---- SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_PROG_SAVELOG)" SetDetailsPrint none ! !insertmacro PFI_BACKUP_123 "$G_ROOTDIR" "addssl.log" Push "$G_ROOTDIR\addssl.log" ! Call PFI_DumpLog SetDetailsPrint both *************** *** 696,703 **** SetDetailsPrint none - Pop ${L_RESULT} - - !undef L_RESULT - SectionEnd --- 625,628 ---- *************** *** 793,797 **** DetailPrint "" SetDetailsPrint both ! DetailPrint "$(PSS_LANG_PROG_CHECKIFRUNNING)" SetDetailsPrint listonly --- 718,722 ---- DetailPrint "" SetDetailsPrint both ! DetailPrint "$(PFI_LANG_PROG_CHECKIFRUNNING)" SetDetailsPrint listonly *************** *** 800,804 **** Push "POPFile" ! Call ServiceRunning Pop ${L_RESULT} StrCmp ${L_RESULT} "true" manual_shutdown --- 725,729 ---- Push "POPFile" ! Call PFI_ServiceRunning Pop ${L_RESULT} StrCmp ${L_RESULT} "true" manual_shutdown *************** *** 813,817 **** Push $G_ROOTDIR ! Call FindLockedPFE Pop ${L_EXE} StrCmp ${L_EXE} "" exit --- 738,742 ---- Push $G_ROOTDIR ! Call PFI_FindLockedPFE Pop ${L_EXE} StrCmp ${L_EXE} "" exit *************** *** 865,869 **** Push ${L_NEW_GUI} ! Call TrimNewlines Pop ${L_NEW_GUI} --- 790,794 ---- Push ${L_NEW_GUI} ! Call PFI_TrimNewlines Pop ${L_NEW_GUI} *************** *** 872,876 **** DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" Push ${L_NEW_GUI} ! Call ShutdownViaUI Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe --- 797,801 ---- DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" Push ${L_NEW_GUI} ! Call PFI_ShutdownViaUI Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe *************** *** 881,888 **** DetailPrint "Please be patient, this may take more than 30 seconds" Push ${L_EXE} ! Call WaitUntilUnlocked DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." Push ${L_EXE} ! Call CheckIfLocked Pop ${L_EXE} StrCmp ${L_EXE} "" unlocked_now --- 806,813 ---- DetailPrint "Please be patient, this may take more than 30 seconds" Push ${L_EXE} ! Call PFI_WaitUntilUnlocked DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." Push ${L_EXE} ! Call PFI_CheckIfLocked Pop ${L_EXE} StrCmp ${L_EXE} "" unlocked_now *************** *** 921,1031 **** FunctionEnd - - #-------------------------------------------------------------------------- - # Installer Function: GetSSLFile - # - # Inputs: - # (top of stack) - full URL used to download the SSL file - # Outputs: - # none - #-------------------------------------------------------------------------- - - Function GetSSLFile - - Pop $G_SSL_FILEURL - - StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL - Push $G_PLS_FIELD_1 - Call StrBackSlash - Call GetParent - Pop $G_PLS_FIELD_2 - StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2 - IntOp $G_PLS_FIELD_2 $G_PLS_FIELD_2 + 1 - StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1" "" $G_PLS_FIELD_2 - StrCpy $G_PLS_FIELD_2 "$G_SSL_FILEURL" $G_PLS_FIELD_2 - DetailPrint "" - DetailPrint "$(PSS_LANG_PROG_STARTDOWNLOAD)" - NSISdl::download "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" - Pop $G_PLS_FIELD_2 - StrCmp $G_PLS_FIELD_2 "success" file_received - SetDetailsPrint both - DetailPrint "$(PSS_LANG_MB_NSISDLFAIL_1)" - SetDetailsPrint listonly - DetailPrint "$(PSS_LANG_MB_NSISDLFAIL_2)" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(PSS_LANG_MB_NSISDLFAIL_1)${MB_NL}$(PSS_LANG_MB_NSISDLFAIL_2)" - SetDetailsPrint listonly - DetailPrint "" - Call GetDateTimeStamp - Pop $G_PLS_FIELD_1 - DetailPrint "----------------------------------------------------" - DetailPrint "POPFile SSL Setup failed ($G_PLS_FIELD_1)" - DetailPrint "----------------------------------------------------" - Abort - - file_received: - FunctionEnd - - - #-------------------------------------------------------------------------- - # Installer Function: DumpLog - # - # This function saves the contents of the install log (from INSTPAGE) in a file. - # The stack is used to pass the full pathname of the file to be used. - #-------------------------------------------------------------------------- - - !define LVM_GETITEMCOUNT 0x1004 - !define LVM_GETITEMTEXT 0x102D - - Function DumpLog - Exch $5 - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $6 - - FindWindow $0 "#32770" "" $HWNDPARENT - GetDlgItem $0 $0 1016 - StrCmp $0 0 error - FileOpen $5 $5 "w" - StrCmp $5 "" error - SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6 - System::Alloc ${NSIS_MAX_STRLEN} - Pop $3 - StrCpy $2 0 - System::Call "*(i, i, i, i, i, i, i, i, i) i \ - (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1" - - loop: - StrCmp $2 $6 done - System::Call "User32::SendMessageA(i, i, i, i) i \ - ($0, ${LVM_GETITEMTEXT}, $2, r1)" - System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)" - FileWrite $5 "$4${MB_NL}" - IntOp $2 $2 + 1 - Goto loop - - done: - FileClose $5 - System::Free $1 - System::Free $3 - Goto exit - - error: - MessageBox MB_OK|MB_ICONEXCLAMATION "Error: problem detected when saving the log file" - - exit: - Pop $6 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - Exch $5 - - FunctionEnd - - #-------------------------------------------------------------------------- # End of 'addssl.nsi' --- 846,849 ---- |
|
From: Joseph C. <tex...@us...> - 2005-10-02 23:21:33
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30075 Added Files: Tag: b0_22_2 favicon.ico Log Message: Add favicon as binary. --- NEW FILE: favicon.ico --- (This appears to be a binary file; contents omitted.) |
|
From: Joseph C. <tex...@us...> - 2005-10-02 23:20:33
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29937 Removed Files: Tag: b0_22_2 favicon.ico Log Message: Remove corrupted favicon. --- favicon.ico DELETED --- |
|
From: Brian S. <xue...@us...> - 2005-10-02 22:37:26
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5260 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: When the '/SSL' option is used shutdown POPFile before installing the files Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** getssl.nsh 13 Sep 2005 20:25:44 -0000 1.6.2.2 --- getssl.nsh 2 Oct 2005 12:07:28 -0000 1.6.2.3 *************** *** 135,139 **** ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher ! StrCpy ${L_RESULT} "built-in" --- 135,139 ---- ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher ! StrCpy ${L_RESULT} "built-in" *************** *** 141,145 **** IntCmp ${L_VER_Y} 8 0 restore_vars set_download_flag IntCmp ${L_VER_Z} 7 0 restore_vars set_download_flag ! set_download_flag: StrCpy ${L_RESULT} "download" --- 141,145 ---- IntCmp ${L_VER_Y} 8 0 restore_vars set_download_flag IntCmp ${L_VER_Z} 7 0 restore_vars set_download_flag ! set_download_flag: StrCpy ${L_RESULT} "download" *************** *** 229,238 **** IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit ! !endif ! !ifdef ADDSSL ! install_SSL_support: !endif ; Now install the files required for SSL support --- 229,246 ---- IfFileExists "$PLUGINSDIR\ssleay32.dll" 0 installer_error_exit IfFileExists "$PLUGINSDIR\libeay32.dll" 0 installer_error_exit ! StrCmp $G_SSL_ONLY "0" install_SSL_support ! ; The '/SSL' option was supplied so we need to make sure it is safe to install the files ! ! DetailPrint "" ! SetDetailsPrint both ! DetailPrint "$(PSS_LANG_PROG_CHECKIFRUNNING) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" ! SetDetailsPrint listonly ! DetailPrint "" ! Call MakeRootDirSafe !endif + install_SSL_support: + ; Now install the files required for SSL support |
|
From: Joseph C. <tex...@us...> - 2005-10-02 22:19:08
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16731/skins/default Modified Files: Tag: b0_22_2 common-bottom.thtml Log Message: Change footer URLs to point to getpopfile.org. Index: common-bottom.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-bottom.thtml,v retrieving revision 1.8 retrieving revision 1.8.6.1 diff -C2 -d -r1.8 -r1.8.6.1 *** common-bottom.thtml 25 Aug 2004 23:30:05 -0000 1.8 --- common-bottom.thtml 2 Oct 2005 22:18:58 -0000 1.8.6.1 *************** *** 11,27 **** <tr> <td class="footerBody"> ! <a class="bottomLink" href="http://popfile.sourceforge.net/"><TMPL_VAR NAME="Localize_Footer_HomePage"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/manual/<TMPL_VAR NAME="Localize_ManualLanguage">/manual.html"> <TMPL_VAR NAME="Localize_Footer_Manual"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/cgi-bin/wiki.pl"> <TMPL_VAR NAME="Localize_Footer_Wiki"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?<TMPL_VAR NAME="Localize_FAQLink">"><TMPL_VAR NAME="Localize_FAQ"></a> <br /> </td> <td class="footerBody"> ! <a class="bottomLink" href="http://popfile.sourceforge.net/"> <img src="otto.png" border="0" alt="" /></a> <br /> --- 11,27 ---- <tr> <td class="footerBody"> ! <a class="bottomLink" href="http://getpopfile.org/"><TMPL_VAR NAME="Localize_Footer_HomePage"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/manual/<TMPL_VAR NAME="Localize_ManualLanguage">/manual.html"> <TMPL_VAR NAME="Localize_Footer_Manual"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/cgi-bin/wiki.pl"> <TMPL_VAR NAME="Localize_Footer_Wiki"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/cgi-bin/wiki.pl?<TMPL_VAR NAME="Localize_FAQLink">"><TMPL_VAR NAME="Localize_FAQ"></a> <br /> </td> <td class="footerBody"> ! <a class="bottomLink" href="http://getpopfile.org/"> <img src="otto.png" border="0" alt="" /></a> <br /> |
|
From: Brian S. <xue...@us...> - 2005-10-02 21:11:52
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6161 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: getssl.nsh now uses a string formerly used only by the "SSL Setup" wizard. Rename this string and rearrange the language files to reflect the sharing of this string. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** getssl.nsh 2 Oct 2005 12:07:28 -0000 1.6.2.3 --- getssl.nsh 2 Oct 2005 14:57:43 -0000 1.6.2.4 *************** *** 235,239 **** DetailPrint "" SetDetailsPrint both ! DetailPrint "$(PSS_LANG_PROG_CHECKIFRUNNING) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" SetDetailsPrint listonly DetailPrint "" --- 235,239 ---- DetailPrint "" SetDetailsPrint both ! DetailPrint "$(PFI_LANG_PROG_CHECKIFRUNNING) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" SetDetailsPrint listonly DetailPrint "" |
|
From: Brian S. <xue...@us...> - 2005-10-02 21:05:23
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4178 Modified Files: Tag: b0_22_2 Arabic-pfi.nsh Bulgarian-pfi.nsh Catalan-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh Log Message: getssl.nsh now uses a string formerly used only by the "SSL Setup" wizard. Rename this string and rearrange the language files to reflect the sharing of this string. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Danish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Danish-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Tryk næste for at fortsætte" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.38.4.1 retrieving revision 1.38.4.2 diff -C2 -d -r1.38.4.1 -r1.38.4.2 *** Czech-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.38.4.1 --- Czech-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.38.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknìte na Dalí pro pokraèování" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.45.4.1 retrieving revision 1.45.4.2 diff -C2 -d -r1.45.4.1 -r1.45.4.2 *** French-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.45.4.1 --- French-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.45.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Cliquez sur 'Suivant' pour continuer" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 426,430 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 430,433 ---- Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.45.4.1 retrieving revision 1.45.4.2 diff -C2 -d -r1.45.4.1 -r1.45.4.2 *** English-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.45.4.1 --- English-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.45.4.2 *************** *** 156,159 **** --- 156,163 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 411,415 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 415,418 ---- Index: Catalan-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Catalan-pfi.nsh,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Catalan-pfi.nsh 15 Sep 2005 12:01:31 -0000 1.1.2.2 --- Catalan-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.1.2.3 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Premi Següent per continuar" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Finnish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Finnish-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klikkaa Seuraava jatkaaksesi" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Dutch-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Dutch-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klik op Volgende om verder te gaan" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Bulgarian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Bulgarian-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñíåòå 'Íàïðåä', çà äà ïðîäúëæèòå." + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.16.4.1 retrieving revision 1.16.4.2 diff -C2 -d -r1.16.4.1 -r1.16.4.2 *** Arabic-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.16.4.1 --- Arabic-pfi.nsh 2 Oct 2005 14:48:51 -0000 1.16.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÅÖÛØ ÇáÊÇáí ááãÊÇÈÚÉ" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 425,429 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 429,432 ---- |
|
From: Brian S. <xue...@us...> - 2005-10-02 20:46:53
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4899 Modified Files: Tag: b0_22_2 German-pfi.nsh Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh Log Message: getssl.nsh now uses a string formerly used only by the "SSL Setup" wizard. Rename this string and rearrange the language files to reflect the sharing of this string. Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.1 retrieving revision 1.54.4.2 diff -C2 -d -r1.54.4.1 -r1.54.4.2 *** Japanese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.54.4.1 --- Japanese-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.54.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "uÖvðNbNµÄ±sµÄº³¢B" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 426,430 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 430,433 ---- Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.48.4.1 retrieving revision 1.48.4.2 diff -C2 -d -r1.48.4.1 -r1.48.4.2 *** German-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.48.4.1 --- German-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.48.4.2 *************** *** 163,166 **** --- 163,170 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicken Sie auf Weiter um fortzufahren" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 428,432 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 432,435 ---- Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.29.4.1 retrieving revision 1.29.4.2 diff -C2 -d -r1.29.4.1 -r1.29.4.2 *** Norwegian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.29.4.1 --- Norwegian-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.29.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Trykk Neste for å begyne" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.44.4.1 retrieving revision 1.44.4.2 diff -C2 -d -r1.44.4.1 -r1.44.4.2 *** Korean-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.44.4.1 --- Korean-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.44.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "°è¼Ó ÁøÇàÇϱâ À§ÇØ '´ÙÀ½'À» ´©¸£½Ê½Ã¿À." + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 426,430 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 430,433 ---- Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Portuguese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Portuguese-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Seguinte para continuar" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.33.4.1 retrieving revision 1.33.4.2 diff -C2 -d -r1.33.4.1 -r1.33.4.2 *** Italian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.33.4.1 --- Italian-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.33.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Seleziona Seguente per continuare" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Hungarian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Hungarian-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "A folytatáshoz nyomja meg a Tovább gombot" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.36.4.1 retrieving revision 1.36.4.2 diff -C2 -d -r1.36.4.1 -r1.36.4.2 *** Polish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.36.4.1 --- Polish-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.36.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknij Dalej aby kontynuowaæ" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.35.4.1 retrieving revision 1.35.4.2 diff -C2 -d -r1.35.4.1 -r1.35.4.2 *** Greek-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.35.4.1 --- Greek-pfi.nsh 2 Oct 2005 14:53:07 -0000 1.35.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "ÊÜíôå êëéê óôï Åðüìåíï ãéá íá óõíå÷ßóåôå" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- |
|
From: Brian S. <xue...@us...> - 2005-10-02 20:39:46
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5482 Modified Files: Tag: b0_22_2 PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: getssl.nsh now uses a string formerly used only by the "SSL Setup" wizard. Rename this string and rearrange the language files to reflect the sharing of this string. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Swedish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Swedish-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicka Nästa för att fortsätta" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.59.4.1 retrieving revision 1.59.4.2 diff -C2 -d -r1.59.4.1 -r1.59.4.2 *** PortugueseBR-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.59.4.1 --- PortugueseBR-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.59.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Clique em Avançar para continuar" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 425,429 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 429,432 ---- Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.44.4.1 retrieving revision 1.44.4.2 diff -C2 -d -r1.44.4.1 -r1.44.4.2 *** TradChinese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.44.4.1 --- TradChinese-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.44.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 420,424 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 424,427 ---- Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.48.4.1 retrieving revision 1.48.4.2 diff -C2 -d -r1.48.4.1 -r1.48.4.2 *** Spanish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.48.4.1 --- Spanish-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.48.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Presione Siguiente para continuar" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 425,429 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 429,432 ---- Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** SimpChinese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- SimpChinese-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 420,424 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 424,427 ---- Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Slovak-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Slovak-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Kliknite na Ïalej pre pokraèovanie" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Russian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Russian-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàæìèòå Äàëåå äëÿ ïðîäîëæåíèÿ óñòàíîâêè." + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.43.4.1 retrieving revision 1.43.4.2 diff -C2 -d -r1.43.4.1 -r1.43.4.2 *** Ukrainian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 --- Ukrainian-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.43.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Íàòèñí³òü Äàë³ äëÿ ïðîäîâæåííÿ" + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.32.4.1 retrieving revision 1.32.4.2 diff -C2 -d -r1.32.4.1 -r1.32.4.2 *** Turkish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.32.4.1 --- Turkish-pfi.nsh 2 Oct 2005 14:57:14 -0000 1.32.4.2 *************** *** 161,164 **** --- 161,168 ---- !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Devam'a tiklayin." + ; Progress Reports displayed above the progress bar when downloading/installing SSL support [addssl.nsi, getssl.nsh] + + !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." + ; Installation Log Messages [installer.nsi, adduser.nsi] *************** *** 416,420 **** !insertmacro PFI_LANG_STRING PSS_LANG_PROG_INITIALISE "Initializing..." - !insertmacro PFI_LANG_STRING PSS_LANG_PROG_CHECKIFRUNNING "Checking if POPFile is running..." !insertmacro PFI_LANG_STRING PSS_LANG_PROG_USERCANCELLED "POPFile SSL Support installation cancelled by the user" !insertmacro PFI_LANG_STRING PSS_LANG_PROG_SUCCESS "POPFile SSL support installed" --- 420,423 ---- |
|
From: Joseph C. <tex...@us...> - 2005-09-29 08:26:20
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30163/skins/default Modified Files: common-bottom.thtml Log Message: Update footer URLs to getpopfile.org. Index: common-bottom.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-bottom.thtml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** common-bottom.thtml 20 Aug 2005 08:13:20 -0000 1.14 --- common-bottom.thtml 29 Sep 2005 08:26:11 -0000 1.15 *************** *** 14,32 **** <tr> <td class="footerBody"> ! <a class="bottomLink" href="http://popfile.sourceforge.net/" title="<TMPL_VAR NAME="Localize_tip_Footer_HomePage">"> <TMPL_VAR NAME="Localize_Footer_HomePage"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/manual/<TMPL_VAR NAME="Localize_ManualLanguage">/manual.html" title="<TMPL_VAR NAME="Localize_tip_Footer_Manual">"> <TMPL_VAR NAME="Localize_Footer_Manual"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/cgi-bin/wiki.pl" title="<TMPL_VAR NAME="Localize_tip_Footer_Wiki">"> <TMPL_VAR NAME="Localize_Footer_Wiki"></a> <br /> ! <a class="bottomLink" href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?<TMPL_VAR NAME="Localize_FAQLink">" title="<TMPL_VAR NAME="Localize_tip_Footer_FAQ">"> <TMPL_VAR NAME="Localize_FAQ"></a> <br /> </td> <td class="footerBody"> ! <a class="bottomLink" href="http://popfile.sourceforge.net/"> <img src="<TMPL_VAR NAME="Skin_Root">otto.png" border="0" alt="" /></a> <br /> --- 14,32 ---- <tr> <td class="footerBody"> ! <a class="bottomLink" href="http://getpopfile.org/" title="<TMPL_VAR NAME="Localize_tip_Footer_HomePage">"> <TMPL_VAR NAME="Localize_Footer_HomePage"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/manual/<TMPL_VAR NAME="Localize_ManualLanguage">/manual.html" title="<TMPL_VAR NAME="Localize_tip_Footer_Manual">"> <TMPL_VAR NAME="Localize_Footer_Manual"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/cgi-bin/wiki.pl" title="<TMPL_VAR NAME="Localize_tip_Footer_Wiki">"> <TMPL_VAR NAME="Localize_Footer_Wiki"></a> <br /> ! <a class="bottomLink" href="http://getpopfile.org/cgi-bin/wiki.pl?<TMPL_VAR NAME="Localize_FAQLink">" title="<TMPL_VAR NAME="Localize_tip_Footer_FAQ">"> <TMPL_VAR NAME="Localize_FAQ"></a> <br /> </td> <td class="footerBody"> ! <a class="bottomLink" href="http://getpopfile.org/"> <img src="<TMPL_VAR NAME="Skin_Root">otto.png" border="0" alt="" /></a> <br /> |
|
From: Manni H. <man...@us...> - 2005-09-28 19:30:53
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2447/UI Modified Files: HTML.pm Log Message: shutdown_page__() didn't know about the reduced number of tabs, yet. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.360 retrieving revision 1.361 diff -C2 -d -r1.360 -r1.361 *** HTML.pm 28 Sep 2005 18:48:36 -0000 1.360 --- HTML.pm 28 Sep 2005 19:30:40 -0000 1.361 *************** *** 3836,3840 **** my $templ = $self->load_template__( 'shutdown-page.thtml','',$session ); ! for my $i ( 0..6 ) { $templ->param( "Common_Middle_Tab$i" => "menuStandard" ); } --- 3836,3840 ---- my $templ = $self->load_template__( 'shutdown-page.thtml','',$session ); ! for my $i ( 0..5 ) { $templ->param( "Common_Middle_Tab$i" => "menuStandard" ); } |
|
From: Manni H. <man...@us...> - 2005-09-28 19:10:01
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28860/skins/default Modified Files: view-quickmagnets-widget.thtml Log Message: Place Brian's magnet-warning along the quick magnets widget. Index: view-quickmagnets-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-quickmagnets-widget.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** view-quickmagnets-widget.thtml 15 Aug 2005 03:49:41 -0000 1.5 --- view-quickmagnets-widget.thtml 28 Sep 2005 19:09:52 -0000 1.6 *************** *** 8,61 **** <TMPL_VAR NAME="Localize_QuickMagnets"> </h4> - <table class="top20Words"> - <tr> - <th scope="col"> - <TMPL_VAR NAME="Localize_Magnet"> - </th> - <th> - <TMPL_VAR NAME="Localize_Magnet_Always"> - </th> - </tr> - - <TMPL_LOOP NAME="View_QuickMagnets_Loop"> <tr> - <td scope="col"> - <TMPL_VAR NAME="View_QuickMagnets_Type">: - <select name="text<TMPL_VAR NAME="View_QuickMagnets_I">"> - - <TMPL_LOOP NAME="View_QuickMagnets_Loop_Magnets"> - - <option value="<TMPL_VAR NAME="View_QuickMagnets_Magnet">"> - <TMPL_VAR NAME="View_QuickMagnets_Magnet"> - </option> - - </TMPL_LOOP> - - </select> - </td> <td> ! <input type="hidden" name="type<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddType" value="<TMPL_VAR NAME="View_QuickMagnets_Type">" /> ! <select name="bucket<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddBucket"> ! <option value=""></option> ! ! <TMPL_LOOP NAME="View_QuickMagnets_Loop_Buckets"> ! ! <option value="<TMPL_VAR NAME="View_QuickMagnets_Bucket">" style="color: <TMPL_VAR NAME="View_QuickMagnets_Bucket_Color">"> ! <TMPL_VAR NAME="View_QuickMagnets_Bucket"> ! </option> ! </TMPL_LOOP> - </select> - </td> - </tr> - - </TMPL_LOOP> ! <tr> ! <td> </td> <td> ! <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> </td> </tr> --- 8,75 ---- <TMPL_VAR NAME="Localize_QuickMagnets"> </h4> + <table> <tr> <td> ! <table class="top20Words"> ! <tr> ! <th scope="col"> ! <TMPL_VAR NAME="Localize_Magnet"> ! </th> ! <th> ! <TMPL_VAR NAME="Localize_Magnet_Always"> ! </th> ! </tr> ! ! <TMPL_LOOP NAME="View_QuickMagnets_Loop"> ! ! <tr> ! <td scope="col"> ! <TMPL_VAR NAME="View_QuickMagnets_Type">: ! <select name="text<TMPL_VAR NAME="View_QuickMagnets_I">"> ! ! <TMPL_LOOP NAME="View_QuickMagnets_Loop_Magnets"> ! ! <option value="<TMPL_VAR NAME="View_QuickMagnets_Magnet">"> ! <TMPL_VAR NAME="View_QuickMagnets_Magnet"> ! </option> ! ! </TMPL_LOOP> ! ! </select> ! </td> ! <td> ! <input type="hidden" name="type<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddType" value="<TMPL_VAR NAME="View_QuickMagnets_Type">" /> ! <select name="bucket<TMPL_VAR NAME="View_QuickMagnets_I">" class="magnetsAddBucket"> ! <option value=""></option> ! ! <TMPL_LOOP NAME="View_QuickMagnets_Loop_Buckets"> ! ! <option value="<TMPL_VAR NAME="View_QuickMagnets_Bucket">" style="color: <TMPL_VAR NAME="View_QuickMagnets_Bucket_Color">"> ! <TMPL_VAR NAME="View_QuickMagnets_Bucket"> ! </option> ! ! </TMPL_LOOP> ! </select> ! </td> ! </tr> ! </TMPL_LOOP> ! <tr> ! <td> ! </td> ! <td> ! <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> ! </td> ! </tr> ! ! </td> ! </table> </td> <td> ! <div class="helpMessage"> ! <TMPL_VAR NAME="Localize_Magnet_Note"> ! </div> </td> </tr> |
|
From: Manni H. <man...@us...> - 2005-09-28 18:49:01
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23951/skins/default Modified Files: common-middle.thtml corpus-page.thtml Log Message: Make template system work even with strict-params enabled. Had to remove some cruft to make this work and I removed Jim's patches from HTML.pm and corpus-page.thtml. I want to try and get the best out of Jim's and Brian's corpus page, but a fresh start seems to be the best solution. Index: common-middle.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-middle.thtml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** common-middle.thtml 20 Aug 2005 06:40:12 -0000 1.20 --- common-middle.thtml 28 Sep 2005 18:48:38 -0000 1.21 *************** *** 51,63 **** <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab6">" align="center"> <a class="menuLink" href="/advanced" title="<TMPL_VAR NAME="Localize_tip_Menu_Advanced">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> --- 51,63 ---- <TMPL_IF NAME="Common_Middle_If_CanAdmin"> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab3">" align="center"> <a class="menuLink" href="/administration" title="<TMPL_VAR NAME="Localize_tip_Menu_Admin">"><TMPL_VAR NAME="Localize_Header_Administration"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab4">" align="center"> <a class="menuLink" href="/users" title="<TMPL_VAR NAME="Localize_tip_Menu_Users">"><TMPL_VAR NAME="Localize_Header_Users"></a> </td> <td class="menuSpacer"></td> ! <td class="<TMPL_VAR NAME="Common_Middle_Tab5">" align="center"> <a class="menuLink" href="/advanced" title="<TMPL_VAR NAME="Localize_tip_Menu_Advanced">"><TMPL_VAR NAME="Localize_Header_Advanced"></a> </td> Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** corpus-page.thtml 10 Sep 2005 08:49:41 -0000 1.24 --- corpus-page.thtml 28 Sep 2005 18:48:38 -0000 1.25 *************** *** 26,195 **** </TMPL_IF> - <!-- Jim's stuff --> - - <table class="bucketsTable" cellpadding="0" cellspacing="5" valign="top" align="center" summary="<TMPL_VAR NAME="Localize_Bucket_StatisticsTableSummary">"> - <tr> - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BucketName"> - </th> - - <th scope="col" colspan="2" align="center" nowrap> - <TMPL_VAR NAME="Localize_Bucket_EmailsClassifiedUpper"> - </th> - - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFN"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_HitRate"> - </th> - - - <th scope="col" rowspan="2" align="center"> - <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFP"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_StrikeRate"> - </th> - - - <th scope="col" colspan="2" align="center" nowrap> - <TMPL_VAR NAME="Localize_Words"> - </th> - - - <th scope="col" rowspan="2" align="right"> - <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> - </th> - </tr> - - <tr> - <th align="right"> - <TMPL_VAR NAME="Localize_Count"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Percent"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Count"> - </th> - - <th align="right"> - <TMPL_VAR NAME="Localize_Percent"> - </th> - </tr> - - <TMPL_LOOP NAME="Corpus_Loop_Buckets"> - <TMPL_IF NAME="__odd__"> - <tr class="rowOdd"> - <TMPL_ELSE> - <tr class="rowEven"> - </TMPL_IF> - <td align="right"> - <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> - <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> - </TMPL_IF> - <span style="color:<TMPL_VAR NAME="Corpus_Bucket_Color">; white-space: nowrap;"> - <b> - <TMPL_VAR NAME="Corpus_Bucket"> - </b> - </span> - <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> - </a> - </TMPL_IF> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Message_Count"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Message_Percent">% - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_False_Negative"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Hit_Rate"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_False_Positive"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Strike_Rate"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Word_Count"> - </td> - - <td align="right"> - <TMPL_VAR NAME="Bucket_Word_Percent">% - </td> - - <td align="right"> - <TMPL_VAR NAME="Corpus_Bucket_Unique"> - </td> - </tr> - </TMPL_LOOP> <!-- corpus loop buckets --> - <tr> - <td align="center"> - <b> - <TMPL_VAR NAME="Localize_Total"> - </b> - </td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Message_Count"> - </b> - </td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Error_Count"> - </b> - </td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Accuracy"> - </b> - </td> - - <td></td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Word_Count"> - </b> - </td> - - <td></td> - - <td align="right"> - <b> - <TMPL_VAR NAME="Corpus_Total_Unique"> - </b> - </td> - </tr> - </table> - - <!-- end Jim's stuff --> - <table class="settingsTable" width="100%" cellpadding="10%" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> --- 26,29 ---- *************** *** 234,238 **** <TMPL_LOOP NAME="Corpus_Loop_Buckets"> - <TMPL_IF NAME="__odd__"> --- 68,71 ---- |
|
From: Manni H. <man...@us...> - 2005-09-28 18:48:49
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23951/UI Modified Files: HTML.pm Log Message: Make template system work even with strict-params enabled. Had to remove some cruft to make this work and I removed Jim's patches from HTML.pm and corpus-page.thtml. I want to try and get the best out of Jim's and Brian's corpus page, but a fresh start seems to be the best solution. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.359 retrieving revision 1.360 diff -C2 -d -r1.359 -r1.360 *** HTML.pm 24 Sep 2005 20:10:41 -0000 1.359 --- HTML.pm 28 Sep 2005 18:48:36 -0000 1.360 *************** *** 820,824 **** $selected = -1 if ( !defined( $selected ) ); ! my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' ); $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) ); --- 820,824 ---- $selected = -1 if ( !defined( $selected ) ); ! my @tab = ( 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard', 'menuStandard' ); $tab[$selected] = 'menuSelected' if ( ( $selected <= $#tab ) && ( $selected >= 0 ) ); *************** *** 1155,1159 **** $templ->param( 'Security_If_Local' => ( $self->config_( 'local' ) == 1 ) ); ! $templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) ); $templ->param( 'Security_If_Update_Check' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) == 1 ) ); $templ->param( 'Security_If_Send_Stats' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) == 1 ) ); --- 1155,1159 ---- $templ->param( 'Security_If_Local' => ( $self->config_( 'local' ) == 1 ) ); ! #$templ->param( 'Security_If_Password_Updated' => ( defined($self->{form_}{password} ) ) ); $templ->param( 'Security_If_Update_Check' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'update_check' ) == 1 ) ); $templ->param( 'Security_If_Send_Stats' => ( $self->user_config_( $self->{sessions__}{$session}{user}, 'send_stats' ) == 1 ) ); *************** *** 2125,2129 **** $bucket_row_data{bar_bucket_name2} = $bucket; $bucket_row_data{bar_width} = $percent; ! $bucket_row_data{Skin_Root} = $self->{skin_root}; } else { --- 2125,2129 ---- $bucket_row_data{bar_bucket_name2} = $bucket; $bucket_row_data{bar_width} = $percent; ! #$bucket_row_data{Skin_Root} = $self->{skin_root}; } else { *************** *** 2277,2302 **** my @corpus_data; - - #***** Jim's stuff 1 ***** - my $total_messages = $self->mcount__( $session ); - if ( $total_messages != 0 ) { - $templ->param( 'Corpus_If_Message_Count' => 1 ); - } - else { - $templ->param( 'Corpus_If_Message_Count' => 0 ); - } - my $total_words = 0; - for my $bucket (@buckets) { - $total_words += $self->classifier_()->get_bucket_word_count( $session, $bucket ); - } - $templ->param( 'Corpus_Word_Count' => $self->pretty_number( $total_words ) ); - if ( $total_words != 0 ) { - $templ->param( 'Corpus_If_Word_Count' => 1 ); - } - else { - $templ->param( 'Corpus_If_Word_Count' => 0 ); - } - #**** end Jim's stuff 1 **** - foreach my $bucket ( @buckets ) { my %row_data; --- 2277,2280 ---- *************** *** 2316,2365 **** push ( @color_data, \%color_row ); } - $row_data{Localize_Apply} = $self->{language__}{Apply}; $row_data{Corpus_Loop_Loop_Colors} = \@color_data; ! #************ Jim's stuff 2 ********* ! my $messages = $self->get_bucket_parameter__( $session, $bucket, 'count' ) || 0; ! if ( $total_messages == 0 ) { ! $total_messages = 1; # prevent div by 0 with empty corpus (needs better solution) ! } ! $row_data{Bucket_Message_Percent} = sprintf( "%.2f", ( 100 * ( $messages / $total_messages ) ) ); ! $row_data{Bucket_Message_Count} = $self->pretty_number( $messages ); ! my $positives = $self->get_bucket_parameter__($session, $bucket, 'fpcount' ) || 0; ! $row_data{Bucket_False_Positive} = $self->pretty_number( $positives ); ! if ( ( $total_messages - $messages ) == 0 ) { ! $row_data{Bucket_Strike_Rate} = "n/a"; ! } ! else { ! $row_data{Bucket_Strike_Rate} = sprintf( "%.2f%%", ( 100 * ( $positives ) / ( $total_messages - $messages ) ) ); ! } ! my $negatives = $self->get_bucket_parameter__( $session, $bucket, 'fncount' ) || 0; ! $row_data{Bucket_False_Negative} = $self->pretty_number( $negatives ); ! if ( ( $messages + $negatives ) == 0 ) { ! $row_data{Bucket_Hit_Rate} = "n/a"; ! } ! else { ! $row_data{Bucket_Hit_Rate} = sprintf( "%.2f%%", ( 100 * ( $messages ) / ( $messages + $negatives ) ) ); ! } ! my $words = $self->classifier_()->get_bucket_word_count( $session, $bucket ) || 0; ! $row_data{Bucket_Word_Count} = $self->pretty_number( $words ); ! if ( $total_words != 0 ) { ! $row_data{Bucket_Word_Percent} = sprintf( "%.2f", ( 100 * ( $words / $total_words ) ) ); ! } ! else { ! $row_data{Bucket_Word_Percent} = " "; ! } ! if ( $messages != 0 ) { ! $row_data{Bar_If_Message_Count} = 1; ! } ! else { ! $row_data{Bar_If_Message_Count} = 0; ! } ! if ( $words != 0 ) { ! $row_data{Bar_If_Word_Count} = 1; ! } ! else { ! $row_data{Bar_If_Word_Count} = 0; ! } ! #********* end Jim's stuff 2 ******** push ( @corpus_data, \%row_data ); } --- 2294,2299 ---- push ( @color_data, \%color_row ); } $row_data{Corpus_Loop_Loop_Colors} = \@color_data; ! push ( @corpus_data, \%row_data ); } *************** *** 2983,2987 **** $row_data{Localize_tip_History_MoveLeft} = $self->{language__}{tip_History_MoveLeft}; $row_data{Localize_tip_History_MoveRight} = $self->{language__}{tip_History_MoveRight}; - $row_data{Skin_Root} = $self->{skin_root}; push ( @header_data, \%row_data ); $length -= 10; --- 2917,2920 ---- *************** *** 3018,3022 **** foreach my $row (@rows) { my %row_data; ! my $mail_file = $row_data{History_Mail_File} = $$row[0]; my @column_data; my @cols = split(',', $self->user_config_( $self->{sessions__}{$session}{user}, 'columns' )); --- 2951,2955 ---- foreach my $row (@rows) { my %row_data; ! my $mail_file = $$row[0]; my @column_data; my @cols = split(',', $self->user_config_( $self->{sessions__}{$session}{user}, 'columns' )); *************** *** 3054,3058 **** if ($header eq 'subject') { $col_data{History_If_Subject_Column} = 1; ! if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' ) { # Remove wrong characters as euc-jp. --- 2987,2991 ---- if ($header eq 'subject') { $col_data{History_If_Subject_Column} = 1; ! if ( $self->user_config_( $self->{sessions__}{$session}{user}, 'language' ) eq 'Nihongo' ) { # Remove wrong characters as euc-jp. *************** *** 3102,3108 **** $col_data{History_If_Bucket_Column} = 1; my $bucket = $col_data{History_Bucket} = $$row[8]; ! $col_data{History_If_Magnetized} = ($$row[11] ne ''); ! $col_data{History_Magnet} = $$row[11]; ! $col_data{Skin_Root} = $self->{skin_root}; $col_data{History_If_Not_Pseudo} = !$self->classifier_()->is_pseudo_bucket( --- 3035,3042 ---- $col_data{History_If_Bucket_Column} = 1; my $bucket = $col_data{History_Bucket} = $$row[8]; ! if ( $$row[11] ne '' ) { ! $col_data{History_If_Magnetized} = 1; ! $col_data{History_Magnet} = $$row[11]; ! } $col_data{History_If_Not_Pseudo} = !$self->classifier_()->is_pseudo_bucket( |
|
From: Joseph C. <tex...@us...> - 2005-09-27 15:47:58
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4877/POPFile Modified Files: Tag: b0_22_2 popfile_version Log Message: Update version number for branch. Index: popfile_version =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/popfile_version,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** popfile_version 1 Dec 2004 03:06:33 -0000 1.4 --- popfile_version 27 Sep 2005 15:47:21 -0000 1.4.4.1 *************** *** 1,3 **** 0 22 ! 2 --- 1,3 ---- 0 22 ! 3 |
|
From: Joseph C. <tex...@us...> - 2005-09-27 14:54:18
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25793/UI Modified Files: Tag: b0_22_2 HTML.pm Log Message: Remove now unused Localize_Apply from Buckets page. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.311.4.4 retrieving revision 1.311.4.5 diff -C2 -d -r1.311.4.4 -r1.311.4.5 *** HTML.pm 27 Sep 2005 09:29:25 -0000 1.311.4.4 --- HTML.pm 27 Sep 2005 14:54:07 -0000 1.311.4.5 *************** *** 1825,1829 **** push ( @color_data, \%color_row ); } - $row_data{Localize_Apply} = $self->{language__}{Apply}; $row_data{Session_Key} = $self->{session_key__}; $row_data{Corpus_Loop_Loop_Colors} = \@color_data; --- 1825,1828 ---- |
|
From: Brian S. <xue...@us...> - 2005-09-27 13:08:41
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30864 Modified Files: adduser-Version.nsh adduser.nsi Log Message: Fix the bug that left $G_SFN_DISABLED undefined when the /restore option is used (found this during testing of the 0.22.3 installer) Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** adduser-Version.nsh 12 Aug 2005 12:58:23 -0000 1.6 --- adduser-Version.nsh 27 Sep 2005 13:08:31 -0000 1.7 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.74" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.0" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** adduser.nsi 12 Aug 2005 12:58:23 -0000 1.78 --- adduser.nsi 27 Sep 2005 13:08:31 -0000 1.79 *************** *** 770,776 **** ; 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 (To do: look for username in Registry?) --- 770,776 ---- ; 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 (To do: look for username in Registry?) *************** *** 782,786 **** got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" --- 782,786 ---- got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" *************** *** 788,792 **** get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" exit StrCmp $G_WINUSERTYPE "Power" exit --- 788,792 ---- get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" exit StrCmp $G_WINUSERTYPE "Power" exit *************** *** 2011,2014 **** --- 2011,2036 ---- check_config: + + ; Assume SFN support is enabled (the default setting for Windows) + + StrCpy $G_SFN_DISABLED "0" + + Push $G_USERDIR + Call PFI_GetSFNStatus + Pop ${L_RESULT} + StrCmp ${L_RESULT} "1" check_restore_log + StrCpy $G_SFN_DISABLED "1" + + ; Short file names are not supported here, so we cannot accept any path containing spaces. + + Push $G_USERDIR + Push ' ' + Call PFI_StrStr + Pop ${L_RESULT} + StrCmp ${L_RESULT} "" check_restore_log + Pop ${L_RESULT} + Goto SFN_problem + + check_restore_log: Pop ${L_RESULT} IfFileExists "$G_USERDIR\pfi-restore.log" 0 invalid_restore *************** *** 2021,2024 **** --- 2043,2052 ---- Abort + SFN_problem: + MessageBox MB_OK|MB_ICONSTOP "Internal Error: Unexpected space(s) found in 'restore' path !\ + ${MB_NL}${MB_NL}\ + ($G_USERDIR)" + Goto quit_wizard + invalid_restore: MessageBox MB_OK|MB_ICONSTOP "Error: No 'restore' data found at specified location !\ |
|
From: Brian S. <xue...@us...> - 2005-09-27 11:47:41
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10730 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi Log Message: Fix the bug that left the $G_SFN_DISABLED global variable undefined when the /restore option is used (this bug was likely to result in invalid data getting into POPFILE_ROOT and POPFILE_USER). Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -d -r1.6.2.4 -r1.6.2.5 *** adduser-Version.nsh 15 Sep 2005 11:57:22 -0000 1.6.2.4 --- adduser-Version.nsh 27 Sep 2005 11:47:33 -0000 1.6.2.5 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.74" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.75" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.3 retrieving revision 1.59.4.4 diff -C2 -d -r1.59.4.3 -r1.59.4.4 *** adduser.nsi 15 Sep 2005 12:03:00 -0000 1.59.4.3 --- adduser.nsi 27 Sep 2005 11:47:33 -0000 1.59.4.4 *************** *** 770,776 **** ; 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 (To do: look for username in Registry?) --- 770,776 ---- ; 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 (To do: look for username in Registry?) *************** *** 782,786 **** got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" --- 782,786 ---- got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" *************** *** 788,792 **** get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" exit StrCmp $G_WINUSERTYPE "Power" exit --- 788,792 ---- get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" exit StrCmp $G_WINUSERTYPE "Power" exit *************** *** 2011,2014 **** --- 2011,2036 ---- check_config: + + ; Assume SFN support is enabled (the default setting for Windows) + + StrCpy $G_SFN_DISABLED "0" + + Push $G_USERDIR + Call PFI_GetSFNStatus + Pop ${L_RESULT} + StrCmp ${L_RESULT} "1" check_restore_log + StrCpy $G_SFN_DISABLED "1" + + ; Short file names are not supported here, so we cannot accept any path containing spaces. + + Push $G_USERDIR + Push ' ' + Call PFI_StrStr + Pop ${L_RESULT} + StrCmp ${L_RESULT} "" check_restore_log + Pop ${L_RESULT} + Goto SFN_problem + + check_restore_log: Pop ${L_RESULT} IfFileExists "$G_USERDIR\pfi-restore.log" 0 invalid_restore *************** *** 2021,2024 **** --- 2043,2052 ---- Abort + SFN_problem: + MessageBox MB_OK|MB_ICONSTOP "Internal Error: Unexpected space(s) found in 'restore' path !\ + ${MB_NL}${MB_NL}\ + ($G_USERDIR)" + Goto quit_wizard + invalid_restore: MessageBox MB_OK|MB_ICONSTOP "Error: No 'restore' data found at specified location !\ |
|
From: Joseph C. <tex...@us...> - 2005-09-27 09:32:28
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13623/skins/default Modified Files: Tag: b0_22_2 corpus-page.thtml Log Message: Put session key back to fix show bucket links on Buckets page. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.9.6.2 retrieving revision 1.9.6.3 diff -C2 -d -r1.9.6.2 -r1.9.6.3 *** corpus-page.thtml 27 Sep 2005 06:48:58 -0000 1.9.6.2 --- corpus-page.thtml 27 Sep 2005 09:32:21 -0000 1.9.6.3 *************** *** 81,86 **** <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! ! <a href="/buckets?showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> </TMPL_IF> --- 81,86 ---- <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> ! ! <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> </TMPL_IF> |
|
From: Joseph C. <tex...@us...> - 2005-09-27 09:29:34
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12749/UI Modified Files: Tag: b0_22_2 HTML.pm Log Message: Put session key back to fix show bucket links on Buckets page. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.311.4.3 retrieving revision 1.311.4.4 diff -C2 -d -r1.311.4.3 -r1.311.4.4 *** HTML.pm 25 Sep 2005 12:56:36 -0000 1.311.4.3 --- HTML.pm 27 Sep 2005 09:29:25 -0000 1.311.4.4 *************** *** 1826,1829 **** --- 1826,1830 ---- } $row_data{Localize_Apply} = $self->{language__}{Apply}; + $row_data{Session_Key} = $self->{session_key__}; $row_data{Corpus_Loop_Loop_Colors} = \@color_data; |
|
From: Joseph C. <tex...@us...> - 2005-09-27 06:49:10
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9717/skins/default Modified Files: Tag: b0_22_2 corpus-page.thtml Log Message: Fix duplicate Bucket Configuration header on Buckets page. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.9.6.1 retrieving revision 1.9.6.2 diff -C2 -d -r1.9.6.1 -r1.9.6.2 *** corpus-page.thtml 25 Sep 2005 12:56:36 -0000 1.9.6.1 --- corpus-page.thtml 27 Sep 2005 06:48:58 -0000 1.9.6.2 *************** *** 28,36 **** </TMPL_IF> - <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Title"></h2> - <form class="bucketsSwitch" action="/buckets" method="post"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! <table width="100%" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> <th colspan="7" align="left"> --- 28,34 ---- </TMPL_IF> <form class="bucketsSwitch" action="/buckets" method="post"> <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /> ! <table class="bucketsTable" width="100%" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> <th colspan="7" align="left"> |
|
From: naoki i. <am...@us...> - 2005-09-26 13:17:30
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1357/languages Modified Files: Tag: b0_22_2 Nihongo.msg Log Message: Japanese update for ApplyChanges Index: Nihongo.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Nihongo.msg,v retrieving revision 1.11 retrieving revision 1.11.6.1 diff -C2 -d -r1.11 -r1.11.6.1 *** Nihongo.msg 24 Sep 2004 16:39:46 -0000 1.11 --- Nihongo.msg 26 Sep 2005 13:17:23 -0000 1.11.6.1 *************** *** 32,35 **** --- 32,36 ---- # Common words that are used on their own all over the interface Apply ŬÍÑ + ApplyChanges Êѹ¹¤òŬÍÑ On ON Off OFF *************** *** 235,239 **** Security_PasswordTitle ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥Ñ¥¹¥ï¡¼¥É Security_Password ¥Ñ¥¹¥ï¡¼¥É ! Security_PasswordUpdate ¥Ñ¥¹¥ï¡¼¥É¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿ Security_AUTHTitle ¥ê¥â¡¼¥È¥µ¡¼¥Ð¡¼ Security_SecureServer ¥ê¥â¡¼¥È POP3 ¥µ¡¼¥Ð¡¼ (SPA/AUTH ¤Þ¤¿¤Ï Æ©²á¥×¥í¥¥·) --- 236,240 ---- Security_PasswordTitle ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥Ñ¥¹¥ï¡¼¥É Security_Password ¥Ñ¥¹¥ï¡¼¥É ! Security_PasswordUpdate ¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤·¤¿ Security_AUTHTitle ¥ê¥â¡¼¥È¥µ¡¼¥Ð¡¼ Security_SecureServer ¥ê¥â¡¼¥È POP3 ¥µ¡¼¥Ð¡¼ (SPA/AUTH ¤Þ¤¿¤Ï Æ©²á¥×¥í¥¥·) |
|
From: John Graham-C. <jgr...@us...> - 2005-09-26 11:54:37
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3741/Classifier Modified Files: Tag: b0_22_2 Bayes.pm Log Message: Prevent problems with primary key errors on database upgrade Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.327.4.3 retrieving revision 1.327.4.4 diff -C2 -d -r1.327.4.3 -r1.327.4.4 *** Bayes.pm 17 Sep 2005 05:40:30 -0000 1.327.4.3 --- Bayes.pm 26 Sep 2005 11:54:28 -0000 1.327.4.4 *************** *** 798,805 **** print "\n\nDatabase schema is outdated, performing automatic upgrade\n"; # The database needs upgrading, so we are going to dump out ! # all the data in the database as INSERT statements in a ! # temporary file, then DROP all the tables in the database, ! # then recreate the schema from the new schema and finally ! # rerun the inserts. my $i = 0; --- 798,805 ---- print "\n\nDatabase schema is outdated, performing automatic upgrade\n"; # The database needs upgrading, so we are going to dump out ! # all the data in the database as INSERT OR IGNORE statements ! # in a temporary file, then DROP all the tables in the ! # database, then recreate the schema from the new schema and ! # finally rerun the inserts. my $i = 0; *************** *** 833,837 **** last if ( $#rows == -1 ); ! print INSERT "INSERT INTO $table ("; for my $i (0..$t->{NUM_OF_FIELDS}-1) { if ( $i != 0 ) { --- 833,837 ---- last if ( $#rows == -1 ); ! print INSERT "INSERT OR IGNORE INTO $table ("; for my $i (0..$t->{NUM_OF_FIELDS}-1) { if ( $i != 0 ) { |
|
From: Manni H. <man...@us...> - 2005-09-25 12:56:49
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8517/languages Modified Files: Tag: b0_22_2 Deutsch.msg English.msg Log Message: Back-port the changes to the Buckets tab to 0.22.3 Index: Deutsch.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v retrieving revision 1.33 retrieving revision 1.33.6.1 diff -C2 -d -r1.33 -r1.33.6.1 *** Deutsch.msg 20 Aug 2004 13:25:39 -0000 1.33 --- Deutsch.msg 25 Sep 2005 12:56:36 -0000 1.33.6.1 *************** *** 28,31 **** --- 28,32 ---- # Common words that are used on their own all over the interface Apply Anwenden + ApplyChanges Änderungen übernehmen On Ein Off Aus Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.75 retrieving revision 1.75.6.1 diff -C2 -d -r1.75 -r1.75.6.1 *** English.msg 14 Sep 2004 18:58:37 -0000 1.75 --- English.msg 25 Sep 2005 12:56:36 -0000 1.75.6.1 *************** *** 31,34 **** --- 31,35 ---- # Common words that are used on their own all over the interface Apply Apply + ApplyChanges Apply Changes On On Off Off |
11 messages has been excluded from this view by a project administrator.
