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: <jgr...@us...> - 2003-07-15 13:39:28
|
Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv28079/Test
Added Files:
MQReceiver.pm
Log Message:
Add helper class for testing the MQ
--- NEW FILE: MQReceiver.pm ---
package Test::MQReceiver;
# ---------------------------------------------------------------------------------------------
#
# Test::MQReceiver. Helper class for the TestMQ.tst suite.
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
sub new
{
my $type = shift;
my $self;
# This is a queue of the messages that have been delivered to
# this class. It is read and cleared with the read method
$self->{messages__} = ();
return bless $self, $type;
}
# ---------------------------------------------------------------------------------------------
#
# deliver
#
# Called to deliver a message from the MQ.
#
# ---------------------------------------------------------------------------------------------
sub deliver
{
my ( $self, $type, $message, $parameter ) = @_;
push @{$self->{messages__}}, [ $type, $message, $parameter ];
}
# ---------------------------------------------------------------------------------------------
#
# read
#
# Reads the queue of messages received and clears it
#
# ---------------------------------------------------------------------------------------------
sub read
{
my ( $self ) = @_;
my @messages = @{$self->{messages__}};
$self->{messages__} = ();
return @messages;
}
1;
|
|
From: <ssc...@us...> - 2003-07-15 02:49:26
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv23349
Modified Files:
TestConfiguration.tst
Log Message:
increase to 100% coverage
Index: TestConfiguration.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestConfiguration.tst,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestConfiguration.tst 15 Jul 2003 02:10:23 -0000 1.4
--- TestConfiguration.tst 15 Jul 2003 02:49:22 -0000 1.5
***************
*** 88,91 ****
--- 88,105 ----
}
+ select(undef, undef, undef, 4 * $c->{pid_delay__});
+
+ if ($process != 0) {
+ #parent loop
+ select(undef, undef, undef, $c->{pid_delay__});
+ $c->service();
+ } elsif ($process == 0) {
+ #child loop
+ test_assert_equal( $c->start(), 0);
+ test_assert( !defined( $c->live_check_() ) );
+
+ exit(0);
+ }
+
close STDERR;
$c->stop();
|
|
From: <jgr...@us...> - 2003-07-15 02:43:47
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv22636/Classifier
Modified Files:
Bayes.pm
Log Message:
Fix bug where a very long quarantined message would have the wrong number of terminating dots
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** Bayes.pm 11 Jul 2003 21:52:55 -0000 1.167
--- Bayes.pm 15 Jul 2003 02:43:44 -0000 1.168
***************
*** 1197,1210 ****
}
! if ( !$got_full_body ) {
! $self->echo_to_dot_( $mail, $echo?$client:undef, '>>' . $temp_file );
! }
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file--$eol";
}
}
if ( $echo ) {
print $client "$eol.$eol";
--- 1197,1214 ----
}
! my $before_dot = '';
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! $before_dot = "$eol--$temp_file--$eol";
}
}
+ if ( !$got_full_body ) {
+ $self->echo_to_dot_( $mail, $echo?$client:undef, '>>' . $temp_file, $before_dot );
+ } else {
+ print $client $before_dot if ( $before_dot ne '' );
+ }
+
if ( $echo ) {
print $client "$eol.$eol";
***************
*** 1655,1658 ****
--- 1659,1663 ----
# $client The local mail client (created with IO::) that needs the response
# $file a file to print the response to
+ # $before Optional string to send to client before the dot is sent
#
# echo all information from the $mail server until a single line with a . is seen
***************
*** 1661,1665 ****
sub echo_to_dot_
{
! my ( $self, $mail, $client, $file ) = @_;
# These if statements are repetitive to keep the inner loops efficient
--- 1666,1670 ----
sub echo_to_dot_
{
! my ( $self, $mail, $client, $file, $before ) = @_;
# These if statements are repetitive to keep the inner loops efficient
***************
*** 1673,1683 ****
last if ( $self->{alive_} == 0 );
- print $client $_;
- print FILE $_;
-
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
}
close FILE;
--- 1678,1700 ----
last if ( $self->{alive_} == 0 );
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
!
! if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
! print $client $before;
! print FILE $before;
! }
!
! print $client $_;
! print FILE $_;
!
! last;
! }
!
! print $client $_;
! print FILE $_;
!
}
close FILE;
***************
*** 1689,1698 ****
last if ( $self->{alive_} == 0 );
- print $client $_;
-
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
}
} elsif (defined($file)) {
--- 1706,1724 ----
last if ( $self->{alive_} == 0 );
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
!
! if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
! print $client $before;
! }
!
! print $client $_;
!
! last;
! }
!
! print $client $_;
}
} elsif (defined($file)) {
***************
*** 1704,1713 ****
last if ( $self->{alive_} == 0 );
- print FILE $_;
-
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
}
close FILE;
--- 1730,1748 ----
last if ( $self->{alive_} == 0 );
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
# not mistake a line beginning with . as the end of the block
!
! if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
! print FILE $before;
! }
!
! print FILE $_;
!
! last;
! }
!
! print FILE $_;
}
close FILE;
|
|
From: <ssc...@us...> - 2003-07-15 02:11:04
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv16780a
Modified Files:
TestLogger.tst
Log Message:
add test for size limitation of last ten
Index: TestLogger.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestLogger.tst,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestLogger.tst 13 Jul 2003 02:40:35 -0000 1.2
--- TestLogger.tst 15 Jul 2003 02:11:02 -0000 1.3
***************
*** 64,67 ****
--- 64,92 ----
test_assert_regexp( $last_ten[1], 'test2' );
+ # test size limiting on last ten
+ $l->debug( 'test3' );
+ $l->debug( 'test4' );
+ $l->debug( 'test5' );
+ $l->debug( 'test6' );
+ $l->debug( 'test7' );
+ $l->debug( 'test8' );
+ $l->debug( 'test9' );
+ $l->debug( 'test10' );
+ $l->debug( 'test11' );
+
+ @last_ten = $l->last_ten();
+
+ test_assert_equal( $#last_ten, 9 );
+ test_assert_regexp( $last_ten[0], 'test2' );
+ test_assert_regexp( $last_ten[1], 'test3' );
+ test_assert_regexp( $last_ten[2], 'test4' );
+ test_assert_regexp( $last_ten[3], 'test5' );
+ test_assert_regexp( $last_ten[4], 'test6' );
+ test_assert_regexp( $last_ten[5], 'test7' );
+ test_assert_regexp( $last_ten[6], 'test8' );
+ test_assert_regexp( $last_ten[7], 'test9' );
+ test_assert_regexp( $last_ten[8], 'test10' );
+ test_assert_regexp( $last_ten[9], 'test11' );
+
# Check the time function is working to generate times to the nearest day
test_assert_equal( $l->{today__}, int( time / 86400 ) * 86400 );
***************
*** 85,93 ****
# file gets deleted, this relies on the GNU date program
my $file = $l->debug_filename();
! `date --set='2 days'`;
$l->service();
my $exists = ( -e $file );
test_assert( $exists, "checking that debug file was deleted" );
! `date --set='1 day'`;
$l->service();
$exists = ( -e $file );
--- 110,118 ----
# file gets deleted, this relies on the GNU date program
my $file = $l->debug_filename();
! `date --set='2 days'`;
$l->service();
my $exists = ( -e $file );
test_assert( $exists, "checking that debug file was deleted" );
! `date --set='1 day'`;
$l->service();
$exists = ( -e $file );
|
|
From: <ssc...@us...> - 2003-07-15 02:10:26
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv16701
Modified Files:
TestConfiguration.tst
Log Message:
update for new pidfile routines
Index: TestConfiguration.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestConfiguration.tst,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestConfiguration.tst 13 Jul 2003 02:40:35 -0000 1.3
--- TestConfiguration.tst 15 Jul 2003 02:10:23 -0000 1.4
***************
*** 52,69 ****
test_assert_equal( $c->global_config_( 'msgdir' ), 'messages/' );
# Check that the PID file gets created and then deleted and
# contains the correct process ID
$c->config_( 'piddir', '../tests/' );
test_assert_equal( $c->start(), 1 );
! test_assert( ( -e 'popfile.pid' ) );
! open PIDFILE, '<popfile.pid';
! my $pid = <PIDFILE>;
! close PIDFILE;
! test_assert_equal( $pid, $$ );
open (STDERR, ">stdout.tmp");
! test_assert_equal( $c->start(), 0 );
close STDERR;
$c->stop();
- test_assert( !( -e 'popfile.pid' ) );
# Check that parameter upgrading works
--- 52,93 ----
test_assert_equal( $c->global_config_( 'msgdir' ), 'messages/' );
+
# Check that the PID file gets created and then deleted and
# contains the correct process ID
+
$c->config_( 'piddir', '../tests/' );
test_assert_equal( $c->start(), 1 );
! test_assert( $c->check_pid_() );
! test_assert_equal( $c->get_pid_(), $$ );
open (STDERR, ">stdout.tmp");
! test_assert_equal( $c->start(), 1 );
! $c->stop();
! test_assert( !$c->check_pid_() );
!
!
! # disable logging
!
! $c->global_config_( 'debug', 0 );
!
! # Check instance coordination via PID file
!
! $c->start();
! $c->{pid_delay__} = 1;
!
! my $process = fork;
!
! if ($process != 0) {
! #parent loop
! test_assert_equal( $c->start(), 0);
! test_assert( !defined( $c->live_check_() ) );
! } elsif ($process == 0) {
! #child loop
! select(undef, undef, undef, $c->{pid_delay__});
! $c->service();
! exit(0);
! }
!
close STDERR;
$c->stop();
# Check that parameter upgrading works
|
|
From: <ssc...@us...> - 2003-07-15 01:45:39
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv13729
Modified Files:
coverage.pl
Log Message:
update to handle forking tests
Index: coverage.pl
===================================================================
RCS file: /cvsroot/popfile/engine/coverage.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** coverage.pl 13 Jul 2003 05:21:21 -0000 1.1
--- coverage.pl 15 Jul 2003 01:45:36 -0000 1.2
***************
*** 26,30 ****
# Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
! # / or :: converted to -
$file =~ /^(.+)\.pm\.(-?\d+)\.lne$/;
--- 26,30 ----
# Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
! # / or :: converted to #
$file =~ /^(.+)\.pm\.(-?\d+)\.lne$/;
***************
*** 37,42 ****
--- 37,48 ----
open SOURCE_FILE, "<../$module.pm";
open LINE_DATA, "<$file";
+ #$module = $file;
my $current_line = 0;
+ $count{$module}{executed} = [];
+
+
+ $count{$module}{total_executable_lines} = 0;
+ $count{$module}{total_lines} = 0;
while ( <SOURCE_FILE> ) {
***************
*** 50,59 ****
if ( $state =~ /1/ ) {
$count{$module}{total_executable_lines} += 1;
! $count{$module}{total_executed} += 1;
! } else {
! if ( $state =~ /0/ ) {
! $count{$module}{total_executable_lines} += 1;
! } else {
! }
}
}
--- 56,63 ----
if ( $state =~ /1/ ) {
$count{$module}{total_executable_lines} += 1;
! $count{$module}{executed}[$current_line] = 1;
! } elsif ( $state =~ /0/ ) {
! $count{$module}{total_executable_lines} += 1;
! } else {
}
}
***************
*** 62,74 ****
close SOURCE_FILE;
- $files{$module} = int(100 * $count{$module}{total_executed} / $count{$module}{total_executable_lines}) unless ( $count{$module}{total_executable_lines} == 0 );
-
unlink $file;
}
foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
my $clean = $file;
$clean =~ s/^\.\.\/\///;
!
print sprintf( "Coverage of %-32s %d%%\n", "$clean...", $files{$file});
}
--- 66,88 ----
close SOURCE_FILE;
unlink $file;
}
+ foreach my $module ( keys( %count ) )
+ {
+ my $total_executed = 0;
+ foreach my $line ( 0 .. $#{$count{$module}{executed}} ) {
+ $total_executed++ if ($count{$module}{executed}[$line]);
+ }
+
+ $files{$module} = int(100 * $total_executed / $count{$module}{total_executable_lines}) unless ( $count{$module}{total_executable_lines} == 0 );
+ }
+
+
foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
+
my $clean = $file;
$clean =~ s/^\.\.\/\///;
!
print sprintf( "Coverage of %-32s %d%%\n", "$clean...", $files{$file});
}
|
|
From: <ssc...@us...> - 2003-07-14 23:08:34
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv24175
Modified Files:
Configuration.pm
Log Message:
update pid file checking to only delay startup if a "ghost" pid is found
Also provided some functions utilities can use to check if POPFile is running
Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Configuration.pm 12 Jul 2003 05:59:02 -0000 1.22
--- Configuration.pm 14 Jul 2003 23:08:31 -0000 1.23
***************
*** 31,35 ****
# All the current configuration parameters are stored in this hash which
! # is intended to be globally accessed by modules that make use of this module,
# to register a configuration default entries are made in this hash in the form
#
--- 31,35 ----
# All the current configuration parameters are stored in this hash which
! # is intended to be globally accessed by modules that make use of this module,
# to register a configuration default entries are made in this hash in the form
#
***************
*** 41,44 ****
--- 41,52 ----
$self->{pid_file__} = '';
+ # The time to delay checking of the PID file
+
+ $self->{pid_delay__} = 5;
+
+ # The last time the PID was checked
+
+ $self->{pid_check__} = time;
+
bless $self, $type;
***************
*** 73,77 ****
# purposes must sort on download_count and then message_count
#
! # download_count is incremented every time POPFile forks to
# start a session for downloading messages (see Proxy::Proxy::service
# for details)
--- 81,85 ----
# purposes must sort on download_count and then message_count
#
! # download_count is incremented every time POPFile forks to
# start a session for downloading messages (see Proxy::Proxy::service
# for details)
***************
*** 88,92 ****
$self->global_config_( 'xtc', 1 );
! # Adding the X-POPFile-Link is on
$self->global_config_( 'xpl', 1 );
--- 96,100 ----
$self->global_config_( 'xtc', 1 );
! # Adding the X-POPFile-Link is on
$self->global_config_( 'xpl', 1 );
***************
*** 113,127 ****
$self->{pid_file__} = $self->config_( 'piddir' ) . 'popfile.pid';
! if ( -e $self->{pid_file__} ) {
! my $error = "\n\nAnother copy of POPFile appears to be running. \nIf this is not the case then delete the file \n$self->{pid_file__} and restart POPFile.\n\n";
!
! print STDERR $error;
!
return 0;
}
! if ( open PID, ">$self->{pid_file__}" ) {
! print PID "$$\n";
! close PID;
}
--- 121,157 ----
$self->{pid_file__} = $self->config_( 'piddir' ) . 'popfile.pid';
! if (defined($self->live_check_())) {
return 0;
}
! $self->write_pid_();
!
! return 1;
! }
!
! # ---------------------------------------------------------------------------------------------
! #
! # service
! #
! # service() is a called periodically to give the module a chance to do housekeeping work.
! #
! # If any problem occurs that requires POPFile to shutdown service() should return 0 and
! # the top level process will gracefully terminate POPFile including calling all stop()
! # methods. In normal operation return 1.#
! # ---------------------------------------------------------------------------------------------
! sub service
! {
! my ( $self ) = @_;
!
! my $time = time;
!
! if ( $self->{pid_check__} <= ( $time - $self->{pid_delay__})) {
!
! $self->{pid_check__} = $time;
!
! if ( !$self->check_pid_() ) {
! $self->write_pid_();
! $self->log_("New POPFile instance detected and signalled")
! }
}
***************
*** 129,132 ****
--- 159,164 ----
}
+
+
# ---------------------------------------------------------------------------------------------
#
***************
*** 142,148 ****
--- 174,283 ----
$self->save_configuration();
+ $self->delete_pid_();
+ }
+
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # live_check_
+ #
+ # Checks if an instance of POPFile is currently running. Takes 10 seconds.
+ # Returns the process-ID of the currently running POPFile, undef if none.
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub live_check_
+ {
+ my ( $self ) = @_;
+
+ if ( $self->check_pid_() ) {
+
+ my $error = "\n\nA copy of POPFile appears to be running.\n Attempting to signal the previous copy.\n Waiting " . ($self->{pid_delay__} * 2) . " seconds for a reply.\n";
+
+ $self->delete_pid_();
+
+ print STDERR $error;
+
+ select(undef, undef, undef, ($self->{pid_delay__} * 2));
+
+ my $pid = $self->get_pid_();
+
+ if (defined($pid)) {
+ $error = "\n A copy of POPFile is running.\n It has signalled that it is alive with proccess ID: $pid\n";
+ print STDERR $error;
+ return $pid;
+ }
+ }
+ return undef;
+ }
+
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # check_pid_
+ #
+ # returns 1 if the pid file exists, 0 otherwise
+ #
+ # ---------------------------------------------------------------------------------------------
+
+ sub check_pid_
+ {
+ my ( $self ) = @_;
+ return (-e $self->{pid_file__});
+ }
+
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # get_pid_
+ #
+ # returns the pidfile proccess ID if a pid file is present, undef otherwise (0 might be a valid PID)
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub get_pid_
+ {
+ my ( $self ) = @_;
+
+ if (open PID, $self->{pid_file__}) {
+ my $pid = <PID>;
+ $pid =~ s/[\r\n]//g;
+ close PID;
+ return $pid;
+ }
+
+ return undef;
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # write_pid_
+ #
+ # writes the current process-ID into the pid file
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub write_pid_
+ {
+ my ( $self ) = @_;
+
+ if ( open PID, ">$self->{pid_file__}" ) {
+ print PID "$$\n";
+ close PID;
+ }
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # delete_pid_
+ #
+ # deletes the pid file
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub delete_pid_
+ {
+ my ( $self ) = @_;
+
unlink( $self->{pid_file__} );
}
+
# ---------------------------------------------------------------------------------------------
#
***************
*** 284,288 ****
if ( open CONFIG, "<popfile.cfg" ) {
while ( <CONFIG> ) {
! s/(\015|\012)//g;
if ( /(\S+) (.+)/ ) {
my $parameter = $1;
--- 419,423 ----
if ( open CONFIG, "<popfile.cfg" ) {
while ( <CONFIG> ) {
! s/(\015|\012)//g;
if ( /(\S+) (.+)/ ) {
my $parameter = $1;
|
|
From: <xue...@us...> - 2003-07-14 19:30:26
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv14133 Modified Files: English-pfi.nsh Log Message: Adjusted the CBP status messages to suit the new page layout. Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** English-pfi.nsh 13 Jul 2003 17:36:14 -0000 1.6 --- English-pfi.nsh 14 Jul 2003 19:30:19 -0000 1.7 *************** *** 143,150 **** ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" --- 143,150 ---- ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "\r\nThere is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "\r\nYou must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "\r\nAt least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "\r\nInstaller cannot create more than" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" |
|
From: <xue...@us...> - 2003-07-14 19:29:48
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv13992 Modified Files: German-pfi.nsh Log Message: German Translation provided by Matthias Deege (pfaelzerchen). Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** German-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- German-pfi.nsh 14 Jul 2003 19:29:45 -0000 1.7 *************** *** 43,48 **** #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)" #-------------------------------------------------------------------------- --- 43,48 ---- #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Hinweise zu dieser POPFile-Version anzeigen?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Ja' wird empfohlen, wenn Sie von einer älteren Version updaten (Sie müssen evtl. Backups VOR dem Update anlegen)" #-------------------------------------------------------------------------- *************** *** 50,56 **** #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl." ! !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI." #-------------------------------------------------------------------------- --- 50,56 ---- #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installiert die Kernkomponenten inklusive einer Minimalversion des Perl-Interpreters." ! !insertmacro PFI_LANG_STRING DESC_SecSkins "Installiert POPFile Skins, mit denen Sie die Benutzeroberfläche von POPFile anpassen können." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Installiert weitere (nicht-englische) Sprachen für die Benutzeroberfläche." #-------------------------------------------------------------------------- *************** *** 60,73 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts (runs in background)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN EXISTING VERSION" ; Message Boxes used when validating user's selections --- 60,73 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installationseinstellungen" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Lassen Sie diese Einstellungen unverändert, sofern Sie sie nicht ändern müssen" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Wählen Sie den Standart-Port für POP3-Verbindungen (110 empfohlen)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Wählen Sie den Standard-Port für Verbindungen zur Benutzeroberfläche (8080 empfohlen)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "POPFile mit Windows starten (läuft unsichtbar im Hintergrund)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "WICHTIGER HINWEIS" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "WENN SIE POPFILE UPDATEN: SETUP WIRD DIE EXISTIERENDE VERSION BEENDEN" ; Message Boxes used when validating user's selections *************** *** 77,95 **** !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Please change your POP3 port selection." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "The 'User Interface' port cannot be set to" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "The port must be a number in the range 1 to 65535." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Please change your 'User Interface' port selection." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." ; Banner message displayed whilst uninstalling old version !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- --- 77,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "Der POP3-Port kann nicht übernommen werden." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "Der Port muß eine Zahl zwischen 1 und 65535 sein." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Bitte korrigieren Sie ihre Eingabe für den POP3-Port." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "Der Port für die Benutzeroberfläche kann nicht übernommen werden." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "Der Port muß eine Zahl zwischen 1 und 65535 sein." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Bitte korrigieren Sie ihre Eingabe für den Port für die Benutzeroberfläche." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "POP3-Port und Port für die Benutzeroberfläche dürfen nicht identisch sein." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Bitte ändern Sie ihre Port-Einstellungen." ; Banner message displayed whilst uninstalling old version !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "Dies kann einige Sekunden dauern..." #-------------------------------------------------------------------------- *************** *** 99,125 **** ; Installation Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicken Sie auf Weiter um fortzufahren" ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Shutting down previous version of POPFile using port" ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "file from previous installation found." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "OK to update this file ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Click 'Yes' to update it (old file will be saved as" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Click 'No' to keep the old file (new file will saved as" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup copy of" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "already exists" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "OK to overwrite this file?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Click 'Yes' to overwrite, click 'No' to skip making a backup copy" #-------------------------------------------------------------------------- --- 99,125 ---- ; Installation Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Suche evtl. existierende ältere Versionen..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installiere Kernkomponenten..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installiere Minimal-Perl-Umgebung..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Erzeuge Verknüpfungen..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installiere Skins..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installiere Sprachdateien..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Klicken Sie auf Weiter um fortzufahren" ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Beende ältere POPFile Version am Port" ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "Datei einer älteren Version gefunden." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "Diese Datei aktualisieren?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Wählen Sie 'Ja', um diese zu aktualisieren (Die alte Datei wird gespeichert unter" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Wählen Sie 'Nein', um die alte Datei zu behalten (Die neue Datei wird gespeichert unter" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup von" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "existiert bereits" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "Diese Datei überschreiben?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Wählen Sie 'Ja', um diese zu überschreiben, 'Nein', um kein neues Backup anzulegen." #-------------------------------------------------------------------------- *************** *** 129,179 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Entfernen" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Fortzufahren" ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "A bucket called" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "has already been defined." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Please choose a different name for the new bucket." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "The installer can only create up to" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "buckets." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Once POPFile has been installed you can create more than" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "The name" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "is not a valid name for a bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Kategorienamen können nur Kleinbuchstaben von a bis z, Ziffern von 0 bis 9, - oder _ enthalten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Please choose a different name for the new bucket." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,$\r$\n$\r$\neither by picking a suggested name from the drop-down list$\r$\n$\r$\nor by typing in a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "buckets have been defined for use by POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Do you want to configure POPFile to use these buckets?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Click 'No' if you wish to change your bucket selections." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "The installer was unable to create" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "of the" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "buckets you selected." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Once POPFile has been installed you can use its 'User Interface'$\r$\n$\r$\ncontrol panel to create the missing bucket(s)." #-------------------------------------------------------------------------- --- 129,179 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Klassifikationskategorien erstellen" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile benötigt MINDESTENS ZWEI Kategorien, um Ihre Emails klassifizieren zu können" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "Nach der Installation können Sie die Anzahl der Kategorien (und deren Name) ohne Probleme an ihre Bedürfnisse anpassen.\r\n\r\nKategorienamen bestehen aus Kleinbuchstaben, Ziffern von 0 bis 9, Bindestrich oder Unterstrich." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Erstellen Sie eine neue Kategorie, indem Sie entweder einen Namen aus der Liste wählen oder einen Namen ihrer Wahl eingeben." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "Um eine oder mehr Kategorien von der Liste zu löschen, markieren Sie entsprechende(n) 'Entfernen' Box(en) und klicken Sie auf 'Weiter'." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Bereits eingerichtete Kategorien" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Entfernen" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Weiter" ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "Sie müssen keine weiteren Kategorien hinzufügen" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "Sie müssen MINDESTENS zwei Kategorien angeben" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "Mindestens eine weitere Kategorie wird benötigt" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Der Installer kann nicht mehr als" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "Kategorien anlegen." ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "Eine Kategorie mit dem Namen" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "wurde bereits angelegt." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Bitte wählen Sie einen anderen Namen für die neue Kategorie." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "Der Installer kann nur bis zu" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "Kategorien anlegen." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Nach der Installation können Sie mehr als" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "Der Name" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "ist ungültig." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Kategorienamen können nur Kleinbuchstaben von a bis z, Ziffern von 0 bis 9, - oder _ enthalten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Bitte wählen Sie einen anderen Namen für die neue Kategorie." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile benötigt MINDESTES ZWEI Kategorien, um ihre Emails klassifizieren zu können." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Bitte geben Sie den Namen einer zu erstellenden Kategorie ein,$\r$\n$\r$\nindem Sie entweder einen der Vorschläge aus der Liste auswählen$\r$\n$\r$\noder indem Sie einen Namen Ihrer Wahl eingeben." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "Sie müssen MINDESTENS ZWEI Kategorien anlegen, bevor Sie die Installation fortsetzen können." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "Kategeforien zur Nutzung durch POPFile wurden angelegt." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Sollen diese Kategorien für POPFile eingerichtet werden?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Wählen Sie 'Nein', wenn Sie Ihre Auswahl korrigieren möchten." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "Der Installer konnte" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "der " ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "von Ihnen angegebenen Kategorien nicht einrichten." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Nach Abschluß der Installation können Sie über die Benutzeroberfläche die fehlende(n) Kategorie(n) nachträglich einrichten." #-------------------------------------------------------------------------- *************** *** 183,200 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigure Outlook Express" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile can reconfigure Outlook Express for you" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigure this account to work with POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email address:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 server:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 username:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "account for the" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identity" #-------------------------------------------------------------------------- --- 183,200 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Outlook Express konfigurieren" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile kann Outlook Express automatisch zur Nutzung mit POPFile konfigurieren" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile hat die folgenden Outlook Express Email-Konten erkannt und kann diese automatisch zur Nutzung mit POPFile konfigurieren" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Account zur Nutzung mit POPFile konfigurieren" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email Adresse:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 Server:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 Benutzername:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "Wenn Sie POPFile deinstallieren, werden die alten Einstellungen wiederhergestellt" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "Account für die" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "Identität" #-------------------------------------------------------------------------- *************** *** 204,224 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- --- 204,224 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile kann nun gestartet werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "Die POPFile Benutzeroberfläche funktioniert nur, wenn POPFile gestartet wurde" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "POPFile jetzt starten?" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "Nein (Die Benutzeroberfläche kann bis zum Start von POPFile nicht verwendet werden)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "POPFile starten (in einem Fenster)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "POPFile im Hintergrund starten (kein Fenster anzeigen)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Wenn POPFile gestartet wurde, können Sie die Benutzeroberfläche aufrufen, indem" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) Sie auf das POPFile-Symbol neben der Uhr doppelklicken oder indem" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) Sie Start --> Programme --> POPFile --> POPFile User Interface wählen." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Start von POPFile vorbereiten." ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "Dies kann einige Sekunden dauern..." #-------------------------------------------------------------------------- *************** *** 228,258 **** ; Uninstall Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Shutting down POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Deleting 'Start Menu' entries for POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Deleting POPFile core files..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Restoring Outlook Express settings..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Deleting POPFile skins files..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Deleting minimal Perl files..." ; Uninstall Log Messages ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Shutting down POPFile using port" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Opened" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Restored" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Closed" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Removing all files from POPFile directory" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Note: unable to remove all files from POPFile directory" ; Message Box text strings ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continue anyway (not recommended) ?" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Uninstall aborted by user" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?$\r$\n$\r$\n(If you have anything you created that you want to keep, click No)" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Note" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "could not be removed." #-------------------------------------------------------------------------- --- 228,258 ---- ; Uninstall Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "POPFile beenden..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Startmenü-Einträge von POPFile löschen..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Kernkomponenten löschen..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Outlook Express Einstellungen wiederherstellen..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Skins löschen..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Minimal-Perl-Umgebung löschen..." ; Uninstall Log Messages ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Beende POPFile am Port" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Geöffnet" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Wiederhergestellt" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Geschlossen" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Alle Dateien im POPFile-Verzeichnis löschen" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Hinweis: Es konnten nicht alle Dateien im POPFile-Verzeichnis gelöscht werden" ; Message Box text strings ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "POPFile scheint nicht im folgenden Verzeichnis installiert zu sein:" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Trotzdem fortfahren (nicht empfohlen)?" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Deinstallation vom Anwender abgebrochen" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Wollen Sie alle Dateien im POPFile-Verzeichnis löschen? (Wenn Sie irgendetwas erstellt haben, was sie behalten möchten, wählen Sie Nein)" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Hinweis" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "konnte nicht entfernt werden." #-------------------------------------------------------------------------- |
|
From: <xue...@us...> - 2003-07-14 09:45:49
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27140
Modified Files:
CBP.nsh
Log Message:
Bucket list rearranged to make room for an extra line of text in the status message area.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CBP.nsh 13 Jul 2003 17:30:32 -0000 1.16
--- CBP.nsh 14 Jul 2003 09:45:43 -0000 1.17
***************
*** 716,720 ****
; Constants used to position the bucket names
! !define CBP_BN_NAME_LEFT 157
!define CBP_BN_NAME_RIGHT 250
--- 716,720 ----
; Constants used to position the bucket names
! !define CBP_BN_NAME_LEFT 160
!define CBP_BN_NAME_RIGHT 250
***************
*** 727,752 ****
!define CBP_BN_ROW_1_TOP 12
! !define CBP_BN_ROW_1_BOTTOM 22
! !define CBP_BN_ROW_2_TOP 27
! !define CBP_BN_ROW_2_BOTTOM 37
! !define CBP_BN_ROW_3_TOP 42
! !define CBP_BN_ROW_3_BOTTOM 52
! !define CBP_BN_ROW_4_TOP 57
! !define CBP_BN_ROW_4_BOTTOM 67
! !define CBP_BN_ROW_5_TOP 72
! !define CBP_BN_ROW_5_BOTTOM 82
! !define CBP_BN_ROW_6_TOP 87
! !define CBP_BN_ROW_6_BOTTOM 97
! !define CBP_BN_ROW_7_TOP 102
! !define CBP_BN_ROW_7_BOTTOM 112
! !define CBP_BN_ROW_8_TOP 117
! !define CBP_BN_ROW_8_BOTTOM 127
; Basic macro used to create the INI file
--- 727,752 ----
!define CBP_BN_ROW_1_TOP 12
! !define CBP_BN_ROW_1_BOTTOM 20
! !define CBP_BN_ROW_2_TOP 26
! !define CBP_BN_ROW_2_BOTTOM 34
! !define CBP_BN_ROW_3_TOP 40
! !define CBP_BN_ROW_3_BOTTOM 48
! !define CBP_BN_ROW_4_TOP 54
! !define CBP_BN_ROW_4_BOTTOM 62
! !define CBP_BN_ROW_5_TOP 68
! !define CBP_BN_ROW_5_BOTTOM 76
! !define CBP_BN_ROW_6_TOP 82
! !define CBP_BN_ROW_6_BOTTOM 90
! !define CBP_BN_ROW_7_TOP 96
! !define CBP_BN_ROW_7_BOTTOM 104
! !define CBP_BN_ROW_8_TOP 110
! !define CBP_BN_ROW_8_BOTTOM 118
; Basic macro used to create the INI file
***************
*** 841,845 ****
"Label" \
" " \
! "154" "300" "132" "140"
; Box enclosing the list of bucket names defined so far
--- 841,845 ----
"Label" \
" " \
! "157" "300" "124" "140"
; Box enclosing the list of bucket names defined so far
***************
*** 848,852 ****
"GroupBox" \
"$(PFI_LANG_CBP_IO_LISTHDR)" \
! "153" "300" "0" "130"
; Text for GroupBox lines 1 to 8
--- 848,852 ----
"GroupBox" \
"$(PFI_LANG_CBP_IO_LISTHDR)" \
! "153" "300" "0" "124"
; Text for GroupBox lines 1 to 8
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv26800 Modified Files: Bulgarian-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Hungarian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Ukrainian-pfi.nsh Log Message: Revised OPTIONS page 'upgrade uninstall' text. Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Bulgarian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Bulgarian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Danish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Danish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Dutch-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Dutch-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Finnish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Finnish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** French-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- French-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** German-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- German-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Hungarian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Hungarian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Japanese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 --- Japanese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Korean-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 --- Korean-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Portuguese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Portuguese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PortugueseBR-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- PortugueseBR-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Russian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Russian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimpChinese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- SimpChinese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Slovak-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Slovak-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Spanish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Spanish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Swedish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Swedish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TradChinese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 --- TradChinese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Ukrainian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- Ukrainian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" |
|
From: <xue...@us...> - 2003-07-13 17:36:17
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv26723 Modified Files: English-pfi.nsh Log Message: Revised OPTIONS page 'upgrade uninstall' text and updated CBP page 'Create'/'Delete' texts to match changes to field sizes. Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** English-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 --- English-pfi.nsh 13 Jul 2003 17:36:14 -0000 1.6 *************** *** 73,79 **** ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" --- 73,79 ---- ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" *************** *** 135,140 **** !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Remove" --- 135,140 ---- !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "\r\nCreate a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "\r\nTo delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Remove" |
|
From: <xue...@us...> - 2003-07-13 17:32:32
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26443
Modified Files:
installer.nsi
Log Message:
Split large message area on STARTUP page into three parts to allow for up to two lines of text in each part.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** installer.nsi 13 Jul 2003 13:04:18 -0000 1.88
--- installer.nsi 13 Jul 2003 17:32:29 -0000 1.89
***************
*** 1142,1148 ****
MessageBox MB_YESNO|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBUNINST_1)$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBUNINST_2)$\r$\n$\r$\n\
! $(PFI_LANG_OPTIONS_MBUNINST_3)" IDNO continue
Banner::show /NOUNLOAD /set 76 "$(PFI_LANG_OPTIONS_BANNER_1)" "$(PFI_LANG_OPTIONS_BANNER_2)"
--- 1142,1148 ----
MessageBox MB_YESNO|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBUNINST_1) '$INSTDIR'$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBUNINST_2)$\r$\n$\r$\n\
! ($(PFI_LANG_OPTIONS_MBUNINST_3))" IDNO continue
Banner::show /NOUNLOAD /set 76 "$(PFI_LANG_OPTIONS_BANNER_1)" "$(PFI_LANG_OPTIONS_BANNER_2)"
***************
*** 1553,1561 ****
!insertmacro PFI_IO_TEXT "ioC.ini" "3" "$(PFI_LANG_LAUNCH_IO_DOSBOX)"
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
!
! !insertmacro PFI_IO_TEXT "ioC.ini" "6" \
! "$(PFI_LANG_LAUNCH_IO_NOTE_1)\r\n\r\n\
! $(PFI_LANG_LAUNCH_IO_NOTE_2)\r\n\r\n\
! $(PFI_LANG_LAUNCH_IO_NOTE_3)"
FunctionEnd
--- 1553,1560 ----
!insertmacro PFI_IO_TEXT "ioC.ini" "3" "$(PFI_LANG_LAUNCH_IO_DOSBOX)"
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
!
! !insertmacro PFI_IO_TEXT "ioC.ini" "6" "$(PFI_LANG_LAUNCH_IO_NOTE_1)"
! !insertmacro PFI_IO_TEXT "ioC.ini" "7" "$(PFI_LANG_LAUNCH_IO_NOTE_2)"
! !insertmacro PFI_IO_TEXT "ioC.ini" "8" "$(PFI_LANG_LAUNCH_IO_NOTE_3)"
FunctionEnd
|
|
From: <xue...@us...> - 2003-07-13 17:30:37
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26225
Modified Files:
CBP.nsh ioC.ini
Log Message:
Split large message area on STARTUP page into three parts to allow for up to two lines of text in each part.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CBP.nsh 13 Jul 2003 12:38:32 -0000 1.15
--- CBP.nsh 13 Jul 2003 17:30:32 -0000 1.16
***************
*** 827,831 ****
"ComboBox" \
"A|B" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "92" "160"
; Instruction for deleting bucket names from the list
--- 827,831 ----
"ComboBox" \
"A|B" \
! "${CBP_INFO_LEFT_MARGIN}" "100" "92" "160"
; Instruction for deleting bucket names from the list
Index: ioC.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioC.ini,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ioC.ini 13 Jul 2003 12:38:32 -0000 1.8
--- ioC.ini 13 Jul 2003 17:30:32 -0000 1.9
***************
*** 11,15 ****
[Settings]
! NumFields=6
BackEnabled=0
CancelEnabled=0
--- 11,15 ----
[Settings]
! NumFields=8
BackEnabled=0
CancelEnabled=0
***************
*** 64,68 ****
Right=298
Top=85
! Bottom=138
#--------------------
--- 64,84 ----
Right=298
Top=85
! Bottom=101
!
! [Field 7]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=103
! Bottom=119
!
! [Field 8]
! Type=Label
! Text=
! Left=5
! Right=298
! Top=121
! Bottom=137
#--------------------
|
|
From: <xue...@us...> - 2003-07-13 13:04:27
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21463
Modified Files:
installer.nsi
Log Message:
Stopped the 'upgrade' uninstall from removing the history.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** installer.nsi 12 Jul 2003 23:23:20 -0000 1.87
--- installer.nsi 13 Jul 2003 13:04:18 -0000 1.88
***************
*** 1992,1997 ****
--- 1992,2000 ----
Delete $INSTDIR\stopwords.bak
Delete $INSTDIR\stopwords.default
+
+ StrCmp ${L_UPGRADE} "yes" remove_perl
!insertmacro SafeRecursiveRMDir "$INSTDIR\messages"
+ remove_perl:
SetDetailsPrint textonly
DetailPrint "$(un.PFI_LANG_PROGRESS_6)"
|
|
From: <xue...@us...> - 2003-07-13 12:38:36
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv18664
Modified Files:
CBP.nsh ioA.ini ioB.ini ioC.ini
Log Message:
Increased the sizes of fields used to hold strings (most can now hold two lines of text)
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CBP.nsh 12 Jul 2003 23:22:19 -0000 1.14
--- CBP.nsh 13 Jul 2003 12:38:32 -0000 1.15
***************
*** 712,716 ****
!define CBP_INFO_LEFT_MARGIN 0
! !define CBP_INFO_RIGHT_MARGIN 141
; Constants used to position the bucket names
--- 712,716 ----
!define CBP_INFO_LEFT_MARGIN 0
! !define CBP_INFO_RIGHT_MARGIN 150
; Constants used to position the bucket names
***************
*** 813,817 ****
"Label" \
"$(PFI_LANG_CBP_IO_INTRO)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "0" "60"
; Label for the "Create Bucket" ComboBox
--- 813,817 ----
"Label" \
"$(PFI_LANG_CBP_IO_INTRO)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "0" "56"
; Label for the "Create Bucket" ComboBox
***************
*** 820,824 ****
"Label" \
"$(PFI_LANG_CBP_IO_CREATE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "63" "87"
; ComboBox used to create a new bucket
--- 820,824 ----
"Label" \
"$(PFI_LANG_CBP_IO_CREATE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "58" "90"
; ComboBox used to create a new bucket
***************
*** 827,831 ****
"ComboBox" \
"A|B" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "90" "170"
; Instruction for deleting bucket names from the list
--- 827,831 ----
"ComboBox" \
"A|B" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "92" "160"
; Instruction for deleting bucket names from the list
***************
*** 834,838 ****
"Label" \
"$(PFI_LANG_CBP_IO_DELETE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "107" "140"
; Label used to display progress reports
--- 834,838 ----
"Label" \
"$(PFI_LANG_CBP_IO_DELETE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "108" "140"
; Label used to display progress reports
***************
*** 841,845 ****
"Label" \
" " \
! "155" "299" "132" "140"
; Box enclosing the list of bucket names defined so far
--- 841,845 ----
"Label" \
" " \
! "154" "300" "132" "140"
; Box enclosing the list of bucket names defined so far
***************
*** 848,852 ****
"GroupBox" \
"$(PFI_LANG_CBP_IO_LISTHDR)" \
! "150" "300" "0" "130"
; Text for GroupBox lines 1 to 8
--- 848,852 ----
"GroupBox" \
"$(PFI_LANG_CBP_IO_LISTHDR)" \
! "153" "300" "0" "130"
; Text for GroupBox lines 1 to 8
Index: ioA.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioA.ini,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ioA.ini 4 Jul 2003 19:44:38 -0000 1.13
--- ioA.ini 13 Jul 2003 12:38:32 -0000 1.14
***************
*** 19,23 ****
Right=300
Top=0
! Bottom=10
[Field 2]
--- 19,23 ----
Right=300
Top=0
! Bottom=16
[Field 2]
***************
*** 26,31 ****
Left=0
Right=70
! Top=15
! Bottom=70
[Field 3]
--- 26,31 ----
Left=0
Right=70
! Top=17
! Bottom=72
[Field 3]
***************
*** 35,39 ****
Right=300
Top=40
! Bottom=50
[Field 4]
--- 35,39 ----
Right=300
Top=40
! Bottom=56
[Field 4]
***************
*** 42,47 ****
Left=0
Right=70
! Top=55
! Bottom=110
[Field 5]
--- 42,47 ----
Left=0
Right=70
! Top=57
! Bottom=112
[Field 5]
***************
*** 51,55 ****
Right=300
Top=80
! Bottom=90
[Field 6]
--- 51,55 ----
Right=300
Top=80
! Bottom=96
[Field 6]
***************
*** 59,71 ****
Right=300
Top=100
! Bottom=-5
[Field 7]
Type=label
Text=
! Left=6
Right=298
Top=115
! Bottom=125
#--------------------
--- 59,71 ----
Right=300
Top=100
! Bottom=140
[Field 7]
Type=label
Text=
! Left=5
Right=298
Top=115
! Bottom=139
#--------------------
Index: ioB.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioB.ini,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ioB.ini 5 Jul 2003 12:44:24 -0000 1.7
--- ioB.ini 13 Jul 2003 12:38:32 -0000 1.8
***************
*** 21,25 ****
Right=300
Top=0
! Bottom=20
[Field 2]
--- 21,25 ----
Right=300
Top=0
! Bottom=16
[Field 2]
***************
*** 29,57 ****
Right=300
Top=20
! Bottom=40
[Field 3]
Type=label
Text=
! Left=16
Right=95
! Top=59
! Bottom=75
[Field 4]
Type=label
Text=
! Left=16
Right=95
! Top=75
! Bottom=91
[Field 5]
Type=label
Text=
! Left=16
Right=95
! Top=91
! Bottom=107
[Field 6]
--- 29,57 ----
Right=300
Top=20
! Bottom=36
[Field 3]
Type=label
Text=
! Left=5
Right=95
! Top=60
! Bottom=76
[Field 4]
Type=label
Text=
! Left=5
Right=95
! Top=78
! Bottom=94
[Field 5]
Type=label
Text=
! Left=5
Right=95
! Top=96
! Bottom=112
[Field 6]
***************
*** 60,65 ****
Left=0
Right=300
! Top=118
! Bottom=137
[Field 7]
--- 60,65 ----
Left=0
Right=300
! Top=120
! Bottom=136
[Field 7]
***************
*** 68,73 ****
Left=96
Right=300
! Top=59
! Bottom=75
[Field 8]
--- 68,73 ----
Left=96
Right=300
! Top=60
! Bottom=76
[Field 8]
***************
*** 76,81 ****
Left=96
Right=300
! Top=75
! Bottom=91
[Field 9]
--- 76,81 ----
Left=96
Right=300
! Top=78
! Bottom=94
[Field 9]
***************
*** 84,97 ****
Left=96
Right=300
! Top=91
! Bottom=107
[Field 10]
Type=GroupBox
Text=
! Left=11
! Right=-20
Top=44
! Bottom=110
#--------------------
--- 84,97 ----
Left=96
Right=300
! Top=96
! Bottom=112
[Field 10]
Type=GroupBox
Text=
! Left=0
! Right=300
Top=44
! Bottom=115
#--------------------
Index: ioC.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioC.ini,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ioC.ini 12 Jul 2003 23:20:31 -0000 1.7
--- ioC.ini 13 Jul 2003 12:38:32 -0000 1.8
***************
*** 21,25 ****
Right=300
Top=0
! Bottom=60
[Field 2]
--- 21,25 ----
Right=300
Top=0
! Bottom=70
[Field 2]
***************
*** 28,33 ****
Left=5
Right=298
! Top=12
! Bottom=22
Flags=Group
--- 28,33 ----
Left=5
Right=298
! Top=10
! Bottom=26
Flags=Group
***************
*** 37,42 ****
Left=5
Right=298
! Top=27
! Bottom=37
[Field 4]
--- 37,42 ----
Left=5
Right=298
! Top=30
! Bottom=46
[Field 4]
***************
*** 45,50 ****
Left=5
Right=298
! Top=42
! Bottom=52
State=1
--- 45,50 ----
Left=5
Right=298
! Top=50
! Bottom=66
State=1
***************
*** 55,59 ****
Right=300
Top=75
! Bottom=135
Flags=Group
--- 55,59 ----
Right=300
Top=75
! Bottom=139
Flags=Group
***************
*** 64,68 ****
Right=298
Top=85
! Bottom=130
#--------------------
--- 64,68 ----
Right=298
Top=85
! Bottom=138
#--------------------
|
|
From: <ssc...@us...> - 2003-07-13 10:51:31
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv7140
Modified Files:
HTML.pm
Log Message:
fix for case in precaching code where POPFile exits with precached messages
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** HTML.pm 13 Jul 2003 09:13:12 -0000 1.181
--- HTML.pm 13 Jul 2003 10:51:22 -0000 1.182
***************
*** 268,271 ****
--- 268,273 ----
my ( $self ) = @_;
+ $self->copy_pre_cache__();
+
$self->save_disk_cache__();
}
***************
*** 3106,3115 ****
}
! # Copy the history pre-cache over AFTER any possibly index-based remove operations are complete
! foreach my $file ( keys( %{$self->{history_pre_cache__}} ) ) {
! $self->{history__}{$file} = $self->{history_pre_cache__}{$file};
! delete $self->{history_pre_cache__}{$file};
! }
! $self->{history_pre_cache__} = {};
# If the history cache is invalid then we need to reload it and then if
--- 3108,3112 ----
}
! $self->copy_pre_cache__();
# If the history cache is invalid then we need to reload it and then if
***************
*** 3663,3666 ****
--- 3660,3681 ----
close LANG;
}
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ # copy_pre_cache__
+ #
+ # Copies the history_pre_cache into the history
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub copy_pre_cache__
+ {
+ my ($self) = @_;
+
+ # Copy the history pre-cache over AFTER any possibly index-based remove operations are complete
+ foreach my $file ( keys( %{$self->{history_pre_cache__}} ) ) {
+ $self->{history__}{$file} = \%{$self->{history_pre_cache__}{$file}};
+ delete $self->{history_pre_cache__}{$file};
+ }
+ $self->{history_pre_cache__} = {};
}
|
|
From: <ssc...@us...> - 2003-07-13 09:13:16
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv30312
Modified Files:
HTML.pm
Log Message:
[ 769688 ] 0.19.0: Message ID lost when message comes while using cc.
Fixed.
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** HTML.pm 12 Jul 2003 00:22:32 -0000 1.180
--- HTML.pm 13 Jul 2003 09:13:12 -0000 1.181
***************
*** 87,90 ****
--- 87,96 ----
$self->{need_resort__} = 0;
+ # Hash containing pre-cached messages loaded upon receipt of NEWFL message. Moved to
+ # $self->{history_keys__} on each invocation of the history page.
+ # Structure is identical to $self->{history_keys__}
+
+ $self->{history_pre_cache__} = {};
+
# A hash containing a mapping between alphanumeric identifiers and appropriate strings used
# for localization. The string may contain sprintf patterns for use in creating grammatically
***************
*** 2422,2429 ****
if ( $first =~ /___HISTORY__ __ VERSION__ 1/ ) {
while ( my $line = <CACHE> ) {
! if ( !( $line =~ /__HISTORY__ __BOUNDARY__/ ) ) {
$self->log_( "Problem in history_cache file, expecting boundary got $line" );
last;
! }
$line = <CACHE>;
--- 2428,2435 ----
if ( $first =~ /___HISTORY__ __ VERSION__ 1/ ) {
while ( my $line = <CACHE> ) {
! if ( !( $line =~ /__HISTORY__ __BOUNDARY__/ ) ) {
$self->log_( "Problem in history_cache file, expecting boundary got $line" );
last;
! }
$line = <CACHE>;
***************
*** 2634,2645 ****
$short_subject =~ s/>/>/g;
! $self->{history__}{$file}{bucket} = $bucket;
! $self->{history__}{$file}{reclassified} = $reclassified;
! $self->{history__}{$file}{magnet} = $magnet;
! $self->{history__}{$file}{subject} = $subject;
! $self->{history__}{$file}{from} = $from;
! $self->{history__}{$file}{short_subject} = $short_subject;
! $self->{history__}{$file}{short_from} = $short_from;
! $self->{history__}{$file}{cull} = 0;
if ( !defined( $index ) ) {
--- 2640,2660 ----
$short_subject =~ s/>/>/g;
! # If the index is known, stick it straight into the history else# go into
! # the precache for merging into history when the history is viewed next
!
! my $cache = 'history__';
! if ( !defined( $index ) ) {
! $cache = 'history_pre_cache__';
! }
!
!
! $self->{$cache}{$file}{bucket} = $bucket;
! $self->{$cache}{$file}{reclassified} = $reclassified;
! $self->{$cache}{$file}{magnet} = $magnet;
! $self->{$cache}{$file}{subject} = $subject;
! $self->{$cache}{$file}{from} = $from;
! $self->{$cache}{$file}{short_subject} = $short_subject;
! $self->{$cache}{$file}{short_from} = $short_from;
! $self->{$cache}{$file}{cull} = 0;
if ( !defined( $index ) ) {
***************
*** 2847,2851 ****
my $fpcount = $self->{classifier__}->get_bucket_parameter( $bucket, 'fpcount' );
$self->{classifier__}->set_bucket_parameter( $bucket, 'fpcount', $fpcount+1 );
! }
# Update the class file
--- 2862,2866 ----
my $fpcount = $self->{classifier__}->get_bucket_parameter( $bucket, 'fpcount' );
$self->{classifier__}->set_bucket_parameter( $bucket, 'fpcount', $fpcount+1 );
! }
# Update the class file
***************
*** 2873,2877 ****
foreach my $newbucket (keys %work) {
$self->{classifier__}->add_messages_to_bucket( $newbucket, @{$work{$newbucket}} );
! }
}
}
--- 2888,2892 ----
foreach my $newbucket (keys %work) {
$self->{classifier__}->add_messages_to_bucket( $newbucket, @{$work{$newbucket}} );
! }
}
}
***************
*** 3091,3094 ****
--- 3106,3116 ----
}
+ # Copy the history pre-cache over AFTER any possibly index-based remove operations are complete
+ foreach my $file ( keys( %{$self->{history_pre_cache__}} ) ) {
+ $self->{history__}{$file} = $self->{history_pre_cache__}{$file};
+ delete $self->{history_pre_cache__}{$file};
+ }
+ $self->{history_pre_cache__} = {};
+
# If the history cache is invalid then we need to reload it and then if
# any of the sort, search or filter options have changed they must be
***************
*** 3207,3211 ****
$body .= "<tr";
! if ( ( ( defined($self->{form_}{file}) && ( $self->{form_}{file} eq $mail_file ) ) ) ||
( $highlight_message eq $mail_file ) ) {
$body .= " class=\"rowHighlighted\"";
--- 3229,3233 ----
$body .= "<tr";
! if ( ( ( defined($self->{form_}{file}) && ( $self->{form_}{file} eq $mail_file ) ) ) ||
( $highlight_message eq $mail_file ) ) {
$body .= " class=\"rowHighlighted\"";
***************
*** 3699,3703 ****
my ( $self, $mail_file, $archive ) = @_;
! $mail_file =~ /(popfile.+\=.+\.msg)$/;
$mail_file = $1;
$self->log_( "delete: $mail_file" );
--- 3721,3725 ----
my ( $self, $mail_file, $archive ) = @_;
! $mail_file =~ /(popfile(\d+)\=(\d+)\.msg)$/;
$mail_file = $1;
$self->log_( "delete: $mail_file" );
|
|
From: <jgr...@us...> - 2003-07-13 05:21:26
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv5644/tests Modified Files: Makefile TestProxy.tst Log Message: Make test runner merge data from forked subprocesses to give one set of output data on coverage Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/tests/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 13 Jul 2003 02:40:35 -0000 1.1 --- Makefile 13 Jul 2003 05:21:21 -0000 1.2 *************** *** 11,12 **** --- 11,13 ---- runtest: @perl -I ../ $(DEBUGARGS) ../tests.pl $(TESTARGS) + @perl ../coverage.pl Index: TestProxy.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestProxy.tst 13 Jul 2003 04:01:35 -0000 1.3 --- TestProxy.tst 13 Jul 2003 05:21:21 -0000 1.4 *************** *** 135,138 **** --- 135,140 ---- test_assert_regexp( $sp->received(), 'toserver' ); + # Close down the child process + close $client; $sp->stop_server(); |
|
From: <jgr...@us...> - 2003-07-13 05:21:25
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv5644
Modified Files:
tests.pl
Added Files:
coverage.pl
Log Message:
Make test runner merge data from forked subprocesses to give one set of output data on coverage
--- NEW FILE: coverage.pl ---
#!/usr/bin/perl
# ---------------------------------------------------------------------------------------------
#
# coverage.pl - Calculate coverage data from LNE files
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use strict;
# This hash will store a count of the number of times each line is executed # in each file,
# it is in fact a hash of hashes used as
# $count{filename}{linenumber}
my %count;
# This hash will map file names of POPFile modules to coverage
my %files;
# Now look for LNE files containing code coverage information
my @line_files = glob '*.lne';
foreach my $file (@line_files) {
# Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
# / or :: converted to -
$file =~ /^(.+)\.pm\.(-?\d+)\.lne$/;
my $module = $1;
my $pid = $2;
$module =~ s/-/\//g;
open SOURCE_FILE, "<../$module.pm";
open LINE_DATA, "<$file";
my $current_line = 0;
while ( <SOURCE_FILE> ) {
# Keep count of the total number of lines in this file
$current_line += 1;
$count{$module}{total_lines} += 1;
my $state = <LINE_DATA>;
if ( $state =~ /1/ ) {
$count{$module}{total_executable_lines} += 1;
$count{$module}{total_executed} += 1;
} else {
if ( $state =~ /0/ ) {
$count{$module}{total_executable_lines} += 1;
} else {
}
}
}
close LINE_DATA;
close SOURCE_FILE;
$files{$module} = int(100 * $count{$module}{total_executed} / $count{$module}{total_executable_lines}) unless ( $count{$module}{total_executable_lines} == 0 );
unlink $file;
}
foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
my $clean = $file;
$clean =~ s/^\.\.\/\///;
print sprintf( "Coverage of %-32s %d%%\n", "$clean...", $files{$file});
}
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tests.pl 13 Jul 2003 02:40:35 -0000 1.20
--- tests.pl 13 Jul 2003 05:21:21 -0000 1.21
***************
*** 149,153 ****
if ( $test =~ /$pattern/ ) {
! # This works by reading the entire suite into the $suite variable
# and then changing calls to test_assert_equal so that they include
# the line number and the file they are from, then the $suite is
--- 149,153 ----
if ( $test =~ /$pattern/ ) {
! # This works by reading the entire suite into the $suite variable
# and then changing calls to test_assert_equal so that they include
# the line number and the file they are from, then the $suite is
|
|
From: <jgr...@us...> - 2003-07-13 05:21:25
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv5644/Devel
Modified Files:
TestCoverage.pm
Log Message:
Make test runner merge data from forked subprocesses to give one set of output data on coverage
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestCoverage.pm 13 Jul 2003 02:40:35 -0000 1.7
--- TestCoverage.pm 13 Jul 2003 05:21:21 -0000 1.8
***************
*** 40,46 ****
END
{
- # This hash will map file names of POPFile modules to coverage
- my %files;
-
# Print out information for each file
for my $file (keys %count)
--- 40,43 ----
***************
*** 51,54 ****
--- 48,55 ----
open SOURCE_FILE, "<$file";
+ my $clean = $file;
+ $clean =~ s/^\.\.\/\///;
+ $clean =~ s/\//-/g;
+ open LINE_DATA, ">$clean.$$.lne";
# Read in each line of the source file and keep track of whether
***************
*** 60,64 ****
# Keep count of the total number of lines in this file
$current_line += 1;
- $count{$file}{total_lines} += 1;
# We do not count lines that are blank or exclusively
--- 61,64 ----
***************
*** 76,80 ****
if ( ( $count{$file}{$current_line} > 0 ) || ( $block_executed ) ) {
! $count{$file}{total_executed} += 1;
# Check to see if the special comment PROFILE BLOCK START is on the line
--- 76,80 ----
if ( ( $count{$file}{$current_line} > 0 ) || ( $block_executed ) ) {
! print LINE_DATA "1\n";
# Check to see if the special comment PROFILE BLOCK START is on the line
***************
*** 90,111 ****
}
} else {
! print "$file:$current_line $_" if ( $file =~/WordMangle/);
}
! }
!
}
- $files{$file} = int(100 * $count{$file}{total_executed} / $count{$file}{total_executable_lines}) unless ( $count{$file}{total_executable_lines} == 0 );
-
close SOURCE_FILE;
}
}
-
- foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
- my $clean = $file;
- $clean =~ s/^\.\.\/\///;
-
- print sprintf( "Coverage of %-32s %d%%\n", "$clean...", $files{$file});
- }
}
--- 90,104 ----
}
} else {
! print LINE_DATA "0\n";
}
! } else {
! print LINE_DATA "\n";
! }
}
close SOURCE_FILE;
+ close LINE_DATA;
}
}
}
|
|
From: <jgr...@us...> - 2003-07-13 04:01:38
|
Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv29055/Test
Modified Files:
SimpleProxy.pm
Log Message:
Improved tests for the Proxy module
Index: SimpleProxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Test/SimpleProxy.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleProxy.pm 13 Jul 2003 02:40:35 -0000 1.1
--- SimpleProxy.pm 13 Jul 2003 04:01:35 -0000 1.2
***************
*** 37,46 ****
--- 37,62 ----
bless $self, $type;
+ $self->{child_} = \&child__;
$self->name( 'simple' );
+ $self->{send__} = '';
+ $self->{received__} = '';
+
return $self;
}
#----------------------------------------------------------------------------
+ # stop_server
+ #
+ # Stops the phony server
+ #----------------------------------------------------------------------------
+ sub stop_server
+ {
+ my ( $self ) = @_;
+
+ close $self->{remote_server__};
+ }
+
+ #----------------------------------------------------------------------------
# start_server
#
***************
*** 63,66 ****
--- 79,84 ----
$self->{remote_selector__} = new IO::Select( $self->{remote_server__} );
+
+ return defined( $self->{remote_server__} ) && defined( $self->{remote_selector__} );
}
***************
*** 78,81 ****
--- 96,101 ----
if ( defined( $self->{remote_client__} ) ) {
+ $self->log_( "service_server: remote client is connected" );
+
my $handle = $self->{remote_client__};
***************
*** 83,101 ****
while ( $self->{send__} =~ s/(.+)[\r\n]+// ) {
! print $handle "$1$eol";
! }
# If there's data available to read then read it into the received
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
! $self->{received__} .= <$handle>;
! $self->{received__} .= $eol;
}
} else {
if ( defined( $self->{remote_selector__}->can_read(0) ) ) {
$self->{remote_client__} = $self->{remote_server__}->accept();
$self->{remote_client_selector__} = new IO::Select( $self->{remote_client__} );
}
}
}
--- 103,183 ----
while ( $self->{send__} =~ s/(.+)[\r\n]+// ) {
! $self->tee_( $handle, "$1$eol" );
! }
# If there's data available to read then read it into the received
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
! my $line = <$handle>;
! $self->log_( "Phony server has received $line" );
! $self->{received__} .= $line;
}
} else {
+ $self->log_( "service_server: remote client is not connected" );
+
if ( defined( $self->{remote_selector__}->can_read(0) ) ) {
$self->{remote_client__} = $self->{remote_server__}->accept();
$self->{remote_client_selector__} = new IO::Select( $self->{remote_client__} );
+ my $handle = $self->{remote_client__};
+ if ( defined( $handle ) ) {
+ $self->tee_( $handle, "Welcome$eol" );
+ }
}
}
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # child__
+ #
+ # The worker method that is called when we get a good connection from a client all this
+ # does is proxy without ANY change between client and server
+ #
+ # $client - an open stream to a client
+ # $download_count - The unique download count for this session
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub child__
+ {
+ my ( $self, $client, $download_count, $pipe ) = @_;
+
+ $self->log_( "Child started" );
+
+ # Connect to the simple server that
+
+ my $remote = $self->verify_connected_( 0, $client, 'localhost', 10000 );
+
+ if ( defined( $remote ) && $remote->connected ) {
+ $self->log_( "Child connected to server" );
+ } else {
+ $self->log_( "Child failed to connect to server" );
+ }
+
+ # Create two selectors so that we can see if the client or the remote
+ # have something to send and can echo between the two
+
+ my $remote_selector = new IO::Select( $remote );
+ my $client_selector = new IO::Select( $client );
+
+ while ( $client->connected ) {
+ if ( defined( $remote_selector->can_read(0) ) ) {
+ my $line = <$remote>;
+ if ( defined( $line ) ) {
+ $self->log_( "Echoing $line from remote to client" );
+ print $client $line;
+ } else {
+ last;
+ }
+ }
+ if ( defined( $client_selector->can_read(0) ) ) {
+ my $line = <$client>;
+ $self->log_( "Echoing $line from client to remote" );
+ print $remote $line;
+ }
+ }
+
+ $self->log_( "Child terminated" );
+ close $remote;
+ close $pipe;
}
|
|
From: <jgr...@us...> - 2003-07-13 04:01:38
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29055/tests
Modified Files:
TestProxy.tst
Log Message:
Improved tests for the Proxy module
Index: TestProxy.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestProxy.tst 13 Jul 2003 02:40:35 -0000 1.2
--- TestProxy.tst 13 Jul 2003 04:01:35 -0000 1.3
***************
*** 7,14 ****
--- 7,57 ----
# ---------------------------------------------------------------------------------------------
+ sub forker
+ {
+ pipe my $reader, my $writer;
+ my $pid = fork();
+
+ if ( !defined( $pid ) ) {
+ close $reader;
+ close $writer;
+ return (undef, undef);
+ }
+
+ if ( $pid == 0 ) {
+ close $reader;
+
+ use IO::Handle;
+ $writer->autoflush(1);
+
+ return (0, $writer);
+ }
+
+ close $writer;
+ return ($pid, $reader);
+ }
+
+ sub pipeready
+ {
+ my ( $pipe ) = @_;
+
+ if ( !defined( $pipe ) ) {
+ return 0;
+ }
+
+ if ( $^O eq 'MSWin32' ) {
+ return ( ( -s $pipe ) > 0 );
+ } else {
+ my $rin = '';
+ vec( $rin, fileno( $pipe ), 1 ) = 1;
+ my $ready = select( $rin, undef, undef, 0.01 );
+ return ( $ready > 0 );
+ }
+ }
+
use POPFile::Configuration;
use POPFile::MQ;
use POPFile::Logger;
use Proxy::Proxy;
+ use IO::Socket;
my $c = new POPFile::Configuration;
***************
*** 21,24 ****
--- 64,69 ----
$c->logger( $l );
+ $c->initialize();
+
$l->configuration( $c );
$l->mq( $mq );
***************
*** 52,57 ****
$sp->logger( $l );
$sp->initialize();
$sp->config_( 'port', 9999 );
test_assert_equal( $sp->start(), 1 );
! $sp->start_server();
--- 97,139 ----
$sp->logger( $l );
+ $sp->forker( \&forker );
+ $sp->pipeready( \&pipeready );
+
$sp->initialize();
$sp->config_( 'port', 9999 );
test_assert_equal( $sp->start(), 1 );
! test_assert( $sp->start_server() );
!
! # Now connect a socket to the proxy through which
! # we can test it
! my $client = IO::Socket::INET->new(
! Proto => "tcp",
! PeerAddr => 'localhost',
! PeerPort => 9999 );
! $sp->service();
!
! test_assert( defined( $client ) );
! test_assert( $client->connected );
!
! $sp->service();
! select( undef, undef, undef, 0.25 );
! $sp->service_server();
! select( undef, undef, undef, 0.25 );
!
! # Basic connectivity test tell the phony
! # server to send a message and we'll receive
! # it through the proxy, then send a message
! # and check that the phony server gets it
!
! $sp->send( "fromserver\n" );
! $sp->service_server();
! my $line = <$client>;
! test_assert_regexp( $line, 'fromserver' );
! print $client "toserver\n";
! select( undef, undef, undef, 0.25 );
! $sp->service_server();
! test_assert_regexp( $sp->received(), 'toserver' );
!
! close $client;
! $sp->stop_server();
! select( undef, undef, undef, 0.25 );
|
|
From: <jgr...@us...> - 2003-07-13 04:01:38
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv29055/Proxy
Modified Files:
Proxy.pm
Log Message:
Improved tests for the Proxy module
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Proxy.pm 12 Jul 2003 18:47:34 -0000 1.20
--- Proxy.pm 13 Jul 2003 04:01:35 -0000 1.21
***************
*** 538,541 ****
--- 538,543 ----
if ( $mail->connected ) {
+ $self->log_( "Connected to $hostname:$port timeout " . $self->global_config_( 'timeout' ) );
+
# Set binmode on the socket so that no translation of CRLF
# occurs
***************
*** 571,574 ****
--- 573,577 ----
}
}
+
$self->log_( "Connection returned: $buf" );
|
|
From: <jgr...@us...> - 2003-07-13 04:01:38
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv29055 Modified Files: Makefile Log Message: Improved tests for the Proxy module Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 13 Jul 2003 02:40:35 -0000 1.13 --- Makefile 13 Jul 2003 04:01:35 -0000 1.14 *************** *** 8,12 **** include vars.mak ! .PHONY: test package windows core manual skins error: --- 8,12 ---- include vars.mak ! .PHONY: test package windows core manual skins coverage error: |
11 messages has been excluded from this view by a project administrator.
