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: Brian S. <xue...@us...> - 2005-08-11 11:28:51
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1874/languages Added Files: Catalan-pfi.nsh Log Message: Add support for the Catalan language. --- NEW FILE: Catalan-pfi.nsh --- #-------------------------------------------------------------------------- # Catalan-pfi.nsh # # This file contains the "Catalan" text strings used by the Windows installer # and other NSIS-based Windows utilities for POPFile (includes customised versions # of strings provided by NSIS and strings which are unique to POPFile). # # These strings are grouped according to the page/window and script where they are used # # Copyright (c) 2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #-------------------------------------------------------------------------- # # Translation created by: (nobody) # Translation updated by: (nobody) # #-------------------------------------------------------------------------- # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes): # # (1) The sequence ${MB_NL} inserts a newline # (2) The sequence ${MB_NL}${MB_NL} inserts a blank line # # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages): # # (1) The sequence ${IO_NL} inserts a newline # (2) The sequence ${IO_NL}${IO_NL} inserts a blank line # # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- # Some strings will be customised at run-time using data held in Global User Variables. # These variables will have names which start with '$G_', e.g. $G_PLS_FIELD_1 #-------------------------------------------------------------------------- !ifndef PFI_VERBOSE !verbose 3 !endif #-------------------------------------------------------------------------- # Mark the start of the language data #-------------------------------------------------------------------------- !define PFI_LANG "CATALAN" #-------------------------------------------------------------------------- # Symbols used to avoid confusion over where the line breaks occur. # (normally these symbols will be defined before this file is 'included') # # ${IO_NL} is used for InstallOptions-style 'new line' sequences. # ${MB_NL} is used for MessageBox-style 'new line' sequences. #-------------------------------------------------------------------------- !ifndef IO_NL !define IO_NL "\r\n" !endif !ifndef MB_NL !define MB_NL "$\r$\n" !endif ########################################################################### ########################################################################### #-------------------------------------------------------------------------- # CONTENTS: # # "General Purpose" strings # # "Shared" strings used by more than one script # # "POPFile Installer" strings used by the main POPFile installer/uninstaller (installer.nsi) # # "SSL Setup" strings used by the standalone "SSL Setup" wizard (addssl.nsi) # # "Get SSL" strings used when downloading/installing SSL support (getssl.nsh) # # "Add User" strings used by the 'Add POPFile User' installer/uninstaller (adduser.nsi) # # "Corpus Conversion" strings used by the 'Monitor Corpus Conversion' utility (MonitorCC.nsi) # #-------------------------------------------------------------------------- ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; General Purpose: (used for banners and page titles/subtitles in several scripts) ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_BE_PATIENT "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_TAKE_A_FEW_SECONDS "This may take a few seconds..." ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message displayed when wizard does not seem to belong to the current installation [adduser.nsi, runpopfile.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_COMPAT_NOTFOUND "Error: Compatible version of ${C_PFI_PRODUCT} not found !" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message box shown (before the WELCOME page) if another installer is running [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_INSTALLER_MUTEX "Another copy of the POPFile installer is already running !" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message box shown if 'SetEnvironmentVariableA' fails [installer.nsi, adduser.nsi, MonitorCC.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ENVNOTSET "Error: Unable to set an environment variable" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Used in message box shown if SFN support has been disabled [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBNOSFN "To install on the '$G_PLS_FIELD_1' drive${MB_NL}${MB_NL}please select a folder location which does not contain spaces" ; Used in message box shown if existing files found when installing [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_2 "Do you want to upgrade it ?" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Standard MUI Page - INSTFILES ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; When upgrading an existing installation, change the normal "Install" button to "Upgrade" [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_BTN_UPGRADE "Upgrade" ; Installation Progress Reports displayed above the progress bar [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..." ; Installation Progress Reports displayed above the progress bar [installer.nsi, adduser.nsi, getssl.nsh] !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Premi Següent per continuar" ; Installation Log Messages [installer.nsi, adduser.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_SHUTDOWN "Shutting down previous version of POPFile using port" ; Installation Log Messages [installer.nsi, addssl.nsi] !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] !insertmacro PFI_LANG_STRING PFI_LANG_MBMANSHUT_1 "Unable to shutdown '$G_PLS_FIELD_1' automatically." !insertmacro PFI_LANG_STRING PFI_LANG_MBMANSHUT_2 "Please shutdown '$G_PLS_FIELD_1' manually now." !insertmacro PFI_LANG_STRING PFI_LANG_MBMANSHUT_3 "When '$G_PLS_FIELD_1' has been shutdown, click 'OK' to continue." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message box shown if problem detected when trying to save the log file [installer.nsi, addssl.nsi, backup.nsi, restore.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_MB_SAVELOG_ERROR "Error: problem detected when saving the log file" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message boxes shown if uninstallation is not straightforward [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBDIFFUSER_1 "'$G_WINUSERNAME' is attempting to remove data belonging to another user" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBNOTFOUND_2 "Continue anyway (not recommended) ?" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message box shown if uninstaller is cancelled by the user [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_UN_ABORT_1 "Uninstall aborted by user" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Uninstall Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_SHUTDOWN "Shutting down POPFile..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_SHORT "Deleting 'Start Menu' entries for POPFile..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Shared: Message box shown if uninstaller failed to remove files/folders [installer.nsi, adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMERR_A "Note: $G_PLS_FIELD_1 could not be removed." ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Message box shown (before the WELCOME page) offering to display the release notes [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?" !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - WELCOME [installer.nsi] ; ; The PFI_LANG_WELCOME_INFO_TEXT string should end with a '${IO_NL}${IO_NL}$_CLICK' sequence). ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_WELCOME_INFO_TEXT "Aquest assistent el guiarà durant el procés d'instal·lació de POPFile.${IO_NL}${IO_NL}Es recomana tancar tota la resta d'aplicacions abans de començar la Instal·lació.${IO_NL}${IO_NL}$_CLICK" !insertmacro PFI_LANG_STRING PFI_LANG_WELCOME_ADMIN_TEXT "IMPORTANT NOTICE:${IO_NL}${IO_NL}The current user does NOT have 'Administrator' rights.${IO_NL}${IO_NL}If multi-user support is required, it is recommended that you cancel this installation and use an 'Administrator' account to install POPFile." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Custom Page - Check Perl Requirements [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title displayed in the page header (there is no sub-title for this page) !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_TITLE "Out-of-date System Components Detected" ; Text strings displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_A "The default browser is used to display the POPFile User Interface (its control centre).${IO_NL}${IO_NL}" !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_B "POPFile does not require a specific browser, it will work with almost any browser.${IO_NL}${IO_NL}" !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_C "A minimal version of Perl is about to be installed (POPFile is written in Perl).${IO_NL}${IO_NL}" !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_D "The Perl supplied with POPFile makes use of some Internet Explorer components and requires Internet Explorer 5.5 (or a later version)." !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_E "The installer has detected that this system has Internet Explorer $G_PLS_FIELD_1${IO_NL}${IO_NL}" !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_F "It is possible that some features of POPFile may not work properly on this system.${IO_NL}${IO_NL}" !insertmacro PFI_LANG_STRING PFI_LANG_PERLREQ_IO_TEXT_G "If you have any problems with POPFile, an upgrade to a newer version of Internet Explorer may help." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - COMPONENTS [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl." !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface." !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI." !insertmacro PFI_LANG_STRING DESC_SubSecOptional "Extra POPFile components (for advanced users)" !insertmacro PFI_LANG_STRING DESC_SecIMAP "Installs the POPFile IMAP module" !insertmacro PFI_LANG_STRING DESC_SecNNTP "Installs POPFile's NNTP proxy" !insertmacro PFI_LANG_STRING DESC_SecSMTP "Installs POPFile's SMTP proxy" !insertmacro PFI_LANG_STRING DESC_SecSOCKS "Installs extra Perl components which allow the POPFile proxies to use SOCKS" !insertmacro PFI_LANG_STRING DESC_SecSSL "Downloads and installs the Perl components and SSL libraries which allow POPFile to make SSL connections to mail servers" !insertmacro PFI_LANG_STRING DESC_SecXMLRPC "Installs the POPFile XMLRPC module (for access to the POPFile API) and the Perl support it requires." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - DIRECTORY (for POPFile program files) [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title shown in the page header and Text shown above the box showing the folder selected for the installation !insertmacro PFI_LANG_STRING PFI_LANG_ROOTDIR_TITLE "Choose Program Files Install Location" !insertmacro PFI_LANG_STRING PFI_LANG_ROOTDIR_TEXT_DESTN "Destination Folder for the POPFile Program" ; Message box warnings used when verifying the installation folder chosen by user !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_1 "Previous installation found at" ; Text strings used when user has NOT selected a component found in the existing installation !insertmacro PFI_LANG_STRING MBCOMPONENT_PROB_1 "Do you want to upgrade the existing $G_PLS_FIELD_1 component ?" !insertmacro PFI_LANG_STRING MBCOMPONENT_PROB_2 "(using out of date POPFile components can cause problems)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Custom Page - Setup Summary [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header ; $G_WINUSERNAME holds the Windows login name and $G_WINUSERTYPE holds 'Admin', 'Power', 'User', 'Guest' or 'Unknown' !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_TITLE "Setup Summary for '$G_WINUSERNAME' ($G_WINUSERTYPE)" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_SUBTITLE "These settings will be used to install the POPFile program" ; Display selected installation location and whether or not an upgrade will be performed ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_BASICLIST "Basic POPFile components to be installed:" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_POPFILECORE "POPFile program files" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_MINPERL "Minimal Perl" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_DEFAULTSKIN "Default UI Skin" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_DEFAULTLANG "Default UI Language" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_EXTRASKINS "Additional UI Skins" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_EXTRALANGS "Additional UI Languages" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_KAKASI "Kakasi package" ; By default none of the optional components is installed (user has to select them) !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_OPTIONLIST "Optional POPFile components to be installed:" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NONE "(none)" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_IMAP "IMAP module" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NNTP "NNTP proxy" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_SMTP "SMTP proxy" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_SOCKS "SOCKS support" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_SSL "SSL support" !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_XMLRPC "XMLRPC module" ; The last line in the summary explains how to change the installation selections !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_BACKBUTTON "To make changes, use the 'Back' button to return to previous pages" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header after installing all the files !insertmacro PFI_LANG_STRING PFI_LANG_INSTFINISH_TITLE "Program Files Installed" !insertmacro PFI_LANG_STRING PFI_LANG_INSTFINISH_SUBTITLE "${C_PFI_PRODUCT} must be configured before it can be used" ; Installation Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_XMLRPC "Installing POPFile XMLRPC files..." ; Message box used to get permission to delete the old minimal Perl before installing the new one !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Delete everything in old minimal Perl folder before installing the new version ?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Uninstall Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_CORE "Deleting POPFile core files..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_SKINS "Deleting POPFile skins files..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_PERL "Deleting minimal Perl files..." ; Uninstall Log Messages !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_SHUTDOWN "Shutting down POPFile using port" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_DELROOTDIR "Removing all files from POPFile directory" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_DELROOTERR "Note: unable to remove all files from POPFile directory" ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Standard MUI Page - WELCOME ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Standard MUI Page - LICENSE ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PSS_LANG_LICENSE_SUBHDR "Please review the license terms before using $(^NameDA)." !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Standard MUI Page - DIRECTORY ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_TITLE "Choose existing POPFile 0.22 (or later) installation" !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_SUBTITLE "SSL support should only be added to an existing POPFile installation" !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_TEXT_TOP "SSL support must be installed using the same installation folder as the POPFile program${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 installation, click Browse and select another folder. $_CLICK" !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_TEXT_DESTN "Existing POPFile 0.22 (or later) installation folder" !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_MB_WARN_1 "POPFile 0.22 (or later) does NOT seem to be installed in${MB_NL}${MB_NL}$G_PLS_FIELD_1" !insertmacro PFI_LANG_STRING PSS_LANG_DESTNDIR_MB_WARN_2 "Are you sure you want to use this folder ?" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Standard MUI Page - INSTFILES ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Initial page header !insertmacro PFI_LANG_STRING PSS_LANG_STD_HDR "Installing SSL support (for POPFile 0.22 or later)" !insertmacro PFI_LANG_STRING PSS_LANG_STD_SUBHDR "Please wait while the SSL files are downloaded and installed..." ; Successful completion page header !insertmacro PFI_LANG_STRING PSS_LANG_END_HDR "POPFile SSL Support installation completed" !insertmacro PFI_LANG_STRING PSS_LANG_END_SUBHDR "SSL support for POPFile has been installed successfully" ; Unsuccessful completion page header !insertmacro PFI_LANG_STRING PSS_LANG_ABORT_HDR "POPFile SSL Support installation failed" !insertmacro PFI_LANG_STRING PSS_LANG_ABORT_SUBHDR "The attempt to add SSL support to POPFile has failed" ; Progress reports !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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Standard MUI Page - FINISH ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PSS_LANG_FINISH_TITLE "Completing the $(^NameDA) Wizard" !insertmacro PFI_LANG_STRING PSS_LANG_FINISH_TEXT "SSL support for POPFile 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 PFI_LANG_STRING PSS_LANG_FINISH_README "Important information" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; SSL Setup: Miscellaneous Strings ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PSS_LANG_MUTEX "Another copy of the SSL Setup wizard is running!" !insertmacro PFI_LANG_STRING PSS_LANG_COMPAT_NOTFOUND "Warning: Cannot find compatible version of POPFile !" !insertmacro PFI_LANG_STRING PSS_LANG_ABORT_WARNING "Are you sure you want to quit the $(^NameDA) Wizard?" !insertmacro PFI_LANG_STRING PSS_LANG_PREPAREPATCH "Updating Module.pm (to avoid slow speed SSL downloads)" !insertmacro PFI_LANG_STRING PSS_LANG_PATCHSTATUS "Module.pm patch status: $G_PLS_FIELD_1" !insertmacro PFI_LANG_STRING PSS_LANG_PATCHCOMPLETED "Module.pm file has been updated" !insertmacro PFI_LANG_STRING PSS_LANG_PATCHFAILED "Module.pm file has not been updated" ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: Strings used when downloading and installing the optional SSL files [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Progress reports !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKINTERNET "Checking Internet connection..." !insertmacro PFI_LANG_STRING PFI_LANG_PROG_STARTDOWNLOAD "Downloading $G_PLS_FIELD_1 file from $G_PLS_FIELD_2" !insertmacro PFI_LANG_STRING PFI_LANG_PROG_FILECOPY "Copying $G_PLS_FIELD_2 files..." !insertmacro PFI_LANG_STRING PFI_LANG_PROG_FILEEXTRACT "Extracting files from $G_PLS_FIELD_2 archive..." !insertmacro PFI_LANG_STRING PFI_LANG_TAKE_SEVERAL_SECONDS "(this may take several seconds)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: Message Box strings used when installing SSL Support [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_MB_INTERNETCONNECT "The SSL Support files will be downloaded from the Internet${MB_NL}${MB_NL}Please connect to the Internet and the click 'OK'${MB_NL}${MB_NL}or click 'Cancel' to cancel this part of the installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_2 "(error: $G_PLS_FIELD_2)" !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ; The NSISdl plugin shows two progress bars, for example: ; ; Downloading libeay32.dll ; ; 118kB (14%) of 816kB @ 3.1kB/s (3 minutes remaining) ; ; The default strings used by the plugin: ; ; downloading - "Downloading %s" ; connecting - "Connecting ..." ; second - "second" ; minute - "minute" ; hour - "hour" ; plural - "s" ; progress - "%dkB (%d%%) of %dkB @ %d.%01dkB/s" ; remaining - " (%d %s%s remaining)" ; ; Note that the "remaining" string starts with a space ; ; Some languages might not be translated properly because plurals are formed simply ; by adding the "plural" value, so "hours" is translated by adding the value of the ; "PFI_LANG_NSISDL_PLURAL" string to the value of the "PFI_LANG_NSISDL_HOUR" string. ; This is a limitation of the NSIS plugin which is used to download the files. ; ; If this is a problem, the plural forms could be used for the PFI_LANG_NSISDL_SECOND, ; PFI_LANG_NSISDL_MINUTE and PFI_LANG_NSISDL_HOUR strings and the PFI_LANG_NSISDL_PLURAL ; string set to a space (" ") [using "" here will generate compiler warnings] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_DOWNLOADING "Downloading %s" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_CONNECTING "Connecting ..." !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_SECOND "second" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_MINUTE "minute" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_HOUR "hour" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PLURAL "s" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_PROGRESS "%dkB (%d%%) of %dkB @ %d.%01dkB/s" !insertmacro PFI_LANG_STRING PFI_LANG_NSISDL_REMAINING " (%d %s%s remaining)" ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - WELCOME [adduser.nsi] ; ; The PFI_LANG_ADDUSER_INFO_TEXT string should end with a '${IO_NL}${IO_NL}$_CLICK' sequence). ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_ADDUSER_INFO_TEXT "This wizard will guide you through the configuration of POPFile for the '$G_WINUSERNAME' user.${IO_NL}${IO_NL}It is recommended that you close all other applications before continuing.${IO_NL}${IO_NL}$_CLICK" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - DIRECTORY [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; $G_WINUSERNAME holds the Windows login name for the user running the wizard !insertmacro PFI_LANG_STRING PFI_LANG_USERDIR_TITLE "Choose POPFile Data Location for '$G_WINUSERNAME'" !insertmacro PFI_LANG_STRING PFI_LANG_USERDIR_SUBTITLE "Choose the folder in which to store the POPFile Data for '$G_WINUSERNAME'" !insertmacro PFI_LANG_STRING PFI_LANG_USERDIR_TEXT_TOP "This version of POPFile uses separate sets of data files for each user.${MB_NL}${MB_NL}Setup will use the following folder for the POPFile data belonging to the '$G_WINUSERNAME' user. To use a different folder for this user, click Browse and select another folder. $_CLICK" !insertmacro PFI_LANG_STRING PFI_LANG_USERDIR_TEXT_DESTN "Folder to be used to store the POPFile data for '$G_WINUSERNAME'" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - INSTFILES [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_ADDUSER_TITLE "Configuring POPFile for '$G_WINUSERNAME' user" !insertmacro PFI_LANG_STRING PFI_LANG_ADDUSER_SUBTITLE "Please wait while the POPFile configuration files are updated for this user" ; When resetting POPFile to use newly restored 'User Data', change "Install" button to "Restore" !insertmacro PFI_LANG_STRING PFI_LANG_INST_BTN_RESTORE "Restore" ; Installation Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORPUS "Making corpus backup. This may take a few seconds..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SQLBACKUP "Backing up the old SQLite database..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_FINDCORPUS "Looking for existing flat-file or BerkeleyDB corpus..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_MAKEBAT "Generating the 'pfi-run.bat' batch file..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_REGSET "Updating registry settings and environment variables..." ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_A "POPFile 'stopwords' file from previous installation found." !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_B "OK to update this file ?" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_C "Click 'Yes' to update it (old file will be saved as 'stopwords.bak')" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_D "Click 'No' to keep the old file (new file will saved as 'stopwords.default')" !insertmacro PFI_LANG_STRING PFI_LANG_MBCORPUS_1 "Error detected when the installer tried to backup the old corpus." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Message box warnings used when verifying the installation folder chosen by user [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_3 "Previous configuration data found at" !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_4 "Restored configuration data found" !insertmacro PFI_LANG_STRING PFI_LANG_DIRSELECT_MBWARN_5 "Do you want to use the restored data ?" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - POPFile Installation Options [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them" ; Text strings displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "If UPGRADING POPFile --- the installer will SHUTDOWN existing version" ; Message Boxes used when validating user's selections !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_A "The POP3 port cannot be set to '$G_POP3'." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_B "The port must be a number in the range 1 to 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_C "Please change your POP3 port selection." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_A "The 'User Interface' port cannot be set to '$G_GUI'." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_B "The port must be a number in the range 1 to 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_C "Please change your 'User Interface' port selection." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Initialization required by POPFile Classification Bucket Creation [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile requires at least TWO buckets in order to work properly. PFI_LANG_CBP_DEFAULT_BUCKETS ; defines the default buckets and PFI_LANG_CBP_SUGGESTED_NAMES defines a list of suggested names ; to help the user get started with POPFile. Both lists use the | character as a name separator. ; Bucket names can only use the characters abcdefghijklmnopqrstuvwxyz_-0123456789 ; (any names which contain invalid characters will be ignored by the installer) ; Empty lists ("") are allowed (but are not very user-friendly) ; The PFI_LANG_CBP_SUGGESTED_NAMES string uses alphabetic order for the suggested names. ; If these names are translated, the translated names can be rearranged to put them back ; into alphabetic order. For example, the Portuguese (Brazil) translation of this string ; starts "admin|admin-lista|..." (which is "admin|list-admin|..." in English) !insertmacro PFI_LANG_STRING PFI_LANG_CBP_DEFAULT_BUCKETS "spam|personal|work|other" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUGGESTED_NAMES "admin|business|computers|family|financial|general|hobby|inbox|junk|list-admin|miscellaneous|not_spam|other|personal|recreation|school|security|shopping|spam|travel|work" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - POPFile Classification Bucket Creation [CBP.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email" ; Text strings displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.${IO_NL}${IO_NL}Bucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Suprimir" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continue" ; Text strings used for status messages under the bucket list !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_A "There is no need to add more buckets" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_B "You must define AT LEAST TWO buckets" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_C "At least one more bucket is required" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_D "Installer cannot create more than $G_PLS_FIELD_1 buckets" ; Message box text strings !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_A "A bucket called '$G_PLS_FIELD_1' has already been defined." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_B "Please choose a different name for the new bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_A "The installer can only create up to $G_PLS_FIELD_1 buckets." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_B "Once POPFile has been installed you can create more than $G_PLS_FIELD_1 buckets." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_A "The name '$G_PLS_FIELD_1' is not a valid name for a bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_B "Els noms de cistella només poden contenir lletres a a z en minúscules, números 0 a 9, més - i _" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_C "Please choose a different name for the new bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,${MB_NL}${MB_NL}either by picking a suggested name from the drop-down list${MB_NL}${MB_NL}or by typing in a name of your own choice." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_A "$G_PLS_FIELD_1 buckets have been defined for use by POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_B "Do you want to configure POPFile to use these buckets?" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_C "Click 'No' if you wish to change your bucket selections." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_A "The installer was unable to create $G_PLS_FIELD_1 of the $G_PLS_FIELD_2 buckets you selected." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_B "Once POPFile has been installed you can use its 'User Interface'${MB_NL}${MB_NL}control panel to create the missing bucket(s)." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - Email Client Reconfiguration [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_TITLE "Email Client Configuration" !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_SUBTITLE "POPFile can reconfigure several email clients for you" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_TEXT_1 "Mail clients marked (*) can be reconfigured automatically, assuming simple accounts are used.${IO_NL}${IO_NL}It is strongly recommended that accounts which require authentication are configured manually." !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_TEXT_2 "IMPORTANT: PLEASE SHUT DOWN THE RECONFIGURABLE EMAIL CLIENTS NOW${IO_NL}${IO_NL}This feature is still under development (e.g. some Outlook accounts may not be detected).${IO_NL}${IO_NL}Please check that the reconfiguration was successful (before using the email client)." !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Text used on buttons to skip configuration of email clients [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_SKIPALL "Skip All" !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_SKIPONE "Skip Client" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Message box warnings that an email client is still running [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_EXP "WARNING: Outlook Express appears to be running !" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_OUT "WARNING: Outlook appears to be running !" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_EUD "WARNING: Eudora appears to be running !" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_1 "Please SHUT DOWN the email program then click 'Retry' to reconfigure it" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_2 "(You can click 'Ignore' to reconfigure it, but this is not recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_3 "Click 'Abort' to skip the reconfiguration of this email program" ; Following three strings are used when uninstalling !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_4 "Please SHUT DOWN the email program then click 'Retry' to restore the settings" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_5 "(You can click 'Ignore' to restore the settings, but this is not recommended)" !insertmacro PFI_LANG_STRING PFI_LANG_MBCLIENT_STOP_6 "Click 'Abort' to skip the restoring of the original settings" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - Reconfigure Outlook/Outlook Express [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_TITLE "Reconfigure Outlook Express" !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_SUBTITLE "POPFile can reconfigure Outlook Express for you" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_TITLE "Reconfigure Outlook" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_SUBTITLE "POPFile can reconfigure Outlook for you" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_IO_CANCELLED "Outlook Express reconfiguration cancelled by user" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_IO_CANCELLED "Outlook reconfiguration cancelled by user" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_BOXHDR "accounts" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_ACCOUNTHDR "Account" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_EMAILHDR "Email address" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_SERVERHDR "Server" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_USRNAMEHDR "Username" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_IO_FOOTNOTE "Tick box(es) to reconfigure account(s).${IO_NL}If you uninstall POPFile the original settings will be restored." ; Message Box to confirm changes to Outlook/Outlook Express account configuration !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_MBIDENTITY "Outlook Express Identity :" !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_MBACCOUNT "Outlook Express Account :" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_MBIDENTITY "Outlook User :" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_MBACCOUNT "Outlook Account :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBEMAIL "Email address :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSERVER "POP3 server :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "POP3 username :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "POP3 port :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" ; Title and Column headings for report/log files !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_LOG_BEFORE "Outlook Express Settings before any changes were made" !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_LOG_AFTER "Changes made to Outlook Express Settings" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_LOG_BEFORE "Outlook Settings before any changes were made" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_LOG_AFTER "Changes made to Outlook Settings" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_END "(end)" !insertmacro PFI_LANG_STRING PFI_LANG_EXPCFG_LOG_IDENTITY "'IDENTITY'" !insertmacro PFI_LANG_STRING PFI_LANG_OUTCFG_LOG_IDENTITY "'OUTLOOK USER'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_ACCOUNT "'ACCOUNT'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_EMAIL "'EMAIL ADDRESS'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_SERVER "'POP3 SERVER'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_USER "'POP3 USERNAME'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_PORT "'POP3 PORT'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_NEWSERVER "'NEW POP3 SERVER'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_NEWUSER "'NEW POP3 USERNAME'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_LOG_NEWPORT "'NEW POP3 PORT'" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - Reconfigure Eudora [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_TITLE "Reconfigure Eudora" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_SUBTITLE "POPFile can reconfigure Eudora for you" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_CANCELLED "Eudora reconfiguration cancelled by user" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_INTRO_1 "POPFile has detected the following Eudora personality" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_INTRO_2 " and can automatically configure it to work with POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_CHECKBOX "Reconfigure this personality to work with POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_DOMINANT "<Dominant> personality" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_PERSONA "personality" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_EMAIL "Email address:" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_SERVER "POP3 server:" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_USERNAME "POP3 username:" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_POP3PORT "POP3 port:" !insertmacro PFI_LANG_STRING PFI_LANG_EUCFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Custom Page - POPFile can now be started [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Page Title and Sub-title displayed in the page header !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started" ; Text displayed on the custom page !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOICON "Run POPFile (do not show system tray icon)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_TRAYICON "Run POPFile with system tray icon" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..." ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - FINISH [adduser.nsi] ; ; The PFI_LANG_FINISH_RUN_TEXT text should be a short phrase (not a long paragraph) ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; $G_WINUSERNAME holds the Windows login name of the user running the wizard !insertmacro PFI_LANG_STRING PFI_LANG_ADDUSER_FINISH_INFO "POPFile has been configured for the '$G_WINUSERNAME' user.${IO_NL}${IO_NL}Click Finish to close this wizard." !insertmacro PFI_LANG_STRING PFI_LANG_FINISH_RUN_TEXT "POPFile User Interface" !insertmacro PFI_LANG_STRING PFI_LANG_FINISH_WEB_LINK_TEXT "Click here to visit the POPFile web site" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - Uninstall Confirmation Page (for the 'POPFile User Data' wizard) [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; $G_WINUSERNAME holds the Windows login name for the user running the uninstall wizard !insertmacro PFI_LANG_STRING PFI_LANG_REMUSER_TITLE "Uninstall POPFile data for '$G_WINUSERNAME' user" !insertmacro PFI_LANG_STRING PFI_LANG_REMUSER_SUBTITLE "Remove POPFile configuration data for this user from your computer" !insertmacro PFI_LANG_STRING PFI_LANG_REMUSER_TEXT_TOP "The POPFile configuration data for the '$G_WINUSERNAME' user will be uninstalled from the following folder. $_CLICK" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - Uninstallation Page (for the 'POPFile User Data' wizard) [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; $G_WINUSERNAME holds the Windows login name for the user running the uninstall wizard !insertmacro PFI_LANG_STRING PFI_LANG_REMOVING_TITLE "Uninstalling POPFile data for '$G_WINUSERNAME' user" !insertmacro PFI_LANG_STRING PFI_LANG_REMOVING_SUBTITLE "Please wait while the POPFile configuration files for this user are deleted" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Add User: Standard MUI Page - UNPAGE_INSTFILES [adduser.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Uninstall Progress Reports displayed above the progress bar !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_OUTEXPRESS "Restoring Outlook Express settings..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_OUTLOOK "Restoring Outlook settings..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_EUDORA "Restoring Eudora settings..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_DBMSGDIR "Deleting corpus and 'Recent Messages' directory..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_CONFIG "Deleting configuration data..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_EXESTATUS "Checking program status..." !insertmacro PFI_LANG_STRING PFI_LANG_UN_PROG_REGISTRY "Deleting POPFile registry entries..." ; Uninstall Log Messages !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EXPRUN "Outlook Express is still running !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OUTRUN "Outlook is still running !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_EUDRUN "Eudora is still running !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_IGNORE "User requested restore while email program is running" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_OPENED "Opened" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_RESTORED "Restored" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_CLOSED "Closed" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_DATAPROBS "Data problems" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_DELUSERDIR "Removing all files from POPFile 'User Data' directory" !insertmacro PFI_LANG_STRING PFI_LANG_UN_LOG_DELUSERERR "Note: unable to remove all files from POPFile 'User Data' directory" ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBCLIENT_1 "'Outlook Express' problem !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBCLIENT_2 "'Outlook' problem !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBCLIENT_3 "'Eudora' problem !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBEMAIL_1 "Unable to restore some original settings" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBEMAIL_2 "Display the error report ?" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_1 "Some email client settings have not been restored !" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_2 "(Details can be found in $INSTDIR folder)" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_3 "Click 'No' to ignore these errors and delete everything" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_4 "Click 'Yes' to keep this data (to allow another attempt later)" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_2 "Do you want to remove all files in your POPFile 'User Data' directory?${MB_NL}${MB_NL}$G_USERDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBDELMSGS_1 "Do you want to remove all files in your 'Recent Messages' directory?" ########################################################################### ########################################################################### ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Corpus Conversion: Standard MUI Page - INSTFILES [MonitorCC.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TITLE "POPFile Corpus Conversion" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUBTITLE "The existing corpus must be converted to work with this version of POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_ENDCONVERT_TITLE "POPFile Corpus Conversion Completed" !insertmacro PFI_LANG_STRING PFI_LANG_ENDCONVERT_SUBTITLE "Please click Close to continue" !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_TITLE "POPFile Corpus Conversion Failed" !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.... [truncated message content] |
|
From: John Graham-C. <jgr...@us...> - 2005-08-11 09:18:58
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12124 Added Files: Catala.msg Log Message: Added Catalan language translation --- NEW FILE: Catala.msg --- # Copyright (c) 2001-2003 John Graham-Cumming # # 2005/08/09 Translated by David Gimeno i Ayuso <in...@si...> # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Identify the language and character set used for the interface LanguageCode ca LanguageCharset ISO-8859-1 LanguageDirection ltr # This is used to get the appropriate subdirectory for the manual ManualLanguage en # This is where to find the FAQ on the Wiki FAQLink FrequentlyAskedQuestions # Common words that are used on their own all over the interface Apply Aplicar On Actiu Off Inactiu TurnOn Activar TurnOff Desactivar Add Afegir Remove Suprimir Previous Anterior Next Següent From Des de Subject Assumpte Cc Còpia Classification Cistella Reclassify Reclassificar Probability Probabilitat Scores Barems QuickMagnets Imants ràpids Undo Desfer Close Tancar Find Cercar Filter Filtre Yes Sí No No ChangeToYes Canviar a Sí ChangeToNo Canviar a No Bucket Cistella Magnet Imant Delete Esborrar Create Crear To A Total Total Rename Redenominar Frequency Freqüència Probability Probabilitat Score Barem Lookup Examinar Word Mot Count Comptador Update Actualitzar Refresh Recarregar FAQ PMF ID ID Date Data Arrived Rebut Size Tamany # This is a regular expression pattern that is used to convert # a number into a friendly looking number (for the US and UK this # means comma separated at the thousands) Locale_Thousands . Locale_Decimal ' # The Locale_Date uses the format strings in Perl's Date::Format # module to set the date format for the UI. There are two possible # ways to specify it. # # <format> Just one simple format used for all dates # <<format> | <format> The first format is used for dates less than # 7 days from now, the second for all other dates Locale_Date %d/%m %R%Z | %e/%L/%Y %R%Z # The header and footer that appear on every UI page Header_Title Centre de control POPFile Header_Shutdown Aturar POPFile Header_History Històric Header_Buckets Cistelles Header_Configuration Configuració Header_Advanced Avançat Header_Security Seguretat Header_Magnets Imants Footer_HomePage Pàgina inicial POPFile Footer_Manual Manual Footer_Forums Fòrums Footer_FeedMe Acaptar Footer_RequestFeature Sol·licitar millora Footer_MailingList Llista de correu Footer_Wiki Documentació Configuration_Error1 El caràcter separador ha de ser-ne un de sol Configuration_Error2 El port de l'interfície d'usuari ha de ser un número entre 1 i 65535 Configuration_Error3 El port que rep les connexions POP3 ha de ser un número entre 1 i 65535 Configuration_Error4 El tamany de pàgina ha de ser un número entre 1 i 1000 Configuration_Error5 El nombre de dies a l'històric ha de ser un número entre 1 i 366 Configuration_Error6 El temps d'espera de TCP ha de ser un número entre 10 i 300 Configuration_Error7 El port que rep les connexions XML RPC ha de ser un número entre 1 i 65535 Configuration_Error8 El port intermedi SOCKS V ha de ser un número entre 1 i 65535 Configuration_POP3Port Port que rep les connexions POP3 Configuration_POP3Update S'ha actualitzat el port POP3 a %s; no tindrà efecte fins que reinicieu el POPFile Configuration_XMLRPCUpdate S'ha actualitzat el port XML-RPC a %s; no tindrà efecte fins que reinicieu el POPFile Configuration_XMLRPCPort Port que rep les connexions XML-RPC Configuration_SMTPPort Port que rep les connexions SMTP Configuration_SMTPUpdate S'ha actualitzat el port SMTP a %s; no tindrà efecte fins que reinicieu el POPFile Configuration_NNTPPort Port que rep les connexions NNTP Configuration_NNTPUpdate S'ha actualitzat el port NNTP a %s; no tindrà efecte fins que reinicieu el POPFile Configuration_POPFork Permetre connexions concurrents POP3 Configuration_SMTPFork Permetre connexions concurrents SMTP Configuration_NNTPFork Permetre connexions concurrents NNTP Configuration_POP3Separator Caràcter separador de host:port:user POP3 Configuration_NNTPSeparator Caràcter separador de host:port:user NNPT Configuration_POP3SepUpdate S'ha actualitzat el separador POP3 a %s Configuration_NNTPSepUpdate S'ha actualitzat el separador NNTP a %s Configuration_UI Port web d'interfície d'usuari Configuration_UIUpdate S'ha actualitzat el port web d'interfície d'usuari a %s; no tindrà efecte fins que reinicieu el POPFile Configuration_History Nombre de missatges per pàgina Configuration_HistoryUpdate S'ha actualitzat el nombre de missatges per pàgina a %s Configuration_Days Nombre de dies a conservar l'històric Configuration_DaysUpdate S'ha actualitzat el nombre de dies d'històric a %s Configuration_UserInterface Interfície d'usuari Configuration_Skins Aparences Configuration_SkinsChoose Trieu aparença Configuration_Language Idioma Configuration_LanguageChoose Trieu idioma Configuration_ListenPorts Opcions de mòduls Configuration_HistoryView Veure històric Configuration_TCPTimeout Temps d'espera connexió Configuration_TCPTimeoutSecs Temps d'espera connexió en segons Configuration_TCPTimeoutUpdate S'ha actualitzat el temps d'espera connexió a %s Configuration_ClassificationInsertion Inserció text del missatge Configuration_SubjectLine Modificació<br>línia de l'assumpte Configuration_XTCInsertion Capçalera<br>X-Text-Classification Configuration_XPLInsertion Capçalera<br>X-POPFile-Link Configuration_Logging S'està registrant Configuration_None Cap Configuration_ToScreen A pantalla Configuration_ToFile A fitxer Configuration_ToScreenFile A pantalla i fitxer Configuration_LoggerOutput Sortida usuari Configuration_GeneralSkins Aparences Configuration_SmallSkins Aparences petites Configuration_TinySkins Aparences minúscules Configuration_CurrentLogFile <Descarregar fitxer de registre actual> Configuration_SOCKSServer Servidor intermedi SOCKS V Configuration_SOCKSPort Port intermedi SOCKS V Configuration_SOCKSPortUpdate S'ha actualitzat el port intermedi SOCKS V a %s Configuration_SOCKSServerUpdate S'ha actualitzat el servidor intermedi SOCKS V a %s Configuration_Fields Columnes històric Advanced_Error1 '%s' ja és a la llista de mots a ignorar Advanced_Error2 Mots a ignorar només pot contenir caràcters alfanumèrics, ., _, - i @ Advanced_Error3 afegit '%s' a la llista de mots a ignorar Advanced_Error4 '%s' no és a la llista de mots a ignorar Advanced_Error5 suprimit '%s' de la llista de mots a ignorar Advanced_StopWords Mots a ignorar Advanced_Message1 POPFile ignora els següents mots molt usuals: Advanced_AddWord Afegir mot Advanced_RemoveWord Suprimir mot Advanced_AllParameters Tots els paràmetres POPFile Advanced_Parameter Paràmetre Advanced_Value Valor Advanced_Warning Aquesta és la llista completa de paràmetres de POPFile. Només usuaris avançats: canvieu-los i cliqueu Actualitzar; no se'n comprova la validesa. Els ítems mostrats en negreta són diferents dels predeterminats. Advanced_ConfigFile Fitxer de configuració: History_Filter (s'està mostrant només la cistella <font color="%s">%s</font>) History_FilterBy Filtrat per History_Search (cercat per Des de/Assumte %s) History_Title Missatges recents History_Jump Anar a la pàgina History_ShowAll Mostrar-ho tot History_ShouldBe Hauria de ser History_NoFrom cap línia Des de History_NoSubject cap línia Assumpte History_ClassifyAs Classificar com a History_MagnetUsed Imant usat History_MagnetBecause <b>Imant usat</b><p>Classificat com a <font color="%s">%s</font> degut a l'imant %s </p> History_ChangedTo S'ha canviat a <font color="%s">%s</font> History_Already Reclassificat com a <font color="%s">%s</font> History_RemoveAll Suprimir-ho tot History_RemovePage Suprimir pàgina History_RemoveChecked Suprimir marcats History_Remove Per suprimir entrades a l'històric, cliqueu History_SearchMessage Cercar Des de/Assumpte History_NoMessages Cap missatge History_ShowMagnet imantat History_Negate_Search Invertir cerca/filtre History_Magnet (s'està mostrant només missatges classificats per imant) History_NoMagnet (s'està mostrant només missatges no classificats per imant) History_ResetSearch Reiniciar History_ChangedClass Ara s'hauria de classificar com a History_Purge Esborrar ara History_Increase Augmentar History_Decrease Reduir History_Column_Characters Canviar l'ample de les columnes Des de, A, Còpia i Assumpte History_Automatic Automàtic History_Reclassified Reclassificat History_Size_Bytes %d B History_Size_KiloBytes %.1f KB History_Size_MegaBytes %.1f MB Password_Title Contrasenya Password_Enter Introduïu-hi la contrasenya Password_Go Anar-hi! Password_Error1 Contrasenya incorrecta Security_Error1 El port ha de ser un número entre 1 i 65535 Security_Stealth Mode furtiu/Operació del servidor Security_NoStealthMode No (mode furtiu) Security_StealthMode (Mode furtiu) Security_ExplainStats (Si s'activa, POPFile envia un cop al dia els tres següents valors a un programa a www.usethesource.com: bc, el nombre total de cistelles que teniu; mc, el nombre total de missatges classificats per POPFile, i ec, el nombre total d'errors de classificació. Això s'emmagatzema en un fitxer i serà usat per confeccionar estadístiques d'ús de POPFile i com funciona de bé. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre estadístiques i adreces IP individuals). Security_ExplainUpdate (Si s'activa, POPFile envia un cop per dia els tres següents valors a un programa a www.usethesource.com: ma, el nombre major de versió de la vostra instal·lació POPFile; mi, el nombre menor de versió de la vostra instal·lació POPFile, i bn, el nombre de muntatge de la vostra instal·lació POPFile. POPFile rep una resposta en forma de gràfic que surt dalt de la pàgina, si hi ha una versió nova disponible. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre les verificacions d'actualització i les adreces IP individuals). Security_PasswordTitle Contrasenya d'interfície d'usuari Security_Password Contrasenya Security_PasswordUpdate S'ha actualitzat la contrasenya Security_AUTHTitle Servidors remots Security_SecureServer Servidor POP3 remot (SPA/AUTH o servidor intermedi transparent) Security_SecureServerUpdate S'ha actualitzat el servidor POP3 remot a %s Security_SecurePort Port POP3 remot (SPA/AUTH o servidor intermedi transparent) Security_SecurePortUpdate S'ha actualitzat el port del servidor POP3 remot a %s Security_SMTPServer Servidor de cadena SMTP Security_SMTPServerUpdate S'ha actualitzat el servidor de cadena SMTP a %s; no tindrà efecte fins que reinicieu el POPFile Security_SMTPPort Port de cadena SMTP Security_SMTPPortUpdate S'ha actualitzat el port de cadena SMTP a %s; no tindrà efecte fins que reinicieu el POPFile Security_POP3 Acceptar connexions POP3 de màquines remotes (cal reiniciar POPFile) Security_SMTP Acceptar connexions SMTP de màquines remotes (cal reiniciar POPFile) Security_NNTP Acceptar connexions NNTP de màquines remotes (cal reiniciar POPFile) Security_UI Acceptar connexions HTTP (interfície d'usuari) de màquines remotes (cal reiniciar POPFile) Security_XMLRPC Acceptar connexions XML-RPC de màquines remotes (cal reiniciar POPFile) Security_UpdateTitle Comprovació automàtica d'actualitzacions Security_Update Comprovar actualitzacions de POPFile diàriament Security_StatsTitle S'estan informant les estadístiques Security_Stats Enviar les estadístiques diàriament Magnet_Error1 Ja existeix l'imant '%s' a la cistella '%s' Magnet_Error2 El nou imant '%s' interfereix amb el '%s' de la cistella '%s' i podria donar resultats ambigus. No s'ha afegit el nou. Magnet_Error3 S'ha creat el nou imant '%s' a la cistella '%s' Magnet_CurrentMagnets Imants actuals Magnet_Message1 Els imants següents impliquen que un missatge sigui sempre encasellat a la cistella indicada Magnet_CreateNew Crear imant nou Magnet_Explanation Disposeu de tres tipus d'imants:</b> <ul><li><b>Adreça Des de o nom:</b> Per exemple: jo...@co... per evitar una adreça específica, <br />company.com per evitar tothom de company.com, <br />John Doe per evitar una persona concreta, John per evitar-los tots</li><li><b>Adreça A/Còpia o nom:</b> Com un imant Des de: però per a l'adressa A:/Còpia: a un missatge</li> <li><b>Mots Assumpte:</b> Per exemple: hello per evitar tots els missatges amb hello a l'assumpte</li></ul> Magnet_MagnetType Tipus d'imant Magnet_Value Valors Magnet_Always Va sempre a la cistella Magnet_Jump Anar a la pàgina d'imants Bucket_Error1 Els noms de cistella només poden contenir lletres a a z en minúscules, números 0 a 9, més - i _ Bucket_Error2 Ja existeix la cistella anomenada %s Bucket_Error3 S'ha creat la cistella anomenada %s Bucket_Error4 Introduïu-hi algun mot Bucket_Error5 Redenominada la cistella %s a %s Bucket_Error6 Esborrada la cistella %s Bucket_Title Configuració de cistella Bucket_BucketName Nom de<br>cistella Bucket_WordCount Comptador de mots Bucket_WordCounts Comptadors de mots Bucket_UniqueWords Mots<br>distints Bucket_SubjectModification Modificació<br>capçalera assumpte Bucket_ChangeColor Color<br>cistella Bucket_NotEnoughData No hi ha prous dades Bucket_ClassificationAccuracy Precisió de la classificació Bucket_EmailsClassified Missatges classificats Bucket_EmailsClassifiedUpper Missatges Classificats Bucket_ClassificationErrors Errors de classificació Bucket_Accuracy Precisió Bucket_ClassificationCount Comptador de classificació Bucket_ClassificationFP Falsos positius Bucket_ClassificationFN Falsos negatius Bucket_ResetStatistics Reiniciar estadístiques Bucket_LastReset Última reinicialització Bucket_CurrentColor El color actual de %s és %s Bucket_SetColorTo S'ha canviat el color de %s a %s Bucket_Maintenance Manteniment Bucket_CreateBucket Crear una cistella de nom Bucket_DeleteBucket Esborrar la cistella anomenada Bucket_RenameBucket Redenominar la cistella anomenada Bucket_Lookup Examinar Bucket_LookupMessage Examinar la paraula a les cistelles Bucket_LookupMessage2 Examinar el resultat per Bucket_LookupMostLikely <b>%s</b> és més probable que aparegui a <font color="%s">%s</font> Bucket_DoesNotAppear <p><b>%s</b> no apareix a cap de les cistelles Bucket_DisabledGlobally Globalment inhabilitat Bucket_To a Bucket_Quarantine Missatge de<br>quarantena SingleBucket_Title Detall de %s SingleBucket_WordCount Comptador de mots de la cistella SingleBucket_TotalWordCount Comptador total de mots SingleBucket_Percentage Percentatge del total SingleBucket_WordTable Taula de mots de %s SingleBucket_Message1 Cliqueu una lletra a l'índex per veure la llista de mots que hi comencen. Cliqueu qualsevol mot per examinar llur probabilitat per a totes les cistelles. SingleBucket_Unique %s distint SingleBucket_ClearBucket Suprimir tots els mots Session_Title La sessió POPFile ha vençut Session_Error La vostra sessió POPFile ha vençut. Això pot ser degut a haver aturat i iniciat POPFile deixant el vostre navegador web obert. Cliqueu un dels enllaços de més amunt per continuar usant POPFile. View_Title Visualització missatge individual View_ShowFrequencies Mostrar freqüències de mot View_ShowProbabilities Mostrar probabilitats de mot View_ShowScores Mostrar barems de mot i diagrama de decisió View_WordMatrix Matriu de mots View_WordProbabilities s'estan mostrant les probabilitats de mot View_WordFrequencies s'estan mostrant les freqüències de mot View_WordScores s'estan mostrant els barems de mot View_Chart Diagrama de decisió Windows_TrayIcon Mostrar la icona POPFile a la safata de sistema del Windows? Windows_Console Executar POPFile a una finestra de consola? Windows_NextTime <p><font color="red">No tindrà efecte fins que reinicieu el POPFile</font> Header_MenuSummary Aquesta taula és el menú de navegació que permet d'accedir a cadascuna de les diferents pàgines del centre de control. History_MainTableSummary Aquesta taula mostra el remitent i l'assumpte dels missatges rebuts adés i permet de revisar-los i reclassificar-los. En clicar la línia de l'assumpte es mostrarà el missatge sencer, juntament amb la informació del per què de llur classificació. La columna 'Hauria de ser' us permet d'especificar a quina cistella pertany o de desfer aquest canvi. La columna 'Esborrar' us permet d'esborrar de l'històric missatges específics, si ja no els necessiteu. History_OpenMessageSummary Aquesta taula conté el text complet d'un missatge, amb els mots usats a la classificació ressaltats segons la cistella més rellevant de cadascun. Bucket_MainTableSummary Aquesta taula proporciona una ullada de les cistelles de classificació. Cada fila mostra per a cada cistella el nom, el comptador total de mots, el nombre total de mots individuals, si es modificarà la línia d'assumpte en classificar-lo, si es deixaran en quarantena els que es rebin i una taula per seleccionar el color a usar en presentar al centre de control res de relacionat amb ella. Bucket_StatisticsTableSummary Aquesta taula proporciona tres jocs d'estadístiques sobre el rendiment general de POPFile. El primer és com d'acurada és la classificació, el segon quants missatges i a quines cistelles s'han classificat i el tercer quants mots hi ha a cada cistella i quins percentatges representen. Bucket_MaintenanceTableSummary Aquesta taula conté formularis que us permeten de crear, esborrar o redenominar cistelles o examinar un mot a totes les cistelles per veure quines probabilitats presenta. Bucket_AccuracyChartSummary Aquesta taula representa gràficament la precisió de la classificació de missatges. Bucket_BarChartSummary Aquesta taula representa gràficament l'assignació de percentatges a cadascuna de les diferents cistelles. S'usa tant per al nombre de missatges classificats com per als comptadors totals de mots. Bucket_LookupResultsSummary Aquesta taula mostra les probabilitats associades a un mot del corpus donat. De cada cistella mostra la freqüència en que esdevé el mot, la probabilitat de que hi aparegui i l'efecte general que té sobre el barem de la cistella si n'hi ha cap en un missatge. Bucket_WordListTableSummary Aquesta taula proporciona una llista de tots els mots d'una cistella particular, ordenats per la primera lletra comú a cada fila. Magnet_MainTableSummary Aquesta taula mostra la llista d'imants que s'usen per classificar missatges automàticament segons unes regles fixes. Cada fila mostra com es defineix l'imant, per a quina cistella s'ha fet i un botó per esborrar-lo. Configuration_MainTableSummary Aquesta taula conté un nombre de formularis que us permeten de controlar la configuració de POPFile. Configuration_InsertionTableSummary Aquesta taula conté els botons que determinen si es fan certes modificacions a les capçaleres o línia d'assumpte del missatge abans no sigui passat al client de correu, o no. Security_MainTableSummary Aquesta taula proporciona jocs de controls que afecten la seguretat de la configuració general de POPFile, si s'ha de comprovar automàticament si hi ha actualitzacions del programa i si s'han enviar les estadístiques sobre rendiment del POPFile al magatzem central de l'autor del programa per a informació general. Advanced_MainTableSummary Aquesta taula proporciona una llista de mots que POPFile ignora en classificar els missatges atesa llur freqüència relativa als missatges de tota mena. S'ordenen per fila segons llur primera lletra. Imap_Bucket2Folder Els correus de la cistella <b>%s</b> van a la carpeta Imap_MapError No podeu assignar més d'una cistella a una sola carpeta! Imap_Server Nom del servidor IMAP: Imap_ServerNameError Introduïu-hi el nom del servidor! Imap_Port Port del servidor IMAP: Imap_PortError Introduïu-hi un número de port vàlid! Imap_Login Nom del compte IMAP: Imap_LoginError Introduïu-hi un nom d'usuari! Imap_Password Contrasenya del compte IMAP: Imap_PasswordError Introduïu-hi una contrasenya pel servidor! Imap_Expunge Destruir de les carpetes mirades els missatges esborrats. Imap_Interval Interval d'actualització, en segons: Imap_IntervalError Introduïu-hi un interval entre 10 i 3600 segons. Imap_Bytelimit Nombre de bytes per missatge a usar per a la classificació. Introduïu-hi 0 (zero) pel missatge complet: Imap_BytelimitError Introduïu-hi un nombre. Imap_RefreshFolders Recarregar la llista de carpetes Imap_Now ara! Imap_UpdateError1 No s'ha pogut entrar. Verifiqueu el nom del compte i la contrasenya. Imap_UpdateError2 No s'ha pogut connectar amb el servidor. Comproveu el nom i el port del servidor i assegureu-vos que sou en línia. Imap_UpdateError3 Configureu abans els detalls de la connexió. Imap_NoConnectionMessage Configureu abans els detalls de la connexió. Després que hi hagueu fet, hi haurà més opcions disponibles. Imap_WatchMore una carpeta a la llista de les carpetes mirades Imap_WatchedFolder Carpeta mirada núm. Shutdown_Message S'ha aturat el POPFile Help_Training Quan useu per primer cop POPFile, no sap res i caldrà una mica d'entrenament. Cal entrenar POPFile per a cada cistella. L'anireu educant cada cop que reclassifiqueu un missatge que POPFile hagi classificat a una cistella incorrecta. També haureu de configurar el vostre client de correu perquè filtri els missatges segons la classificació de POPFile. Podeu trobar informació sobre com configurar el filtratge del vostre client de correu a <a href="http://popfile.sourceforge.net/cgi-bin/wiki.pl?FrequentlyAskedQuestions/EmailSorting">Projecte de Documentació POPFile</a> (en anglès). Help_Bucket_Setup POPFile necessita al menys dues cistelles a més de la pseudo-cistella 'unclassified'. El que fa únic POPFile és que pot classificar els correus en tantes cistelles com volgueu. Una configuració senzilla pot ser una cistella "spam", una "personal" i una altra "feina". Help_No_More No mostrar-m'ho més |
|
From: Brian S. <xue...@us...> - 2005-08-05 19:09:01
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27580 Modified Files: pfidiag.nsi Log Message: Make it easier to maintain this utility by splitting the huge single 'section' into smaller ones and reducing the number of local variables. Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pfidiag.nsi 5 Aug 2005 00:39:24 -0000 1.13 --- pfidiag.nsi 5 Aug 2005 19:08:53 -0000 1.14 *************** *** 45,48 **** --- 45,49 ---- !undef ${NSIS_VERSION}_found + ;------------------------------------------------ ; This script requires the 'ShellLink' NSIS plugin *************** *** 59,62 **** --- 60,64 ---- ; ${NSISDIR}\Contrib\ShellLink\ folder if you wish, but this step is entirely optional. [...1410 lines suppressed...] # specified folder and lists those that appear to start POPFile. # + # POPFile shortcuts are expected to use command-lines which include one of the following: + # + # (1) runpopfile.exe + # (2) popfile.exe + # (3) popfileb.exe + # (4) popfilef.exe + # (5) popfileib.exe + # (6) popfileif.exe + # (7) perl.exe popfile.pl + # (8) wperl.exe popfile.pl + # + # Additional command-line options may be supplied (to override some configuration settings). + # + # For simplicity this version of the function merely looks for the string "POPFile" in the + # shortcut's "target" command-line using a case-insensitive search. + # # Inputs: # (top of stack) - address of the folder containing the shortcuts to be analysed |
|
From: Brian S. <xue...@us...> - 2005-08-05 00:39:33
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31748 Modified Files: pfidiag.nsi Log Message: Fix a stack/register corruption bug. Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pfidiag.nsi 3 Aug 2005 15:29:22 -0000 1.12 --- pfidiag.nsi 5 Aug 2005 00:39:24 -0000 1.13 *************** *** 92,96 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.54" !define C_OUTFILE "pfidiag.exe" --- 92,96 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.55" !define C_OUTFILE "pfidiag.exe" *************** *** 1142,1145 **** --- 1142,1146 ---- Pop ${L_SHORTCUT_TARGET} Pop ${L_SHORTCUT_ARGS} + Pop ${L_POPFILE_TOTAL} Pop ${L_LNK_TOTAL} Pop ${L_LNK_NAME} *************** *** 1151,1154 **** --- 1152,1156 ---- !undef L_LNK_NAME !undef L_LNK_TOTAL + !undef L_POPFILE_TOTAL !undef L_SHORTCUT_ARGS !undef L_SHORTCUT_TARGET |
|
From: Brian S. <xue...@us...> - 2005-08-03 15:29:35
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830 Modified Files: pfidiag.nsi Log Message: Analyse all of the shortcuts in the 'All Users' and 'Current User' StartUp folders and report which shortcuts (if any) appear to start POPFile. NB: An extra NSIS plugin is required in order to be able to analyse the shortcuts (download details are given in the script's header comment) Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pfidiag.nsi 21 Jul 2005 19:18:44 -0000 1.11 --- pfidiag.nsi 3 Aug 2005 15:29:22 -0000 1.12 *************** *** 45,48 **** --- 45,62 ---- !undef ${NSIS_VERSION}_found + ;------------------------------------------------ + ; This script requires the 'ShellLink' NSIS plugin + ;------------------------------------------------ + ; + ; This script uses a special NSIS plugin (ShellLink) to extract information from a Windows + ; shortcut (*.lnk) file + ; + ; The 'NSIS Wiki' page for the 'ShellLink' plugin (description, example and download links): + ; http://nsis.sourceforge.net/wiki/ShellLink_plugin + ; + ; To compile this script, copy the 'ShellLink.dll' file to the standard NSIS plugins folder + ; (${NSISDIR}\Plugins\). The 'ShellLink' source and example files can be unzipped to the + ; ${NSISDIR}\Contrib\ShellLink\ folder if you wish, but this step is entirely optional. + #-------------------------------------------------------------------------- # Run-time command-line switch (used by 'pfidiag.exe') *************** *** 78,82 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.53" !define C_OUTFILE "pfidiag.exe" --- 92,96 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.54" !define C_OUTFILE "pfidiag.exe" *************** *** 348,360 **** !define L_DIAG_MODE $R9 ; controls the level of detail supplied by the utility ! !define L_EXPECTED_ROOT $R8 ; expected value for POPFILE_ROOT or SFN version of RootDir ! !define L_EXPECTED_USER $R7 ; expected value for POPFILE_USER or SFN version of UserDir !define L_ITAIJIDICTPATH $R6 ; current Kakasi environment variable !define L_KANWADICTPATH $R5 ; current Kakasi environment variable ! !define L_POPFILE_ROOT $R4 ; current environment variable ! !define L_POPFILE_USER $R3 ; current environment variable !define L_REGDATA $R2 ; data read from registry ! !define L_STATUS_ROOT $R1 ; used when reporting whether or not 'popfile.pl' exists ! !define L_STATUS_USER $R0 ; used when reporting whether or not 'popfile.cfg' exists !define L_TEMP $9 !define L_WIN_OS_TYPE $8 ; 0 = Win9x, 1 = more modern version of Windows --- 362,378 ---- !define L_DIAG_MODE $R9 ; controls the level of detail supplied by the utility ! !define L_EXPECTED_ROOT $R8 ; (1) expected value for POPFILE_ROOT, or ! ; (2) SFN version of RootDir ! !define L_EXPECTED_USER $R7 ; (1) expected value for POPFILE_USER, or ! ; (2) SFN version of UserDir !define L_ITAIJIDICTPATH $R6 ; current Kakasi environment variable !define L_KANWADICTPATH $R5 ; current Kakasi environment variable ! !define L_POPFILE_ROOT $R4 ; current value of POPFILE_ROOT environment variable ! !define L_POPFILE_USER $R3 ; current value of POPFILE_USER environment variable !define L_REGDATA $R2 ; data read from registry ! !define L_STATUS_ROOT $R1 ; (1) 'all users' StartUp shortcut total, or ! ; (2) used when reporting whether or not 'popfile.pl' exists ! !define L_STATUS_USER $R0 ; (1) 'current user' StartUp shortcut total, or ! ; (2) used when reporting whether or not 'popfile.pl' exists !define L_TEMP $9 !define L_WIN_OS_TYPE $8 ; 0 = Win9x, 1 = more modern version of Windows *************** *** 444,447 **** --- 462,471 ---- DetailPrint "AU: $$SMPROGRAMS = < $SMPROGRAMS >" DetailPrint "AU: $$SMSTARTUP = < $SMSTARTUP >" + StrCpy ${L_TEMP} "$SMSTARTUP" + DetailPrint "" + DetailPrint "Search results for the $\"AU: $$SMSTARTUP$\" folder:" + Push "${L_TEMP}" + Call AnalyseShortcuts + Pop ${L_STATUS_ROOT} DetailPrint "" *************** *** 449,454 **** --- 473,498 ---- DetailPrint "CU: $$SMPROGRAMS = < $SMPROGRAMS >" DetailPrint "CU: $$SMSTARTUP = < $SMSTARTUP >" + + ; If 'all users' & 'current user' use same StartUp folder there is no need to check it again + + StrCmp ${L_TEMP} "$SMSTARTUP" 0 check_CU_shortcuts + DetailPrint "" + DetailPrint "($\"CU: $$SMSTARTUP$\" folder is same as $\"AU: $$SMSTARTUP$\" folder)" + Goto check_reg_data + + check_CU_shortcuts: DetailPrint "" + DetailPrint "Search results for the $\"CU: $$SMSTARTUP$\" folder:" + Push "$SMSTARTUP" + Call AnalyseShortcuts + Pop ${L_STATUS_USER} + IntOp ${L_TEMP} ${L_STATUS_ROOT} + ${L_STATUS_USER} + IntCmp ${L_TEMP} 1 check_reg_data check_reg_data + DetailPrint "" + DetailPrint "'POPFile' total = ${L_TEMP}" + DetailPrint "^^^^^ Error ^^^^^ The $\"'POPFile' total$\" should not be more than one (1)" + check_reg_data: + DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "Obsolete/testbed Registry Entries" *************** *** 985,988 **** --- 1029,1162 ---- #-------------------------------------------------------------------------- + # Installer Function: AnalyseShortcuts + # + # The Windows installer (setup.exe) and the "Add POPFile User" wizard (adduser.exe) only check + # for specific StartUp shortcut names so if the user has renamed a POPFile StartUp shortcut + # created during a previous installation or has created their own shortcut then there may be + # more than one StartUp shortcut for POPFile. This function analyses all shortcuts in the + # specified folder and lists those that appear to start POPFile. + # + # Inputs: + # (top of stack) - address of the folder containing the shortcuts to be analysed + # + # Outputs: + # (top of stack) - number of shortcuts found which appear to start POPFile + # + # Usage: + # + # Push "$SMSTARTUP" + # Call AnalyseShortcuts + # Pop $R0 + # + # ; if $R0 is 2 or more then something has gone wrong! + # + #-------------------------------------------------------------------------- + + Function AnalyseShortcuts + + !define L_LNK_FOLDER $R9 ; folder where the shortcuts (if any) are stored + !define L_LNK_HANDLE $R8 ; file handle used when searching for shortcut files + !define L_LNK_NAME $R7 ; name of a shortcut file + !define L_LNK_TOTAL $R6 ; counts the number of shortcuts we find + !define L_POPFILE_TOTAL $R5 ; total number of shortcuts which appear to start POPFile + !define L_SHORTCUT_ARGS $R4 + !define L_SHORTCUT_TARGET $R3 + !define L_TEMP $R2 + + Exch ${L_LNK_FOLDER} + Push ${L_LNK_HANDLE} + Push ${L_LNK_NAME} + Push ${L_LNK_TOTAL} + Push ${L_POPFILE_TOTAL} + Push ${L_SHORTCUT_ARGS} + Push ${L_SHORTCUT_TARGET} + Push ${L_TEMP} + + StrCpy ${L_LNK_TOTAL} 0 + StrCpy ${L_POPFILE_TOTAL} 0 + + IfFileExists "${L_LNK_FOLDER}\*.*" 0 exit + + FindFirst ${L_LNK_HANDLE} ${L_LNK_NAME} "${L_LNK_FOLDER}\*.lnk" + StrCmp ${L_LNK_HANDLE} "" all_done_now + + examine_shortcut: + StrCmp ${L_LNK_NAME} "." look_again + StrCmp ${L_LNK_NAME} ".." look_again + IfFileExists "${L_LNK_FOLDER}\${L_LNK_NAME}\*.*" look_again + IntOp ${L_LNK_TOTAL} ${L_LNK_TOTAL} + 1 + ShellLink::GetShortCutTarget "${L_LNK_FOLDER}\${L_LNK_NAME}" + Pop ${L_SHORTCUT_TARGET} + ShellLink::GetShortCutArgs "${L_LNK_FOLDER}\${L_LNK_NAME}" + Pop ${L_SHORTCUT_ARGS} + + Push ${L_SHORTCUT_TARGET} + Push "popfile" + Call PFI_StrStr + Pop ${L_TEMP} + StrCmp ${L_TEMP} "" 0 show_details + Push ${L_SHORTCUT_ARGS} + Push "popfile" + Call PFI_StrStr + Pop ${L_TEMP} + StrCmp ${L_TEMP} "" look_again + + show_details: + IntOp ${L_POPFILE_TOTAL} ${L_POPFILE_TOTAL} + 1 + DetailPrint "" + DetailPrint "Shortcut name = < ${L_LNK_NAME} >" + DetailPrint "Shortcut target = < ${L_SHORTCUT_TARGET} >" + StrCpy ${L_TEMP} "found" + IfFileExists ${L_SHORTCUT_TARGET} show_args + StrCpy ${L_TEMP} "not found" + + show_args: + StrCmp ${L_SHORTCUT_ARGS} "" no_args + DetailPrint "Shortcut argument = < ${L_SHORTCUT_ARGS} >" + Goto show_status + + no_args: + DetailPrint "Shortcut argument = ><" + + show_status: + DetailPrint "Target status = ${L_TEMP}" + + look_again: + FindNext ${L_LNK_HANDLE} ${L_LNK_NAME} + StrCmp ${L_LNK_NAME} "" all_done_now examine_shortcut + + all_done_now: + FindClose ${L_LNK_HANDLE} + + exit: + DetailPrint "" + DetailPrint "*.lnk files found = ${L_LNK_TOTAL}" + DetailPrint "POPFile shortcuts = ${L_POPFILE_TOTAL}" + IntCmp ${L_POPFILE_TOTAL} 1 restore_regs restore_regs + DetailPrint "^^^^^ Error ^^^^^ There should not be more than one (1) POPFile StartUp shortcut here" + + restore_regs: + StrCpy ${L_LNK_FOLDER} ${L_POPFILE_TOTAL} + + Pop ${L_TEMP} + Pop ${L_SHORTCUT_TARGET} + Pop ${L_SHORTCUT_ARGS} + Pop ${L_LNK_TOTAL} + Pop ${L_LNK_NAME} + Pop ${L_LNK_HANDLE} + Exch ${L_LNK_FOLDER} ; return number of shortcuts which appear to start POPFile + + !undef L_LNK_FOLDER + !undef L_LNK_HANDLE + !undef L_LNK_NAME + !undef L_LNK_TOTAL + !undef L_SHORTCUT_ARGS + !undef L_SHORTCUT_TARGET + !undef L_TEMP + + FunctionEnd + + + #-------------------------------------------------------------------------- # Installer Function: CheckForSpaces # |
|
From: Brian S. <xue...@us...> - 2005-08-02 23:23:36
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16739 Modified Files: installer-SecMinPerl-body.nsh installer-Uninstall.nsh installer.nsi Log Message: Update the minimal Perl to suit ActivePerl 5.8.7 (new Perl dependencies) The minimal Perl needs to be updated to support the current SSL components from the University of Winnipeg and to fix the LSP-compatibility problem (e.g PGP Desktop 9.0 stops the Windows version of 0.22.2 from working). Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.258 retrieving revision 1.259 diff -C2 -d -r1.258 -r1.259 *** installer.nsi 1 Jul 2005 09:51:31 -0000 1.258 --- installer.nsi 2 Aug 2005 23:23:24 -0000 1.259 *************** *** 1101,1110 **** ;-------------------------------------------------------------------------- ! ; Install Perl modules: base.pm, bytes.pm, the Encode collection and Text::Kakasi ;-------------------------------------------------------------------------- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" - File "${C_PERL_DIR}\lib\bytes.pm" File "${C_PERL_DIR}\lib\Encode.pm" --- 1101,1111 ---- ;-------------------------------------------------------------------------- ! ; Install Perl modules: base.pm, the entire Encode collection and Text::Kakasi ! ; (bytes.pm and bytes_heavy.pl are also required but these files became part of ! ; the standard minimal Perl when support for encrypted cookies was added for 0.23.0) ;-------------------------------------------------------------------------- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\Encode.pm" Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installer-SecMinPerl-body.nsh 2 Mar 2005 19:53:41 -0000 1.1 --- installer-SecMinPerl-body.nsh 2 Aug 2005 23:23:24 -0000 1.2 *************** *** 42,45 **** --- 42,51 ---- ; extra Perl components which are added when the optional POPFile components are installed. + ; The 0.22.2 release's minimal Perl was based upon ActivePerl 5.8.4 but the optional SSL + ; components from the University of Winnipeg repository are no longer compatible with this + ; version of ActivePerl. ActivePerl 5.8.7 (the most recent version at the time of writing) + ; introduced some new dependencies so this section assumes the minimal Perl will be based + ; upon ActivePerl 5.8.7. + !insertmacro SECTIONLOG_ENTER "Minimal Perl" *************** *** 71,74 **** --- 77,81 ---- File "${C_PERL_DIR}\lib\Carp.pm" File "${C_PERL_DIR}\lib\Config.pm" + File "${C_PERL_DIR}\lib\Config_heavy.pl" File "${C_PERL_DIR}\lib\constant.pm" File "${C_PERL_DIR}\lib\DynaLoader.pm" *************** *** 216,219 **** --- 223,227 ---- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\bytes.pm" + File "${C_PERL_DIR}\lib\bytes_heavy.pl" File "${C_PERL_DIR}\lib\subs.pm" Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installer-Uninstall.nsh 2 Mar 2005 19:53:41 -0000 1.1 --- installer-Uninstall.nsh 2 Aug 2005 23:23:24 -0000 1.2 *************** *** 690,693 **** --- 690,694 ---- skip_Win32: Delete "$G_MPLIBDIR\*.pm" + Delete "$G_MPLIBDIR\*.pl" RMDIR "$G_MPLIBDIR" |
|
From: Brian S. <xue...@us...> - 2005-07-21 19:18:55
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6834 Modified Files: pfidiag.nsi Log Message: When displaying the 'simple' report, scroll to the part which shows the LFN and SFN formats of POPFile's program and user data folders. Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pfidiag.nsi 2 Mar 2005 20:02:33 -0000 1.10 --- pfidiag.nsi 21 Jul 2005 19:18:44 -0000 1.11 *************** *** 78,82 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.52" !define C_OUTFILE "pfidiag.exe" --- 78,82 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.53" !define C_OUTFILE "pfidiag.exe" *************** *** 915,918 **** --- 915,924 ---- DetailPrint "------------------------------------------------------------" + StrCmp ${L_DIAG_MODE} "simple" 0 quiet_exit + + ; For 'simple' reports, scroll to the LFN and SFN versions of the installation locations + + Call ScrollToShowPaths + quiet_exit: SetDetailsPrint textonly *************** *** 1059,1062 **** --- 1065,1137 ---- FunctionEnd + + #-------------------------------------------------------------------------- + # Function used to manipulate the contents of the details view + #-------------------------------------------------------------------------- + + ;------------------------------------------------------------------------ + ; Constants used when accessing the details view + ;------------------------------------------------------------------------ + + !define C_LVM_GETITEMCOUNT 0x1004 + !define C_LVM_ENSUREVISIBLE 0x1013 + + #-------------------------------------------------------------------------- + # Installer Function: ScrollToShowPaths + # + # Scrolls the details view up to make it show the locations of the + # program files and the 'User Data' files in LFN and SFN formats. + # + # Inputs: + # none + # + # Outputs: + # none + # + # Usage: + # Call ScrollToShowPaths + # + #-------------------------------------------------------------------------- + + Function ScrollToShowPaths + + !define L_TEMP $R9 + !define L_TOPROW $R8 ; item index of the line we want to be at the top of the window + + Push ${L_TEMP} + Push ${L_TOPROW} + + ; Even the 'simple' report is too long to fit in the details view window so we + ; automatically scroll the view to make it display the LFN and SFN versions of + ; the POPFile program and 'User Data' folder locations (on the assumption that + ; this is the information most users will want to find first). + + StrCpy ${L_TOPROW} 9 ; index of the blank line immediately before "Current UserName" + + ; Check how many 'details' lines there are + + FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TEMP} ${C_LVM_GETITEMCOUNT} 0 0 ${L_TEMP} + + ; No point in trying to display a non-existent line + + IntCmp ${L_TEMP} ${L_TOPROW} exit exit + + ; Scroll up (in effect) to show Current UserName, Program folder & User Data folder entries + + FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 + + exit: + Pop ${L_TOPROW} + Pop ${L_TEMP} + + !undef L_TEMP + !undef L_TOPROW + + FunctionEnd + #-------------------------------------------------------------------------- # End of 'pfidiag.nsi' |
|
From: Brian S. <xue...@us...> - 2005-07-21 17:04:32
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3248 Modified Files: pfidbstatus.nsi Log Message: Support two variants: 'integrated' (for bundling with the installer) and 'stand-alone' for use with 0.21.0 or a later release. The 'integrated' one does not need to include the sqlite.exe utility because the installer will install a compatible version of sqlite.exe. Introduce a new run time option (/REGISTRY) to make it easier for the installer to create a suitable Start Menu shortcut for the utility. Make the report more user-friendly by automatically scrolling the output to reveal the name and location of the POPFile SQLite database which was examined (previously this line scrolled out of sight when the timestamp was added at the end of the report). Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pfidbstatus.nsi 12 Jul 2005 18:23:38 -0000 1.2 --- pfidbstatus.nsi 21 Jul 2005 17:02:40 -0000 1.3 *************** *** 8,17 **** # and sqlite3.exe for 3.x format files. # ! # It is assumed that the appropriate version of the SQLite utility is ! # available on the target system (the utility searches for the utility ! # in several likely places). However sqlite.exe v2.8.12 causes GPFs when ! # called by the 'nsExec' plug-in to execute SQL from the command-line so ! # if that version is found the "built-in" compatible version of sqlite.exe ! # is used instead. # # Copyright (c) 2005 John Graham-Cumming --- 8,14 ---- # and sqlite3.exe for 3.x format files. # ! # NOTE: sqlite.exe v2.8.12 causes GPFs when called by the 'nsExec' plug-in ! # to execute SQL from the command-line so this utility checks the ! # sqlite.exe version number before trying to execute any SQL. # # Copyright (c) 2005 John Graham-Cumming *************** *** 34,37 **** --- 31,53 ---- #------------------------------------------------------------------------------------------- + #-------------------------------------------------------------------------- + # Compile-time command-line switches (used by 'makensis.exe') + #-------------------------------------------------------------------------- + # + # /DCTS_INTEGRATED + # + # This script can build either an 'integrated' version of the utility which will be included + # in the main POPFile installer or a 'stand-alone' version of the utility which can be used + # with POPFile 0.21.0 or a later version. + # + # Since the 'integrated' version will be installed at the same time as a compatible version + # of the SQLite utility there is no need to include a compatible SQLite utility. When the + # '/DCTS_INTEGRATED' compile-time switch is supplied, the SQLite utility will not be included + # so the resulting executable file will be smaller (typically 79 KB instead of 208 KB). + # + # By default the SQLite utility is included when this utility is built. + # + #-------------------------------------------------------------------------- + #------------------------------------------------------------------------------------------- # Usage (one optional parameter): *************** *** 41,46 **** # # Normally 'database_filename' will simply be the default SQLite database filename, popfile.db. ! # This utility is intended for use via a shortcut created in the 'User Data' folder by the ! # 'POPFile User Data' wizard (setupuser.exe) or by simply double-clicking the utility's icon. # # If no parameter is given the utility makes several attempts to find the database file: --- 57,64 ---- # # Normally 'database_filename' will simply be the default SQLite database filename, popfile.db. ! # ! # If this utility is used via a Start Menu shortcut created by the 'POPFile User Data' wizard ! # (setupuser.exe) then the parameter will be '/REGISTRY' which forces the utility to use the ! # registry data to find the database file (if the registry data does not exist, it exits). # # If no parameter is given the utility makes several attempts to find the database file: *************** *** 70,73 **** --- 88,94 ---- # (7) The search is abandoned if the above steps fail to find the database (the utility exits). # + # NOTE: Priority is given to the current folder and the folder containing the utility to make + # it easy to use the utility (e.g. just put it in the same folder as the popfile.db file) + # #------------------------------------------------------------------------------------------- *************** *** 108,118 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.3" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" ; The default NSIS caption is "Name Setup" so we override it here ! Name "POPFile SQLite Database Status Check" ! Caption "POPFile SQLite Database Status Check ${C_VERSION}" ; Specify EXE filename and icon for the 'installer' --- 129,144 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" ; The default NSIS caption is "Name Setup" so we override it here ! !ifdef CTS_INTEGRATED ! Name "POPFile SQLite Database Status Check (integrated)" ! Caption "POPFile SQLite Database Status Check ${C_VERSION} (integrated)" ! !else ! Name "POPFile SQLite Database Status Check (stand-alone)" ! Caption "POPFile SQLite Database Status Check ${C_VERSION} (stand-alone)" ! !endif ; Specify EXE filename and icon for the 'installer' *************** *** 145,149 **** VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" --- 171,179 ---- VIProductVersion "${C_VERSION}.0" ! !ifdef CTS_INTEGRATED ! VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check (integrated version)" ! !else ! VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check (stand-alone version)" ! !endif VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" *************** *** 167,170 **** --- 197,202 ---- ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data. + Var G_WINUSERNAME ; current Windows user login name + Var G_DATADIR ; folder path where we expect to find the SQLite database file Var G_DATABASE ; holds name (and possibly path) to the SQLite database *************** *** 270,273 **** --- 302,307 ---- !insertmacro DBS_TEXT DBS_LANG_RIGHTCLICK "Right-click in the window below to copy the report to the clipboard" + !insertmacro DBS_TEXT DBS_LANG_NOCONFIGDATA "POPFile is not configured for the '$G_WINUSERNAME' user" + !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_1 "Unable to find the '$G_DATABASE' file (the SQLite database)" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder)" *************** *** 278,282 **** !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_3 " e.g. $G_PLS_FIELD_1 popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_4 " e.g. $G_PLS_FIELD_1 C:\Program Files\POPFile\popfile.db" ! !insertmacro DBS_TEXT DBS_LANG_NODBPARAM "$(DBS_LANG_NODBPARAM_1)${MB_NL}${MB_NL}$(DBS_LANG_NODBPARAM_2)${MB_NL}$(DBS_LANG_NODBPARAM_3)${MB_NL}$(DBS_LANG_NODBPARAM_4)" !insertmacro DBS_TEXT DBS_LANG_OPENERR "unable to open file" --- 312,317 ---- !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_3 " e.g. $G_PLS_FIELD_1 popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_4 " e.g. $G_PLS_FIELD_1 C:\Program Files\POPFile\popfile.db" ! !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_5 " e.g. $G_PLS_FIELD_1 /REGISTRY" ! !insertmacro DBS_TEXT DBS_LANG_NODBPARAM "$(DBS_LANG_NODBPARAM_1)${MB_NL}${MB_NL}$(DBS_LANG_NODBPARAM_2)${MB_NL}$(DBS_LANG_NODBPARAM_3)${MB_NL}$(DBS_LANG_NODBPARAM_4)${MB_NL}$(DBS_LANG_NODBPARAM_5)" !insertmacro DBS_TEXT DBS_LANG_OPENERR "unable to open file" *************** *** 300,303 **** --- 335,339 ---- !insertmacro DBS_TEXT DBS_LANG_NOSQLITE "$(DBS_LANG_NOSQLITE_1)${MB_NL}${MB_NL}$(DBS_LANG_NOSQLITE_2))" + !insertmacro DBS_TEXT DBS_LANG_CURRENT_USER "Current user : $G_WINUSERNAME" !insertmacro DBS_TEXT DBS_LANG_CURRENT_DIR "Current folder: $INSTDIR" !insertmacro DBS_TEXT DBS_LANG_UTILITY_DIR "Utility folder: $EXEDIR" *************** *** 313,316 **** --- 349,353 ---- !insertmacro DBS_TEXT DBS_LANG_HKCU_REG_VAL "'User Data' folder (from HKCU entry) = $G_DATADIR" !insertmacro DBS_TEXT DBS_LANG_NOT_HKCU_REG "Unable to find database using registry data (HKCU)" + !insertmacro DBS_TEXT DBS_LANG_HKCU_INVALID "Error: No POPFile registry data found for '$G_WINUSERNAME' user" !insertmacro DBS_TEXT DBS_LANG_TRY_CURRENT "Trying to find database (popfile.db) in current folder" *************** *** 331,335 **** !insertmacro DBS_TEXT DBS_LANG_SQLITEUTIL "SQLite $G_PLS_FIELD_2 utility found in $G_PLS_FIELD_1" ! !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "is not compatible with this utility (using 'built-in' SQLite $G_PLS_FIELD_2 instead)" !insertmacro DBS_TEXT DBS_LANG_SQLITECOMMAND "Result of running the 'pragma integrity_check;' command:" !insertmacro DBS_TEXT DBS_LANG_SQLITEDBISOK "The POPFile database has passed the SQLite integrity check!" --- 368,376 ---- !insertmacro DBS_TEXT DBS_LANG_SQLITEUTIL "SQLite $G_PLS_FIELD_2 utility found in $G_PLS_FIELD_1" ! !ifdef CTS_INTEGRATED ! !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "not compatible with this 'integrated' version (use 'stand-alone' version or newer sqlite.exe)" ! !else ! !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "not compatible with this utility (using 'built-in' SQLite $G_PLS_FIELD_2 instead)" ! !endif !insertmacro DBS_TEXT DBS_LANG_SQLITECOMMAND "Result of running the 'pragma integrity_check;' command:" !insertmacro DBS_TEXT DBS_LANG_SQLITEDBISOK "The POPFile database has passed the SQLite integrity check!" *************** *** 370,373 **** --- 411,425 ---- DetailPrint "" + ClearErrors + UserInfo::GetName + IfErrors default_name + Pop $G_WINUSERNAME + StrCmp $G_WINUSERNAME "" 0 check_input + + default_name: + StrCpy $G_WINUSERNAME "UnknownUser" + + check_input: + ; Set OutPath to the working directory (to cope with cases where no database path is supplied) *************** *** 378,384 **** --- 430,440 ---- SetDetailsPrint listonly + DetailPrint "$(DBS_LANG_CURRENT_USER)" DetailPrint "$(DBS_LANG_CURRENT_DIR)" + StrCmp "$INSTDIR" "$EXEDIR" check_command_line DetailPrint "$(DBS_LANG_UTILITY_DIR)" + check_command_line: + ; The command-line can be used to supply the name of a database file in the current folder ; (e.g. mydata.db), a relative filename for the database file (e.g. ..\data\mydata.db) or *************** *** 389,393 **** StrCmp $G_DATABASE "" check_currentdir DetailPrint "$(DBS_LANG_COMMANDLINE)" ! Goto lookforfile check_currentdir: --- 445,451 ---- StrCmp $G_DATABASE "" check_currentdir DetailPrint "$(DBS_LANG_COMMANDLINE)" ! StrCmp $G_DATABASE "/REGISTRY" 0 lookforfile ! DetailPrint "" ! Goto use_registry check_currentdir: *************** *** 402,405 **** --- 460,464 ---- DetailPrint "$(DBS_LANG_NOT_CURRENT)" + StrCmp "$INSTDIR" "$EXEDIR" try_env_var DetailPrint "$(DBS_LANG_TRY_EXEDIR)$(DBS_LANG_SEARCHING)" IfFileExists "$EXEDIR\$G_DATABASE" found_in_exedir *************** *** 407,410 **** --- 466,470 ---- DetailPrint "$(DBS_LANG_NOT_EXEDIR)" + try_env_var: DetailPrint "$(DBS_LANG_TRY_ENV_VAR)$(DBS_LANG_SEARCHING)" ReadEnvStr $G_DATADIR "POPFILE_USER" *************** *** 432,436 **** --- 492,509 ---- !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_ENV_VAR)" + + use_registry: DetailPrint "$(DBS_LANG_TRY_HKCU_REG)$(DBS_LANG_SEARCHING)" + ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "Owner" + StrCmp $G_DATADIR $G_WINUSERNAME same_owner + !insertmacro DELETE_LAST_ENTRY + StrCmp $G_DATABASE "/REGISTRY" no_reg_data + DetailPrint "" + + no_reg_data: + DetailPrint "$(DBS_LANG_HKCU_INVALID)" + Goto usage_msg + + same_owner: ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "UserDir_LFN" StrCmp $G_DATADIR "" abandon_search *************** *** 495,498 **** --- 568,573 ---- MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_DBNOTFOUND)" + usage_msg: + ; Ensure the correct program name appears in the 'usage' message added to the log. ; The first system call gets the full pathname (returned in $R0) and the second call *************** *** 509,514 **** --- 584,591 ---- DetailPrint "" DetailPrint "$(DBS_LANG_NODBPARAM_2)" + DetailPrint "" DetailPrint "$(DBS_LANG_NODBPARAM_3)" DetailPrint "$(DBS_LANG_NODBPARAM_4)" + DetailPrint "$(DBS_LANG_NODBPARAM_5)" Goto error_exit *************** *** 591,612 **** StrCmp $G_PLS_FIELD_2 "v2.8.12" 0 use_it ! ; sqlite.exe 2.8.12 causes a GPF when the 'nsExec' plugin uses it to execute a SQL command ! ; from the command-line so we have to use a more recent sqlite.exe utility if we detect the ! ; target system uses sqlite.exe 2.8.12 (sqlite.exe 2.8.13, 2.8.15 & 2.8.16 (the most recent ! ; version available as of 12 July 2005) are all safe to use here) ! SetDetailsPrint none ! File "/oname=$PLUGINSDIR\sqlite.exe" "sqlite_clu\sqlite.exe" ! StrCpy $G_PLS_FIELD_1 "$PLUGINSDIR" ! SetDetailsPrint listonly ! nsExec::ExecToStack '"$G_PLS_FIELD_1\sqlite.exe" -version' ! Pop ${L_TEMP} ! StrCmp ${L_TEMP} "error" start_error ! StrCmp ${L_TEMP} "timeout" start_error ! IntCmp ${L_TEMP} 1 0 version_error version_error ! Call PFI_TrimNewlines ! Pop $G_PLS_FIELD_2 ! StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" ! DetailPrint "$(DBS_LANG_BUILTINUTIL)" use_it: --- 668,694 ---- StrCmp $G_PLS_FIELD_2 "v2.8.12" 0 use_it ! !ifdef CTS_INTEGRATED ! DetailPrint "$(DBS_LANG_BUILTINUTIL)" ! Goto error_exit ! !else ! ; sqlite.exe 2.8.12 causes a GPF when the 'nsExec' plugin uses it to execute a SQL command ! ; from the command-line so we have to use a more recent sqlite.exe utility if we detect the ! ; target system uses sqlite.exe 2.8.12 (sqlite.exe 2.8.13, 2.8.15 & 2.8.16 (the most recent ! ; version available as of 12 July 2005) are all safe to use here) ! SetDetailsPrint none ! File "/oname=$PLUGINSDIR\sqlite.exe" "sqlite_clu\sqlite.exe" ! StrCpy $G_PLS_FIELD_1 "$PLUGINSDIR" ! SetDetailsPrint listonly ! nsExec::ExecToStack '"$G_PLS_FIELD_1\sqlite.exe" -version' ! Pop ${L_TEMP} ! StrCmp ${L_TEMP} "error" start_error ! StrCmp ${L_TEMP} "timeout" start_error ! IntCmp ${L_TEMP} 1 0 version_error version_error ! Call PFI_TrimNewlines ! Pop $G_PLS_FIELD_2 ! StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" ! DetailPrint "$(DBS_LANG_BUILTINUTIL)" ! !endif use_it: *************** *** 682,685 **** --- 764,773 ---- SetDetailsPrint none + ; Provide an instant snapshot summary by scrolling up to display the name and location + ; of the POPFile SQLite database file we have just checked (the "report finished" block + ; makes the database information scroll off the top of the list). + + Call HideFinalTimestamp + !undef L_TEMP *************** *** 697,700 **** --- 785,791 ---- !define C_LVM_DELETEITEM 0x1008 + !define C_LVM_ENSUREVISIBLE 0x1013 + !define C_LVM_GETTOPINDEX 0x1027 + #-------------------------------------------------------------------------- # Installer Function: GetDetailViewItemCount *************** *** 704,707 **** --- 795,799 ---- # Inputs: # none + # # Outputs: # (top of stack) - number of rows in the details view window *************** *** 729,732 **** --- 821,825 ---- # Inputs: # (top of stack) - index number of the row to be deleted + # # Outputs: # none *************** *** 749,752 **** --- 842,904 ---- FunctionEnd + #-------------------------------------------------------------------------- + # Installer Function: HideFinalTimestamp + # + # Scrolls the details view up a little to provide an 'instant' summary. + # + # After a successful integrity check, the "report finished" timestamp causes the + # location of the POPFile database file to scroll off the top of the details list + # so we in effect scroll up a few lines to bring it back into view. + # + # The "report finished" timestamp can still be seen by scrolling down or saving + # the entire report to a file via the clipboard. + # + # Inputs: + # none + # + # Outputs: + # none + # + # Usage: + # Call HideFinalTimestamp + # + #-------------------------------------------------------------------------- + + Function HideFinalTimestamp + + !define L_TEMP $R9 + !define L_TOPROW $R8 + + Push ${L_TEMP} + Push ${L_TOPROW} + + ; The final timestamp block uses 3 lines so we want to scroll up 3 lines to bring + ; more important lines back into view at the top of the list. The LVM_SCROLL message + ; uses a pixel-based vertical scroll value instead of an item-based value so we take + ; an easier approach: find the item index of the currently visible top row and then + ; make visible the item which is 3 rows before that. (The item index is zero based so + ; we must ensure we never supply a negative item index) + + FindWindow ${L_TOPROW} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TOPROW} ${L_TOPROW} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TOPROW} ${C_LVM_GETTOPINDEX} 0 0 ${L_TOPROW} + + IntOp ${L_TOPROW} ${L_TOPROW} - 3 + IntCmp ${L_TOPROW} 0 scrollup 0 scrollup + StrCpy ${L_TOPROW} 0 + + scrollup: + FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 + + Pop ${L_TOPROW} + Pop ${L_TEMP} + + !undef L_TEMP + !undef L_TOPROW + + FunctionEnd + ;-------------------------- ; End of 'pfidbstatus.nsi' |
|
From: Brian S. <xue...@us...> - 2005-07-14 11:30:04
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11659 Modified Files: pfi-library.nsh Log Message: Fix the bug that caused PFI_GetSQLdbPathName to return the wrong answer if it is used during creation of a new 'User Data' folder. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** pfi-library.nsh 12 Jul 2005 12:13:03 -0000 1.63 --- pfi-library.nsh 14 Jul 2005 11:29:46 -0000 1.64 *************** *** 58,62 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.8" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.9" #-------------------------------------------------------------------------- *************** *** 2887,2890 **** --- 2887,2891 ---- StrCpy ${L_SQL_CORPUS} "" + StrCpy ${L_SQL_CONNECT} "" IfFileExists "${L_SOURCE}\popfile.cfg" 0 no_sql_set |
|
From: Brian S. <xue...@us...> - 2005-07-12 18:23:48
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20826 Modified Files: pfidbstatus.nsi Log Message: A GPF occurs whenever 'nsExec' uses sqlite.exe 2.8.12 to run SQL commands via the command-line. If version 2.8.12 is detected on the target system, ignore it and use a newer sqlite.exe version which doesn't cause GPFs. Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pfidbstatus.nsi 12 Jul 2005 12:10:40 -0000 1.1 --- pfidbstatus.nsi 12 Jul 2005 18:23:38 -0000 1.2 *************** *** 8,14 **** # and sqlite3.exe for 3.x format files. # ! # In order to reduce the size of this simple utility, it is assumed that ! # the appropriate version of the SQLite utility is available on the target ! # system (the utility searches for the utility in several likely places). # # Copyright (c) 2005 John Graham-Cumming --- 8,17 ---- # and sqlite3.exe for 3.x format files. # ! # It is assumed that the appropriate version of the SQLite utility is ! # available on the target system (the utility searches for the utility ! # in several likely places). However sqlite.exe v2.8.12 causes GPFs when ! # called by the 'nsExec' plug-in to execute SQL from the command-line so ! # if that version is found the "built-in" compatible version of sqlite.exe ! # is used instead. # # Copyright (c) 2005 John Graham-Cumming *************** *** 105,109 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 108,112 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.3" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" *************** *** 328,331 **** --- 331,335 ---- !insertmacro DBS_TEXT DBS_LANG_SQLITEUTIL "SQLite $G_PLS_FIELD_2 utility found in $G_PLS_FIELD_1" + !insertmacro DBS_TEXT DBS_LANG_BUILTINUTIL "is not compatible with this utility (using 'built-in' SQLite $G_PLS_FIELD_2 instead)" !insertmacro DBS_TEXT DBS_LANG_SQLITECOMMAND "Result of running the 'pragma integrity_check;' command:" !insertmacro DBS_TEXT DBS_LANG_SQLITEDBISOK "The POPFile database has passed the SQLite integrity check!" *************** *** 585,588 **** --- 589,614 ---- DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEUTIL)" + StrCmp $G_PLS_FIELD_2 "v2.8.12" 0 use_it + + ; sqlite.exe 2.8.12 causes a GPF when the 'nsExec' plugin uses it to execute a SQL command + ; from the command-line so we have to use a more recent sqlite.exe utility if we detect the + ; target system uses sqlite.exe 2.8.12 (sqlite.exe 2.8.13, 2.8.15 & 2.8.16 (the most recent + ; version available as of 12 July 2005) are all safe to use here) + + SetDetailsPrint none + File "/oname=$PLUGINSDIR\sqlite.exe" "sqlite_clu\sqlite.exe" + StrCpy $G_PLS_FIELD_1 "$PLUGINSDIR" + SetDetailsPrint listonly + nsExec::ExecToStack '"$G_PLS_FIELD_1\sqlite.exe" -version' + Pop ${L_TEMP} + StrCmp ${L_TEMP} "error" start_error + StrCmp ${L_TEMP} "timeout" start_error + IntCmp ${L_TEMP} 1 0 version_error version_error + Call PFI_TrimNewlines + Pop $G_PLS_FIELD_2 + StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" + DetailPrint "$(DBS_LANG_BUILTINUTIL)" + + use_it: nsExec::ExecToStack '"$G_PLS_FIELD_1\$G_SQLITEUTIL" "$G_DATABASE" "select version from popfile;"' Pop ${L_TEMP} |
|
From: Brian S. <xue...@us...> - 2005-07-12 12:13:20
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv727 Modified Files: pfi-library.nsh Log Message: Add support for the new "POPFile SQLite Database Status Check" utility and simplify some of the conditional compilation expressions. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** pfi-library.nsh 2 Mar 2005 19:57:09 -0000 1.62 --- pfi-library.nsh 12 Jul 2005 12:13:03 -0000 1.63 *************** *** 35,47 **** # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (5) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (6) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (7) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (8) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (9) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (10) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (11) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (12) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- --- 35,48 ---- # (2) ADDUSER defined in adduser.nsi ('Add POPFile User' wizard) # (3) BACKUP defined in backup.nsi (POPFile 'User Data' Backup utility) ! # (4) DBSTATUS defined in test\pfidbstatus.nsi (POPFile SQLite Database Status Check) ! # (5) INSTALLER defined in installer.nsi (the main installer program, setup.exe) ! # (6) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (7) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (8) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (9) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (10) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (11) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (12) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (13) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- *************** *** 57,61 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.7" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.8" #-------------------------------------------------------------------------- *************** *** 1527,1531 **** !macroend ! !ifdef ADDUSER | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1528,1532 ---- !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 1969,1973 **** !macroend ! !ifdef ADDUSER | BACKUP | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath --- 1970,1974 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetDataPath *************** *** 2258,2262 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp --- 2259,2263 ---- !macroend ! !ifndef RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp *************** *** 2455,2459 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MSGCAPTURE | PFIDIAG | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime --- 2456,2460 ---- !macroend ! !ifndef RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime *************** *** 2685,2689 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent --- 2686,2690 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent *************** *** 2986,2990 **** !macroend ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName --- 2987,2991 ---- !macroend ! !ifdef ADDUSER | DBSTATUS #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLdbPathName *************** *** 3108,3112 **** !macroend ! !ifdef ADDUSER | BACKUP | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat --- 3109,3113 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | RUNSQLITE | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetSQLiteFormat *************** *** 4045,4049 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash --- 4046,4050 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_StrBackSlash *************** *** 4142,4146 **** !macroend ! !ifndef PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal --- 4143,4147 ---- !macroend ! !ifndef DBSTATUS & PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal *************** *** 4225,4229 **** !macroend ! !ifndef ADDSSL & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr --- 4226,4230 ---- !macroend ! !ifndef ADDSSL & DBSTATUS & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr *************** *** 4296,4300 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_TrimNewlines --- 4297,4301 ---- !macroend ! !ifndef MSGCAPTURE & PFIDIAG & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_TrimNewlines |
|
From: Brian S. <xue...@us...> - 2005-07-12 12:10:54
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32381 Added Files: pfidbstatus.nsi Log Message: The new "POPFile SQLite Database Status Check" utility is a small Windows program which uses the SQLite command-line utility to perform the database integrity check (it avoids the need to type commands in a DOS-box). --- NEW FILE: pfidbstatus.nsi --- #------------------------------------------------------------------------------------------- # # pfidbstatus.nsi --- A simple utility to check the status and integrity of POPFile's SQLite # database using the SQLite command-line utility. # # SQLite 2.x and 3.x database files are not compatible therefore separate # command-line utilities have to be used: sqlite.exe for 2.x format files # and sqlite3.exe for 3.x format files. # # In order to reduce the size of this simple utility, it is assumed that # the appropriate version of the SQLite utility is available on the target # system (the utility searches for the utility in several likely places). # # Copyright (c) 2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------------------- #------------------------------------------------------------------------------------------- # Usage (one optional parameter): # # pfidbstatus # or pfidbstatus database_filename # # Normally 'database_filename' will simply be the default SQLite database filename, popfile.db. # This utility is intended for use via a shortcut created in the 'User Data' folder by the # 'POPFile User Data' wizard (setupuser.exe) or by simply double-clicking the utility's icon. # # If no parameter is given the utility makes several attempts to find the database file: # # (1) If the default SQLite database file (popfile.db) is found in the current folder then # it is assumed that this is the database to be checked. # # (2) If the default SQLite database file (popfile.db) is found in the same folder as the # utility then it is assumed that this is the database to be checked. # # (3) If the POPFILE_USER environment variable has been defined and the POPFile configuration # file (popfile.cfg) is found in the specified folder then the name and location of the # SQLite database file is extracted. # # (4) If the POPFILE_USER environment variable has been defined and the specified folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (5) If the 'User Data' folder location is specified in the Registry, the folder exists and # the POPFile configuration file (popfile.cfg) is found there then the name and location # of the SQLite database file is extracted. # # (6) If the 'User Data' folder location is specified in the Registry and the folder exists # but the name and location of the SQLite database file cannot be determined, the utility # looks for the default SQLite database file (popfile.db) in that folder. # # (7) The search is abandoned if the above steps fail to find the database (the utility exits). # #------------------------------------------------------------------------------------------- ; 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 ;-------------------------------------------------------------------------- ; Symbols used to avoid confusion over where the line breaks occur. ; ; ${IO_NL} is used for InstallOptions-style 'new line' sequences. ; ${MB_NL} is used for MessageBox-style 'new line' sequences. ; ; (these two constants do not follow the 'C_' naming convention described below) ;-------------------------------------------------------------------------- !define IO_NL "\r\n" !define MB_NL "$\r$\n" ;-------------------------------------------------------------------------- ; POPFile constants have been given names beginning with 'C_' (eg C_README) ;-------------------------------------------------------------------------- !define C_VERSION "0.0.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" ; The default NSIS caption is "Name Setup" so we override it here Name "POPFile SQLite Database Status Check" Caption "POPFile SQLite Database Status Check ${C_VERSION}" ; Specify EXE filename and icon for the 'installer' OutFile "${C_OUTFILE}" Icon "..\POPFileIcon\popfile.ico" #-------------------------------------------------------------------------- # Use the "Modern User Interface" #-------------------------------------------------------------------------- !include "MUI.nsh" #-------------------------------------------------------------------------- # Include private library functions and macro definitions #-------------------------------------------------------------------------- ; Avoid compiler warnings by disabling the functions and definitions we do not use !define DBSTATUS !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- ; '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_VERSION}.0" VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "Check the status of POPFile's SQLite database" VIAddVersionKey "FileVersion" "${C_VERSION}" VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" 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__})" #---------------------------------------------------------------------------------------- #-------------------------------------------------------------------------- # User Variables (Global) #-------------------------------------------------------------------------- ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data. Var G_DATADIR ; folder path where we expect to find the SQLite database file Var G_DATABASE ; holds name (and possibly path) to the SQLite database Var G_SQLITEUTIL ; name of the appropriate SQLite command-line utility Var G_DBFORMAT ; SQLite database format ('2.x', '3.x' or an error string) Var G_DBSCHEMA ; SQLite database schema ( a number like '12' or an error string) Var G_PLS_FIELD_1 ; used to customize language strings Var G_PLS_FIELD_2 ; used to customize language strings #-------------------------------------------------------------------------- # Configure the MUI pages #-------------------------------------------------------------------------- ;---------------------------------------------------------------- ; Interface Settings - General Interface Settings ;---------------------------------------------------------------- ; The icon file for the utility !define MUI_ICON "..\POPFileIcon\popfile.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\hdr-common.bmp" !define MUI_HEADERIMAGE_RIGHT ;---------------------------------------------------------------- ; Interface Settings - Interface Resource Settings ;---------------------------------------------------------------- ; The banner provided by the default 'modern.exe' UI does not provide much room for the ; two lines of text, e.g. the German version is truncated, so we use a custom UI which ; provides slightly wider text areas. Each area is still limited to a single line of text. !define MUI_UI "..\UI\pfi_modern.exe" ; The 'hdr-common.bmp' logo is only 90 x 57 pixels, much smaller than the 150 x 57 pixel ; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which ; leaves more room for the TITLE and SUBTITLE text. !define MUI_UI_HEADERIMAGE_RIGHT "..\UI\pfi_headerbmpr.exe" ;---------------------------------------------------------------- ; Interface Settings - Installer Finish Page Interface Settings ;---------------------------------------------------------------- ; Show the installation log and leave the window open when utility has completed its work ShowInstDetails show !define MUI_FINISHPAGE_NOAUTOCLOSE #-------------------------------------------------------------------------- # Define the Page order for the utility #-------------------------------------------------------------------------- ;--------------------------------------------------- ; Installer Page - Install files ;--------------------------------------------------- ; Override standard "Installing..." page header !define MUI_PAGE_HEADER_TEXT "$(DBS_LANG_STD_HDR)" !define MUI_PAGE_HEADER_SUBTEXT "$(DBS_LANG_STD_SUBHDR)" ; Override the standard "Installation complete..." page header !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "$(DBS_LANG_END_HDR)" !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "$(DBS_LANG_END_SUBHDR)" ; Override the standard "Installation Aborted..." page header !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT "$(DBS_LANG_ABORT_HDR)" !define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "$(DBS_LANG_ABORT_SUBHDR)" !insertmacro MUI_PAGE_INSTFILES #-------------------------------------------------------------------------- # Language Support for the utility #-------------------------------------------------------------------------- !insertmacro MUI_LANGUAGE "English" ;-------------------------------------------------------------------------- ; Current build only supports English and uses local strings ; instead of language strings from languages\*-pfi.nsh files ;-------------------------------------------------------------------------- !macro DBS_TEXT NAME VALUE LangString ${NAME} ${LANG_ENGLISH} "${VALUE}" !macroend !insertmacro DBS_TEXT DBS_LANG_STD_HDR "POPFile SQLite Database Status Check" !insertmacro DBS_TEXT DBS_LANG_STD_SUBHDR "Please wait while the database status is checked" !insertmacro DBS_TEXT DBS_LANG_END_HDR "POPFile SQLite Database Status Check" !insertmacro DBS_TEXT DBS_LANG_END_SUBHDR "To save the report, use right-click in the message window,${MB_NL}copy to the clipboard then paste the report into a text file" !insertmacro DBS_TEXT DBS_LANG_ABORT_HDR "POPFile SQLite Database Status Check Failed" !insertmacro DBS_TEXT DBS_LANG_ABORT_SUBHDR "Problem detected - see error report in window below" !insertmacro DBS_TEXT DBS_LANG_RIGHTCLICK "Right-click in the window below to copy the report to the clipboard" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_1 "Unable to find the '$G_DATABASE' file (the SQLite database)" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder)" !insertmacro DBS_TEXT DBS_LANG_DBNOTFOUND "$(DBS_LANG_DBNOTFOUND_1)${MB_NL}${MB_NL}$(DBS_LANG_DBNOTFOUND_2)" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_1 "No SQLite database filename specified." !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_2 "Usage: $G_PLS_FIELD_1 <database>" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_3 " e.g. $G_PLS_FIELD_1 popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM_4 " e.g. $G_PLS_FIELD_1 C:\Program Files\POPFile\popfile.db" !insertmacro DBS_TEXT DBS_LANG_NODBPARAM "$(DBS_LANG_NODBPARAM_1)${MB_NL}${MB_NL}$(DBS_LANG_NODBPARAM_2)${MB_NL}$(DBS_LANG_NODBPARAM_3)${MB_NL}$(DBS_LANG_NODBPARAM_4)" !insertmacro DBS_TEXT DBS_LANG_OPENERR "unable to open file" !insertmacro DBS_TEXT DBS_LANG_DBIDENTIFIED "The '$G_DATABASE' file is a SQLite $G_DBFORMAT database" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND_1 "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND_2 "(looked in '$G_PLS_FIELD_1' folder, 'POPFILE_ROOT' and Registry)" !insertmacro DBS_TEXT DBS_LANG_UTILNOTFOUND "$(DBS_LANG_UTILNOTFOUND_1)${MB_NL}${MB_NL}$(DBS_LANG_UTILNOTFOUND_2)" !insertmacro DBS_TEXT DBS_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" !insertmacro DBS_TEXT DBS_LANG_VERSIONERROR "Error: Unable to determine the '$G_SQLITEUTIL' utility's version number" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_1 "Unable to tell if '$G_DATABASE' is a SQLite database file" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_2 "File format not known $G_DBFORMAT" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFMT_3 "Please shutdown POPFile before using this utility" !insertmacro DBS_TEXT DBS_LANG_UNKNOWNFORMAT "$(DBS_LANG_UNKNOWNFMT_1)${MB_NL}${MB_NL}$(DBS_LANG_UNKNOWNFMT_2)${MB_NL}${MB_NL}$(DBS_LANG_UNKNOWNFMT_3)" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE_1 "Error: POPFile not configured to use SQLite" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE_2 "(see the configuration data in '$G_DATADIR')" !insertmacro DBS_TEXT DBS_LANG_NOSQLITE "$(DBS_LANG_NOSQLITE_1)${MB_NL}${MB_NL}$(DBS_LANG_NOSQLITE_2))" !insertmacro DBS_TEXT DBS_LANG_CURRENT_DIR "Current folder: $INSTDIR" !insertmacro DBS_TEXT DBS_LANG_UTILITY_DIR "Utility folder: $EXEDIR" !insertmacro DBS_TEXT DBS_LANG_COMMANDLINE "Command line : $G_DATABASE" !insertmacro DBS_TEXT DBS_LANG_NOCOMMANDLINE "Searching for database because no command-line parameter supplied" !insertmacro DBS_TEXT DBS_LANG_TRY_ENV_VAR "Trying to find database using POPFILE_USER environment variable" !insertmacro DBS_TEXT DBS_LANG_ENV_VAR_VAL "'User Data' folder (from POPFILE_USER) = $G_DATADIR" !insertmacro DBS_TEXT DBS_LANG_NOT_ENV_VAR "Unable to find database using POPFILE_USER environment variable" !insertmacro DBS_TEXT DBS_LANG_TRY_HKCU_REG "Trying to find database using registry data (HKCU)" !insertmacro DBS_TEXT DBS_LANG_HKCU_REG_VAL "'User Data' folder (from HKCU entry) = $G_DATADIR" !insertmacro DBS_TEXT DBS_LANG_NOT_HKCU_REG "Unable to find database using registry data (HKCU)" !insertmacro DBS_TEXT DBS_LANG_TRY_CURRENT "Trying to find database (popfile.db) in current folder" !insertmacro DBS_TEXT DBS_LANG_NOT_CURRENT "Unable to find database (popfile.db) in current folder" !insertmacro DBS_TEXT DBS_LANG_TRY_EXEDIR "Trying to find database (popfile.db) in same folder as utility" !insertmacro DBS_TEXT DBS_LANG_NOT_EXEDIR "Unable to find database (popfile.db) in same folder as utility" !insertmacro DBS_TEXT DBS_LANG_SEARCHING "..." !insertmacro DBS_TEXT DBS_LANG_FOUNDIT "... found it!" !insertmacro DBS_TEXT DBS_LANG_DIRNOTFILE "Error: '$G_DATABASE' is a folder, not a database file" !insertmacro DBS_TEXT DBS_LANG_CHECKTHISONE "POPFile database found ($G_DATABASE)" !insertmacro DBS_TEXT DBS_LANG_DBFORMAT "Database is in SQLite $G_DBFORMAT format" !insertmacro DBS_TEXT DBS_LANG_DBFORMATSCHEMA "$(DBS_LANG_DBFORMAT) and uses POPFile schema version $G_DBSCHEMA" !insertmacro DBS_TEXT DBS_LANG_DBSCHEMAERROR "SQLite error detected when extracting POPFile schema version:" !insertmacro DBS_TEXT DBS_LANG_SQLITEUTIL "SQLite $G_PLS_FIELD_2 utility found in $G_PLS_FIELD_1" !insertmacro DBS_TEXT DBS_LANG_SQLITECOMMAND "Result of running the 'pragma integrity_check;' command:" !insertmacro DBS_TEXT DBS_LANG_SQLITEDBISOK "The POPFile database has passed the SQLite integrity check!" !insertmacro DBS_TEXT DBS_LANG_SQLITEFAIL "Error: The SQLite utility returned error code $G_PLS_FIELD_1" ;------------------------------------------------------------------------ ; Macro to make it easy to delete the last row in the details window ;------------------------------------------------------------------------ !macro DELETE_LAST_ENTRY Push $0 Call GetDetailViewItemCount Pop $0 IntOp $0 $0 - 1 ; decrement to get the right index of last entry Push $0 Call DeleteDetailViewItem Pop $0 !macroend ;-------------------------------------------------------------------------- ;------------------------------ ; Section: CheckSQLiteDatabase ;------------------------------ Section CheckSQLiteDatabase !define L_TEMP $R9 SetDetailsPrint textonly DetailPrint "$(DBS_LANG_RIGHTCLICK)" SetDetailsPrint listonly DetailPrint "------------------------------------------------------------" DetailPrint "$(^Name) v${C_VERSION}" DetailPrint "------------------------------------------------------------" DetailPrint "" ; Set OutPath to the working directory (to cope with cases where no database path is supplied) GetFullPathName $INSTDIR ".\" SetDetailsPrint none SetOutPath "$INSTDIR" SetDetailsPrint listonly DetailPrint "$(DBS_LANG_CURRENT_DIR)" DetailPrint "$(DBS_LANG_UTILITY_DIR)" ; The command-line can be used to supply the name of a database file in the current folder ; (e.g. mydata.db), a relative filename for the database file (e.g. ..\data\mydata.db) or ; the full pathname for the database file (D:\Application Data\POPFile\popfile.db). Call PFI_GetParameters Pop $G_DATABASE StrCmp $G_DATABASE "" check_currentdir DetailPrint "$(DBS_LANG_COMMANDLINE)" Goto lookforfile check_currentdir: DetailPrint "" DetailPrint "$(DBS_LANG_NOCOMMANDLINE)" DetailPrint "" DetailPrint "$(DBS_LANG_TRY_CURRENT)$(DBS_LANG_SEARCHING)" StrCpy $G_DATABASE "popfile.db" IfFileExists "$INSTDIR\$G_DATABASE" found_in_current !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_CURRENT)" DetailPrint "$(DBS_LANG_TRY_EXEDIR)$(DBS_LANG_SEARCHING)" IfFileExists "$EXEDIR\$G_DATABASE" found_in_exedir !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_EXEDIR)" DetailPrint "$(DBS_LANG_TRY_ENV_VAR)$(DBS_LANG_SEARCHING)" ReadEnvStr $G_DATADIR "POPFILE_USER" StrCmp $G_DATADIR "" try_registry Push $G_DATADIR Call PFI_GetCompleteFPN Pop $G_DATADIR !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_ENV_VAR_VAL)" IfFileExists "$G_DATADIR\*.*" 0 try_registry Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_env_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_env_file_exists: IfFileExists "$G_DATABASE" 0 try_registry !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_ENV_VAR)$(DBS_LANG_FOUNDIT)" Goto split_path try_registry: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_ENV_VAR)" DetailPrint "$(DBS_LANG_TRY_HKCU_REG)$(DBS_LANG_SEARCHING)" ReadRegStr $G_DATADIR HKCU "Software\POPFile Project\POPFile\MRI" "UserDir_LFN" StrCmp $G_DATADIR "" abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_HKCU_REG_VAL)" IfFileExists "$G_DATADIR\*.*" 0 abandon_search Push $G_DATADIR Call PFI_GetSQLdbPathName Pop $G_DATABASE StrCmp $G_DATABASE "Not SQLite" sqlite_not_used StrCmp $G_DATABASE "" 0 check_reg_file_exists StrCpy $G_DATABASE "$G_DATADIR\popfile.db" check_reg_file_exists: IfFileExists "$G_DATABASE" 0 abandon_search !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_HKCU_REG)$(DBS_LANG_FOUNDIT)" Goto split_path sqlite_not_used: DetailPrint "" DetailPrint "$(DBS_LANG_NOSQLITE_1)" DetailPrint "$(DBS_LANG_NOSQLITE_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_NOSQLITE)" Goto error_exit abandon_search: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_NOT_HKCU_REG)" StrCpy $G_PLS_FIELD_1 "$INSTDIR" Goto give_up found_in_current: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_CURRENT)$(DBS_LANG_FOUNDIT)" Goto lookforfile found_in_exedir: !insertmacro DELETE_LAST_ENTRY DetailPrint "$(DBS_LANG_TRY_EXEDIR)$(DBS_LANG_FOUNDIT)" StrCpy $INSTDIR $EXEDIR lookforfile: Push $INSTDIR Push $G_DATABASE Call PFI_GetDataPath Pop $G_DATABASE split_path: Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} IfFileExists "$G_PLS_FIELD_1\$G_DATABASE" continue give_up: DetailPrint "" DetailPrint "$(DBS_LANG_DBNOTFOUND_1)" DetailPrint "$(DBS_LANG_DBNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_DBNOTFOUND)" ; Ensure the correct program name appears in the 'usage' message added to the log. ; The first system call gets the full pathname (returned in $R0) and the second call ; extracts the filename (and possibly the extension) part (result returned in $R1) Push $R0 Push $R1 System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' StrCpy $G_PLS_FIELD_1 $R1 Pop $R1 Pop $R0 DetailPrint "" DetailPrint "$(DBS_LANG_NODBPARAM_2)" DetailPrint "$(DBS_LANG_NODBPARAM_3)" DetailPrint "$(DBS_LANG_NODBPARAM_4)" Goto error_exit continue: StrCpy $G_DATABASE "$G_PLS_FIELD_1\$G_DATABASE" IfFileExists "$G_DATABASE\*.*" dir_not_file DetailPrint "" DetailPrint "$(DBS_LANG_CHECKTHISONE)" Push $G_DATABASE Call PFI_GetSQLiteFormat Pop $G_DBFORMAT StrCpy $G_SQLITEUTIL "sqlite.exe" StrCmp $G_DBFORMAT "2.x" look_for_util StrCpy $G_SQLITEUTIL "sqlite3.exe" StrCmp $G_DBFORMAT "3.x" look_for_util Push $G_DATABASE Call PFI_GetParent Pop $G_PLS_FIELD_1 StrLen ${L_TEMP} $G_PLS_FIELD_1 IntOp ${L_TEMP} ${L_TEMP} + 1 StrCpy $G_DATABASE $G_DATABASE "" ${L_TEMP} DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_1)" DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_2)" DetailPrint "" DetailPrint "$(DBS_LANG_UNKNOWNFMT_3)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_UNKNOWNFORMAT)" Goto error_exit look_for_util: StrCpy ${L_TEMP} "$EXEDIR" StrCpy $G_PLS_FIELD_1 "$EXEDIR" IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it ; It is not in "our" folder so try looking in the usual places ReadEnvStr ${L_TEMP} "POPFILE_ROOT" StrCmp ${L_TEMP} "" try_HKCU Push ${L_TEMP} Call PFI_GetCompleteFPN Pop ${L_TEMP} StrCmp ${L_TEMP} "" try_HKCU IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it try_HKCU: ReadRegStr ${L_TEMP} HKCU "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" try_HKLM IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it try_HKLM: ReadRegStr ${L_TEMP} HKLM "Software\POPFile Project\POPFile\MRI" "RootDir_LFN" StrCmp ${L_TEMP} "" no_util IfFileExists "${L_TEMP}\$G_SQLITEUTIL" run_it no_util: DetailPrint "" DetailPrint "$(DBS_LANG_DBIDENTIFIED)" DetailPrint "" DetailPrint "$(DBS_LANG_UTILNOTFOUND_1)" DetailPrint "$(DBS_LANG_UTILNOTFOUND_2)" MessageBox MB_OK|MB_ICONEXCLAMATION \ "$(DBS_LANG_DBIDENTIFIED)\ ${MB_NL}${MB_NL}${MB_NL}\ $(DBS_LANG_UTILNOTFOUND)" Goto error_exit run_it: StrCpy $G_PLS_FIELD_1 ${L_TEMP} nsExec::ExecToStack '"$G_PLS_FIELD_1\$G_SQLITEUTIL" -version' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error IntCmp ${L_TEMP} 1 0 version_error version_error Call PFI_TrimNewlines Pop $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "v$G_PLS_FIELD_2" DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEUTIL)" nsExec::ExecToStack '"$G_PLS_FIELD_1\$G_SQLITEUTIL" "$G_DATABASE" "select version from popfile;"' Pop ${L_TEMP} Call PFI_TrimNewlines Pop $G_DBSCHEMA StrCmp ${L_TEMP} "0" schema_ok StrCpy $G_DBSCHEMA "($G_DBSCHEMA)" DetailPrint "" DetailPrint "$(DBS_LANG_DBFORMAT)" DetailPrint "" DetailPrint "$(DBS_LANG_DBSCHEMAERROR)" DetailPrint "$G_DBSCHEMA" Goto check_integrity schema_ok: DetailPrint "" DetailPrint "$(DBS_LANG_DBFORMATSCHEMA)" check_integrity: DetailPrint "" DetailPrint "$(DBS_LANG_SQLITECOMMAND)" nsExec::ExecToLog '"$G_PLS_FIELD_1\$G_SQLITEUTIL" "$G_DATABASE" "pragma integrity_check;"' Pop ${L_TEMP} StrCmp ${L_TEMP} "error" start_error StrCmp ${L_TEMP} "timeout" start_error IntCmp ${L_TEMP} 0 exit StrCpy $G_PLS_FIELD_1 ${L_TEMP} DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEFAIL)" Goto error_exit dir_not_file: DetailPrint "" DetailPrint "$(DBS_LANG_DIRNOTFILE)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_DIRNOTFILE)" Goto error_exit version_error: StrCpy $G_PLS_FIELD_2 "" DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEUTIL)" DetailPrint "" DetailPrint "$(DBS_LANG_VERSIONERROR)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_VERSIONERROR)" Goto error_exit start_error: DetailPrint "" DetailPrint "$(DBS_LANG_STARTERROR)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(DBS_LANG_STARTERROR)" error_exit: Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "(status check failed ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none Abort exit: DetailPrint "" DetailPrint "$(DBS_LANG_SQLITEDBISOK)" Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "" DetailPrint "------------------------------------------------------------" DetailPrint "(report finished ${L_TEMP})" DetailPrint "------------------------------------------------------------" SetDetailsPrint none !undef L_TEMP SectionEnd #-------------------------------------------------------------------------- # Functions used to manipulate the contents of the details view #-------------------------------------------------------------------------- ;------------------------------------------------------------------------ ; Constants used when accessing the details view ;------------------------------------------------------------------------ !define C_LVM_GETITEMCOUNT 0x1004 !define C_LVM_DELETEITEM 0x1008 #-------------------------------------------------------------------------- # Installer Function: GetDetailViewItemCount # # Returns the number of rows in the details view (on the INSTFILES page) # # Inputs: # none # Outputs: # (top of stack) - number of rows in the details view window # # Usage: # # Call GetDetailViewItemCount # Pop $R9 # #-------------------------------------------------------------------------- Function GetDetailViewItemCount Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_GETITEMCOUNT} 0 0 $1 Exch $1 FunctionEnd #-------------------------------------------------------------------------- # Installer Function: DeleteDetailViewItem # # Deletes one row from the details view (on the INSTFILES page) # # Inputs: # (top of stack) - index number of the row to be deleted # Outputs: # none # # Usage: # # Push $R9 # Call DeleteDetailViewItem # #-------------------------------------------------------------------------- Function DeleteDetailViewItem Exch $0 Push $1 FindWindow $1 "#32770" "" $HWNDPARENT GetDlgItem $1 $1 0x3F8 ; This is the Control ID of the details view SendMessage $1 ${C_LVM_DELETEITEM} $0 0 Pop $1 Pop $0 FunctionEnd ;-------------------------- ; End of 'pfidbstatus.nsi' ;-------------------------- |
|
From: Brian S. <xue...@us...> - 2005-07-01 10:12:38
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28876 Modified Files: 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: Ensure that the "summary" page does not show a garbled installation path when the path contains any of the InstallOptions2 escape sequences (e.g. "C:\Program Files\new POPFile" contains the "\n" escape sequence) Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Swedish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 --- Swedish-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Slovak-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 --- Slovak-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** TradChinese-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.50 --- TradChinese-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.51 *************** *** 299,304 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 299,304 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Russian-pfi.nsh 28 Jun 2005 13:38:21 -0000 1.49 --- Russian-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Ukrainian-pfi.nsh 28 Jun 2005 13:38:23 -0000 1.49 --- Ukrainian-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Turkish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.38 --- Turkish-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.39 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** Spanish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.54 --- Spanish-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.55 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** SimpChinese-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 --- SimpChinese-pfi.nsh 1 Jul 2005 10:12:28 -0000 1.50 *************** *** 299,304 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 299,304 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) |
|
From: Brian S. <xue...@us...> - 2005-07-01 10:07:50
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26825 Modified Files: Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Log Message: Ensure that the "summary" page does not show a garbled installation path when the path contains any of the InstallOptions2 escape sequences (e.g. "C:\Program Files\new POPFile" contains the "\n" escape sequence) Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Portuguese-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.49 --- Portuguese-pfi.nsh 1 Jul 2005 10:07:37 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Italian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.39 --- Italian-pfi.nsh 1 Jul 2005 10:07:36 -0000 1.40 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Japanese-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.60 --- Japanese-pfi.nsh 1 Jul 2005 10:07:36 -0000 1.61 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** PortugueseBR-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.66 --- PortugueseBR-pfi.nsh 1 Jul 2005 10:07:38 -0000 1.67 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Hungarian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.49 --- Hungarian-pfi.nsh 1 Jul 2005 10:07:36 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Polish-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.42 --- Polish-pfi.nsh 1 Jul 2005 10:07:37 -0000 1.43 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Greek-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.41 --- Greek-pfi.nsh 1 Jul 2005 10:07:36 -0000 1.42 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Norwegian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.35 --- Norwegian-pfi.nsh 1 Jul 2005 10:07:37 -0000 1.36 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Korean-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.50 --- Korean-pfi.nsh 1 Jul 2005 10:07:37 -0000 1.51 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) |
|
From: Brian S. <xue...@us...> - 2005-07-01 10:02:16
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24108 Modified Files: Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Log Message: Ensure that the "summary" page does not show a garbled installation path when the path contains any of the InstallOptions2 escape sequences (e.g. "C:\Program Files\new POPFile" contains the "\n" escape sequence) Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Danish-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.49 --- Danish-pfi.nsh 1 Jul 2005 10:01:58 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Czech-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.44 --- Czech-pfi.nsh 1 Jul 2005 10:01:58 -0000 1.45 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Dutch-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.49 --- Dutch-pfi.nsh 1 Jul 2005 10:01:59 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** French-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.52 --- French-pfi.nsh 1 Jul 2005 10:02:00 -0000 1.53 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** German-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.54 --- German-pfi.nsh 1 Jul 2005 10:02:00 -0000 1.55 *************** *** 307,312 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 307,312 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Arabic-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.22 --- Arabic-pfi.nsh 1 Jul 2005 10:01:57 -0000 1.23 *************** *** 305,310 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 305,310 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** English-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.51 --- English-pfi.nsh 1 Jul 2005 10:01:59 -0000 1.52 *************** *** 290,295 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 290,295 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Bulgarian-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.49 --- Bulgarian-pfi.nsh 1 Jul 2005 10:01:58 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Finnish-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.49 --- Finnish-pfi.nsh 1 Jul 2005 10:02:00 -0000 1.50 *************** *** 295,300 **** ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_ROOTDIR" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_ROOTDIR" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) --- 295,300 ---- ; $G_ROOTDIR holds the installation location, e.g. C:\Program Files\POPFile ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_NEWLOCN "New POPFile installation at $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SUMMARY_UPGRADELOCN "Upgrade existing POPFile installation at $G_PLS_FIELD_2" ; By default all of these components are installed (but Kakasi is only installed when Japanese/Nihongo language is chosen) |
|
From: Brian S. <xue...@us...> - 2005-07-01 09:51:44
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20603 Modified Files: installer.nsi Log Message: Ensure that the "summary" page does not show a garbled installation path when the path contains any of the InstallOptions2 escape sequences (e.g. "C:\Program Files\new POPFile" contains the "\n" escape sequence) Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.257 retrieving revision 1.258 diff -C2 -d -r1.257 -r1.258 *** installer.nsi 4 Mar 2005 14:44:23 -0000 1.257 --- installer.nsi 1 Jul 2005 09:51:31 -0000 1.258 *************** *** 1488,1491 **** --- 1488,1497 ---- !define C_NLT "${IO_NL}\t" + ; Convert the installation pathname into a string which is safe to use in the summary page + + Push $G_ROOTDIR + Call NSIS2IO + Pop $G_PLS_FIELD_2 + IfFileExists "$G_ROOTDIR\popfile.pl" upgrade StrCpy ${L_TEMP} "$(PFI_LANG_SUMMARY_NEWLOCN)" *************** *** 2025,2028 **** --- 2031,2092 ---- #-------------------------------------------------------------------------- + # Installer Function: NSIS2IO + # + # Convert an NSIS string to a form suitable for use by InstallOptions + # + # Inputs: + # (top of stack) - a string to be used on an InstallOptions page + # Outputs: + # (top of stack) - a safe version of the input which will be displayed correctly + # + # Usage: + # Push "C:\Install\Workshop\restore" ; InstallOptions treats '\r' as a CR char + # Call NSIS2IO + # Pop $R0 + # + # ($R0 will now hold "C:\\Install\\Workshop\\restore" + # to make InstallOptions display "C:\Install\Workshop\restore" + # instead of "C:\Install\Workshop + # estore") + # + #-------------------------------------------------------------------------- + + Function NSIS2IO + Exch $0 ; The source + Push $1 ; The output + Push $2 ; Temporary char + StrCpy $1 "" ; Initialise the output + + loop: + StrCpy $2 $0 1 ; Get the next source char + StrCmp $2 "" done ; Abort when none left + StrCpy $0 $0 "" 1 ; Remove it from the source + StrCmp $2 "\" "" +3 ; Back-slash? + StrCpy $1 "$1\\" + Goto loop + + StrCmp $2 "$\r" "" +3 ; Carriage return? + StrCpy $1 "$1\r" + Goto loop + + StrCmp $2 "$\n" "" +3 ; Line feed? + StrCpy $1 "$1\n" + Goto loop + + StrCmp $2 "$\t" "" +3 ; Tab? + StrCpy $1 "$1\t" + Goto loop + + StrCpy $1 "$1$2" ; Anything else + Goto loop + + done: + StrCpy $0 $1 + Pop $2 + Pop $1 + Exch $0 + FunctionEnd + + #-------------------------------------------------------------------------- # End of 'installer.nsi' #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-06-29 09:24:23
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11336 Modified Files: runsqlite.nsi Log Message: Display a more helpful message when unable to determine the database format because the file cannot be opened. Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** runsqlite.nsi 2 Mar 2005 20:01:32 -0000 1.3 --- runsqlite.nsi 29 Jun 2005 09:24:12 -0000 1.4 *************** *** 76,80 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.3" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 76,80 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 156,160 **** !insertmacro RSU_TEXT RSU_LANG_UTILNOTFOUND "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)${MB_NL}${MB_NL}(looked in $EXEDIR folder)" !insertmacro RSU_TEXT RSU_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" ! !insertmacro RSU_TEXT RSU_LANG_UNKNOWNFORMAT "Unable to tell if '$G_DATABASE' is a SQLite database file${MB_NL}${MB_NL}File format not known $G_DBFORMAT" ;-------------------------------------------------------------------------- --- 156,160 ---- !insertmacro RSU_TEXT RSU_LANG_UTILNOTFOUND "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)${MB_NL}${MB_NL}(looked in $EXEDIR folder)" !insertmacro RSU_TEXT RSU_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" ! !insertmacro RSU_TEXT RSU_LANG_UNKNOWNFORMAT "Unable to tell if '$G_DATABASE' is a SQLite database file${MB_NL}${MB_NL}File format not known $G_DBFORMAT${MB_NL}${MB_NL}Please shutdown POPFile before using this utility" ;-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2005-06-28 15:40:49
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12427 Modified Files: addssl.nsi Log Message: Correct 'copy and paste' error in comment. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** addssl.nsi 28 Jun 2005 13:39:52 -0000 1.9 --- addssl.nsi 28 Jun 2005 15:40:40 -0000 1.10 *************** *** 96,100 **** ; The following local SSL files are compatible with POPFile 0.22.x: ; ! ; (1) ssl-0.22.x\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) --- 96,100 ---- ; 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) |
|
From: Brian S. <xue...@us...> - 2005-06-28 13:40:06
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21185 Modified Files: addssl.nsi Log Message: A few days ago the optional SSL files in the University of Winnipeg repository were updated and they are no longer compatible with the minimal Perl used by POPFile 0.22.x (the new SSL files cause POPFile to crash when it tries to use SSL). To solve this problem the "SSL Setup" wizard now includes a set of 0.22.x-compatible SSL files for use when adding SSL support to an existing 0.22.x installation. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** addssl.nsi 2 Mar 2005 20:03:17 -0000 1.8 --- addssl.nsi 28 Jun 2005 13:39:52 -0000 1.9 *************** *** 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,12 ---- #-------------------------------------------------------------------------- # ! # 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.x so this utility includes a compatible set of 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 version of Module.pm distributed with POPFile 0.22.0 results in extremely *************** *** 59,64 **** ; 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: --- 65,70 ---- ; 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: *************** *** 69,73 **** ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. ; ! ; Tested with versions 1.0.5, 1.0.6 and 1.0.7 of the 'untgz' plugin. ;------------------------------------------------ --- 75,107 ---- ; ${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.x 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.x 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\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.23.0 will probably be 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. ;------------------------------------------------ *************** *** 126,130 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.0.15" ; Mention the wizard's version number in the window title --- 160,164 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.1.0" ; Mention the wizard's version number in the window title |
|
From: Brian S. <xue...@us...> - 2005-06-28 13:39:10
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20805 Modified Files: getssl.nsh Log Message: A few days ago the optional SSL files in the University of Winnipeg repository were updated and they are no longer compatible with the minimal Perl used by POPFile 0.22.x (the new SSL files cause POPFile to crash when it tries to use SSL). To solve this problem the "SSL Setup" wizard now includes a set of 0.22.x-compatible SSL files for use when adding SSL support to an existing 0.22.x installation. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** getssl.nsh 4 Mar 2005 19:06:25 -0000 1.5 --- getssl.nsh 28 Jun 2005 13:39:00 -0000 1.6 *************** *** 41,46 **** ; 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: --- 41,46 ---- ; 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: *************** *** 51,55 **** ; ${NSISDIR}\Contrib\untgz\ folder if you wish, but this step is entirely optional. ; ! ; Tested with versions 1.0.5, 1.0.6 and 1.0.7 of the 'untgz' plugin. --- 51,55 ---- ; ${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. *************** *** 87,98 **** Section /o "SSL Support" SecSSL !insertmacro SECTIONLOG_ENTER "SSL Support" !else Section "SSL Support" SecSSL - !endif ! ; 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) - AddSize 2560 !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result --- 87,106 ---- Section /o "SSL Support" SecSSL !insertmacro SECTIONLOG_ENTER "SSL Support" + + ; The main installer 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) + + AddSize 2560 !else Section "SSL Support" SecSSL ! ; The stand-alone utility includes a compressed set of POPFile 0.22.x compatible SSL ! ; support files so we increase the size estimate to take the necessary unpacking into ! ; account (and assume that there will not be a significant difference in the space ! ; required if the wizard decides to download the SSL support files instead). ! ! AddSize 1450 ! !endif !define L_RESULT $R0 ; used by the 'untgz' plugin to return the result *************** *** 100,103 **** --- 108,177 ---- Push ${L_RESULT} + !ifdef ADDSSL + + !define L_VER_X $R1 ; We check only the first three fields in the version number + !define L_VER_Y $R2 ; but the code could be further simplified by merely testing + !define L_VER_Z $R3 ; the 'build number' field (the field we currently ignore) + + Push ${L_VER_X} + Push ${L_VER_Y} + Push ${L_VER_Z} + + ; The stand-alone utility may be used to add SSL support to an 0.22.x installation + ; which is not compatible with the files in the University of Winnipeg repository, + ; so we check the minimal Perl's version number to see if we should use the built-in + ; SSL files instead of downloading the most up-to-date ones. + + IfFileExists "$G_ROOTDIR\perl58.dll" check_Perl_version + DetailPrint "Assume 0.22.x installation (perl58.dll not found in '$G_ROOTDIR' folder)" + Goto assume_0_22_x + + check_Perl_version: + GetDllVersion "$G_ROOTDIR\perl58.dll" ${L_VER_Y} ${L_VER_Z} + IntOp ${L_VER_X} ${L_VER_Y} / 0x00010000 + IntOp ${L_VER_Y} ${L_VER_Y} & 0x0000FFFF + IntOp ${L_VER_Z} ${L_VER_Z} / 0x00010000 + DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder" + + ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher + + StrCpy ${L_RESULT} "built-in" + + IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag + 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" + + restore_vars: + Pop ${L_VER_Z} + Pop ${L_VER_Y} + Pop ${L_VER_X} + + !undef L_VER_X + !undef L_VER_Y + !undef L_VER_Z + + StrCmp ${L_RESULT} "download" download_ssl + + assume_0_22_x: + + ; Pretend we've just downloaded these files from the repository + + DetailPrint "therefore built-in SSL files used instead of downloading the latest versions" + DetailPrint "" + SetOutPath "$PLUGINSDIR" + File "ssl-0.22.x\IO-Socket-SSL.tar.gz" + File "ssl-0.22.x\Net_SSLeay.pm.tar.gz" + File "ssl-0.22.x\ssleay32.dll" + File "ssl-0.22.x\libeay32.dll" + Goto install_SSL_support + + download_ssl: + DetailPrint "therefore the latest versions of the SSL files will be downloaded" + DetailPrint "" + !endif + SetDetailsPrint textonly DetailPrint "$(PFI_LANG_PROG_CHECKINTERNET) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" *************** *** 157,160 **** --- 231,238 ---- !endif + !ifdef ADDSSL + install_SSL_support: + !endif + ; Now install the files required for SSL support |
|
From: Brian S. <xue...@us...> - 2005-06-28 13:38:34
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18341 Modified Files: 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: A few days ago the optional SSL files in the University of Winnipeg repository were updated and they are no longer compatible with the minimal Perl used by POPFile 0.22.x (the new SSL files cause POPFile to crash when it tries to use SSL). To solve this problem the "SSL Setup" wizard now includes a set of 0.22.x-compatible SSL files for use when adding SSL support to an existing 0.22.x installation. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Swedish-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.48 --- Swedish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Slovak-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 --- Slovak-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** TradChinese-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.49 --- TradChinese-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.50 *************** *** 377,381 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 377,381 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Russian-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 --- Russian-pfi.nsh 28 Jun 2005 13:38:21 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Ukrainian-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.48 --- Ukrainian-pfi.nsh 28 Jun 2005 13:38:23 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Turkish-pfi.nsh 2 Mar 2005 17:08:14 -0000 1.37 --- Turkish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.38 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Spanish-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.53 --- Spanish-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.54 *************** *** 382,386 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 382,386 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** SimpChinese-pfi.nsh 2 Mar 2005 17:08:13 -0000 1.48 --- SimpChinese-pfi.nsh 28 Jun 2005 13:38:22 -0000 1.49 *************** *** 377,381 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 377,381 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Brian S. <xue...@us...> - 2005-06-28 13:34:27
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15473 Modified Files: Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Log Message: A few days ago the optional SSL files in the University of Winnipeg repository were updated and they are no longer compatible with the minimal Perl used by POPFile 0.22.x (the new SSL files cause POPFile to crash when it tries to use SSL). To solve this problem the "SSL Setup" wizard now includes a set of 0.22.x-compatible SSL files for use when adding SSL support to an existing 0.22.x installation. Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Portuguese-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.48 --- Portuguese-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Italian-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.38 --- Italian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.39 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Japanese-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.59 --- Japanese-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.60 *************** *** 383,387 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 383,387 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** PortugueseBR-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.65 --- PortugueseBR-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.66 *************** *** 382,386 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 382,386 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Hungarian-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.48 --- Hungarian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Polish-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.41 --- Polish-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.42 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Greek-pfi.nsh 2 Mar 2005 17:03:43 -0000 1.40 --- Greek-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.41 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Norwegian-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.34 --- Norwegian-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.35 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Korean-pfi.nsh 2 Mar 2005 17:03:44 -0000 1.49 --- Korean-pfi.nsh 28 Jun 2005 13:34:12 -0000 1.50 *************** *** 383,387 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 383,387 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Brian S. <xue...@us...> - 2005-06-28 13:29:43
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12619 Modified Files: Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Log Message: A few days ago the optional SSL files in the University of Winnipeg repository were updated and they are no longer compatible with the minimal Perl used by POPFile 0.22.x (the new SSL files cause POPFile to crash when it tries to use SSL). To solve this problem the "SSL Setup" wizard now includes a set of 0.22.x-compatible SSL files for use when adding SSL support to an existing 0.22.x installation. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Danish-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.48 --- Danish-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Czech-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.43 --- Czech-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.44 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Dutch-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.48 --- Dutch-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** French-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.51 --- French-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.52 *************** *** 383,387 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 383,387 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** German-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.53 --- German-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.54 *************** *** 385,389 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 385,389 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Arabic-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.21 --- Arabic-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.22 *************** *** 382,386 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 382,386 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** English-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.50 --- English-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.51 *************** *** 368,372 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 368,372 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Bulgarian-pfi.nsh 2 Mar 2005 16:58:45 -0000 1.48 --- Bulgarian-pfi.nsh 28 Jun 2005 13:29:28 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Finnish-pfi.nsh 2 Mar 2005 16:58:46 -0000 1.48 --- Finnish-pfi.nsh 28 Jun 2005 13:29:29 -0000 1.49 *************** *** 373,377 **** !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 373,377 ---- !insertmacro PFI_LANG_STRING PSS_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PFI_LANG_STRING 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 and installs 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" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Joseph C. <tex...@us...> - 2005-06-03 09:02:26
|
Update of /cvsroot/popfile/engine/skins/coolblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31657/skins/coolblue Modified Files: style.css Log Message: Update CoolBlue for 0.23. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/coolblue/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** style.css 31 Jul 2004 18:04:30 -0000 1.3 --- style.css 3 Jun 2005 09:02:17 -0000 1.4 *************** *** 1,297 **** ! body { ! background-color: #FFFFFF; ! border: none; ! font-family: tahoma, arial, sans-serif; ! color: black; ! margin: 10px 20px 20px 20px; ! font-size: 10pt; ! } ! ! h2 { ! font-size: 11pt; ! font-weight: bold; ! } ! ! .shell, .shellTop { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! margin: 0px; ! border-left: #000000 2px solid; ! color: #000000; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! input, select, textarea { ! border-right: #000000 1px solid; ! border-top: #000000 1px solid; ! border-left: #000000 1px solid; ! color: #000000; ! border-bottom: #000000 1px solid; ! font-family: tahoma, arial, serif; ! background-color: #cccccc; ! } ! ! .menu { ! font-size: 10pt; ! font-weight: bold; ! width: 100%; ! } ! ! .menuSelected { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! width: 16%; ! color: black; ! background-color: #99ccff; ! font-size: 10pt; ! } ! ! .menuStandard { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! width: 16%; ! color: black; ! background-color: #6699cc; ! font-size: 10pt; ! } ! ! tr.rowEven { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! color: black; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! tr.rowOdd { ! border-right: #000000 1px solid; ! border-top: #000000 1px solid; ! border-left: #000000 1px solid; ! color: black; ! border-bottom: #000000 1px solid; ! background-color: #99ccff; ! } ! ! a:link { ! color: #000000; ! background-color: transparent; ! text-decoration: none; ! } ! ! a:visited { ! color: #333333; ! background-color: transparent; ! text-decoration: none; ! } ! ! a:hover { ! text-decoration: underline; ! } ! ! hr { ! color: #000000; ! background-color: transparent; ! } ! ! td.naked { ! padding: 0px; ! margin: 0px; ! border: none; ! } ! ! td.logo2menuSpace { ! height: 0.5em; ! } ! ! td.head { ! font-weight: bold; ! font-size: 12pt; ! } ! ! table.head { ! border-right: #000000 2px; ! border-top: #000000 2px; ! font-weight: bold; ! font-size: 12pt; ! background: #6699cc; ! margin: 0px; ! border-left: #000000 2px; ! width: 100%; ! color: #000000; ! border-bottom: #000000 2px; ! font-family: tahoma, arial, sans-serif; ! } ! ! a.shutdownLink { ! font-size: 10pt; ! font-weight: bold; ! } ! ! td.footerBody { ! text-align: center; ! padding-left: 5%; ! padding-right: 5%; ! } ! ! table.footer { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! margin: 1em 0px 0px; ! border-left: #000000 2px solid; ! width: 100%; ! color: #000000; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! table.settingsTable { ! border: 1px solid #000000; ! } ! ! table.openMessageTable, table.lookupResultsTable { ! border: 3px solid #99ccff; ! } ! ! td.openMessageCloser { ! text-align: right; ! } ! ! td.openMessageBody { ! text-align: left; ! } ! ! td.settingsPanel { ! border: 1px solid #000000; ! } ! ! .menuIndent { ! width: 2%; ! } ! ! td.accuracy0to49 { ! background-color: red; ! color: black; ! } ! ! td.accuracy50to93 { ! background-color: yellow; ! color: black; ! } ! ! td.accuracy94to100 { ! background-color: green; ! color: black; ! } ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! span.graphFont { ! font-size: x-small; ! } ! ! .historyLabel { ! font-weight: normal; ! } ! ! .historyLabel em { ! font-weight: bold; ! font-style: normal; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configuration { ! font-size: 11pt; ! } ! ! .configurationLabel { ! font-size: 10pt; ! font-weight: bold; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! a.menuLink { ! font-weight:bold; ! } ! ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; ! } ! ! table.historyButtonsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! td.historyNavigatorTop { ! text-align: right; ! } ! ! td.historyNavigatorBottom { ! text-align: right; ! } ! ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! span.bucketsWidgetState { ! font-weight: bold; ! } ! ! span.configWidgetState { ! font-weight: bold; ! } ! ! span.securityWidgetState { ! font-weight: bold; ! } ! ! tr.rowBoundary { ! background-color: #000000; ! } ! ! div.helpMessage { ! background-color: #99ccff; ! border: 1px solid black; ! padding: 0.3em; ! padding-bottom: 0; } \ No newline at end of file --- 1,402 ---- ! body { ! background-color: #FFFFFF; ! border: none; ! font-family: tahoma, arial, sans-serif; ! color: black; ! margin: 10px 20px 20px 20px; ! font-size: 10pt; ! } ! ! h2 { ! font-size: 11pt; ! font-weight: bold; ! } ! ! h2.history { ! margin-top: 0; ! margin-bottom: 0.3em; ! } ! ! .search { ! display: inline; ! float: left; ! } ! ! .filter { ! display: inline; ! } ! ! .removeButtonsTop { ! padding-bottom: 1em; ! } ! ! .shell, .shellTop { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! margin: 0px; ! border-left: #000000 2px solid; ! color: #000000; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! .shellStatusMessage { ! color: #000000; ! background-color: #99ccff; ! border: #000000 2px solid; ! width: 100%; ! } ! ! .shellErrorMessage { ! color: #FF0000; ! background-color: #99ccff; ! border: #000000 2px solid; ! width: 100%; ! } ! ! input, select, textarea { ! border-right: #000000 1px solid; ! border-top: #000000 1px solid; ! border-left: #000000 1px solid; ! color: #000000; ! border-bottom: #000000 1px solid; ! font-family: tahoma, arial, serif; ! background-color: #cccccc; ! } ! ! .menu { ! font-size: 10pt; ! font-weight: bold; ! width: 100%; ! } ! ! .menuSelected { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! width: 16%; ! color: black; ! background-color: #99ccff; ! font-size: 10pt; ! } ! ! .menuStandard { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! width: 16%; ! color: black; ! background-color: #6699cc; ! font-size: 10pt; ! } ! ! .menuLink { ! display: block; ! width: 100%; ! } ! ! tr.rowEven { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! border-left: #000000 2px solid; ! color: black; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! tr.rowOdd { ! border-right: #000000 1px solid; ! border-top: #000000 1px solid; ! border-left: #000000 1px solid; ! color: black; ! border-bottom: #000000 1px solid; ! background-color: #99ccff; ! } ! ! a:link { ! color: #000000; ! background-color: transparent; ! text-decoration: none; ! } ! ! a:visited { ! color: #333333; ! background-color: transparent; ! text-decoration: none; ! } ! ! a:hover { ! text-decoration: underline; ! } ! ! hr { ! color: #000000; ! background-color: transparent; ! } ! ! td.naked { ! padding: 0px; ! margin: 0px; ! border: none; ! } ! ! td.logo2menuSpace { ! height: 0.5em; ! } ! ! td.head { ! font-weight: bold; ! font-size: 12pt; ! } ! ! table.head { ! border-right: #000000 2px; ! border-top: #000000 2px; ! font-weight: bold; ! font-size: 12pt; ! background: #6699cc; ! margin: 0px; ! border-left: #000000 2px; ! width: 100%; ! color: #000000; ! border-bottom: #000000 2px; ! font-family: tahoma, arial, sans-serif; ! } ! ! a.logoutLink, a.shutdownLink { ! font-size: 10pt; ! font-weight: bold; ! } ! ! td.footerBody { ! text-align: center; ! padding-left: 5%; ! padding-right: 5%; ! } ! ! table.footer { ! border-right: #000000 2px solid; ! border-top: #000000 2px solid; ! margin: 1em 0px 0px; ! border-left: #000000 2px solid; ! width: 100%; ! color: #000000; ! border-bottom: #000000 2px solid; ! background-color: #6699cc; ! } ! ! table.settingsTable { ! border: 1px solid #000000; ! } ! ! table.openMessageTable, table.lookupResultsTable { ! border: 3px solid #99ccff; ! } ! ! td.openMessageCloser { ! text-align: right; ! } ! ! td.openMessageBody { ! text-align: left; ! } ! ! td.settingsPanel { ! border: 1px solid #000000; ! } ! ! .menuIndent { ! width: 2%; ! } ! ! td.accuracy0to49 { ! background-color: red; ! color: black; ! } ! ! td.accuracy50to93 { ! background-color: yellow; ! color: black; ! } ! ! td.accuracy94to100 { ! background-color: green; ! color: black; ! } ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! span.graphFont { ! font-size: x-small; ! } ! ! .historyLabel { ! font-weight: normal; ! } ! ! .historyLabel em { ! font-weight: bold; ! font-style: normal; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configuration { ! font-size: 11pt; ! } ! ! .configurationLabel { ! font-size: 10pt; ! font-weight: bold; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! a.menuLink { ! font-weight:bold; ! } ! ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; ! } ! ! table.historyButtonsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! td.historyNavigatorTop { ! text-align: right; ! vertical-align: top; ! } ! ! .historyNavigatorTop form, .historyNavigatorBottom form { ! margin: 0.2em 0; ! } ! ! td.historyNavigatorBottom { ! text-align: right; ! } ! ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; ! } ! ! span.bucketsWidgetState { ! font-weight: bold; ! } ! ! span.configWidgetState { ! font-weight: bold; ! } ! ! span.securityWidgetState { ! font-weight: bold; ! } ! ! tr.rowBoundary { ! background-color: #000000; ! } ! ! div.helpMessage { ! background-color: #99ccff; ! border: #000000 1px solid; ! padding: 0.3em; ! padding-bottom: 0; ! } ! ! ! /*********************************************************/ ! /* Config Bars */ ! ! .configBar, .configBarHidden { ! padding-top: 1em; ! } ! ! .configBarTitle { ! border: #000000 2px solid; ! padding: 0.3em; ! padding-bottom: 0; ! margin-left: 0.3em; ! background-color: #99ccff; ! font-weight: bold; ! } ! ! .configBarBody { ! background-color: #6699cc; ! border: #000000 1px solid; ! } ! ! .configBar td { ! border: #000000 1px solid; ! } ! ! .configBarBody form { ! margin: 0; ! } ! ! .configBarOption { ! border: #000000 1px solid; ! margin: 0.3em; ! padding: 0.3em; ! display: inline; ! float: left; ! min-height: 3em; ! background-color: #99ccff; ! } ! ! .checkLabel { ! white-space: nowrap; ! } ! ! .configBarBody label.configurationLabel { ! display: block; ! } ! ! /*********************************************************/ ! /* History Column Controls */ ! ! .columnControls { ! white-space:nowrap; ! vertical-align: top; ! width: 10px; ! } ! ! .columnRemove, .columnMove { ! display: block; ! width:100%; ! height: 1em; } \ No newline at end of file |
|
From: Joseph C. <tex...@us...> - 2005-06-02 11:26:49
|
Update of /cvsroot/popfile/engine/skins/smalldefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32269/skins/smalldefault Modified Files: style.css Log Message: Update SmallDefault for 0.23. Minor changes to several other skins. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/smalldefault/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** style.css 31 Jul 2004 18:04:42 -0000 1.3 --- style.css 2 Jun 2005 11:26:39 -0000 1.4 *************** *** 1,319 **** ! H2 { ! font-size: 14pt; ! font-weight: normal; ! } ! ! body { ! background-color: white; ! border: none; ! font-family: tahoma, sans-serif; ! font-size: 8pt; ! font-weight: normal; ! color: #000000; ! margin: 3px; ! } ! ! table.head { ! font-weight: normal; ! width: 100%; ! } ! ! .top, .bottom, .borderTopLeft, .borderTop, .borderTopRight, .borderLeft, .borderRight, .borderBottomLeft, .borderBottom, .borderBottomRight { ! visibility: hidden; ! display: none; ! } ! ! .head, td.head { ! font-weight: bold; ! font-size: 14pt; ! background-color: #ededca; ! color: #666666; ! padding-left: 5px; ! } ! ! .shell, .shellTop { ! border: 2px #cccc99 solid; ! background-color: #ededca; ! color: #000000; ! margin: 0px; ! padding: 0px; ! } ! ! .head a { ! font-size: 12pt; ! font-weight: normal; ! } ! ! .menu { ! font-size: 12pt; ! font-weight: normal; ! width: 100%; ! } ! ! .menuIndent { ! width: 5%; ! } ! ! .menuSelected, .menuSelected a { ! background-color: #cccc99; ! color: #000000; ! font-size: 14pt; ! font-weight: normal; ! text-decoration: none; ! } ! ! td.menuSelected { ! border-left: 2px solid #cccc99; ! border-right: 2px solid #cccc99; ! border-top: 2px solid #cccc99; ! padding-left: 2px; ! padding-right: 2px; ! margin-left: 2px; ! margin-right: 2px; ! width: 15%; ! } ! ! .menuStandard, .menuStandard a { ! background-color: #ededca; ! color: #0000ff; ! font-size: 14pt; ! font-weight: normal; ! text-decoration: none; ! } ! ! td.menuStandard { ! border-left: 2px solid #cccc99; ! border-right: 2px solid #cccc99; ! border-top: 2px solid #cccc99; ! padding-left: 2px; ! padding-right: 2px; ! margin-left: 2px; ! margin-right: 2px; ! width: 15%; ! } ! ! .menuStandard a:hover { ! text-decoration: underline; ! } ! ! .rowEven { ! background-color: #ededca; ! color: #000000; ! } ! ! .rowOdd { ! background-color: #cccc99; ! color: #000000; ! } ! ! .rowEven a, .rowOdd a { ! text-decoration: none; ! } ! ! .rowEven a:hover, .rowOdd a:hover { ! color: #000000; ! background-color: #ffffcc; ! } ! ! tr.rowHighlighted { ! background-color: #cccc99; ! color: #eeeeee; ! } ! ! table.settingsTable { ! border: 1px solid #cccc99; ! padding: 3px; ! margin: 0px; ! } ! ! table.openMessageTable, table.lookupResultsTable { ! border: 2px solid Black; ! padding: 2px; ! margin: 0px; ! } ! ! td.settingsPanel { ! border: 1px solid #cccc99; ! padding: 3px; ! margin: 0px; ! } ! ! td.naked { ! padding: 0px; ! margin: 0px; ! border: none ! } ! ! td.accuracy0to49 { ! background-color: red; ! color: black; ! height: 20px; ! } ! ! td.accuracy50to93 { ! background-color: yellow; ! color: black; ! height: 20px; ! } ! ! td.accuracy94to100 { ! background-color: green; ! color: black; ! height: 20px; ! } ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! td.historyNavigatorTop { ! text-align: right; ! padding-right: 5px; ! } ! ! .historyNavigatorTop a:hover, .historyNavigatorBottom a:hover { ! background-color: #eeeeee; ! color: #000000; ! } ! ! td.openMessageCloser { ! text-align: right; ! background-color: #eeeeee; ! color: #000000; ! } ! ! .historyLabel { ! font-weight: normal; ! font-size: 9pt; ! text-decoration: none; ! padding-left: 1px; ! padding-right: 2px; ! } ! ! .historyLabel em { ! font-weight: bold; ! font-style: normal; ! } ! ! a.historyLabel:hover { ! text-decoration: underline; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configurationLabel { ! font-weight: normal; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! table.historyWidgetsTop { ! width: 100%; ! border-top: 2px solid #cccc99; ! border-bottom: 2px solid #cccc99; ! } ! ! table.historyWidgetsTop td { ! padding-left: 20px; ! font-weight: bold; ! } ! ! table.historyWidgetsBottom { ! width: 100%; ! border-bottom: 2px solid #cccc99; ! } ! ! table.historyWidgetsBottom td { ! padding-left: 20px; ! font-weight: bold; ! } ! ! table.footer { ! width: 100%; ! background-color: #ededca; ! color: #666666; ! border-left: 2px solid #cccc99; ! border-right: 2px solid #cccc99; ! border-bottom: 2px solid #cccc99; ! } ! ! td.footerBody { ! text-align: center; ! padding-left: 5%; ! padding-right: 5%; ! font-size: 8pt; ! font-weight: bold; ! } ! ! .bottomLink { ! text-decoration: none; ! } ! ! .bottomLink:hover { ! background-color: #ffffcc; ! color: #000000; ! } ! ! input, select, .submit { ! font-family: tahoma, sans-serif; ! font-size: 8pt; ! font-weight: normal; ! padding: 0px; ! margin: 0px; ! } ! ! tt { ! font-family: "lucida console", courier, sans-serif; ! font-size: 9pt; ! font-weight: normal; ! } ! ! span.bucketsWidgetState { ! font-weight: bold; ! } ! ! span.configWidgetState { ! font-weight: bold; ! } ! ! span.securityWidgetState { ! font-weight: bold; ! } ! ! tr.rowBoundary { ! background-color: #cccc99; ! } ! ! div.helpMessage { ! background-color: #DFDFAF; ! border: 2px solid #CCCC99; ! padding: 0.4em; ! padding-bottom: 0; ! } \ No newline at end of file --- 1,411 ---- ! /*********************************************************/ ! /* Main Body */ ! body { ! background-color: white; ! font-family: tahoma, sans-serif; ! font-size: 8pt; ! font-weight: normal; ! color: #000000; ! margin: 3px; ! } ! ! /*********************************************************/ ! /* Shell structure */ ! ! .shell, .shellTop { ! color: #000000; ! background-color: #EDEDCA; ! border: 2px #CCCC99 solid; ! margin: 0px; ! padding: 0px; ! } ! ! .shellStatusMessage { ! color: #000000; ! background-color: #EDEDCA; ! border: 3px #CCCC99 solid; ! width: 100%; ! } ! ! .shellErrorMessage { ! color: #FF0000; ! background-color: #EDEDCA; ! border: 3px #CCCC99 solid; ! width: 100%; ! } ! ! table.head { ! font-weight: normal; ! width: 100%; ! } ! ! td.head { ! font-weight: bold; ! font-size: 14pt; ! color: #666666; ! } ! ! .head a { ! font-size: 12pt; ! font-weight: normal; ! } ! ! table.footer { ! width: 100%; ! color: #666666; ! } ! ! td.footerBody { ! text-align: center; ! padding-left: 5%; ! padding-right: 5%; ! font-size: 8pt; ! font-weight: bold; ! } ! ! .bottomLink { ! text-decoration: none; ! } ! ! .bottomLink:hover { ! background-color: #FFFFCC; ! color: #000000; ! } ! ! td.naked { ! padding: 0; ! margin: 0; ! border: 0; ! } ! ! td.logo2menuSpace { ! height: 0.8em; ! } ! ! /*********************************************************/ ! /* Menu Settings */ ! ! .menu { ! font-size: 12pt; ! font-weight: normal; ! width: 100%; ! } ! ! .menuSelected { ! background-color: #CCCC99; ! padding: 0 2px; ! margin: 0 2px; ! width: 15%; ! } ! ! .menuSelected, .menuSelected a { ! color: #000000; ! font-size: 14pt; ! font-weight: normal; ! text-decoration: none; ! } ! ! .menuStandard { ! border: 2px solid #CCCC99; ! border-bottom: none; ! padding: 0 2px; ! margin: 0 2px; ! width: 15%; ! } ! ! .menuStandard, .menuStandard a { ! background-color: #EDEDCA; ! color: #0000ff; ! font-size: 14pt; ! font-weight: normal; ! text-decoration: none; ! } ! ! .menuSelected a:hover, .menuStandard a:hover { ! text-decoration: underline; ! } ! ! .menuIndent { ! width: 5%; ! } ! ! .menuLink { ! display: block; ! width: 100%; ! } ! ! /*********************************************************/ ! /* Table Settings */ ! ! table.settingsTable { ! border: 1px solid #CCCC99; ! padding: 3px; ! margin: 0px; ! } ! ! td.settingsPanel { ! border: 1px solid #CCCC99; ! padding: 3px; ! margin: 0px; ! } ! ! table.openMessageTable { ! border: 2px solid #CCCC99; ! padding: 2px; ! margin: 0px; ! } ! ! td.openMessageBody { ! text-align: left; ! } ! ! td.openMessageCloser { ! text-align: right; ! } ! ! tr.rowEven { ! color: #000000; ! background-color: #EDEDCA; ! } ! ! tr.rowOdd { ! color: #000000; ! background-color: #CCCC99; ! } ! ! tr.rowEven a, tr.rowOdd a { ! text-decoration: none; ! } ! ! tr.rowEven a:hover, tr.rowOdd a:hover { ! color: #000000; ! background-color: #FFFFCC; ! } ! ! tr.rowHighlighted { ! color: #000000; ! background-color: #B7B7B7; ! } ! ! tr.rowBoundary { ! background-color: #CCCC99; ! } ! ! table.lookupResultsTable { ! border: 2px solid #CCCC99; ! } ! ! td.naked { ! padding: 0px; ! margin: 0px; ! border: none ! } ! ! /*********************************************************/ ! /* Messages */ ! ! div.error01 { ! background-color: transparent; ! color: red; ! font-size: larger; ! } ! ! div.error02 { ! background-color: transparent; ! color: red; ! } ! ! div.helpMessage { ! background-color: #DFDFAF; ! border: 2px solid #CCCC99; ! padding: 0.4em; ! padding-bottom: 0; ! } ! ! /*********************************************************/ ! /* Form Labels */ ! ! th.historyLabel { ! font-weight: normal; ! font-size: 9pt; ! text-decoration: none; ! } ! ! em.historyLabelSort { ! font-weight: bold; ! font-style: normal; ! } ! ! th.historyLabel a:hover { ! text-decoration: underline; ! } ! ! .bucketsLabel { ! font-weight: bold; ! } ! ! .magnetsLabel { ! font-weight: bold; ! } ! ! .securityLabel { ! font-weight: bold; ! } ! ! .configurationLabel { ! font-weight: normal; ! } ! ! .advancedLabel { ! font-weight: bold; ! } ! ! .passwordLabel { ! font-weight: bold; ! } ! ! .sessionLabel { ! font-weight: bold; ! } ! ! .bucketsWidgetStateOn, .bucketsWidgetStateOff { ! font-weight: bold; ! } ! ! .configWidgetStateOn, .configWidgetStateOff { ! font-weight: bold; ! } ! ! .securityWidgetStateOn, .securityWidgetStateOff { ! font-weight: bold; ! } ! ! /*********************************************************/ ! /* Positioning */ ! ! .historyNavigatorTop, .historyNavigatorBottom { ! text-align: right; ! vertical-align: top; ! } ! ! .historyNavigatorTop a:hover, .historyNavigatorBottom a:hover { ! background-color: #EEEEEE; ! color: #000000; ! } ! ! .historyNavigatorTop form, .historyNavigatorBottom form { ! display:inline; ! } ! ! .refreshLink { ! margin-top: 0.5em; ! } ! ! .magnetsTable caption { ! text-align: left; ! } ! ! h2.history { ! margin-top: 0; ! margin-bottom: 0.3em; ! font-size: 14pt; ! font-weight: normal; ! } ! ! .search { ! display: inline; ! float: left; ! padding-right: 1em; ! } ! ! .filter { ! display: inline; ! } ! ! .removeButtonsTop { ! padding-bottom: 1em; ! } ! ! /*********************************************************/ ! /* Config Bar */ ! ! .configBar, .configBarHidden { ! padding-top: 1em; ! } ! ! .configBarTitle { ! border: 2px #CCCC99 solid; ! padding: 0.3em; ! padding-bottom: 0; ! margin-left: 0.3em; ! background-color: #CCCC99; ! font-weight: bold; ! } ! ! .configBarBody { ! background-color: #DFDFAF; ! border: 1px solid #CCCC99; ! } ! ! .configBarBody td { ! border: 1px solid #CCCC99; ! } ! ! .configBarBody form { ! margin: 0; ! } ! ! .configBarOption { ! border: 1px solid #CCCC99; ! margin: 0.3em; ! padding: 0.3em; ! display: inline; ! float: left; ! min-height: 3em; ! background-color: #EDEDCA; ! } ! ! .checkLabel { ! border: 1px solid #CCCC99; ! white-space: nowrap; ! } ! ! .configBarBody input.submit { ! margin-top: 0.1em; ! } ! ! .configBarBody label.configurationLabel { ! display: block; ! } ! ! /*********************************************************/ ! /* History Column Controls */ ! ! .columnControls { ! white-space:nowrap; ! vertical-align: top; ! width: 10px; ! } ! ! .columnRemove, .columnMove { ! display: block; ! width:100%; ! height: 1em; ! } ! ! /*********************************************************/ ! ! input, select, .submit { ! font-family: tahoma, sans-serif; ! font-size: 8pt; ! font-weight: normal; ! padding: 0; ! margin: 0; ! } ! ! tt { ! font-family: "lucida console", courier, sans-serif; ! font-size: 9pt; ! font-weight: normal; ! } ! |
11 messages has been excluded from this view by a project administrator.
