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...> - 2006-11-07 15:38:55
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17628 Modified Files: pfi-library.nsh Log Message: Upgraded to default to using the most recent 0.22.x-compatible version of IMAP.pm (v1.9.4.3, committed to CVS yesterday) whenever the updater detects a 0.22.x installation. Also the command-line can now be used to specify a revision from a branch instead of only the main trunk. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** pfi-library.nsh 16 Jun 2006 09:38:56 -0000 1.68 --- pfi-library.nsh 7 Nov 2006 15:38:46 -0000 1.69 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.13" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.14" #-------------------------------------------------------------------------- *************** *** 4145,4149 **** !macroend ! !ifndef DBANALYSER & PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal --- 4145,4149 ---- !macroend ! !ifndef DBANALYSER & IMAPUPDATER & PFIDIAG & RUNPOPFILE & RUNSQLITE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrCheckDecimal |
|
From: Brian S. <xue...@us...> - 2006-11-07 15:38:55
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17628/add-ons Modified Files: updateimap.nsi Log Message: Upgraded to default to using the most recent 0.22.x-compatible version of IMAP.pm (v1.9.4.3, committed to CVS yesterday) whenever the updater detects a 0.22.x installation. Also the command-line can now be used to specify a revision from a branch instead of only the main trunk. Index: updateimap.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/updateimap.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** updateimap.nsi 30 May 2006 14:12:04 -0000 1.5 --- updateimap.nsi 7 Nov 2006 15:38:46 -0000 1.6 *************** *** 5,9 **** # or the version specified on the command-line. This utility is intended # for use with an existing POPFile 0.22.x installation (the IMAP module ! # is still 'experimental' so it is not shipped with the 0.22.0 release). # # Copyright (c) 2004-2006 John Graham-Cumming --- 5,10 ---- # or the version specified on the command-line. This utility is intended # for use with an existing POPFile 0.22.x installation (the IMAP module ! # is still 'experimental' so it was not shipped with the 0.22.0 or 0.22.1 ! # releases). # # Copyright (c) 2004-2006 John Graham-Cumming *************** *** 26,41 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 27,42 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.21" compiler, ! ; released 20 October 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.21_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.21 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 79,83 **** # updateimap.exe /revision=1.4 # ! # To get the most recent version without knowing its revision number, use the command: # # updateimap.exe /revision=1.999 --- 80,85 ---- # updateimap.exe /revision=1.4 # ! # To get the most recent version from the main CVS trunk without knowing its revision number, ! # use the command: # # updateimap.exe /revision=1.999 *************** *** 93,100 **** ;-------------------------------------------------------------------------- ! ; Select LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- ! SetCompressor lzma ;-------------------------------------------------------------------------- --- 95,102 ---- ;-------------------------------------------------------------------------- ! ; Select SOLID LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- ! SetCompressor /SOLID lzma ;-------------------------------------------------------------------------- *************** *** 121,125 **** Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.9" ; Mention the wizard's version number in the window title --- 123,127 ---- Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.10" ; Mention the wizard's version number in the window title *************** *** 153,157 **** ;-------------------------------------------------------------------------- ! !define C_PRE_23_COMPATIBLE_VERSION "1.9.4.2" #-------------------------------------------------------------------------- --- 155,159 ---- ;-------------------------------------------------------------------------- ! !define C_PRE_23_COMPATIBLE_VERSION "1.9.4.3" #-------------------------------------------------------------------------- *************** *** 393,397 **** !insertmacro PLS_TEXT PIU_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PIU_LANG_WELCOME_TEXT "This utility will download the POPFile IMAP module from CVS.${IO_NL}${IO_NL}Normally it will download the most up-to-date version, but you can request a particular version by starting the utility with the /revision=1.x option (where x is the revision of interest).${IO_NL}${IO_NL}For example: updateimap.exe /revision=1.5${IO_NL}${IO_NL}For the most recent revision, set x to a huge number like 999${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL} WARNING:${IO_NL}${IO_NL} PLEASE SHUT DOWN POPFILE NOW !${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL}$_CLICK" ;-------------------------------------------------------------------------- --- 395,399 ---- !insertmacro PLS_TEXT PIU_LANG_WELCOME_TITLE "Welcome to the $(^NameDA) Wizard" ! !insertmacro PLS_TEXT PIU_LANG_WELCOME_TEXT "This utility will download the POPFile IMAP module from CVS.${IO_NL}${IO_NL}Normally it will download the most up-to-date version, but you can request a particular version by starting the utility with the /revision=1.x option (where x is the revision of interest).${IO_NL}${IO_NL}Example (a): updateimap.exe /revision=1.5${IO_NL}Example (b): updateimap.exe /revision=1.2.3.4${IO_NL}${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL} WARNING:${IO_NL}${IO_NL} PLEASE SHUT DOWN POPFILE NOW !${IO_NL}~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~${IO_NL}${IO_NL}$_CLICK" ;-------------------------------------------------------------------------- *************** *** 465,472 **** !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_1 "Invalid command-line option supplied ($G_PLS_FIELD_1)" !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_2 "Usage examples:" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_3 "(to get the most up-to-date revision using CVS data)" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_4 "(where x is the required revision number, starting at 1)" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_5 "To get the most recent revision, set x to a huge number like 999" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_ALL "$(PIU_LANG_MB_BADOPTION_1)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_2)${MB_NL}${MB_NL}updateimap.exe${MB_NL}$(PIU_LANG_MB_BADOPTION_3)${MB_NL}${MB_NL}or${MB_NL}${MB_NL}updateimap.exe /revision=1.x${MB_NL}$(PIU_LANG_MB_BADOPTION_4)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_5)" !insertmacro PLS_TEXT PIU_LANG_ANALYSISFAILED_1 "Sorry, unable to determine the most recent revision!" --- 467,473 ---- !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_1 "Invalid command-line option supplied ($G_PLS_FIELD_1)" !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_2 "Usage examples:" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_3 "(to get the most up-to-date compatible revision)" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_4 "(where 1.x is the required revision number, eg 1.5 or 1.2.3.4)" ! !insertmacro PLS_TEXT PIU_LANG_MB_BADOPTION_ALL "$(PIU_LANG_MB_BADOPTION_1)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_2)${MB_NL}${MB_NL}updateimap.exe${MB_NL}$(PIU_LANG_MB_BADOPTION_3)${MB_NL}${MB_NL}or${MB_NL}${MB_NL}updateimap.exe /revision=1.x${MB_NL}$(PIU_LANG_MB_BADOPTION_4)" !insertmacro PLS_TEXT PIU_LANG_ANALYSISFAILED_1 "Sorry, unable to determine the most recent revision!" *************** *** 558,566 **** StrCmp ${L_TEMP} "/revision=1." 0 bad_option StrCpy $G_REVISION $G_REVISION "" 12 Push $G_REVISION ! Call PFI_StrCheckDecimal Pop $G_REVISION StrCmp $G_REVISION "" bad_option - IntCmp $G_REVISION 0 bad_option bad_option StrCpy $G_REVISION "1.$G_REVISION" --- 559,567 ---- StrCmp ${L_TEMP} "/revision=1." 0 bad_option StrCpy $G_REVISION $G_REVISION "" 12 + StrCmp $G_REVISION "" bad_option Push $G_REVISION ! Call CheckRevisionNumber Pop $G_REVISION StrCmp $G_REVISION "" bad_option StrCpy $G_REVISION "1.$G_REVISION" *************** *** 576,579 **** --- 577,594 ---- #-------------------------------------------------------------------------- + # Installer Function: .onGUIEnd + # + # Called right after the installer window closes. This workaround might help + # ensure that all of the temporary files created by this utility get deleted + #-------------------------------------------------------------------------- + + Function .onGUIEnd + + SetOutPath "$TEMP" + + FunctionEnd + + + #-------------------------------------------------------------------------- # Installer Section: POPFile IMAP component # *************** *** 676,682 **** DetailPrint "$(PIU_LANG_ANALYSISFAILED_3)" DetailPrint "$(PIU_LANG_MB_BADOPTION_4)" ! DetailPrint "" ! DetailPrint "$(PIU_LANG_MB_BADOPTION_5)" ! MessageBox MB_OK|MB_ICONSTOP "$(PIU_LANG_MB_ANALYSISFAILED)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_4)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_5)" Goto error_exit --- 691,695 ---- DetailPrint "$(PIU_LANG_ANALYSISFAILED_3)" DetailPrint "$(PIU_LANG_MB_BADOPTION_4)" ! MessageBox MB_OK|MB_ICONSTOP "$(PIU_LANG_MB_ANALYSISFAILED)${MB_NL}${MB_NL}$(PIU_LANG_MB_BADOPTION_4)" Goto error_exit *************** *** 947,950 **** --- 960,1037 ---- #-------------------------------------------------------------------------- + # Installer Function: CheckRevisionNumber + # + # This function performs some simple checks on the IMAP.pm revision number supplied on the + # command-line by the user. Revision numbers for the main trunk are in the form 1.xxx but + # the numbers used on the branches have more than one decimal point (e.g. 1.9.4.3) + # + # Inputs: + # (top of stack) - the string to be checked + # + # Outputs: + # (top of stack) - the input string (if valid) or "" (if invalid) + # + # Usage: + # + # Push "1.234" + # Call CheckRevisionNumber + # Pop $R0 + # ($R0 at this point is "1.234") + # + # Push "1.234-A" + # Call CheckRevisionNumber + # Pop $R0 + # ($R0 at this point is "") + + #-------------------------------------------------------------------------- + + Function CheckRevisionNumber + + !define VALID_CHAR "0123456789." ; string defining the valid characters + !define BAD_OFFSET 11 ; length of VALID_CHAR string + + Exch $0 ; The input string + Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) + Push $2 ; A character from the input string + Push $3 ; The offset to a character in the "validity check" string + Push $4 ; A character from the "validity check" string + Push $5 ; Holds the current "validity check" string + + StrCpy $1 "" + + next_input_char: + StrCpy $2 $0 1 ; Get the next character from the input string + StrCmp $2 "" done + StrCpy $5 ${VALID_CHAR}$2 ; Add it to end of "validity check" to guarantee a match + StrCpy $0 $0 "" 1 + StrCpy $3 -1 + + next_valid_char: + IntOp $3 $3 + 1 + StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) + StrCmp $2 $4 0 next_valid_char + IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad + StrCpy $1 $1$4 ; Add "valid" character to the result + goto next_input_char + + invalid: + StrCpy $1 "" + + done: + StrCpy $0 $1 ; Result is either a decimal number string or "" + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Exch $0 ; place result on top of the stack + + !undef VALID_CHAR + !undef BAD_OFFSET + + FunctionEnd + + + #-------------------------------------------------------------------------- # End of 'updatemap.nsi' #-------------------------------------------------------------------------- |
|
From: Manni H. <man...@us...> - 2006-11-06 15:05:59
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv692 Modified Files: Tag: b0_22_2 IMAP.pm Log Message: Backport bugfix to 0.22 Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.9.4.2 retrieving revision 1.9.4.3 diff -C2 -d -r1.9.4.2 -r1.9.4.3 *** IMAP.pm 10 Feb 2006 15:31:20 -0000 1.9.4.2 --- IMAP.pm 6 Nov 2006 15:05:53 -0000 1.9.4.3 *************** *** 274,278 **** $self->connect_folders__(); ! # Reset the hash containing the hash values we have seen the # last time through service. $self->{hash_values__} = (); --- 274,278 ---- $self->connect_folders__(); ! # Reset the hash containing the hash values we have seen the # last time through service. $self->{hash_values__} = (); *************** *** 294,297 **** --- 294,300 ---- if ( $@ =~ /The connection to the IMAP server was lost/ ) { $self->log_( 0, $@ ); + + # If we caught an exception, we better reset training_mode + $self->config_( 'training_mode', 0 ); } # If we didn't die but somebody else did, we have empathy. *************** *** 1098,1101 **** --- 1101,1106 ---- # No! commit suicide. $self->log_( 0, "Got a folder ($imap_or_folder) with no attached socket in say!" ); + my ($package, $filename, $line, $subroutine, $hasargs, $wantarray, $evaltext, $is_require, $hints, $bitmask) = caller 1; + $self->log_( 0, "Got this after being called by $subroutine." ); die( "The connection to the IMAP server was lost. Could not talk to the server." ); } *************** *** 2310,2324 **** foreach my $folder ( keys %{$self->{folders__}} ) { - - # Set uidnext value to 1. We will train on all messages. - $self->uid_next__( $folder, 1 ); - my @uids = $self->get_new_message_list( $folder ); my $bucket = $self->{folders__}{$folder}{output}; ! # Skip pseudobuckets and the INBOX next if $self->{classifier__}->is_pseudo_bucket( $self->{api_session__}, $bucket ); next if $folder eq 'INBOX'; ! $self->log_( 0, "Training on messages in folder $folder to bucket $bucket." ); foreach my $msg ( @uids ) { --- 2315,2329 ---- foreach my $folder ( keys %{$self->{folders__}} ) { my $bucket = $self->{folders__}{$folder}{output}; ! # Skip pseudobuckets and the INBOX next if $self->{classifier__}->is_pseudo_bucket( $self->{api_session__}, $bucket ); next if $folder eq 'INBOX'; ! # Set uidnext value to 1. We will train on all messages. ! $self->uid_next__( $folder, 1 ); ! my @uids = $self->get_new_message_list( $folder ); ! ! $self->log_( 0, "Training on " . ( scalar @uids ) . " messages in folder $folder to bucket $bucket." ); foreach my $msg ( @uids ) { |
|
From: naoki i. <am...@us...> - 2006-10-23 14:05:29
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29448/POPFile Modified Files: Tag: b0_22_2 Configuration.pm Log Message: Following Japanese support: - Performance update for convert_encoding. - Fix the problem with HTML entity. - Clear the character set per mail to avoid using the wrong charsets. - Fix the problem that 'uninitialized value' warnings occur on Japanese environment. Index: Configuration.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v retrieving revision 1.51.4.2 retrieving revision 1.51.4.3 diff -C2 -d -r1.51.4.2 -r1.51.4.3 *** Configuration.pm 7 Feb 2006 08:38:53 -0000 1.51.4.2 --- Configuration.pm 23 Oct 2006 14:05:20 -0000 1.51.4.3 *************** *** 662,666 **** } ! return $self->{configuration_parameters__}{$name}{value}; } --- 662,672 ---- } ! # If $self->{configuration_parameters__}{$name} is undefined, simply ! # return undef to avoid defining $self->{configuration_parameters__}{$name}. ! if ( defined($self->{configuration_parameters__}{$name}) ) { ! return $self->{configuration_parameters__}{$name}{value}; ! } else { ! return undef; ! } } |
|
From: naoki i. <am...@us...> - 2006-10-23 14:05:25
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29448/Classifier Modified Files: Tag: b0_22_2 MailParse.pm Log Message: Following Japanese support: - Performance update for convert_encoding. - Fix the problem with HTML entity. - Clear the character set per mail to avoid using the wrong charsets. - Fix the problem that 'uninitialized value' warnings occur on Japanese environment. Index: MailParse.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v retrieving revision 1.216.4.6 retrieving revision 1.216.4.7 diff -C2 -d -r1.216.4.6 -r1.216.4.7 *** MailParse.pm 9 Feb 2006 00:25:31 -0000 1.216.4.6 --- MailParse.pm 23 Oct 2006 14:05:19 -0000 1.216.4.7 *************** *** 572,578 **** if ( defined( $to ) ) { ! # HTML entities confilict with DBCS chars. Replace entities with blanks. ! if ( $self->{lang__} eq 'Korean' ) { $to = ' '; } else { --- 572,578 ---- if ( defined( $to ) ) { ! # HTML entities confilict with DBCS and EUC-JP chars. Replace entities with blanks. ! if ( $self->{lang__} eq 'Korean' || $self->{lang__} eq 'Nihongo' ) { $to = ' '; } else { *************** *** 1539,1542 **** --- 1539,1545 ---- $self->{colorized__} .= "<tt>" if ( $self->{color__} ne '' ); + # Clear the character set to avoid using the wrong charsets + $self->{charset__} = ''; + # Since Text::Kakasi is not thread-safe, we use it under the # control of a Mutex to avoid a crash if we are running on *************** *** 1641,1650 **** } - # Decode \x?? - if ( $self->{lang__} eq 'Nihongo' && !$self->{in_headers__} ) { - $line =~ s/\\x([8-9A-F][A-F0-9])/pack("C", hex($1))/eig; - } - if ( $self->{lang__} eq 'Nihongo' ) { $line = convert_encoding( $line, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); $line = parse_line_with_kakasi( $self, $line ); --- 1644,1653 ---- } if ( $self->{lang__} eq 'Nihongo' ) { + # Decode \x?? + if ( !$self->{in_headers__} ) { + $line =~ s/\\x([8-9A-F][A-F0-9])/pack("C", hex($1))/eig; + } + $line = convert_encoding( $line, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); $line = parse_line_with_kakasi( $self, $line ); *************** *** 2480,2483 **** --- 2483,2489 ---- my ( $string, $from, $to, $default, @candidates ) = @_; + # If the string contains only ascii characters, do nothing + return $string if ( $string =~ /^[\r\n\t\x20-\x7E]*$/ ); + require Encode; require Encode::Guess; |
|
From: Brian S. <xue...@us...> - 2006-09-28 18:30:10
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11375 Modified Files: Tag: b0_22_2 adduser-Uninstall.nsh adduser-Version.nsh adduser.nsi Log Message: Introduce a new Start Menu entry which uses the Message Capture utility to start POPFile. This makes it much easier to use that utility, especially on Windows 9x systems. Index: adduser-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** adduser-Uninstall.nsh 6 Feb 2006 16:26:03 -0000 1.2.2.4 --- adduser-Uninstall.nsh 28 Sep 2006 18:30:06 -0000 1.2.2.5 *************** *** 468,471 **** --- 468,472 ---- Delete "$G_USERDIR\Run SQLite utility.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Check database status.lnk" + Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Message Capture utility.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile Data ($G_WINUSERNAME).lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\User Data ($G_WINUSERNAME).lnk" Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.7 retrieving revision 1.6.2.8 diff -C2 -d -r1.6.2.7 -r1.6.2.8 *** adduser-Version.nsh 29 Aug 2006 15:49:19 -0000 1.6.2.7 --- adduser-Version.nsh 28 Sep 2006 18:30:06 -0000 1.6.2.8 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.0" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.1" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.8 retrieving revision 1.59.4.9 diff -C2 -d -r1.59.4.8 -r1.59.4.9 *** adduser.nsi 29 Aug 2006 15:51:12 -0000 1.59.4.8 --- adduser.nsi 28 Sep 2006 18:30:06 -0000 1.59.4.9 *************** *** 1240,1244 **** pfidiag_entries: ! IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 dbstatus_check Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL --- 1240,1244 ---- pfidiag_entries: ! IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 msgcapture_entry Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL *************** *** 1252,1256 **** "$G_ROOTDIR\pfidiag.exe" "/shortcut" ! dbstatus_check: IfFileExists "$G_ROOTDIR\pfidbstatus.exe" 0 silent_shutdown Push $G_USERDIR --- 1252,1260 ---- "$G_ROOTDIR\pfidiag.exe" "/shortcut" ! msgcapture_entry: ! SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Message Capture utility.lnk" NORMAL ! CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\Message Capture utility.lnk" \ ! "$G_ROOTDIR\runpopfile.exe" "/msgcapture" ! IfFileExists "$G_ROOTDIR\pfidbstatus.exe" 0 silent_shutdown Push $G_USERDIR |
|
From: Brian S. <xue...@us...> - 2006-09-28 18:28:11
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11006 Modified Files: Tag: b0_22_2 runpopfile.nsi Log Message: Introduce a new command-line option (/msgcapture) which starts POPFile via the Message Capture utility. This makes it much easier to use that utility, especially on Windows 9x systems which previously may have required some manual adjustment before the POPFILE_ROOT and POPFILE_USER environment variables could be defined successfully. Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.4 retrieving revision 1.11.4.5 diff -C2 -d -r1.11.4.4 -r1.11.4.5 *** runpopfile.nsi 29 Aug 2006 15:59:40 -0000 1.11.4.4 --- runpopfile.nsi 28 Sep 2006 18:28:06 -0000 1.11.4.5 *************** *** 64,68 **** # (or have not yet used) POPFile). The switch can be in uppercase or lowercase. # ! # This switch cannot be combined with the '/config' switch. # # --------------------------------------------------------------------------------------- --- 64,68 ---- # (or have not yet used) POPFile). The switch can be in uppercase or lowercase. # ! # This switch cannot be combined with the '/config' or '/msgcapture' switches. # # --------------------------------------------------------------------------------------- *************** *** 86,90 **** # These temporary changes will override any existing values in these environment variables. # ! # This switch cannot be combined with the '/startup' switch. # #------------------------------------------------------------------------------------------- --- 86,101 ---- # These temporary changes will override any existing values in these environment variables. # ! # This switch cannot be combined with the '/startup' or '/msgcapture' switches. ! # ! # --------------------------------------------------------------------------------------- ! # ! # /msgcapture ! # ! # By default POPFile runs without showing the console window. This command-line switch forces ! # the utility to use the Message Capture utility in order to make it easy to see (and save) ! # POPFile's console messages which are normally hidden from view. This switch makes it much ! # easier for users (especially those using Windows 9x) to capture these console messages. ! # ! # This switch cannot be combined with the '/startup' or '/config=path' switches. # #------------------------------------------------------------------------------------------- *************** *** 106,110 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.0" !define C_OUTFILE "runpopfile.exe" --- 117,121 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.1" !define C_OUTFILE "runpopfile.exe" *************** *** 220,223 **** --- 231,235 ---- StrCmp ${L_PARAMS} "" use_reg_dirdata StrCmp ${L_PARAMS} "/startup" use_reg_dirdata + StrCmp ${L_PARAMS} "/msgcapture" use_reg_dirdata StrCpy ${L_TEMP} ${L_PARAMS} 8 StrCmp ${L_TEMP} "/config=" extract_config_path *************** *** 390,393 **** --- 402,420 ---- start_popfile: + StrCmp ${L_PARAMS} "/msgcapture" 0 look_for_pfimsgcapture + IfFileExists "${L_EXEFILE}\msgcapture.exe" run_capture_mode + IfFileExists "${L_EXEFILE}\pfimsgcapture.exe" run_debug_mode + MessageBox MB_OK|MB_ICONSTOP "Error: Unable to start Message Capture utility !\ + ${MB_NL}${MB_NL}\ + Cannot find\ + ${MB_NL}\ + ${L_EXEFILE}\msgcapture.exe\ + ${MB_NL}\ + or\ + ${MB_NL}\ + ${L_EXEFILE}\pfimsgcapture.exe" + Goto exit + + look_for_pfimsgcapture: IfFileExists "${L_EXEFILE}\pfimsgcapture.exe" 0 run_normal_mode IfFileExists "${L_PFI_USER}\popfile.cfg" 0 run_normal_mode *************** *** 428,431 **** --- 455,462 ---- Goto exit + run_capture_mode: + Exec '"${L_EXEFILE}\msgcapture.exe" /TIMEOUT=0' + Goto exit + bad_root_error: IfFileExists "${L_EXEFILE}\adduser.exe" can_add_root |
|
From: Brian S. <xue...@us...> - 2006-09-14 13:55:45
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3324 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: IO::Socket::SSL v1.01 (released yesterday) is not compatible with the Windows version of POPFile 0.22.4 so the SSL Setup wizard has been updated to cope with this. Patch problems are now reported instead of simply being logged. Updated to use the latest version of the Inetc plugin. By default the install details are hidden and in order to avoid a strange looking display the "Show Details" button is disabled whilst downloading the SSL files (for some reason the new version of Inetc does not hide that button). Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.7 retrieving revision 1.6.2.8 diff -C2 -d -r1.6.2.7 -r1.6.2.8 *** getssl.nsh 29 Aug 2006 15:52:48 -0000 1.6.2.7 --- getssl.nsh 14 Sep 2006 13:55:38 -0000 1.6.2.8 *************** *** 17,20 **** --- 17,24 ---- # be applied to downgrade the relevant file to the compatible v0.97 version. # + # On 13 September 2006 the University of Winnipeg repository was updated to + # provide IO::Socket::SSL v1.01 which is not compatible with POPFile so this + # utility will apply a patch to downgrade this to the compatible v0.97 version. + # # Copyright (c) 2005-2006 John Graham-Cumming # *************** *** 87,94 **** --- 91,100 ---- ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat ; GenPat.exe SSL_0.999.pm SSL_0.97.pm SSL_pm.pat + ; GenPat.exe SSL_1.01.pm SSL_0.97.pm SSL_pm.pat ; ; where SSL_0.97.pm was the SSL.pm file from v0.97 of the IO::Socket:SSL module ; and SSL_0.99.pm was the SSL.pm file from v0.99 of the IO::Socket:SSL module ; and SSL_0.999.pm was the SSL.pm file from v0.999 of the IO::Socket:SSL module + ; and SSL_1.01.pm was the SSL.pm file from v1.01 of the IO::Socket:SSL module #-------------------------------------------------------------------------- *************** *** 299,303 **** DetailPrint "" - StrCmp $G_PLS_FIELD_2 "No suitable patches were found" label_a StrCmp $G_PLS_FIELD_2 "OK" 0 show_downgrade_status !insertmacro PFI_BACKUP_123_DP "$G_PLS_FIELD_1" "SSL.pm" --- 305,308 ---- *************** *** 440,443 **** --- 445,452 ---- Pop $G_SSL_FILEURL + !define L_DLG_ITEM $R9 + + Push ${L_DLG_ITEM} + StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL Push $G_PLS_FIELD_1 *************** *** 451,456 **** --- 460,479 ---- DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" + + ; The current version of the Inetc plugin (dated 8 September 2006) leaves the "Show Details" + ; button in view so we temporarily disable it during the download to avoid a messy display + ; (if the user has already clicked the button then they'll just need to put up with the mess) + + FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT + GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x403 + EnableWindow ${L_DLG_ITEM} 0 + inetc::get /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END Pop $G_PLS_FIELD_2 + + ; Enable the "Show Details" button now that the download has been completed + + EnableWindow ${L_DLG_ITEM} 1 + StrCmp $G_PLS_FIELD_2 "OK" file_received SetDetailsPrint both *************** *** 471,474 **** --- 494,501 ---- file_received: + Pop ${L_DLG_ITEM} + + !undef L_DLG_ITEM + FunctionEnd |
|
From: Brian S. <xue...@us...> - 2006-09-14 13:54:23
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2938 Modified Files: Tag: b0_22_2 SSL_pm.pat Log Message: Updated to downgrade IO::Socket::SSL's SSL.pm file from v1.01 to v0.97 to make it compatible with the Windows version of POPFile 0.22.4 Index: SSL_pm.pat =================================================================== RCS file: /cvsroot/popfile/windows/Attic/SSL_pm.pat,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvs8lWyn6 and /tmp/cvsRmYwju differ |
|
From: Brian S. <xue...@us...> - 2006-09-14 13:53:40
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2570 Modified Files: Tag: b0_22_2 addssl.nsi Log Message: The "getssl.nsh" INCLUDE file is the best place for most of the information about the patches required to make the SSL Support files from the University of Winnipeg repository compatible with the Windows version of POPFile 0.22.4 Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -C2 -d -r1.3.4.3 -r1.3.4.4 *** addssl.nsi 29 Aug 2006 16:18:39 -0000 1.3.4.3 --- addssl.nsi 14 Sep 2006 13:53:35 -0000 1.3.4.4 *************** *** 16,26 **** # the command "setup.exe /SSL" to run the installer (instead of "setup.exe"). # ! # On 18 July 2006 the University of Winnipeg repository was updated to provide ! # IO::Socket::SSL v0.99 which is not compatible with POPFile so this utility ! # will apply a patch to downgrade this to the compatible v0.97 version. ! # ! # On 18 August 2006 the University of Winnipeg repository was updated to provide ! # IO::Socket::SSL v0.999 which is not compatible with POPFile so this utility ! # will apply a patch to downgrade this to the compatible v0.97 version. # # As a temporary workaround to cope with future "SSL compatibility" issues --- 16,24 ---- # the command "setup.exe /SSL" to run the installer (instead of "setup.exe"). # ! # IO::Socket:SSL v0.97 (released 17 July 2005) is the most recent version which ! # is compatible with the current version of POPFile (0.22.4). IO::Socket::SSL ! # versions 0.99, 0.999 and 1.01 (the most recent, released 13 September 2006) ! # are all incompatible with POPFile 0.22.4 so a patch is applied to downgrade ! # SSL.pm to v0.97 to make it POPFile-compatible (see ..\getssl.nsh for details). # # As a temporary workaround to cope with future "SSL compatibility" issues *************** *** 89,93 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 24 June 2006 12:40 ;------------------------------------------------ --- 87,91 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 8 September 2006 10:13:18 ;------------------------------------------------ *************** *** 138,160 **** ; of the SSL files. ; ! ; On 18 July 2006 'IO::Socket::SSL' was upgraded from v0.97 to v0.99 which causes problems ! ; with POPFile. On 18 August 2006 'IO::Socket::SSL' was upgraded to v0.999 which also causes ! ; POPFile problems. Therefore this utility will automatically downgrade the relevant file ! ; from that module (SSL.pm) from either v0.99 or v0.999 to v0.97 to avoid problems. ! ! ;------------------------------------------------ ! ; How the SSL.pm patch was created ! ;------------------------------------------------ ! ! ; The patch used to downgrade either SSL.pm v0.99 or SSL.pm v0.999 to v0.97 was created ! ; using the VPATCH package which is supplied with NSIS. This special patch was made using ! ; the commands: ! ; ! ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat ! ; GenPat.exe SSL_0.999.pm SSL_0.97.pm SSL_pm.pat ! ; ! ; where SSL_0.97.pm was the SSL.pm file from v0.97 of the IO::Socket:SSL module ! ; and SSL_0.99.pm was the SSL.pm file from v0.99 of the IO::Socket:SSL module ! ; and SSL_0.999.pm was the SSL.pm file from v0.999 of the IO::Socket:SSL module ;------------------------------------------------ --- 136,142 ---- ; of the SSL files. ; ! ; At present (14 September 2006) the University of Winnipeg repository supplies a version of ! ; 'IO::Socket::SSL' which is not compatible with POPFile so a patch is applied to downgrade ! ; the file to make it POPFile-compatible. See the ..\getssl.nsh INCLUDE file for details. ;------------------------------------------------ *************** *** 251,255 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.0" ; Mention the wizard's version number in the window title --- 233,237 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.1" ; Mention the wizard's version number in the window title |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:21:46
|
Update of /cvsroot/popfile/windows/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22941 Modified Files: Tag: b0_22_2 pfi_headerbmp.exe pfi_headerbmpr.exe pfi_modern.exe UI ReadMe Log Message: Customised UIs now based upon NSIS 2.19 (for the POPFile 0.22.5 release) Index: pfi_headerbmp.exe =================================================================== RCS file: /cvsroot/popfile/windows/UI/pfi_headerbmp.exe,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 Binary files /tmp/cvsAX7LQ8 and /tmp/cvsDcOjEN differ Index: pfi_headerbmpr.exe =================================================================== RCS file: /cvsroot/popfile/windows/UI/pfi_headerbmpr.exe,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 Binary files /tmp/cvsURjMZb and /tmp/cvshUXROQ differ Index: UI ReadMe =================================================================== RCS file: /cvsroot/popfile/windows/UI/UI ReadMe,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** UI ReadMe 17 Aug 2004 08:28:00 -0000 1.3 --- UI ReadMe 29 Aug 2006 16:21:44 -0000 1.3.6.1 *************** *** 3,7 **** ============================================================================= ! Last updated: 16 August 2004 (17:24 GMT) ============================================================================= --- 3,7 ---- ============================================================================= ! Last updated: 23 August 2006 (12:34 GMT) ============================================================================= *************** *** 22,26 **** The current versions of these customised UI files are based upon the UI files ! provided in the NSIS 2.0b4 release (dated 19 November 2003). Future updates to the NSIS compiler may not be compatible with these customised --- 22,26 ---- The current versions of these customised UI files are based upon the UI files ! provided in the NSIS 2.19 release (nsis-2.19-setup.exe, dated 6 August 2006). Future updates to the NSIS compiler may not be compatible with these customised *************** *** 50,55 **** Details: ! 'pfi_modern.exe' v1.3 was created by modifying 'modern.exe', NSIS CVS v1.37 ! (dated 24-Oct-2003), as follows: [1] Dialog 111, Control 103 (the icon image) --- 50,55 ---- Details: ! 'pfi_modern.exe' v1.4 was created by modifying 'modern.exe' from the NSIS 2.19 ! release (dated 06-Aug-2006), as follows: [1] Dialog 111, Control 103 (the icon image) *************** *** 123,128 **** ============================================================================= ! 'pfi_headerbmp.exe' v1.3 was created by modifying 'modern_headerbmp.exe', ! NSIS CVS v1.6 (dated 12-Oct-2003), as follows: [1] Dialog 105, Control 1037 (the TITLE text area) --- 123,128 ---- ============================================================================= ! 'pfi_headerbmp.exe' v1.4 was created by modifying 'modern_headerbmp.exe' from ! the NSIS 2.19 release (dated 06-Aug-2006), as follows: [1] Dialog 105, Control 1037 (the TITLE text area) *************** *** 172,177 **** ============================================================================= ! 'pfi_headerbmpr.exe' v1.3 was created by modifying 'modern_headerbmpr.exe', ! NSIS CVS v1.6 (dated 12-Oct-2003), as follows: [1] Dialog 105, Control 1037 (the TITLE text area) --- 172,177 ---- ============================================================================= ! 'pfi_headerbmpr.exe' v1.4 was created by modifying 'modern_headerbmpr.exe' ! from the NSIS 2.19 release (dated 06-Aug-2006), as follows: [1] Dialog 105, Control 1037 (the TITLE text area) Index: pfi_modern.exe =================================================================== RCS file: /cvsroot/popfile/windows/UI/pfi_modern.exe,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 Binary files /tmp/cvsRkJQ2d and /tmp/cvsXGB6US differ |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:20:46
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22479 Removed Files: Tag: b0_22_2 zerobyte.file Log Message: This file is no longer required - getssl.nsh has been modified to always use the copy in the main installer directory ('windows'). --- zerobyte.file DELETED --- |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:18:46
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21646 Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Version Information now includes a trademark statement and has the build year updated automatically. Switched from the standard NSISdl plugin to the Inetc plugin since it offers much better proxy support and also better support for dial-up connections. No longer need to ping the remote site to detect if the target system is connected to the Internet. Vpatch used when installing SSL Support files from the University of Winnipeg repository. IO::Socket::SSL v0.99 and v0.999 are not compatible with POPFile 0.22.x so this patch is used to downgrade the SSL.pm file to v0.97 which is compatible. New /BUILTIN command-line option added to cope with the inevitable delay between incompatible SSL Support files appearing in the University of Winnipeg repository and this wizard and/or POPFile being updated to work with these new SSL files. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** addssl.nsi 6 Feb 2006 14:46:36 -0000 1.3.4.2 --- addssl.nsi 29 Aug 2006 16:18:39 -0000 1.3.4.3 *************** *** 16,19 **** --- 16,31 ---- # the command "setup.exe /SSL" to run the installer (instead of "setup.exe"). # + # On 18 July 2006 the University of Winnipeg repository was updated to provide + # IO::Socket::SSL v0.99 which is not compatible with POPFile so this utility + # will apply a patch to downgrade this to the compatible v0.97 version. + # + # On 18 August 2006 the University of Winnipeg repository was updated to provide + # IO::Socket::SSL v0.999 which is not compatible with POPFile so this utility + # will apply a patch to downgrade this to the compatible v0.97 version. + # + # As a temporary workaround to cope with future "SSL compatibility" issues + # the command-line option /BUILTIN forces the wizard to install the old SSL + # files which are normally only used with POPFile 0.22.0, 0.22.1 and 0.22.3. + # # The version of Module.pm distributed with POPFile 0.22.0 results in extremely # slow message downloads (e.g. 6 minutes for a 2,713 byte msg) so this utility *************** *** 43,58 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 55,70 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 64,67 **** --- 76,95 ---- ;------------------------------------------------ + ; This script requires the 'Inetc' NSIS plugin + ;------------------------------------------------ + + ; This script uses a special NSIS plugin (inetc) to download the SSL files. This plugin + ; has much better proxy support than the standard NSISdl plugin shipped with NSIS. + ; + ; The 'NSIS Wiki' page for the 'Inetc' plugin (description, example and download links): + ; http://nsis.sourceforge.net/Inetc_plug-in + ; + ; To compile this script, copy the 'inetc.dll' file to the standard NSIS plugins folder + ; (${NSISDIR}\Plugins\). The 'Inetc' source and example files can be unzipped to the + ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. + ; + ; Tested with the inetc.dll plugin timestamped 24 June 2006 12:40 + + ;------------------------------------------------ ; This script requires the 'untgz' NSIS plugin ;------------------------------------------------ *************** *** 106,112 **** ; (4) ssl-0.22.x\ssleay32.dll (dated 23-Dec-2004) ; ! ; POPFile 0.22.3 is based upon ActivePerl 5.8.7 Build 813 so it will be safe to download the ! ; latest versions of the SSL files if the 'SSL Setup' wizard is used to add SSL support to a ! ; system which uses a minimal Perl version of 5.8.7 or higher. ;------------------------------------------------ --- 134,160 ---- ; (4) ssl-0.22.x\ssleay32.dll (dated 23-Dec-2004) ; ! ; POPFile 0.22.3 and 0.22.4 are based upon ActivePerl 5.8.7 (Builds 813 & 815 respectively). ! ; Up until 18 July 2006 is was safe for POPFile 0.22.3 and 0.22.4 to use the latest versions ! ; of the SSL files. ! ; ! ; On 18 July 2006 'IO::Socket::SSL' was upgraded from v0.97 to v0.99 which causes problems ! ; with POPFile. On 18 August 2006 'IO::Socket::SSL' was upgraded to v0.999 which also causes ! ; POPFile problems. Therefore this utility will automatically downgrade the relevant file ! ; from that module (SSL.pm) from either v0.99 or v0.999 to v0.97 to avoid problems. ! ! ;------------------------------------------------ ! ; How the SSL.pm patch was created ! ;------------------------------------------------ ! ! ; The patch used to downgrade either SSL.pm v0.99 or SSL.pm v0.999 to v0.97 was created ! ; using the VPATCH package which is supplied with NSIS. This special patch was made using ! ; the commands: ! ; ! ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat ! ; GenPat.exe SSL_0.999.pm SSL_0.97.pm SSL_pm.pat ! ; ! ; where SSL_0.97.pm was the SSL.pm file from v0.97 of the IO::Socket:SSL module ! ; and SSL_0.99.pm was the SSL.pm file from v0.99 of the IO::Socket:SSL module ! ; and SSL_0.999.pm was the SSL.pm file from v0.999 of the IO::Socket:SSL module ;------------------------------------------------ *************** *** 116,132 **** ; The patch used to update Module.pm v1.40 to v1.41 was created using the VPATCH package ; which is supplied with NSIS. The command used to create the patch was: ; GenPat.exe Module.pm Module_ssl.pm Module_ssl.pat ; where Module.pm was CVS version 1.40 and Module_ssl.pm was CVS version 1.41. #-------------------------------------------------------------------------- ! # Language Support NSIS Compiler Warnings #-------------------------------------------------------------------------- # ! # Expect 3 compiler warnings, all related to standard NSIS language files which are ! # out-of-date (if the default multi-language 'SSL Setup' wizard is compiled). # ! # There may be further warnings which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or ! # more language tables. The '..\pfi-languages.nsh' file lists all of the language table codes ! # used by the POPFile installer and other NSIS-based utilities. # # NOTE: The language selection menu order used in this script assumes that the NSIS MUI --- 164,202 ---- ; The patch used to update Module.pm v1.40 to v1.41 was created using the VPATCH package ; which is supplied with NSIS. The command used to create the patch was: + ; ; GenPat.exe Module.pm Module_ssl.pm Module_ssl.pat + ; ; where Module.pm was CVS version 1.40 and Module_ssl.pm was CVS version 1.41. #-------------------------------------------------------------------------- ! # Optional run-time command-line switch (used by 'addssl.exe') #-------------------------------------------------------------------------- # ! # /BUILTIN # ! # For POPFile 0.22.3 (and later) releases this wizard will download and, if necessary, patch ! # the SSL support files from the University of Winnipeg repository. However there will always ! # be some delay between the repository being updated with SSL files which are not compatible ! # with POPFile and the generation of an updated version of this wizard. ! # ! # The /BUILTIN switch provides an easy way to force the installation of the old SSL support ! # files normally used only for the POPFile 0.22.0, 0.22.1 and 0.22.2 releases as a workaround ! # until this wizard can be updated to handle the new SSL support files. ! # ! # To force the installation of the old SSL support files use the following command: ! # ! # addssl.exe /BUILTIN ! # ! # (the option is not case-sensitive so the command 'addssl.exe /builtin' can be used instead) ! #-------------------------------------------------------------------------- ! ! #-------------------------------------------------------------------------- ! # Language Support NSIS Compiler Warnings ! #-------------------------------------------------------------------------- ! # ! # Normally no NSIS compiler warnings are expected. However there may be some warnings ! # which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or more language tables. ! # These "PFI_LANG_NSISDL_PLURAL" warnings can be safely ignored (at present only the ! # 'Japanese-pfi.nsh' file generates this warning). # # NOTE: The language selection menu order used in this script assumes that the NSIS MUI *************** *** 154,161 **** ;-------------------------------------------------------------------------- ! ; Select LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- ! SetCompressor lzma ;-------------------------------------------------------------------------- --- 224,231 ---- ;-------------------------------------------------------------------------- ! ; Select "Solid" LZMA compression (to generate smallest EXE file) ;-------------------------------------------------------------------------- ! SetCompressor /SOLID lzma ;-------------------------------------------------------------------------- *************** *** 181,185 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.1.5" ; Mention the wizard's version number in the window title --- 251,255 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.0" ; Mention the wizard's version number in the window title *************** *** 245,252 **** VIProductVersion "${C_PFI_VERSION}.0" VIAddVersionKey "ProductName" "POPFile SSL Setup wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22 or later" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 315,325 ---- VIProductVersion "${C_PFI_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "POPFile SSL Setup wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Installs SSL support for POPFile 0.22 or later" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" *************** *** 476,479 **** --- 549,554 ---- !insertmacro MUI_RESERVEFILE_LANGDLL !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ReserveFile "${NSISDIR}\Plugins\DumpLog.dll" + ReserveFile "${NSISDIR}\Plugins\inetc.dll" ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" ReserveFile "${NSISDIR}\Plugins\System.dll" *************** *** 588,596 **** StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log ! StrCmp $G_PLS_FIELD_1 "OK" 0 show_status !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm" SetDetailsPrint none Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm" ! IfFileExists "$G_ROOTDIR\POPFile\Module.pm" success Rename "$G_ROOTDIR\POPFile\Module.pm.bk1" "$G_ROOTDIR\POPFile\Module.pm" SetDetailsPrint listonly --- 663,671 ---- StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log ! StrCmp $G_PLS_FIELD_1 "OK" 0 show_speedup_status !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm" SetDetailsPrint none Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm" ! IfFileExists "$G_ROOTDIR\POPFile\Module.pm" speedup_success Rename "$G_ROOTDIR\POPFile\Module.pm.bk1" "$G_ROOTDIR\POPFile\Module.pm" SetDetailsPrint listonly *************** *** 607,616 **** Abort ! success: SetDetailsPrint listonly DetailPrint "$(PSS_LANG_PATCHCOMPLETED)" DetailPrint "" ! show_status: MessageBox MB_OK|MB_ICONEXCLAMATION "$(PSS_LANG_PATCHSTATUS)" --- 682,691 ---- Abort ! speedup_success: SetDetailsPrint listonly DetailPrint "$(PSS_LANG_PATCHCOMPLETED)" DetailPrint "" ! show_speedup_status: MessageBox MB_OK|MB_ICONEXCLAMATION "$(PSS_LANG_PATCHSTATUS)" |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:17:55
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19813 Modified Files: Tag: b0_22_2 PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: Updated for the 0.22.5 release. SSL Support files are now downloaded by the Inetc plugin operating in NSISdl-compatible mode. The new plugin removes the need to ping the remote server to check the connection. Both the installer and the SSL Setup wizard can patch IO::Socket::SSL v0.99 or v0.999 to downgrade SSL.pm to v0.97 which is POPFile-compatible. Outlook Express accounts which use SMTP Authorisation with the POP3 username are now given a separate SMTP username when they are configured to work with POPFile. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Swedish-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- Swedish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.59.4.3 retrieving revision 1.59.4.4 diff -C2 -d -r1.59.4.3 -r1.59.4.4 *** PortugueseBR-pfi.nsh 6 Feb 2006 14:03:46 -0000 1.59.4.3 --- PortugueseBR-pfi.nsh 29 Aug 2006 16:17:51 -0000 1.59.4.4 *************** *** 465,469 **** ; Progress reports - !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKINTERNET "Verificando conexão à Internet..." !insertmacro PFI_LANG_STRING PFI_LANG_PROG_STARTDOWNLOAD "Baixando arquivo $G_PLS_FIELD_1 de $G_PLS_FIELD_2" !insertmacro PFI_LANG_STRING PFI_LANG_PROG_FILECOPY "Copiando $G_PLS_FIELD_2 arquivos..." --- 465,468 ---- *************** *** 476,480 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_INTERNETCONNECT "Os arquivos para Suporte SSL serão baixados da Internet${MB_NL}${MB_NL}Por favor conecte na Internet e clique 'OK'${MB_NL}${MB_NL}ou clique 'Cancelar' para cancelar esta parte da instalação" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "O download do arquivo $G_PLS_FIELD_1 falhou" --- 475,479 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "O download do arquivo $G_PLS_FIELD_1 falhou" *************** *** 486,493 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 485,502 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 736,739 **** --- 745,749 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Reconfiguração do cliente de email cancelada pelo usuário" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 798,801 **** --- 808,812 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "Nome de usuário POP3:" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "Porta POP3:" + !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "correntemente" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigurar esta conta para funcionar com o POPFile ?" Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.44.4.3 retrieving revision 1.44.4.4 diff -C2 -d -r1.44.4.3 -r1.44.4.4 *** TradChinese-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.44.4.3 --- TradChinese-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.44.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 459,463 **** ; 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..." --- 459,462 ---- *************** *** 470,474 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 469,473 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 480,487 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 479,496 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 695,698 **** --- 704,708 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 757,760 **** --- 767,771 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.48.4.3 retrieving revision 1.48.4.4 diff -C2 -d -r1.48.4.3 -r1.48.4.4 *** Spanish-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.48.4.3 --- Spanish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.48.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 464,468 **** ; 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..." --- 464,467 ---- *************** *** 475,479 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 474,478 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 485,492 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 484,501 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 735,738 **** --- 744,748 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 797,800 **** --- 807,811 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** SimpChinese-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- SimpChinese-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 459,463 **** ; 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..." --- 459,462 ---- *************** *** 470,474 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 469,473 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 480,487 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 479,496 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 695,698 **** --- 704,708 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 757,760 **** --- 767,771 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Slovak-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- Slovak-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Russian-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- Russian-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Ukrainian-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- Ukrainian-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.32.4.3 retrieving revision 1.32.4.4 diff -C2 -d -r1.32.4.3 -r1.32.4.4 *** Turkish-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.32.4.3 --- Turkish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.32.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:13:10
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17826 Modified Files: Tag: b0_22_2 German-pfi.nsh Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh Log Message: Updated for the 0.22.5 release. SSL Support files are now downloaded by the Inetc plugin operating in NSISdl-compatible mode. The new plugin removes the need to ping the remote server to check the connection. Both the installer and the SSL Setup wizard can patch IO::Socket::SSL v0.99 or v0.999 to downgrade SSL.pm to v0.97 which is POPFile-compatible. Outlook Express accounts which use SMTP Authorisation with the POP3 username are now given a separate SMTP username when they are configured to work with POPFile. Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.4 retrieving revision 1.54.4.5 diff -C2 -d -r1.54.4.4 -r1.54.4.5 *** Japanese-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.54.4.4 --- Japanese-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.54.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 465,469 **** ; Progress reports - !insertmacro PFI_LANG_STRING PFI_LANG_PROG_CHECKINTERNET "C^[lbgÚ±ð`FbNµÄ¢Ü·..." !insertmacro PFI_LANG_STRING PFI_LANG_PROG_STARTDOWNLOAD "$G_PLS_FIELD_1 ð $G_PLS_FIELD_2 æè_E[hµÄ¢Ü·B" !insertmacro PFI_LANG_STRING PFI_LANG_PROG_FILECOPY "$G_PLS_FIELD_2 ðRs[..." --- 465,468 ---- *************** *** 476,480 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_INTERNETCONNECT "SSLðT|[g·éÌÉKvÈt@CÍC^[lbgæè_E[hµÜ·B${MB_NL}${MB_NL}C^[lbgÉÚ±µÄ'OK'{^ðNbN·é©A${MB_NL}${MB_NL}'LZ' {^ðµÄ±ÌªÌCXg[ìÆðLZµÄ¾³¢B" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "$G_PLS_FIELD_1 t@Cð_E[hūܹñŵ½B" --- 475,479 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "$G_PLS_FIELD_1 t@Cð_E[hūܹñŵ½B" *************** *** 486,493 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 485,502 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 736,739 **** --- 745,749 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "[NCAgÌÝèÏXÍLZ³êܵ½B" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 798,801 **** --- 808,812 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "POP3 [U[¼ :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "POP3 |[g :" + !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "»ÝÌÝè" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "±ÌAJEgÌÝèð POPFile pÉÏXµÜ·©H" Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.48.4.3 retrieving revision 1.48.4.4 diff -C2 -d -r1.48.4.3 -r1.48.4.4 *** German-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.48.4.3 --- German-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.48.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 467,471 **** ; 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..." --- 467,470 ---- *************** *** 478,482 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 477,481 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 488,495 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 487,504 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 738,741 **** --- 747,751 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Die Konfiguration wurde vom Benutzer abgebrochen" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 800,803 **** --- 810,814 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "POP3 Benutzername:" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "POP3 Port:" + !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "aktuell" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Account zur Nutzung mit POPFile konfigurieren ?" Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.29.4.3 retrieving revision 1.29.4.4 diff -C2 -d -r1.29.4.3 -r1.29.4.4 *** Norwegian-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.29.4.3 --- Norwegian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.29.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.44.4.3 retrieving revision 1.44.4.4 diff -C2 -d -r1.44.4.3 -r1.44.4.4 *** Korean-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.44.4.3 --- Korean-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.44.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 465,469 **** ; 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..." --- 465,468 ---- *************** *** 476,480 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 475,479 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 486,493 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 485,502 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 736,739 **** --- 745,749 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 798,801 **** --- 808,812 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Portuguese-pfi.nsh 6 Feb 2006 14:16:32 -0000 1.43.4.3 --- Portuguese-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.33.4.3 retrieving revision 1.33.4.4 diff -C2 -d -r1.33.4.3 -r1.33.4.4 *** Italian-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.33.4.3 --- Italian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.33.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Hungarian-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.43.4.3 --- Hungarian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.36.4.3 retrieving revision 1.36.4.4 diff -C2 -d -r1.36.4.3 -r1.36.4.4 *** Polish-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.36.4.3 --- Polish-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.36.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.35.4.3 retrieving revision 1.35.4.4 diff -C2 -d -r1.35.4.3 -r1.35.4.4 *** Greek-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.35.4.3 --- Greek-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.35.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:07:44
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15947 Modified Files: Tag: b0_22_2 Arabic-pfi.nsh Bulgarian-pfi.nsh Catalan-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh Log Message: Updated for the 0.22.5 release. SSL Support files are now downloaded by the Inetc plugin operating in NSISdl-compatible mode. The new plugin removes the need to ping the remote server to check the connection. Both the installer and the SSL Setup wizard can patch IO::Socket::SSL v0.99 or v0.999 to downgrade SSL.pm to v0.97 which is POPFile-compatible. Outlook Express accounts which use SMTP Authorisation with the POP3 username are now given a separate SMTP username when they are configured to work with POPFile. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Danish-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.43.4.3 --- Danish-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.38.4.3 retrieving revision 1.38.4.4 diff -C2 -d -r1.38.4.3 -r1.38.4.4 *** Czech-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.38.4.3 --- Czech-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.38.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.45.4.3 retrieving revision 1.45.4.4 diff -C2 -d -r1.45.4.3 -r1.45.4.4 *** French-pfi.nsh 6 Feb 2006 14:11:39 -0000 1.45.4.3 --- French-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.45.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 465,469 **** ; 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..." --- 465,468 ---- *************** *** 476,480 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 475,479 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 486,493 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 485,502 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 736,739 **** --- 745,749 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Reconfiguration du client de messagerie abandonnée par l'utilisateur" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 798,801 **** --- 808,812 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "Nom d'utilisateur POP3 :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "Port POP3 :" + !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "actuellement" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigurer ce compte pour fonctionner avec POPFile ?" Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.45.4.3 retrieving revision 1.45.4.4 diff -C2 -d -r1.45.4.3 -r1.45.4.4 *** English-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.45.4.3 --- English-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.45.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 450,454 **** ; 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..." --- 450,453 ---- *************** *** 461,465 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 460,464 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 471,478 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 470,487 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 681,684 **** --- 690,694 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 743,746 **** --- 753,757 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Catalan-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Catalan-pfi.nsh,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** Catalan-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.1.2.4 --- Catalan-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.1.2.5 *************** *** 8,12 **** # 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 --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Finnish-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.43.4.3 --- Finnish-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Dutch-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.43.4.3 --- Dutch-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.43.4.3 retrieving revision 1.43.4.4 diff -C2 -d -r1.43.4.3 -r1.43.4.4 *** Bulgarian-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.43.4.3 --- Bulgarian-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 455,459 **** ; 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..." --- 455,458 ---- *************** *** 466,470 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 465,469 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 476,483 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 475,492 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 691,694 **** --- 700,704 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Email client reconfiguration cancelled by user" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 753,756 **** --- 763,767 ---- !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_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "currently" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Reconfigure this account to work with POPFile ?" Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.16.4.3 retrieving revision 1.16.4.4 diff -C2 -d -r1.16.4.3 -r1.16.4.4 *** Arabic-pfi.nsh 6 Feb 2006 14:07:25 -0000 1.16.4.3 --- Arabic-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.16.4.4 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile *************** *** 464,468 **** ; 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..." --- 464,467 ---- *************** *** 475,479 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !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" --- 474,478 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "Download of $G_PLS_FIELD_1 file failed" *************** *** 485,492 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; 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 --- 484,501 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Get SSL: Strings used when patching SSL.pm from IO::Socket::SSL [getssl.nsh] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" + !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; Get SSL: NSISdl strings (displayed by the plugin which downloads the SSL files) [getssl.nsh] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; ! ; The NSISdl plugin (or the Inetc plugin operating in NSISdl-compatible mode) ! ; shows two progress bars, for example: ; ; Downloading libeay32.dll *************** *** 735,738 **** --- 744,748 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "Êã ÅáÛÇÁ ÚãáíÉ ÅÚÏÇÏ ÈÑäÇãÌ ÇáÈÑíÏ ãä ÞÈá ÇáãÓÊÎÏã" + !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 797,800 **** --- 807,811 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBUSERNAME "ÅÓã ãÓÊÎÏãPOP3 :" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOEPORT "ãäÝÐ POP3 :" + !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBSMTPLOGIN "SMTP username will be set to ' $G_PLS_FIELD_2'" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBOLDVALUE "ÍÇáíÇð" !insertmacro PFI_LANG_STRING PFI_LANG_OOECFG_MBQUESTION "Þã ÅÚÏÇÏ åÐÇ ÇáÍÓÇÈ áíÚãá ãÚ POPFile ¿" |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:03:02
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15218 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: Updated to work for the 0.22.5 release. Replaced the slow script-based installation log dump function with one which uses a much faster plugin. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.3 retrieving revision 1.53.4.4 diff -C2 -d -r1.53.4.3 -r1.53.4.4 *** pfi-library.nsh 6 Feb 2006 14:48:03 -0000 1.53.4.3 --- pfi-library.nsh 29 Aug 2006 16:02:57 -0000 1.53.4.4 *************** *** 58,62 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.12" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.2.0" #-------------------------------------------------------------------------- *************** *** 515,519 **** ! !ifndef ADDSSL & BACKUP #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters --- 515,519 ---- ! !ifndef BACKUP #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters *************** *** 1220,1223 **** --- 1220,1240 ---- # so NSIS scripts can use 'Call PFI_DumpLog' and 'Call un.PFI_DumpLog' without additional preparation. # + #-------------------------------------------------------------------------- + # This macro uses a plugin which is not distributed with the NSIS compiler + #-------------------------------------------------------------------------- + # This macro uses a special NSIS plugin (DumpLog) to dump the log contents into a text file. + # Originally a script-based method was used but it could take several seconds to save the log + # (the plugin saves the file almost instantly). + # + # The 'NSIS Wiki' page for the 'DumpLog' plugin (description, example and download links): + # http://nsis.sourceforge.net/DumpLog_plugin + # + # To install this plugin, copy the 'DumpLog.dll' file to the standard NSIS plugins folder + # (${NSISDIR}\Plugins\). The 'DumpLog' source and example files can be unzipped to the + # appropriate sub-folders of ${NSISDIR} if you wish, but this step is entirely optional. + # + # Tested with version 1.0 of the 'DumpLog' plugin. + #-------------------------------------------------------------------------- + # # Inputs: # (top of stack) - the full path of the file where the log will be dumped *************** *** 1237,1295 **** Function ${UN}PFI_DumpLog ! !ifndef LVM_GETITEMCOUNT ! !define LVM_GETITEMCOUNT 0x1004 ! !endif ! !ifndef LVM_GETITEMTEXT ! !define LVM_GETITEMTEXT 0x102D ! !endif ! ! Exch $5 ! Push $0 ! Push $1 ! Push $2 ! Push $3 ! Push $4 ! Push $6 ! FindWindow $0 "#32770" "" $HWNDPARENT ! GetDlgItem $0 $0 1016 ! StrCmp $0 0 error ! FileOpen $5 $5 "w" ! StrCmp $5 "" error ! SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6 ! System::Alloc ${NSIS_MAX_STRLEN} ! Pop $3 ! StrCpy $2 0 ! System::Call "*(i, i, i, i, i, i, i, i, i) i \ ! (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1" ! loop: ! StrCmp $2 $6 done ! System::Call "User32::SendMessageA(i, i, i, i) i \ ! ($0, ${LVM_GETITEMTEXT}, $2, r1)" ! System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)" ! FileWrite $5 "$4${MB_NL}" ! IntOp $2 $2 + 1 ! Goto loop ! done: ! FileClose $5 ! System::Free $1 ! System::Free $3 ! Goto exit ! error: ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_SAVELOG_ERROR)" ! exit: ! Pop $6 ! Pop $4 ! Pop $3 ! Pop $2 ! Pop $1 ! Pop $0 ! Pop $5 ! FunctionEnd !macroend --- 1254,1278 ---- Function ${UN}PFI_DumpLog ! !define L_LOGFILE $R9 ! !define L_RESULT $R8 ! Exch ${L_LOGFILE} ! Push ${L_RESULT} ! DumpLog::DumpLog "${L_LOGFILE}" .R8 ! StrCmp ${L_RESULT} 0 exit ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_SAVELOG_ERROR)\ ! ${MB_NL}${MB_NL}\ ! (${L_LOGFILE})" ! exit: ! Pop ${L_RESULT} ! Pop ${L_LOGFILE} ! !undef L_LOGFILE ! !undef L_RESULT ! FunctionEnd !macroend |
|
From: Brian S. <xue...@us...> - 2006-08-29 16:01:01
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14689 Modified Files: Tag: b0_22_2 pfidbstatus.nsi pfidiag.nsi Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Version Information now includes a trademark statement and has the build year updated automatically. Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** pfidbstatus.nsi 6 Feb 2006 14:18:44 -0000 1.3.2.3 --- pfidbstatus.nsi 29 Aug 2006 16:00:54 -0000 1.3.2.4 *************** *** 30,45 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 30,45 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 157,161 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.8" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 157,161 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" *************** *** 199,202 **** --- 199,204 ---- VIProductVersion "${C_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + !ifdef CTS_INTEGRATED VIAddVersionKey "ProductName" "POPFile SQLite Database Status Check (integrated version)" *************** *** 206,210 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Check the status of POPFile's SQLite database" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 208,213 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Check the status of POPFile's SQLite database" VIAddVersionKey "FileVersion" "${C_VERSION}" Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.3 retrieving revision 1.8.4.4 diff -C2 -d -r1.8.4.3 -r1.8.4.4 *** pfidiag.nsi 6 Feb 2006 14:17:53 -0000 1.8.4.3 --- pfidiag.nsi 29 Aug 2006 16:00:54 -0000 1.8.4.4 *************** *** 24,39 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 24,39 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 104,108 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.60" !define C_OUTFILE "pfidiag.exe" --- 104,108 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" !define C_OUTFILE "pfidiag.exe" *************** *** 145,152 **** VIProductVersion "${C_VERSION}.0" VIAddVersionKey "ProductName" "PFI Diagnostic Utility" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 145,155 ---- VIProductVersion "${C_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "PFI Diagnostic Utility" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:59:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13960 Modified Files: Tag: b0_22_2 MonitorCC.nsi msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Version Information now includes a trademark statement and has the build year updated automatically. Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.3 retrieving revision 1.14.4.4 diff -C2 -d -r1.14.4.3 -r1.14.4.4 *** stop_popfile.nsi 6 Feb 2006 16:59:16 -0000 1.14.4.3 --- stop_popfile.nsi 29 Aug 2006 15:59:40 -0000 1.14.4.4 *************** *** 82,97 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 82,97 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.5.13" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 166,174 **** VIProductVersion "${C_VERSION}.0" VIAddVersionKey "ProductName" "POPFile Silent Shutdown Utility - stops POPFile without \ opening a browser window." VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Silent Shutdown Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 166,177 ---- VIProductVersion "${C_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "POPFile Silent Shutdown Utility - stops POPFile without \ opening a browser window." VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Silent Shutdown Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.3 retrieving revision 1.11.4.4 diff -C2 -d -r1.11.4.3 -r1.11.4.4 *** runpopfile.nsi 6 Feb 2006 16:59:16 -0000 1.11.4.3 --- runpopfile.nsi 29 Aug 2006 15:59:40 -0000 1.11.4.4 *************** *** 29,44 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 29,44 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 106,110 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.1.17" !define C_OUTFILE "runpopfile.exe" --- 106,110 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.0" !define C_OUTFILE "runpopfile.exe" *************** *** 150,157 **** VIProductVersion "${C_PFI_VERSION}.0" VIAddVersionKey "ProductName" "Run POPFile" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Enhanced front-end for POPFile starter program" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 150,160 ---- VIProductVersion "${C_PFI_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "Run POPFile" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Enhanced front-end for POPFile starter program" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.3 retrieving revision 1.7.4.4 diff -C2 -d -r1.7.4.3 -r1.7.4.4 *** msgcapture.nsi 6 Feb 2006 16:55:52 -0000 1.7.4.3 --- msgcapture.nsi 29 Aug 2006 15:59:40 -0000 1.7.4.4 *************** *** 26,41 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 26,41 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 115,119 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.64" !define C_OUTFILE "msgcapture.exe" --- 115,119 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" !define C_OUTFILE "msgcapture.exe" *************** *** 158,165 **** VIProductVersion "${C_VERSION}.0" VIAddVersionKey "ProductName" "PFI Message Capture Utility" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Message Capture Utility (0-99 sec timeout)" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 158,168 ---- VIProductVersion "${C_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "PFI Message Capture Utility" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "PFI Message Capture Utility (0-99 sec timeout)" VIAddVersionKey "FileVersion" "${C_VERSION}" Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** runsqlite.nsi 6 Feb 2006 16:59:16 -0000 1.1.4.3 --- runsqlite.nsi 29 Aug 2006 15:59:40 -0000 1.1.4.4 *************** *** 39,54 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 39,54 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 110,117 **** VIProductVersion "${C_VERSION}.0" VIAddVersionKey "ProductName" "Run SQLite 2.x/3.x utility to examine a POPFile database" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 110,120 ---- VIProductVersion "${C_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "Run SQLite 2.x/3.x utility to examine a POPFile database" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" VIAddVersionKey "FileVersion" "${C_VERSION}" Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.3 retrieving revision 1.19.4.4 diff -C2 -d -r1.19.4.3 -r1.19.4.4 *** MonitorCC.nsi 6 Feb 2006 16:59:16 -0000 1.19.4.3 --- MonitorCC.nsi 29 Aug 2006 15:59:40 -0000 1.19.4.4 *************** *** 24,39 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 24,39 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 44,49 **** !undef ${NSIS_VERSION}_found - ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date. - #-------------------------------------------------------------------------- # Run-time command-line switches (used by 'monitorcc.exe') --- 44,47 ---- *************** *** 113,117 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.20" !define C_OUTFILE "monitorcc.exe" --- 111,115 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.0" !define C_OUTFILE "monitorcc.exe" *************** *** 142,149 **** VIProductVersion "${C_PFI_VERSION}.0" VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 140,150 ---- VIProductVersion "${C_PFI_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:57:40
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594 Modified Files: Tag: b0_22_2 installer-SecPOPFile-func.nsh Log Message: Added some extra logging commands to record shutdown via UI status. Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** installer-SecPOPFile-func.nsh 6 Feb 2006 16:52:03 -0000 1.1.2.4 --- installer-SecPOPFile-func.nsh 29 Aug 2006 15:57:38 -0000 1.1.2.5 *************** *** 252,255 **** --- 252,256 ---- Call PFI_ShutdownViaUI Pop ${L_RESULT} + DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" StrCmp ${L_RESULT} "success" check_exe StrCmp ${L_RESULT} "password?" manual_shutdown *************** *** 262,265 **** --- 263,267 ---- Call PFI_ShutdownViaUI Pop ${L_RESULT} + DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" StrCmp ${L_RESULT} "success" check_exe Goto manual_shutdown |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:56:44
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13221 Modified Files: Tag: b0_22_2 installer-SecPOPFile-body.nsh Log Message: Extra data stored in the "Add/Remove Program" entry to stop Windows from making wild guesses about how much space the POPFile program occupies. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -C2 -d -r1.3.2.5 -r1.3.2.6 *** installer-SecPOPFile-body.nsh 6 Feb 2006 16:52:03 -0000 1.3.2.5 --- installer-SecPOPFile-body.nsh 29 Aug 2006 15:56:37 -0000 1.3.2.6 *************** *** 205,209 **** Delete "$G_ROOTDIR\popfileib-584.exe" Delete "$G_ROOTDIR\popfile-service-584.exe" ! ; The experimental 'setup-repack587.exe' installer had to use 'perlmsgcap.exe' since the ; NSIS-based replacements were not compatible with the standard "Message Capture" utility --- 205,209 ---- Delete "$G_ROOTDIR\popfileib-584.exe" Delete "$G_ROOTDIR\popfile-service-584.exe" ! ; The experimental 'setup-repack587.exe' installer had to use 'perlmsgcap.exe' since the ; NSIS-based replacements were not compatible with the standard "Message Capture" utility *************** *** 212,216 **** ; Install the POPFile EXE files ! File "..\engine\popfile.exe" File "..\engine\popfilef.exe" --- 212,216 ---- ; Install the POPFile EXE files ! File "..\engine\popfile.exe" File "..\engine\popfilef.exe" *************** *** 230,236 **** File /nonfatal "test\pfidiag.exe" File "msgcapture.exe" ! IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths ! Delete "$G_ROOTDIR\pfimsgcapture.exe" File "/oname=pfimsgcapture.exe" "msgcapture.exe" --- 230,236 ---- File /nonfatal "test\pfidiag.exe" File "msgcapture.exe" ! IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths ! Delete "$G_ROOTDIR\pfimsgcapture.exe" File "/oname=pfimsgcapture.exe" "msgcapture.exe" *************** *** 468,471 **** --- 468,473 ---- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ + "InstallLocation" "$G_ROOTDIR" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" *************** *** 479,482 **** --- 481,486 ---- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ + "InstallLocation" "$G_ROOTDIR" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:55:50
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12790 Modified Files: Tag: b0_22_2 installer.nsi Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Version Information now includes a trademark statement and has the build year updated automatically. Replaced the slow script-based installation log dump function with one which uses a much faster plugin. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.5 retrieving revision 1.242.4.6 diff -C2 -d -r1.242.4.5 -r1.242.4.6 *** installer.nsi 6 Feb 2006 18:56:58 -0000 1.242.4.5 --- installer.nsi 29 Aug 2006 15:55:45 -0000 1.242.4.6 *************** *** 11,19 **** # # (1) adduser.exe (NSIS script: adduser.nsi) ! # (2) ctchecks.exe (NSIS script: ctchecks.nsi) ! # (3) msgcapture.exe (NSIS script: msgcapture.nsi) ! # (4) runpopfile.exe (NSIS script: runpopfile.nsi) ! # (5) runsqlite.exe (NSIS script: runsqlite.nsi) ! # (6) stop_pf.exe (NSIS script: stop_popfile.nsi) # # (B) The following programs (built using NSIS) are optional: --- 11,18 ---- # # (1) adduser.exe (NSIS script: adduser.nsi) ! # (2) msgcapture.exe (NSIS script: msgcapture.nsi) ! # (3) runpopfile.exe (NSIS script: runpopfile.nsi) ! # (4) runsqlite.exe (NSIS script: runsqlite.nsi) ! # (5) stop_pf.exe (NSIS script: stop_popfile.nsi) # # (B) The following programs (built using NSIS) are optional: *************** *** 49,64 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 48,63 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 68,78 **** !undef ${NSIS_VERSION}_found ! ! ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date ! ; (if the default multi-language installer is compiled). ! ; ! ; There may be further warnings which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or ! ; more language tables. The 'pfi-languages.nsh' file lists all of the language table codes ! ; used by the POPFile installer and other NSIS-based utilities. ; ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI --- 67,75 ---- !undef ${NSIS_VERSION}_found ! ! ; Normally no NSIS compiler warnings are expected. However there may be some warnings ! ; which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or more language tables. ! ; These "PFI_LANG_NSISDL_PLURAL" warnings can be safely ignored (at present only the ! ; 'Japanese-pfi.nsh' file generates this warning). ; ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI *************** *** 185,189 **** ;-------------------------------------------------------------------------- ! SetCompressor lzma ;-------------------------------------------------------------------------- --- 182,186 ---- ;-------------------------------------------------------------------------- ! SetCompressor /solid lzma ;-------------------------------------------------------------------------- *************** *** 368,375 **** VIProductVersion "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.0" VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Automatic email classification" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 365,375 ---- VIProductVersion "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalTrademarks" "POPFile is a registered trademark of John Graham-Cumming" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Automatic email classification" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" *************** *** 676,679 **** --- 676,680 ---- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ReserveFile "${NSISDIR}\Plugins\Banner.dll" + ReserveFile "${NSISDIR}\Plugins\DumpLog.dll" ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" ReserveFile "${NSISDIR}\Plugins\System.dll" *************** *** 1323,1327 **** SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_PROG_SAVELOG) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" SetDetailsPrint listonly Call PFI_GetDateTimeStamp --- 1324,1328 ---- SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_PROG_SAVELOG)" SetDetailsPrint listonly Call PFI_GetDateTimeStamp *************** *** 1496,1500 **** ; Convert the installation pathname into a string which is safe to use in the summary page ! Push $G_ROOTDIR Call NSIS2IO --- 1497,1501 ---- ; Convert the installation pathname into a string which is safe to use in the summary page ! Push $G_ROOTDIR Call NSIS2IO |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:54:34
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12510 Added Files: Tag: b0_22_2 SSL_pm.pat Log Message: Used by the main POPFile installer and the stand-alone SSL Setup wizard. IO::Socket::SSL v0.99 and v0.999 from the University of Winnipeg are not compatible with POPFile so this patch is used to downgrade the SSL.pm file to v0.97 which is compatible with POPFile 0.22.3 or later. --- NEW FILE: SSL_pm.pat --- (This appears to be a binary file; contents omitted.) |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:52:54
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11752 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). Switched from the standard NSISdl plugin to the Inetc plugin since it offers much better proxy support and also better support for dial-up connections. No longer need to ping the remote site to detect if the target system is connected to the Internet. Vpatch used when installing SSL Support files from the University of Winnipeg repository. IO::Socket::SSL v0.99 and v0.999 are not compatible with POPFile 0.22.x so this patch is used to downgrade the SSL.pm file to v0.97 which is compatible. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -C2 -d -r1.6.2.6 -r1.6.2.7 *** getssl.nsh 6 Feb 2006 16:13:24 -0000 1.6.2.6 --- getssl.nsh 29 Aug 2006 15:52:48 -0000 1.6.2.7 *************** *** 9,12 **** --- 9,20 ---- # programs download and install the same SSL files. # + # On 18 July 2006 the University of Winnipeg repository was updated to provide + # IO::Socket::SSL v0.99 which is not compatible with POPFile so a patch will be + # applied to downgrade the relevant file to the compatible v0.97 version. + # + # On 18 August 2006 the University of Winnipeg repository was updated to supply + # IO::Socket::SSL v0.999 which is not compatible with POPFile so a patch will + # be applied to downgrade the relevant file to the compatible v0.97 version. + # # Copyright (c) 2005-2006 John Graham-Cumming # *************** *** 31,36 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. ;------------------------------------------------ --- 39,61 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download ! ! ;------------------------------------------------ ! ; This script requires the 'Inetc' NSIS plugin ! ;------------------------------------------------ ! ! ; This script uses a special NSIS plugin (inetc) to download the SSL files. This plugin ! ; has much better proxy support than the standard NSISdl plugin shipped with NSIS. ! ; ! ; The 'NSIS Wiki' page for the 'Inetc' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/Inetc_plug-in ! ; ! ; To compile this script, copy the 'inetc.dll' file to the standard NSIS plugins folder ! ; (${NSISDIR}\Plugins\). The 'Inetc' source and example files can be unzipped to the ! ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ! ; ! ; Tested with the inetc.dll plugin timestamped 24 June 2006 12:40 ;------------------------------------------------ *************** *** 52,55 **** --- 77,94 ---- ; Tested with versions 1.0.5, 1.0.6, 1.0.7 and 1.0.8 of the 'untgz' plugin. + ;------------------------------------------------ + ; How the SSL.pm patch was created + ;------------------------------------------------ + + ; The patch used to downgrade either SSL.pm v0.99 or SSL.pm v0.999 to v0.97 was created + ; using the VPATCH package which is supplied with NSIS. This special patch was made using + ; the commands: + ; + ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat + ; GenPat.exe SSL_0.999.pm SSL_0.97.pm SSL_pm.pat + ; + ; where SSL_0.97.pm was the SSL.pm file from v0.97 of the IO::Socket:SSL module + ; and SSL_0.99.pm was the SSL.pm file from v0.99 of the IO::Socket:SSL module + ; and SSL_0.999.pm was the SSL.pm file from v0.999 of the IO::Socket:SSL module #-------------------------------------------------------------------------- *************** *** 58,65 **** #-------------------------------------------------------------------------- - ; To check if the target computer is connected to the Internet, we ping this address: - - !define C_UWR_URL_TO_PING "http://theoryx5.uwinnipeg.ca/" - ; In addition to some extra Perl modules, POPFile's SSL support needs two OpenSSL DLLs. --- 97,100 ---- *************** *** 94,98 **** 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 --- 129,133 ---- Section "SSL Support" SecSSL ! ; The stand-alone utility includes a compressed set of POPFile pre-0.22.3 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 *************** *** 109,119 **** !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 --- 144,166 ---- !ifdef ADDSSL ! ; For POPFile 0.22.3 (and later) releases this stand-alone utility will download and, ! ; if necessary, patch the SSL support files from the University of Winnipeg repository. ! ; ! ; However there will always be some delay between the repository being updated with SSL ! ; files which are not compatible with POPFile and the generation of an updated version ! ; of this stand-alone utility which fixes the SSL compatibility problem. ! ; ! ; The /BUILTIN command-line switch provides an easy way to force the installation of ! ; the old SSL support files normally used only for the POPFile 0.22.0, 0.22.1 and ! ; 0.22.2 releases as a workaround until this utility can be updated to handle the new ! ; SSL support files. ! Call PFI_GetParameters ! Pop ${L_RESULT} ! StrCmp ${L_RESULT} "/BUILTIN" 0 look_for_minimal_Perl ! DetailPrint "The '/BUILTIN' option was supplied on the command-line" ! Goto assume_pre_0_22_3 ! ! look_for_minimal_Perl: ; The stand-alone utility may be used to add SSL support to an 0.22.x installation *************** *** 123,130 **** 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 --- 170,186 ---- IfFileExists "$G_ROOTDIR\perl58.dll" check_Perl_version ! DetailPrint "Assume pre-0.22.3 installation (perl58.dll not found in '$G_ROOTDIR' folder)" ! Goto assume_pre_0_22_3 check_Perl_version: + + !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} + GetDllVersion "$G_ROOTDIR\perl58.dll" ${L_VER_Y} ${L_VER_Z} IntOp ${L_VER_X} ${L_VER_Y} / 0x00010000 *************** *** 155,159 **** StrCmp ${L_RESULT} "download" download_ssl ! assume_0_22_x: ; Pretend we've just downloaded these files from the repository --- 211,215 ---- StrCmp ${L_RESULT} "download" download_ssl ! assume_pre_0_22_3: ; Pretend we've just downloaded these files from the repository *************** *** 173,212 **** !endif - SetDetailsPrint textonly - DetailPrint "$(PFI_LANG_PROG_CHECKINTERNET) $(PFI_LANG_TAKE_SEVERAL_SECONDS)" - SetDetailsPrint listonly - - !define FLAG_ICC_FORCE_CONNECTION 0x00000001 - - ; The system call result is returned in 'r10' (i.e. in $R0) - - System::Call "wininet::InternetCheckConnection( \ - t '${C_UWR_URL_TO_PING}', \ - i ${FLAG_ICC_FORCE_CONNECTION}, i 0) i .r10" - - StrCmp ${L_RESULT} "error" no_ie3 - StrCmp ${L_RESULT} "0" no_connection - DetailPrint "InternetCheckConnection: online (${L_RESULT})" - Goto download - - no_ie3: - DetailPrint "InternetCheckConnection: no IE3" - Goto manual_connect - - no_connection: - DetailPrint "InternetCheckConnection: offline" - - manual_connect: - DetailPrint "InternetCheckConnection: manual connect requested" - MessageBox MB_OKCANCEL|MB_ICONINFORMATION "$(PFI_LANG_MB_INTERNETCONNECT)" IDOK download - DetailPrint "InternetCheckConnection: cancelled by user" - !ifdef INSTALLER - Goto installer_error_exit - !else - Goto error_exit - !endif - - download: - ; Download the archives and OpenSSL DLLs --- 229,232 ---- *************** *** 254,258 **** SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" ! StrCmp ${L_RESULT} "success" label_a error_exit label_a: --- 274,324 ---- SetDetailsPrint listonly untgz::extractFile -d "$G_PLS_FIELD_1" "$PLUGINSDIR\IO-Socket-SSL.tar.gz" "SSL.pm" ! StrCmp ${L_RESULT} "success" 0 error_exit ! ! ; If IO::Socket::SSL v0.99 has been downloaded and installed, apply the patch which ! ; downgrades the SSL.pm file from v0.99 to v0.97 to make it compatible with POPFile ! ! DetailPrint "" ! DetailPrint "$(PFI_LANG_SSLPREPAREPATCH)" ! ! SetDetailsPrint none ! !ifdef INSTALLER ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" ! !else ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat" ! !endif ! SetDetailsPrint listonly ! ! DetailPrint "" ! vpatch::vpatchfile "$PLUGINSDIR\SSL_pm.pat" "$G_PLS_FIELD_1\SSL.pm" "$PLUGINSDIR\SSL_v097.pm" ! Pop $G_PLS_FIELD_2 ! ! SetDetailsPrint both ! DetailPrint "$(PFI_LANG_SSLPATCHSTATUS)" ! SetDetailsPrint listonly ! DetailPrint "" ! ! StrCmp $G_PLS_FIELD_2 "No suitable patches were found" label_a ! StrCmp $G_PLS_FIELD_2 "OK" 0 show_downgrade_status ! !insertmacro PFI_BACKUP_123_DP "$G_PLS_FIELD_1" "SSL.pm" ! SetDetailsPrint none ! Rename "$PLUGINSDIR\SSL_v097.pm" "$G_PLS_FIELD_1\SSL.pm" ! IfFileExists "$G_PLS_FIELD_1\SSL.pm" downgrade_success ! Rename "$G_PLS_FIELD_1\SSL.pm.bk1" "$G_PLS_FIELD_1\SSL.pm" ! SetDetailsPrint listonly ! DetailPrint "" ! SetDetailsPrint both ! DetailPrint "$(PFI_LANG_SSLPATCHFAILED)" ! Goto label_a ! ! downgrade_success: ! SetDetailsPrint listonly ! DetailPrint "$(PFI_LANG_SSLPATCHCOMPLETED)" ! DetailPrint "" ! ! show_downgrade_status: ! !ifdef ADDSSL ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_SSLPATCHSTATUS)" ! !endif label_a: *************** *** 335,339 **** IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" done: --- 401,409 ---- IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done ! !ifdef INSTALLER ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" ! !else ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "..\zerobyte.file" ! !endif done: *************** *** 381,387 **** DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" ! NSISdl::download ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" Pop $G_PLS_FIELD_2 ! StrCmp $G_PLS_FIELD_2 "success" file_received SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_1)" --- 451,457 ---- DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" ! inetc::get /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END Pop $G_PLS_FIELD_2 ! StrCmp $G_PLS_FIELD_2 "OK" file_received SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_1)" |
|
From: Brian S. <xue...@us...> - 2006-08-29 15:52:19
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11371 Modified Files: Tag: b0_22_2 adduser-EmailConfig.nsh Log Message: Updated to work with the NSIS 2.19 compiler (for the 0.22.5 release). If no reconfigurable clients are detected the wizard no longer attempts to find Outlook Express accounts (oops!). If an Outlook Express account which uses SMTP Authentication is to be reconfigured and it re-uses the POP3 username (the default setting) then a separate SMTP username is created (to avoid login failures when SMTP Authentication tries to use the POPFile-enabled POP3 username). Index: adduser-EmailConfig.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-EmailConfig.nsh,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** adduser-EmailConfig.nsh 6 Feb 2006 16:26:03 -0000 1.1.2.4 --- adduser-EmailConfig.nsh 29 Aug 2006 15:52:09 -0000 1.1.2.5 *************** *** 69,72 **** --- 69,73 ---- # # This function is used to introduce the reconfiguration of email clients + # (at present only a few clients can be reconfigured automatically) #-------------------------------------------------------------------------- *************** *** 77,82 **** !define L_CLIENT_NAME $R7 !define L_CLIENT_TYPE $R6 ; used to indicate if client can be reconfigured by installer ! !define L_SEPARATOR $R5 ! !define L_TEMP $R4 Push ${L_CLIENT_INDEX} --- 78,84 ---- !define L_CLIENT_NAME $R7 !define L_CLIENT_TYPE $R6 ; used to indicate if client can be reconfigured by installer ! !define L_RECONFIGURABLE $R5 ; 0 = no reconfigurable clients found ! !define L_SEPARATOR $R4 ! !define L_TEMP $R3 Push ${L_CLIENT_INDEX} *************** *** 84,90 **** --- 86,97 ---- Push ${L_CLIENT_NAME} Push ${L_CLIENT_TYPE} + Push ${L_RECONFIGURABLE} Push ${L_SEPARATOR} Push ${L_TEMP} + ; Assume no suitable clients are found + + StrCpy ${L_RECONFIGURABLE} "0" + ; On older systems with several email clients, the email client scan can take a few seconds ; during which time the user may be tempted to click the 'Next' button which would result in *************** *** 116,120 **** --- 123,131 ---- Pop ${L_CLIENT_TYPE} StrCmp ${L_CLIENT_TYPE} "" add_to_list + + ; A reconfigurable client has been found (NB Some Outlook accounts cannot be reconfigured) + StrCpy ${L_CLIENT_TYPE} " (*)" + StrCpy ${L_RECONFIGURABLE} "1" ReadRegStr ${L_TEMP} HKLM "Software\Clients\Mail\${L_CLIENT_NAME}\shell\open\command" "" *************** *** 145,154 **** !insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN Pop ${L_TEMP} ! StrCmp ${L_TEMP} "back" 0 exit !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "ClientEXE" "ConfigStatus" "SkipAll" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioF.ini" "Settings" "NumFields" "1" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioF.ini" "Settings" "BackEnabled" "0" !insertmacro PFI_IO_TEXT "ioF.ini" "1" "$(PFI_LANG_MAILCFG_IO_CANCEL)" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioF.ini" --- 156,175 ---- !insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN Pop ${L_TEMP} ! StrCmp ${L_TEMP} "back" skip_email_pages ! StrCmp ${L_RECONFIGURABLE} "1" exit ! ! skip_email_pages: !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "ClientEXE" "ConfigStatus" "SkipAll" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioF.ini" "Settings" "NumFields" "1" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioF.ini" "Settings" "BackEnabled" "0" + StrCmp ${L_TEMP} "back" cancelled_by_user + !insertmacro PFI_IO_TEXT "ioF.ini" "1" "$(PFI_LANG_MAILCFG_IO_NOMATCHES)" + goto show_skip_page + + cancelled_by_user: !insertmacro PFI_IO_TEXT "ioF.ini" "1" "$(PFI_LANG_MAILCFG_IO_CANCEL)" + + show_skip_page: !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioF.ini" *************** *** 156,159 **** --- 177,181 ---- Pop ${L_TEMP} Pop ${L_SEPARATOR} + Pop ${L_RECONFIGURABLE} Pop ${L_CLIENT_TYPE} Pop ${L_CLIENT_NAME} *************** *** 165,168 **** --- 187,191 ---- !undef L_CLIENT_NAME !undef L_CLIENT_TYPE + !undef L_RECONFIGURABLE !undef L_SEPARATOR !undef L_TEMP *************** *** 233,252 **** ; etc ! !define L_ACCOUNT $R9 ; path to the data for the current OE account (less the HKCU part) ! !define L_ACCT_INDEX $R8 ; used to loop through OE accounts for the current OE Identity ! !define L_CFG $R7 ; file handle ! !define L_GUID $R6 ; GUID of the current entry in HKCU\Identities list ! !define L_GUID_INDEX $R5 ; used to loop through the list of OE Identities ! !define L_IDENTITY $R4 ; plain text form of OE Identity name ! !define L_OEDATA $R3 ; some data (it varies) for current OE account ! !define L_OEPATH $R2 ; holds part of the path used to access OE account data ! !define L_ORDINALS $R1 ; "Identity Ordinals" flag (1 = found, 0 = not found) ! !define L_PORT $R0 ; POP3 Port used for an OE Account ! !define L_STATUS $9 ; keeps track of the status of the account we are checking ! !define L_TEMP $8 !define L_POP3SERVER $7 !define L_EMAILADDRESS $6 !define L_USERNAME $5 Push ${L_ACCOUNT} --- 256,280 ---- ; etc ! !define L_ACCOUNT $R9 ; path to data for the current OE account (less the HKCU part) ! !define L_ACCT_INDEX $R8 ; used to loop through OE accounts for the current OE Identity ! !define L_CFG $R7 ; file handle ! !define L_GUID $R6 ; GUID of the current entry in HKCU\Identities list ! !define L_GUID_INDEX $R5 ; used to loop through the list of OE Identities ! !define L_IDENTITY $R4 ; plain text form of OE Identity name ! !define L_OEDATA $R3 ; some data (it varies) for current OE account ! !define L_OEPATH $R2 ; holds part of the path used to access OE account data ! !define L_ORDINALS $R1 ; "Identity Ordinals" flag (1 = found, 0 = not found) ! !define L_PORT $R0 ; POP3 Port used for an OE Account ! !define L_STATUS $9 ; keeps track of the status of the account we are checking ! !define L_TEMP $8 !define L_POP3SERVER $7 !define L_EMAILADDRESS $6 !define L_USERNAME $5 + !define L_SMTPAUTH $4 ; 'SMTP Use Sicily' setting from this account's registry entry + ; 0 (or an empty string) = SMTP Authentication is not used, + ; 2 = SMTP Authentication uses the POP3 username and password, + ; 3 = SMTP Authentication uses the 'SMTP User Name' username + !define L_SMTPUSERNAME $3 ; user name to be used when SMTP Authentication is employed Push ${L_ACCOUNT} *************** *** 266,269 **** --- 294,299 ---- Push ${L_EMAILADDRESS} Push ${L_USERNAME} + Push ${L_SMTPAUTH} + Push ${L_SMTPUSERNAME} !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_EXPCFG_TITLE)" "$(PFI_LANG_EXPCFG_SUBTITLE)" *************** *** 480,483 **** --- 510,520 ---- ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "Account Name" + ; If this account uses SMTP Authentication and SMTP currently uses the POP3 username + ; then we will need to change the SMTP settings if this account is configured to work + ; with POPFile (all we need to do is set up a new SMTP username) + + ReadRegDWORD ${L_SMTPAUTH} HKCU ${L_ACCOUNT} "SMTP Use Sicily" + ReadRegStr ${L_SMTPUSERNAME} HKCU ${L_ACCOUNT} "SMTP User Name" + !insertmacro MUI_INSTALLOPTIONS_READ ${L_STATUS} "ioB.ini" "Field 8" "State" StrCpy ${L_TEMP} "" *************** *** 502,505 **** --- 539,544 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account $G_OOELIST_INDEX" "POP3username" "${L_USERNAME}" !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account $G_OOELIST_INDEX" "POP3port" "${L_PORT}" + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account $G_OOELIST_INDEX" "SMTPauth" "${L_SMTPAUTH}" + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account $G_OOELIST_INDEX" "SMTPusername" "${L_SMTPUSERNAME}" !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account $G_OOELIST_INDEX" "RegistryKey" "${L_ACCOUNT}" *************** *** 531,537 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1200 ; Field 1 = IDENTITY label (above the box) CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 570,576 ---- !endif ! ; Field 1 = IDENTITY label (above the box) ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioB.ini" "Field 1" "HWND" CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 *************** *** 573,579 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1200 ; Field 1 = IDENTITY label (above the box) CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 612,618 ---- !endif ! ; Field 1 = IDENTITY label (above the box) ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioB.ini" "Field 1" "HWND" CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 *************** *** 615,618 **** --- 654,659 ---- exit: + Pop ${L_SMTPUSERNAME} + Pop ${L_SMTPAUTH} Pop ${L_USERNAME} Pop ${L_EMAILADDRESS} *************** *** 648,651 **** --- 689,694 ---- !undef L_EMAILADDRESS !undef L_USERNAME + !undef L_SMTPAUTH + !undef L_SMTPUSERNAME FunctionEnd *************** *** 853,856 **** --- 896,901 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account ${L_TEXT_INDEX}" "POP3username" "" !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account ${L_TEXT_INDEX}" "POP3port" "" + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account ${L_TEXT_INDEX}" "SMTPauth" "" + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account ${L_TEXT_INDEX}" "SMTPusername" "" !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Account ${L_TEXT_INDEX}" "RegistryKey" "" IntOp ${L_TEXT_INDEX} ${L_TEXT_INDEX} + 1 *************** *** 888,891 **** --- 933,942 ---- !define L_POP3PORT $5 + !define L_SMTPAUTH $4 ; 'SMTP Use Sicily' setting from this account's registry entry + ; 0 (or an empty string) = SMTP Authentication is not used, + ; 2 = SMTP Authentication uses the POP3 username and password, + ; 3 = SMTP Authentication uses the 'SMTP User Name' username + !define L_SMTPUSERNAME $3 ; user name to be used when SMTP Authentication is employed + Push ${L_CBOX_INDEX} Push ${L_CBOX_STATE} *************** *** 902,905 **** --- 953,958 ---- Push ${L_POP3USERNAME} Push ${L_POP3PORT} + Push ${L_SMTPAUTH} + Push ${L_SMTPUSERNAME} ; If user has cancelled the reconfiguration, there is nothing to do here *************** *** 930,935 **** --- 983,996 ---- !insertmacro MUI_INSTALLOPTIONS_READ ${L_POP3USERNAME} "pfi-cfg.ini" "Account ${L_DATA_INDEX}" "POP3username" !insertmacro MUI_INSTALLOPTIONS_READ ${L_POP3PORT} "pfi-cfg.ini" "Account ${L_DATA_INDEX}" "POP3port" + !insertmacro MUI_INSTALLOPTIONS_READ ${L_SMTPAUTH} "pfi-cfg.ini" "Account ${L_DATA_INDEX}" "SMTPauth" + !insertmacro MUI_INSTALLOPTIONS_READ ${L_SMTPUSERNAME} "pfi-cfg.ini" "Account ${L_DATA_INDEX}" "SMTPusername" !insertmacro MUI_INSTALLOPTIONS_READ ${L_REGKEY} "pfi-cfg.ini" "Account ${L_DATA_INDEX}" "RegistryKey" + StrCpy $G_PLS_FIELD_1 "${MB_NL}" + StrCmp ${L_SMTPAUTH} "2" 0 get_permission + StrCpy $G_PLS_FIELD_2 "${L_POP3USERNAME}" + StrCpy $G_PLS_FIELD_1 "$(PFI_LANG_OOECFG_MBSMTPLOGIN)${MB_NL}${MB_NL}${MB_NL}" + + get_permission: MessageBox MB_YESNO \ "$(PFI_LANG_EXPCFG_MBIDENTITY) ${L_IDENTITY}\ *************** *** 947,951 **** $(PFI_LANG_OOECFG_MBOEPORT) $G_POP3 \ ($(PFI_LANG_OOECFG_MBOLDVALUE) '${L_POP3PORT}')\ ! ${MB_NL}${MB_NL}${MB_NL}\ $(PFI_LANG_OOECFG_MBQUESTION)\ " IDNO ignore_tick --- 1008,1013 ---- $(PFI_LANG_OOECFG_MBOEPORT) $G_POP3 \ ($(PFI_LANG_OOECFG_MBOLDVALUE) '${L_POP3PORT}')\ ! ${MB_NL}${MB_NL}\ ! $G_PLS_FIELD_1\ $(PFI_LANG_OOECFG_MBQUESTION)\ " IDNO ignore_tick *************** *** 969,973 **** WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "User-${L_UNDO}" "$G_WINUSERNAME" WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "Type-${L_UNDO}" "$G_WINUSERTYPE" ! WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "IniV-${L_UNDO}" "3" WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "Restored" "No" --- 1031,1035 ---- WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "User-${L_UNDO}" "$G_WINUSERNAME" WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "Type-${L_UNDO}" "$G_WINUSERTYPE" ! WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "History" "IniV-${L_UNDO}" "4" WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "Restored" "No" *************** *** 976,979 **** --- 1038,1043 ---- WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "POP3Server" "${L_POP3SERVER}" WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "POP3Port" "${L_POP3PORT}" + WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "SMTPUseSicily" "${L_SMTPAUTH}" + WriteINIStr "$G_USERDIR\pfi-outexpress.ini" "Undo-${L_UNDO}" "SMTPUserName" "${L_SMTPUSERNAME}" ; Reconfigure the Outlook Express account *************** *** 982,986 **** --- 1046,1054 ---- WriteRegStr HKCU ${L_REGKEY} "POP3 Server" "127.0.0.1" WriteRegDWORD HKCU ${L_REGKEY} "POP3 Port" $G_POP3 + StrCmp ${L_SMTPAUTH} "2" 0 update_log + WriteRegDWORD HKCU ${L_REGKEY} "SMTP Use Sicily" 3 + WriteRegStr HKCU ${L_REGKEY} "SMTP User Name" "${L_POP3USERNAME}" + update_log: !insertmacro PFI_OOECONFIG_CHANGES_LOG "${L_IDENTITY}" 20 !insertmacro PFI_OOECONFIG_CHANGES_LOG "${L_ACCOUNTNAME}" 20 *************** *** 1000,1003 **** --- 1068,1073 ---- exit: + Pop ${L_SMTPUSERNAME} + Pop ${L_SMTPAUTH} Pop ${L_POP3PORT} Pop ${L_POP3USERNAME} *************** *** 1029,1032 **** --- 1099,1104 ---- !undef L_POP3USERNAME !undef L_POP3PORT + !undef L_SMTPAUTH + !undef L_SMTPUSERNAME FunctionEnd *************** *** 1352,1358 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1200 ; Field 1 = IDENTITY label (above the box) CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 1424,1430 ---- !endif ! ; Field 1 = IDENTITY label (above the box) ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioB.ini" "Field 1" "HWND" CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 *************** *** 1394,1400 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1200 ; Field 1 = IDENTITY label (above the box) CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 1466,1472 ---- !endif ! ; Field 1 = IDENTITY label (above the box) ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioB.ini" "Field 1" "HWND" CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 *************** *** 1900,1906 **** !endif ! ; In 'GetDlgItem', use (1200 + Field number - 1) to refer to the field to be changed ! GetDlgItem $G_DLGITEM $G_HWND 1203 ; Field 4 = PERSONA (text in groupbox frame) CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 --- 1972,1978 ---- !endif ! ; Field 4 = PERSONA (text in groupbox frame) ! !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioE.ini" "Field 4" "HWND" CreateFont $G_FONT "MS Shell Dlg" 8 700 ; use a 'bolder' version of the font in use SendMessage $G_DLGITEM ${WM_SETFONT} $G_FONT 0 |
11 messages has been excluded from this view by a project administrator.
