diff -pruN 0.22.4-1.2/bayes.pl 1.0.1-0ubuntu2/bayes.pl --- 0.22.4-1.2/bayes.pl 2006-02-16 15:36:14.000000000 +0000 +++ 1.0.1-0ubuntu2/bayes.pl 2008-04-18 14:49:20.000000000 +0100 @@ -3,7 +3,7 @@ # # bayes.pl --- Classify a mail message manually # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/Classifier/Bayes.pm 1.0.1-0ubuntu2/Classifier/Bayes.pm --- 0.22.4-1.2/Classifier/Bayes.pm 2006-02-16 15:36:16.000000000 +0000 +++ 1.0.1-0ubuntu2/Classifier/Bayes.pm 2008-04-18 14:49:26.000000000 +0100 @@ -8,7 +8,7 @@ use POPFile::Module; # # Bayes.pm --- Naive Bayes text classifier # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -210,19 +210,19 @@ sub initialize # database, if you decide to change from using SQLite to some # other database (e.g. MySQL, Oracle, ... ) this *should* be all # you need to change. The additional parameters user and auth are - # needed for some databases. + # needed for some databases. # # Note that the dbconnect string # will be interpolated before being passed to DBI and the variable # $dbname can be used within it and it resolves to the full path # to the database named in the database parameter above. - $self->config_( 'dbconnect', 'dbi:SQLite:dbname=$dbname' ); + $self->config_( 'dbconnect', 'dbi:SQLite2:dbname=$dbname' ); $self->config_( 'dbuser', '' ); $self->config_( 'dbauth', '' ); # SQLite 1.05+ have some problems we are resolving. This lets us # give a nice message and then disable the version checking later - + $self->config_( 'bad_sqlite_version', '3.0.0' ); # No default unclassified weight is the number of times more sure @@ -270,9 +270,12 @@ sub initialize # # 1 = Asynchronous deletes # 2 = Backup database every hour - + $self->config_( 'sqlite_tweaks', 0xFFFFFFFF ); + # Japanese wakachigaki parser ('kakasi' or 'mecab' or 'internal'). + $self->config_( 'nihongo_parser', 'kakasi' ); + $self->mq_register_( 'COMIT', $self ); $self->mq_register_( 'RELSE', $self ); @@ -301,10 +304,10 @@ sub deliver if ( $type eq 'COMIT' ) { $self->classified( $message[0], $message[2] ); } - + if ( $type eq 'RELSE' ) { $self->release_session_key_private__( $message[0] ); - } + } if ( $type eq 'TICKD' ) { $self->backup_database__(); @@ -337,30 +340,41 @@ sub start # Pass in the current interface language for language specific parsing - $self->{parser__}->{lang__} = $self->module_config_( 'html', 'language' ); + $self->{parser__}->{lang__} = $self->module_config_( 'html', 'language' ) || ''; $self->{unclassified__} = log( $self->config_( 'unclassified_weight' ) ); if ( !$self->db_connect__() ) { return 0; } - # Since Text::Kakasi is not thread-safe, we use it under the - # control of a Mutex to avoid a crash if we are running on - # Windows and using the fork. - - if ( ( $self->{parser__}->{lang__} eq 'Nihongo' ) && ( $^O eq 'MSWin32' ) && - ( ( ( $self->module_config_( 'pop3', 'enabled' ) ) && - ( $self->module_config_( 'pop3', 'force_fork' ) ) ) || - ( ( $self->module_config_( 'nntp', 'enabled' ) ) && - ( $self->module_config_( 'nntp', 'force_fork' ) ) ) || - ( ( $self->module_config_( 'smtp', 'enabled' ) ) && - ( $self->module_config_( 'smtp', 'force_fork' ) ) ) ) ) { - $self->{parser__}->{need_kakasi_mutex__} = 1; - - # Prepare the Mutex. - require POPFile::Mutex; - $self->{parser__}->{kakasi_mutex__} = new POPFile::Mutex( 'mailparse_kakasi' ); - $self->log_( 2, "Create mutex for Kakasi." ); + if ( $self->{parser__}->{lang__} eq 'Nihongo' ) { + # Setup Nihongo (Japanese) parser. + + my $nihongo_parser = $self->config_( 'nihongo_parser' ); + + $nihongo_parser = $self->{parser__}->setup_nihongo_parser( $nihongo_parser ); + + $self->log_( 2, "Use Nihongo (Japanese) parser : $nihongo_parser" ); + $self->config_( 'nihongo_parser', $nihongo_parser ); + + # Since Text::Kakasi is not thread-safe, we use it under the + # control of a Mutex to avoid a crash if we are running on + # Windows and using the fork. + + if ( ( $nihongo_parser eq 'kakasi' ) && ( $^O eq 'MSWin32' ) && + ( ( ( $self->module_config_( 'pop3', 'enabled' ) ) && + ( $self->module_config_( 'pop3', 'force_fork' ) ) ) || + ( ( $self->module_config_( 'nntp', 'enabled' ) ) && + ( $self->module_config_( 'nntp', 'force_fork' ) ) ) || + ( ( $self->module_config_( 'smtp', 'enabled' ) ) && + ( $self->module_config_( 'smtp', 'force_fork' ) ) ) ) ) { + $self->{parser__}->{need_kakasi_mutex__} = 1; + + # Prepare the Mutex. + require POPFile::Mutex; + $self->{parser__}->{kakasi_mutex__} = new POPFile::Mutex( 'mailparse_kakasi' ); + $self->log_( 2, "Create mutex for Kakasi." ); + } } $self->upgrade_predatabase_data__(); @@ -415,7 +429,7 @@ sub backup_database__ # If database backup is turned on and we are using SQLite then # backup the database by copying it - if ( ( $self->config_( 'sqlite_tweaks' ) & 2 ) && + if ( ( $self->config_( 'sqlite_tweaks' ) & 2 ) && $self->{db_is_sqlite__} ) { if ( !copy( $self->{db_name__}, $self->{db_name__} . ".backup" ) ) { $self->log_( 0, "Failed to backup database ".$self->{db_name__} ); @@ -438,7 +452,7 @@ sub tweak_sqlite { my ( $self, $tweak, $state, $db ) = @_; - if ( $self->{db_is_sqlite__} && + if ( $self->{db_is_sqlite__} && ( $self->config_( 'sqlite_tweaks' ) & $tweak ) ) { $self->log_( 1, "Performing tweak $tweak to $state" ); @@ -446,7 +460,7 @@ sub tweak_sqlite if ( $tweak == 1 ) { my $sync = $state?'off':'normal'; $db->do( "pragma synchronous=$sync;" ); - } + } } } @@ -616,7 +630,7 @@ sub set_value_ my $userid = $self->valid_session_key__( $session ); my $bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id}; - $self->{db_delete_zero_words__}->execute( $bucketid ); + $self->validate_sql_prepare_and_execute( $self->{db_delete_zero_words__}, $bucketid ); return 1; } else { @@ -710,7 +724,7 @@ sub db_connect__ if ( $sqlite ) { $dbname = $self->get_user_path_( $self->config_( 'database' ) ); - $dbpresent = ( -e $dbname ) || 0; + $dbpresent = ( -e $dbname ) || 0; } else { $dbname = $self->config_( 'database' ); $dbpresent = 1; @@ -735,25 +749,25 @@ sub db_connect__ $self->{db__} = DBI->connect( $dbconnect, # PROFILE BLOCK START $self->config_( 'dbuser' ), $self->config_( 'dbauth' ) ); # PROFILE BLOCK STOP - + $self->log_( 0, "Using SQLite library version " . $self->{db__}{sqlite_version}); - + # We check to make sure we're not using DBD::SQLite 1.05 or greater # which uses SQLite V 3 If so, we'll use DBD::SQLite2 and SQLite 2.8, # which is still compatible with old databases - + if ( $self->{db__}{sqlite_version} gt $self->config_('bad_sqlite_version' ) ) { - $self->log_( 0, "Substituting DBD::SQLite2 for DBD::SQLite 1.05" ); + $self->log_( 0, "Substituting DBD::SQLite2 for DBD::SQLite 1.05" ); $self->log_( 0, "Please install DBD::SQLite2 and set dbconnect to use DBD::SQLite2" ); - + $dbconnect =~ s/SQLite:/SQLite2:/; - + undef $self->{db__}; # $self->db_disconnect__(); - + $self->{db__} = DBI->connect( $dbconnect, # PROFILE BLOCK START $self->config_( 'dbuser' ), - $self->config_( 'dbauth' ) ); # PROFILE BLOCK STOP + $self->config_( 'dbauth' ) ); # PROFILE BLOCK STOP } if ( !defined( $self->{db__} ) ) { @@ -785,7 +799,7 @@ sub db_connect__ # to strip off any sqlquotechars from the table names we retrieve # - my $sqlquotechar = $self->{db__}->get_info(29) || ''; + my $sqlquotechar = $self->{db__}->get_info(29) || ''; my @tables = map { s/$sqlquotechar//g; $_ } ($self->{db__}->tables()); foreach my $table (@tables) { @@ -822,8 +836,7 @@ sub db_connect__ } print " Saving table $table\n "; - my $t = $self->{db__}->prepare( "select * from $table;" ); - $t->execute; + my $t = $self->validate_sql_prepare_and_execute( "select * from $table;" ); $i = 0; while ( 1 ) { if ( ( ++$i % 100 ) == 0 ) { @@ -853,7 +866,7 @@ sub db_connect__ my $val = $rows[$i]; if ( $t->{TYPE}->[$i] !~ /^int/i ) { $val = '' if ( !defined( $val ) ); - $val = $self->{db__}->quote( $val ); + $val = $self->db_quote( $val ); } else { $val = 'NULL' if ( !defined( $val ) ); } @@ -981,8 +994,7 @@ sub db_connect__ # Get the mapping from parameter names to ids into a local hash - my $h = $self->{db__}->prepare( "select name, id from bucket_template;" ); - $h->execute; + my $h = $self->validate_sql_prepare_and_execute( "select name, id from bucket_template;" ); while ( my $row = $h->fetchrow_arrayref ) { $self->{db_parameterid__}{$row->[0]} = $row->[1]; } @@ -1087,14 +1099,14 @@ sub db_update_cache__ delete $self->{db_bucketid__}{$userid}; - $self->{db_get_buckets__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_buckets__}, $userid ); while ( my $row = $self->{db_get_buckets__}->fetchrow_arrayref ) { $self->{db_bucketid__}{$userid}{$row->[0]}{id} = $row->[1]; $self->{db_bucketid__}{$userid}{$row->[0]}{pseudo} = $row->[2]; $self->{db_bucketcount__}{$userid}{$row->[0]} = 0; } - $self->{db_get_bucket_word_counts__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_bucket_word_counts__}, $userid ); for my $b (sort keys %{$self->{db_bucketid__}{$userid}}) { $self->{db_bucketcount__}{$userid}{$b} = 0; @@ -1105,7 +1117,7 @@ sub db_update_cache__ $self->{db_bucketcount__}{$userid}{$row->[1]} = $row->[0]; } - $self->{db_get_bucket_unique_counts__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_bucket_unique_counts__}, $userid ); while ( my $row = $self->{db_get_bucket_unique_counts__}->fetchrow_arrayref ) { $self->{db_bucketunique__}{$userid}{$row->[1]} = $row->[0]; @@ -1133,7 +1145,7 @@ sub db_get_word_count__ my $userid = $self->valid_session_key__( $session ); return undef if ( !defined( $userid ) ); - $self->{db_get_wordid__}->execute( $word ); + $self->validate_sql_prepare_and_execute( $self->{db_get_wordid__}, $word ); my $result = $self->{db_get_wordid__}->fetchrow_arrayref; if ( !defined( $result ) ) { return undef; @@ -1141,7 +1153,7 @@ sub db_get_word_count__ my $wordid = $result->[0]; - $self->{db_get_word_count__}->execute( $self->{db_bucketid__}{$userid}{$bucket}{id}, $wordid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_word_count__}, $self->{db_bucketid__}{$userid}{$bucket}{id}, $wordid ); $result = $self->{db_get_word_count__}->fetchrow_arrayref; if ( defined( $result ) ) { return $result->[0]; @@ -1174,7 +1186,7 @@ sub db_put_word_count__ # word in the words table (if there's none then we need to add the # word), the bucket id in the buckets table (which must exist) - $word = $self->{db__}->quote($word); + $word = $self->db_quote($word); my $result = $self->{db__}->selectrow_arrayref( "select words.id from words where words.word = $word limit 1;"); @@ -1188,7 +1200,7 @@ sub db_put_word_count__ my $wordid = $result->[0]; my $bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id}; - $self->{db_put_word_count__}->execute( $bucketid, $wordid, $count ); + $self->validate_sql_prepare_and_execute( $self->{db_put_word_count__}, $bucketid, $wordid, $count ); return 1; } @@ -1474,7 +1486,7 @@ sub magnet_match_helper__ my @magnets; my $bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id}; - my $h = $self->{db__}->prepare( # PROFILE BLOCK START + my $h = $self->validate_sql_prepare_and_execute( # PROFILE BLOCK START "select magnets.val, magnets.id from magnets, users, buckets, magnet_types where buckets.id = $bucketid and magnets.id != 0 and @@ -1482,8 +1494,6 @@ sub magnet_match_helper__ magnets.bucketid = buckets.id and magnet_types.mtype = '$type' and magnets.mtid = magnet_types.id order by magnets.val;" ); # PROFILE BLOCK STOP - - $h->execute; while ( my $row = $h->fetchrow_arrayref ) { push @magnets, [$row->[0], $row->[1]]; } @@ -1574,11 +1584,10 @@ sub add_words_to_bucket__ my $words; $words = join( ',', map( $self->{db__}->quote( $_ ), (sort keys %{$self->{parser__}{words__}}) ) ); - $self->{get_wordids__} = $self->{db__}->prepare( # PROFILE BLOCK START + $self->{get_wordids__} = $self->validate_sql_prepare_and_execute( # PROFILE BLOCK START "select id, word from words where word in ( $words );" ); # PROFILE BLOCK STOP - $self->{get_wordids__}->execute; my @id_list; my %wordmap; @@ -1592,14 +1601,12 @@ sub add_words_to_bucket__ my $ids = join( ',', @id_list ); - $self->{db_getwords__} = $self->{db__}->prepare( # PROFILE BLOCK START + $self->{db_getwords__} = $self->validate_sql_prepare_and_execute( # PROFILE BLOCK START "select matrix.times, matrix.wordid from matrix where matrix.wordid in ( $ids ) and matrix.bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id};" ); # PROFILE BLOCK STOP - $self->{db_getwords__}->execute; - my %counts; while ( my $row = $self->{db_getwords__}->fetchrow_arrayref ) { @@ -1618,7 +1625,7 @@ sub add_words_to_bucket__ # set_value_ which would need to look up the wordid again if ( defined( $wordmap{$word} ) && defined( $counts{$wordmap{$word}} ) ) { - $self->{db_put_word_count__}->execute( $self->{db_bucketid__}{$userid}{$bucket}{id}, # PROFILE BLOCK START + $self->validate_sql_prepare_and_execute( $self->{db_put_word_count__}, $self->{db_bucketid__}{$userid}{$bucket}{id}, # PROFILE BLOCK START $wordmap{$word}, $counts{$wordmap{$word}} + $subtract * $self->{parser__}->{words__}{$word} ); # PROFILE BLOCK STOP } else { @@ -1637,7 +1644,7 @@ sub add_words_to_bucket__ # removed if ( $subtract == -1 ) { - $self->{db_delete_zero_words__}->execute( $self->{db_bucketid__}{$userid}{$bucket}{id} ); + $self->validate_sql_prepare_and_execute( $self->{db_delete_zero_words__}, $self->{db_bucketid__}{$userid}{$bucket}{id} ); } $self->{db__}->commit; @@ -1789,7 +1796,7 @@ sub generate_unique_session_key__ # $session A session key previously returned by get_session_key # # Releases and invalidates the session key. Worker function that does the work -# of release_session_key. +# of release_session_key. # ****DO NOT CALL DIRECTLY**** # unless you want your session key released immediately, possibly preventing # asynchronous tasks from completing @@ -1798,7 +1805,7 @@ sub generate_unique_session_key__ sub release_session_key_private__ { my ( $self, $session ) = @_; - + if ( defined( $self->{api_sessions__}{$session} ) ) { $self->log_( 1, "release_session_key releasing key $session for user $self->{api_sessions__}{$session}" ); delete $self->{api_sessions__}{$session}; @@ -1883,7 +1890,7 @@ sub get_session_key my $hash = md5_hex( $user . '__popfile__' . $pwd ); - $self->{db_get_userid__}->execute( $user, $hash ); + $self->validate_sql_prepare_and_execute( $self->{db_get_userid__}, $user, $hash ); my $result = $self->{db_get_userid__}->fetchrow_arrayref; if ( !defined( $result ) ) { @@ -1919,7 +1926,7 @@ sub get_session_key sub release_session_key { my ( $self, $session ) = @_; - + $self->mq_post_( "RELSE", $session ); } @@ -2085,12 +2092,11 @@ sub classify my $words; $words = join( ',', map( $self->{db__}->quote( $_ ), (sort keys %{$self->{parser__}{words__}}) ) ); - $self->{get_wordids__} = $self->{db__}->prepare( # PROFILE BLOCK START + $self->{get_wordids__} = $self->validate_sql_prepare_and_execute( # PROFILE BLOCK START "select id, word from words where word in ( $words ) order by id;" ); # PROFILE BLOCK STOP - $self->{get_wordids__}->execute; my @id_list; my %temp_idmap; @@ -2108,15 +2114,13 @@ sub classify my $ids = join( ',', @id_list ); - $self->{db_classify__} = $self->{db__}->prepare( # PROFILE BLOCK START + $self->{db_classify__} = $self->validate_sql_prepare_and_execute( # PROFILE BLOCK START "select matrix.times, matrix.wordid, buckets.name from matrix, buckets where matrix.wordid in ( $ids ) and matrix.bucketid = buckets.id and buckets.userid = $userid;" ); # PROFILE BLOCK STOP - $self->{db_classify__}->execute; - # %matrix maps wordids and bucket names to counts # $matrix{$wordid}{$bucket} == $count @@ -2432,7 +2436,7 @@ sub classify my $width_2 = int( $chart{$word_2} * $scale - .5 ) * -1; last if ( $width_1 <=0 && $width_2 <= 0 ); - + my %row_data; $row_data{View_Chart_Word_1} = $word_1; @@ -3162,7 +3166,7 @@ sub get_word_count my $userid = $self->valid_session_key__( $session ); return undef if ( !defined( $userid ) ); - $self->{db_get_full_total__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_full_total__}, $userid ); return $self->{db_get_full_total__}->fetchrow_arrayref->[0]; } @@ -3226,7 +3230,7 @@ sub get_unique_word_count my $userid = $self->valid_session_key__( $session ); return undef if ( !defined( $userid ) ); - $self->{db_get_unique_word_count__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_unique_word_count__}, $userid ); return $self->{db_get_unique_word_count__}->fetchrow_arrayref->[0]; } @@ -3301,14 +3305,16 @@ sub get_bucket_parameter # If there is a non-default value for this parameter then return it. - $self->{db_get_bucket_parameter__}->execute( $self->{db_bucketid__}{$userid}{$bucket}{id}, $self->{db_parameterid__}{$parameter} ); + $self->validate_sql_prepare_and_execute( $self->{db_get_bucket_parameter__}, + $self->{db_bucketid__}{$userid}{$bucket}{id}, + $self->{db_parameterid__}{$parameter} ); my $result = $self->{db_get_bucket_parameter__}->fetchrow_arrayref; # If this parameter has not been defined for this specific bucket then # get the default value if ( !defined( $result ) ) { - $self->{db_get_bucket_parameter_default__}->execute( # PROFILE BLOCK START + $self->validate_sql_prepare_and_execute( $self->{db_get_bucket_parameter_default__}, # PROFILE BLOCK START $self->{db_parameterid__}{$parameter} ); # PROFILE BLOCK STOP $result = $self->{db_get_bucket_parameter_default__}->fetchrow_arrayref; } @@ -3351,7 +3357,7 @@ sub set_bucket_parameter # Exactly one row should be affected by this statement - $self->{db_set_bucket_parameter__}->execute( $bucketid, $btid, $value ); + $self->validate_sql_prepare_and_execute( $self->{db_set_bucket_parameter__}, $bucketid, $btid, $value ); if ( defined( $self->{db_parameters__}{$userid}{$bucket}{$parameter} ) ) { $self->{db_parameters__}{$userid}{$bucket}{$parameter} = $value; @@ -3383,7 +3389,7 @@ sub get_html_colored_message $self->{parser__}->{color_idmap__} = undef; $self->{parser__}->{color_userid__} = undef; $self->{parser__}->{bayes__} = bless $self; - + my $result = $self->{parser__}->parse_file( $file, # PROFILE BLOCK START $self->global_config_( 'message_cutoff' ) ); # PROFILE BLOCK STOP @@ -3633,7 +3639,7 @@ sub get_buckets_with_magnets my @result; - $self->{db_get_buckets_with_magnets__}->execute( $userid ); + $self->validate_sql_prepare_and_execute( $self->{db_get_buckets_with_magnets__}, $userid ); while ( my $row = $self->{db_get_buckets_with_magnets__}->fetchrow_arrayref ) { push @result, ($row->[0]); } @@ -3661,14 +3667,13 @@ sub get_magnet_types_in_bucket my @result; my $bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id}; - my $h = $self->{db__}->prepare( "select magnet_types.mtype from magnet_types, magnets, buckets + my $h = $self->validate_sql_prepare_and_execute( "select magnet_types.mtype from magnet_types, magnets, buckets where magnet_types.id = magnets.mtid and magnets.bucketid = buckets.id and buckets.id = $bucketid group by magnet_types.mtype order by magnet_types.mtype;" ); - $h->execute; while ( my $row = $h->fetchrow_arrayref ) { push @result, ($row->[0]); } @@ -3743,13 +3748,12 @@ sub get_magnets my @result; my $bucketid = $self->{db_bucketid__}{$userid}{$bucket}{id}; - my $h = $self->{db__}->prepare( "select magnets.val from magnets, magnet_types + my $h = $self->validate_sql_prepare_and_execute( "select magnets.val from magnets, magnet_types where magnets.bucketid = $bucketid and magnets.id != 0 and magnet_types.id = magnets.mtid and magnet_types.mtype = '$type' order by magnets.val;" ); - $h->execute; while ( my $row = $h->fetchrow_arrayref ) { push @result, ($row->[0]); } @@ -3807,9 +3811,8 @@ sub get_magnet_types my %result; - my $h = $self->{db__}->prepare( "select magnet_types.mtype, magnet_types.header from magnet_types order by mtype;" ); + my $h = $self->validate_sql_prepare_and_execute( "select magnet_types.mtype, magnet_types.header from magnet_types order by mtype;" ); - $h->execute; while ( my $row = $h->fetchrow_arrayref ) { $result{$row->[0]} = $row->[1]; } @@ -3842,11 +3845,12 @@ sub delete_magnet where magnet_types.mtype = '$type';" ); my $mtid = $result->[0]; + $text = $self->{db__}->quote( $text ); $self->{db__}->do( "delete from magnets where magnets.bucketid = $bucketid and magnets.mtid = $mtid and - magnets.val = '$text';" ); + magnets.val = $text;" ); } #---------------------------------------------------------------------------- @@ -3932,6 +3936,113 @@ sub remove_stopword return $self->{parser__}->{mangle__}->remove_stopword( $stopword, $self->module_config_( 'html', 'language' ) ); } + +#---------------------------------------------------------------------------- +# +# db_quote +# +# Quote a string for use in a sql statement. Before calling DBI::quote on the +# string the string is also checked for any null-bytes. +# +# $string The string that should be quoted. +# +# returns the quoted string without any possible null-bytes +#---------------------------------------------------------------------------- +sub db_quote { + my $self = shift; + my $string = shift; + + my $backup = $string; + if ( $string =~ s/\x00//g ) { + my ( $package, $file, $line ) = caller; + $self->log_( 0, "Found null-byte in string '$backup'. Called from package '$package' ($file), line $line." ); + } + + return $self->{db__}->quote( $string ); +} + + +#---------------------------------------------------------------------------- +# +# validate_sql_prepare_and_execute +# +# This method will prepare sql statements and execute them. +# The statement itself and any binding parameters are also +# tested for possible null-characters (\x00). +# If you pass in a handle to a prepared statement, the statement +# will be executed and possible binding-parameters are checked. +# +# $statement The sql statement to prepare or the prepared statement handle +# @args The (optional) list of binding parameters +# +# Returns the result of prepare() +#---------------------------------------------------------------------------- +sub validate_sql_prepare_and_execute { + my $self = shift; + my $sql_or_sth = shift; + my @args = @_; + + my $dbh = $self->db(); + my $sth = undef; + + # Is this a statement-handle or a sql string? + if ( (ref $sql_or_sth) =~ m/^DBI::/ ) { + $sth = $sql_or_sth; + } + else { + my $sql = $sql_or_sth; + $sql = $self->check_for_nullbytes( $sql ); + $sth = $dbh->prepare( $sql ); + } + + my $execute_result = undef; + + # Any binding-params? + if ( @args ) { + foreach my $arg ( @args ) { + $arg = $self->check_for_nullbytes( $arg ); + } + $execute_result = $sth->execute( @args ); + } + else { + $execute_result = $sth->execute(); + } + + unless ( $execute_result ) { + my ( $package, $file, $line ) = caller; + $self->log_( 0, "DBI::execute failed. Called from package '$package' ($file), line $line." ); + } + + return $sth; +} + + +#---------------------------------------------------------------------------- +# +# check_for_nullbytes +# +# Will check a passed-in string for possible null-bytes and log and error +# message in case a null-byte is found. +# +# Will return the string with any null-bytes removed. +#---------------------------------------------------------------------------- +sub check_for_nullbytes { + my $self = shift; + my $string = shift; + + if ( defined $string ) { + my $backup = $string; + + if ( my $count = ( $string =~ s/\x00//g ) ) { + my ( $package, $file, $line ) = caller( 1 ); + $self->log_( 0, "Found $count null-character(s) in string '$backup'. Called from package '$package' ($file), line $line." ); + } + } + + return $string; +} + + #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- # _____ _____ _____ _______ _____ _______ _______ _____ _____ diff -pruN 0.22.4-1.2/Classifier/MailParse.pm 1.0.1-0ubuntu2/Classifier/MailParse.pm --- 0.22.4-1.2/Classifier/MailParse.pm 2006-02-16 15:36:16.000000000 +0000 +++ 1.0.1-0ubuntu2/Classifier/MailParse.pm 2008-04-18 14:49:28.000000000 +0100 @@ -4,7 +4,7 @@ package Classifier::MailParse; # # MailParse.pm --- Parse a mail message or messages into words # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -43,7 +43,7 @@ my $eksc = "(?:$ksc5601|[\x81-\xC6][\x41 # These are used for Japanese support my %encoding_candidates = ( - 'Nihongo' => [ 'shiftjis', 'euc-jp', '7bit-jis' ] + 'Nihongo' => [ 'cp932', 'euc-jp', '7bit-jis' ] ); my $ascii = '[\x00-\x7F]'; # ASCII chars @@ -64,6 +64,25 @@ my $cho_on_symbol = '(?:\xA1\xBC)'; my $non_symbol_two_bytes_euc_jp = '(?:[\x8E\xA3-\xA7\xB0-\xFE][\xA1-\xFE])'; my $non_symbol_euc_jp = "(?:$non_symbol_two_bytes_euc_jp|$three_bytes_euc_jp|$cho_on_symbol)"; +# Constants for the internal wakachigaki parser. +# Kind of EUC-JP chars +my $euc_jp_symbol = '[\xA1\xA2\xA6-\xA8\xAD\xF9-\xFC][\xA1-\xFE]'; # The symbols make a word of one character. +my $euc_jp_alphanum = '(?:\xA3[\xB0-\xB9\xC1-\xDA\xE1-\xFA])+'; # One or more alphabets and numbers +my $euc_jp_hiragana = '(?:(?:\xA4[\xA1-\xF3])+(?:\xA1[\xAB\xAC\xB5\xB6\xBC])*)+'; # One or more Hiragana characters +my $euc_jp_katakana = '(?:(?:\xA5[\xA1-\xF6])+(?:\xA1[\xA6\xBC\xB3\xB4])*)+'; # One or more Katakana characters +my $euc_jp_hkatakana = '(?:\x8E[\xA6-\xDF])+'; # One or more Half-width Katakana characters +my $euc_jp_kanji = '[\xB0-\xF4][\xA1-\xFE](?:[\xB0-\xF4][\xA1-\xFE]|\xA1\xB9)?'; # One or two Kanji characters + +my $euc_jp_word = '(' . + $euc_jp_alphanum . '|' . + $euc_jp_hiragana . '|' . + $euc_jp_katakana . '|' . + $euc_jp_hkatakana . '|' . + $euc_jp_kanji . '|' . + $euc_jp_symbol . '|' . + $ascii . '+|' . + $three_bytes_euc_jp . ')'; + # HTML entity mapping to character codes, this maps things like & to their corresponding # character code @@ -220,9 +239,13 @@ sub new $self->{lang__} = ''; $self->{first20__} = ''; - # For support Quoted Printable in Japanese text, save encoded text in multiple lines + # For support Quoted Printable in Japanese text, save encoded text in + # multiple lines $self->{prev__} = ''; + # Object for the Nihongo (Japanese) parser. + $self->{nihongo_parser__} = undef; + return $result; } @@ -571,9 +594,9 @@ sub add_line if ( defined( $to ) ) { - # HTML entities confilict with DBCS chars. Replace entities with blanks. + # HTML entities confilict with DBCS and EUC-JP chars. Replace entities with blanks. - if ( $self->{lang__} eq 'Korean' ) { + if ( $self->{lang__} eq 'Korean' || $self->{lang__} eq 'Nihongo' ) { $to = ' '; } else { $to = chr($to); @@ -603,7 +626,7 @@ sub add_line # Pull out any email addresses in the line that are marked with <> and have an @ in them - while ( $line =~ s/(mailto:)?([[:alpha:]0-9\-_\.]+?@([[:alpha:]0-9\-_\.]+\.[[:alpha:]0-9\-_]+))([\"\&\)\?\:\/ >\&\;])// ) { + while ( $line =~ s/(mailto:)?([[:alpha:]0-9\-_\.]+?@([[:alpha:]0-9\-_\.]+\.[[:alpha:]0-9\-_]+))([\"\&\)\?\:\/ >\&\;]|$)// ) { update_word($self, $2, $encoded, ($1?$1:''), '[\&\?\:\/ >\&\;]', $prefix); add_url($self, $3, $encoded, '\@', '[\&\?\:\/]', $prefix); } @@ -621,16 +644,14 @@ sub add_line # Deal with runs of alternating spaces and letters - foreach my $space (' ', '\'', '*', '^', '`', ' ', '\38', '.' ){ - while ( $line =~ s/( |^)(([A-Z]\Q$space\E){2,15}[A-Z])( |\Q$space\E|[!\?,])/ /i ) { - my $original = "$1$2$4"; - my $word = $2; - print "$word ->" if $self->{debug__}; - $word =~ s/[^A-Z]//gi; - print "$word\n" if $self->{debug__}; - $self->update_word( $word, $encoded, ' ', ' ', $prefix); - $self->update_pseudoword( 'trick', 'spacedout', $encoded, $original ); - } + while ( $line =~ s/( |^)([A-Za-z]([\'\*^`&\. ]| )(?:[A-Za-z]\3){1,14}[A-Za-z])( |\3|[!\?,]|$)/ / ) { + my $original = "$1$2$4"; + my $word = $2; + print "$word ->" if $self->{debug__}; + $word =~ s/[^A-Z]//gi; + print "$word\n" if $self->{debug__}; + $self->update_word( $word, $encoded, ' ', ' ', $prefix); + $self->update_pseudoword( 'trick', 'spacedout', $encoded, $original ); } # Deal with random insertion of . inside words @@ -649,20 +670,16 @@ sub add_line # C8BE, the second byte of the first char and the first byte of # the second char. - while ( $line =~ s/^$euc_jp*?(([A-Za-z]|$non_symbol_euc_jp)([A-Za-z\']|$non_symbol_euc_jp){1,44})([_\-,\.\"\'\)\?!:;\/& \t\n\r]{0,5}|$)//ox ) { + # In Japanese, one character words are common, so care about + # words between 2 and 45 characters + + while ( $line =~ s/^$euc_jp*?([A-Za-z][A-Za-z\']{2,44}|$non_symbol_euc_jp{2,45})(?:[_\-,\.\"\'\)\?!:;\/& \t\n\r]{0,5}|$)//o ) { if ( ( $self->{in_headers__} == 0 ) && ( $self->{first20count__} < 20 ) ) { $self->{first20count__} += 1; $self->{first20__} .= " $1"; } - my $matched_word = $1; - - # In Japanese, 2 characters words are common, so care about - # words between 2 and 45 characters - - if (((length $matched_word >= 3) && ($matched_word =~ /[A-Za-z]/)) || ((length $matched_word >= 2) && ($matched_word =~ /$non_symbol_euc_jp/))) { - update_word($self, $matched_word, $encoded, '', '[_\-,\.\"\'\)\?!:;\/ &\t\n\r]'."|$symbol_euc_jp", $prefix); - } + update_word($self, $1, $encoded, '', '[_\-,\.\"\'\)\?!:;\/ &\t\n\r]|'.$symbol_euc_jp, $prefix); } } else { if ( $self->{lang__} eq 'Korean' ) { @@ -1538,18 +1555,21 @@ sub start_parse $self->{colorized__} = ''; $self->{colorized__} .= "" if ( $self->{color__} ne '' ); - # Since Text::Kakasi is not thread-safe, we use it under the - # control of a Mutex to avoid a crash if we are running on - # Windows. + # Clear the character set to avoid using the wrong charsets + $self->{charset__} = ''; if ( $self->{lang__} eq 'Nihongo' ) { + + # Since Text::Kakasi is not thread-safe, we use it under the + # control of a Mutex to avoid a crash if we are running on + # Windows. if ( $self->{need_kakasi_mutex__} ) { require POPFile::Mutex; $self->{kakasi_mutex__}->acquire(); } - # Open Kakasi dictionary and initialize - init_kakasi(); + # Initialize Nihongo (Japanese) parser + $self->{nihongo_parser__}{init}( $self ); } } @@ -1588,8 +1608,8 @@ sub stop_parse $self->{in_html_tag__} = 0; if ( $self->{lang__} eq 'Nihongo' ) { - # Close Kakasi dictionary - close_kakasi(); + # Close Nihongo (Japanese) parser + $self->{nihongo_parser__}{close}( $self ); if ( $self->{need_kakasi_mutex__} ) { require POPFile::Mutex; @@ -1626,9 +1646,8 @@ sub parse_line # Decode quoted-printable if ( !$self->{in_headers__} && $self->{encoding__} =~ /quoted\-printable/i) { if ( $self->{lang__} eq 'Nihongo') { - if ( $line =~ /=\r\n$/ ) { + if ( $line =~ s/=\r\n$// ) { # Encoded in multiple lines - $line =~ s/=\r\n$//g; $self->{prev__} .= $line; next; } else { @@ -1640,14 +1659,12 @@ sub parse_line $line =~ s/\x00/NUL/g; } - # Decode \x?? - if ( $self->{lang__} eq 'Nihongo' && !$self->{in_headers__} ) { + if ( $self->{lang__} eq 'Nihongo' && !$self->{in_headers__} && $self->{encoding__} !~ /base64/i ) { + # Decode \x?? $line =~ s/\\x([8-9A-F][A-F0-9])/pack("C", hex($1))/eig; - } - if ( $self->{lang__} eq 'Nihongo' ) { $line = convert_encoding( $line, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); - $line = parse_line_with_kakasi( $self, $line ); + $line = $self->{nihongo_parser__}{parse}( $self, $line ); } if ($self->{color__} ne '' ) { @@ -1812,7 +1829,7 @@ sub clear_out_base64 if ( $self->{lang__} eq 'Nihongo' ) { $decoded = convert_encoding( $decoded, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); - $decoded = parse_line_with_kakasi( $self, $decoded ); + $decoded = $self->{nihongo_parser__}{parse}( $self, $decoded ); } $self->parse_html( $decoded, 1 ); @@ -2031,9 +2048,8 @@ sub parse_header $argument = $self->decode_string( $argument, $self->{lang__} ); if ( $self->{subject__} eq '' ) { - # In Japanese mode, parse subject with kakasi - - $argument = parse_line_with_kakasi( $self, $argument ) if ( $self->{lang__} eq 'Nihongo' && $argument ne '' ); + # In Japanese mode, parse subject with Nihongo (Japanese) parser + $argument = $self->{nihongo_parser__}{parse}( $self, $argument ) if ( $self->{lang__} eq 'Nihongo' && $argument ne '' ); $self->{subject__} = $argument; $self->{subject__} =~ s/[\t\r\n]//g; @@ -2381,6 +2397,9 @@ sub add_attachment_filename if ( length( $filename ) > 0) { print "Add filename $filename\n" if $self->{debug__}; + # Decode the filename + $filename = $self->decode_string( $filename ); + my ( $name, $ext ) = $self->file_extension( $filename ); if ( length( $name ) > 0) { @@ -2479,6 +2498,9 @@ sub convert_encoding { my ( $string, $from, $to, $default, @candidates ) = @_; + # If the string contains only ascii characters, do nothing + return $string if ( $string =~ /^[\r\n\t\x20-\x7E]*$/ ); + require Encode; require Encode::Guess; @@ -2487,7 +2509,7 @@ sub convert_encoding my $enc = Encode::Guess::guess_encoding( $string, @candidates ); if(ref $enc){ - $from= $enc->name; + $from= $enc->name; } else { # If guess does not work, check whether $from is valid. @@ -2505,7 +2527,11 @@ sub convert_encoding # Workaround for Encode::Unicode error bug. eval { - Encode::from_to($string, $from, $to); + if (ref $enc) { + $string = Encode::encode($to, $enc->decode($string)); + } else { + Encode::from_to($string, $from, $to); + } }; $string = $orig_string if ($@); } @@ -2532,9 +2558,6 @@ sub parse_line_with_kakasi # If the line does not contain Japanese characters, do nothing return $line if ( $line =~ /^[\x00-\x7F]*$/ ); - # This is used to parse Japanese - require Text::Kakasi; - # Split Japanese line into words using Kakasi Wakachigaki mode $line = Text::Kakasi::do_kakasi($line); @@ -2543,6 +2566,58 @@ sub parse_line_with_kakasi # ---------------------------------------------------------------------------- # +# parse_line_with_mecab +# +# Parse a line with MeCab +# +# Split Japanese words by spaces using "MeCab" - Yet Another Part-of-Speech +# and Morphological Analyzer. +# +# $line The line to be parsed +# +# ---------------------------------------------------------------------------- +sub parse_line_with_mecab +{ + my ( $self, $line ) = @_; + + # If the line does not contain Japanese characters, do nothing + return $line if ( $line =~ /^[\x00-\x7F]*$/ ); + + # Split Japanese line into words using MeCab + $line = $self->{nihongo_parser__}{obj_mecab}->parse($line); + + # Remove the unnecessary white spaces + $line =~ s/([\x00-\x1f\x21-\x7f]) (?=[\x00-\x1f\x21-\x7f])/$1/g; + + return $line; +} + +# ---------------------------------------------------------------------------- +# +# parse_line_with_internal_parser +# +# Parse a line with an internal perser +# +# Split characters by kind of the character +# +# $line The line to be parsed +# +# ---------------------------------------------------------------------------- +sub parse_line_with_internal_parser +{ + my ( $self, $line ) = @_; + + # If the line does not contain Japanese characters, do nothing + return $line if ( $line =~ /^[\x00-\x7F]*$/ ); + + # Split Japanese line into words by the kind of characters + $line =~ s/\G$euc_jp_word/$1 /og; + + return $line; +} + +# ---------------------------------------------------------------------------- +# # init_kakasi # # Open the kanwa dictionary and initialize the parameter of Kakasi. @@ -2550,13 +2625,29 @@ sub parse_line_with_kakasi # ---------------------------------------------------------------------------- sub init_kakasi { - require Text::Kakasi; - # Initialize Kakasi with Wakachigaki mode(-w is passed to # Kakasi as argument). Both input and ouput encoding are # EUC-JP. - Text::Kakasi::getopt_argv("kakasi", "-w", "-ieuc", "-oeuc"); + Text::Kakasi::getopt_argv('kakasi', '-w', '-ieuc', '-oeuc'); +} + +# ---------------------------------------------------------------------------- +# +# init_mecab +# +# Create a new parser object of MeCab. +# +# ---------------------------------------------------------------------------- +sub init_mecab +{ + my ( $self ) = @_; + + # Initialize MeCab (-F %M\s -U %M\s -E \n is passed to MeCab as argument). + # Insert white spaces after words. + + $self->{nihongo_parser__}{obj_mecab} + = MeCab::Tagger->new('-F %M\s -U %M\s -E \n'); } # ---------------------------------------------------------------------------- @@ -2568,10 +2659,95 @@ sub init_kakasi # ---------------------------------------------------------------------------- sub close_kakasi { - require Text::Kakasi; - Text::Kakasi::close_kanwadict(); } +# ---------------------------------------------------------------------------- +# +# close_mecab +# +# Free the parser object of MeCab. +# +# ---------------------------------------------------------------------------- +sub close_mecab +{ + my ( $self ) = @_; + + $self->{nihongo_parser__}{obj_mecab} = undef; +} + +# ---------------------------------------------------------------------------- +# +# setup_nihongo_parser +# +# Check whether Nihongo (Japanese) parsers are available and setup subroutines. +# +# $nihongo_parser Nihongo (Japanese) parser to use +# ( kakasi / mecab / internal ) +# +# ---------------------------------------------------------------------------- +sub setup_nihongo_parser +{ + my ( $self, $nihongo_parser ) = @_; + + # If MeCab is installed, use MeCab. + if ( $nihongo_parser eq 'mecab' ) { + my $has_mecab = 0; + + foreach my $prefix (@INC) { + my $realfilename = "$prefix/MeCab.pm"; + if (-f $realfilename) { + $has_mecab = 1; + last; + } + } + + # If MeCab is not installed, try to use Text::Kakasi. + $nihongo_parser = 'kakasi' unless ( $has_mecab ); + } + + # If Text::Kakasi is installed, use Text::Kakasi. + if ( $nihongo_parser eq 'kakasi' ) { + my $has_kakasi = 0; + + foreach my $prefix (@INC) { + my $realfilename = "$prefix/Text/Kakasi.pm"; + if (-f $realfilename) { + $has_kakasi = 1; + last; + } + } + + # If Kakasi is not installed, use the internal parser. + $nihongo_parser = 'internal' unless ( $has_kakasi ); + } + + # Setup perser's subroutines + if ( $nihongo_parser eq 'mecab' ) { + # Import MeCab module + require MeCab; + import MeCab; + + $self->{nihongo_parser__}{init} = \&init_mecab; + $self->{nihongo_parser__}{parse} = \&parse_line_with_mecab; + $self->{nihongo_parser__}{close} = \&close_mecab; + } elsif ( $nihongo_parser eq 'kakasi' ) { + # Import Text::Kakasi module + require Text::Kakasi; + import Text::Kakasi; + + $self->{nihongo_parser__}{init} = \&init_kakasi; + $self->{nihongo_parser__}{parse} = \&parse_line_with_kakasi; + $self->{nihongo_parser__}{close} = \&close_kakasi; + } else { + # Require no external modules + $self->{nihongo_parser__}{init} = sub {}; # Needs no initialization + $self->{nihongo_parser__}{parse} = \&parse_line_with_internal_parser; + $self->{nihongo_parser__}{close} = sub {}; + } + + return $nihongo_parser; +} + 1; diff -pruN 0.22.4-1.2/Classifier/popfile.sql 1.0.1-0ubuntu2/Classifier/popfile.sql --- 0.22.4-1.2/Classifier/popfile.sql 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/Classifier/popfile.sql 2008-04-18 14:49:28.000000000 +0100 @@ -3,7 +3,7 @@ -- -- popfile.schema - POPFile's database schema -- --- Copyright (c) 2003-2006 John Graham-Cumming +-- Copyright (c) 2001-2008 John Graham-Cumming -- -- This file is part of POPFile -- diff -pruN 0.22.4-1.2/Classifier/WordMangle.pm 1.0.1-0ubuntu2/Classifier/WordMangle.pm --- 0.22.4-1.2/Classifier/WordMangle.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/Classifier/WordMangle.pm 2008-04-18 14:49:28.000000000 +0100 @@ -8,7 +8,7 @@ use POPFile::Module; # # WordMangle.pm --- Mangle words for better classification # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/debian/changelog 1.0.1-0ubuntu2/debian/changelog --- 0.22.4-1.2/debian/changelog 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/changelog 2008-07-24 20:13:56.000000000 +0100 @@ -1,31 +1,66 @@ -popfile (0.22.4-1.2) unstable; urgency=low +popfile (1.0.1-0ubuntu2) intrepid; urgency=low - * Non-maintainer upload to fix pending l10n issues. - * Add LSB formatted dependency info in init.d script - Closes: #468883 - * Debconf translations: - - Russian. Closes: #407343 - - Portuguese. Closes: #415371 - - German. Closes: #418574 - - Dutch. Closes: #466443 - - Finnish. Closes: #475827 - - Galician. Closes: #475854 - - Basque. Closes: #475998 - * [Lintian] Remove useless whitespaces at the end of the doc-base file - * [Lintian] Use Network/Communication as section in doc-base file - * [Lintian] No longer ignore errors by "make clean" - - -- Christian Perrier Thu, 03 Apr 2008 19:28:42 +0200 - -popfile (0.22.4-1.1) unstable; urgency=low - - * Non-maintainer upload. - * Added LSB formatted dependency info in init.d script (closes: #468883) - * Added build dependency po-debconf - * Moved build dependencies to Build-Depends because they are used by clean - * Moved Homepage to control field + * debian/init.d: add "--oknodo" to start-stop-daemon calls for "start" and + "stop" actions, so removal of the package does not fail in case no running + process is found (LP: #239386) + * debian/popfile.doc-base: removed; not used anymore, since the manual is + gone + + -- Daniel Hahler Thu, 24 Jul 2008 19:29:35 +0200 + +popfile (1.0.1-0ubuntu1) intrepid; urgency=low + + * New upstream version. + * Makefile: + - Do not install "manual" anymore (removed upstream). + * debian/control: + - add Vcs fields + - Standards-Version: 3.8.0; no other changes" + + -- Daniel Hahler Thu, 24 Jul 2008 01:46:28 +0200 + +popfile (1.0.0-0ubuntu2) hardy; urgency=low + + * Makefile: + - install Services directory, required for IMAP support. + Thanks Hirvinen (LP: #217072) + - Install *.png, too. This makes the logo appear in the UI and prevents + the logfile to grow because of 404 errors. + + -- Daniel Hahler Mon, 14 Apr 2008 21:05:26 +0200 + +popfile (1.0.0-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #186217) + * Dropped debian/patches/02_sqlite2.dpatch: applied upstream + * debian/control: + - Build-Depend on po-debconf (lintian) + - Standards-Version 3.7.3 (lintian) + - Moved Homepage out of description into new field + - Mention IMAP functionality in description + * debian/rules: + - Fix debian-rules-ignores-make-clean-error (lintian) + * debian/init.d: + - Add LSB init script header according to + http://wiki.debian.org/LSBInitScripts + * debian/popfile.doc-base: + - Fix doc-base-file-separator-extra-whitespaces (lintian) + * debian/postinst: Moved creation of /var/lib/popfile before call to adduser + to avoid warning from adduser that the homedir cannot be accessed. + + -- Daniel Hahler Tue, 12 Feb 2008 00:56:36 +0100 + +popfile (0.22.4-1ubuntu1) gutsy; urgency=low + + * Made sure that /var/run/popfile exists in init.d script + (LP: #126894) + * Changed chown separator from '.' to ':' + * Changed maintainer according to + https://wiki.ubuntu.com/DebianMaintainerField + * Standards-Version: 3.7.2 + * Changed Build-Depends-Indep to Build-Depends (lintian) - -- Peter Eisentraut Thu, 03 Apr 2008 13:29:51 +0200 + -- dAniel hAhler Thu, 26 Jul 2007 01:09:02 +0200 popfile (0.22.4-1) unstable; urgency=low diff -pruN 0.22.4-1.2/debian/control 1.0.1-0ubuntu2/debian/control --- 0.22.4-1.2/debian/control 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/control 2008-07-24 20:13:56.000000000 +0100 @@ -1,10 +1,13 @@ Source: popfile Section: mail Priority: optional -Maintainer: Lucas Wall +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Lucas Wall Build-Depends: debhelper (>> 4.1.16), dpatch, po-debconf -Standards-Version: 3.6.2 +Standards-Version: 3.8.0 Homepage: http://popfile.sourceforge.net/ +Vcs-Bzr: lp:~blueyed/popfile/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~blueyed/popfile/ubuntu Package: popfile Architecture: all @@ -16,3 +19,5 @@ Description: email classification tool clients. It's not only useful to filter spam, but also to sort legitimate mail into different folders. POPFile can be trained to recognize and sort mails even when no regular mail rules based on header can be made. + POPFile can be used also for IMAP. It will move messages into folders + and re-classify mails after they have been moved. diff -pruN 0.22.4-1.2/debian/init.d 1.0.1-0ubuntu2/debian/init.d --- 0.22.4-1.2/debian/init.d 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/init.d 2008-07-24 20:13:56.000000000 +0100 @@ -1,12 +1,14 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: popfile -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 +# Short-Description: Start popfile proxy/daemon ### END INIT INFO + PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/share/popfile/start_popfile.sh NAME=popfile @@ -22,6 +24,10 @@ then . /etc/default/popfile fi +if [ ! -d /var/run/popfile ] ; then + install -o popfile -g popfile -m 755 -d /var/run/popfile || return 2 +fi + EXTRA_OPTS= if [ "$NICE_LEVEL" != "" ] then @@ -39,7 +45,7 @@ start() { fi if [ "$NOSTART" = "0" ]; then start-stop-daemon --start --exec $DAEMON --pidfile $PIDFILE \ - --chuid popfile --background $EXTRA_OPTS -- $DAEMON_OPTS + --chuid popfile --background --oknodo $EXTRA_OPTS -- $DAEMON_OPTS echo "$NAME." fi } @@ -47,7 +53,7 @@ start() { stop() { echo -n "Stopping $DESC: " if [ -e $PIDFILE ]; then - start-stop-daemon --stop --pidfile $PIDFILE --retry 60 + start-stop-daemon --stop --pidfile $PIDFILE --retry 60 --oknodo echo "$NAME." else echo "$NAME not running." diff -pruN 0.22.4-1.2/debian/patches/00list 1.0.1-0ubuntu2/debian/patches/00list --- 0.22.4-1.2/debian/patches/00list 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/patches/00list 2008-07-24 20:13:56.000000000 +0100 @@ -1,2 +1 @@ 01_logdir -02_sqlite2 diff -pruN 0.22.4-1.2/debian/patches/01_fullpath_in_config.dpatch 1.0.1-0ubuntu2/debian/patches/01_fullpath_in_config.dpatch --- 0.22.4-1.2/debian/patches/01_fullpath_in_config.dpatch 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/patches/01_fullpath_in_config.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,153 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# vim: ft=diff -## 01_fullpath_in_config.dpatch by Lucas Wall -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Allows full paths to dirs in config file (bug: #268410) - -@DPATCH@ -diff -urNad /home/kthulhu/linux/svndeb/popfile/UI/HTML.pm popfile/UI/HTML.pm ---- /home/kthulhu/linux/svndeb/popfile/UI/HTML.pm 2004-04-22 22:56:30.000000000 -0300 -+++ popfile/UI/HTML.pm 2004-08-28 02:12:55.000000000 -0300 -@@ -281,7 +281,7 @@ - - # Ensure that the messages subdirectory exists - -- if ( !$self->make_directory__( $self->get_user_path_( $self->global_config_( 'msgdir' ) ) ) ) { -+ if ( !$self->make_directory__( $self->get_user_path_( $self->global_config_( 'msgdir' ), 0 ) ) ) { - print STDERR "Failed to create the messages subdirectory\n"; - return 0; - } -@@ -2491,7 +2491,7 @@ - { - my ( $self ) = @_; - -- my $cache_file = $self->get_user_path_( $self->global_config_( 'msgdir' ) . 'history_cache' ); -+ my $cache_file = $self->get_user_path_( $self->global_config_( 'msgdir' ) . 'history_cache', 0 ); - if ( !(-e $cache_file) ) { - return; - } -@@ -2549,7 +2549,7 @@ - return; - } - -- open CACHE, '>' . $self->get_user_path_( $self->global_config_( 'msgdir' ) . 'history_cache' ); -+ open CACHE, '>' . $self->get_user_path_( $self->global_config_( 'msgdir' ) . 'history_cache', 0 ); - print CACHE "___HISTORY__ __ VERSION__ 1\n"; - foreach my $key (keys %{$self->{history__}}) { - print CACHE "__HISTORY__ __BOUNDARY__\n"; -@@ -2601,7 +2601,7 @@ - # through them looking for existing entries in the history which must be marked - # for non-culling and new entries that need to be added to the end - -- opendir MESSAGES, $self->get_user_path_( $self->global_config_( 'msgdir' ) ); -+ opendir MESSAGES, $self->get_user_path_( $self->global_config_( 'msgdir' ), 0 ); - - my @history_files; - -@@ -2674,7 +2674,7 @@ - $magnet = '' if ( !defined( $magnet ) ); - $reclassified = '' if ( !defined( $reclassified ) ); - -- if ( open MAIL, '<'. $self->get_user_path_( $self->global_config_( 'msgdir' ) . $file ) ) { -+ if ( open MAIL, '<'. $self->get_user_path_( $self->global_config_( 'msgdir' ) . $file, 0 ) ) { - while ( ) { - last if ( /^(\r\n|\r|\n)/ ); - -@@ -2984,7 +2984,7 @@ - # Only reclassify messages that haven't been reclassified before - - if ( !$reclassified ) { -- push @{$work{$newbucket}}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ); -+ push @{$work{$newbucket}}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ); - - $self->log_( "Reclassifying $mail_file from $bucket to $newbucket" ); - -@@ -3053,7 +3053,7 @@ - # Only undo if the message has been classified... - - if ( defined( $usedtobe ) ) { -- $self->{classifier__}->remove_message_from_bucket( $self->{api_session__}, $bucket, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ) ); -+ $self->{classifier__}->remove_message_from_bucket( $self->{api_session__}, $bucket, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ) ); - - $self->{save_cache__} = 1; - -@@ -3584,14 +3584,14 @@ - # Build the scores by classifying the message, since get_html_colored_message has parsed the message - # for us we do not need to parse it again and hence we pass in undef for the filename - -- $self->{classifier__}->classify( $self->{api_session__}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ), $self, \%matrix, \%idmap ); -+ $self->{classifier__}->classify( $self->{api_session__}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ), $self, \%matrix, \%idmap ); - - # Disable, print, and clear saved word-scores - - $self->{classifier__}->wordscores( 0 ); - - $body .= $self->{classifier__}->fast_get_html_colored_message( -- $self->{api_session__}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ), \%matrix, \%idmap ); -+ $self->{api_session__}, $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ), \%matrix, \%idmap ); - - # We want to insert a link to change the output format at the start of the word - # matrix. The classifier puts a comment in the right place, which we can replace -@@ -3638,7 +3638,7 @@ - my $text = $2; - $body .= ""; - -- open MESSAGE, '<' . $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ); -+ open MESSAGE, '<' . $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ); - my $line; - # process each line of the message - while ($line = ) { -@@ -3881,11 +3881,11 @@ - { - my ( $self ) = @_; - -- opendir MESSAGES, $self->get_user_path_( $self->global_config_( 'msgdir' ) ); -+ opendir MESSAGES, $self->get_user_path_( $self->global_config_( 'msgdir' ), 0 ); - - while ( my $mail_file = readdir MESSAGES ) { - if ( $mail_file =~ /popfile(\d+)=\d+\.msg$/ ) { -- my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ) ); -+ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ) ); - - if ( $ctime < (time - $self->config_( 'history_days' ) * $seconds_per_day) ) { - $self->history_delete_file( $mail_file, $self->config_( 'archive' ) ); -@@ -3898,7 +3898,7 @@ - - # Clean up old style msg/cls files - -- my @mail_files = glob( $self->get_user_path_( $self->global_config_( 'msgdir' ) . "popfile*_*.???" ) ); -+ my @mail_files = glob( $self->get_user_path_( $self->global_config_( 'msgdir' ) . "popfile*_*.???", 0 ) ); - - foreach my $mail_file (@mail_files) { - unlink($mail_file); -@@ -3935,7 +3935,7 @@ - $self->log_( "delete: $mail_file" ); - - if ( $archive ) { -- my $path = $self->get_user_path_( $self->config_( 'archive_dir' ) ); -+ my $path = $self->get_user_path_( $self->config_( 'archive_dir' ), 0 ); - - $self->make_directory__( $path ); - -@@ -3956,7 +3956,7 @@ - # unusual places, or overwritten files) no longer applies - # Files are now placed in the user directory, in the archive_dir subdirectory - -- $self->history_copy_file( $self->get_user_path_( $self->global_config_( 'msgdir' ) . "$mail_file" ), $path, $mail_file ); -+ $self->history_copy_file( $self->get_user_path_( $self->global_config_( 'msgdir' ) . "$mail_file", 0 ), $path, $mail_file ); - } - } - -@@ -3968,9 +3968,9 @@ - # Now remove the files from the disk, remove both the msg file containing - # the mail message and its associated CLS file - -- unlink( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ) ); -+ unlink( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ) ); - $mail_file =~ s/msg$/cls/; -- unlink( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file ) ); -+ unlink( $self->get_user_path_( $self->global_config_( 'msgdir' ) . $mail_file, 0 ) ); - } - - # --------------------------------------------------------------------------------------------- diff -pruN 0.22.4-1.2/debian/patches/01_server_user_separator.dpatch 1.0.1-0ubuntu2/debian/patches/01_server_user_separator.dpatch --- 0.22.4-1.2/debian/patches/01_server_user_separator.dpatch 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/patches/01_server_user_separator.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# vim: ft=diff -## 01_server_user_separator.dpatch by Lucas Wall -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix server/username separator bug - -@DPATCH@ -diff -urNad /home/kthulhu/svndeb/popfile/Proxy/POP3.pm popfile/Proxy/POP3.pm ---- /home/kthulhu/svndeb/popfile/Proxy/POP3.pm 2004-09-09 07:12:34.000000000 -0300 -+++ popfile/Proxy/POP3.pm 2004-09-09 07:25:52.000000000 -0300 -@@ -186,8 +186,8 @@ - # Compile some configurable regexp's once - - my $transparent = '^USER ([^:])+$'; -- my $user_command = 'USER ([^:]+)(:(\d+))?' . $self->config_( 'separator' ) . '([^:]+)(:([^:]+))?'; -- my $apop_command = 'APOP ([^:]+)(:(\d+))?' . $self->config_( 'separator' ) . '([^:]+) (.*?)'; -+ my $user_command = 'USER ([^:]+)(:(\d+))?\\' . $self->config_( 'separator' ) . '([^:]+)(:([^:]+))?'; -+ my $apop_command = 'APOP ([^:]+)(:(\d+))?\\' . $self->config_( 'separator' ) . '([^:]+) (.*?)'; - - # Retrieve commands from the client and process them until the - # client disconnects or we get a specific QUIT command diff -pruN 0.22.4-1.2/debian/patches/02_sqlite2.dpatch 1.0.1-0ubuntu2/debian/patches/02_sqlite2.dpatch --- 0.22.4-1.2/debian/patches/02_sqlite2.dpatch 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/patches/02_sqlite2.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -# vim: ft=diff -## 02_sqlite2.dpatch by Lucas Wall -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Debian libdbd-sqlite-perl calls sqlite 2 module SQLite2 (bug: #284520) - -@DPATCH@ -diff -urNad popfile/Classifier/Bayes.pm /tmp/dpep.J38tLr/popfile/Classifier/Bayes.pm ---- popfile/Classifier/Bayes.pm 2004-12-07 01:48:47.000000000 -0300 -+++ /tmp/dpep.J38tLr/popfile/Classifier/Bayes.pm 2004-12-07 01:50:07.000000000 -0300 -@@ -211,7 +211,7 @@ - # it resolves to the full path to the database named in the - # database parameter above. - -- $self->config_( 'dbconnect', 'dbi:SQLite:dbname=$dbname' ); -+ $self->config_( 'dbconnect', 'dbi:SQLite2:dbname=$dbname' ); - $self->config_( 'dbuser', '' ); $self->config_( 'dbauth', '' ); - - # SQLite 1.05+ have some problems we are resolving. -@@ -614,6 +614,9 @@ - $dbpresent = 1; - } - -+ # HACK: Debian's sqlite version 2 perl module is SQLite2 -+ $dbconnect =~ s/SQLite:/SQLite2:/; -+ - # Now perform the connect, note that this is database independent - # at this point, the actual database that we connect to is defined - # by the dbconnect parameter. diff -pruN 0.22.4-1.2/debian/po/cs.po 1.0.1-0ubuntu2/debian/po/cs.po --- 0.22.4-1.2/debian/po/cs.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/cs.po 2008-07-24 20:13:56.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: popfile\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2005-05-15 20:43+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff -pruN 0.22.4-1.2/debian/po/de.po 1.0.1-0ubuntu2/debian/po/de.po --- 0.22.4-1.2/debian/po/de.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/de.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,106 +0,0 @@ -# Translation of popfile debconf templates to German -# Copyright (C) Helge Kreutzmann , 2007. -# This file is distributed under the same license as the popfile package. -# -msgid "" -msgstr "" -"Project-Id-Version: popfile 0.22.4-1\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-03-27 08:13+0100\n" -"PO-Revision-Date: 2007-04-10 17:47+0200\n" -"Last-Translator: Helge Kreutzmann \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Möchten Sie die internen Daten von Popfile sichern?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"Popfile hat die Art der Speicherung von internen Daten verändert. Es wird " -"ein automatisches Upgrade von älteren Versionen durchführen, aber falls Sie " -"jemals ein Downgrade durchführen wollen, benötigen Sie eine Sicherungskopie " -"Ihrer alten Daten." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Eine Sicherung Ihrer derzeitigen Daten wird in /var/lib/popfile/backup-" -".tar.gz abgelegt. Sie benötigen dies nur, falls Sie ein Downgrade " -"durchführen möchten." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Web UI-Port:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "" -"Dies ist der Port, auf dem die Web-Oberfläche (UI) von Popfile auf Anfragen " -"warten wird." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "Web UI akzeptiert nur lokale Verbindungen?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Wird die Web-UI für nicht-lokale Verbindungen deaktiviert, erhöht dies die " -"Sicherheit. Falls Sie sich entscheiden, nicht-lokale Verbindungen auf " -"Popfile zu erlauben, denken Sie daran, sobald wie möglich ein Passwort zu " -"setzen (im Sicherheits-Abschnitt der Web-UI)." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "POP Proxy-Port:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "" -"Dies ist der Port, auf dem Popfiles POP-Proxy auf Anfragen warten wird." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "POP-Proxy akzeptiert nur lokale Verbindungen?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "" -"Deaktivierung nicht-lokale Verbindungen auf dem POP-Proxy erhöht die " -"Sicherheit." diff -pruN 0.22.4-1.2/debian/po/es.po 1.0.1-0ubuntu2/debian/po/es.po --- 0.22.4-1.2/debian/po/es.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/es.po 2008-07-24 20:13:56.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: popfile 0.21.1-3\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2004-09-10 15:19-0300\n" "Last-Translator: Lucas Wall \n" "Language-Team: Debian Spanish \n" diff -pruN 0.22.4-1.2/debian/po/eu.po 1.0.1-0ubuntu2/debian/po/eu.po --- 0.22.4-1.2/debian/po/eu.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/eu.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -# translation of popfile-eu.po to Euskara -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Piarres Beobide , 2008. -msgid "" -msgstr "" -"Project-Id-Version: popfile-eu\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" -"PO-Revision-Date: 2008-04-14 11:25+0200\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: Euskara \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Popfile-ren barne datuen babeskopia egin bahi al duzu?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"Popfilek barne informazioa gordetzen duen modua aldatu du. Aurreko " -"bertsiotik automatikoki eguneratu da, baina noizbait bertsioan atzera egin " -"nahi baduzu zure datu zaharren babeskopia bat beharko duzu." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Zure datuen babeskopia /var/lib/popfile/backup-.tar.gz-en ipiniko " -"da. Hau bertsioa zahartu nahi izanez gero bakarrik beharko duzu." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Web interfaze ataka:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "Hau da popfile web interfazeak entzunego duen ataka." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "Web interfazeak konexio lokalak bakarrik onartu behar al ditu?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Web interfazean lokalak ez diren konexioak ezgaitzeak segurtasuna handitzen " -"du. Lokalak ez diren konexioak onartzea erabakitzen baduzu gogoratu ahal " -"bezain laster pasahitz bat ezartzeaz (web interfazearen segurtasun zatian)." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "POP proxy ataka:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "Hau da popfileren POP proxy-ak entzungo duen ataka." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "Pop proxy-ak konexio lokalak bakarrik onartu behar ditu?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "" -"POP proxy-an lokalak ez diren konexioak ezgaitzeak segurtasuna handitzen du." diff -pruN 0.22.4-1.2/debian/po/fi.po 1.0.1-0ubuntu2/debian/po/fi.po --- 0.22.4-1.2/debian/po/fi.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/fi.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: popfile\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" -"PO-Revision-Date: 2008-04-13 12:08+0200\n" -"Last-Translator: Esko Arajärvi \n" -"Language-Team: Finnish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Finnish\n" -"X-Poedit-Country: FINLAND\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Tulisiko popfilen sisäisistä tiedoista ottaa varmuuskopio?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"Tapa, jolla popfile on tallentaa sisäiset tietonsa on muuttunut. Aikaisemmat " -"versiot päivitetään automaattisesti, mutta jos paketti halutaan koskaan " -"päivityksen jälkeen varhentaa aikaisempaan versioon, täytyy vanhoista " -"tiedoista ottaa nyt varmuuskopiot." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Nykyiset tiedot kopioidaan nimelle /var/lib/popfile/backup-.tar.gz. " -"Vain nämä tarvitaan, jos paketti varhennetaan." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Verkkokäyttöliittymän portti:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "Anna portti, jota popfilen verkkokäyttöliittymä kuuntelee." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "Tulisiko verkkokäyttöliittymän sallia vain paikalliset yhteydet?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Verkkokäyttöliittymän etäyhteyksien kieltäminen lisää turvallisuutta. Jos ne " -"päätetään ottaa käyttöön, tulisi salasana (verkkokäyttöliittymän " -"turvallisuusosassa) asettaa mahdollisimman pian." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "POP-välityspalvelimen portti:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "Anna portti, jota popfilen POP-välityspalvelin kuuntelee." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "Tulisiko POP-välityspalvelimen sallia vain paikalliset yhteydet?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "POP-välityspalvelimen etäyhteyksien kieltäminen lisää turvallisuutta." diff -pruN 0.22.4-1.2/debian/po/fr.po 1.0.1-0ubuntu2/debian/po/fr.po --- 0.22.4-1.2/debian/po/fr.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/fr.po 2008-07-24 20:13:56.000000000 +0100 @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: popfile\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2004-09-11 11:11+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff -pruN 0.22.4-1.2/debian/po/gl.po 1.0.1-0ubuntu2/debian/po/gl.po --- 0.22.4-1.2/debian/po/gl.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -# Galician translation of popfile's debconf templates -# This file is distributed under the same license as the popfile package. -# Jacobo Tarrio , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: popfile\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" -"PO-Revision-Date: 2008-04-13 13:41+0100\n" -"Last-Translator: Jacobo Tarrio \n" -"Language-Team: Galician \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "¿Quere facer unha copia de seguridade dos datos internos de popfile?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"Popfile cambiou a maneira na que armacena os seus datos internos. Ha " -"actualizar automaticamente as versións antigas, pero se quere voltar a unha " -"versión anterior ha precisar dunha copia de seguridade dos datos antigos." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Hase facer unha copia dos seus datos actuais en /var/lib/popfile/backup-" -".tar.gz. Só ha precisar dela se quere voltar á versión anterior." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Porto da interface web:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "Este é o porto no que a interface web de popfile ha escoitar." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "¿A interface web só acepta conexións locais?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Desactivar a interface web para conexións non locais ha aumentar a " -"seguridade. Se decide permitir que popfile acepte conexións non locais, " -"lembre establecer un contrasinal (na parte de seguridade da interface web) o " -"antes posible." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "Porto do proxy POP:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "Este é o porto no que o proxy POP de popfile ha escoitar." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "¿O proxy POP acepta só conexións locais?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "" -"Desactivar o proxy POP para conexións non locais ha aumentar a seguridade." diff -pruN 0.22.4-1.2/debian/po/ja.po 1.0.1-0ubuntu2/debian/po/ja.po --- 0.22.4-1.2/debian/po/ja.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/ja.po 2008-07-24 20:13:56.000000000 +0100 @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: popfile \n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2004-09-11 13:08+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" diff -pruN 0.22.4-1.2/debian/po/nl.po 1.0.1-0ubuntu2/debian/po/nl.po --- 0.22.4-1.2/debian/po/nl.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/nl.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER -# This file is distributed under the same license as the package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: popfile\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-03-27 08:13+0100\n" -"PO-Revision-Date: 2008-02-08 11:34+0100\n" -"Last-Translator: Bart Cornelis \n" -"Language-Team: debian-l10n-dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Dutch\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Wilt u een reservekopie maken van de interne data van popfile?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"De manier waarop popfile zijn interne data opslaat is veranderd. Dit wordt " -"automatisch opgewaardeerd van vorige versies, maar als u de mogelijkheid " -"wilt hebben om terug te gaan naar een oudere versie heeft u een reservekopie " -"van de oude data nodig." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Er wordt een reservekopie van de huidige data aangemaakt in /var/lib/popfile/" -"backup-.tar.gz ; deze reservekopie heeft u enkel nodig wanneer u " -"terug gaat naar een oudere versie." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Poort voor de webinterface:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "Dit is de poort waarop de webinterface van popfile bereikbaar is." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "Wilt u dat de webinterface enkel lokale verbindingen toestaat?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Enkel lokale verbindingen naar de webinterface toestaan verhoogt de " -"veiligheid. Als u beslist om niet-lokale verbindingen toe te staan, vergeet " -"dan niet om zo snel mogelijk een wachtwoord in te stellen (in het " -"beveiligingsgedeelte van de webinterface)." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "Poort voor de POP-proxy:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "Dit is de poort waarop de POP-proxy van popfile bereikbaar is." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "Wilt u dat de POP-proxy enkel lokale verbindingen toestaat?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "" -"Enkel lokale verbindingen naar de POP-proxy toestaan verhoogt de veiligheid. " diff -pruN 0.22.4-1.2/debian/po/pt.po 1.0.1-0ubuntu2/debian/po/pt.po --- 0.22.4-1.2/debian/po/pt.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -# Portuguese translation for popfile's debconf messages -# Copyright (C) 2007 Miguel Figueiredo -# This file is distributed under the same license as the popfile package. -# Miguel Figueiredo , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: popfile 0.22.4-1\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-03-27 08:13+0100\n" -"PO-Revision-Date: 2007-03-18 16:28+0000\n" -"Last-Translator: Miguel Figueiredo \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Deseja salvaguardar os dados internos do popfile?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"O popfile mudou o modo como guarda os seus dados internos. Irá fazer a " -"actualização automática a partir de versões anteriores, mas se alguma vez " -"quiser fazer o downgrade você irá precisar dos dados antigos." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"Será feito um backup dos seus dados actuais em /var/lib/popfile/backup-" -".tar.gz. Você irá precisar disto se desejar fazer 'downgrade'." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Porto do Web UI:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "Este é o porto no qual o UI web do popfile irá escutar." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "O Web UI aceita apenas ligações locais?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Desabilitar o UI Web para ligações não locais irá aumentar a segurança. Se " -"você decidir deixar o popfile aceitar ligações não-locais lembre-se de " -"definir uma palavra-passe (na secção de segurança web UI) logo que possível." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "Porto do Proxy POP:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "Este é o porto no qual o proxy POP do popfile irá escutar." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "O Proxy de POP aceita apenas ligações locais?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "" -"Desabilitar o proxy POP para ligações não-locais irá aumentar a segurança." diff -pruN 0.22.4-1.2/debian/po/ru.po 1.0.1-0ubuntu2/debian/po/ru.po --- 0.22.4-1.2/debian/po/ru.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/ru.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -# translation of popfile_0.22.4-1_debconf_ru.po to Russian -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Yuri Kozlov , 2007. -msgid "" -msgstr "" -"Project-Id-Version: 0.22.4-1\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-03-27 08:13+0100\n" -"PO-Revision-Date: 2007-01-17 22:03+0300\n" -"Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "Do you wish to backup popfile's internal data?" -msgstr "Создать резервную копию внутренних данных popfile?" - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"Popfile has changed the way it stores its internal data. It will " -"automatically upgrade from previous versions, but if you ever want to " -"downgrade you will need a backup of your old data." -msgstr "" -"Ð’ popfile изменилÑÑ ÑпоÑоб Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… данных. Будет произведёно " -"автоматичеÑкое обновление, но еÑли вы захотите вернутьÑÑ Ð½Ð° прежнюю верÑию, " -"вам нужно выполнить резервное копирование данных." - -#. Type: boolean -#. Description -#: ../popfile.templates:1001 -msgid "" -"A backup of your current data will be done in /var/lib/popfile/backup-" -".tar.gz. You will only need this if you wish to downgrade." -msgstr "" -"ÐšÐ¾Ð¿Ð¸Ñ Ð¸Ð¼ÐµÑŽÑ‰Ð¸Ñ…ÑÑ Ð´Ð°Ð½Ð½Ñ‹Ñ… будет Ñохранена в файле /var/lib/popfile/backup-" -"<верÑиÑ>.tar.gz. Это нужно только еÑли вы захотите вернутьÑÑ Ð½Ð° Ñтарую " -"верÑию." - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "Web UI Port:" -msgstr "Порт Ð´Ð»Ñ Ð²ÐµÐ±-интерфейÑа:" - -#. Type: string -#. Description -#: ../popfile.templates:2001 -msgid "This is the port on which popfile's web UI will listen." -msgstr "" -"ЗдеÑÑŒ задаётÑÑ Ð½Ð¾Ð¼ÐµÑ€ порта, на котором веб-Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ popfile будет принимать " -"входÑщие ÑоединениÑ." - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "Web UI accepts only local connections?" -msgstr "Разрешить только локальные Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº веб-интерфейÑу?" - -#. Type: boolean -#. Description -#: ../popfile.templates:3001 -msgid "" -"Disabling the web UI for non local connections will increase security. If " -"you decide to let popfile accept non local connections remember to set a " -"password (in the security part of the web UI) as soon as possible." -msgstr "" -"Запрет на подключение к веб-интерфейÑу извне повышает безопаÑноÑÑ‚ÑŒ. ЕÑли вы " -"разрешите popfile отвечать на внешние запроÑÑ‹, уÑтановите пароль (пункт про " -"безопаÑноÑÑ‚ÑŒ в веб-интерфейÑе) Ñразу как только Ñто Ñтанет возможно." - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "POP Proxy Port:" -msgstr "Порт Ð´Ð»Ñ POP-прокÑи:" - -#. Type: string -#. Description -#: ../popfile.templates:4001 -msgid "This is the port on which popfile's POP proxy will listen." -msgstr "" -"ЗдеÑÑŒ задаётÑÑ Ð½Ð¾Ð¼ÐµÑ€ порта, на котором popfile POP-прокÑи будет принимать " -"входÑщие ÑоединениÑ." - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "POP proxy accepts only local connections?" -msgstr "Разрешить только локальные Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº POP-прокÑи?" - -#. Type: boolean -#. Description -#: ../popfile.templates:5001 -msgid "" -"Disabling the POP proxy for non local connections will increase security." -msgstr "Запрет на подключение к POP-прокÑи извне повышает безопаÑноÑÑ‚ÑŒ." diff -pruN 0.22.4-1.2/debian/po/sv.po 1.0.1-0ubuntu2/debian/po/sv.po --- 0.22.4-1.2/debian/po/sv.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/sv.po 2008-07-24 20:13:56.000000000 +0100 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: popfile 0.22.2-3\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2005-12-19 12:54+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff -pruN 0.22.4-1.2/debian/po/templates.pot 1.0.1-0ubuntu2/debian/po/templates.pot --- 0.22.4-1.2/debian/po/templates.pot 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/templates.pot 2008-07-24 20:13:56.000000000 +0100 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -pruN 0.22.4-1.2/debian/po/vi.po 1.0.1-0ubuntu2/debian/po/vi.po --- 0.22.4-1.2/debian/po/vi.po 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/po/vi.po 2008-07-24 20:13:56.000000000 +0100 @@ -1,12 +1,12 @@ # Vietnamese translation for popfile. # Copyright © 2005 Free Software Foundation, Inc. # Clytie Siddall , 2005. -# +# msgid "" msgstr "" "Project-Id-Version: popfile 0.22.2-2\n" -"Report-Msgid-Bugs-To: popfile@packages.debian.org\n" -"POT-Creation-Date: 2008-04-03 13:19+0200\n" +"Report-Msgid-Bugs-To: ubuntu-motu@lists.ubuntu.com\n" +"POT-Creation-Date: 2007-07-29 22:17-0400\n" "PO-Revision-Date: 2005-07-05 19:28+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff -pruN 0.22.4-1.2/debian/popfile.doc-base 1.0.1-0ubuntu2/debian/popfile.doc-base --- 0.22.4-1.2/debian/popfile.doc-base 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/popfile.doc-base 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -Document: popfile -Title: Popfile Manual -Author: Popfile team -Abstract: This manual describes what popfile - is and how it must be configured to filter - emails. -Section: Network/Communication - -Format: HTML -Index: /usr/share/doc/popfile/manual/en/manual.html -Files: /usr/share/doc/popfile/manual/en/*.html diff -pruN 0.22.4-1.2/debian/postinst 1.0.1-0ubuntu2/debian/postinst --- 0.22.4-1.2/debian/postinst 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/debian/postinst 2008-07-24 20:13:56.000000000 +0100 @@ -13,17 +13,17 @@ case "$1" in ( echo "Creating user (ignore 'already exist' errors)" + mkdir -p /var/lib/popfile adduser --system --home /usr/lib/popfile --no-create-home \ --group --shell /bin/sh --home /var/lib/popfile popfile \ || true >/dev/null mkdir -p /var/run/popfile - chown -R popfile.popfile /var/run/popfile + chown -R popfile:popfile /var/run/popfile mkdir -p /var/log/popfile - chown -R popfile.popfile /var/log/popfile + chown -R popfile:popfile /var/log/popfile - mkdir -p /var/lib/popfile if [ ! -e /var/lib/popfile/stopwords ] then cp /usr/share/popfile/stopwords /var/lib/popfile/ @@ -33,7 +33,7 @@ case "$1" in cp -f /etc/popfile/popfile.cfg /var/lib/popfile/ rm -f /etc/popfile/popfile.cfg fi - chown -R popfile.popfile /var/lib/popfile + chown -R popfile:popfile /var/lib/popfile mkdir -p /etc/popfile diff -pruN 0.22.4-1.2/insert.pl 1.0.1-0ubuntu2/insert.pl --- 0.22.4-1.2/insert.pl 2006-02-16 15:36:14.000000000 +0000 +++ 1.0.1-0ubuntu2/insert.pl 2008-04-18 14:49:22.000000000 +0100 @@ -3,7 +3,7 @@ # # insert.pl --- Inserts a mail message into a specific bucket # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/languages/Arabic.msg 1.0.1-0ubuntu2/languages/Arabic.msg --- 0.22.4-1.2/languages/Arabic.msg 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Arabic.msg 2008-04-18 14:49:44.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -25,7 +25,7 @@ LanguageDirection ManualLanguage ar # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply تطبيق @@ -228,8 +228,8 @@ Security_Error1 Security_Stealth نظام الإخÙاء/عمليات الخادم Security_NoStealthMode لا (نظام الإخÙاء) Security_StealthMode (Stealth Mode) -Security_ExplainStats (عندما يكون Ùعالاً يقوم POPFile بإرسال القيم الثلاث التالية إلى www.usethesource.com مرة واحدة ÙÙŠ اليوم: bc (إجمالي عدد الدلاء التي عندك)ØŒ mc (إجمالي عدد الرسائل التي صنÙها POPFile) Ùˆ ec (إجمالي عدد أخطاء التصنيÙ). هذه القيم تخزن ÙÙŠ مل٠ومن ثم يتم إستعمالها لنشر إحصاءات عن كيÙية استعمال الناس لـ POPFile ومدى نجاهة. الخادم الأساسي يقوم بحÙظ السجلات لمدة 5 أيام ومن ثم يتم حذÙها؛ ليس هناك سجلات تربط بين الإحصاءات وعناوين IP الÙردية). -Security_ExplainUpdate (عندما يكون Ùعالاً يقوم POPFile بإرسال القيم الثلاث التالية إلى www.usethesource.com مرة واحدة ÙÙŠ اليوم: ma (رقم الإصدار الأعلى لنسخة POPFile المركبة)ØŒ mi (رقم الإصدار الأدنى لنسخة POPFile المركبة) Ùˆ bn (رقم البنية لنسخة POPFile المركبة). POPFile يحصل على جواب على شكل صورة تظهر ÙÙŠ أعلى الصÙحة إذا ما كان هناك تحديث. الخادم الأساسي يقوم بحÙظ السجلات لمدة 5 أيام ومن ثم يتم حذÙها؛ ليس هناك سجلات تربط بين تÙحص التحديثات وعناوين IP الÙردية). +Security_ExplainStats (عندما يكون Ùعالاً يقوم POPFile بإرسال القيم الثلاث التالية إلى getpopfile.org مرة واحدة ÙÙŠ اليوم: bc (إجمالي عدد الدلاء التي عندك)ØŒ mc (إجمالي عدد الرسائل التي صنÙها POPFile) Ùˆ ec (إجمالي عدد أخطاء التصنيÙ). هذه القيم تخزن ÙÙŠ مل٠ومن ثم يتم إستعمالها لنشر إحصاءات عن كيÙية استعمال الناس لـ POPFile ومدى نجاهة. الخادم الأساسي يقوم بحÙظ السجلات لمدة 5 أيام ومن ثم يتم حذÙها؛ ليس هناك سجلات تربط بين الإحصاءات وعناوين IP الÙردية). +Security_ExplainUpdate (عندما يكون Ùعالاً يقوم POPFile بإرسال القيم الثلاث التالية إلى getpopfile.org مرة واحدة ÙÙŠ اليوم: ma (رقم الإصدار الأعلى لنسخة POPFile المركبة)ØŒ mi (رقم الإصدار الأدنى لنسخة POPFile المركبة) Ùˆ bn (رقم البنية لنسخة POPFile المركبة). POPFile يحصل على جواب على شكل صورة تظهر ÙÙŠ أعلى الصÙحة إذا ما كان هناك تحديث. الخادم الأساسي يقوم بحÙظ السجلات لمدة 5 أيام ومن ثم يتم حذÙها؛ ليس هناك سجلات تربط بين تÙحص التحديثات وعناوين IP الÙردية). Security_PasswordTitle كلمة المرور لواجهة المستخدم Security_Password كلمة المرور Security_PasswordUpdate تم تعديل كلمة المرور @@ -371,6 +371,6 @@ Imap_WatchedFolder Shutdown_Message تم إقÙال POPFile -Help_Training عند إستعمالك POPFile لأول مرة، Ùإنه لا يعر٠أي شيء ويحتاج لبعض التدريب. يحتاج POPFile للتدريب على رسائل لكل دلو، التدريب يتم عند إعادة تصني٠رسالة قام POPFile بتصنيÙها بشكل خاطئ. ستحتاج أيضاً إلى إعداد برنامج البريد ليقوم بترتيب البريد حسب تصنيÙات POPFile. يمكن العثور على التعليمات لإعداد برامج البريد ÙÙŠ صÙحات تعليمات POPFile. +Help_Training عند إستعمالك POPFile لأول مرة، Ùإنه لا يعر٠أي شيء ويحتاج لبعض التدريب. يحتاج POPFile للتدريب على رسائل لكل دلو، التدريب يتم عند إعادة تصني٠رسالة قام POPFile بتصنيÙها بشكل خاطئ. ستحتاج أيضاً إلى إعداد برنامج البريد ليقوم بترتيب البريد حسب تصنيÙات POPFile. يمكن العثور على التعليمات لإعداد برامج البريد ÙÙŠ صÙحات تعليمات POPFile. Help_Bucket_Setup يحتاج POPFile إلى دلوين على الأقل بالإضاÙØ© إلى دلو غير-المصنÙ. ما يجعل POPFile Ùريداً هو أنه يستطيع تصني٠بريد اكثر من هذا، تستطيع ان يكون عندك أي عدد من الدلاء. أبسط إعداد هو أن يكون عندك الدلاء "spam"ØŒ "personal"ØŒ "work". Help_No_More لا تعرض هذا مرة أخرى diff -pruN 0.22.4-1.2/languages/Bulgarian.msg 1.0.1-0ubuntu2/languages/Bulgarian.msg --- 0.22.4-1.2/languages/Bulgarian.msg 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Bulgarian.msg 2008-04-18 14:49:46.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -155,8 +155,8 @@ Password_Error1 Security_Error1 Ïîðòúò ñ ëåãèòèìèðàíå òðÿáâà äà áúäå ÷èñëî ìåæäó 1 è 65535 Security_Stealth Ñêðèò ðåæèì Security_NoStealthMode Íå (ñêðèò ðåæèì) -Security_ExplainStats (Êîãàòî òîâà å âêëþ÷åíî, POPFile âåäíúæ äíåâíî èçïðàùà êúì ñêðèïò íà www.usethesource.com: bc (áðîÿ íà êîøîâåòå), mc (áðîÿ ñúîáùåíèÿ, êëàñèôèöèðàíè îò POPFile) è ec (áðîÿ íà ãðåøíî êëàñèôèöèðàíèòå ñúîáùåíèÿ). Òåçè ñòîéíîñòè ñå ñúõðàíÿâàò âúâ ôàéë è áëàãîäàðåíèå íà òÿõ àç ïóáëèêóâàì ñòàòèñòèêà çà íà÷èíà, ïî êîéòî õîðàòà èçïîëçâàò POPFile è êîëêî äîáðå ðàáîòè. Ìîÿò Web ñúðâúð ñúõðàíÿâà ëîã-ôàéëîâåòå ñè â ïðîäúëæåíèå íà îêîëî 5 äíè, ñëåä êîåòî ãè èçòðèâà; àç íå ïàçÿ âðúçêà ìåæäó ñòàòèñòè÷åñêèòå äàííè è êîíêðåòíèòå IP àäðåñè.) -Security_ExplainUpdate (Êîãàòî òîâà å âêëþ÷åíî, POPFile âåäíúæ äíåâíî èçïðàùà êúì ñêðèïò íà www.usethesource.com: bc (áðîÿ íà êîøîâåòå), mc (áðîÿ ñúîáùåíèÿ, êëàñèôèöèðàíè îò POPFile) è ec (áðîÿ íà ãðåøíî êëàñèôèöèðàíèòå ñúîáùåíèÿ). POPFile ïîëó÷àâà îáðàòíî èçâåñòèå äàëè èìà ïî-íîâà âåðñèÿ íà ñîôòóåðà è ïîêàçâà ñúîòâåòíà êàðòèíêà íà âñÿêà ñòðàíèöà. Ìîÿò Web ñúðâúð ñúõðàíÿâà ëîã-ôàéëîâåòå ñè â ïðîäúëæåíèå íà îêîëî 5 äíè, ñëåä êîåòî ãè èçòðèâà; àç íå ïàçÿ âðúçêà ìåæäó çàïèòâàíèÿòà çà íîâà âåðñèÿ è êîíêðåòíèòå IP àäðåñè.) +Security_ExplainStats (Êîãàòî òîâà å âêëþ÷åíî, POPFile âåäíúæ äíåâíî èçïðàùà êúì ñêðèïò íà getpopfile.org: bc (áðîÿ íà êîøîâåòå), mc (áðîÿ ñúîáùåíèÿ, êëàñèôèöèðàíè îò POPFile) è ec (áðîÿ íà ãðåøíî êëàñèôèöèðàíèòå ñúîáùåíèÿ). Òåçè ñòîéíîñòè ñå ñúõðàíÿâàò âúâ ôàéë è áëàãîäàðåíèå íà òÿõ àç ïóáëèêóâàì ñòàòèñòèêà çà íà÷èíà, ïî êîéòî õîðàòà èçïîëçâàò POPFile è êîëêî äîáðå ðàáîòè. Ìîÿò Web ñúðâúð ñúõðàíÿâà ëîã-ôàéëîâåòå ñè â ïðîäúëæåíèå íà îêîëî 5 äíè, ñëåä êîåòî ãè èçòðèâà; àç íå ïàçÿ âðúçêà ìåæäó ñòàòèñòè÷åñêèòå äàííè è êîíêðåòíèòå IP àäðåñè.) +Security_ExplainUpdate (Êîãàòî òîâà å âêëþ÷åíî, POPFile âåäíúæ äíåâíî èçïðàùà êúì ñêðèïò íà getpopfile.org: bc (áðîÿ íà êîøîâåòå), mc (áðîÿ ñúîáùåíèÿ, êëàñèôèöèðàíè îò POPFile) è ec (áðîÿ íà ãðåøíî êëàñèôèöèðàíèòå ñúîáùåíèÿ). POPFile ïîëó÷àâà îáðàòíî èçâåñòèå äàëè èìà ïî-íîâà âåðñèÿ íà ñîôòóåðà è ïîêàçâà ñúîòâåòíà êàðòèíêà íà âñÿêà ñòðàíèöà. Ìîÿò Web ñúðâúð ñúõðàíÿâà ëîã-ôàéëîâåòå ñè â ïðîäúëæåíèå íà îêîëî 5 äíè, ñëåä êîåòî ãè èçòðèâà; àç íå ïàçÿ âðúçêà ìåæäó çàïèòâàíèÿòà çà íîâà âåðñèÿ è êîíêðåòíèòå IP àäðåñè.) Security_PasswordTitle Ïàðîëà çà ïîòðåáèòåëñêèÿ èíòåðôåéñ Security_Password Ïàðîëà Security_PasswordUpdate Ïàðîëàòà ïðîìåíåíà íà %s diff -pruN 0.22.4-1.2/languages/Catala.msg 1.0.1-0ubuntu2/languages/Catala.msg --- 0.22.4-1.2/languages/Catala.msg 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Catala.msg 2008-04-18 14:49:46.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # 2005/08/09 Translated by David Gimeno i Ayuso # @@ -27,7 +27,7 @@ LanguageDirection ManualLanguage en # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Aplicar @@ -230,8 +230,8 @@ Security_Error1 Security_Stealth Mode furtiu/Operació del servidor Security_NoStealthMode No (mode furtiu) Security_StealthMode (Mode furtiu) -Security_ExplainStats (Si s'activa, POPFile envia un cop al dia els tres següents valors a un programa a www.usethesource.com: bc, el nombre total de cistelles que teniu; mc, el nombre total de missatges classificats per POPFile, i ec, el nombre total d'errors de classificació. Això s'emmagatzema en un fitxer i serà usat per confeccionar estadístiques d'ús de POPFile i com funciona de bé. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre estadístiques i adreces IP individuals). -Security_ExplainUpdate (Si s'activa, POPFile envia un cop per dia els tres següents valors a un programa a www.usethesource.com: ma, el nombre major de versió de la vostra instal·lació POPFile; mi, el nombre menor de versió de la vostra instal·lació POPFile, i bn, el nombre de muntatge de la vostra instal·lació POPFile. POPFile rep una resposta en forma de gràfic que surt dalt de la pàgina, si hi ha una versió nova disponible. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre les verificacions d'actualització i les adreces IP individuals). +Security_ExplainStats (Si s'activa, POPFile envia un cop al dia els tres següents valors a un programa a getpopfile.org: bc, el nombre total de cistelles que teniu; mc, el nombre total de missatges classificats per POPFile, i ec, el nombre total d'errors de classificació. Això s'emmagatzema en un fitxer i serà usat per confeccionar estadístiques d'ús de POPFile i com funciona de bé. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre estadístiques i adreces IP individuals). +Security_ExplainUpdate (Si s'activa, POPFile envia un cop per dia els tres següents valors a un programa a getpopfile.org: ma, el nombre major de versió de la vostra instal·lació POPFile; mi, el nombre menor de versió de la vostra instal·lació POPFile, i bn, el nombre de muntatge de la vostra instal·lació POPFile. POPFile rep una resposta en forma de gràfic que surt dalt de la pàgina, si hi ha una versió nova disponible. El meu servidor web conserva els seus fitxers de registre uns 5 dies i aleshores s'esborren; no emmagatzemo cap connexió entre les verificacions d'actualització i les adreces IP individuals). Security_PasswordTitle Contrasenya d'interfície d'usuari Security_Password Contrasenya Security_PasswordUpdate S'ha actualitzat la contrasenya @@ -373,6 +373,6 @@ Imap_WatchedFolder Shutdown_Message S'ha aturat el POPFile -Help_Training Quan useu per primer cop POPFile, no sap res i caldrà una mica d'entrenament. Cal entrenar POPFile per a cada cistella. L'anireu educant cada cop que reclassifiqueu un missatge que POPFile hagi classificat a una cistella incorrecta. També haureu de configurar el vostre client de correu perquè filtri els missatges segons la classificació de POPFile. Podeu trobar informació sobre com configurar el filtratge del vostre client de correu a Projecte de Documentació POPFile (en anglès). +Help_Training Quan useu per primer cop POPFile, no sap res i caldrà una mica d'entrenament. Cal entrenar POPFile per a cada cistella. L'anireu educant cada cop que reclassifiqueu un missatge que POPFile hagi classificat a una cistella incorrecta. També haureu de configurar el vostre client de correu perquè filtri els missatges segons la classificació de POPFile. Podeu trobar informació sobre com configurar el filtratge del vostre client de correu a Projecte de Documentació POPFile (en anglès). Help_Bucket_Setup POPFile necessita al menys dues cistelles a més de la pseudo-cistella 'unclassified'. El que fa únic POPFile és que pot classificar els correus en tantes cistelles com volgueu. Una configuració senzilla pot ser una cistella "spam", una "personal" i una altra "feina". Help_No_More No mostrar-m'ho més diff -pruN 0.22.4-1.2/languages/Chinese-Simplified-GB2312.msg 1.0.1-0ubuntu2/languages/Chinese-Simplified-GB2312.msg --- 0.22.4-1.2/languages/Chinese-Simplified-GB2312.msg 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Chinese-Simplified-GB2312.msg 2008-04-18 14:49:46.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -15,10 +15,10 @@ # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# POPFile 0.22.0 Simplified Chinese Translation +# POPFile 1.0.0 Simplified Chinese Translation # Created By Jedi Lin, 2004/09/19 # In fact translated from Traditional Chinese by Encode::HanConvert -# Modified By Jedi Lin, 2004/09/23 +# Modified By Jedi Lin, 2007/12/25 # Identify the language and character set used for the interface LanguageCode cn @@ -29,10 +29,11 @@ LanguageDirection ManualLanguage zh-cn # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Ì×Óà +ApplyChanges Ì×Óñä¸ü On ¿ª Off ¹Ø TurnOn ´ò¿ª @@ -158,14 +159,14 @@ Configuration_XTCInsertion Configuration_XPLInsertion ÔÚ±êÍ·²åÈë
X-POPFile-Link Configuration_Logging ÈÕÖ¾ Configuration_None ÎÞ -Configuration_ToScreen Êä³öÖÁÆÁÄ» +Configuration_ToScreen Êä³öÖÁÆÁÄ» (Console) Configuration_ToFile Êä³öÖÁµµ°¸ Configuration_ToScreenFile Êä³öÖÁÆÁÄ»¼°µµ°¸ Configuration_LoggerOutput ÈÕÖ¾Êä³ö·½Ê½ Configuration_GeneralSkins Íâ¹ÛÑùʽ Configuration_SmallSkins СÐÍÍâ¹ÛÑùʽ Configuration_TinySkins ΢ÐÍÍâ¹ÛÑùʽ -Configuration_CurrentLogFile <ÏÂÔØÄ¿Ç°µÄÈÕÖ¾µµ> +Configuration_CurrentLogFile <¼ìÊÓÄ¿Ç°µÄÈÕÖ¾µµ> Configuration_SOCKSServer SOCKS V ´úÀí·þÎñÆ÷Ö÷»ú Configuration_SOCKSPort SOCKS V ´úÀí·þÎñÆ÷Á¬½Ó²º Configuration_SOCKSPortUpdate SOCKS V ´úÀí·þÎñÆ÷Á¬½Ó²ºÒѸüÐÂΪ %s @@ -184,7 +185,7 @@ Advanced_RemoveWord Advanced_AllParameters ËùÓÐµÄ POPFile ²ÎÊý Advanced_Parameter ²ÎÊý Advanced_Value Öµ -Advanced_Warning ÕâÊÇÍêÕûµÄ POPFile ²ÎÊýÇåµ¥. µoÊʺϽø½×ʹÓÃÕß: Äã¿ÉÒÔ±ä¸üÈκβÎÊýÖµ²¢°´Ï ¸üÐÂ; ²»¹ýûÓÐÈκλúÖÆ»á¼ì²éÕâЩ²ÎÊýÖµµÄÓÐЧÐÔ. ÒÔ´ÖÌåÏÔʾµÄÏîÄ¿±íʾÒѾ­´ÓÔ¤ÉèÖµ±»¼ÓÒÔ±ä¸üÁË. +Advanced_Warning ÕâÊÇÍêÕûµÄ POPFile ²ÎÊýÇåµ¥. µoÊʺϽø½×ʹÓÃÕß: Äã¿ÉÒÔ±ä¸üÈκβÎÊýÖµ²¢°´Ï ¸üÐÂ; ²»¹ýûÓÐÈκλúÖÆ»á¼ì²éÕâЩ²ÎÊýÖµµÄÓÐЧÐÔ. ÒÔ´ÖÌåÏÔʾµÄÏîÄ¿±íʾÒѾ­´ÓÔ¤ÉèÖµ±»¼ÓÒÔ±ä¸üÁË. ¸üÏ꾡µÄÑ¡ÏîÐÅÏ¢Çë¼û OptionReference. Advanced_ConfigFile ×é̬µµ: History_Filter  (µoÏÔʾ %s ÓÊͲ) @@ -213,7 +214,7 @@ History_Magnet History_NoMagnet  (µoÏÔʾ²»ÊÇÓÉÎüÌúËù·ÖÀàµÄÓʼþѶϢ) History_ResetSearch ÖØÉè History_ChangedClass ÏÖÔÚ±»·ÖÀàΪ -History_Purge ÂíÉÏɾ³ý +History_Purge ¼´¿Ìµ½ÆÚ History_Increase Ôö¼Ó History_Decrease ¼õÉÙ History_Column_Characters ±ä¸ü¼Ä¼þÕß, ÊÕ¼þÕß, ¸±±¾ºÍÖ÷Ö¼×ֶεĿí¶È @@ -232,8 +233,8 @@ Security_Error1 Security_Stealth ¹í¹íËîËîģʽ/·þÎñÆ÷×÷Òµ Security_NoStealthMode ·ñ (¹í¹íËîËîģʽ) Security_StealthMode (¹í¹íËîËîģʽ) -Security_ExplainStats (Õâ¸öÑ¡ÏÆôºó, POPFile ÿÌ춼»á´«ËÍÒ»´ÎÏÂÁÐÈý¸öÊýÖµµ½ www.usethesource.com µÄÒ»¸ö½Å±¾: bc (ÄãµÄÓÊͲÊýÁ¿), mc (±» POPFile ·ÖÀà¹ýµÄÓʼþѶϢ×ÜÊý) ºÍ ec (·ÖÀà´íÎóµÄ×ÜÊý). ÕâЩÊýÖµ»á±»´¢´æµ½Ò»¸öµµ°¸Àï, È»ºó»á±»ÎÒÓÃÀ´·¢²¼Ò»Ð©¹ØÓÚÈËÃÇʹÓà POPFile µÄÇé¿ö¸úÆä³ÉЧµÄͳ¼ÆÊý¾Ý. ÎÒµÄÍøÒ³·þÎñÆ÷»á±£ÁôÆä±¾ÉíµÄÈÕÖ¾µµÔ¼ 5 Ìì, È»ºó¾Í»á¼ÓÒÔɾ³ý; ÎÒ²»»á´¢´æÈκÎͳ¼ÆÓëµ¥¶À IP µØÖ·¼äµÄ¹ØÁªÐÔÆðÀ´.) -Security_ExplainUpdate (Õâ¸öÑ¡ÏÆôºó, POPFile ÿÌ춼»á´«ËÍÒ»´ÎÏÂÁÐÈý¸öÊýÖµµ½ www.usethesource.com µÄÒ»¸ö½Å±¾: ma (ÄãµÄ POPFile µÄÖ÷Òª°æ±¾±àºÅ), mi (ÄãµÄ POPFile µÄ´ÎÒª°æ±¾±àºÅ) ºÍ bn (ÄãµÄ POPFile µÄ½¨ºÅ). аæÍƳöʱ, POPFile »áÊÕµ½Ò»·ÝͼÐÎÏìÓ¦, ²¢ÇÒÏÔʾÔÚ»­Ã涥¶Ë. ÎÒµÄÍøÒ³·þÎñÆ÷»á±£ÁôÆä±¾ÉíµÄÈÕÖ¾µµÔ¼ 5 Ìì, È»ºó¾Í»á¼ÓÒÔɾ³ý; ÎÒ²»»á´¢´æÈκθüмì²éÓëµ¥¶À IP µØÖ·¼äµÄ¹ØÁªÐÔÆðÀ´.) +Security_ExplainStats (Õâ¸öÑ¡ÏÆôºó, POPFile ÿÌ춼»á´«ËÍÒ»´ÎÏÂÁÐÈý¸öÊýÖµµ½ getpopfile.org µÄÒ»¸ö½Å±¾: bc (ÄãµÄÓÊͲÊýÁ¿), mc (±» POPFile ·ÖÀà¹ýµÄÓʼþѶϢ×ÜÊý) ºÍ ec (·ÖÀà´íÎóµÄ×ÜÊý). ÕâЩÊýÖµ»á±»´¢´æµ½Ò»¸öµµ°¸Àï, È»ºó»á±»ÎÒÓÃÀ´·¢²¼Ò»Ð©¹ØÓÚÈËÃÇʹÓà POPFile µÄÇé¿ö¸úÆä³ÉЧµÄͳ¼ÆÊý¾Ý. ÎÒµÄÍøÒ³·þÎñÆ÷»á±£ÁôÆä±¾ÉíµÄÈÕÖ¾µµÔ¼ 5 Ìì, È»ºó¾Í»á¼ÓÒÔɾ³ý; ÎÒ²»»á´¢´æÈκÎͳ¼ÆÓëµ¥¶À IP µØÖ·¼äµÄ¹ØÁªÐÔÆðÀ´.) +Security_ExplainUpdate (Õâ¸öÑ¡ÏÆôºó, POPFile ÿÌ춼»á´«ËÍÒ»´ÎÏÂÁÐÈý¸öÊýÖµµ½ getpopfile.org µÄÒ»¸ö½Å±¾: ma (ÄãµÄ POPFile µÄÖ÷Òª°æ±¾±àºÅ), mi (ÄãµÄ POPFile µÄ´ÎÒª°æ±¾±àºÅ) ºÍ bn (ÄãµÄ POPFile µÄ½¨ºÅ). аæÍƳöʱ, POPFile »áÊÕµ½Ò»·ÝͼÐÎÏìÓ¦, ²¢ÇÒÏÔʾÔÚ»­Ã涥¶Ë. ÎÒµÄÍøÒ³·þÎñÆ÷»á±£ÁôÆä±¾ÉíµÄÈÕÖ¾µµÔ¼ 5 Ìì, È»ºó¾Í»á¼ÓÒÔɾ³ý; ÎÒ²»»á´¢´æÈκθüмì²éÓëµ¥¶À IP µØÖ·¼äµÄ¹ØÁªÐÔÆðÀ´.) Security_PasswordTitle ʹÓÃÕß½Ó¿Ú¿ÚÁî Security_Password ¿ÚÁî Security_PasswordUpdate ¿ÚÁîÒѸüР@@ -328,6 +329,7 @@ View_WordProbabilities View_WordFrequencies ÕýÔÚÏÔʾ×Ö´ÊƵÂÊ View_WordScores ÕýÔÚÏÔʾ×Ö´ÊµÃ·Ö View_Chart Åж¨Í¼±í +View_DownloadMessage ÏÂÔØÓʼþѶϢ Windows_TrayIcon ÊÇ·ñÒªÔÚ Windows µÄϵͳ³£×¤ÁÐÏÔʾ POPFile ͼ±ê? Windows_Console ÊÇ·ñÒªÔÚÃüÁîÁд°¿ÚÀïÖ´ÐÐ POPFile? @@ -349,7 +351,7 @@ Configuration_InsertionTableSummary Security_MainTableSummary Õâ¸ö±í¸ñÌṩÁ˼¸×é¿ØÖÆ, ÄÜÓ°Ïì POPFile ÕûÌå×é̬µÄ°²È«, ÊÇ·ñÒª×Ô¶¯¼ì²é³ÌÐò¸üÐÂ, ÒÔ¼°ÊÇ·ñÒª°Ñ POPFile ЧÄÜͳ¼ÆÊý¾ÝµÄÒ»°ãÐÅÏ¢´«»Ø³ÌÐò×÷ÕßµÄÖÐÑëÊý¾Ý¿â. Advanced_MainTableSummary Õâ¸ö±í¸ñÌṩÁËÒ»·Ý POPFile ·ÖÀàÓʼþѶϢʱËù»áºöÂÔµÄ×Ö´ÊÇåµ¥, ÒòΪËûÃÇÔÚÒ»°ãÓʼþѶϢÀïµÄ¹ØÁª¹ýÓÚƵ·±. ËýÃǻᱻ°´ÕÕ×Ö´Ê¿ªÍ·µÄ×ÖĶ±»ÖðÁÐÕûÀí. -Imap_Bucket2Folder %s ÓÊͲµÄÐżþÖÁÓʼþÏ» +Imap_Bucket2Folder '%s' ÓÊͲµÄÐżþÖÁÓʼþÏ» Imap_MapError Äã²»Äܰѳ¬¹ýÒ»¸öµÄÓÊͲ¶ÔÓ¦µ½µ¥Ò»µÄÓʼþÏ»Àï! Imap_Server IMAP ·þÎñÆ÷Ö÷»úÃû³Æ: Imap_ServerNameError ÇëÊäÈë·þÎñÆ÷µÄÖ÷»úÃû³Æ! @@ -372,9 +374,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage ÇëÏÈ×é̬Áª»úϸ½Ú. µ±ÄãÍê³Éºó, ÕâÒ»Ò³Àï¾Í»á³öÏÖ¸ü¶à¿ÉÓõÄÑ¡Ïî. Imap_WatchMore ±»¼àÊÓÓʼþÏ»Çåµ¥µÄÓʼþÏ» Imap_WatchedFolder ±»¼àÊÓµÄÓʼþÏ»±àºÅ +Imap_Use_SSL ʹÓà SSL Shutdown_Message POPFile ÒѾ­±»Í£µôÁË -Help_Training µ±Äã³õ´ÎʹÓà POPFile ʱ, ËýɶҲ²»¶®¶øÐèÒª±»¼ÓÒÔµ÷½Ì. POPFile µÄÿһ¸öÓÊͲ¶¼ÐèÒªÓÃÓʼþѶϢÀ´¼ÓÒÔµ÷½Ì, µoÓе±ÄãÖØаÑij¸ö±» POPFile ´íÎó·ÖÀàµÄÓʼþѶϢÖØзÖÀൽÕýÈ·µÄÓÊͲʱ, ²ÅÕæµÄÊÇÔÚµ÷½ÌËý. ͬʱÄãÒ²µÃÉ趨ÄãµÄÓʼþÓû§¶Ë³ÌÐò, À´°´ÕÕ POPFile µÄ·ÖÀà½á¹û¼ÓÒÔ¹ýÂËÓʼþѶϢ. ¹ØÓÚÉ趨Óû§¶Ë¹ýÂËÆ÷µÄÐÅÏ¢¿ÉÒÔÔÚ POPFile Îļþ¼Æ»­Àï±»ÕÒµ½. -Help_Bucket_Setup POPFile ³ýÁËδ·ÖÀà (unclassified) µÄ¼ÙÓÊͲÍâ, »¹ÐèÒªÖÁÉÙÁ½¸öÓÊͲ. ¶ø POPFile µÄ¶ÀÌØÖ®´¦ÕýÔÚÓÚËý¶Ôµç×ÓÓʼþµÄÇø·Ö¸üʤÓÚ´Ë, ÄãÉõÖÁ¿ÉÒÔÓÐÈÎÒâÊýÁ¿µÄÓÊͲ. ¼òµ¥µÄÉ趨»áÊÇÏñ "À¬»ø (spam)", "¸öÈË (personal)", ºÍ "¹¤×÷ (work)" ÓÊͲ. +Help_Training µ±Äã³õ´ÎʹÓà POPFile ʱ, ËýɶҲ²»¶®¶øÐèÒª±»¼ÓÒÔµ÷½Ì. POPFile µÄÿһ¸öÓÊͲ¶¼ÐèÒªÓÃÓʼþѶϢÀ´¼ÓÒÔµ÷½Ì, µoÓе±ÄãÖØаÑij¸ö±» POPFile ´íÎó·ÖÀàµÄÓʼþѶϢÖØзÖÀൽÕýÈ·µÄÓÊͲʱ, ²ÅÕæµÄÊÇÔÚµ÷½ÌËý. ͬʱÄãÒ²µÃÉ趨ÄãµÄÓʼþÓû§¶Ë³ÌÐò, À´°´ÕÕ POPFile µÄ·ÖÀà½á¹û¼ÓÒÔ¹ýÂËÓʼþѶϢ. ¹ØÓÚÉ趨Óû§¶Ë¹ýÂËÆ÷µÄÐÅÏ¢¿ÉÒÔÔÚ POPFile Îļþ¼Æ»­Àï±»ÕÒµ½. +Help_Bucket_Setup POPFile ³ýÁË "δ·ÖÀà (unclassified)" µÄ¼ÙÓÊͲÍâ, »¹ÐèÒªÖÁÉÙÁ½¸öÓÊͲ. ¶ø POPFile µÄ¶ÀÌØÖ®´¦ÕýÔÚÓÚËý¶Ôµç×ÓÓʼþµÄÇø·Ö¸üʤÓÚ´Ë, ÄãÉõÖÁ¿ÉÒÔÓÐÈÎÒâÊýÁ¿µÄÓÊͲ. ¼òµ¥µÄÉ趨»áÊÇÏñ "À¬»ø (spam)", "¸öÈË (personal)", ºÍ "¹¤×÷ (work)" ÓÊͲ. Help_No_More ±ðÔÙÏÔʾÕâ¸ö˵Ã÷ÁË diff -pruN 0.22.4-1.2/languages/Chinese-Simplified.msg 1.0.1-0ubuntu2/languages/Chinese-Simplified.msg --- 0.22.4-1.2/languages/Chinese-Simplified.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Chinese-Simplified.msg 2008-04-18 14:52:10.000000000 +0100 @@ -1,380 +1,383 @@ -# Copyright (c) 2001-2006 John Graham-Cumming -# -# This file is part of POPFile -# -# POPFile is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# POPFile is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with POPFile; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# POPFile 0.22.0 Simplified Chinese Translation -# Created By Jedi Lin, 2004/09/19 -# In fact translated from Traditional Chinese by Encode::HanConvert -# Modified By Jedi Lin, 2004/09/23 - -# Identify the language and character set used for the interface -LanguageCode cn -LanguageCharset UTF8 -LanguageDirection ltr - -# This is used to get the appropriate subdirectory for the manual -ManualLanguage zh-cn - -# This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions - -# Common words that are used on their own all over the interface -Apply 套用 -On å¼€ -Off å…³ -TurnOn 打开 -TurnOff 关上 -Add 加入 -Remove 移除 -Previous å‰ä¸€é¡µ -Next 下一页 -From 寄件者 -Subject 主旨 -Cc 副本 -Classification 邮筒 -Reclassify é‡æ–°åˆ†ç±» -Probability å¯èƒ½æ€§ -Scores 分数 -QuickMagnets 快速å¸é“ -Undo 还原 -Close 关闭 -Find 寻找 -Filter 过滤器 -Yes 是 -No å¦ -ChangeToYes 改æˆæ˜¯ -ChangeToNo 改æˆå¦ -Bucket 邮筒 -Magnet å¸é“ -Delete 删除 -Create 建立 -To 收件人 -Total 全部 -Rename æ›´å -Frequency 频率 -Probability å¯èƒ½æ€§ -Score 分数 -Lookup 查找 -Word å­—è¯ -Count 计数 -Update æ›´æ–° -Refresh é‡æ–°æ•´ç† -FAQ 常è§é—®ç­”集 -ID ID -Date 日期 -Arrived 收件时间 -Size å¤§å° - -# This is a regular expression pattern that is used to convert -# a number into a friendly looking number (for the US and UK this -# means comma separated at the thousands) - -Locale_Thousands , -Locale_Decimal . - -# The Locale_Date uses the format strings in Perl's Date::Format -# module to set the date format for the UI. There are two possible -# ways to specify it. -# -# Just one simple format used for all dates -# < | The first format is used for dates less than -# 7 days from now, the second for all other dates - -Locale_Date %a %m/%d %T %z | %A %Y/%m/%d %T %z - -# The header and footer that appear on every UI page -Header_Title POPFile 控制中心 -Header_Shutdown åœæŽ‰ POPFile -Header_History åŽ†å² -Header_Buckets 邮筒 -Header_Configuration ç»„æ€ -Header_Advanced 进阶 -Header_Security 安全 -Header_Magnets å¸é“ - -Footer_HomePage POPFile 首页 -Footer_Manual 手册 -Footer_Forums 讨论区 -Footer_FeedMe æ助 -Footer_RequestFeature 功能请求 -Footer_MailingList 邮递论题 -Footer_Wiki 文件集 - -Configuration_Error1 分隔符祇能是å•ä¸€çš„字符 -Configuration_Error2 使用者接å£çš„连接埠一定è¦ä»‹äºŽ 1 å’Œ 65535 之间 -Configuration_Error3 POP3 è†å¬è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 -Configuration_Error4 页é¢å¤§å°ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 1000 之间 -Configuration_Error5 历å²é‡Œè¦ä¿ç•™çš„日数一定è¦ä»‹äºŽ 1 å’Œ 366 之间 -Configuration_Error6 TCP 逾时值一定è¦ä»‹äºŽ 10 å’Œ 300 之间 -Configuration_Error7 XML RPC è†å¬è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 -Configuration_Error8 SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 -Configuration_POP3Port POP3 è†å¬è¿žæŽ¥åŸ  -Configuration_POP3Update POP3 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Configuration_XMLRPCUpdate XML-RPC 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Configuration_XMLRPCPort XML-RPC è†å¬è¿žæŽ¥åŸ  -Configuration_SMTPPort SMTP è†å¬è¿žæŽ¥åŸ  -Configuration_SMTPUpdate SMTP 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Configuration_NNTPPort NNTP è†å¬è¿žæŽ¥åŸ  -Configuration_NNTPUpdate NNTP 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Configuration_POPFork å…许é‡å¤çš„ POP3 è”机 -Configuration_SMTPFork å…许é‡å¤çš„ SMTP è”机 -Configuration_NNTPFork å…许é‡å¤çš„ NNTP è”机 -Configuration_POP3Separator POP3 主机:连接埠:使用者 分隔符 -Configuration_NNTPSeparator NNTP 主机:连接埠:使用者 分隔符 -Configuration_POP3SepUpdate POP3 的分隔符已更新为 %s -Configuration_NNTPSepUpdate NNTP 的分隔符已更新为 %s -Configuration_UI 使用者接å£ç½‘页连接埠 -Configuration_UIUpdate 使用者接å£ç½‘页连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Configuration_History æ¯ä¸€é¡µæ‰€è¦åˆ—出的邮件讯æ¯æ•°é‡ -Configuration_HistoryUpdate æ¯ä¸€é¡µæ‰€è¦åˆ—出的邮件讯æ¯æ•°é‡å·²æ›´æ–°ä¸º %s -Configuration_Days 历å²é‡Œæ‰€è¦ä¿ç•™çš„天数 -Configuration_DaysUpdate 历å²é‡Œæ‰€è¦ä¿ç•™çš„天数已更新为 %s -Configuration_UserInterface ä½¿ç”¨è€…æŽ¥å£ -Configuration_Skins å¤–è§‚æ ·å¼ -Configuration_SkinsChoose é€‰æ‹©å¤–è§‚æ ·å¼ -Configuration_Language 语言 -Configuration_LanguageChoose 选择语言 -Configuration_ListenPorts 模å—选项 -Configuration_HistoryView 历å²æ£€è§† -Configuration_TCPTimeout è”机逾时 -Configuration_TCPTimeoutSecs è”机逾时秒数 -Configuration_TCPTimeoutUpdate è”机逾时秒数已更新为 %s -Configuration_ClassificationInsertion æ’入邮件讯æ¯æ–‡å­— -Configuration_SubjectLine å˜æ›´ä¸»æ—¨åˆ— -Configuration_XTCInsertion 在标头æ’å…¥
X-Text-Classification -Configuration_XPLInsertion 在标头æ’å…¥
X-POPFile-Link -Configuration_Logging 日志 -Configuration_None æ—  -Configuration_ToScreen 输出至å±å¹• -Configuration_ToFile 输出至档案 -Configuration_ToScreenFile 输出至å±å¹•åŠæ¡£æ¡ˆ -Configuration_LoggerOutput æ—¥å¿—è¾“å‡ºæ–¹å¼ -Configuration_GeneralSkins å¤–è§‚æ ·å¼ -Configuration_SmallSkins å°åž‹å¤–è§‚æ ·å¼ -Configuration_TinySkins å¾®åž‹å¤–è§‚æ ·å¼ -Configuration_CurrentLogFile <下载目å‰çš„日志档> -Configuration_SOCKSServer SOCKS V 代ç†æœåŠ¡å™¨ä¸»æœº -Configuration_SOCKSPort SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ  -Configuration_SOCKSPortUpdate SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ å·²æ›´æ–°ä¸º %s -Configuration_SOCKSServerUpdate SOCKS V 代ç†æœåŠ¡å™¨ä¸»æœºå·²æ›´æ–°ä¸º %s -Configuration_Fields 历å²å­—段 - -Advanced_Error1 '%s' å·²ç»åœ¨å¿½ç•¥å­—è¯æ¸…å•é‡Œäº† -Advanced_Error2 è¦è¢«å¿½ç•¥çš„å­—è¯ä»…能包å«å­—æ¯æ•°å­—, ., _, -, 或 @ 字符 -Advanced_Error3 '%s' 已被加入忽略字è¯æ¸…å•é‡Œäº† -Advanced_Error4 '%s' 并ä¸åœ¨å¿½ç•¥å­—è¯æ¸…å•é‡Œ -Advanced_Error5 '%s' 已从忽略字è¯æ¸…å•é‡Œè¢«ç§»é™¤äº† -Advanced_StopWords è¢«å¿½ç•¥çš„å­—è¯ -Advanced_Message1 POPFile 会忽略下列这些常用的字è¯: -Advanced_AddWord åŠ å…¥å­—è¯ -Advanced_RemoveWord ç§»é™¤å­—è¯ -Advanced_AllParameters 所有的 POPFile å‚æ•° -Advanced_Parameter å‚æ•° -Advanced_Value 值 -Advanced_Warning 这是完整的 POPFile å‚数清å•. 祇适åˆè¿›é˜¶ä½¿ç”¨è€…: ä½ å¯ä»¥å˜æ›´ä»»ä½•å‚数值并按下 æ›´æ–°; ä¸è¿‡æ²¡æœ‰ä»»ä½•æœºåˆ¶ä¼šæ£€æŸ¥è¿™äº›å‚数值的有效性. 以粗体显示的项目表示已ç»ä»Žé¢„设值被加以å˜æ›´äº†. -Advanced_ConfigFile 组æ€æ¡£: - -History_Filter  (祇显示 %s 邮筒) -History_FilterBy 过滤æ¡ä»¶ -History_Search  (按寄件者/主旨æ¥æœå¯» %s) -History_Title æœ€è¿‘çš„é‚®ä»¶è®¯æ¯ -History_Jump 跳到这一页 -History_ShowAll 全部显示 -History_ShouldBe 应该è¦æ˜¯ -History_NoFrom 没有寄件者列 -History_NoSubject 没有主旨列 -History_ClassifyAs åˆ†ç±»æˆ -History_MagnetUsed 使用了å¸é“ -History_MagnetBecause 使用了å¸é“

è¢«åˆ†ç±»æˆ %s 的原因是 %s å¸é“

-History_ChangedTo å·²å˜æ›´ä¸º %s -History_Already é‡æ–°åˆ†ç±»æˆ %s -History_RemoveAll 全部移除 -History_RemovePage 移除本页 -History_RemoveChecked 移除被核选的 -History_Remove 按此移除历å²é‡Œçš„项目 -History_SearchMessage æœå¯»å¯„件者/主旨 -History_NoMessages æ²¡æœ‰é‚®ä»¶è®¯æ¯ -History_ShowMagnet 用了å¸é“ -History_Negate_Search è´Ÿå‘æœå¯»/过滤 -History_Magnet  (祇显示由å¸é“所分类的邮件讯æ¯) -History_NoMagnet  (祇显示ä¸æ˜¯ç”±å¸é“所分类的邮件讯æ¯) -History_ResetSearch é‡è®¾ -History_ChangedClass 现在被分类为 -History_Purge 马上删除 -History_Increase 增加 -History_Decrease å‡å°‘ -History_Column_Characters å˜æ›´å¯„件者, 收件者, 副本和主旨字段的宽度 -History_Automatic 自动化 -History_Reclassified å·²é‡æ–°åˆ†ç±» -History_Size_Bytes %d B -History_Size_KiloBytes %.1f KB -History_Size_MegaBytes %.1f MB - -Password_Title å£ä»¤ -Password_Enter 输入å£ä»¤ -Password_Go 冲! -Password_Error1 ä¸æ­£ç¡®çš„å£ä»¤ - -Security_Error1 连接埠一定è¦ä»‹äºŽ 1 å’Œ 65535 之间 -Security_Stealth 鬼鬼祟祟模å¼/æœåŠ¡å™¨ä½œä¸š -Security_NoStealthMode å¦ (鬼鬼祟祟模å¼) -Security_StealthMode (鬼鬼祟祟模å¼) -Security_ExplainStats (这个选项开å¯åŽ, POPFile æ¯å¤©éƒ½ä¼šä¼ é€ä¸€æ¬¡ä¸‹åˆ—三个数值到 www.usethesource.com 的一个脚本: bc (你的邮筒数é‡), mc (被 POPFile 分类过的邮件讯æ¯æ€»æ•°) å’Œ ec (分类错误的总数). 这些数值会被储存到一个档案里, 然åŽä¼šè¢«æˆ‘用æ¥å‘布一些关于人们使用 POPFile 的情况跟其æˆæ•ˆçš„统计数æ®. 我的网页æœåŠ¡å™¨ä¼šä¿ç•™å…¶æœ¬èº«çš„日志档约 5 天, 然åŽå°±ä¼šåŠ ä»¥åˆ é™¤; 我ä¸ä¼šå‚¨å­˜ä»»ä½•ç»Ÿè®¡ä¸Žå•ç‹¬ IP 地å€é—´çš„å…³è”性起æ¥.) -Security_ExplainUpdate (这个选项开å¯åŽ, POPFile æ¯å¤©éƒ½ä¼šä¼ é€ä¸€æ¬¡ä¸‹åˆ—三个数值到 www.usethesource.com 的一个脚本: ma (ä½ çš„ POPFile 的主è¦ç‰ˆæœ¬ç¼–å·), mi (ä½ çš„ POPFile 的次è¦ç‰ˆæœ¬ç¼–å·) å’Œ bn (ä½ çš„ POPFile 的建å·). 新版推出时, POPFile 会收到一份图形å“应, 并且显示在画é¢é¡¶ç«¯. 我的网页æœåŠ¡å™¨ä¼šä¿ç•™å…¶æœ¬èº«çš„日志档约 5 天, 然åŽå°±ä¼šåŠ ä»¥åˆ é™¤; 我ä¸ä¼šå‚¨å­˜ä»»ä½•æ›´æ–°æ£€æŸ¥ä¸Žå•ç‹¬ IP 地å€é—´çš„å…³è”性起æ¥.) -Security_PasswordTitle 使用者接å£å£ä»¤ -Security_Password å£ä»¤ -Security_PasswordUpdate å£ä»¤å·²æ›´æ–° -Security_AUTHTitle 远程æœåŠ¡å™¨ -Security_SecureServer 远程 POP3 æœåŠ¡å™¨ (SPA/AUTH 或穿é€å¼ä»£ç†æœåŠ¡å™¨) -Security_SecureServerUpdate 远程 POP3 æœåŠ¡å™¨å·²æ›´æ–°ä¸º %s -Security_SecurePort 远程 POP3 连接埠 (SPA/AUTH 或穿é€å¼ä»£ç†æœåŠ¡å™¨) -Security_SecurePortUpdate 远程 POP3 连接埠已更新为 %s -Security_SMTPServer SMTP è¿žé”æœåŠ¡å™¨ -Security_SMTPServerUpdate SMTP è¿žé”æœåŠ¡å™¨å·²æ›´æ–°ä¸º %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Security_SMTPPort SMTP è¿žé”连接埠 -Security_SMTPPortUpdate SMTP è¿žé”连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ -Security_POP3 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ POP3 è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) -Security_SMTP 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ SMTP è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) -Security_NNTP 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ NNTP è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) -Security_UI 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ HTTP (使用者接å£) è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) -Security_XMLRPC 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ XML-RPC è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) -Security_UpdateTitle 自动更新检查 -Security_Update æ¯å¤©æ£€æŸ¥ POPFile 是å¦æœ‰æ›´æ–° -Security_StatsTitle å›žæŠ¥ç»Ÿè®¡æ•°æ® -Security_Stats æ¯æ—¥é€å‡ºç»Ÿè®¡æ•°æ® - -Magnet_Error1 '%s' å¸é“å·²ç»å­˜åœ¨äºŽ '%s' 邮筒里了 -Magnet_Error2 æ–°çš„ '%s' å¸é“跟既有的 '%s' å¸é“起了冲çª, å¯èƒ½ä¼šå¼•èµ· '%s' 邮筒内的歧异结果. æ–°çš„å¸é“ä¸ä¼šè¢«åŠ è¿›åŽ». -Magnet_Error3 建立新的å¸é“ '%s' 于 '%s' 邮筒中 -Magnet_CurrentMagnets 现用的å¸é“ -Magnet_Message1 下列的å¸é“会让信件总是被分类到特定的邮筒里. -Magnet_CreateNew 建立新的å¸é“ -Magnet_Explanation 有这些类别的å¸é“å¯ä»¥ç”¨:
  • 寄件者地å€æˆ–åå­—: 举例æ¥è¯´: john@company.com 就祇会å»åˆç‰¹å®šçš„地å€,
    company.com 会å»åˆåˆ°ä»»ä½•ä»Ž company.com 寄出æ¥çš„人,
    John Doe 会å»åˆç‰¹å®šçš„人, John 会å»åˆæ‰€æœ‰çš„ Johns
  • 收件者/副本地å€æˆ–å称: 就跟寄件者一样: 但是å¸é“祇会针对邮件讯æ¯é‡Œçš„ To:/Cc: 地å€ç”Ÿæ•ˆ
  • 主旨字è¯: 例如: hello 会å»åˆæ‰€æœ‰ä¸»æ—¨é‡Œæœ‰ hello 的邮件讯æ¯
-Magnet_MagnetType å¸é“类别 -Magnet_Value 值 -Magnet_Always 总是分到邮筒 -Magnet_Jump 跳到å¸é“é¡µé¢ - -Bucket_Error1 邮筒å称祇能å«æœ‰å°å†™ a 到 z çš„å­—æ¯, 0 到 9 çš„æ•°å­—, 加上 - å’Œ _ -Bucket_Error2 å·²ç»æœ‰å为 %s 的邮筒了 -Bucket_Error3 å·²ç»å»ºç«‹äº†å为 %s 的邮筒 -Bucket_Error4 请输入éžç©ºç™½çš„å­—è¯ -Bucket_Error5 å·²ç»æŠŠ %s 邮筒改å为 %s 了 -Bucket_Error6 å·²ç»åˆ é™¤äº† %s 邮筒了 -Bucket_Title é‚®ç­’ç»„æ€ -Bucket_BucketName 邮筒å称 -Bucket_WordCount å­—è¯è®¡æ•° -Bucket_WordCounts å­—è¯æ•°ç›®ç»Ÿè®¡ -Bucket_UniqueWords 独特的
å­—è¯æ•° -Bucket_SubjectModification 修改主旨标头 -Bucket_ChangeColor 邮筒颜色 -Bucket_NotEnoughData æ•°æ®ä¸è¶³ -Bucket_ClassificationAccuracy 分类准确度 -Bucket_EmailsClassified 已分类的邮件讯æ¯æ•°é‡ -Bucket_EmailsClassifiedUpper 邮件讯æ¯åˆ†ç±»ç»“æžœ -Bucket_ClassificationErrors 分类错误 -Bucket_Accuracy 准确度 -Bucket_ClassificationCount 分类计数 -Bucket_ClassificationFP 伪阳性分类 -Bucket_ClassificationFN 伪阴性分类 -Bucket_ResetStatistics é‡è®¾ç»Ÿè®¡æ•°æ® -Bucket_LastReset å‰æ¬¡é‡è®¾äºŽ -Bucket_CurrentColor %s 现用的颜色为 %s -Bucket_SetColorTo 设定 %s 的颜色为 %s -Bucket_Maintenance 维护 -Bucket_CreateBucket 用这个å字建立邮筒 -Bucket_DeleteBucket 删掉此å称的邮筒 -Bucket_RenameBucket 更改此å称的邮筒 -Bucket_Lookup 查找 -Bucket_LookupMessage åœ¨é‚®ç­’é‡ŒæŸ¥æ‰¾å­—è¯ -Bucket_LookupMessage2 查找此字è¯çš„结果 -Bucket_LookupMostLikely %s 最åƒæ˜¯åœ¨ %s 会出现的å•è¯ -Bucket_DoesNotAppear

%s 并未出现于任何邮筒里 -Bucket_DisabledGlobally 已全域åœç”¨çš„ -Bucket_To 至 -Bucket_Quarantine 隔离邮筒 - -SingleBucket_Title %s çš„è¯¦ç»†æ•°æ® -SingleBucket_WordCount 邮筒字è¯è®¡æ•° -SingleBucket_TotalWordCount 全部的字è¯è®¡æ•° -SingleBucket_Percentage å å…¨éƒ¨çš„百分比 -SingleBucket_WordTable %s çš„å­—è¯è¡¨ -SingleBucket_Message1 按下索引里的字æ¯æ¥çœ‹çœ‹æ‰€æœ‰ä»¥è¯¥å­—æ¯å¼€å¤´çš„å­—è¯. 按下任何字è¯å°±å¯ä»¥æŸ¥æ‰¾å®ƒåœ¨æ‰€æœ‰é‚®ç­’里的å¯èƒ½æ€§. -SingleBucket_Unique %s 独有的 -SingleBucket_ClearBucket ç§»é™¤æ‰€æœ‰çš„å­—è¯ - -Session_Title POPFile 阶段时期已逾时 -Session_Error ä½ çš„ POPFile 阶段时期已ç»é€¾æœŸäº†. è¿™å¯èƒ½æ˜¯å› ä¸ºä½ æ¿€æ´»å¹¶åœæ­¢äº† POPFile 但å´ä¿æŒç½‘页æµè§ˆå™¨å¼€å¯æ‰€è‡´. 请按下列的链接之一æ¥ç»§ç»­ä½¿ç”¨ POPFile. - -View_Title å•ä¸€é‚®ä»¶è®¯æ¯æ£€è§† -View_ShowFrequencies 显示字è¯é¢‘率 -View_ShowProbabilities 显示字è¯å¯èƒ½æ€§ -View_ShowScores 显示字è¯å¾—分åŠåˆ¤å®šå›¾è¡¨ -View_WordMatrix å­—è¯çŸ©é˜µ -View_WordProbabilities 正在显示字è¯å¯èƒ½æ€§ -View_WordFrequencies 正在显示字è¯é¢‘率 -View_WordScores 正在显示字è¯å¾—分 -View_Chart 判定图表 - -Windows_TrayIcon 是å¦è¦åœ¨ Windows 的系统常驻列显示 POPFile 图标? -Windows_Console 是å¦è¦åœ¨å‘½ä»¤åˆ—窗å£é‡Œæ‰§è¡Œ POPFile? -Windows_NextTime

这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ - -Header_MenuSummary 这个表格是份导览选å•, 能让你存å–控制中心里ä¸åŒçš„æ¯ä¸€ä¸ªé¡µé¢. -History_MainTableSummary 这份表格列出了最近收到的邮件讯æ¯çš„寄件者åŠä¸»æ—¨, 你也能在此é‡æ–°åŠ ä»¥æ£€è§†å¹¶é‡æ–°åˆ†ç±»è¿™äº›é‚®ä»¶è®¯æ¯. 按一下主旨列就会显示出完整的邮件讯æ¯æ–‡å­—, 以åŠå¥¹ä»¬ä¸ºä½•ä¼šè¢«å¦‚此分类的信æ¯. ä½ å¯ä»¥åœ¨ '应该è¦æ˜¯' 字段指定邮件讯æ¯è¯¥å½’属的邮筒, 或者还原这项å˜æ›´. 如果有特定的邮件讯æ¯å†ä¹Ÿä¸éœ€è¦äº†, 你也å¯ä»¥ç”¨ '删除' 字段æ¥ä»ŽåŽ†å²é‡ŒåŠ ä»¥åˆ é™¤. -History_OpenMessageSummary 这个表格å«æœ‰æŸä¸ªé‚®ä»¶è®¯æ¯çš„全文, 其中被高亮度标示的字è¯æ˜¯è¢«ç”¨æ¥åˆ†ç±»çš„, ä¾æ®çš„是她们跟那个邮筒最有关è”. -Bucket_MainTableSummary 这个表格æ供了分类邮筒的概况. æ¯ä¸€åˆ—都会显示出邮筒å称, 该邮筒里的字è¯æ€»æ•°, æ¯ä¸ªé‚®ç­’里实际的å•ç‹¬å­—è¯æ•°é‡, 邮件讯æ¯çš„主旨列是å¦ä¼šåœ¨è¢«åˆ†ç±»åˆ°è¯¥é‚®ç­’时一并被修改, 是å¦è¦éš”离被收进该邮筒里的邮件讯æ¯, 以åŠä¸€ä¸ªè®©ä½ æŒ‘选颜色的表格, 这个颜色会在控制中心里显示于任何跟该邮筒有关的地方. -Bucket_StatisticsTableSummary 这个表格æ供了三组跟 POPFile 整体效能有关的统计数æ®. 第一组是其分类准确度如何, 第二组是共有多少邮件讯æ¯è¢«åŠ ä»¥åˆ†ç±»åˆ°é‚£ä¸ªé‚®ç­’里, 第三组是æ¯ä¸ªé‚®ç­’里有多少字è¯åŠå…¶å…³è”百分比. -Bucket_MaintenanceTableSummary 这个表格å«æœ‰ä¸€ä¸ªè¡¨å•, 让你能够建立, 删除, 或é‡æ–°å‘½åæŸä¸ªé‚®ç­’, 也å¯ä»¥åœ¨æ‰€æœ‰çš„邮筒里查找æŸä¸ªå­—è¯, 看看其关è”å¯èƒ½æ€§. -Bucket_AccuracyChartSummary 这个表格用图形显示了邮件讯æ¯åˆ†ç±»çš„准确度. -Bucket_BarChartSummary 这个表格用图形显示了ä¸åŒé‚®ç­’所å æ®çš„百分比. è¿™åŒæ—¶è®¡ç®—了被分类的邮件讯æ¯æ•°é‡, 以åŠå…¨éƒ¨çš„å­—è¯è®¡æ•°. -Bucket_LookupResultsSummary 这个表格显示了与尸体里任何给定字è¯å…³è”çš„å¯èƒ½æ€§. 对于æ¯ä¸ªé‚®ç­’æ¥è¯´, 她都会显示出该字è¯å‘生的频率, å­—è¯ä¼šå‡ºçŽ°åœ¨è¯¥é‚®ç­’里的å¯èƒ½æ€§, 以åŠå½“该字è¯å‡ºçŽ°åœ¨é‚®ä»¶è®¯æ¯é‡Œæ—¶, 对于该邮筒得分的整体影å“. -Bucket_WordListTableSummary 这个表格æ供了特定邮筒里全部的字è¯æ¸…å•, 按照开头的字æ¯é€åˆ—æ•´ç†. -Magnet_MainTableSummary 这个表格显示了å¸é“清å•, 这些å¸é“是用æ¥æŒ‰ç…§å›ºå®šè§„则把邮件讯æ¯åŠ ä»¥åˆ†ç±»çš„. æ¯ä¸€åˆ—都会显示出å¸é“如何被定义著, 其所觊觎的邮筒, 还有用æ¥åˆ é™¤è¯¥å¸é“的按钮. -Configuration_MainTableSummary 这个表格å«æœ‰æ•°ä¸ªè¡¨å•, 让你控制 POPFile 的组æ€. -Configuration_InsertionTableSummary 这个表格å«æœ‰ä¸€äº›æŒ‰é’®, 判断是å¦è¦åœ¨é‚®ä»¶è®¯æ¯é€’é€ç»™é‚®ä»¶ç”¨æˆ·ç«¯ç¨‹åºå‰, 先行修改标头或主旨列. -Security_MainTableSummary 这个表格æ供了几组控制, èƒ½å½±å“ POPFile 整体组æ€çš„安全, 是å¦è¦è‡ªåŠ¨æ£€æŸ¥ç¨‹åºæ›´æ–°, 以åŠæ˜¯å¦è¦æŠŠ POPFile 效能统计数æ®çš„一般信æ¯ä¼ å›žç¨‹åºä½œè€…的中央数æ®åº“. -Advanced_MainTableSummary 这个表格æ供了一份 POPFile 分类邮件讯æ¯æ—¶æ‰€ä¼šå¿½ç•¥çš„å­—è¯æ¸…å•, 因为他们在一般邮件讯æ¯é‡Œçš„å…³è”过于频ç¹. 她们会被按照字è¯å¼€å¤´çš„字亩被é€åˆ—æ•´ç†. - -Imap_Bucket2Folder %s 邮筒的信件至邮件匣 -Imap_MapError ä½ ä¸èƒ½æŠŠè¶…过一个的邮筒对应到å•ä¸€çš„邮件匣里! -Imap_Server IMAP æœåŠ¡å™¨ä¸»æœºå称: -Imap_ServerNameError 请输入æœåŠ¡å™¨çš„主机å称! -Imap_Port IMAP æœåŠ¡å™¨è¿žæŽ¥åŸ : -Imap_PortError 请输入有效的连接埠å·ç ! -Imap_Login IMAP å¸å·ç™»å…¥: -Imap_LoginError 请输入使用者/登入å称! -Imap_Password IMAP å¸å·çš„å£ä»¤: -Imap_PasswordError 请输入è¦ç”¨äºŽæœåŠ¡å™¨çš„å£ä»¤! -Imap_Expunge 从被监视的信件匣里清除已被删除的邮件讯æ¯. -Imap_Interval 更新间隔秒数: -Imap_IntervalError 请输入介于 10 秒至 3600 秒间的间隔. -Imap_Bytelimit æ¯å°é‚®ä»¶è®¯æ¯è¦ç”¨æ¥åˆ†ç±»çš„字节数. 输入 0 (空) 表示完整的邮件讯æ¯: -Imap_BytelimitError 请输入数值. -Imap_RefreshFolders é‡æ–°æ•´ç†é‚®ä»¶åŒ£æ¸…å• -Imap_Now 现在! -Imap_UpdateError1 无法登入. 请验è¯ä½ çš„登入å称跟å£ä»¤. -Imap_UpdateError2 连接至æœåŠ¡å™¨å¤±è´¥. 请检查主机å称跟连接埠, 并请确认你正在线上. -Imap_UpdateError3 请先组æ€è”机细节. -Imap_NoConnectionMessage 请先组æ€è”机细节. 当你完æˆåŽ, 这一页里就会出现更多å¯ç”¨çš„选项. -Imap_WatchMore 被监视邮件匣清å•çš„邮件匣 -Imap_WatchedFolder è¢«ç›‘è§†çš„é‚®ä»¶åŒ£ç¼–å· - -Shutdown_Message POPFile å·²ç»è¢«åœæŽ‰äº† - -Help_Training 当你åˆæ¬¡ä½¿ç”¨ POPFile æ—¶, 她啥也ä¸æ‡‚而需è¦è¢«åŠ ä»¥è°ƒæ•™. POPFile çš„æ¯ä¸€ä¸ªé‚®ç­’都需è¦ç”¨é‚®ä»¶è®¯æ¯æ¥åŠ ä»¥è°ƒæ•™, 祇有当你é‡æ–°æŠŠæŸä¸ªè¢« POPFile 错误分类的邮件讯æ¯é‡æ–°åˆ†ç±»åˆ°æ­£ç¡®çš„邮筒时, æ‰çœŸçš„是在调教她. åŒæ—¶ä½ ä¹Ÿå¾—设定你的邮件用户端程åº, æ¥æŒ‰ç…§ POPFile 的分类结果加以过滤邮件讯æ¯. 关于设定用户端过滤器的信æ¯å¯ä»¥åœ¨ POPFile 文件计画里被找到. -Help_Bucket_Setup POPFile 除了未分类 (unclassified) çš„å‡é‚®ç­’外, 还需è¦è‡³å°‘两个邮筒. 而 POPFile 的独特之处正在于她对电å­é‚®ä»¶çš„区分更胜于此, 你甚至å¯ä»¥æœ‰ä»»æ„æ•°é‡çš„邮筒. 简å•çš„è®¾å®šä¼šæ˜¯åƒ "垃圾 (spam)", "个人 (personal)", å’Œ "工作 (work)" 邮筒. -Help_No_More 别å†æ˜¾ç¤ºè¿™ä¸ªè¯´æ˜Žäº† +# Copyright (c) 2001-2008 John Graham-Cumming +# +# This file is part of POPFile +# +# POPFile is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# POPFile is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with POPFile; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# POPFile 1.0.0 Simplified Chinese Translation +# Created By Jedi Lin, 2004/09/19 +# In fact translated from Traditional Chinese by Encode::HanConvert +# Modified By Jedi Lin, 2007/12/25 + +# Identify the language and character set used for the interface +LanguageCode cn +LanguageCharset UTF8 +LanguageDirection ltr + +# This is used to get the appropriate subdirectory for the manual +ManualLanguage zh-cn + +# This is where to find the FAQ on the Wiki +FAQLink FAQ + +# Common words that are used on their own all over the interface +Apply 套用 +ApplyChanges 套用å˜æ›´ +On å¼€ +Off å…³ +TurnOn 打开 +TurnOff 关上 +Add 加入 +Remove 移除 +Previous å‰ä¸€é¡µ +Next 下一页 +From 寄件者 +Subject 主旨 +Cc 副本 +Classification 邮筒 +Reclassify é‡æ–°åˆ†ç±» +Probability å¯èƒ½æ€§ +Scores 分数 +QuickMagnets 快速å¸é“ +Undo 还原 +Close 关闭 +Find 寻找 +Filter 过滤器 +Yes 是 +No å¦ +ChangeToYes 改æˆæ˜¯ +ChangeToNo 改æˆå¦ +Bucket 邮筒 +Magnet å¸é“ +Delete 删除 +Create 建立 +To 收件人 +Total 全部 +Rename æ›´å +Frequency 频率 +Probability å¯èƒ½æ€§ +Score 分数 +Lookup 查找 +Word å­—è¯ +Count 计数 +Update æ›´æ–° +Refresh é‡æ–°æ•´ç† +FAQ 常è§é—®ç­”集 +ID ID +Date 日期 +Arrived 收件时间 +Size å¤§å° + +# This is a regular expression pattern that is used to convert +# a number into a friendly looking number (for the US and UK this +# means comma separated at the thousands) + +Locale_Thousands , +Locale_Decimal . + +# The Locale_Date uses the format strings in Perl's Date::Format +# module to set the date format for the UI. There are two possible +# ways to specify it. +# +# Just one simple format used for all dates +# < | The first format is used for dates less than +# 7 days from now, the second for all other dates + +Locale_Date %a %m/%d %T %z | %A %Y/%m/%d %T %z + +# The header and footer that appear on every UI page +Header_Title POPFile 控制中心 +Header_Shutdown åœæŽ‰ POPFile +Header_History åŽ†å² +Header_Buckets 邮筒 +Header_Configuration ç»„æ€ +Header_Advanced 进阶 +Header_Security 安全 +Header_Magnets å¸é“ + +Footer_HomePage POPFile 首页 +Footer_Manual 手册 +Footer_Forums 讨论区 +Footer_FeedMe æ助 +Footer_RequestFeature 功能请求 +Footer_MailingList 邮递论题 +Footer_Wiki 文件集 + +Configuration_Error1 分隔符祇能是å•ä¸€çš„字符 +Configuration_Error2 使用者接å£çš„连接埠一定è¦ä»‹äºŽ 1 å’Œ 65535 之间 +Configuration_Error3 POP3 è†å¬è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 +Configuration_Error4 页é¢å¤§å°ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 1000 之间 +Configuration_Error5 历å²é‡Œè¦ä¿ç•™çš„日数一定è¦ä»‹äºŽ 1 å’Œ 366 之间 +Configuration_Error6 TCP 逾时值一定è¦ä»‹äºŽ 10 å’Œ 300 之间 +Configuration_Error7 XML RPC è†å¬è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 +Configuration_Error8 SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 65535 之间 +Configuration_POP3Port POP3 è†å¬è¿žæŽ¥åŸ  +Configuration_POP3Update POP3 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Configuration_XMLRPCUpdate XML-RPC 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Configuration_XMLRPCPort XML-RPC è†å¬è¿žæŽ¥åŸ  +Configuration_SMTPPort SMTP è†å¬è¿žæŽ¥åŸ  +Configuration_SMTPUpdate SMTP 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Configuration_NNTPPort NNTP è†å¬è¿žæŽ¥åŸ  +Configuration_NNTPUpdate NNTP 连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Configuration_POPFork å…许é‡å¤çš„ POP3 è”机 +Configuration_SMTPFork å…许é‡å¤çš„ SMTP è”机 +Configuration_NNTPFork å…许é‡å¤çš„ NNTP è”机 +Configuration_POP3Separator POP3 主机:连接埠:使用者 分隔符 +Configuration_NNTPSeparator NNTP 主机:连接埠:使用者 分隔符 +Configuration_POP3SepUpdate POP3 的分隔符已更新为 %s +Configuration_NNTPSepUpdate NNTP 的分隔符已更新为 %s +Configuration_UI 使用者接å£ç½‘页连接埠 +Configuration_UIUpdate 使用者接å£ç½‘页连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Configuration_History æ¯ä¸€é¡µæ‰€è¦åˆ—出的邮件讯æ¯æ•°é‡ +Configuration_HistoryUpdate æ¯ä¸€é¡µæ‰€è¦åˆ—出的邮件讯æ¯æ•°é‡å·²æ›´æ–°ä¸º %s +Configuration_Days 历å²é‡Œæ‰€è¦ä¿ç•™çš„天数 +Configuration_DaysUpdate 历å²é‡Œæ‰€è¦ä¿ç•™çš„天数已更新为 %s +Configuration_UserInterface ä½¿ç”¨è€…æŽ¥å£ +Configuration_Skins å¤–è§‚æ ·å¼ +Configuration_SkinsChoose é€‰æ‹©å¤–è§‚æ ·å¼ +Configuration_Language 语言 +Configuration_LanguageChoose 选择语言 +Configuration_ListenPorts 模å—选项 +Configuration_HistoryView 历å²æ£€è§† +Configuration_TCPTimeout è”机逾时 +Configuration_TCPTimeoutSecs è”机逾时秒数 +Configuration_TCPTimeoutUpdate è”机逾时秒数已更新为 %s +Configuration_ClassificationInsertion æ’入邮件讯æ¯æ–‡å­— +Configuration_SubjectLine å˜æ›´ä¸»æ—¨åˆ— +Configuration_XTCInsertion 在标头æ’å…¥
X-Text-Classification +Configuration_XPLInsertion 在标头æ’å…¥
X-POPFile-Link +Configuration_Logging 日志 +Configuration_None æ—  +Configuration_ToScreen 输出至å±å¹• (Console) +Configuration_ToFile 输出至档案 +Configuration_ToScreenFile 输出至å±å¹•åŠæ¡£æ¡ˆ +Configuration_LoggerOutput æ—¥å¿—è¾“å‡ºæ–¹å¼ +Configuration_GeneralSkins å¤–è§‚æ ·å¼ +Configuration_SmallSkins å°åž‹å¤–è§‚æ ·å¼ +Configuration_TinySkins å¾®åž‹å¤–è§‚æ ·å¼ +Configuration_CurrentLogFile <检视目å‰çš„日志档> +Configuration_SOCKSServer SOCKS V 代ç†æœåŠ¡å™¨ä¸»æœº +Configuration_SOCKSPort SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ  +Configuration_SOCKSPortUpdate SOCKS V 代ç†æœåŠ¡å™¨è¿žæŽ¥åŸ å·²æ›´æ–°ä¸º %s +Configuration_SOCKSServerUpdate SOCKS V 代ç†æœåŠ¡å™¨ä¸»æœºå·²æ›´æ–°ä¸º %s +Configuration_Fields 历å²å­—段 + +Advanced_Error1 '%s' å·²ç»åœ¨å¿½ç•¥å­—è¯æ¸…å•é‡Œäº† +Advanced_Error2 è¦è¢«å¿½ç•¥çš„å­—è¯ä»…能包å«å­—æ¯æ•°å­—, ., _, -, 或 @ 字符 +Advanced_Error3 '%s' 已被加入忽略字è¯æ¸…å•é‡Œäº† +Advanced_Error4 '%s' 并ä¸åœ¨å¿½ç•¥å­—è¯æ¸…å•é‡Œ +Advanced_Error5 '%s' 已从忽略字è¯æ¸…å•é‡Œè¢«ç§»é™¤äº† +Advanced_StopWords è¢«å¿½ç•¥çš„å­—è¯ +Advanced_Message1 POPFile 会忽略下列这些常用的字è¯: +Advanced_AddWord åŠ å…¥å­—è¯ +Advanced_RemoveWord ç§»é™¤å­—è¯ +Advanced_AllParameters 所有的 POPFile å‚æ•° +Advanced_Parameter å‚æ•° +Advanced_Value 值 +Advanced_Warning 这是完整的 POPFile å‚数清å•. 祇适åˆè¿›é˜¶ä½¿ç”¨è€…: ä½ å¯ä»¥å˜æ›´ä»»ä½•å‚数值并按下 æ›´æ–°; ä¸è¿‡æ²¡æœ‰ä»»ä½•æœºåˆ¶ä¼šæ£€æŸ¥è¿™äº›å‚数值的有效性. 以粗体显示的项目表示已ç»ä»Žé¢„设值被加以å˜æ›´äº†. 更详尽的选项信æ¯è¯·è§ OptionReference. +Advanced_ConfigFile 组æ€æ¡£: + +History_Filter  (祇显示 %s 邮筒) +History_FilterBy 过滤æ¡ä»¶ +History_Search  (按寄件者/主旨æ¥æœå¯» %s) +History_Title æœ€è¿‘çš„é‚®ä»¶è®¯æ¯ +History_Jump 跳到这一页 +History_ShowAll 全部显示 +History_ShouldBe 应该è¦æ˜¯ +History_NoFrom 没有寄件者列 +History_NoSubject 没有主旨列 +History_ClassifyAs åˆ†ç±»æˆ +History_MagnetUsed 使用了å¸é“ +History_MagnetBecause 使用了å¸é“

è¢«åˆ†ç±»æˆ %s 的原因是 %s å¸é“

+History_ChangedTo å·²å˜æ›´ä¸º %s +History_Already é‡æ–°åˆ†ç±»æˆ %s +History_RemoveAll 全部移除 +History_RemovePage 移除本页 +History_RemoveChecked 移除被核选的 +History_Remove 按此移除历å²é‡Œçš„项目 +History_SearchMessage æœå¯»å¯„件者/主旨 +History_NoMessages æ²¡æœ‰é‚®ä»¶è®¯æ¯ +History_ShowMagnet 用了å¸é“ +History_Negate_Search è´Ÿå‘æœå¯»/过滤 +History_Magnet  (祇显示由å¸é“所分类的邮件讯æ¯) +History_NoMagnet  (祇显示ä¸æ˜¯ç”±å¸é“所分类的邮件讯æ¯) +History_ResetSearch é‡è®¾ +History_ChangedClass 现在被分类为 +History_Purge å³åˆ»åˆ°æœŸ +History_Increase 增加 +History_Decrease å‡å°‘ +History_Column_Characters å˜æ›´å¯„件者, 收件者, 副本和主旨字段的宽度 +History_Automatic 自动化 +History_Reclassified å·²é‡æ–°åˆ†ç±» +History_Size_Bytes %d B +History_Size_KiloBytes %.1f KB +History_Size_MegaBytes %.1f MB + +Password_Title å£ä»¤ +Password_Enter 输入å£ä»¤ +Password_Go 冲! +Password_Error1 ä¸æ­£ç¡®çš„å£ä»¤ + +Security_Error1 连接埠一定è¦ä»‹äºŽ 1 å’Œ 65535 之间 +Security_Stealth 鬼鬼祟祟模å¼/æœåŠ¡å™¨ä½œä¸š +Security_NoStealthMode å¦ (鬼鬼祟祟模å¼) +Security_StealthMode (鬼鬼祟祟模å¼) +Security_ExplainStats (这个选项开å¯åŽ, POPFile æ¯å¤©éƒ½ä¼šä¼ é€ä¸€æ¬¡ä¸‹åˆ—三个数值到 getpopfile.org 的一个脚本: bc (你的邮筒数é‡), mc (被 POPFile 分类过的邮件讯æ¯æ€»æ•°) å’Œ ec (分类错误的总数). 这些数值会被储存到一个档案里, 然åŽä¼šè¢«æˆ‘用æ¥å‘布一些关于人们使用 POPFile 的情况跟其æˆæ•ˆçš„统计数æ®. 我的网页æœåŠ¡å™¨ä¼šä¿ç•™å…¶æœ¬èº«çš„日志档约 5 天, 然åŽå°±ä¼šåŠ ä»¥åˆ é™¤; 我ä¸ä¼šå‚¨å­˜ä»»ä½•ç»Ÿè®¡ä¸Žå•ç‹¬ IP 地å€é—´çš„å…³è”性起æ¥.) +Security_ExplainUpdate (这个选项开å¯åŽ, POPFile æ¯å¤©éƒ½ä¼šä¼ é€ä¸€æ¬¡ä¸‹åˆ—三个数值到 getpopfile.org 的一个脚本: ma (ä½ çš„ POPFile 的主è¦ç‰ˆæœ¬ç¼–å·), mi (ä½ çš„ POPFile 的次è¦ç‰ˆæœ¬ç¼–å·) å’Œ bn (ä½ çš„ POPFile 的建å·). 新版推出时, POPFile 会收到一份图形å“应, 并且显示在画é¢é¡¶ç«¯. 我的网页æœåŠ¡å™¨ä¼šä¿ç•™å…¶æœ¬èº«çš„日志档约 5 天, 然åŽå°±ä¼šåŠ ä»¥åˆ é™¤; 我ä¸ä¼šå‚¨å­˜ä»»ä½•æ›´æ–°æ£€æŸ¥ä¸Žå•ç‹¬ IP 地å€é—´çš„å…³è”性起æ¥.) +Security_PasswordTitle 使用者接å£å£ä»¤ +Security_Password å£ä»¤ +Security_PasswordUpdate å£ä»¤å·²æ›´æ–° +Security_AUTHTitle 远程æœåŠ¡å™¨ +Security_SecureServer 远程 POP3 æœåŠ¡å™¨ (SPA/AUTH 或穿é€å¼ä»£ç†æœåŠ¡å™¨) +Security_SecureServerUpdate 远程 POP3 æœåŠ¡å™¨å·²æ›´æ–°ä¸º %s +Security_SecurePort 远程 POP3 连接埠 (SPA/AUTH 或穿é€å¼ä»£ç†æœåŠ¡å™¨) +Security_SecurePortUpdate 远程 POP3 连接埠已更新为 %s +Security_SMTPServer SMTP è¿žé”æœåŠ¡å™¨ +Security_SMTPServerUpdate SMTP è¿žé”æœåŠ¡å™¨å·²æ›´æ–°ä¸º %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Security_SMTPPort SMTP è¿žé”连接埠 +Security_SMTPPortUpdate SMTP è¿žé”连接埠已更新为 %s; 这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ +Security_POP3 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ POP3 è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) +Security_SMTP 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ SMTP è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) +Security_NNTP 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ NNTP è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) +Security_UI 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ HTTP (使用者接å£) è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) +Security_XMLRPC 接å—æ¥è‡ªè¿œç¨‹æœºå™¨çš„ XML-RPC è”机 (需è¦é‡æ–°æ¿€æ´» POPFile) +Security_UpdateTitle 自动更新检查 +Security_Update æ¯å¤©æ£€æŸ¥ POPFile 是å¦æœ‰æ›´æ–° +Security_StatsTitle å›žæŠ¥ç»Ÿè®¡æ•°æ® +Security_Stats æ¯æ—¥é€å‡ºç»Ÿè®¡æ•°æ® + +Magnet_Error1 '%s' å¸é“å·²ç»å­˜åœ¨äºŽ '%s' 邮筒里了 +Magnet_Error2 æ–°çš„ '%s' å¸é“跟既有的 '%s' å¸é“起了冲çª, å¯èƒ½ä¼šå¼•èµ· '%s' 邮筒内的歧异结果. æ–°çš„å¸é“ä¸ä¼šè¢«åŠ è¿›åŽ». +Magnet_Error3 建立新的å¸é“ '%s' 于 '%s' 邮筒中 +Magnet_CurrentMagnets 现用的å¸é“ +Magnet_Message1 下列的å¸é“会让信件总是被分类到特定的邮筒里. +Magnet_CreateNew 建立新的å¸é“ +Magnet_Explanation 有这些类别的å¸é“å¯ä»¥ç”¨:
  • 寄件者地å€æˆ–åå­—: 举例æ¥è¯´: john@company.com 就祇会å»åˆç‰¹å®šçš„地å€,
    company.com 会å»åˆåˆ°ä»»ä½•ä»Ž company.com 寄出æ¥çš„人,
    John Doe 会å»åˆç‰¹å®šçš„人, John 会å»åˆæ‰€æœ‰çš„ Johns
  • 收件者/副本地å€æˆ–å称: 就跟寄件者一样: 但是å¸é“祇会针对邮件讯æ¯é‡Œçš„ To:/Cc: 地å€ç”Ÿæ•ˆ
  • 主旨字è¯: 例如: hello 会å»åˆæ‰€æœ‰ä¸»æ—¨é‡Œæœ‰ hello 的邮件讯æ¯
+Magnet_MagnetType å¸é“类别 +Magnet_Value 值 +Magnet_Always 总是分到邮筒 +Magnet_Jump 跳到å¸é“é¡µé¢ + +Bucket_Error1 邮筒å称祇能å«æœ‰å°å†™ a 到 z çš„å­—æ¯, 0 到 9 çš„æ•°å­—, 加上 - å’Œ _ +Bucket_Error2 å·²ç»æœ‰å为 %s 的邮筒了 +Bucket_Error3 å·²ç»å»ºç«‹äº†å为 %s 的邮筒 +Bucket_Error4 请输入éžç©ºç™½çš„å­—è¯ +Bucket_Error5 å·²ç»æŠŠ %s 邮筒改å为 %s 了 +Bucket_Error6 å·²ç»åˆ é™¤äº† %s 邮筒了 +Bucket_Title é‚®ç­’ç»„æ€ +Bucket_BucketName 邮筒å称 +Bucket_WordCount å­—è¯è®¡æ•° +Bucket_WordCounts å­—è¯æ•°ç›®ç»Ÿè®¡ +Bucket_UniqueWords 独特的
å­—è¯æ•° +Bucket_SubjectModification 修改主旨标头 +Bucket_ChangeColor 邮筒颜色 +Bucket_NotEnoughData æ•°æ®ä¸è¶³ +Bucket_ClassificationAccuracy 分类准确度 +Bucket_EmailsClassified 已分类的邮件讯æ¯æ•°é‡ +Bucket_EmailsClassifiedUpper 邮件讯æ¯åˆ†ç±»ç»“æžœ +Bucket_ClassificationErrors 分类错误 +Bucket_Accuracy 准确度 +Bucket_ClassificationCount 分类计数 +Bucket_ClassificationFP 伪阳性分类 +Bucket_ClassificationFN 伪阴性分类 +Bucket_ResetStatistics é‡è®¾ç»Ÿè®¡æ•°æ® +Bucket_LastReset å‰æ¬¡é‡è®¾äºŽ +Bucket_CurrentColor %s 现用的颜色为 %s +Bucket_SetColorTo 设定 %s 的颜色为 %s +Bucket_Maintenance 维护 +Bucket_CreateBucket 用这个å字建立邮筒 +Bucket_DeleteBucket 删掉此å称的邮筒 +Bucket_RenameBucket 更改此å称的邮筒 +Bucket_Lookup 查找 +Bucket_LookupMessage åœ¨é‚®ç­’é‡ŒæŸ¥æ‰¾å­—è¯ +Bucket_LookupMessage2 查找此字è¯çš„结果 +Bucket_LookupMostLikely %s 最åƒæ˜¯åœ¨ %s 会出现的å•è¯ +Bucket_DoesNotAppear

%s 并未出现于任何邮筒里 +Bucket_DisabledGlobally 已全域åœç”¨çš„ +Bucket_To 至 +Bucket_Quarantine 隔离邮筒 + +SingleBucket_Title %s çš„è¯¦ç»†æ•°æ® +SingleBucket_WordCount 邮筒字è¯è®¡æ•° +SingleBucket_TotalWordCount 全部的字è¯è®¡æ•° +SingleBucket_Percentage å å…¨éƒ¨çš„百分比 +SingleBucket_WordTable %s çš„å­—è¯è¡¨ +SingleBucket_Message1 按下索引里的字æ¯æ¥çœ‹çœ‹æ‰€æœ‰ä»¥è¯¥å­—æ¯å¼€å¤´çš„å­—è¯. 按下任何字è¯å°±å¯ä»¥æŸ¥æ‰¾å®ƒåœ¨æ‰€æœ‰é‚®ç­’里的å¯èƒ½æ€§. +SingleBucket_Unique %s 独有的 +SingleBucket_ClearBucket ç§»é™¤æ‰€æœ‰çš„å­—è¯ + +Session_Title POPFile 阶段时期已逾时 +Session_Error ä½ çš„ POPFile 阶段时期已ç»é€¾æœŸäº†. è¿™å¯èƒ½æ˜¯å› ä¸ºä½ æ¿€æ´»å¹¶åœæ­¢äº† POPFile 但å´ä¿æŒç½‘页æµè§ˆå™¨å¼€å¯æ‰€è‡´. 请按下列的链接之一æ¥ç»§ç»­ä½¿ç”¨ POPFile. + +View_Title å•ä¸€é‚®ä»¶è®¯æ¯æ£€è§† +View_ShowFrequencies 显示字è¯é¢‘率 +View_ShowProbabilities 显示字è¯å¯èƒ½æ€§ +View_ShowScores 显示字è¯å¾—分åŠåˆ¤å®šå›¾è¡¨ +View_WordMatrix å­—è¯çŸ©é˜µ +View_WordProbabilities 正在显示字è¯å¯èƒ½æ€§ +View_WordFrequencies 正在显示字è¯é¢‘率 +View_WordScores 正在显示字è¯å¾—分 +View_Chart 判定图表 +View_DownloadMessage ä¸‹è½½é‚®ä»¶è®¯æ¯ + +Windows_TrayIcon 是å¦è¦åœ¨ Windows 的系统常驻列显示 POPFile 图标? +Windows_Console 是å¦è¦åœ¨å‘½ä»¤åˆ—窗å£é‡Œæ‰§è¡Œ POPFile? +Windows_NextTime

这项更动在你é‡æ–°æ¿€æ´» POPFile å‰éƒ½ä¸ä¼šç”Ÿæ•ˆ + +Header_MenuSummary 这个表格是份导览选å•, 能让你存å–控制中心里ä¸åŒçš„æ¯ä¸€ä¸ªé¡µé¢. +History_MainTableSummary 这份表格列出了最近收到的邮件讯æ¯çš„寄件者åŠä¸»æ—¨, 你也能在此é‡æ–°åŠ ä»¥æ£€è§†å¹¶é‡æ–°åˆ†ç±»è¿™äº›é‚®ä»¶è®¯æ¯. 按一下主旨列就会显示出完整的邮件讯æ¯æ–‡å­—, 以åŠå¥¹ä»¬ä¸ºä½•ä¼šè¢«å¦‚此分类的信æ¯. ä½ å¯ä»¥åœ¨ '应该è¦æ˜¯' 字段指定邮件讯æ¯è¯¥å½’属的邮筒, 或者还原这项å˜æ›´. 如果有特定的邮件讯æ¯å†ä¹Ÿä¸éœ€è¦äº†, 你也å¯ä»¥ç”¨ '删除' 字段æ¥ä»ŽåŽ†å²é‡ŒåŠ ä»¥åˆ é™¤. +History_OpenMessageSummary 这个表格å«æœ‰æŸä¸ªé‚®ä»¶è®¯æ¯çš„全文, 其中被高亮度标示的字è¯æ˜¯è¢«ç”¨æ¥åˆ†ç±»çš„, ä¾æ®çš„是她们跟那个邮筒最有关è”. +Bucket_MainTableSummary 这个表格æ供了分类邮筒的概况. æ¯ä¸€åˆ—都会显示出邮筒å称, 该邮筒里的字è¯æ€»æ•°, æ¯ä¸ªé‚®ç­’里实际的å•ç‹¬å­—è¯æ•°é‡, 邮件讯æ¯çš„主旨列是å¦ä¼šåœ¨è¢«åˆ†ç±»åˆ°è¯¥é‚®ç­’时一并被修改, 是å¦è¦éš”离被收进该邮筒里的邮件讯æ¯, 以åŠä¸€ä¸ªè®©ä½ æŒ‘选颜色的表格, 这个颜色会在控制中心里显示于任何跟该邮筒有关的地方. +Bucket_StatisticsTableSummary 这个表格æ供了三组跟 POPFile 整体效能有关的统计数æ®. 第一组是其分类准确度如何, 第二组是共有多少邮件讯æ¯è¢«åŠ ä»¥åˆ†ç±»åˆ°é‚£ä¸ªé‚®ç­’里, 第三组是æ¯ä¸ªé‚®ç­’里有多少字è¯åŠå…¶å…³è”百分比. +Bucket_MaintenanceTableSummary 这个表格å«æœ‰ä¸€ä¸ªè¡¨å•, 让你能够建立, 删除, 或é‡æ–°å‘½åæŸä¸ªé‚®ç­’, 也å¯ä»¥åœ¨æ‰€æœ‰çš„邮筒里查找æŸä¸ªå­—è¯, 看看其关è”å¯èƒ½æ€§. +Bucket_AccuracyChartSummary 这个表格用图形显示了邮件讯æ¯åˆ†ç±»çš„准确度. +Bucket_BarChartSummary 这个表格用图形显示了ä¸åŒé‚®ç­’所å æ®çš„百分比. è¿™åŒæ—¶è®¡ç®—了被分类的邮件讯æ¯æ•°é‡, 以åŠå…¨éƒ¨çš„å­—è¯è®¡æ•°. +Bucket_LookupResultsSummary 这个表格显示了与尸体里任何给定字è¯å…³è”çš„å¯èƒ½æ€§. 对于æ¯ä¸ªé‚®ç­’æ¥è¯´, 她都会显示出该字è¯å‘生的频率, å­—è¯ä¼šå‡ºçŽ°åœ¨è¯¥é‚®ç­’里的å¯èƒ½æ€§, 以åŠå½“该字è¯å‡ºçŽ°åœ¨é‚®ä»¶è®¯æ¯é‡Œæ—¶, 对于该邮筒得分的整体影å“. +Bucket_WordListTableSummary 这个表格æ供了特定邮筒里全部的字è¯æ¸…å•, 按照开头的字æ¯é€åˆ—æ•´ç†. +Magnet_MainTableSummary 这个表格显示了å¸é“清å•, 这些å¸é“是用æ¥æŒ‰ç…§å›ºå®šè§„则把邮件讯æ¯åŠ ä»¥åˆ†ç±»çš„. æ¯ä¸€åˆ—都会显示出å¸é“如何被定义著, 其所觊觎的邮筒, 还有用æ¥åˆ é™¤è¯¥å¸é“的按钮. +Configuration_MainTableSummary 这个表格å«æœ‰æ•°ä¸ªè¡¨å•, 让你控制 POPFile 的组æ€. +Configuration_InsertionTableSummary 这个表格å«æœ‰ä¸€äº›æŒ‰é’®, 判断是å¦è¦åœ¨é‚®ä»¶è®¯æ¯é€’é€ç»™é‚®ä»¶ç”¨æˆ·ç«¯ç¨‹åºå‰, 先行修改标头或主旨列. +Security_MainTableSummary 这个表格æ供了几组控制, èƒ½å½±å“ POPFile 整体组æ€çš„安全, 是å¦è¦è‡ªåŠ¨æ£€æŸ¥ç¨‹åºæ›´æ–°, 以åŠæ˜¯å¦è¦æŠŠ POPFile 效能统计数æ®çš„一般信æ¯ä¼ å›žç¨‹åºä½œè€…的中央数æ®åº“. +Advanced_MainTableSummary 这个表格æ供了一份 POPFile 分类邮件讯æ¯æ—¶æ‰€ä¼šå¿½ç•¥çš„å­—è¯æ¸…å•, 因为他们在一般邮件讯æ¯é‡Œçš„å…³è”过于频ç¹. 她们会被按照字è¯å¼€å¤´çš„字亩被é€åˆ—æ•´ç†. + +Imap_Bucket2Folder '%s' 邮筒的信件至邮件匣 +Imap_MapError ä½ ä¸èƒ½æŠŠè¶…过一个的邮筒对应到å•ä¸€çš„邮件匣里! +Imap_Server IMAP æœåŠ¡å™¨ä¸»æœºå称: +Imap_ServerNameError 请输入æœåŠ¡å™¨çš„主机å称! +Imap_Port IMAP æœåŠ¡å™¨è¿žæŽ¥åŸ : +Imap_PortError 请输入有效的连接埠å·ç ! +Imap_Login IMAP å¸å·ç™»å…¥: +Imap_LoginError 请输入使用者/登入å称! +Imap_Password IMAP å¸å·çš„å£ä»¤: +Imap_PasswordError 请输入è¦ç”¨äºŽæœåŠ¡å™¨çš„å£ä»¤! +Imap_Expunge 从被监视的信件匣里清除已被删除的邮件讯æ¯. +Imap_Interval 更新间隔秒数: +Imap_IntervalError 请输入介于 10 秒至 3600 秒间的间隔. +Imap_Bytelimit æ¯å°é‚®ä»¶è®¯æ¯è¦ç”¨æ¥åˆ†ç±»çš„字节数. 输入 0 (空) 表示完整的邮件讯æ¯: +Imap_BytelimitError 请输入数值. +Imap_RefreshFolders é‡æ–°æ•´ç†é‚®ä»¶åŒ£æ¸…å• +Imap_Now 现在! +Imap_UpdateError1 无法登入. 请验è¯ä½ çš„登入å称跟å£ä»¤. +Imap_UpdateError2 连接至æœåŠ¡å™¨å¤±è´¥. 请检查主机å称跟连接埠, 并请确认你正在线上. +Imap_UpdateError3 请先组æ€è”机细节. +Imap_NoConnectionMessage 请先组æ€è”机细节. 当你完æˆåŽ, 这一页里就会出现更多å¯ç”¨çš„选项. +Imap_WatchMore 被监视邮件匣清å•çš„邮件匣 +Imap_WatchedFolder è¢«ç›‘è§†çš„é‚®ä»¶åŒ£ç¼–å· +Imap_Use_SSL 使用 SSL + +Shutdown_Message POPFile å·²ç»è¢«åœæŽ‰äº† + +Help_Training 当你åˆæ¬¡ä½¿ç”¨ POPFile æ—¶, 她啥也ä¸æ‡‚而需è¦è¢«åŠ ä»¥è°ƒæ•™. POPFile çš„æ¯ä¸€ä¸ªé‚®ç­’都需è¦ç”¨é‚®ä»¶è®¯æ¯æ¥åŠ ä»¥è°ƒæ•™, 祇有当你é‡æ–°æŠŠæŸä¸ªè¢« POPFile 错误分类的邮件讯æ¯é‡æ–°åˆ†ç±»åˆ°æ­£ç¡®çš„邮筒时, æ‰çœŸçš„是在调教她. åŒæ—¶ä½ ä¹Ÿå¾—设定你的邮件用户端程åº, æ¥æŒ‰ç…§ POPFile 的分类结果加以过滤邮件讯æ¯. 关于设定用户端过滤器的信æ¯å¯ä»¥åœ¨ POPFile 文件计画里被找到. +Help_Bucket_Setup POPFile 除了 "未分类 (unclassified)" çš„å‡é‚®ç­’外, 还需è¦è‡³å°‘两个邮筒. 而 POPFile 的独特之处正在于她对电å­é‚®ä»¶çš„区分更胜于此, 你甚至å¯ä»¥æœ‰ä»»æ„æ•°é‡çš„邮筒. 简å•çš„è®¾å®šä¼šæ˜¯åƒ "垃圾 (spam)", "个人 (personal)", å’Œ "工作 (work)" 邮筒. +Help_No_More 别å†æ˜¾ç¤ºè¿™ä¸ªè¯´æ˜Žäº† diff -pruN 0.22.4-1.2/languages/Chinese-Traditional-BIG5.msg 1.0.1-0ubuntu2/languages/Chinese-Traditional-BIG5.msg --- 0.22.4-1.2/languages/Chinese-Traditional-BIG5.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Chinese-Traditional-BIG5.msg 2008-04-18 14:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -15,9 +15,9 @@ # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# POPFile 0.22.0 Traditional Chinese Translation +# POPFile 1.0.0 Traditional Chinese Translation # Created By Jedi Lin, 2004/09/19 -# Modified By Jedi Lin, 2004/09/23 +# Modified By Jedi Lin, 2007/12/25 # Identify the language and character set used for the interface LanguageCode tw @@ -28,10 +28,11 @@ LanguageDirection ManualLanguage zh-tw # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply ®M¥Î +ApplyChanges ®M¥ÎÅܧó On ¶} Off Ãö TurnOn ¥´¶} @@ -157,14 +158,14 @@ Configuration_XTCInsertion Configuration_XPLInsertion ¦b¼ÐÀY´¡¤J
X-POPFile-Link Configuration_Logging ¤é»x Configuration_None µL -Configuration_ToScreen ¿é¥X¦Ü¿Ã¹õ +Configuration_ToScreen ¿é¥X¦Ü¿Ã¹õ (Console) Configuration_ToFile ¿é¥X¦ÜÀÉ®× Configuration_ToScreenFile ¿é¥X¦Ü¿Ã¹õ¤ÎÀÉ®× Configuration_LoggerOutput ¤é»x¿é¥X¤è¦¡ Configuration_GeneralSkins ¥~Æ[¼Ë¦¡ Configuration_SmallSkins ¤p«¬¥~Æ[¼Ë¦¡ Configuration_TinySkins ·L«¬¥~Æ[¼Ë¦¡ -Configuration_CurrentLogFile <¤U¸ü¥Ø«eªº¤é»xÀÉ> +Configuration_CurrentLogFile <À˵ø¥Ø«eªº¤é»xÀÉ> Configuration_SOCKSServer SOCKS V ¥N²z¦øªA¾¹¥D¾÷ Configuration_SOCKSPort SOCKS V ¥N²z¦øªA¾¹³s±µ°ð Configuration_SOCKSPortUpdate SOCKS V ¥N²z¦øªA¾¹³s±µ°ð¤w§ó·s¬° %s @@ -183,7 +184,7 @@ Advanced_RemoveWord Advanced_AllParameters ©Ò¦³ªº POPFile °Ñ¼Æ Advanced_Parameter °Ñ¼Æ Advanced_Value ­È -Advanced_Warning ³o¬O§¹¾ãªº POPFile °Ñ¼Æ²M³æ. ¬é¾A¦X¶i¶¥¨Ï¥ÎªÌ: ©p¥i¥HÅܧó¥ô¦ó°Ñ¼Æ­È¨Ã«ö¤U §ó·s; ¤£¹L¨S¦³¥ô¦ó¾÷¨î·|Àˬd³o¨Ç°Ñ¼Æ­Èªº¦³®Ä©Ê. ¥H²ÊÅéÅã¥Üªº¶µ¥Øªí¥Ü¤w¸g±q¹w³]­È³Q¥[¥HÅܧó¤F. +Advanced_Warning ³o¬O§¹¾ãªº POPFile °Ñ¼Æ²M³æ. ¬é¾A¦X¶i¶¥¨Ï¥ÎªÌ: ©p¥i¥HÅܧó¥ô¦ó°Ñ¼Æ­È¨Ã«ö¤U §ó·s; ¤£¹L¨S¦³¥ô¦ó¾÷¨î·|Àˬd³o¨Ç°Ñ¼Æ­Èªº¦³®Ä©Ê. ¥H²ÊÅéÅã¥Üªº¶µ¥Øªí¥Ü¤w¸g±q¹w³]­È³Q¥[¥HÅܧó¤F. §ó¸ÔºÉªº¿ï¶µ¸ê°T½Ð¨£ OptionReference. Advanced_ConfigFile ²ÕºAÀÉ: History_Filter  (¬éÅã¥Ü %s ¶lµ©) @@ -212,7 +213,7 @@ History_Magnet History_NoMagnet  (¬éÅã¥Ü¤£¬O¥Ñ§lÅK©Ò¤ÀÃþªº¶l¥ó°T®§) History_ResetSearch ­«³] History_ChangedClass ²{¦b³Q¤ÀÃþ¬° -History_Purge °¨¤W§R°£ +History_Purge §Y¨è¨ì´Á History_Increase ¼W¥[ History_Decrease ´î¤Ö History_Column_Characters Åܧó±H¥óªÌ, ¦¬¥óªÌ, °Æ¥»©M¥D¦®Äæ¦ìªº¼e«× @@ -231,8 +232,8 @@ Security_Error1 Security_Stealth °­°­¯©¯©¼Ò¦¡/¦øªA¾¹§@·~ Security_NoStealthMode §_ (°­°­¯©¯©¼Ò¦¡) Security_StealthMode (°­°­¯©¯©¼Ò¦¡) -Security_ExplainStats (³o­Ó¿ï¶µ¶}±Ò«á, POPFile ¨C¤Ñ³£·|¶Ç°e¤@¦¸¤U¦C¤T­Ó¼Æ­È¨ì www.usethesource.com ªº¤@­Ó¸}¥»: bc (©pªº¶lµ©¼Æ¶q), mc (³Q POPFile ¤ÀÃþ¹Lªº¶l¥ó°T®§Á`¼Æ) ©M ec (¤ÀÃþ¿ù»~ªºÁ`¼Æ). ³o¨Ç¼Æ­È·|³QÀx¦s¨ì¤@­ÓÀÉ®×ùØ, µM«á·|³Q§Ú¥Î¨Óµo§G¤@¨ÇÃö©ó¤H­Ì¨Ï¥Î POPFile ªº±¡ªp¸ò¨ä¦¨®Äªº²Î­p¸ê®Æ. §Úªººô­¶¦øªA¾¹·|«O¯d¨ä¥»¨­ªº¤é»xÀɬù 5 ¤Ñ, µM«á´N·|¥[¥H§R°£; §Ú¤£·|Àx¦s¥ô¦ó²Î­p»P³æ¿W IP ¦a§}¶¡ªºÃöÁp©Ê°_¨Ó.) -Security_ExplainUpdate (³o­Ó¿ï¶µ¶}±Ò«á, POPFile ¨C¤Ñ³£·|¶Ç°e¤@¦¸¤U¦C¤T­Ó¼Æ­È¨ì www.usethesource.com ªº¤@­Ó¸}¥»: ma (©pªº POPFile ªº¥D­nª©¥»½s¸¹), mi (©pªº POPFile ªº¦¸­nª©¥»½s¸¹) ©M bn (©pªº POPFile ªº«Ø¸¹). ·sª©±À¥X®É, POPFile ·|¦¬¨ì¤@¥÷¹Ï§Î¦^À³, ¨Ã¥BÅã¥Ü¦bµe­±³»ºÝ. §Úªººô­¶¦øªA¾¹·|«O¯d¨ä¥»¨­ªº¤é»xÀɬù 5 ¤Ñ, µM«á´N·|¥[¥H§R°£; §Ú¤£·|Àx¦s¥ô¦ó§ó·sÀˬd»P³æ¿W IP ¦a§}¶¡ªºÃöÁp©Ê°_¨Ó.) +Security_ExplainStats (³o­Ó¿ï¶µ¶}±Ò«á, POPFile ¨C¤Ñ³£·|¶Ç°e¤@¦¸¤U¦C¤T­Ó¼Æ­È¨ì getpopfile.org ªº¤@­Ó¸}¥»: bc (©pªº¶lµ©¼Æ¶q), mc (³Q POPFile ¤ÀÃþ¹Lªº¶l¥ó°T®§Á`¼Æ) ©M ec (¤ÀÃþ¿ù»~ªºÁ`¼Æ). ³o¨Ç¼Æ­È·|³QÀx¦s¨ì¤@­ÓÀÉ®×ùØ, µM«á·|³Q§Ú¥Î¨Óµo§G¤@¨ÇÃö©ó¤H­Ì¨Ï¥Î POPFile ªº±¡ªp¸ò¨ä¦¨®Äªº²Î­p¸ê®Æ. §Úªººô­¶¦øªA¾¹·|«O¯d¨ä¥»¨­ªº¤é»xÀɬù 5 ¤Ñ, µM«á´N·|¥[¥H§R°£; §Ú¤£·|Àx¦s¥ô¦ó²Î­p»P³æ¿W IP ¦a§}¶¡ªºÃöÁp©Ê°_¨Ó.) +Security_ExplainUpdate (³o­Ó¿ï¶µ¶}±Ò«á, POPFile ¨C¤Ñ³£·|¶Ç°e¤@¦¸¤U¦C¤T­Ó¼Æ­È¨ì getpopfile.org ªº¤@­Ó¸}¥»: ma (©pªº POPFile ªº¥D­nª©¥»½s¸¹), mi (©pªº POPFile ªº¦¸­nª©¥»½s¸¹) ©M bn (©pªº POPFile ªº«Ø¸¹). ·sª©±À¥X®É, POPFile ·|¦¬¨ì¤@¥÷¹Ï§Î¦^À³, ¨Ã¥BÅã¥Ü¦bµe­±³»ºÝ. §Úªººô­¶¦øªA¾¹·|«O¯d¨ä¥»¨­ªº¤é»xÀɬù 5 ¤Ñ, µM«á´N·|¥[¥H§R°£; §Ú¤£·|Àx¦s¥ô¦ó§ó·sÀˬd»P³æ¿W IP ¦a§}¶¡ªºÃöÁp©Ê°_¨Ó.) Security_PasswordTitle ¨Ï¥ÎªÌ¤¶­±±K½X Security_Password ±K½X Security_PasswordUpdate ±K½X¤w§ó·s @@ -327,6 +328,7 @@ View_WordProbabilities View_WordFrequencies ¥¿¦bÅã¥Ü¦rµüÀW²v View_WordScores ¥¿¦bÅã¥Ü¦rµü±o¤À View_Chart §P©w¹Ïªí +View_DownloadMessage ¤U¸ü¶l¥ó°T®§ Windows_TrayIcon ¬O§_­n¦b Windows ªº¨t²Î±`¾n¦CÅã¥Ü POPFile ¹Ï¥Ü? Windows_Console ¬O§_­n¦b©R¥O¦Cµøµ¡ùØ°õ¦æ POPFile? @@ -348,7 +350,7 @@ Configuration_InsertionTableSummary Security_MainTableSummary ³o­Óªí®æ´£¨Ñ¤F´X²Õ±±¨î, ¯à¼vÅT POPFile ¾ãÅé²ÕºAªº¦w¥þ, ¬O§_­n¦Û°ÊÀˬdµ{¦¡§ó·s, ¥H¤Î¬O§_­n§â POPFile ®Ä¯à²Î­p¸ê®Æªº¤@¯ë¸ê°T¶Ç¦^µ{¦¡§@ªÌªº¤¤¥¡¸ê®Æ®w. Advanced_MainTableSummary ³o­Óªí®æ´£¨Ñ¤F¤@¥÷ POPFile ¤ÀÃþ¶l¥ó°T®§®É©Ò·|©¿²¤ªº¦rµü²M³æ, ¦]¬°¥L­Ì¦b¤@¯ë¶l¥ó°T®§ùتºÃöÁp¹L©óÀWÁc. ¦o­Ì·|³Q«ö·Ó¦rµü¶}ÀYªº¦r¯a³Q³v¦C¾ã²z. -Imap_Bucket2Folder %s ¶lµ©ªº«H¥ó¦Ü¶l¥ó§X +Imap_Bucket2Folder '%s' ¶lµ©ªº«H¥ó¦Ü¶l¥ó§X Imap_MapError ©p¤£¯à§â¶W¹L¤@­Óªº¶lµ©¹ïÀ³¨ì³æ¤@ªº¶l¥ó§XùØ! Imap_Server IMAP ¦øªA¾¹¥D¾÷¦WºÙ: Imap_ServerNameError ½Ð¿é¤J¦øªA¾¹ªº¥D¾÷¦WºÙ! @@ -371,9 +373,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage ½Ð¥ý²ÕºA³s½u²Ó¸`. ·í©p§¹¦¨«á, ³o¤@­¶ùØ´N·|¥X²{§ó¦h¥i¥Îªº¿ï¶µ. Imap_WatchMore ³QºÊµø¶l¥ó§X²M³æªº¶l¥ó§X Imap_WatchedFolder ³QºÊµøªº¶l¥ó§X½s¸¹ +Imap_Use_SSL ¨Ï¥Î SSL Shutdown_Message POPFile ¤w¸g³Q°±±¼¤F -Help_Training ·í©pªì¦¸¨Ï¥Î POPFile ®É, ¦oÔ£¤]¤£À´¦Ó»Ý­n³Q¥[¥H½Õ±Ð. POPFile ªº¨C¤@­Ó¶lµ©³£»Ý­n¥Î¶l¥ó°T®§¨Ó¥[¥H½Õ±Ð, ¬é¦³·í©p­«·s§â¬Y­Ó³Q POPFile ¿ù»~¤ÀÃþªº¶l¥ó°T®§­«·s¤ÀÃþ¨ì¥¿½Tªº¶lµ©®É, Åׯuªº¬O¦b½Õ±Ð¦o. ¦P®É©p¤]±o³]©w©pªº¶l¥ó¥Î¤áºÝµ{¦¡, ¨Ó«ö·Ó POPFile ªº¤ÀÃþµ²ªG¥[¥H¹LÂo¶l¥ó°T®§. Ãö©ó³]©w¥Î¤áºÝ¹LÂo¾¹ªº¸ê°T¥i¥H¦b POPFile ¤å¥ó­pµeùسQ§ä¨ì. -Help_Bucket_Setup POPFile °£¤F¥¼¤ÀÃþ (unclassified) ªº°²¶lµ©¥~, Áٻݭn¦Ü¤Ö¨â­Ó¶lµ©. ¦Ó POPFile ªº¿W¯S¤§³B¥¿¦b©ó¦o¹ï¹q¤l¶l¥óªº°Ï¤À§ó³Ó©ó¦¹, ©p¬Æ¦Ü¥i¥H¦³¥ô·N¼Æ¶qªº¶lµ©. ²³æªº³]©w·|¬O¹³ "©U§£ (spam)", "­Ó¤H (personal)", ©M "¤u§@ (work)" ¶lµ©. +Help_Training ·í©pªì¦¸¨Ï¥Î POPFile ®É, ¦oÔ£¤]¤£À´¦Ó»Ý­n³Q¥[¥H½Õ±Ð. POPFile ªº¨C¤@­Ó¶lµ©³£»Ý­n¥Î¶l¥ó°T®§¨Ó¥[¥H½Õ±Ð, ¬é¦³·í©p­«·s§â¬Y­Ó³Q POPFile ¿ù»~¤ÀÃþªº¶l¥ó°T®§­«·s¤ÀÃþ¨ì¥¿½Tªº¶lµ©®É, Åׯuªº¬O¦b½Õ±Ð¦o. ¦P®É©p¤]±o³]©w©pªº¶l¥ó¥Î¤áºÝµ{¦¡, ¨Ó«ö·Ó POPFile ªº¤ÀÃþµ²ªG¥[¥H¹LÂo¶l¥ó°T®§. Ãö©ó³]©w¥Î¤áºÝ¹LÂo¾¹ªº¸ê°T¥i¥H¦b POPFile ¤å¥ó­pµeùسQ§ä¨ì. +Help_Bucket_Setup POPFile °£¤F "¥¼¤ÀÃþ (unclassified)" ªº°²¶lµ©¥~, Áٻݭn¦Ü¤Ö¨â­Ó¶lµ©. ¦Ó POPFile ªº¿W¯S¤§³B¥¿¦b©ó¦o¹ï¹q¤l¶l¥óªº°Ï¤À§ó³Ó©ó¦¹, ©p¬Æ¦Ü¥i¥H¦³¥ô·N¼Æ¶qªº¶lµ©. ²³æªº³]©w·|¬O¹³ "©U§£ (spam)", "­Ó¤H (personal)", ©M "¤u§@ (work)" ¶lµ©. Help_No_More §O¦AÅã¥Ü³o­Ó»¡©ú¤F diff -pruN 0.22.4-1.2/languages/Chinese-Traditional.msg 1.0.1-0ubuntu2/languages/Chinese-Traditional.msg --- 0.22.4-1.2/languages/Chinese-Traditional.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Chinese-Traditional.msg 2008-04-18 14:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -15,9 +15,9 @@ # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# POPFile 0.22.0 Traditional Chinese Translation +# POPFile 1.0.0 Traditional Chinese Translation # Created By Jedi Lin, 2004/09/19 -# Modified By Jedi Lin, 2004/09/23 +# Modified By Jedi Lin, 2007/12/25 # Identify the language and character set used for the interface LanguageCode tw @@ -28,10 +28,11 @@ LanguageDirection ManualLanguage zh-tw # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply 套用 +ApplyChanges 套用變更 On é–‹ Off é—œ TurnOn 打開 @@ -157,14 +158,14 @@ Configuration_XTCInsertion Configuration_XPLInsertion 在標頭æ’å…¥
X-POPFile-Link Configuration_Logging 日誌 Configuration_None ç„¡ -Configuration_ToScreen 輸出至螢幕 +Configuration_ToScreen 輸出至螢幕 (Console) Configuration_ToFile 輸出至檔案 Configuration_ToScreenFile 輸出至螢幕åŠæª”案 Configuration_LoggerOutput æ—¥èªŒè¼¸å‡ºæ–¹å¼ Configuration_GeneralSkins å¤–è§€æ¨£å¼ Configuration_SmallSkins å°åž‹å¤–è§€æ¨£å¼ Configuration_TinySkins å¾®åž‹å¤–è§€æ¨£å¼ -Configuration_CurrentLogFile <下載目å‰çš„日誌檔> +Configuration_CurrentLogFile <檢視目å‰çš„日誌檔> Configuration_SOCKSServer SOCKS V 代ç†ä¼ºæœå™¨ä¸»æ©Ÿ Configuration_SOCKSPort SOCKS V 代ç†ä¼ºæœå™¨é€£æŽ¥åŸ  Configuration_SOCKSPortUpdate SOCKS V 代ç†ä¼ºæœå™¨é€£æŽ¥åŸ å·²æ›´æ–°ç‚º %s @@ -183,7 +184,7 @@ Advanced_RemoveWord Advanced_AllParameters 所有的 POPFile åƒæ•¸ Advanced_Parameter åƒæ•¸ Advanced_Value 值 -Advanced_Warning 這是完整的 POPFile åƒæ•¸æ¸…å–®. 祇é©åˆé€²éšŽä½¿ç”¨è€…: 妳å¯ä»¥è®Šæ›´ä»»ä½•åƒæ•¸å€¼ä¸¦æŒ‰ä¸‹ æ›´æ–°; ä¸éŽæ²’有任何機制會檢查這些åƒæ•¸å€¼çš„有效性. 以粗體顯示的項目表示已經從é è¨­å€¼è¢«åŠ ä»¥è®Šæ›´äº†. +Advanced_Warning 這是完整的 POPFile åƒæ•¸æ¸…å–®. 祇é©åˆé€²éšŽä½¿ç”¨è€…: 妳å¯ä»¥è®Šæ›´ä»»ä½•åƒæ•¸å€¼ä¸¦æŒ‰ä¸‹ æ›´æ–°; ä¸éŽæ²’有任何機制會檢查這些åƒæ•¸å€¼çš„有效性. 以粗體顯示的項目表示已經從é è¨­å€¼è¢«åŠ ä»¥è®Šæ›´äº†. 更詳盡的é¸é …資訊請見 OptionReference. Advanced_ConfigFile 組態檔: History_Filter  (祇顯示 %s 郵筒) @@ -212,7 +213,7 @@ History_Magnet History_NoMagnet  (祇顯示ä¸æ˜¯ç”±å¸éµæ‰€åˆ†é¡žçš„郵件訊æ¯) History_ResetSearch é‡è¨­ History_ChangedClass ç¾åœ¨è¢«åˆ†é¡žç‚º -History_Purge 馬上刪除 +History_Purge å³åˆ»åˆ°æœŸ History_Increase 增加 History_Decrease 減少 History_Column_Characters 變更寄件者, 收件者, 副本和主旨欄ä½çš„寬度 @@ -231,8 +232,8 @@ Security_Error1 Security_Stealth 鬼鬼祟祟模å¼/伺æœå™¨ä½œæ¥­ Security_NoStealthMode å¦ (鬼鬼祟祟模å¼) Security_StealthMode (鬼鬼祟祟模å¼) -Security_ExplainStats (這個é¸é …開啟後, POPFile æ¯å¤©éƒ½æœƒå‚³é€ä¸€æ¬¡ä¸‹åˆ—三個數值到 www.usethesource.com 的一個腳本: bc (妳的郵筒數é‡), mc (被 POPFile 分類éŽçš„郵件訊æ¯ç¸½æ•¸) å’Œ ec (分類錯誤的總數). 這些數值會被儲存到一個檔案è£, 然後會被我用來發佈一些關於人們使用 POPFile 的情æ³è·Ÿå…¶æˆæ•ˆçš„統計資料. 我的網é ä¼ºæœå™¨æœƒä¿ç•™å…¶æœ¬èº«çš„日誌檔約 5 天, 然後就會加以刪除; 我ä¸æœƒå„²å­˜ä»»ä½•çµ±è¨ˆèˆ‡å–®ç¨ IP 地å€é–“çš„é—œè¯æ€§èµ·ä¾†.) -Security_ExplainUpdate (這個é¸é …開啟後, POPFile æ¯å¤©éƒ½æœƒå‚³é€ä¸€æ¬¡ä¸‹åˆ—三個數值到 www.usethesource.com 的一個腳本: ma (妳的 POPFile 的主è¦ç‰ˆæœ¬ç·¨è™Ÿ), mi (妳的 POPFile 的次è¦ç‰ˆæœ¬ç·¨è™Ÿ) å’Œ bn (妳的 POPFile 的建號). 新版推出時, POPFile 會收到一份圖形回應, 並且顯示在畫é¢é ‚端. 我的網é ä¼ºæœå™¨æœƒä¿ç•™å…¶æœ¬èº«çš„日誌檔約 5 天, 然後就會加以刪除; 我ä¸æœƒå„²å­˜ä»»ä½•æ›´æ–°æª¢æŸ¥èˆ‡å–®ç¨ IP 地å€é–“çš„é—œè¯æ€§èµ·ä¾†.) +Security_ExplainStats (這個é¸é …開啟後, POPFile æ¯å¤©éƒ½æœƒå‚³é€ä¸€æ¬¡ä¸‹åˆ—三個數值到 getpopfile.org 的一個腳本: bc (妳的郵筒數é‡), mc (被 POPFile 分類éŽçš„郵件訊æ¯ç¸½æ•¸) å’Œ ec (分類錯誤的總數). 這些數值會被儲存到一個檔案è£, 然後會被我用來發佈一些關於人們使用 POPFile 的情æ³è·Ÿå…¶æˆæ•ˆçš„統計資料. 我的網é ä¼ºæœå™¨æœƒä¿ç•™å…¶æœ¬èº«çš„日誌檔約 5 天, 然後就會加以刪除; 我ä¸æœƒå„²å­˜ä»»ä½•çµ±è¨ˆèˆ‡å–®ç¨ IP 地å€é–“çš„é—œè¯æ€§èµ·ä¾†.) +Security_ExplainUpdate (這個é¸é …開啟後, POPFile æ¯å¤©éƒ½æœƒå‚³é€ä¸€æ¬¡ä¸‹åˆ—三個數值到 getpopfile.org 的一個腳本: ma (妳的 POPFile 的主è¦ç‰ˆæœ¬ç·¨è™Ÿ), mi (妳的 POPFile 的次è¦ç‰ˆæœ¬ç·¨è™Ÿ) å’Œ bn (妳的 POPFile 的建號). 新版推出時, POPFile 會收到一份圖形回應, 並且顯示在畫é¢é ‚端. 我的網é ä¼ºæœå™¨æœƒä¿ç•™å…¶æœ¬èº«çš„日誌檔約 5 天, 然後就會加以刪除; 我ä¸æœƒå„²å­˜ä»»ä½•æ›´æ–°æª¢æŸ¥èˆ‡å–®ç¨ IP 地å€é–“çš„é—œè¯æ€§èµ·ä¾†.) Security_PasswordTitle 使用者介é¢å¯†ç¢¼ Security_Password 密碼 Security_PasswordUpdate 密碼已更新 @@ -327,6 +328,7 @@ View_WordProbabilities View_WordFrequencies 正在顯示字詞頻率 View_WordScores 正在顯示字詞得分 View_Chart 判定圖表 +View_DownloadMessage ä¸‹è¼‰éƒµä»¶è¨Šæ¯ Windows_TrayIcon 是å¦è¦åœ¨ Windows 的系統常é§åˆ—顯示 POPFile 圖示? Windows_Console 是å¦è¦åœ¨å‘½ä»¤åˆ—視窗è£åŸ·è¡Œ POPFile? @@ -348,7 +350,7 @@ Configuration_InsertionTableSummary Security_MainTableSummary 這個表格æ供了幾組控制, 能影響 POPFile 整體組態的安全, 是å¦è¦è‡ªå‹•æª¢æŸ¥ç¨‹å¼æ›´æ–°, 以åŠæ˜¯å¦è¦æŠŠ POPFile 效能統計資料的一般資訊傳回程å¼ä½œè€…的中央資料庫. Advanced_MainTableSummary 這個表格æ供了一份 POPFile 分類郵件訊æ¯æ™‚所會忽略的字詞清單, 因為他們在一般郵件訊æ¯è£çš„é—œè¯éŽæ–¼é »ç¹. 她們會被按照字詞開頭的字ç•è¢«é€åˆ—æ•´ç†. -Imap_Bucket2Folder %s 郵筒的信件至郵件匣 +Imap_Bucket2Folder '%s' 郵筒的信件至郵件匣 Imap_MapError 妳ä¸èƒ½æŠŠè¶…éŽä¸€å€‹çš„郵筒å°æ‡‰åˆ°å–®ä¸€çš„郵件匣è£! Imap_Server IMAP 伺æœå™¨ä¸»æ©Ÿå稱: Imap_ServerNameError 請輸入伺æœå™¨çš„主機å稱! @@ -371,9 +373,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage 請先組態連線細節. 當妳完æˆå¾Œ, 這一é è£å°±æœƒå‡ºç¾æ›´å¤šå¯ç”¨çš„é¸é …. Imap_WatchMore 被監視郵件匣清單的郵件匣 Imap_WatchedFolder 被監視的郵件匣編號 +Imap_Use_SSL 使用 SSL Shutdown_Message POPFile 已經被åœæŽ‰äº† -Help_Training 當妳åˆæ¬¡ä½¿ç”¨ POPFile 時, 她啥也ä¸æ‡‚而需è¦è¢«åŠ ä»¥èª¿æ•™. POPFile çš„æ¯ä¸€å€‹éƒµç­’都需è¦ç”¨éƒµä»¶è¨Šæ¯ä¾†åŠ ä»¥èª¿æ•™, 祇有當妳é‡æ–°æŠŠæŸå€‹è¢« POPFile 錯誤分類的郵件訊æ¯é‡æ–°åˆ†é¡žåˆ°æ­£ç¢ºçš„郵筒時, 纔真的是在調教她. åŒæ™‚妳也得設定妳的郵件用戶端程å¼, 來按照 POPFile 的分類çµæžœåŠ ä»¥éŽæ¿¾éƒµä»¶è¨Šæ¯. 關於設定用戶端éŽæ¿¾å™¨çš„資訊å¯ä»¥åœ¨ POPFile 文件計畫è£è¢«æ‰¾åˆ°. -Help_Bucket_Setup POPFile 除了未分類 (unclassified) çš„å‡éƒµç­’外, 還需è¦è‡³å°‘兩個郵筒. 而 POPFile çš„ç¨ç‰¹ä¹‹è™•æ­£åœ¨æ–¼å¥¹å°é›»å­éƒµä»¶çš„å€åˆ†æ›´å‹æ–¼æ­¤, 妳甚至å¯ä»¥æœ‰ä»»æ„數é‡çš„郵筒. ç°¡å–®çš„è¨­å®šæœƒæ˜¯åƒ "垃圾 (spam)", "個人 (personal)", å’Œ "工作 (work)" 郵筒. +Help_Training 當妳åˆæ¬¡ä½¿ç”¨ POPFile 時, 她啥也ä¸æ‡‚而需è¦è¢«åŠ ä»¥èª¿æ•™. POPFile çš„æ¯ä¸€å€‹éƒµç­’都需è¦ç”¨éƒµä»¶è¨Šæ¯ä¾†åŠ ä»¥èª¿æ•™, 祇有當妳é‡æ–°æŠŠæŸå€‹è¢« POPFile 錯誤分類的郵件訊æ¯é‡æ–°åˆ†é¡žåˆ°æ­£ç¢ºçš„郵筒時, 纔真的是在調教她. åŒæ™‚妳也得設定妳的郵件用戶端程å¼, 來按照 POPFile 的分類çµæžœåŠ ä»¥éŽæ¿¾éƒµä»¶è¨Šæ¯. 關於設定用戶端éŽæ¿¾å™¨çš„資訊å¯ä»¥åœ¨ POPFile 文件計畫è£è¢«æ‰¾åˆ°. +Help_Bucket_Setup POPFile 除了 "未分類 (unclassified)" çš„å‡éƒµç­’外, 還需è¦è‡³å°‘兩個郵筒. 而 POPFile çš„ç¨ç‰¹ä¹‹è™•æ­£åœ¨æ–¼å¥¹å°é›»å­éƒµä»¶çš„å€åˆ†æ›´å‹æ–¼æ­¤, 妳甚至å¯ä»¥æœ‰ä»»æ„數é‡çš„郵筒. ç°¡å–®çš„è¨­å®šæœƒæ˜¯åƒ "垃圾 (spam)", "個人 (personal)", å’Œ "工作 (work)" 郵筒. Help_No_More 別å†é¡¯ç¤ºé€™å€‹èªªæ˜Žäº† diff -pruN 0.22.4-1.2/languages/Czech.msg 1.0.1-0ubuntu2/languages/Czech.msg --- 0.22.4-1.2/languages/Czech.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Czech.msg 2008-04-18 14:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -175,8 +175,8 @@ Password_Error1 Security_Error1 Port musí být èíslo mezi 1 a 65535 Security_Stealth Utajený režim/režim serveru Security_NoStealthMode Ne (Utajený režim) -Security_ExplainStats (Pokud je to zapnuto, POPFile jedenkrát dennì odešle skriptu na www.usethesource.com následující údaje: bc [celkový poèet košù], mc [celkový poèet zpráv, které POPFile klasifikoval] a ec [celkový poèet chyb klasifikace]. Tyto údaje jsou ukládány a použiji je pro statistiku o tom, jak lidé POPFile používají a jak je úspìšný. Mùj web server data udržuje 5 dnù a pak je ruší. Neukládá se žádná informace o propojení mezi statistikami a pøíslušnými IP adresami.) -Security_ExplainUpdate (Pokud je to zapnuto, POPFile jedenkrát dennì odešle skriptu na www.usethesource.com následující údaje: ma [hlavní èíslo verze vašeho POPFile], mi [vedlejší èíslo verze] a bn (èíslo sestavení POPFile). Pokud je dostupná nová verze, POPFile to graficky zobrazí v horní èásti stránky. Mùj web server data udržuje 5 dnù a pak je ruší. Neukládá se žádná informace o propojení mezi údaji a pøíslušnými IP adresami.) +Security_ExplainStats (Pokud je to zapnuto, POPFile jedenkrát dennì odešle skriptu na getpopfile.org následující údaje: bc [celkový poèet košù], mc [celkový poèet zpráv, které POPFile klasifikoval] a ec [celkový poèet chyb klasifikace]. Tyto údaje jsou ukládány a použiji je pro statistiku o tom, jak lidé POPFile používají a jak je úspìšný. Mùj web server data udržuje 5 dnù a pak je ruší. Neukládá se žádná informace o propojení mezi statistikami a pøíslušnými IP adresami.) +Security_ExplainUpdate (Pokud je to zapnuto, POPFile jedenkrát dennì odešle skriptu na getpopfile.org následující údaje: ma [hlavní èíslo verze vašeho POPFile], mi [vedlejší èíslo verze] a bn (èíslo sestavení POPFile). Pokud je dostupná nová verze, POPFile to graficky zobrazí v horní èásti stránky. Mùj web server data udržuje 5 dnù a pak je ruší. Neukládá se žádná informace o propojení mezi údaji a pøíslušnými IP adresami.) Security_PasswordTitle Heslo uživatelského rozhraní Security_Password Heslo Security_PasswordUpdate Nové heslo je %s diff -pruN 0.22.4-1.2/languages/Dansk.msg 1.0.1-0ubuntu2/languages/Dansk.msg --- 0.22.4-1.2/languages/Dansk.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Dansk.msg 2008-04-18 14:49:52.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/languages/Deutsch.msg 1.0.1-0ubuntu2/languages/Deutsch.msg --- 0.22.4-1.2/languages/Deutsch.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Deutsch.msg 2008-04-18 17:16:20.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -18,12 +18,18 @@ # Identify the language and character set used for the interface LanguageCode de -LanguageCharset ISO-8859-1 -LanguageDirection ltr + + # This is used to get the appropriate subdirectory for the manual ManualLanguage de + + + + + + # Common words that are used on their own all over the interface Apply Anwenden ApplyChanges Änderungen übernehmen @@ -226,8 +232,8 @@ Security_Error1 Security_Stealth Stealth Modus/Serverbetrieb Security_NoStealthMode Nein (Stealth Modus) Security_StealthMode (Stealth Modus) -Security_ExplainStats (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: bc (Anzahl von Ihnen eingerichteter Kategorien), mc (Anzahl von POPFile eingestufter Nachrichten) und ec (Anzahl der Einstufungsfehler). Diese werden in einer Datei gespeichert und benutzt, um öffentliche Statistiken darüber zu erstellen, wie POPFile genutzt wird und wie gut es dabei funktioniert. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.) -Security_ExplainUpdate (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf www.usethesource.com: ma (die Hauptversionsnummer der POPFile-Installation), mi (die Nebenversionsnummer der POPFile-Installation) und bn (die build-Nummer der POPFile-Installation). POPFile erhält die Antwort in Form einer Grafik, die am Kopf einer Seite erscheint, wenn eine neue Version verfügbar ist. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.) +Security_ExplainStats (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf getpopfile.org: bc (Anzahl von Ihnen eingerichteter Kategorien), mc (Anzahl von POPFile eingestufter Nachrichten) und ec (Anzahl der Einstufungsfehler). Diese werden in einer Datei gespeichert und benutzt, um öffentliche Statistiken darüber zu erstellen, wie POPFile genutzt wird und wie gut es dabei funktioniert. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.) +Security_ExplainUpdate (Wenn Sie diese Funktion einschalten, sendet POPFile täglich die drei folgenden Werte an ein Skript auf getpopfile.org: ma (die Hauptversionsnummer der POPFile-Installation), mi (die Nebenversionsnummer der POPFile-Installation) und bn (die build-Nummer der POPFile-Installation). POPFile erhält die Antwort in Form einer Grafik, die am Kopf einer Seite erscheint, wenn eine neue Version verfügbar ist. Die Daten werden etwa 5 Tage auf dem Server gespeichert und dann gelöscht. Zuordnungen zwischen IP-Adressen und statistischen Daten werden nicht gespeichert.) Security_PasswordTitle Paßwort für Benutzeroberfläche Security_Password Paßwort Security_PasswordUpdate Passwort geändert @@ -322,6 +328,7 @@ View_WordProbabilities View_WordFrequencies zeige Häufigkeit des Auftretens View_WordScores zeige Bewertung des Wortes View_Chart Entscheidungs-Diagramm +View_DownloadMessage Nachricht herunterladen Windows_TrayIcon POPFile-Symbol neben der Uhr anzeigen? Windows_Console POPFile in einem Konsolenfenster ausführen? @@ -366,9 +373,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage Bitte konfigurieren Sie erst die Verbindung zum Server. Nachdem Sie das getan haben, werden Sie an dieser Stelle mehr Konfigurationsmöglichkeiten finden. Imap_WatchMore : einen weiteren zu überwachenden Ordner Imap_WatchedFolder Überwachter Ordner Nr. +Imap_Use_SSL SSL-gesicherte Verbindung Shutdown_Message POPFile wurde beendet -Help_Training POPFile weiss zunächst einmal nichts über Ihre Nachrichten und muss deshalb erst trainiert werden. Für jede Kategorie muss mindestens eine Nachricht neu eingestuft worden sein, damit POPFile selber eine Einstufung vornehmen kann. Außerdem müssen Sie Ihr Mail-Programm so konfigurieren, dass es aufgrund der POPFile-Einstufung Ihre Emails filtert. Informationen über die Konfiguration verschiedener Mail-Programme finden Sie (auf English) im POPFile Documentation Project. +Help_Training POPFile weiss zunächst einmal nichts über Ihre Nachrichten und muss deshalb erst trainiert werden. Für jede Kategorie muss mindestens eine Nachricht neu eingestuft worden sein, damit POPFile selber eine Einstufung vornehmen kann. Außerdem müssen Sie Ihr Mail-Programm so konfigurieren, dass es aufgrund der POPFile-Einstufung Ihre Emails filtert. Informationen über die Konfiguration verschiedener Mail-Programme finden Sie (auf English) im POPFile Documentation Project. Help_Bucket_Setup POPFile braucht mindestens zwei Kategorien zusätzlich zu der "unclassified" Pseudo-Kategorie. POPFile zeichnet sich durch die Fähigkeit aus, Emails in eine unbgrenzte Zahl von Kategorien einsortieren zu können. Eine einfache Konfiguration könnte zum Beispiel die Kategorien "spam", "beruflich" und "privat" enthalten. Help_No_More Diesen Hinweis nicht mehr zeigen diff -pruN 0.22.4-1.2/languages/English.msg 1.0.1-0ubuntu2/languages/English.msg --- 0.22.4-1.2/languages/English.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/English.msg 2008-04-18 14:49:54.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -24,8 +24,11 @@ LanguageDirection # This is used to get the appropriate subdirectory for the manual ManualLanguage en -# This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +# These are where to find the documents on the Wiki +WikiLink index.php +FAQLink FAQ +RequestFeatureLink RequestFeature +MailingListLink mailing_lists # Common words that are used on their own all over the interface Apply Apply @@ -181,7 +184,7 @@ Advanced_RemoveWord Advanced_AllParameters All POPFile Parameters Advanced_Parameter Parameter Advanced_Value Value -Advanced_Warning This is the complete list of POPFile parameters. Advanced users only: you may change any and click Update; there is no validity checking. Items shown in bold have been changed from the default setting. See OptionReference for more information on options. +Advanced_Warning This is the complete list of POPFile parameters. Advanced users only: you may change any and click Update; there is no validity checking. Items shown in bold have been changed from the default setting. See OptionReference for more information on options. Advanced_ConfigFile Configuration file: History_Filter  (just showing bucket %s) @@ -229,8 +232,8 @@ Security_Error1 Security_Stealth Stealth Mode/Server Operation Security_NoStealthMode No (Stealth Mode) Security_StealthMode (Stealth Mode) -Security_ExplainStats (With this turned on POPFile sends once per day the following three values to a script on www.usethesource.com: bc (the total number of buckets that you have), mc (the total number of messages that POPFile has classified) and ec (the total number of classification errors). These get stored in a file and I will use this to publish some statistics about how people use POPFile and how well it works. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the statistics and individual IP addresses.) -Security_ExplainUpdate (With this turned on POPFile sends once per day the following three values to a script on www.usethesource.com: ma (the major version number of your installed POPFile), mi (the minor version number of your installed POPFile) and bn (the build number of your installed POPFile). POPFile receives a response in the form of a graphic that appears at the top of the page if a new version is available. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the update checks and individual IP addresses.) +Security_ExplainStats (With this turned on POPFile sends once per day the following three values to a script on getpopfile.org: bc (the total number of buckets that you have), mc (the total number of messages that POPFile has classified) and ec (the total number of classification errors). These get stored in a file and I will use this to publish some statistics about how people use POPFile and how well it works. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the statistics and individual IP addresses.) +Security_ExplainUpdate (With this turned on POPFile sends once per day the following three values to a script on getpopfile.org: ma (the major version number of your installed POPFile), mi (the minor version number of your installed POPFile) and bn (the build number of your installed POPFile). POPFile receives a response in the form of a graphic that appears at the top of the page if a new version is available. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the update checks and individual IP addresses.) Security_PasswordTitle User Interface Password Security_Password Password Security_PasswordUpdate Updated password @@ -325,6 +328,7 @@ View_WordProbabilities View_WordFrequencies showing word frequencies View_WordScores showing word scores View_Chart Decision Chart +View_DownloadMessage Download Message Windows_TrayIcon Show POPFile icon in Windows system tray? Windows_Console Run POPFile in a console window? @@ -369,9 +373,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage Please configure the connection details first. After you have done that, more options will be available on this page. Imap_WatchMore a folder to list of watched folders Imap_WatchedFolder Watched folder no +Imap_Use_SSL Use SSL Shutdown_Message POPFile has shut down -Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile missclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the POPFile Documentation Project. +Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile missclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the POPFile Documentation Project. Help_Bucket_Setup POPFile requires at least two buckets in addition to the "unclassified" pseudo-bucket. What makes POPFile unique is that it can classify email more than that, you can have any number of buckets. A simple setup would be a "spam", "personal", and a "work" bucket. Help_No_More Don't show this again diff -pruN 0.22.4-1.2/languages/English-UK.msg 1.0.1-0ubuntu2/languages/English-UK.msg --- 0.22.4-1.2/languages/English-UK.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/English-UK.msg 2008-04-18 14:49:54.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -25,7 +25,7 @@ LanguageDirection ManualLanguage en # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Apply @@ -181,7 +181,7 @@ Advanced_RemoveWord Advanced_AllParameters All POPFile Parameters Advanced_Parameter Parameter Advanced_Value Value -Advanced_Warning This is the complete list of POPFile parameters. Advanced users only: you may change any and click Update; there is no validity checking. Items shown in bold have been changed from the default setting. See OptionReference for more information on options. +Advanced_Warning This is the complete list of POPFile parameters. Advanced users only: you may change any and click Update; there is no validity checking. Items shown in bold have been changed from the default setting. See OptionReference for more information on options. Advanced_ConfigFile Configuration file: History_Filter  (just showing bucket %s) @@ -229,8 +229,8 @@ Security_Error1 Security_Stealth Stealth Mode/Server Operation Security_NoStealthMode No (Stealth Mode) Security_StealthMode (Stealth Mode) -Security_ExplainStats (With this turned on POPFile sends once per day the following three values to a script on www.usethesource.com: bc (the total number of buckets that you have), mc (the total number of messages that POPFile has classified) and ec (the total number of classification errors). These get stored in a file and I will use this to publish some statistics about how people use POPFile and how well it works. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the statistics and individual IP addresses.) -Security_ExplainUpdate (With this turned on POPFile sends once per day the following three values to a script on www.usethesource.com: ma (the major version number of your installed POPFile), mi (the minor version number of your installed POPFile) and bn (the build number of your installed POPFile). POPFile receives a response in the form of a graphic that appears at the top of the page if a new version is available. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the update checks and individual IP addresses.) +Security_ExplainStats (With this turned on POPFile sends once per day the following three values to a script on getpopfile.org: bc (the total number of buckets that you have), mc (the total number of messages that POPFile has classified) and ec (the total number of classification errors). These get stored in a file and I will use this to publish some statistics about how people use POPFile and how well it works. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the statistics and individual IP addresses.) +Security_ExplainUpdate (With this turned on POPFile sends once per day the following three values to a script on getpopfile.org: ma (the major version number of your installed POPFile), mi (the minor version number of your installed POPFile) and bn (the build number of your installed POPFile). POPFile receives a response in the form of a graphic that appears at the top of the page if a new version is available. My web server keeps its log files for about 5 days and then they get deleted; I am not storing any connection between the update checks and individual IP addresses.) Security_PasswordTitle User Interface Password Security_Password Password Security_PasswordUpdate Updated password @@ -325,6 +325,7 @@ View_WordProbabilities View_WordFrequencies showing word frequencies View_WordScores showing word scores View_Chart Decision Chart +View_DownloadMessage Download Message Windows_TrayIcon Show POPFile icon in Windows system tray? Windows_Console Run POPFile in a console window? @@ -369,9 +370,10 @@ Imap_UpdateError3 Imap_NoConnectionMessage Please configure the connection details first. After you have done that, more options will be available on this page. Imap_WatchMore a folder to list of watched folders Imap_WatchedFolder Watched folder no +Imap_Use_SSL Use SSL Shutdown_Message POPFile has shut down -Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile misclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the POPFile Documentation Project. +Help_Training When you first use POPFile, it knows nothing and will need some training. POPFile requires training on messages for each bucket, training occurs when you reclassify a message POPFile misclassified to the correct bucket. You must also setup your mail client to filter messages based on POPFile's classification. Information on setting up your client filtering can be found at the POPFile Documentation Project. Help_Bucket_Setup POPFile requires at least two buckets in addition to the "unclassified" pseudo-bucket. What makes POPFile unique is that it can classify email more than that, you can have any number of buckets. A simple setup would be a "spam", "personal", and a "work" bucket. Help_No_More Don't show this again diff -pruN 0.22.4-1.2/languages/Espanol.msg 1.0.1-0ubuntu2/languages/Espanol.msg --- 0.22.4-1.2/languages/Espanol.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Espanol.msg 2008-04-18 14:49:54.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -183,8 +183,8 @@ Password_Error1 Security_Error1 El puerto seguro tiene que ser un nº entre 1 y 65535 Security_Stealth Modo Oculto/Operación del Servidor Security_NoStealthMode No (Modo Oculto) -Security_ExplainStats Con esto activado POPFile envia una vez al día los tres valores siguientes a un script en www.usethesource.com: bc (el nº de categorías que tienes), mc (el nº total de mensajes que ha clasificado POPFile) y ec (el nº total de errores de clasificación). Estos se guardan en un archivo que yo utilizaré para publicar algunas estadísticas acerca de cómo usa la gente POPFile y cómo de bien les funciona. Mi servidor web mantiene sus archivos log unos 5 días y luego se borran; Yo no guardo ninguna relación entre las estadísticas y sus direcciones IP individuales. -Security_ExplainUpdate Con esto activado POPFile envia una vez al día los tres valores siguientes a un script en www.usethesource.com: ma (el nº de versión de tu POPFile), mi (el nº de revisión de tu POPFile) y bn (el nº de compilación de tu POPFile). Si existe una nueva versión, POPFile recibe una respuesta en forma de gráfico que se muestra en la parte superior de la página. Mi servidor web mantiene sus archivos log unos 5 días y luego se borran; Yo no guardo ninguna relación entre las comprobaciones de actualización y sus direcciones IP individuales. +Security_ExplainStats Con esto activado POPFile envia una vez al día los tres valores siguientes a un script en getpopfile.org: bc (el nº de categorías que tienes), mc (el nº total de mensajes que ha clasificado POPFile) y ec (el nº total de errores de clasificación). Estos se guardan en un archivo que yo utilizaré para publicar algunas estadísticas acerca de cómo usa la gente POPFile y cómo de bien les funciona. Mi servidor web mantiene sus archivos log unos 5 días y luego se borran; Yo no guardo ninguna relación entre las estadísticas y sus direcciones IP individuales. +Security_ExplainUpdate Con esto activado POPFile envia una vez al día los tres valores siguientes a un script en getpopfile.org: ma (el nº de versión de tu POPFile), mi (el nº de revisión de tu POPFile) y bn (el nº de compilación de tu POPFile). Si existe una nueva versión, POPFile recibe una respuesta en forma de gráfico que se muestra en la parte superior de la página. Mi servidor web mantiene sus archivos log unos 5 días y luego se borran; Yo no guardo ninguna relación entre las comprobaciones de actualización y sus direcciones IP individuales. Security_PasswordTitle Contraseña del Interface de Usuario Security_Password Contraseña Security_PasswordUpdate Contraseña actualizada diff -pruN 0.22.4-1.2/languages/Francais.msg 1.0.1-0ubuntu2/languages/Francais.msg --- 0.22.4-1.2/languages/Francais.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Francais.msg 2008-04-18 14:49:54.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -225,8 +225,8 @@ Security_Error1 Security_Stealth Mode Furtif/Fonctionnement du Serveur Security_NoStealthMode Non (Mode Furtif) Security_StealthMode (Mode Furtif) -Security_ExplainStats (Quand ceci est activé POPFile envoie une fois par jour les trois valeurs suivantes à un script à www.usethesource.com: bc (le nombre total de vos catégories), mc (le nombre total de messages classifiés par POPFile) et ec (le nombre total d'erreurs de classification). Elles sont alors stockées dans un fichier que j'utiliserai pour publier quelques statistiques sur comment les gens utilisent POPFile et si ça marche bien. Mon serveur web conserve ses fichiers log pendant environ 5 jours puis les efface; je ne recueille aucun lien entre les statisques et les adresses IP individuelles.) -Security_ExplainUpdate (Quand ceci est activé POPFile envoie une fois par jour les trois valeurs suivantes à un script à www.usethesource.com: ma (le numéro de version principal de votre POPFile), mi (le numéro de version secondaire de votre POPFile) et bn (le numéro de compilation de votre POPFile). POPFile reçoit une réponse sous la forme d'un graphique qui apparaît en haut de la page si une version plus récente est disponible. Mon serveur web conserve ses fichiers log pendant environ 5 jours puis les efface; je ne recueille aucun lien entre les contrôles de mise à jour et les adresses IP individuelles.) +Security_ExplainStats (Quand ceci est activé POPFile envoie une fois par jour les trois valeurs suivantes à un script à getpopfile.org: bc (le nombre total de vos catégories), mc (le nombre total de messages classifiés par POPFile) et ec (le nombre total d'erreurs de classification). Elles sont alors stockées dans un fichier que j'utiliserai pour publier quelques statistiques sur comment les gens utilisent POPFile et si ça marche bien. Mon serveur web conserve ses fichiers log pendant environ 5 jours puis les efface; je ne recueille aucun lien entre les statisques et les adresses IP individuelles.) +Security_ExplainUpdate (Quand ceci est activé POPFile envoie une fois par jour les trois valeurs suivantes à un script à getpopfile.org: ma (le numéro de version principal de votre POPFile), mi (le numéro de version secondaire de votre POPFile) et bn (le numéro de compilation de votre POPFile). POPFile reçoit une réponse sous la forme d'un graphique qui apparaît en haut de la page si une version plus récente est disponible. Mon serveur web conserve ses fichiers log pendant environ 5 jours puis les efface; je ne recueille aucun lien entre les contrôles de mise à jour et les adresses IP individuelles.) Security_PasswordTitle Mot de passe de l'interface utilisateur Security_Password Mot de passe Security_PasswordUpdate Mot de passe changé en %s @@ -368,6 +368,6 @@ Imap_WatchedFolder Shutdown_Message POPFile s'est arrêté -Help_Training Lorsque vous utilisez POPFile pour la première fois, il ne connait rien et a besoin d'un apprentissage. POPFile a besoin d'être entraîné avec des messages appartenant à chaque catégorie, cet apprentissage ayant lieu quand vous reclassifiez un message que POPFile a mal classé. Vous devez également configurer votre client de messagerie pour filtrer les messages en fonction de la classification effectuée par POPFile. Pour plus de renseignements sur la mise en place du filtrage dans les clients de messagerie, consultez : POPFile Documentation Project (en Anglais). +Help_Training Lorsque vous utilisez POPFile pour la première fois, il ne connait rien et a besoin d'un apprentissage. POPFile a besoin d'être entraîné avec des messages appartenant à chaque catégorie, cet apprentissage ayant lieu quand vous reclassifiez un message que POPFile a mal classé. Vous devez également configurer votre client de messagerie pour filtrer les messages en fonction de la classification effectuée par POPFile. Pour plus de renseignements sur la mise en place du filtrage dans les clients de messagerie, consultez : POPFile Documentation Project (en Anglais). Help_Bucket_Setup POPFile a besoin d'au moins deux catégories en plus de la pseudo-catégorie 'unclassified'. Ce qui rend POPFile unique est qu'il peut classifier les messages dans autant de catégorie que vous le désirez. Une configuration simple pourrait être une catégorie "spam", une autre "personnel" et une autre "professionnel" Help_No_More Ne plus montrer ceci diff -pruN 0.22.4-1.2/languages/Hebrew.msg 1.0.1-0ubuntu2/languages/Hebrew.msg --- 0.22.4-1.2/languages/Hebrew.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Hebrew.msg 2008-04-18 14:49:54.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -182,8 +182,8 @@ Password_Error1 Security_Error1 מספר השער המוגן צרין להיות מספר בין 1 ל 65535 Security_Stealth הרש×ות חיבור ×ž×ž×—×©×‘×™× ××—×¨×™× Security_NoStealthMode ×œ× (פעולה חסויה) -Security_ExplainStats כש×פשרות זו נבחרת, POPFile מתחברת ×חת ×œ×™×•× ×œ×©×¨×ª www.usethesource.com ומוסרת 3 פרטי×: bc (מספר ×”×ž×¦×‘×•×¨×™× ×©×™×© לך), mc (מספר ההודעות שהתוכנה סיווגה), ac (מספר טעויות הסיווג שהתוכנה ביצעה). × ×ª×•× ×™× ×לה × ×©×ž×¨×™× ×‘×§×•×‘×¥, ו×× ×™ ×שתמש ×‘×”× ×œ×¤×™×¨×¡×•× ×¡×˜×˜×™×¡×˜×™×§×” כוללנית על ×יך ×× ×©×™× ×ž×©×ª×ž×©×™× ×‘×ª×•×›× ×” ורמת הדיוק שלה. ×”×§×‘×¦×™× × ×©×ž×¨×™× ×›5 ×™×ž×™× ×‘×©×¨×ª ×•× ×ž×—×§×™× ×œ×חר מכן. מידע המקשר בין כתובת ×” IP שלך לבין הסטטיסטיקה ×ינו נשמר ×ו מפורס×. -Security_ExplainUpdate כש×פשרות זו נבחרת, POPFile מתחברת ×חת ×œ×™×•× ×œ×©×¨×ª www.usethesource.com ומוסרת 3 פרטי×: ma (מספר הגירסה הר×שי של POPFile המותקנת במחשבך), ma (מספר הגירסה המשני של POPFile המותקנת במחשבך), bn (גירסת הקומפילציה של POPFile המותקנת במחשבך).POPFile תקבל משוב מהשרת בצורת ×יקון גרפי המר××” ×× ×§×™×™×ž×ª גירסה חדשה שתוכל להתקין. 3 ×”× ×ª×•× ×™× × ×©×ž×¨×™× ×‘×§×•×‘×¥ בשרת. ×”×§×‘×¦×™× × ×©×ž×¨×™× ×›5 ×™×ž×™× ×‘×©×¨×ª ×•× ×ž×—×§×™× ×œ×חר מכן. מידע המקשר בין כתובת ×” IP שלך לבין שלושת ×”×¤×¨×™×˜×™× ×ינו נשמר ×ו מפורס×. +Security_ExplainStats כש×פשרות זו נבחרת, POPFile מתחברת ×חת ×œ×™×•× ×œ×©×¨×ª getpopfile.org ומוסרת 3 פרטי×: bc (מספר ×”×ž×¦×‘×•×¨×™× ×©×™×© לך), mc (מספר ההודעות שהתוכנה סיווגה), ac (מספר טעויות הסיווג שהתוכנה ביצעה). × ×ª×•× ×™× ×לה × ×©×ž×¨×™× ×‘×§×•×‘×¥, ו×× ×™ ×שתמש ×‘×”× ×œ×¤×™×¨×¡×•× ×¡×˜×˜×™×¡×˜×™×§×” כוללנית על ×יך ×× ×©×™× ×ž×©×ª×ž×©×™× ×‘×ª×•×›× ×” ורמת הדיוק שלה. ×”×§×‘×¦×™× × ×©×ž×¨×™× ×›5 ×™×ž×™× ×‘×©×¨×ª ×•× ×ž×—×§×™× ×œ×חר מכן. מידע המקשר בין כתובת ×” IP שלך לבין הסטטיסטיקה ×ינו נשמר ×ו מפורס×. +Security_ExplainUpdate כש×פשרות זו נבחרת, POPFile מתחברת ×חת ×œ×™×•× ×œ×©×¨×ª getpopfile.org ומוסרת 3 פרטי×: ma (מספר הגירסה הר×שי של POPFile המותקנת במחשבך), ma (מספר הגירסה המשני של POPFile המותקנת במחשבך), bn (גירסת הקומפילציה של POPFile המותקנת במחשבך).POPFile תקבל משוב מהשרת בצורת ×יקון גרפי המר××” ×× ×§×™×™×ž×ª גירסה חדשה שתוכל להתקין. 3 ×”× ×ª×•× ×™× × ×©×ž×¨×™× ×‘×§×•×‘×¥ בשרת. ×”×§×‘×¦×™× × ×©×ž×¨×™× ×›5 ×™×ž×™× ×‘×©×¨×ª ×•× ×ž×—×§×™× ×œ×חר מכן. מידע המקשר בין כתובת ×” IP שלך לבין שלושת ×”×¤×¨×™×˜×™× ×ינו נשמר ×ו מפורס×. Security_PasswordTitle ×¡×™×¡×ž× ×œ×ž×ž×©×§ המשתמש Security_Password ×¡×™×¡×ž× Security_PasswordUpdate ×”×¡×™×¡×ž× ×¢×•×“×›× ×” ל %s diff -pruN 0.22.4-1.2/languages/Hellenic.msg 1.0.1-0ubuntu2/languages/Hellenic.msg --- 0.22.4-1.2/languages/Hellenic.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Hellenic.msg 2008-04-18 14:49:56.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -176,8 +176,8 @@ Password_Error1 Security_Error1 Ôï port ðñÝðåé íá åßíáé Ýíáò áñéèìüò ìåôáîý 1 êáé 65535 Security_Stealth Ëåéôïõñãßá ÁðüêñõøÞò/Ëåéôïõñãßá Server Security_NoStealthMode Ï÷é ( Ëåéôïõñãßá Áðüêñõøçò ) -Security_ExplainStats (Ìå áõôÞ ôçí åðéëïãÞ åíåñãÞ ôï POPFile óôÝëíåé êÜèå çìÝñá ôéò áêüëïõèåò ôñåßò ðáñáìÝôñïõò óå Ýíá ðñüãñáììá óôï www.usethesource.com: bc (óýíïëï áñ÷åßùí ðïõ ÷ñçóéìïðïéïýíôáé ), mc (óýíïëï ôáîéíïìçìÝíùí ìõíçìÜôùí) and ec (óýíïëï ëáèþí ôáîéíüìçóçò). ÁõôÜ áñ÷åéïèåôïýíôáé êáé ÷ñçóéìïðïéïýíôáé ãéá íá óõíôá÷èïýí óôáôéóôéêÝò ãéá ôï ðþò ïé ÷ñÞóôåò ÷ñçóéìïðïéïýí ôï POPFile áëëÜ êáé ðüóï áðïôåëåóìáôéêÜ áõôü äïõëåýåés. Ôá áñ÷åßá óâÞíïíôáé ìå ôçí ðáñÝëåõóç ðåíèçìÝñïõ; Äåí ãßíïíôáé óõó÷åôéóìïß ìåôáîý ôùí óôáôéóôéêþí êáé ôùí ìåìïíïìÝíùí äéåõèýíóåùí IP.) -Security_ExplainUpdate (Ìå áõôÞ ôçí åðéëïãÞ åíåñãÞ ôï POPFile óôÝëíåé êÜèå çìÝñá ôéò áêüëïõèåò ôñåßò ðáñáìÝôñïõò óå Ýíá ðñüãñáììá óôï www.usethesource.com:: ma (ôïí êýñéï áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile), mi (ôïí äåõôåñåýïíôá áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile) êáé bn (ôïí áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile). Ôï POPFile ëáìâÜíåé ìßá áðÜíôçóç ìå ôçí ìïñöÞ ãñáöéêïý ðïõ åìöáíßæåôáé óôçí Üíù ìåñéÜ ôçò óåëßäáò, êáé óáò åéäïðïéåß üôé õðÜñ÷åé íÝá åíçìåñùìÝíç Ýêäïóç. Ôá áñ÷åßá óâÞíïíôáé ìå ôçí ðáñÝëåõóç ðåíèçìÝñïõ; Äåí ãßíïíôáé óõó÷åôéóìïß ìåôáîý ôùí óôáôéóôéêþí êáé ôùí ìåìïíïìÝíùí äéåõèýíóåùí IP.) +Security_ExplainStats (Ìå áõôÞ ôçí åðéëïãÞ åíåñãÞ ôï POPFile óôÝëíåé êÜèå çìÝñá ôéò áêüëïõèåò ôñåßò ðáñáìÝôñïõò óå Ýíá ðñüãñáììá óôï getpopfile.org: bc (óýíïëï áñ÷åßùí ðïõ ÷ñçóéìïðïéïýíôáé ), mc (óýíïëï ôáîéíïìçìÝíùí ìõíçìÜôùí) and ec (óýíïëï ëáèþí ôáîéíüìçóçò). ÁõôÜ áñ÷åéïèåôïýíôáé êáé ÷ñçóéìïðïéïýíôáé ãéá íá óõíôá÷èïýí óôáôéóôéêÝò ãéá ôï ðþò ïé ÷ñÞóôåò ÷ñçóéìïðïéïýí ôï POPFile áëëÜ êáé ðüóï áðïôåëåóìáôéêÜ áõôü äïõëåýåés. Ôá áñ÷åßá óâÞíïíôáé ìå ôçí ðáñÝëåõóç ðåíèçìÝñïõ; Äåí ãßíïíôáé óõó÷åôéóìïß ìåôáîý ôùí óôáôéóôéêþí êáé ôùí ìåìïíïìÝíùí äéåõèýíóåùí IP.) +Security_ExplainUpdate (Ìå áõôÞ ôçí åðéëïãÞ åíåñãÞ ôï POPFile óôÝëíåé êÜèå çìÝñá ôéò áêüëïõèåò ôñåßò ðáñáìÝôñïõò óå Ýíá ðñüãñáììá óôï getpopfile.org:: ma (ôïí êýñéï áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile), mi (ôïí äåõôåñåýïíôá áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile) êáé bn (ôïí áñéèìü Ýêäïóçò ôïõ åí ÷ñÞóç POPFile). Ôï POPFile ëáìâÜíåé ìßá áðÜíôçóç ìå ôçí ìïñöÞ ãñáöéêïý ðïõ åìöáíßæåôáé óôçí Üíù ìåñéÜ ôçò óåëßäáò, êáé óáò åéäïðïéåß üôé õðÜñ÷åé íÝá åíçìåñùìÝíç Ýêäïóç. Ôá áñ÷åßá óâÞíïíôáé ìå ôçí ðáñÝëåõóç ðåíèçìÝñïõ; Äåí ãßíïíôáé óõó÷åôéóìïß ìåôáîý ôùí óôáôéóôéêþí êáé ôùí ìåìïíïìÝíùí äéåõèýíóåùí IP.) Security_PasswordTitle Óýíèçìá ÅðéöÜíåéáò ×ñÞóçò Security_Password Óýíèçìá Security_PasswordUpdate Ôï óýíèçìá Üëëáîå óå %s diff -pruN 0.22.4-1.2/languages/Hungarian.msg 1.0.1-0ubuntu2/languages/Hungarian.msg --- 0.22.4-1.2/languages/Hungarian.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Hungarian.msg 2008-04-18 14:49:58.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -151,8 +151,8 @@ Password_Error1 Security_Error1 A secure port egy szám kell hogy legyen 1 és 65535 között Security_Stealth Lopakodó (Stealth) Üzemmód/Szerver Múködés Security_NoStealthMode Nem (Stealth Üzemmód) -Security_ExplainStats (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a www.usethesource.com-ra: bc (a konténerek száma) mc (a POPFile által osztályozott üzenetek száma) ec (az osztályozási hibák száma). Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.) -Security_ExplainUpdate (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a www.usethesource.com-ra: ma (az általad használt POPFile fõ verziószáma) mi (az általad használt POPFile al-verziószáma) bn (az általad használt POPFile build száma). Az általad használt POPFile kapni fog egy grafikát a szervertõl, ami a lap tetején lesz látható ha egy újabb verzió elérhetõ. Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.) +Security_ExplainStats (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a getpopfile.org-ra: bc (a konténerek száma) mc (a POPFile által osztályozott üzenetek száma) ec (az osztályozási hibák száma). Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.) +Security_ExplainUpdate (Ha ez be van kapcsolva, akkor a POPFile naponta egyszer elküldi a következõ 3 változó értékét egy script-nek a getpopfile.org-ra: ma (az általad használt POPFile fõ verziószáma) mi (az általad használt POPFile al-verziószáma) bn (az általad használt POPFile build száma). Az általad használt POPFile kapni fog egy grafikát a szervertõl, ami a lap tetején lesz látható ha egy újabb verzió elérhetõ. Ezeket az adatokat egy állomámyban tartom, és arra használom õket hogy néhány statisztikai adatok publikáljak a POPFile hatékonyságáról és arról hogy az emberek hogyan hasynálják a programot. A Web szerverem kb. 5 napig õrzi meg az információt, majd törli. Nem tárolok semmiféle kapcsolatot a begyûjtött adatok és az IP cimek között.) Security_PasswordTitle Felhaszálói felület jelszó Security_Password Jelszó Security_PasswordUpdate Az új jelszó: %s diff -pruN 0.22.4-1.2/languages/Italiano.msg 1.0.1-0ubuntu2/languages/Italiano.msg --- 0.22.4-1.2/languages/Italiano.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Italiano.msg 2008-04-18 14:49:58.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -27,7 +27,7 @@ LanguageDirection ManualLanguage en # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Applica @@ -230,8 +230,8 @@ Security_Error1 Security_Stealth Modalità stealth/Server Operation Security_NoStealthMode No (Modalità Stealth) Security_StealthMode (Modalità Stealth) -Security_ExplainStats (Attivando questo flag POPFile spedisce una volta al giorno i seguenti tre valori ad uno script su www.usethesource.com: bc (il numero totale di cesti che hai), mc (il numero totale di messaggi che POPFile ha classificato) ed ec (il numero totale di errori di classificazione). Questi valori vengono conservati in un file e ne farò uso per pubblicare delle statistiche su come la gente usa POPFile e su come funziona. Il mio server web conserva questi file di log per circa 5 giorni e poi vengono cancellati; non traccio alcuna connessione tra le statistiche e gli IP individuali.) -Security_ExplainUpdate (Attivando questo flag POPFile spedisce una volta al giorno i seguenti tre valori ad uno script su www.usethesource.com: ma (il major version number del POPFile che hai installato), mi (il minor version number del POPFile che hai installato) e bn (il build number del POPFile che hai installato). POPFile ne ottiene una risposta nella forma di un grafico che appare nella parte alta della pagina allorquando una nuova versione si renda disponibile. Il mio server web conserva questi file di log per circa 5 giorni e poi vengono cancellati; non conservo alcun dato sulla connessione tra i controlli di aggiornamenti e gli IP individuali.) +Security_ExplainStats (Attivando questo flag POPFile spedisce una volta al giorno i seguenti tre valori ad uno script su getpopfile.org: bc (il numero totale di cesti che hai), mc (il numero totale di messaggi che POPFile ha classificato) ed ec (il numero totale di errori di classificazione). Questi valori vengono conservati in un file e ne farò uso per pubblicare delle statistiche su come la gente usa POPFile e su come funziona. Il mio server web conserva questi file di log per circa 5 giorni e poi vengono cancellati; non traccio alcuna connessione tra le statistiche e gli IP individuali.) +Security_ExplainUpdate (Attivando questo flag POPFile spedisce una volta al giorno i seguenti tre valori ad uno script su getpopfile.org: ma (il major version number del POPFile che hai installato), mi (il minor version number del POPFile che hai installato) e bn (il build number del POPFile che hai installato). POPFile ne ottiene una risposta nella forma di un grafico che appare nella parte alta della pagina allorquando una nuova versione si renda disponibile. Il mio server web conserva questi file di log per circa 5 giorni e poi vengono cancellati; non conservo alcun dato sulla connessione tra i controlli di aggiornamenti e gli IP individuali.) Security_PasswordTitle Password dell'Interfaccia Utente Security_Password Password Security_PasswordUpdate Password modifica in %s @@ -373,6 +373,6 @@ Imap_WatchedFolder Shutdown_Message POPFile è stato disattivato -Help_Training Quando usi POPFile per la prima volta, non sa niente e necessita di addestramento. POPFile ha bisogno di essere 'allenato' sui messaggi nei vari cesti, l'allenamento si ha quando riclassifichi nel cesto appropriato un messaggio che POPFile ha classificato male. Devi anche settare il tuo client di posta elettronica in modo che filtri i messaggi secondo la classificazione fatta da POPFile. Trovi informazioni su come settare il tuo programma di posta elettronica all'indirizzo POPFile Documentation Project. +Help_Training Quando usi POPFile per la prima volta, non sa niente e necessita di addestramento. POPFile ha bisogno di essere 'allenato' sui messaggi nei vari cesti, l'allenamento si ha quando riclassifichi nel cesto appropriato un messaggio che POPFile ha classificato male. Devi anche settare il tuo client di posta elettronica in modo che filtri i messaggi secondo la classificazione fatta da POPFile. Trovi informazioni su come settare il tuo programma di posta elettronica all'indirizzo POPFile Documentation Project. Help_Bucket_Setup POPFile richiede che ci siano almeno due cesti oltre allo pseudo-cesto 'unclassified'. Quel che rende POPFile unico è che può classificare email distribuendole in un numero qualunque di cesti. Un setup semplice può prevedere i cesti "spam", "personale", and a "lavoro" bucket. Help_No_More Non mostrare più diff -pruN 0.22.4-1.2/languages/Klingon.msg 1.0.1-0ubuntu2/languages/Klingon.msg --- 0.22.4-1.2/languages/Klingon.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Klingon.msg 1970-01-01 01:00:00.000000000 +0100 @@ -1,291 +0,0 @@ -# ------------------------------------------------------------------------------- -# -# POPFile Email Filter App | Copyright (c) 2001-2006 John Graham-Cumming -# Klingon Language dictionary | Translation Beta v1.0 by Ryan Allen (kxmode@yahoo.com) -# -# ------------------------------------------------------------------------------- - - - -# IDENTIFY LANGUAGE AND CHARACTER SET USED IN INTERFACE -# ------------------------------------------------------------------------------- -LanguageCode en -LanguageCharset ISO-8859-1 - - - -# USED TO GET APPROPRIATE SUBDIRECTORY FOR MANUAL -# ------------------------------------------------------------------------------- -ManualLanguage en - - - -# COMMON WORDS USED IN THE U.I. -# ------------------------------------------------------------------------------- -Apply moq -On ghaj -Off Hutlh -TurnOn ghaj HoS -TurnOff Hutlh HoS -Add boq -Remove teq -Previous 'och -Next veb -From Daq -Subject buS -Classification Segh -Reclassify ngep Segh -Undo tI' -Close SoQmoH -Find tu' -Filter Segh -Yes HIja' -No pagh -ChangeToYes choH' HIja' -ChangeToNo choH' pagh -Bucket ngaS -Magnet peQ -Delete Huv -Create chenmoH -To choH' -Total Qav -Rename chu' pong -Request Feature tlhob DuH -Frequency 'Ij yaH -Probability DIch -Score pe''egh -Lookup nej -ID ngu' -RequestFeure ghel DuH - - - -# HEADER -# ------------------------------------------------------------------------------- -Header_Title POP-teywI' SeHlaw (translation search on Google) -Header_Shutdown tlhe' DoH -Header_History qun -Header_Buckets ngaS -Header_Configuration cher -Header_Advanced veb cher -Header_Security Hung -Header_Magnets peQ - - - -# FOOTER -# ------------------------------------------------------------------------------- -Footer_HomePage POP-teywI' juH nav -Footer_Manual potlh teywI' -Footer_Forums ghom ja'chuq -Footer_FeedMe je' jeQ -Footer_RequestFeature ghel DuH -Footer_MailingList ngoqDe' ghom - - - -# CONFIGURATION -# ------------------------------------------------------------------------------- -Configuration_Error1 chev I lu' y'el nIteb nuv -Configuration_Error2 SeHlaw cher Daq lu' mI' joj 1 'ej 65535 -Configuration_Error3 POP3 'Ij Daq lu' mI' joj 1 'ej 65535 -Configuration_Error4 nav ngI' lu' mI' joj 1 'ej 1000 -Configuration_Error5 mI' Hu' 'el leS lu' mI' joj 1 'ej 366 -Configuration_Error6 TCP poH luj lu' mI' joj 10 'ej 300 -Configuration_POP3Port POP3 'Ij Daq -Configuration_POP3Update chu' POP3 Daq %s; choH luj qaS ghorgh SoH juS tagh POP-teywI' -Configuration_Separator mob I -Configuration_SepUpdate choH' wav %s -Configuration_UI SeHlaw cher rar Daq -Configuration_UIUpdate choH' SeHlaw cher rar Daq %s; choH luj qaS ghorgh SoH juS tagh POP-teywI' -Configuration_History mI' 'el nav -Configuration_HistoryUpdate mI' 'el nav %s -Configuration_Days mI' leS qun pol -Configuration_DaysUpdate choH' mI' leS qun %s -Configuration_UserInterface SeHlaw cher -Configuration_Skins yuvtlhe' -Configuration_SkinsChoose woH yuvtlhe' -Configuration_Language Hol -Configuration_LanguageChoose woH Hol -Configuration_ListenPorts 'Ij Daq -Configuration_HistoryView qun tu' -Configuration_TCPTimeout TCP rar poH luj -Configuration_TCPTimeoutSecs TCP rar poH luj lup -Configuration_TCPTimeoutUpdate choH' TCP rar poH luj %s -Configuration_ClassificationInsertion 'el ghItlh boq -Configuration_SubjectLine buS choH -Configuration_XTCInsertion X-Text-Classification Header -Configuration_XPLInsertion X-POPFile-Link Header -Configuration_Logging QonoS -Configuration_None chIm -Configuration_ToScreen HaSta -Configuration_ToFile teywI' -Configuration_ToScreenFile HaSta 'ej teywI' -Configuration_LoggerOutput 'agh QonoS -Configuration_GeneralSkins yuvtlhe' -Configuration_SmallSkins mach yuvtlhe' -Configuration_TinySkins moch mach yuvtlhe' -Configuration_MainTableSummary raS ngaS mI' ghel nav nob chaw' tlhIH nob SeH choH POP-teywI'. -Configuration_InsertionTableSummary raS ngaS SeH 'e' wIv vogh na' Hutlh choH chenmoH nob Dung QIn lurgh ghom'a' 'ul ngoqDe' pupfe chaw' nob 'ul ngoqDe' vay'. - - - -# ADVANCED ERRORS MESSAGES -# ------------------------------------------------------------------------------- -Advanced_Error1 '%s' 'och qImHa' mu' tetlh -Advanced_Error2 'och mu' vang neH ngaS mu' 'ej mI', _, -, @ Doch -Advanced_Error3 '%s' boq qImHa' mu' tetlh -Advanced_Error4 '%s' pagh qImHa' mu' tetlh -Advanced_Error5 '%s' teq Daq pagh mu' tetlh -Advanced_StopWords pagh mu' -Advanced_Message1 POP-teywI' pagh pIj-lo' mu': -Advanced_AddWord boq mu' -Advanced_RemoveWord teq mu' - - - -# HISTORY -# ------------------------------------------------------------------------------- -History_Filter  (neH 'ang ngaS %s) -History_FilterBy Segh -History_Search  (nej Daq/buS %s) -History_Title SaH 'el -History_Jump ghoS 'el -History_ShowAll 'agh Hoch -History_ShouldBe qIt -History_NoFrom Hutlh Daq tlhegh -History_NoSubject Hutlh buS tlhegh -History_ClassifyAs Segh -History_MagnetBecause peQ lo' -History_ChangedTo choH %s -History_Already SaH Segh %s -History_RemoveAll teq Hoch -History_RemovePage teq nav -History_Remove teq ngoqDe' qun 'uy -History_SearchMessage nej Daq/buS -History_NoMessages Hutlh 'el -History_ShowMagnet peQ -History_Magnet  (nIteb 'agh peQ Segh 'el) -History_ResetSearch Huv -History_MainTableSummary raS 'ang HIjwI' 'ej lurgh qen Hev QIn 'ej chaw' nob tagh nej 'ej rebuv. tagh lurgh ghom'a' lu' 'ang naQ QIn mu', ngagh De' buS qatlh Hu' buv Hu'. teq pup' tut chaw' tlhIH nob per ngaS QIn pup' qoD, nob undo 'e' choH. 'HoH' tut chaw' tlhIH nob HoH Hum QIn nob qun tlhIH luj neH 'op. -History_OpenMessageSummary raS ngaS naQ mu' 'ul ngoqDe' QIn, mu' 'e' lo' Segh highlighted rom nob ngaS 'e' Hu' tIn potlh. - - - -# PASSWORD -# ------------------------------------------------------------------------------- -PassWord_Title 'el mu' -PassWord_Enter ghItlh 'el mu' -PassWord_Go tagh! -PassWord_Error1 Hutlh lugh 'el mu' - - - -# SECURITY -# ------------------------------------------------------------------------------- -Security_Error1 Hung Daq lu' mI' joj 1 'ej 65535 -Security_Stealth So' Segh/Daq yo'SeH yaHnIv -Security_NoStealthMode ghItlh (So' Segh) -Security_ExplainStats (chegh POP-teywI' ngeH wa' bem jaj pab wej lo'laHghach nob ghItlh www.usesource.com: bc (Qav mI' ngaS 'e' tlhIH ghaj), mc (Qav mI' 'el 'e' POP-teywI' buv) 'ej ec (Qav mI' Segh Qagh). se Suq 'el teywI' 'ej I lu' lo' nob lIng 'op boS De' buS bey ghom'a' lo' POP-teywI' 'ej bey majQa' Doch Qap. tlhIl Daq Dochs QonoS teywI's nej buS 5 leS 'ej n y Suq teq; I Qotlh yer law' rar joj boS De' 'ej 'eldividual IP Daq.) -Security_ExplainUpdate (chegh POP-teywI' ngeH wa' bem jaj pab wej lo'laHghach nob ghItlh www.usesource.com: ma ( tIn puq poH mI' Hutlh tlhIl 'elstalled POP-teywI'), mI' ( m'elor puq poH mI' Hutlh tlhIl 'elstalled POP-teywI') 'ej bn ( chen mI' Hutlh tlhIl 'elstalled POP-teywI'). POP-teywI' Hev jang 'el nejm HaSta 'e' nargh yor nav chu' puq poH SaH. tlhIl Daq Dochs QonoS teywI's nej buS 5 leS 'ej n y Suq teq; I Qotlh yer law' rar joj chu' nej 'ej 'eldividual IP Daq.) -Security_PasswordTitle SeHlaw 'el mu' -Security_Password 'el mu' -Security_PasswordUpdate chu' 'el mu' nob %s -Security_AUTHTitle Hung 'el mu' 'ol/AUTH -Security_SecureServer Hung Daq -Security_SecureServerUpdate chu' Hung Daq nob %s; choH lu' Hutlh chen vang loS tlhIH tagh POP-teywI' -Security_SecurePort Hung Daq -Security_SecurePortUpdate chu' Daq nob %s; choH lu' Hutlh chen vang loS tlhIH tagh POP-teywI' -Security_POP3 Qochbe' POP3 rars qang Hop mach'eles (poQ POP-teywI' tagh) -Security_UI Qochbe' HTTP (SeHlaw) rars qang Hop mach'eles (poQ POP-teywI' tagh) -Security_UpdateTitle jeQ tagh chu' nej 'elg -Security_Update nej Hoch DaHjaj nej chu' nob POP-teywI' -Security_StatsTitle lI' togh De' -Security_Stats ngeH boS De' Hoch DaHjaj -Security_MainTableSummary raS nob chenmoH SeH 'e' choH Hung natlh choH POP-teywI', vogh neH ra' Hutlh nej chu' nob ghun, 'ej vogh boS De' buS POP-teywI' vang lI' nob Daq HovpoH ghun's ngup Sa' De'. - - - -# MAGNETS -# ------------------------------------------------------------------------------- -Magnet_Error1 peQ '%s' DaH latlh 'el ngaS '%s' -Magnet_Error2 chu' peQ '%s' clashes peQ '%s' 'el ngaS '%s' 'ej calo' Hon ngoQ. chu' peQ Hutlh boq. -Magnet_Error3 chenmoH chu' peQ '%s' 'el ngaS '%s' -Magnet_CurrentMagnets SaH peQ -Magnet_Message1 pab peQ lo' QIn nob reH buv 'elto chuH ngaS. -Magnet_CreateNew chenmoH chu' peQ -Magnet_Explanation wej Segh peQ are SaH:

  • qang Daq pong: vaj: john@company.com nob 'Iq le'be' Daq,
    company.com nob 'Iq Hoch who ngeH qang company.com,
    John Doe nob 'Iq le'be' ghot, John nob 'Iq all Johns
  • nob Daq pong: Like qang: peQ but nej nob: Daq 'el 'ul ngoqDe'
  • lut ghItlh: vaj: ghom nob 'Iq all 'el ghom 'el lut
-Magnet_MagnetType peQ Segh -Magnet_Value lo'laHghach -Magnet_Always Qeq nob ngaS -Magnet_MainTableSummary raS 'ang tetlh peQ 'e' lo' nob ra' Hutlh Segh 'ul ngoqDe' rom nob chut. 'ang 'ar peQ buv, ngaS Hech, 'ej SeH nob HoH peQ. - - - -# BUCKETS -# ------------------------------------------------------------------------------- -Bucket_Error1 ngaS pong ngaS ta'el mu' A nob Z 'el mu' latlh - 'ej _ -Bucket_Error2 ngaS pong %s DaH latlh -Bucket_Error3 chenmoH ngaS pong %s -Bucket_Error4 ghItlh non-blank mu' -Bucket_Error5 chu' pong ngaS %s nob %s -Bucket_Error6 nguv ngaS %s -Bucket_Title qum tu' -Bucket_BucketName ngaS pong -Bucket_WordCount mu' togh -Bucket_WordCounts mu' Qav -Bucket_UniqueWords Hutlh mung nIteb mu' -Bucket_SubjectModification buS choH -Bucket_ChangeColor choH rItlh -Bucket_NotEnoughData Hutlh yap da -Bucket_ClassificationAccuracy Segh DoS -Bucket_EmailsClassified 'ul ngoqDe' buv -Bucket_EmailsClassifiedUpper 'ul ngoqDe' Qum -Bucket_ClassificationErrors Segh Qagh -Bucket_Accuracy DoS -Bucket_ClassificationCount Segh Qav -Bucket_ResetStatistics Huv Dotlh -Bucket_LastReset ret Huv -Bucket_CurrentColor %s SaH rItlh %s -Bucket_SetColorTo Set %s rItlh nob %s -Bucket_Maintenance leH -Bucket_CreateBucket chenmoH ngaS tlhej pong -Bucket_DeleteBucket Huv ngaS pong -Bucket_RenameBucket choH ngaS pong -Bucket_Lookup nej -Bucket_LookupMessage nej mu' ngaS -Bucket_LookupMessage2 nej result nej -Bucket_LookupMostLikely %s tlhoS ghaytan nob nargh 'el %s -Bucket_DoesNotAppear

%s Hutlh nargh 'el law' ngaS -Bucket_DisabledGlobally Hutlh Qap -Bucket_To nob -Bucket_Quarantine nIteb 'ay' -Bucket_MainTableSummary raS nob nej Segh ngaS. 'ang ngaS pong, mu' togh Qav 'e' ngaS, teH mI' QIn qoD ngaS, vogh 'ul ngoqDe''s lurgh ghom'a' lu' choH ghorgh Suqs buv nob 'e' ngaS, vogh nob nID teq jav DoH ghom'a' QIn Hev qoD 'e' ngaS, 'ej raS nob woH col lo' qoD HaSta vay' rap nob 'e' ngaS qoD SeH botlh. -Bucket_StatisticsTableSummary raS nob wej Daq boS De' natlh vang POP-teywI'. wa'Dich 'ar qar Segh, cha'Dich 'ar togh 'ul ngoqDe's ghaj pupen buv, 'ej nob ngaS, 'ej wejDich 'ar togh mu' qoD ngaS, 'ej nuq ghaytan Qav. -Bucket_MaintenanceTableSummary raS ngaS ghel nav 'e' chaw' tlhIH nob chenmoH, HoH ngep pong ngaS, 'ej nob nej mu' qoD Hoch ngaS nob legh ghaytan DuH. -Bucket_AccuracyChartSummary raS HaSta ghaytan DoS 'ul ngoqDe' Segh. -Bucket_BarChartSummary raS HaSta ghaytan Qav 'ay' pIm ngaS. Doch lo' both mI' 'ul ngoqDe's buv, 'ej Qav mu' toghs. -Bucket_LookupResultsSummary raS 'ang 'ay' ngu' vay' nob mu' corpus. ngaS, 'ang nargh 'e' mu' qaS, ghaytan 'e' lu' qaS qoD 'e' ngaS, 'ej natlh ngoQ pe''egh ngaS 'e' mu' yIn qoD 'ul ngoqDe'. -Bucket_WordListTableSummary raS nob tetlh Hoch mu' 'ay' ngaS, 'obe' motlh wa'Dich mu'. - -SingleBucket_Title Detail nej %s -SingleBucket_WordCount ngaS mu' togh -SingleBucket_TotalWordCount Qav mu' togh -SingleBucket_Percentage tlhoS Qav -SingleBucket_WordTable mu' Doch nej %s -SingleBucket_Message1 Hov (*) ghItlh ghaj lo'd nej Segh 'el POP-teywI' Dotlh. 'uy law' mu' nob nej ghaytan Dochs nej Hoch ngaS. -SingleBucket_Unique %s Hutlh mung - - - -# SESSION INFO -# ------------------------------------------------------------------------------- -Session_Title POP-teywI' Dotlh Hegh -Session_Error POP-teywI' Dotlh Hegh. ghaj calo'd tagh 'ej mev POP-teywI' wej mej Hutlh tlhIl browser Qap. 'uy wa' l'elks Dung nob Qap POP-teywI'. - - - -# MISC. -# ------------------------------------------------------------------------------- -Header_MenuSummary raS chIj HIDjolev chaw' naw' nob pIm nav SeH botlh. -Advanced_MainTableSummary raS nob tetlh mu' 'e' POP-teywI' buSHa' ghorgh Segh 'ul ngoqDe' nob ghaytan qaS qoD 'ul ngoqDe' qoD Sa'. Segh pupm rom nob wa'Dich mu'. \ No newline at end of file diff -pruN 0.22.4-1.2/languages/Korean.msg 1.0.1-0ubuntu2/languages/Korean.msg --- 0.22.4-1.2/languages/Korean.msg 2006-02-16 15:36:22.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Korean.msg 2008-04-18 14:49:58.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -183,8 +183,8 @@ Password_Error1 Security_Error1 º¸¾ÈÆ÷Æ®´Â ¹Ýµå½Ã 1ºÎÅÍ 65535»çÀÌÀÇ ¼ýÀÚ¿©¾ß ÇÕ´Ï´Ù. Security_Stealth ½ºÅÚ½º ¸ðµå / ¼­¹ö µ¿ÀÛ Security_NoStealthMode ¾Æ´Ï¿À (½ºÅÚ½º ¸ðµå) -Security_ExplainStats (ÀÌ°ÍÀÌ ÄÑÁö¸é ÆËÆÄÀÏÀº ÇÏ·ç¿¡ Çѹø¾¿ ´ÙÀ½ÀÇ ¼¼°¡Áö °ªÀ» www.usethesource.com¿¡ º¸³À´Ï´Ù - bc (¸¸µå½Å ¹öŶ ¼ö), mc (ÆËÆÄÀÏÀÌ ºÐ·ùÇÑ ¸Þ½ÃÁö ¼ö) and ec (ºÐ·ù ¿À·ù °Ç¼ö). À̰͵éÀº ÆÄÀÏ·Î ÀúÀåµÇ¸ç ÆËÆÄÀÏÀÌ ¾î¶»°Ô »ç¿ëµÇ¸ç ¾ó¸¶³ª Àß ÀÛµ¿ÇÏ´ÂÁö¿¡ °üÇÑ Åë°è¸¦ °øÇ¥ÇÒ¶§ »ç¿ëµË´Ï´Ù. Á¦ À¥¼­¹ö´Â 5ÀÏ°£ ·Î±×ÆÄÀÏÀ» º¸Á¸ÇÏ°í ±× ÈÄ »èÁ¦ÇÕ´Ï´Ù. °³°³ÀÇ IPÁÖ¼Ò¿Í Åë°è °£¿¡ ¾î¶°ÇÑ ¿¬°ü°ü°èµµ ÀúÀåµÇÁö ¾Ê½À´Ï´Ù.) -Security_ExplainUpdate (ÀÌ°ÍÀÌ ÄÑÁö¸é ÆËÆÄÀÏÀº ÇÏ·ç¿¡ Çѹø¾¿ ´ÙÀ½ÀÇ ¼¼°¡Áö °ªÀ» www.usethesource.com¿¡ º¸³À´Ï´Ù - ma (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ¸ÞÀÌÀú ¹öÀü ¹øÈ£), mi (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ¸¶ÀÌ³Ê ¹öÀü ¹øÈ£), bn (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ºôµå ¹øÈ£). ÆËÆÄÀÏÀº »õ ¹öÀüÀÌ ÀÖÀ¸¸é ÆäÀÌÁö ¸Ç À§ÂÊ¿¡ ±×·¡ÇÈ ÇüÅ·Π±× °á°ú¸¦ Ç¥½ÃÇÕ´Ï´Ù. Á¦ À¥¼­¹ö´Â 5ÀÏ°£ ·Î±×ÆÄÀÏÀ» º¸Á¸ÇÏ°í ±× ÈÄ »èÁ¦ÇÕ´Ï´Ù. °³°³ÀÇ IPÁÖ¼Ò¿Í ¾÷µ¥ÀÌÆ® üũ °£¿¡ ¾î¶°ÇÑ ¿¬°ü°ü°èµµ ÀúÀåµÇÁö ¾Ê½À´Ï´Ù.) +Security_ExplainStats (ÀÌ°ÍÀÌ ÄÑÁö¸é ÆËÆÄÀÏÀº ÇÏ·ç¿¡ Çѹø¾¿ ´ÙÀ½ÀÇ ¼¼°¡Áö °ªÀ» getpopfile.org¿¡ º¸³À´Ï´Ù - bc (¸¸µå½Å ¹öŶ ¼ö), mc (ÆËÆÄÀÏÀÌ ºÐ·ùÇÑ ¸Þ½ÃÁö ¼ö) and ec (ºÐ·ù ¿À·ù °Ç¼ö). À̰͵éÀº ÆÄÀÏ·Î ÀúÀåµÇ¸ç ÆËÆÄÀÏÀÌ ¾î¶»°Ô »ç¿ëµÇ¸ç ¾ó¸¶³ª Àß ÀÛµ¿ÇÏ´ÂÁö¿¡ °üÇÑ Åë°è¸¦ °øÇ¥ÇÒ¶§ »ç¿ëµË´Ï´Ù. Á¦ À¥¼­¹ö´Â 5ÀÏ°£ ·Î±×ÆÄÀÏÀ» º¸Á¸ÇÏ°í ±× ÈÄ »èÁ¦ÇÕ´Ï´Ù. °³°³ÀÇ IPÁÖ¼Ò¿Í Åë°è °£¿¡ ¾î¶°ÇÑ ¿¬°ü°ü°èµµ ÀúÀåµÇÁö ¾Ê½À´Ï´Ù.) +Security_ExplainUpdate (ÀÌ°ÍÀÌ ÄÑÁö¸é ÆËÆÄÀÏÀº ÇÏ·ç¿¡ Çѹø¾¿ ´ÙÀ½ÀÇ ¼¼°¡Áö °ªÀ» getpopfile.org¿¡ º¸³À´Ï´Ù - ma (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ¸ÞÀÌÀú ¹öÀü ¹øÈ£), mi (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ¸¶ÀÌ³Ê ¹öÀü ¹øÈ£), bn (¼³Ä¡ÇϽŠÆËÆÄÀÏÀÇ ºôµå ¹øÈ£). ÆËÆÄÀÏÀº »õ ¹öÀüÀÌ ÀÖÀ¸¸é ÆäÀÌÁö ¸Ç À§ÂÊ¿¡ ±×·¡ÇÈ ÇüÅ·Π±× °á°ú¸¦ Ç¥½ÃÇÕ´Ï´Ù. Á¦ À¥¼­¹ö´Â 5ÀÏ°£ ·Î±×ÆÄÀÏÀ» º¸Á¸ÇÏ°í ±× ÈÄ »èÁ¦ÇÕ´Ï´Ù. °³°³ÀÇ IPÁÖ¼Ò¿Í ¾÷µ¥ÀÌÆ® üũ °£¿¡ ¾î¶°ÇÑ ¿¬°ü°ü°èµµ ÀúÀåµÇÁö ¾Ê½À´Ï´Ù.) Security_PasswordTitle »ç¿ëÀÚ ÀÎÅÍÆäÀ̽º ºñ¹Ð¹øÈ£ Security_Password ºñ¹Ð¹øÈ£ Security_PasswordUpdate ºñ¹Ð¹øÈ£¸¦ %s·Î º¯°æÇß½À´Ï´Ù. diff -pruN 0.22.4-1.2/languages/Nederlands.msg 1.0.1-0ubuntu2/languages/Nederlands.msg --- 0.22.4-1.2/languages/Nederlands.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Nederlands.msg 2008-04-18 14:50:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -152,8 +152,8 @@ Password_Error1 Security_Error1 De veilige poort moet een nummer zijn tussen 1 en 65535 Security_Stealth Undercover modus/Server operatie Security_NoStealthMode Nee (Undercover modus) -Security_ExplainStats (als dit aan staat stuurt POPFile één keer per dag de volgende drie waarden naar een script op www.usethesource.com: bc (het aantal bakken dat je hebt), mc (het totaal aantal geclassificeerde berichten door POPFile) en ec (het totaal aantal fouten tijdens classificatie). Deze waarden worden opgeslagen in een bestand en ik zal deze gegevens gebruiken om statistieken te publiceren over hoe mensen POPFile gebruiken en hoe goed het werkt. Mijn web server houdt de log bestanden 5 dagen vast waarna ze verwijderd zullen worden; Ik bewaar geen gegevens over het verband tussen de statistieken en individuele IP adressen.) -Security_ExplainUpdate (als dit aan staat stuurt POPFile één keer per dag de volgende drie waarden naar een script op www.usethesource.com: ma (het grote versie nummer van jouw POPFile installatie), mi (het kleine versie nummer van jouw POPFile installatie) en bn (het bouwnummer van jouw versie van POPFile). POPFile ontvangt in reactie hierop een plaatje dat bovenaan de pagina afgebeeld wordt als er een nieuwe versie van POPFile beschikbaar is. Mijn web server houdt de log bestanden 5 dagen vast waarna ze verwijderd zullen worden; Ik bewaar geen gegevens over het verband tussen de update checks en individuele IP adressen.) +Security_ExplainStats (als dit aan staat stuurt POPFile één keer per dag de volgende drie waarden naar een script op getpopfile.org: bc (het aantal bakken dat je hebt), mc (het totaal aantal geclassificeerde berichten door POPFile) en ec (het totaal aantal fouten tijdens classificatie). Deze waarden worden opgeslagen in een bestand en ik zal deze gegevens gebruiken om statistieken te publiceren over hoe mensen POPFile gebruiken en hoe goed het werkt. Mijn web server houdt de log bestanden 5 dagen vast waarna ze verwijderd zullen worden; Ik bewaar geen gegevens over het verband tussen de statistieken en individuele IP adressen.) +Security_ExplainUpdate (als dit aan staat stuurt POPFile één keer per dag de volgende drie waarden naar een script op getpopfile.org: ma (het grote versie nummer van jouw POPFile installatie), mi (het kleine versie nummer van jouw POPFile installatie) en bn (het bouwnummer van jouw versie van POPFile). POPFile ontvangt in reactie hierop een plaatje dat bovenaan de pagina afgebeeld wordt als er een nieuwe versie van POPFile beschikbaar is. Mijn web server houdt de log bestanden 5 dagen vast waarna ze verwijderd zullen worden; Ik bewaar geen gegevens over het verband tussen de update checks en individuele IP adressen.) Security_PasswordTitle Gebruikers Interface Wachtwoord Security_Password Wachtwoord Security_PasswordUpdate Wachtwoord veranderd naar %s diff -pruN 0.22.4-1.2/languages/Nihongo.msg 1.0.1-0ubuntu2/languages/Nihongo.msg --- 0.22.4-1.2/languages/Nihongo.msg 2006-02-21 14:04:44.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Nihongo.msg 2008-04-18 14:50:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -25,8 +25,11 @@ LanguageDirection ManualLanguage jp -# This is where to find the FAQ on the Wiki -FAQLink JP_FrequentlyAskedQuestions +# These are where to find the documents on the Wiki +WikiLink JP +FAQLink JP:FAQ +RequestFeatureLink JP:RequestFeature +MailingListLink JP:mailing_lists # Common words that are used on their own all over the interface Apply ŬÍÑ @@ -59,7 +62,7 @@ Bucket Magnet ¥Þ¥°¥Í¥Ã¥È Delete ºï½ü Create ºîÀ® -To °¸¤ÆÀè +To °¸Àè Total ¹ç·× Rename ̾Á°Êѹ¹ Frequency ÉÑÅÙ @@ -70,7 +73,7 @@ Word Count ¥«¥¦¥ó¥È Update ¹¹¿· Refresh ºÇ¿·¤Î¾õÂ֤˹¹¿· -FAQ FAQ ½é¿´¼Ô¡¦½é³Ø¼Ô¸þ¤±¤ÎQ&A½¸ +FAQ FAQ ½é¿´¼Ô¡¦½é³Ø¼Ô¸þ¤±¤Î Q&A ½¸ ID ID Date Æü»þ Arrived ¼õ¿®Æü»þ @@ -106,19 +109,19 @@ Header_Magnets Footer_HomePage POPFile ¥Û¡¼¥à¥Ú¡¼¥¸ Footer_Manual ¥Þ¥Ë¥å¥¢¥ë Footer_Forums ¥Õ¥©¡¼¥é¥à -Footer_FeedMe ´óÉÕ +Footer_FeedMe ´óÉÕ(±Ñ¸ì) Footer_RequestFeature Í×˾ Footer_MailingList ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È Footer_Wiki ¥É¥­¥å¥á¥ó¥È -Configuration_Error1 ¶èÀÚ¤êʸ»ú¤Ï1ʸ»ú¤À¤±¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error2 ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error3 POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error4 ¥Ú¡¼¥¸¥µ¥¤¥º¤Ï1¤«¤é1000¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error5 ÍúÎò¤ò»Ä¤¹Æü¿ô¤Ï1¤«¤é366¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error6 TCP ¥¿¥¤¥à¥¢¥¦¥È¤Ï10¤«¤é300¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error7 XML RPC ¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -Configuration_Error8 SOCKS V ¥×¥í¥­¥·¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error1 ¶èÀÚ¤êʸ»ú¤Ï 1 ʸ»ú¤À¤±¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error2 ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error3 POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error4 ¥Ú¡¼¥¸¥µ¥¤¥º¤Ï 1 ¤«¤é 1000 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error5 ÍúÎò¤ò»Ä¤¹Æü¿ô¤Ï 1 ¤«¤é 366 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error6 TCP ¥¿¥¤¥à¥¢¥¦¥È¤Ï 10 ¤«¤é 300 ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error7 XML RPC ¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Configuration_Error8 SOCKS V ¥×¥í¥­¥·¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_POP3Port POP3 ¥Ý¡¼¥ÈÈÖ¹æ Configuration_POP3Update POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_XMLRPCUpdate XML-RPC ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ @@ -130,14 +133,14 @@ Configuration_NNTPUpdate Configuration_POPFork POP3 Ʊ»þÀܳ¤Îµö²Ä Configuration_SMTPFork SMTP Ʊ»þÀܳ¤Îµö²Ä Configuration_NNTPFork NNTP Ʊ»þÀܳ¤Îµö²Ä -Configuration_POP3Separator POP3 ¥Û¥¹¥È̾¡¢¥Ý¡¼¥ÈÈֹ桢¥æ¡¼¥¶Ì¾¤Î¶èÀÚ¤êʸ»ú -Configuration_NNTPSeparator NNTP ¥Û¥¹¥È̾¡¢¥Ý¡¼¥ÈÈֹ桢¥æ¡¼¥¶Ì¾¤Î¶èÀÚ¤êʸ»ú +Configuration_POP3Separator POP3 ¥Û¥¹¥È̾¡¢¥Ý¡¼¥ÈÈֹ桢¥æ¡¼¥¶¡¼Ì¾¤Î¶èÀÚ¤êʸ»ú +Configuration_NNTPSeparator NNTP ¥Û¥¹¥È̾¡¢¥Ý¡¼¥ÈÈֹ桢¥æ¡¼¥¶¡¼Ì¾¤Î¶èÀÚ¤êʸ»ú Configuration_POP3SepUpdate POP3 ¶èÀÚ¤êʸ»ú¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_NNTPSepUpdate NNTP ¶èÀÚ¤êʸ»ú¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_UI ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ Configuration_UIUpdate ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ -Configuration_History 1¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô -Configuration_HistoryUpdate 1¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ +Configuration_History 1 ¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô +Configuration_HistoryUpdate 1 ¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_Days ÍúÎò¤ò»Ä¤¹Æü¿ô Configuration_DaysUpdate ÍúÎò¤ò»Ä¤¹Æü¿ô¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_UserInterface ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ @@ -164,10 +167,10 @@ Configuration_GeneralSkins Configuration_SmallSkins ¾®¥¹¥­¥ó Configuration_TinySkins ºÇ¾®¥¹¥­¥ó Configuration_CurrentLogFile <¸½ºß¤Î¥í¥°¥Õ¥¡¥¤¥ë> -Configuration_SOCKSServer SOCKS V ¥×¥í¥­¥· ¥µ¡¼¥Ð +Configuration_SOCKSServer SOCKS V ¥×¥í¥­¥· ¥µ¡¼¥Ð¡¼ Configuration_SOCKSPort SOCKS V ¥×¥í¥­¥· ¥Ý¡¼¥ÈÈÖ¹æ Configuration_SOCKSPortUpdate SOCKS V ¥×¥í¥­¥·¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ -Configuration_SOCKSServerUpdate SOCKS V ¥×¥í¥­¥·¤Î¥µ¡¼¥Ð¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ +Configuration_SOCKSServerUpdate SOCKS V ¥×¥í¥­¥·¤Î¥µ¡¼¥Ð¡¼¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_Fields ÍúÎò¥¿¥Ö¤Ëɽ¼¨¤¹¤ë¹àÌÜ Advanced_Error1 '%s' ¤Ï´û¤Ë̵»ë¤¹¤ëñ¸ì¤Î¥ê¥¹¥È¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ @@ -182,10 +185,10 @@ Advanced_RemoveWord Advanced_AllParameters POPFile Á´¥Ñ¥é¥á¡¼¥¿¡¼ Advanced_Parameter ¥Ñ¥é¥á¡¼¥¿¡¼ Advanced_Value ÃÍ -Advanced_Warning °Ê²¼¤Ï POPFile ¤ÎÁ´¤Æ¤Î¥Ñ¥é¥á¡¼¥¿¡¼¤Î¥ê¥¹¥È¤Ç¤¹¡£¥¢¥É¥Ð¥ó¥¹¥É¡¦¥æ¡¼¥¶¡¼ÀìÍѤǤ¹¡£ÃͤòÊѹ¹¤·¤Æ¹¹¿·¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£¥Ð¥ê¥Ç¥£¥Æ¥£¡¼¡ÊÂÅÅöÀ­¡Ë¥Á¥§¥Ã¥¯¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ÂÀ»ú¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ë¹àÌܤϥǥե©¥ë¥ÈÀßÄ꤫¤éÊѹ¹¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¡¦¥ê¥Õ¥¡¥ì¥ó¥¹¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ +Advanced_Warning °Ê²¼¤Ï POPFile ¤ÎÁ´¤Æ¤Î¥Ñ¥é¥á¡¼¥¿¡¼¤Î¥ê¥¹¥È¤Ç¤¹¡£¥¢¥É¥Ð¥ó¥¹¥É¡¦¥æ¡¼¥¶¡¼ÀìÍѤǤ¹¡£ÃͤòÊѹ¹¤·¤Æ¹¹¿·¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£¥Ð¥ê¥Ç¥£¥Æ¥£¡¼¡ÊÂÅÅöÀ­¡Ë¥Á¥§¥Ã¥¯¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ÂÀ»ú¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ë¹àÌܤϥǥե©¥ë¥ÈÀßÄ꤫¤éÊѹ¹¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï¡¢¥ª¥×¥·¥ç¥ó¡¦¥ê¥Õ¥¡¥ì¥ó¥¹¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Advanced_ConfigFile ÀßÄê¥Õ¥¡¥¤¥ë: -History_Filter  (%s ¥Ð¥±¥Ä¤Î¤ß¤òɽ¼¨) +History_Filter  (%s ¥Ð¥±¥Ä¤Î¤ß¤òɽ¼¨) History_FilterBy ¥Õ¥£¥ë¥¿¥ê¥ó¥° History_Search  (º¹½Ð¿Í/·ï̾ ¤ò¸¡º÷: %s) History_Title ºÇ¶á¤Î¥á¥Ã¥»¡¼¥¸ @@ -214,7 +217,7 @@ History_ChangedClass History_Purge ¤¹¤°¤Ëºï½ü History_Increase ¹­¤¯ History_Decrease ¶¹¤¯ -History_Column_Characters From¡¢To¡¢Cc¡¢·ï̾Íó¤ÎÉý¤òÊѹ¹ +History_Column_Characters º¹½Ð¿Í¡¢°¸Àè¡¢Cc¡¢·ï̾Íó¤ÎÉý¤òÊѹ¹ History_Automatic ¼«Æ° History_Reclassified ºÆʬÎव¤ì¤Þ¤·¤¿ History_Size_Bytes %d B @@ -226,12 +229,12 @@ Password_Enter Password_Go ¥í¥°¥¤¥ó Password_Error1 ¥Ñ¥¹¥ï¡¼¥É¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ -Security_Error1 ǧ¾Ú¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ +Security_Error1 ǧ¾Ú¥Ý¡¼¥ÈÈÖ¹æ¤Ï 1 ¤«¤é 65535 ¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Security_Stealth ¥¹¥Æ¥ë¥¹¥â¡¼¥É/¥µ¡¼¥Ð¡¼¥ª¥Ú¥ì¡¼¥·¥ç¥ó Security_NoStealthMode ¤¤¤¤¤¨ (¥¹¥Æ¥ë¥¹¥â¡¼¥É) Security_StealthMode (¥¹¥Æ¥ë¥¹¥â¡¼¥É) -Security_ExplainStats (POPFile ¤ÏËèÆü°ì²ó¡¢°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò www.usethesource.com ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: bc (¥Ð¥±¥Ä¤ÎÁí¿ô)¡¢mc (POPFile ¤¬Ê¬Îष¤¿¥á¥Ã¥»¡¼¥¸¤ÎÁí¿ô)¡¢ec (ʬÎ२¥é¡¼¤ÎÁí¿ô)¡£¤³¤ì¤é¤Ï¥Õ¥¡¥¤¥ë¤Ëµ­Ï¿¤µ¤ì¡¢POPFile ¤¬¤É¤Î¤è¤¦¤Ë»ÈÍѤµ¤ì¡¢¤É¤ÎÄøÅ٤θú²Ì¤ò¤¢¤²¤Æ¤¤¤ë¤Î¤«¤ò¼¨¤¹Åý·×¾ðÊó¤È¤·¤Æ¸ø³«¤µ¤»¤Æ¤¤¤¿¤À¤­¤Þ¤¹¡£»ÈÍѤ·¤Æ¤¤¤Þ¤¹ Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤ÎÅý·×Ãͤò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤·¤¿¤ê¤Ï¤¤¤Ã¤µ¤¤¤¤¤¿¤·¤Þ¤»¤ó¡£) -Security_ExplainUpdate (POPFile ¤ÏËèÆü°ì²ó¡¢°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò www.usethesource.com ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: ma (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢mi (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢bn (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Ó¥ë¥ÉÈÖ¹æ)¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤ë¤È¡¢POPFile ¤Ï¤½¤Î¾ðÊó¤ò¼õ¤±¤Æ¥Ú¡¼¥¸¤Î¾åÉô¤Ë¥°¥é¥Õ¥£¥Ã¥¯¤òɽ¼¨¤·¤Æ¤ªÃΤ餻¤·¤Þ¤¹¡£»ÈÍѤ·¤Æ¤¤¤Þ¤¹ Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¹¹¿·¥Á¥§¥Ã¥¯¤Ë»ÈÍѤ·¤¿¥Ç¡¼¥¿¤ò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤·¤¿¤ê¤Ï¤¤¤Ã¤µ¤¤¤¤¤¿¤·¤Þ¤»¤ó¡£) +Security_ExplainStats (¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢POPFile ¤ÏËèÆü°ì²ó°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò getpopfile.org ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: bc (¥Ð¥±¥Ä¤ÎÁí¿ô)¡¢mc (POPFile ¤¬Ê¬Îष¤¿¥á¥Ã¥»¡¼¥¸¤ÎÁí¿ô)¡¢ec (ʬÎ२¥é¡¼¤ÎÁí¿ô)¡£¤³¤ì¤é¤Ï¥Õ¥¡¥¤¥ë¤Ëµ­Ï¿¤µ¤ì¡¢POPFile ¤¬¤É¤Î¤è¤¦¤Ë»ÈÍѤµ¤ì¡¢¤É¤ÎÄøÅ٤θú²Ì¤ò¤¢¤²¤Æ¤¤¤ë¤Î¤«¤ò¼¨¤¹Åý·×¾ðÊó¤È¤·¤Æ¸ø³«¤µ¤»¤Æ¤¤¤¿¤À¤­¤Þ¤¹¡£Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤ÎÅý·×Ãͤò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤¹¤ë¤³¤È¤Ï¤¤¤Ã¤µ¤¤¤¢¤ê¤Þ¤»¤ó¡£) +Security_ExplainUpdate (POPFile ¤ÏËèÆü°ì²ó¡¢°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò getpopfile.org ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: ma (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢mi (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢bn (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Ó¥ë¥ÉÈÖ¹æ)¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤ë¤È¡¢POPFile ¤Ï¤½¤Î¾ðÊó¤ò¼õ¤±¤Æ¥Ú¡¼¥¸¤Î¾åÉô¤Ë¥°¥é¥Õ¥£¥Ã¥¯¤òɽ¼¨¤·¤Æ¤ªÃΤ餻¤·¤Þ¤¹¡£Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¹¹¿·¥Á¥§¥Ã¥¯¤Ë»ÈÍѤ·¤¿¥Ç¡¼¥¿¤ò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤¹¤ë¤³¤È¤Ï¤¤¤Ã¤µ¤¤¤¢¤ê¤Þ¤»¤ó¡£) Security_PasswordTitle ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥Ñ¥¹¥ï¡¼¥É Security_Password ¥Ñ¥¹¥ï¡¼¥É Security_PasswordUpdate ¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤·¤¿ @@ -255,7 +258,7 @@ Security_StatsTitle Security_Stats Åý·×¾ðÊó¤òËèÆüÁ÷¤ë Magnet_Error1 ¥Þ¥°¥Í¥Ã¥È '%s' ¤Ë¤Ï´û¤Ë¥Ð¥±¥Ä '%s' ¤ò³ä¤êÅö¤Æ¤Æ¤¤¤Þ¤¹¡£ -Magnet_Error2 ¿·µ¬¥Þ¥°¥Í¥Ã¥È '%s' ¤Ï´û¤Ë¤¢¤ë¥Þ¥°¥Í¥Ã¥È '%s' (¥Ð¥±¥Ä '%s' ¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹) ¤È¾×Æͤ¹¤ë¤¿¤á¡¢Àµ¤·¤¤½èÍý¤ò¤ª¤³¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¿·µ¬¥Þ¥°¥Í¥Ã¥È¤ÏÄɲä·¤Þ¤»¤ó¤Ç¤·¤¿¡£ +Magnet_Error2 ¿·µ¬¥Þ¥°¥Í¥Ã¥È '%s' ¤Ï´û¤Ë¤¢¤ë¥Þ¥°¥Í¥Ã¥È '%s' (¥Ð¥±¥Ä '%s' ¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹) ¤È¾×Æͤ¹¤ë¤¿¤á¡¢Àµ¤·¤¤½èÍý¤ò¤ª¤³¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¿·µ¬¥Þ¥°¥Í¥Ã¥È¤ÏÄɲ䵤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£ Magnet_Error3 ¿·µ¬¥Þ¥°¥Í¥Ã¥È '%s' ¤Ë¥Ð¥±¥Ä '%s' ¤ò³ä¤êÅö¤Æ¤Þ¤·¤¿¡£ Magnet_CurrentMagnets ¸½ºß¤Î¥Þ¥°¥Í¥Ã¥È Magnet_Message1 ¼¡¤Î¥Þ¥°¥Í¥Ã¥È¤Ë¤è¤ê¡¢¥á¡¼¥ë¤ò¾ï¤ËÆÃÄê¤Î¥Ð¥±¥Ä¤ËʬÎष¤Þ¤¹¡£ @@ -326,6 +329,7 @@ View_WordProbabilities View_WordFrequencies ÉÑÅÙ View_WordScores ÆÀÅÀ View_Chart ʬÎà·èÄê¿Þ +View_DownloadMessage ¥á¥Ã¥»¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É Windows_TrayIcon POPFile ¤Î¥¢¥¤¥³¥ó¤ò Windows ¥·¥¹¥Æ¥à¥È¥ì¥¤¤Ëɽ¼¨¤·¤Þ¤¹¤«¡© Windows_Console POPFile ¤Î¥á¥Ã¥»¡¼¥¸¤ò¥³¥ó¥½¡¼¥ë¥¦¥£¥ó¥É¥¦¤Ë½ÐÎϤ·¤Þ¤¹¤«¡© @@ -349,30 +353,31 @@ Advanced_MainTableSummary Imap_Bucket2Folder '%s' ¥Ð¥±¥Ä¤ËʬÎव¤ì¤¿¥á¡¼¥ë¤Î°ÜÆ°Àè Imap_MapError Ê£¿ô¤Î¥Ð¥±¥Ä¤ò¤Ò¤È¤Ä¤Î¥Õ¥©¥ë¥À¤ËÂбþÉÕ¤±¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£ -Imap_Server IMAP ¥µ¡¼¥Ð ¥Û¥¹¥È̾: -Imap_ServerNameError ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ -Imap_Port IMAP ¥µ¡¼¥Ð ¥Ý¡¼¥ÈÈÖ¹æ: +Imap_Server IMAP ¥µ¡¼¥Ð¡¼ ¥Û¥¹¥È̾: +Imap_ServerNameError ¥µ¡¼¥Ð¡¼¤Î¥Û¥¹¥È̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_Port IMAP ¥µ¡¼¥Ð¡¼ ¥Ý¡¼¥ÈÈÖ¹æ: Imap_PortError Àµ¤·¤¤¥Ý¡¼¥ÈÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ -Imap_Login IMAP ¥¢¥«¥¦¥ó¥È ¥æ¡¼¥¶Ì¾: -Imap_LoginError ¥æ¡¼¥¶Ì¾¡¿¥í¥°¥¤¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_Login IMAP ¥¢¥«¥¦¥ó¥È ¥æ¡¼¥¶¡¼Ì¾: +Imap_LoginError ¥æ¡¼¥¶¡¼Ì¾¡¿¥í¥°¥¤¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ Imap_Password IMAP ¥¢¥«¥¦¥ó¥È¤Î¥Ñ¥¹¥ï¡¼¥É: -Imap_PasswordError ¥µ¡¼¥Ð¤ËÂФ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_PasswordError ¥µ¡¼¥Ð¡¼¤ËÂФ¹¤ë¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ Imap_Expunge ´Æ»ë¥Õ¥©¥ë¥À¤«¤é°ÜÆ°¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë¡£ Imap_Interval ¹¹¿·¤Î´Ö³Ö¡ÊÉáË: -Imap_IntervalError ¹¹¿·´Ö³Ö¤Ï10É䫤é3600Éäδ֤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_IntervalError ¹¹¿·´Ö³Ö¤Ï 10 É䫤é 3600 Éäδ֤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ Imap_Bytelimit ʬÎà¤Î¤¿¤á¤Ë»ÈÍѤ¹¤ë¥á¥Ã¥»¡¼¥¸¤Î¥Ð¥¤¥È¿ô¡£0¡Ê¶õÇò¡Ë¤Î¾ì¹ç¡¢¥á¥Ã¥»¡¼¥¸¤ÎÁ´ÂΤò»ÈÍѤ·¤Þ¤¹: Imap_BytelimitError ¿ô»ú¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ Imap_RefreshFolders ¥Õ¥©¥ë¥À¥ê¥¹¥È¤Î¹¹¿· Imap_Now ¼Â¹Ô -Imap_UpdateError1 ¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó¡£¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ -Imap_UpdateError2 ¥µ¡¼¥Ð¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£¥Û¥¹¥È̾¤È¥Ý¡¼¥ÈÈÖ¹æ¤ò³Îǧ¤¹¤ë¤È¤È¤â¤Ë¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ -Imap_UpdateError3 ¥µ¡¼¥Ð¤ËÀܳ¤¹¤ë¤¿¤á¤Î¾ðÊó¤òÀè¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ -Imap_NoConnectionMessage ¥µ¡¼¥Ð¤ËÀܳ¤¹¤ë¤¿¤á¤Î¾ðÊó¤òÀè¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¤½¤¦¤¹¤ë¤È¡¢¤µ¤é¤Ë¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬ÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ +Imap_UpdateError1 ¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó¡£¥æ¡¼¥¶¡¼Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_UpdateError2 ¥µ¡¼¥Ð¡¼¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£¥Û¥¹¥È̾¤È¥Ý¡¼¥ÈÈÖ¹æ¤ò³Îǧ¤¹¤ë¤È¤È¤â¤Ë¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ +Imap_UpdateError3 ¥µ¡¼¥Ð¡¼¤ËÀܳ¤¹¤ë¤¿¤á¤Î¾ðÊó¤òÀè¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ +Imap_NoConnectionMessage ¥µ¡¼¥Ð¡¼¤ËÀܳ¤¹¤ë¤¿¤á¤Î¾ðÊó¤òÀè¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£¤½¤¦¤¹¤ë¤È¡¢¤µ¤é¤Ë¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬ÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ Imap_WatchMore ´Æ»ë¥Õ¥©¥ë¥À¥ê¥¹¥È¤Ë¥Õ¥©¥ë¥À¤òÄɲà Imap_WatchedFolder ´Æ»ë¥Õ¥©¥ë¥À +Imap_Use_SSL SSL ¤ò»ÈÍѤ¹¤ë Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ -Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢POPFile ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ +Help_Training POPFile ¤ò¤³¤ì¤«¤é»È¤¤»Ï¤á¤ë¾ì¹ç¡¢¤¢¤ëÄøÅ٤Υȥ졼¥Ë¥ó¥°¤¬É¬ÍפȤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢POPFile ¤Ï¤É¤Î¥á¡¼¥ë¤¬É¬Íפʥ᡼¥ë¤Ç¤É¤Î¥á¡¼¥ë¤¬ÉÔÍפʥ᡼¥ë¤«¤Ë¤Ä¤¤¤Æ¤Ê¤Ë¤âÃΤé¤Ê¤¤¤«¤é¤Ç¤¹¡£¥È¥ì¡¼¥Ë¥ó¥°¤Ï¤½¤ì¤¾¤ì¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¡ÊºÇÄã¤Ç¤â£±¤Ä¤Î¥Ð¥±¥Ä¤Ë¤Ä¤¤¤Æ¡¢£±¤Ä°Ê¾å¤Î¥á¥Ã¥»¡¼¥¸¤òºÆʬÎह¤ë¡Ë¡¢POPFile ¤¬Ê¬Îà¤ò´Ö°ã¤¨¤¿¥á¥Ã¥»¡¼¥¸¤òÀµ¤·¤¤¥Ð¥±¥Ä¤ËºÆʬÎह¤ë¡ÊÍúÎò¤Î±¦Â¦¤Ë¤¢¤ë¥á¥Ë¥å¡¼¤«¤éÀµ¤·¤¤Ê¬ÎàÀè¤òÁªÂò¤·¤Æ¡ÖºÆʬÎà¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¡Ë¤³¤È¤Ë¤è¤Ã¤Æ¥È¥ì¡¼¥Ë¥ó¥°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢POPFile ¤¬¹Ô¤Ã¤¿Ê¬Îà¤Ë¤¢¤ï¤»¤Æ¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë¤Ê¤É¡¢¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢POPFile ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ Help_Bucket_Setup POPFile ¤Ç¤Ï¡¢¤â¤È¤â¤È¤¢¤ë "unclassified" ¤È¤¤¤¦²¾ÁÛŪ¤Ê¥Ð¥±¥Ä°Ê³°¤Ë¡¢ºÇÄã¤Ç¤â£²¤Ä¤Î¥Ð¥±¥Ä¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ÎÆÃħ¤Ï¡¢¡Ê¥á¡¼¥ë¤ò spam ¤È¤½¤ì°Ê³°¤ËʬÎह¤ë¤È¤¤¤¦¤À¤±¤Ç¤Ï¤Ê¤¯¡Ë¤¤¤¯¤Ä¤Ç¤â¥Ð¥±¥Ä¤òºîÀ®¤·¡¢¤½¤ì¤é¤Ë¥á¡¼¥ë¤òʬÎह¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤Ç¤¹¡£´Êñ¤ÊÀßÄê¤Ç¤Ï¡¢"spam"¡¢"personal"¡¢"work" ¤È¤¤¤Ã¤¿¥Ð¥±¥Ä¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ Help_No_More ¼¡²ó¤«¤éɽ¼¨¤·¤Ê¤¤¡£ diff -pruN 0.22.4-1.2/languages/Norsk.msg 1.0.1-0ubuntu2/languages/Norsk.msg --- 0.22.4-1.2/languages/Norsk.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Norsk.msg 2008-04-18 14:50:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/languages/Polish.msg 1.0.1-0ubuntu2/languages/Polish.msg --- 0.22.4-1.2/languages/Polish.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Polish.msg 2008-04-18 14:50:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -178,8 +178,8 @@ Password_Error1 Security_Error1 Port musi byæ miêdzy 1 a 65535 Security_Stealth Operacje w trybie niewidocznym Security_NoStealthMode Nie (tryb niewidoczny) -Security_ExplainStats (gdy to jest w³±czone POPFile wysy³a raz dziennie nastêpuj±ce trzy warto¶ci do skryptu na www.usethesource.com: bc (liczba folderów, które posiadasz), mc (liczba klasyfikowanych wiadomo¶ci) i ec (liczba b³êdów klasyfikacji). S± one gromadzone w pliku i wykorzystam je do publikacji o ludziach u¿ywaj±cych POPFile'a i jak on dzia³a. Mój serwer przechowuje dane przez 5 dni a nastêpnie je kasuje; Nie przechowujê ¿adnych danych o adresach IP, itp.) -Security_ExplainUpdate (gdy to jest w³±czone POPFile wysy³a raz dziennie nastêpuj±ce trzy warto¶ci do skryptu na www.usethesource.com: ma (numer wersji POPFile'a), mi (numer podwersji POPFile'a) i bn (numer kompilacji POPFile'a). POPFile otrzymuje graficzn± informacjê na g³ównej stronie je¶li pojawi siê nowa wersja. Mój serwer przechowuje dane przez 5 dni a nastêpnie je kasuje; Nie przechowujê ¿adnych danych o adresach IP, itp.) +Security_ExplainStats (gdy to jest w³±czone POPFile wysy³a raz dziennie nastêpuj±ce trzy warto¶ci do skryptu na getpopfile.org: bc (liczba folderów, które posiadasz), mc (liczba klasyfikowanych wiadomo¶ci) i ec (liczba b³êdów klasyfikacji). S± one gromadzone w pliku i wykorzystam je do publikacji o ludziach u¿ywaj±cych POPFile'a i jak on dzia³a. Mój serwer przechowuje dane przez 5 dni a nastêpnie je kasuje; Nie przechowujê ¿adnych danych o adresach IP, itp.) +Security_ExplainUpdate (gdy to jest w³±czone POPFile wysy³a raz dziennie nastêpuj±ce trzy warto¶ci do skryptu na getpopfile.org: ma (numer wersji POPFile'a), mi (numer podwersji POPFile'a) i bn (numer kompilacji POPFile'a). POPFile otrzymuje graficzn± informacjê na g³ównej stronie je¶li pojawi siê nowa wersja. Mój serwer przechowuje dane przez 5 dni a nastêpnie je kasuje; Nie przechowujê ¿adnych danych o adresach IP, itp.) Security_PasswordTitle Has³o interface'u u¿ytkownika Security_Password Has³o Security_PasswordUpdate Zmieniono has³o na %s diff -pruN 0.22.4-1.2/languages/Portugues-do-Brasil.msg 1.0.1-0ubuntu2/languages/Portugues-do-Brasil.msg --- 0.22.4-1.2/languages/Portugues-do-Brasil.msg 1970-01-01 01:00:00.000000000 +0100 +++ 1.0.1-0ubuntu2/languages/Portugues-do-Brasil.msg 2008-04-18 14:50:02.000000000 +0100 @@ -0,0 +1,379 @@ +# Copyright (c) 2001-2008 John Graham-Cumming +# Translated by Adriano Rafael Gomes +# Updated by Fernando de Alcantara Correia to v0.19.1 +# +# This file is part of POPFile +# +# POPFile is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# POPFile is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with POPFile; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# Identify the language and character set used for the interface +LanguageCode br +LanguageCharset ISO-8859-1 +LanguageDirection ltr + +# This is used to get the appropriate subdirectory for the manual +ManualLanguage br + +# This is where to find the FAQ on the Wiki +FAQLink FAQ + +# Common words that are used on their own all over the interface +Apply Aplicar +ApplyChanges Aplicar Alterações +On Ligado +Off Desligado +TurnOn Ligar +TurnOff Desligar +Add Adicionar +Remove Remover +Previous Anterior +Next Próximo +From De +Subject Assunto +Cc Cc +Classification Balde +Reclassify Reclassificar +Probability Probabilidade +Scores Pontos +QuickMagnets Ímãs Rápidos +Undo Desfazer +Close Fechar +Find Procurar +Filter Filtrar +Yes Sim +No Não +ChangeToYes Trocar para Sim +ChangeToNo Trocar para Não +Bucket Balde +Magnet Ímã +Delete Excluir +Create Criar +To Para +Total Total +Rename Renomear +Frequency Freqüência +Probability Probabilidade +Score Pontuação +Lookup Procurar +Word Palavra +Count Quantidade +Update Alterar +Refresh Atualizar +FAQ FAQ +ID ID +Date Data +Arrived Chegada +Size Tamanho + +# This is a regular expression pattern that is used to convert +# a number into a friendly looking number (for the US and UK this +# means comma separated at the thousands) + +Locale_Thousands . +Locale_Decimal , + +# The Locale_Date uses the format strings in Perl's Date::Format +# module to set the date format for the UI. There are two possible +# ways to specify it. +# +# Just one simple format used for all dates +# | The first format is used for dates less than +# 7 days from now, the second for all other dates + +Locale_Date %a %R | %D %R + +# The header and footer that appear on every UI page +Header_Title Centro de Controle do POPFile +Header_Shutdown Desligar o POPFile +Header_History Histórico +Header_Buckets Baldes +Header_Configuration Configuração +Header_Advanced Avançado +Header_Security Segurança +Header_Magnets Ímãs + +Footer_HomePage POPFile Home Page +Footer_Manual Manual +Footer_Forums Forums +Footer_FeedMe Contribua +Footer_RequestFeature Pedir uma Característica +Footer_MailingList Lista de Email +Footer_Wiki Documentação + +Configuration_Error1 O caracter separador deve ser um único caracter +Configuration_Error2 O porta da interface de usuário deve ser um número entre 1 e 65535 +Configuration_Error3 A porta de escuta POP3 deve ser um número entre 1 e 65535 +Configuration_Error4 O tamanho da página deve ser um número entre 1 e 1000 +Configuration_Error5 O número de dias no histórico deve ser um número entre 1 e 366 +Configuration_Error6 O tempo limite TCP deve ser um número entre 10 e 300 +Configuration_Error7 A porta de escuta XML-RPC deve ser um número entre 1 e 65535 +Configuration_Error8 A porta do proxy SOCKS V deve ser um número entre 1 e 65535 +Configuration_POP3Port Porta de escuta POP3 +Configuration_POP3Update A porta POP3 foi alterada para %s; esta alteração não terá efeito até que você reinicie o POPFile +Configuration_XMLRPCUpdate A porta XML-RPC foi alterada para %s; esta alteração não terá efeito até que você reinicie o POPFile +Configuration_XMLRPCPort Porta de escuta XML-RPC +Configuration_SMTPPort Porta de escuta SMTP +Configuration_SMTPUpdate A porta SMTP foi alterada para %s; esta alteração não terá efeito até que você reinicie o POPFile +Configuration_NNTPPort Porta de escuta NNTP +Configuration_NNTPUpdate A porta NNTP foi alterada para %s; esta alteração não terá efeito até que você reinicie o POPFile +Configuration_POPFork Permitir conexões POP3 concorrentes +Configuration_SMTPFork Permitir conexões SMTP concorrentes +Configuration_NNTPFork Permitir conexões NNTP concorrentes +Configuration_POP3Separator Caracter de separação POP3 servidor:porta:usuário +Configuration_NNTPSeparator Caracter de separação NNTP servidor:porta:usuário +Configuration_POP3SepUpdate Separador POP3 alterado para %s +Configuration_NNTPSepUpdate Separador NNTP alterado para %s +Configuration_UI Porta da interface web de usuário +Configuration_UIUpdate Alterada a porta da interface web de usuário para %s; esta alteração não terá efeito até que você reinicie o POPFile +Configuration_History Número de mensagens por página +Configuration_HistoryUpdate Alterado o número de mensagens por página para %s +Configuration_Days Número de dias para manter no histórico +Configuration_DaysUpdate Alterado o número de dias para manter no histórico para %s +Configuration_UserInterface Interface de Usuário +Configuration_Skins Skins +Configuration_SkinsChoose Escolha o skin +Configuration_Language Linguagem +Configuration_LanguageChoose Escolha a linguagem +Configuration_ListenPorts Opções de Módulo +Configuration_HistoryView Exibir Histórico +Configuration_TCPTimeout Tempo Limite de Conexão +Configuration_TCPTimeoutSecs Tempo limite de conexão em segundos +Configuration_TCPTimeoutUpdate Alterado o tempo limite de conexão para %s +Configuration_ClassificationInsertion Inserção de Texto na Mensagem +Configuration_SubjectLine Modificação de
linha de assunto +Configuration_XTCInsertion Cabeçalho
X-Text-Classification +Configuration_XPLInsertion Cabeçalho
X-POPFile-Link +Configuration_Logging Logging +Configuration_None Nada +Configuration_ToScreen Na Tela (console) +Configuration_ToFile Em Arquivo +Configuration_ToScreenFile Na Tela e em Arquivo +Configuration_LoggerOutput Saída do Logger +Configuration_GeneralSkins Skins +Configuration_SmallSkins Small Skins +Configuration_TinySkins Tiny Skins +Configuration_CurrentLogFile <Exibir arquivo de log atual> +Configuration_SOCKSServer Endereço do proxy SOCKS V +Configuration_SOCKSPort Porta do proxy SOCKS V +Configuration_SOCKSPortUpdate Alterada a porta do proxy SOCKS V para %s +Configuration_SOCKSServerUpdate Alterado o endereço do proxy SOCKS V para %s +Configuration_Fields Colunas do Histórico + +Advanced_Error1 '%s' já está na lista de Palavras Ignoradas +Advanced_Error2 Palavras ignoradas podem somente conter caracteres alfanuméricos, ., _, -, ou @ +Advanced_Error3 '%s' adicionado na lista de Palavras Ignoradas +Advanced_Error4 '%s' não está na lista de Palavras Ignoradas +Advanced_Error5 '%s' removido da lista de Palavras Ignoradas +Advanced_StopWords Palavras Ignoradas +Advanced_Message1 O POPFile ignora as seguintes palavras freqüentemente usadas: +Advanced_AddWord Adicionar palavra +Advanced_RemoveWord Remover palavra +Advanced_AllParameters Todos os Parâmetros do POPFile +Advanced_Parameter Parâmetro +Advanced_Value Valor +Advanced_Warning Esta é a lista completa dos parâmetros do POPFile. Somente para usuários avançados: você pode alterar qualquer um e clicar em Alterar; não há verificação de validade. Ítens em negrito estão diferentes da configuração padrão. Veja OptionReference para mais informação sobre as opções. +Advanced_ConfigFile Arquivo de configuração: + +History_Filter  (apenas mostrando o balde %s) +History_FilterBy Filtrar Por +History_Search  (procurado por remetente/assunto %s) +History_Title Mensagens Recentes +History_Jump Ir para a página +History_ShowAll Exibir Tudo +History_ShouldBe Deveria ser +History_NoFrom sem linha de +History_NoSubject sem linha de assunto +History_ClassifyAs Classificar como +History_MagnetUsed Ímã usado +History_MagnetBecause Ímã Utilizado

Classificado para %s por causa do ímã %s

+History_ChangedTo Alterado para %s +History_Already Reclassificado como %s +History_RemoveAll Remover Tudo +History_RemovePage Remover a Página +History_RemoveChecked Remover Marcados +History_Remove Para remover entradas do histórico clique +History_SearchMessage Procurar Remetente/Assunto +History_NoMessages Nenhuma mensagem +History_ShowMagnet magnetizado +History_Negate_Search Inverter procura/filtro +History_Magnet  (mostrando apenas mensagens classificadas por ímã) +History_NoMagnet  (mostrando apenas mensagens não classificadas por ímã) +History_ResetSearch Limpar +History_ChangedClass Deveria classificar agora como +History_Purge Expirar Agora +History_Increase Incrementar +History_Decrease Decrementar +History_Column_Characters Alterar a largura das colunas De, Para, Cc e Assunto +History_Automatic Automático +History_Reclassified Reclassificado +History_Size_Bytes %d B +History_Size_KiloBytes %.1f KB +History_Size_MegaBytes %.1f MB + +Password_Title Senha +Password_Enter Digite a senha +Password_Go Ir! +Password_Error1 Senha incorreta + +Security_Error1 A porta deve ser um número entre 1 e 65535 +Security_Stealth Modo Stealth/Operação Servidor +Security_NoStealthMode Não (Modo Stealth) +Security_StealthMode (Modo Stealth) +Security_ExplainStats (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em getpopfile.org: bc (o número total de baldes que você tem), mc (o número total de mensagens que o POPFile classificou) e ec (o número total de erros de classificação). Isto fica guardado em um arquivo e eu vou usar para publicar algumas estatísticas sobre como as pessoas usam o POPFile e o quão bem ele funciona. Meu servidor web mantém seus arquivos de log por mais ou menos 5 dias e então os deleta; eu não estou guardando nenhuma conexão entre as estatístcas e os endereços IP de cada um.) +Security_ExplainUpdate (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em getpopfile.org: ma (o número maior da versão do seu POPFile), mi (o número menor da versão do seu POPFile) e bn (o número do build da sua versão do POPFile). O POPFile recebe uma resposta na forma de um gráfico que aparece no topo da página se uma nova versão estiver disponível. Meu servidor web mantém seus arquivos de log por mais ou menos 5 dias e então os deleta; eu não estou guardando nenhuma conexão entre as verificações de versão e os endereços IP de cada um.) +Security_PasswordTitle Senha da Interface de Usuário +Security_Password Senha +Security_PasswordUpdate Alterada a senha +Security_AUTHTitle Servidores Remotos +Security_SecureServer Servidor POP3 remoto (SPA/AUTH ou proxy transparente) +Security_SecureServerUpdate Alterado o servidor POP3 remoto para %s +Security_SecurePort Porta POP3 remota (SPA/AUTH ou proxy transparente) +Security_SecurePortUpdate Alterada a porta do servidor POP3 remoto para %s +Security_SMTPServer Servidor da cadeia SMTP +Security_SMTPServerUpdate Alterado o servidor da cadeia SMTP para %s; esta alteração não terá efeito até que você reinicie o POPFile +Security_SMTPPort Porta da cadeia SMTP +Security_SMTPPortUpdate Alterada a porta da cadeia SMTP para %s; esta alteração não terá efeito até que você reinicie o POPFile +Security_POP3 Aceitar conexões POP3 de máquinas remotas (requer reiniciar o POPFile) +Security_SMTP Aceitar conexões SMTP de máquinas remotas (requer reiniciar o POPFile) +Security_NNTP Aceitar conexões NNTP de máquinas remotas (requer reiniciar o POPFile) +Security_UI Aceitar conexões HTTP (Interface de Usuário) de máquinas remotas (requer reiniciar o POPFile) +Security_XMLRPC Aceitar conexões XML-RPC de máquinas remotas (requer reiniciar o POPFile) +Security_UpdateTitle Verificação Automática de Atualização +Security_Update Verificar diariamente atualizações para o POPFile +Security_StatsTitle Reportar Estatísticas +Security_Stats Enviar estatísticas diariamente + +Magnet_Error1 Ímã '%s' já existe no balde '%s' +Magnet_Error2 O novo ímã '%s' conflita com o ímã '%s' no balde '%s' e pode causar resultados ambíguos. O novo ímã não foi adicionado. +Magnet_Error3 Criar novo ímã '%s' no balde '%s' +Magnet_CurrentMagnets Ímãs Atuais +Magnet_Message1 Os seguintes ímãs fazem as mensagens serem sempre classificadas no balde especificado. +Magnet_CreateNew Criar Novo Ímã +Magnet_Explanation Estes tipos de ímã estão disponíveis:
  • Endereço ou nome do remetente: Por exemplo: fulano@empresa.com para pegar um endereço específico,
    empresa.com para pegar todo mundo que envia de empresa.com,
    Fulano de Tal para pegar uma pessoa específica, Fulano para pegar todos os Fulanos.
  • Endereço ou nome de destinatário/cópia: Como um ímã de remetente mas para o endereço Para:/Cc: de uma mensagem.
  • Palavras no assunto: Por exemplo: olá para pegar todas as mensagens com olá no assunto.
+Magnet_MagnetType Tipo do ímã +Magnet_Value Valores +Magnet_Always Sempre vai para o balde +Magnet_Jump Ir para a página de ímãs + +Bucket_Error1 Nomes de balde somente podem conter as letras de a até z minúsculas, números de 0 a 9, mais - e _ +Bucket_Error2 O balde %s já existe +Bucket_Error3 Criado o balde %s +Bucket_Error4 Por favor digite uma palavra que não seja em branco +Bucket_Error5 Renomeado o balde %s para %s +Bucket_Error6 Excluído o balde %s +Bucket_Title Configuração do Balde +Bucket_BucketName Nome do
Balde +Bucket_WordCount Contagem de Palavras +Bucket_WordCounts Contagens de Palavras +Bucket_UniqueWords Palavras Distintas +Bucket_SubjectModification Modificação do
Cabeçalho Assunto +Bucket_ChangeColor Cor do
Balde +Bucket_NotEnoughData Dados insuficientes +Bucket_ClassificationAccuracy Precisão da Classificação +Bucket_EmailsClassified Mensagens classificadas +Bucket_EmailsClassifiedUpper Mensagens Classificadas +Bucket_ClassificationErrors Erros de classificação +Bucket_Accuracy Precisão +Bucket_ClassificationCount Contagem da Classificação +Bucket_ClassificationFP Falsos Positivos +Bucket_ClassificationFN Falsos Negativos +Bucket_ResetStatistics Reiniciar Estatísticas +Bucket_LastReset Último Reinício +Bucket_CurrentColor A cor atual de %s é %s +Bucket_SetColorTo Ajustar a cor de %s para %s +Bucket_Maintenance Manutenção +Bucket_CreateBucket Criar balde com o nome +Bucket_DeleteBucket Excluir o balde chamado +Bucket_RenameBucket Renomear o balde chamado +Bucket_Lookup Procurar +Bucket_LookupMessage Procurar por palavra nos baldes +Bucket_LookupMessage2 Procurar no resultado por +Bucket_LookupMostLikely %s é mais provável de aparecer em %s +Bucket_DoesNotAppear

%s não aparece em nenhum dos baldes +Bucket_DisabledGlobally Desabilitado globalmente +Bucket_To para +Bucket_Quarantine Mensagem de
Quarentena + +SingleBucket_Title Detalhes para %s +SingleBucket_WordCount Contagem de palavras do balde +SingleBucket_TotalWordCount Contagem total de palavras +SingleBucket_Percentage Percentual do total +SingleBucket_WordTable Tabela de Palavras para %s +SingleBucket_Message1 Clique em uma letra no índice para ver a lista de palavras que começam com tal letra. Clique em qualquer palavra para procurar sua probabilidade para todos os baldes. +SingleBucket_Unique %s distinta +SingleBucket_ClearBucket Remover Todas Palavras + +Session_Title Sessão do POPFile Expirada +Session_Error A sua sessão do POPFile expirou. Isto pode ter sido causado por iniciar e parar o POPFile mas deixando o navegador web aberto. Por favor clique em um dos atalhos acima para continuar a usar o POPFile. + +View_Title Visão de Única Mensagem +View_ShowFrequencies Exibir freqüência das palavras +View_ShowProbabilities Exibir probabilidade das palavras +View_ShowScores Exibir pontuação das palavras e gráfico de decisão +View_WordMatrix Matriz de palavras +View_WordProbabilities exibindo probabilidade das palavras +View_WordFrequencies exibindo freqüência das palavras +View_WordScores exibindo pontuação das palavras +View_Chart Gráfico de Decisão + +Windows_TrayIcon Exibir o ícone do POPFile na bandeja do sistema? +Windows_Console Executar o POPFile em uma janela de console? +Windows_NextTime

Esta alteração não terá efeito até que você reinicie o POPFile + +Header_MenuSummary Esta tabela é o menu de navegação que possibilita acesso a cada uma das diferentes páginas do centro de controle. +History_MainTableSummary Esta tabela mostra o remetente e o assunto das mensagens recebidas recentemente e permite que elas sejam revisadas e reclassificadas. Clicar na linha de assunto vai mostrar o texto inteiro da mensagem, juntamente com informação sobre por que ela foi classificada como o foi. A coluna 'Deveria ser' permite que você especifique a que balde a mensagem pertence, ou desfazer esta mudança. A coluna 'Remover' permite que você exclua mensagens específicas do histórico se você não precisar mais delas. +History_OpenMessageSummary Esta tabela contém o texto integral de uma mensagem, com as palavras que são usadas para classificação destacadas de acordo com o balde que foi mais relevante para elas. +Bucket_MainTableSummary Esta tabela fornece uma visão geral dos baldes de classificação. Cada linha mostra o nome do balde, a contagem total de palavras para aquele balde, o número real de palavras individuais em cada balde, se o assunto da mensagem vai ser modificado quando ele for classificado para aquele balde, se as mensagens recebidas naquele balde devem ficar em quarentena, e uma tabela para escolher a cor usada para mostrar qualquer coisa relacionada àquele balde no centro de controle. +Bucket_StatisticsTableSummary Esta tabela fornece três conjuntos de estatísticas sobre o desempenho geral do PopFile. A primeira é a exatidão da classificação, a segunda é quantas mensagens foram classificadas, e para quais baldes, e a terceira é quantas palavras existem em cada balde, e as suas porcentagens relativas. +Bucket_MaintenanceTableSummary Esta tabela contém formulários que permitem que você crie, exclua ou renomeie baldes, e para procurar uma palavra em todos os baldes e ver as suas probabilidades relativas. +Bucket_AccuracyChartSummary Esta tabela representa graficamente a exatidão da classificação de mensagens. +Bucket_BarChartSummary Esta tabela representa graficamente a uma alocação porcentual para cada um dos diferentes baldes. Ela é usada tanto para o número de mensagens classificadas como para o número total de palavras. +Bucket_LookupResultsSummary Esta tabela mostra as probabilidades associadas com qualquer palavra específica do corpus. Para cada balde, ela mostra a freqüência com que cada palavra ocorre, a probabilidade de que ela ocorra naquele balde, e o efeito geral na pontuação do balde se aquela palavra existir em uma mensagem. +Bucket_WordListTableSummary Esta tabela fornece uma relação de todas as palavras para um balde específico, organizada pela primeira letra comum para cada linha. +Magnet_MainTableSummary Esta tabela mostra a lista de ímãs que são usados para classificar automaticamente mensagens de acordo com regras fixas. Cada linha mostra como o ímã está definido, para qual balde ele foi concebido, e um botão para excluir aquele ímã. +Configuration_MainTableSummary Esta tabela contém alguns formulários que permitem que você controle a configuração do PopFile. +Configuration_InsertionTableSummary Esta tabela contém botões para determinar se certas modificações são feitas no cabeçalho ou no assunto da mensagem antes que ela seja encaminhada para o programa cliente de mensagens. +Security_MainTableSummary Esta tabela fornece conjuntos de controles que afetam a segurança da configuração geral do PopFile, se ele deve procurar automaticamente por atualizações do programa, e se estatísticas sobre o desempenho do PopFile devem ser enviadas ao banco de dados central do autor do programa para informação geral. +Advanced_MainTableSummary Esta tabela fornece uma lista de palavras que o PopFile ignora quando classifica mensagens por causa da sua freqüência relativa nas mensagens em geral. Elas são organizadas por linha de acordo com a primeira letra das palavras. + +Imap_Bucket2Folder Email para o balde '%s' vai para a pasta +Imap_MapError Você não pode mapear mais de um balde para uma única pasta! +Imap_Server Nome do servidor IMAP: +Imap_ServerNameError Por favor informe o nome do servidor! +Imap_Port Porta do servidor IMAP: +Imap_PortError Por favor informe um número de porta válido! +Imap_Login Conta de login IMAP: +Imap_LoginError Por favor informe um nome de usuário/login! +Imap_Password Senha para a conta IMAP: +Imap_PasswordError Por favor informe uma senha para o servidor! +Imap_Expunge Expurgar mensagens deletadas de pastas em observação. +Imap_Interval Intervalo de atualização em segundos: +Imap_IntervalError Por favor informe um intervalo entre 10 e 3600 segundos. +Imap_Bytelimit Bytes por mensagem para usar para classificação. Informe 0 (Nulo) para usar a mensagem completa: +Imap_BytelimitError Por favor informe um número. +Imap_RefreshFolders Atualizar a lista de pastas +Imap_Now agora! +Imap_UpdateError1 Não é possível logar. Verifique seu nome de usuário e senha, por favor. +Imap_UpdateError2 Falha na conexão ao servidor. Por favor verifique o nome e porta do servidor e certifique-se que você está online. +Imap_UpdateError3 Por favor configure os detalhes da conexão primeiro. +Imap_NoConnectionMessage Por favor configure os detalhes da conexão primeiro. Depois disto, mais opções estarão disponíveis nesta página. +Imap_WatchMore uma pasta para lista de pastas em observação +Imap_WatchedFolder Pasta em observação nº + +Shutdown_Message O POPFile foi desligado + +Help_Training Quando você usa o POPFile pela primeira vez, ele ainda não sabe nada e precisa de treinamento. O POPFile requer treinamento nas mensagens para cada balde, e o treinamento acontece quando você reclassifica para o balde correto uma mensagem que o POPFile classificou incorretamente. Você deve também configurar seu cliente de email para filtrar mensagens baseado na classificação do POPFile. Informação para configurar os filtros no seu cliente de email pode ser encontrado no Projeto de Documentação do POPFile. +Help_Bucket_Setup O POPFile requer pelo menos dois baldes além do pseudo-balde "unclassified". O que torna o POPFile único é que ele pode classificar email, mais do que isso, você pode ter qualquer número de baldes. Uma configuração simples poderia ser um balde "spam", "pessoal", e um balde "trabalho". +Help_No_More Não mostre isto novamente diff -pruN 0.22.4-1.2/languages/Portugues.msg 1.0.1-0ubuntu2/languages/Portugues.msg --- 0.22.4-1.2/languages/Portugues.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Portugues.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -179,8 +179,8 @@ Password_Error1 Security_Error1 A porta segura deve ser um número entre 1 e 65535 Security_Stealth Modo Stealth/Operação Servidor Security_NoStealthMode Não (Modo Stealth) -Security_ExplainStats (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em www.usethesource.com: bc (o número total de receptáculos que você tem), mc (o número total de mensagens que o POPFile classificou) e ec (o número total de erros de classificação). Isto fica guardado num arquivo que eu vou usar para publicar algumas estatísticas sobre como as pessoas usam o POPFile e o quão bem ele funciona. O meu servidor web mantém o seus arquivos de log por mais ou menos 5 dias antes de os apagar; Eu não guardo nenhuma ligação entre as estatístcas e os endereços IP de cada um.) -Security_ExplainUpdate (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em www.usethesource.com: ma (o número maior da versão do seu POPFile), mi (o número menor da versão do seu POPFile) and bn (o número do build da sua versão do POPFile). O POPFile recebe uma resposta na forma de um gráfico que aparece no topo da página se uma nova versão estiver disponível. Meu servidor web mantém seus arquivos de log por mais ou menos 5 antes de os apagar; Eu não guardo nenhuma ligação entre as verificações de versão e os endereços IP de cada um.) +Security_ExplainStats (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em getpopfile.org: bc (o número total de receptáculos que você tem), mc (o número total de mensagens que o POPFile classificou) e ec (o número total de erros de classificação). Isto fica guardado num arquivo que eu vou usar para publicar algumas estatísticas sobre como as pessoas usam o POPFile e o quão bem ele funciona. O meu servidor web mantém o seus arquivos de log por mais ou menos 5 dias antes de os apagar; Eu não guardo nenhuma ligação entre as estatístcas e os endereços IP de cada um.) +Security_ExplainUpdate (Com isto ligado o POPFile envia uma vez por dia os seguintes três valores para um script em getpopfile.org: ma (o número maior da versão do seu POPFile), mi (o número menor da versão do seu POPFile) and bn (o número do build da sua versão do POPFile). O POPFile recebe uma resposta na forma de um gráfico que aparece no topo da página se uma nova versão estiver disponível. Meu servidor web mantém seus arquivos de log por mais ou menos 5 antes de os apagar; Eu não guardo nenhuma ligação entre as verificações de versão e os endereços IP de cada um.) Security_PasswordTitle Senha da Interface de utilizador Security_Password Senha Security_PasswordUpdate Alterada a senha para %s diff -pruN 0.22.4-1.2/languages/Russian.msg 1.0.1-0ubuntu2/languages/Russian.msg --- 0.22.4-1.2/languages/Russian.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Russian.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -163,8 +163,8 @@ Password_Error1 Security_Error1 îÏÍÅÒ ÂÅÚÏÐÁÓÎÏÇÏ ÐÏÒÔÁ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ ÏÔ 1 ÄÏ 65535 Security_Stealth òÅÖÉÍ ÎÅ×ÉÄÉÍÏÓÔÉ/îÁÓÔÒÏÊËÁ ÓÅÒ×ÅÒÁ Security_NoStealthMode îÅÔ (ÒÅÖÉÍ ÎÅ×ÉÄÉÍÏÓÔÉ) -Security_ExplainStats (åÓÌÉ ×ËÌÀÞÅÎÏ, POPFile ÒÁÚ × ÄÅÎØ ÂÕÄÅÔ ÏÔÐÒÁ×ÌÑÔØ ÓËÒÉÐÔÕ ÎÁ www.usethesource.com ÔÒÉ ÞÉÓÌÁ: bc (ÞÉÓÌÏ ×ÁÛÉÈ ×£ÄÅÒ), mc (ÓËÏÌØËÏ ÐÉÓÅÍ ÂÙÌÏ ËÌÁÓÓÉÆÉÃÉÒÏ×ÁÎÏ Ó ÐÏÍÏÝØÀ POPFile) É ec (ÞÉÓÌÏ ÏÛÉÂÏË ËÌÁÓÓÉÆÉËÁÃÉÉ). üÔÉ ÚÎÁÞÅÎÉÑ ÓÏÈÒÁÎÑÔÓÑ × ÆÁÊÌÅ É Á×ÔÏÒ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ ÄÌÑ ÏÐÕÂÌÉËÏ×ÁÎÉÑ ÓÔÁÔÉÓÔÉÞÅÓËÉÈ ÄÁÎÎÙÈ Ï ÔÏÍ, ËÁË ÉÓÐÏÌØÚÕÅÔÓÑ POPFile É ÎÁÓËÏÌØËÏ ÈÏÒÏÛÏ ÏÎ ÒÁÂÏÔÁÅÔ. ÷ÅÂ-ÓÅÒ×ÅÒ Á×ÔÏÒÁ ÈÒÁÎÉÔ ÌÏÇÉ × ÔÅÞÅÎÉÅ 5 ÄÎÅÊ, ÐÏÓÌÅ ÞÅÇÏ ÏÎÉ ÕÄÁÌÑÀÔÓÑ, Á×ÔÏÒ ÎÅ ÚÁÎÉÍÁÅÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅÍ ÓÔÁÔÉÓÔÉËÉ É IP-ÁÄÒÅÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ.) -Security_ExplainUpdate (åÓÌÉ ×ËÌÀÞÅÎÏ, POPFile ÒÁÚ × ÄÅÎØ ÂÕÄÅÔ ÏÔÐÒÁ×ÌÑÔØ ÓËÒÉÐÔÕ ÎÁ www.usethesource.com ÔÒÉ ÞÉÓÌÁ: ma (ÓÔÁÒÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ POPFile), mi (ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ) É bn (ÎÏÍÅÒ ÓÂÏÒËÉ). POPFile ÐÏÌÕÞÉÔ ÏÔ×ÅÔ ÏÔ ÓÅÒ×ÅÒÁ × ×ÉÄÅ ËÁÒÔÉÎËÉ, ËÏÔÏÒÁÑ ÐÏÑ×ÉÔÓÑ ××ÅÒÈÕ ÓÔÒÁÎÉÃÙ, ÅÓÌÉ ÄÏÓÔÕÐÎÁ ÎÏ×ÁÑ ×ÅÒÓÉÑ. ÷ÅÂ-ÓÅÒ×ÅÒ Á×ÔÏÒÁ ÈÒÁÎÉÔ ÌÏÇÉ × ÔÅÞÅÎÉÅ 5 ÄÎÅÊ, ÐÏÓÌÅ ÞÅÇÏ ÏÎÉ ÕÄÁÌÑÀÔÓÑ, Á×ÔÏÒ ÎÅ ÚÁÎÉÍÁÅÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅÍ ÚÁÐÒÏÓÏ× Ï ÏÂÎÏ×ÌÅÎÉÉ É IP-ÁÄÒÅÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ.) +Security_ExplainStats (åÓÌÉ ×ËÌÀÞÅÎÏ, POPFile ÒÁÚ × ÄÅÎØ ÂÕÄÅÔ ÏÔÐÒÁ×ÌÑÔØ ÓËÒÉÐÔÕ ÎÁ getpopfile.org ÔÒÉ ÞÉÓÌÁ: bc (ÞÉÓÌÏ ×ÁÛÉÈ ×£ÄÅÒ), mc (ÓËÏÌØËÏ ÐÉÓÅÍ ÂÙÌÏ ËÌÁÓÓÉÆÉÃÉÒÏ×ÁÎÏ Ó ÐÏÍÏÝØÀ POPFile) É ec (ÞÉÓÌÏ ÏÛÉÂÏË ËÌÁÓÓÉÆÉËÁÃÉÉ). üÔÉ ÚÎÁÞÅÎÉÑ ÓÏÈÒÁÎÑÔÓÑ × ÆÁÊÌÅ É Á×ÔÏÒ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ ÄÌÑ ÏÐÕÂÌÉËÏ×ÁÎÉÑ ÓÔÁÔÉÓÔÉÞÅÓËÉÈ ÄÁÎÎÙÈ Ï ÔÏÍ, ËÁË ÉÓÐÏÌØÚÕÅÔÓÑ POPFile É ÎÁÓËÏÌØËÏ ÈÏÒÏÛÏ ÏÎ ÒÁÂÏÔÁÅÔ. ÷ÅÂ-ÓÅÒ×ÅÒ Á×ÔÏÒÁ ÈÒÁÎÉÔ ÌÏÇÉ × ÔÅÞÅÎÉÅ 5 ÄÎÅÊ, ÐÏÓÌÅ ÞÅÇÏ ÏÎÉ ÕÄÁÌÑÀÔÓÑ, Á×ÔÏÒ ÎÅ ÚÁÎÉÍÁÅÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅÍ ÓÔÁÔÉÓÔÉËÉ É IP-ÁÄÒÅÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ.) +Security_ExplainUpdate (åÓÌÉ ×ËÌÀÞÅÎÏ, POPFile ÒÁÚ × ÄÅÎØ ÂÕÄÅÔ ÏÔÐÒÁ×ÌÑÔØ ÓËÒÉÐÔÕ ÎÁ getpopfile.org ÔÒÉ ÞÉÓÌÁ: ma (ÓÔÁÒÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ POPFile), mi (ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ) É bn (ÎÏÍÅÒ ÓÂÏÒËÉ). POPFile ÐÏÌÕÞÉÔ ÏÔ×ÅÔ ÏÔ ÓÅÒ×ÅÒÁ × ×ÉÄÅ ËÁÒÔÉÎËÉ, ËÏÔÏÒÁÑ ÐÏÑ×ÉÔÓÑ ××ÅÒÈÕ ÓÔÒÁÎÉÃÙ, ÅÓÌÉ ÄÏÓÔÕÐÎÁ ÎÏ×ÁÑ ×ÅÒÓÉÑ. ÷ÅÂ-ÓÅÒ×ÅÒ Á×ÔÏÒÁ ÈÒÁÎÉÔ ÌÏÇÉ × ÔÅÞÅÎÉÅ 5 ÄÎÅÊ, ÐÏÓÌÅ ÞÅÇÏ ÏÎÉ ÕÄÁÌÑÀÔÓÑ, Á×ÔÏÒ ÎÅ ÚÁÎÉÍÁÅÔÓÑ ÓÏÐÏÓÔÁ×ÌÅÎÉÅÍ ÚÁÐÒÏÓÏ× Ï ÏÂÎÏ×ÌÅÎÉÉ É IP-ÁÄÒÅÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ.) Security_PasswordTitle ðÁÒÏÌØ ÄÌÑ ×ÅÂ-ÉÎÔÅÒÆÅÊÓÁ Security_Password ðÁÒÏÌØ Security_PasswordUpdate ðÁÒÏÌØ ÉÚÍÅΣΠÎÁ '%s' diff -pruN 0.22.4-1.2/languages/Slovak.msg 1.0.1-0ubuntu2/languages/Slovak.msg --- 0.22.4-1.2/languages/Slovak.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Slovak.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -156,8 +156,8 @@ Password_Error1 Security_Error1 Bezpeènostný port musí by v rozpätí èísel 1 až 65535 Security_Stealth Utajený mód/Èinnos servera Security_NoStealthMode Nie (Utajený mód) -Security_ExplainStats (Ak je toto zapnuté, POPFile pošle raz za deò nasledovné tri hodnoty na stránku www.usethesource.com: bc (celkový poèet košov, ktoré máš), mc (celkový poèet správ, ktoré POPFile klasifikoval) a ec (celkový poèet chybných klasifikácii). Tieto hodnoty sa ukladajú do súboru a budú použité na vyhodnotenie niektorých štatistík o tom ako ¾udia používajú POPFile a ako dobre funguje. Môj web server uchováva tieto informácie približne 5 dní a potom ich zmaže; Neuchovávam informácie prepojujúce štatistické údaje s konkrétnymi IP adresami.) -Security_ExplainUpdate (Ak je toto zapnuté, POPFile pošle raz za deò nasledovné tri hodnoty na stránku www.usethesource.com: ma (hlavné èíslo verzie používaného POPFile), mi (ved¾ajšie èíslo verzie používaného POPFile) a bn (èíslo kompilácie používaného POPFile). POPFile dostane odpoveï vo forme obrázku, ktorý sa zobrazí na vrchu stránku, ak je k dispozícii nová verzia. Môj web server uchováva tieto informácie približne 5 dní a potom ich zmaže; Neuchovávam informácie prepojujúce štatistické údaje s konkrétnymi IP adresami.) +Security_ExplainStats (Ak je toto zapnuté, POPFile pošle raz za deò nasledovné tri hodnoty na stránku getpopfile.org: bc (celkový poèet košov, ktoré máš), mc (celkový poèet správ, ktoré POPFile klasifikoval) a ec (celkový poèet chybných klasifikácii). Tieto hodnoty sa ukladajú do súboru a budú použité na vyhodnotenie niektorých štatistík o tom ako ¾udia používajú POPFile a ako dobre funguje. Môj web server uchováva tieto informácie približne 5 dní a potom ich zmaže; Neuchovávam informácie prepojujúce štatistické údaje s konkrétnymi IP adresami.) +Security_ExplainUpdate (Ak je toto zapnuté, POPFile pošle raz za deò nasledovné tri hodnoty na stránku getpopfile.org: ma (hlavné èíslo verzie používaného POPFile), mi (ved¾ajšie èíslo verzie používaného POPFile) a bn (èíslo kompilácie používaného POPFile). POPFile dostane odpoveï vo forme obrázku, ktorý sa zobrazí na vrchu stránku, ak je k dispozícii nová verzia. Môj web server uchováva tieto informácie približne 5 dní a potom ich zmaže; Neuchovávam informácie prepojujúce štatistické údaje s konkrétnymi IP adresami.) Security_PasswordTitle Heslo užívate¾ského rozhrania Security_Password Heslo Security_PasswordUpdate Heslo zmenené na %s diff -pruN 0.22.4-1.2/languages/Suomi.msg 1.0.1-0ubuntu2/languages/Suomi.msg --- 0.22.4-1.2/languages/Suomi.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Suomi.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -25,7 +25,7 @@ LanguageDirection ManualLanguage en # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Käytä @@ -228,8 +228,8 @@ Security_Error1 Security_Stealth Piilotila/Palvelintoiminta Security_NoStealthMode Ei (Piilotila) Security_StealthMode (Piilotila) -Security_ExplainStats Kun tämä asetus on päällä, POPFile lähettää kerran päivässä seuraavat kolme arvoa osoitteeseen www.usethesource.com: bc (sankojen kokonaismäärä), mc (POPFilen luokittelemien viestien määrä) ja ec (luokitteluvirheiden määrä). Näitä tietoja käytetään POPFilen käyttötavoista ja toimintatarkkuudesta kertovien tilastojen laatimiseen. Webpalvelin säilyttää lokitiedostoja noin 5:n päivän ajan, jonka jälkeen ne poistetaan. Minkäänlaista tietoa tilastojen ja IP-osoitteiden välillä ei säilytetä. -Security_ExplainUpdate Kun tämä asetus on päällä, POPFile lähettää kerran päivässä seuraavat kolme arvoa osoitteeseen www.usethesource.com: ma (POPFilen iso versionumero), mi (POPFilen pieni versionumero) ja bn (POPFilen käännösnumero). POPFile saa vastauksen kuvana, joka näkyy sivun ylälaidassa, kun uusi versio on saatavilla. Webpalvelin säilyttää lokitiedostoja noin 5:n päivän ajan, jonka jälkeen ne poistetaan. Minkäänlaista tietoa päivitystarkistusten ja IP-osoitteiden välillä ei säilytetä. +Security_ExplainStats Kun tämä asetus on päällä, POPFile lähettää kerran päivässä seuraavat kolme arvoa osoitteeseen getpopfile.org: bc (sankojen kokonaismäärä), mc (POPFilen luokittelemien viestien määrä) ja ec (luokitteluvirheiden määrä). Näitä tietoja käytetään POPFilen käyttötavoista ja toimintatarkkuudesta kertovien tilastojen laatimiseen. Webpalvelin säilyttää lokitiedostoja noin 5:n päivän ajan, jonka jälkeen ne poistetaan. Minkäänlaista tietoa tilastojen ja IP-osoitteiden välillä ei säilytetä. +Security_ExplainUpdate Kun tämä asetus on päällä, POPFile lähettää kerran päivässä seuraavat kolme arvoa osoitteeseen getpopfile.org: ma (POPFilen iso versionumero), mi (POPFilen pieni versionumero) ja bn (POPFilen käännösnumero). POPFile saa vastauksen kuvana, joka näkyy sivun ylälaidassa, kun uusi versio on saatavilla. Webpalvelin säilyttää lokitiedostoja noin 5:n päivän ajan, jonka jälkeen ne poistetaan. Minkäänlaista tietoa päivitystarkistusten ja IP-osoitteiden välillä ei säilytetä. Security_PasswordTitle Käyttöliittymän salasana Security_Password Salasana Security_PasswordUpdate Salasana vaihdettu @@ -371,6 +371,6 @@ Imap_WatchedFolder Shutdown_Message POPFile on sammutettu -Help_Training Kun käytät POPFileä ensimmäistä kertaa, se ei tiedä mitään ja vaatii opetusta. POPFilelle pitää opettaa miltä eri sankojen viestit näyttävät. POPFile oppii, kun korjaat sen tekemiä virheitä luokittelemalla väärin luokitellut viestit oikeaan sankoon. Lisäksi sinun pitää lisätä käyttämääsi sähköpostiohjelmaan suodattimia, joka suodattavat viestit POPFilen luokitusten mukaan. Englanninkielistä apua suodatinten tekoon löytyy POPFilen dokumentointiprojektista. +Help_Training Kun käytät POPFileä ensimmäistä kertaa, se ei tiedä mitään ja vaatii opetusta. POPFilelle pitää opettaa miltä eri sankojen viestit näyttävät. POPFile oppii, kun korjaat sen tekemiä virheitä luokittelemalla väärin luokitellut viestit oikeaan sankoon. Lisäksi sinun pitää lisätä käyttämääsi sähköpostiohjelmaan suodattimia, joka suodattavat viestit POPFilen luokitusten mukaan. Englanninkielistä apua suodatinten tekoon löytyy POPFilen dokumentointiprojektista. Help_Bucket_Setup POPFile vaatii vähintään kaksi sankoa unclassified (luokittelematon) -nimisen pseudosangon lisäksi. POPFile voi kuitenkin luokitella viestit hienojakoisemminkin. Sankojen määrää ei ole rajoitettu. Voit käyttää esimerkiksi sankoja "roskapostit", "yksityiset" ja "työasiat". -Help_No_More Älä näytä tätä viestiä enää \ No newline at end of file +Help_No_More Älä näytä tätä viestiä enää diff -pruN 0.22.4-1.2/languages/Svenska.msg 1.0.1-0ubuntu2/languages/Svenska.msg --- 0.22.4-1.2/languages/Svenska.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Svenska.msg 2007-01-31 10:33:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2003-2006 John Graham-Cumming +# Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/languages/Turkce.msg 1.0.1-0ubuntu2/languages/Turkce.msg --- 0.22.4-1.2/languages/Turkce.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Turkce.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -28,7 +28,7 @@ LanguageDirection ManualLanguage en # This is where to find the FAQ on the Wiki -FAQLink FrequentlyAskedQuestions +FAQLink FAQ # Common words that are used on their own all over the interface Apply Uygula @@ -231,8 +231,8 @@ Security_Error1 Security_Stealth Gizli Mod/Sunucu Çalýþmasý Security_NoStealthMode Hayýr (Gizli Mod) Security_StealthMode (Gizli Mod) -Security_ExplainStats (Bu ayar açýk olduðunda, POPFile günde bir kez olmak üzere þu deðerleri www.usethesource.com içindeki bir koda gönderir; bc (sahip olduðunuz toplam kategori sayýsý), mc (POPFile'ýn sýnýflandýrdýðý toplam mesaj sayýsý) ve ec (toplam sýnýflandýrma hatasý sayýsý). Bu bilgiler bir dosyada saklanýr, bunlarý kullanýcýlarýn POPFile'ý nasýl kullandýðýný ve ne kadar iyi çalýþtýðý hakkýnda istatistikler yayýnlamak amacýyla kullanacaðým. Web sunucum günlük dosyalarýný yaklaþýk 5 gün saklar ve siler; istatistikler ve IP adresleri arasýnda herhangi bir baðlantý biriktirmemekteyim.) -Security_ExplainUpdate (Bu ayar açýk olduðunda, POPFile günde bir kez olmak üzere þu üç deðeri www.usethesource.com içindeki bir koda gönderir; ma (yüklediðiniz POPFile'ýn büyük sürüm numarasý), mi (yüklediðiniz POPFile'ýn küçük sürüm numarasý) ve bn (yüklediðiniz POPFile'ýn yapý [build] numarasý). Yeni bir sürüm bulunduðunda POPFile, sayfanýn üstünde gösterilen, grafik biçiminde bir cevap alýr. Web sunucum günlük dosyalarýný yaklaþýk 5 gün saklar ve siler; güncelleme kontrolleri ve IP adresleri arasýnda herhangi bir baðlantý biriktirmemekteyim.) +Security_ExplainStats (Bu ayar açýk olduðunda, POPFile günde bir kez olmak üzere þu deðerleri getpopfile.org içindeki bir koda gönderir; bc (sahip olduðunuz toplam kategori sayýsý), mc (POPFile'ýn sýnýflandýrdýðý toplam mesaj sayýsý) ve ec (toplam sýnýflandýrma hatasý sayýsý). Bu bilgiler bir dosyada saklanýr, bunlarý kullanýcýlarýn POPFile'ý nasýl kullandýðýný ve ne kadar iyi çalýþtýðý hakkýnda istatistikler yayýnlamak amacýyla kullanacaðým. Web sunucum günlük dosyalarýný yaklaþýk 5 gün saklar ve siler; istatistikler ve IP adresleri arasýnda herhangi bir baðlantý biriktirmemekteyim.) +Security_ExplainUpdate (Bu ayar açýk olduðunda, POPFile günde bir kez olmak üzere þu üç deðeri getpopfile.org içindeki bir koda gönderir; ma (yüklediðiniz POPFile'ýn büyük sürüm numarasý), mi (yüklediðiniz POPFile'ýn küçük sürüm numarasý) ve bn (yüklediðiniz POPFile'ýn yapý [build] numarasý). Yeni bir sürüm bulunduðunda POPFile, sayfanýn üstünde gösterilen, grafik biçiminde bir cevap alýr. Web sunucum günlük dosyalarýný yaklaþýk 5 gün saklar ve siler; güncelleme kontrolleri ve IP adresleri arasýnda herhangi bir baðlantý biriktirmemekteyim.) Security_PasswordTitle Kullanýcý Arayüzü Parolasý Security_Password Parola Security_PasswordUpdate Parola %s olarak güncellendi @@ -374,6 +374,6 @@ Imap_WatchedFolder Shutdown_Message POPFile kapatýldý -Help_Training POPFile'ý ilk kullandýðýnýzda o hiçbir bilgiye sahip deðildir ve eðitime ihtiyacý vardýr. POPFile her kategori için mesajlar ile eðitilmelidir. Eðitim, POPFile bir mesajý yanlýþ sýnýflandýrdýðýnda bunu doðru kategori ile tekrar sýnýflandýrarak gerçekleþtirilir. Bunun dýþýnda, posta programýnýzýn mesajlarý POPFile'ýn sýnýflandýrmasýna göre filtrelemesi için ayarlamalýsýnýz. Posta programýnýzýn filtelerini ayarlamak hakkýnda bilgi POPFile Dökümantasyon Projesi adresinde bulunabilir. +Help_Training POPFile'ý ilk kullandýðýnýzda o hiçbir bilgiye sahip deðildir ve eðitime ihtiyacý vardýr. POPFile her kategori için mesajlar ile eðitilmelidir. Eðitim, POPFile bir mesajý yanlýþ sýnýflandýrdýðýnda bunu doðru kategori ile tekrar sýnýflandýrarak gerçekleþtirilir. Bunun dýþýnda, posta programýnýzýn mesajlarý POPFile'ýn sýnýflandýrmasýna göre filtrelemesi için ayarlamalýsýnýz. Posta programýnýzýn filtelerini ayarlamak hakkýnda bilgi POPFile Dökümantasyon Projesi adresinde bulunabilir. Help_Bucket_Setup POPFile, sýnýflandýrýlmamýþ pseudo-kategorisi dýþýnda en az iki kategori gerektirir. POPFile'ý eþsiz yapan, ikiden fazla, istediðiniz sayýda kategoriye sahip olabilmenizdir. Basit bir kurulum, "spam", "kiþisel", ve "iþ" kategorileri gibi olabilir. Help_No_More Bunu bir daha gösterme diff -pruN 0.22.4-1.2/languages/Ukrainian.msg 1.0.1-0ubuntu2/languages/Ukrainian.msg --- 0.22.4-1.2/languages/Ukrainian.msg 2006-02-16 15:36:24.000000000 +0000 +++ 1.0.1-0ubuntu2/languages/Ukrainian.msg 2008-04-18 14:50:04.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -183,8 +183,8 @@ Password_Error1 Security_Error1 âÅÚÐÅÞÎÉÊ ÐÏÒÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ ÞÉÓÌÏÍ Í¦Ö 1 ÔÁ 65535 Security_Stealth îÅ×ÉÄÉÍÉÊ ÒÅÖÉÍ/ÒÏÂÏÔÁ ÓÅÒ×ÅÒÁ Security_NoStealthMode î¦ (îÅ×ÉÄÉÍÉÊ ÒÅÖÉÍ) -Security_ExplainStats (ñËÝÏ ÃÅ ×צÍËÎÕÔÏ, ÔÏ POPFile ÎÁÄÓÉÌÁ¤ ÒÁÚ × ÄÅÎØ ÎÁÓÔÕÐΦ ÔÒÉ ÚÎÁÞÅÎΦ ÓËÒÉÐÔÕ ÎÁ www.usethesource.com: bc (ÚÁÇÁÌØÎÁ ˦ÌØ˦ÓÔØ ËÁÔÅÇÏÒ¦Ê, ÑËÕ ÍÁ¤ÔÅ), mc (ÚÁÇÁÌØÎÕ Ë¦ÌØ˦ÓÔØ ÐÏצÄÏÍÌÅÎØ ÝÏ ÐÒÏËÌÁÓÉƦËÕ×Á× POPFile) ÔÁ ec (ÚÁÇÁÌØÎÁ ˦ÌØ˦ÓÔØ ÐÏÍÉÌÏË ËÌÁÓÉƦËÁæ§). ÷ÏÎÉ ÚÂÅÒ¦ÇÁÀÔØÓÑ × ÆÁÊ̦ ¦ Ñ ×ÉËÏÒÉÓÔÏ×ÕÀ §È ÝÏ ÏÐÕÂ̦ËÕ×ÁÔÉ ÄÅÑËÕ ÓÔÁÔÉÓÔÉËÕ ÐÒÏ ÔÅ, ÑË ÌÀÄÉ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ POPFile ¦ ÎÁÓ˦ÌØËÉ ÄÏÂÒŠצΠÄÌÑ ÎÉÈ ÐÒÁÃÀ¤. í¦Ê ×Å ÓÅÒ×ÅÒ ÚÂÅÒ¦ÇÁ¤ Ó×ϧ ÆÁÊÌÉ Ú×¦Ô¦× ËÏÌÏ 5 ÄÎ¦× ¦ ÔÏĦ §È ÓÔÉÒÁ¤ÔØÓÑ; Ñ ÎÅ ÚÂÅÒ¦ÇÁÀ ÂÕÄØ ÑËÏÇÏ Ú×'ÑÚËÕ Í¦Ö ÓÔÁÔÉÓÔÉËÏÀ ÔÁ ¦ÎÄÉצÄÕÁÌØÎÉÍÉ IP ÁÄÒÅÓÁÍÉ.) -Security_ExplainUpdate (ñËÝÏ ÃÅ ×צÍËÎÕÔÏ, ÔÏ POPFile ÎÁÄÓÉÌÁ¤ ÒÁÚ × ÄÅÎØ ÎÁÓÔÕÐΦ ÔÒÉ ÚÎÁÞÅÎΦ ÓËÒÉÐÔÕ ÎÁ www.usethesource.com: ma (ÏÓÎÏ×ÎÁ ×ÅÒÓ¦Ñ ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile), mi (×ÔÏÒÉÎÎÁ ×ÅÒÓ¦Ñ ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile) ÔÁ bn (ÎÏÍÅÒ ÐÏÂÕÄÏ×É ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile). POPFile ÏÔÒÉÍÕ¤ צÄÐÏצÄØ Õ ÆÏÒͦ ÇÒÁƦËÉ ÝÏ Ú'Ñ×ÌѤÔØÓÑ ÚÇÏÒÉ ÓÔÏÒ¦ÎËÉ ÑËÝÏ ÎÁÑ×ÎÁ ÎÏ×Á ×ÅÒÓ¦Ñ. í¦Ê ×Å ÓÅÒ×ÅÒ ÚÂÅÒ¦ÇÁ¤ Ó×ϧ ÆÁÊÌÉ Ú×¦Ô¦× ËÏÌÏ 5 ÄÎ¦× ¦ ÔÏĦ §È ÓÔÉÒÁ¤ÔØÓÑ; Ñ ÎÅ ÚÂÅÒ¦ÇÁÀ ÂÕÄØ ÑËÏÇÏ Ú×'ÑÚËÕ Í¦Ö ÐÅÒÅצÒËÏÀ ÏÎÏ×ÌÅÎØ ÔÁ ¦ÎÄÉצÄÕÁÌØÎÉÍÉ IP ÁÄÒÅÓÁÍÉ.) +Security_ExplainStats (ñËÝÏ ÃÅ ×צÍËÎÕÔÏ, ÔÏ POPFile ÎÁÄÓÉÌÁ¤ ÒÁÚ × ÄÅÎØ ÎÁÓÔÕÐΦ ÔÒÉ ÚÎÁÞÅÎΦ ÓËÒÉÐÔÕ ÎÁ getpopfile.org: bc (ÚÁÇÁÌØÎÁ ˦ÌØ˦ÓÔØ ËÁÔÅÇÏÒ¦Ê, ÑËÕ ÍÁ¤ÔÅ), mc (ÚÁÇÁÌØÎÕ Ë¦ÌØ˦ÓÔØ ÐÏצÄÏÍÌÅÎØ ÝÏ ÐÒÏËÌÁÓÉƦËÕ×Á× POPFile) ÔÁ ec (ÚÁÇÁÌØÎÁ ˦ÌØ˦ÓÔØ ÐÏÍÉÌÏË ËÌÁÓÉƦËÁæ§). ÷ÏÎÉ ÚÂÅÒ¦ÇÁÀÔØÓÑ × ÆÁÊ̦ ¦ Ñ ×ÉËÏÒÉÓÔÏ×ÕÀ §È ÝÏ ÏÐÕÂ̦ËÕ×ÁÔÉ ÄÅÑËÕ ÓÔÁÔÉÓÔÉËÕ ÐÒÏ ÔÅ, ÑË ÌÀÄÉ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ POPFile ¦ ÎÁÓ˦ÌØËÉ ÄÏÂÒŠצΠÄÌÑ ÎÉÈ ÐÒÁÃÀ¤. í¦Ê ×Å ÓÅÒ×ÅÒ ÚÂÅÒ¦ÇÁ¤ Ó×ϧ ÆÁÊÌÉ Ú×¦Ô¦× ËÏÌÏ 5 ÄÎ¦× ¦ ÔÏĦ §È ÓÔÉÒÁ¤ÔØÓÑ; Ñ ÎÅ ÚÂÅÒ¦ÇÁÀ ÂÕÄØ ÑËÏÇÏ Ú×'ÑÚËÕ Í¦Ö ÓÔÁÔÉÓÔÉËÏÀ ÔÁ ¦ÎÄÉצÄÕÁÌØÎÉÍÉ IP ÁÄÒÅÓÁÍÉ.) +Security_ExplainUpdate (ñËÝÏ ÃÅ ×צÍËÎÕÔÏ, ÔÏ POPFile ÎÁÄÓÉÌÁ¤ ÒÁÚ × ÄÅÎØ ÎÁÓÔÕÐΦ ÔÒÉ ÚÎÁÞÅÎΦ ÓËÒÉÐÔÕ ÎÁ getpopfile.org: ma (ÏÓÎÏ×ÎÁ ×ÅÒÓ¦Ñ ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile), mi (×ÔÏÒÉÎÎÁ ×ÅÒÓ¦Ñ ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile) ÔÁ bn (ÎÏÍÅÒ ÐÏÂÕÄÏ×É ×ÁÛÏÇÏ ×ÓÔÁÎÏ×ÌÅÎÏÇÏ POPFile). POPFile ÏÔÒÉÍÕ¤ צÄÐÏצÄØ Õ ÆÏÒͦ ÇÒÁƦËÉ ÝÏ Ú'Ñ×ÌѤÔØÓÑ ÚÇÏÒÉ ÓÔÏÒ¦ÎËÉ ÑËÝÏ ÎÁÑ×ÎÁ ÎÏ×Á ×ÅÒÓ¦Ñ. í¦Ê ×Å ÓÅÒ×ÅÒ ÚÂÅÒ¦ÇÁ¤ Ó×ϧ ÆÁÊÌÉ Ú×¦Ô¦× ËÏÌÏ 5 ÄÎ¦× ¦ ÔÏĦ §È ÓÔÉÒÁ¤ÔØÓÑ; Ñ ÎÅ ÚÂÅÒ¦ÇÁÀ ÂÕÄØ ÑËÏÇÏ Ú×'ÑÚËÕ Í¦Ö ÐÅÒÅצÒËÏÀ ÏÎÏ×ÌÅÎØ ÔÁ ¦ÎÄÉצÄÕÁÌØÎÉÍÉ IP ÁÄÒÅÓÁÍÉ.) Security_PasswordTitle ðÁÒÏÌØ ¦ÎÔÅÒÆÅÊÓÕ ËÏÒÉÓÔÕ×ÁÞÁ Security_Password ðÁÒÏÌØ Security_PasswordUpdate ðÁÒÏÌØ ÚͦÎÅÎÏ ÄÌÑ %s diff -pruN 0.22.4-1.2/Makefile 1.0.1-0ubuntu2/Makefile --- 0.22.4-1.2/Makefile 2008-07-24 20:15:47.000000000 +0100 +++ 1.0.1-0ubuntu2/Makefile 2008-07-24 20:13:56.000000000 +0100 @@ -5,16 +5,16 @@ all: cp v*.change changelog install: - cp *.gif *.pl *.sh $(DESTDIR)/usr/share/popfile/ + cp *.gif *.pl *.sh *.png $(DESTDIR)/usr/share/popfile/ cp stopwords popfile.pck $(DESTDIR)/usr/share/popfile/ chmod +x $(DESTDIR)/usr/share/popfile/*.pl \ $(DESTDIR)/usr/share/popfile/*.sh cp -Rf Classifier $(DESTDIR)/usr/share/popfile/ cp -Rf POPFile $(DESTDIR)/usr/share/popfile/ cp -Rf Proxy $(DESTDIR)/usr/share/popfile/ + cp -Rf Services $(DESTDIR)/usr/share/popfile/ cp -Rf UI $(DESTDIR)/usr/share/popfile/ cp -Rf languages $(DESTDIR)/usr/share/popfile/ - cp -Rf manual $(DESTDIR)/usr/share/doc/popfile/ cp -Rf skins $(DESTDIR)/usr/share/popfile/ cp -Rf debian_wrappers/popfile-bayes $(DESTDIR)/usr/sbin/ cp -Rf debian_wrappers/popfile-insert $(DESTDIR)/usr/sbin/ Binary files 0.22.4-1.2/manual/e_filter1.gif and 1.0.1-0ubuntu2/manual/e_filter1.gif differ Binary files 0.22.4-1.2/manual/e_filter2.gif and 1.0.1-0ubuntu2/manual/e_filter2.gif differ Binary files 0.22.4-1.2/manual/e_filter3.gif and 1.0.1-0ubuntu2/manual/e_filter3.gif differ Binary files 0.22.4-1.2/manual/e_filter4.gif and 1.0.1-0ubuntu2/manual/e_filter4.gif differ diff -pruN 0.22.4-1.2/manual/en/email.html 1.0.1-0ubuntu2/manual/en/email.html --- 0.22.4-1.2/manual/en/email.html 2003-03-14 17:36:16.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/email.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,493 +0,0 @@ -POPFile Documentation - - - -
  POPFile Documentation 

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
- -
- - - - - - - -

Getting Your Email Program To Talk To POPFile

- - - -

POPFile works as a proxy server. Your email program talks to POPFile, which talks to your email server on its behalf. Instead of your email program getting messages directly, POPFile grabs them first, and scans them to decide what bucket they should go into.

- - - -

Once it's decided - which takes only a fraction of a second - POPFile does one of two things: it can add a tag like [this] to the start of the subject line; which means that simple filtering programs like Microsoft Outlook Express can deliver your mail where it's supposed to - or, for more advanced email programs like Eudora, it can add a new email header like this:

- - - -

X-Text-Classification: personal

- - - -

- which your email program can use as a filter.

- - - -

However, you need to do two things to get your email program talking to POPFile: - - - -

  1. Adjust your email program's settings to make it talk to POPFile, and - -
  2. set up your email filters so that things get filed properly.

- - - -

Let's adjust the mail settings first. We'll set up filters in a moment. - - - -

Below are instructions for some of the more popular email programs. For others - or for advanced users - here are the general instructions:

- - - -

  • Change the POP3 server name in your email client to 127.0.0.1, noting the original address. - -
  • Change the POP3 user name to [original-POP3-server-address]:[username] - -
  • Leave the password alone

- - - -

For accounts using Secure Password Authentication, see Using POPFile with: Secure Password Authentication.

- - - - - - - - - - - -
- - - -Just choose your email program and follow the column down. While these instructions might look complicated, they actually only take about two minutes - and it's hard to go wrong. (Just in case, make a note of your original settings in case you need to go back.) - - - -
- - - -

Outlook

- - - -
    - -
  • In Outlook select the Tools->Email Accounts... menu option. The E-mail Accounts dialog will appear. [screenshot] - -
  • Click View or change existing e-mail accounts and click Next. Choose the account you want to use POPFile with and click Change... - -Make a note of the Incoming mail server (POP3) server name and the User Name. [screenshot] - -
  • Change the Incoming mail server (POP3) server name to 127.0.0.1 and change the User Name to the combination of the original - -Incoming mail server (POP3) server name and the original User Name separated by a colon. [screenshot] - -
  • So, if the original Incoming mail server (POP3) name was my.mail.com and your username was jdoe, your new username would be my.mail.com:jdoe - -
  • You don't need to change the password. - -
  • Hit Next and then Finish. - -
  • Ensure that POPFile is running and all mail will be delivered through POPFile! - -
  • You'll need to make sure POPFile starts whenever Windows does. If you're using the Windows installer version, you can drag the 'Start POPFile in Background' link from the POPFile group in the Start menu to the Startup group. Now, Windows will load POPFile each time. - -
  • Important! If POPFile isn't loaded, the mail will not get through - and your email program won't connect! - -
- - - -		 - - - -

Outlook Express

- - - -
    - -
  • In Outlook Express select the Tools->Accounts... menu option. The Internet Accounts dialog will appear. [screenshot] - -
  • Select the account you wish to modify to use POPFile and click on Properties. [screenshot] - -
  • Choose the Servers tab. Make a note of the Incoming Mail (POP3) server name and the Incoming Mail Server Account Name. [screenshot] - -
  • Change the Incoming Mail (POP3) server name to 127.0.0.1 and change the Incoming Mail Server Account Name to the combination of the original Incoming Mail (POP3) server name and the original Incoming Mail Server Account Name separated by a colon. [screenshot] - -
  • So, if the original Incoming Mail server name was my.mail.com and your username was jdoe, your new username would be my.mail.com:jdoe - -
  • You don't need to change the password. - -
  • Hit OK and then Close. - -
  • Ensure that POPFile is running and all mail will be delivered through POPFile! - -
  • You'll need to make sure POPFile starts whenever Windows does. If you're using the Windows installer version, you can drag the 'Start POPFile in Background' link from the POPFile group in the Start menu to the Startup group. Now, Windows will load POPFile each time. - -
  • Important! If POPFile isn't loaded, the mail will not get through - and your email program won't connect! - -
- - - -		 - - - -

Eudora

- - - -
    - -
  • In Eudora select the Tools->Options... menu option. The Options dialog will appear. [screenshot] - -
  • Make a note of the Mail Server (incoming) server name and the Login Name. [screenshot] - -
  • Change the Mail Server (incoming) server name to 127.0.0.1 and change the Login Name to the combination of the original - -Mail Server (incoming) server name and the original Login Name separated by a colon. [screenshot] - -
  • So, if the original Mail Server (incoming) server name was my.mail.com and your username was jdoe, your new username would be my.mail.com:jdoe - -
  • You don't need to change the password. - -
  • Hit OK. - -
  • Ensure that POPFile is running and all mail will be delivered through POPFile. - -
  • You'll need to make sure POPFile starts whenever Windows does. If you're using the Windows installer version, you can drag the 'Start POPFile in Background' link from the POPFile group in the Start menu to the Startup group. Now, Windows will load POPFile each time. - -
  • Important! If POPFile isn't loaded, the mail will not get through - and your email program won't connect! - -
- - - -		 - - - -

Pegasus

- - - -
    - -
  • In Pegasus select the Tools->Internet Options... Receiving (POP3) tab. The POP3 account setup page will appear. - -
  • Under General settings for receiving mail using POP3, select the POP3 Host dialog box. Make a note of the current POP3 host. - -
  • Change the POP3 Host to 127.0.0.1 - -
  • Under General settings for receiving mail using POP3, select the User name dialog box. Make a note of the current User name. - -
  • Change the User name to the combination of the original POP3 Host name and the original User name separated by a colon. - -
  • So, if the original POP3 host was my.mail.com and your User name was jdoe, your new User name would be my.mail.com:jdoe - -
  • You don't need to change the password. - -
  • Click the OK Button to save the changes. - -
  • Ensure that POPFile is running and all mail will be delivered through POPFile! - -
  • You'll need to make sure POPFile starts whenever Windows does. If you're using the Windows installer version of POPFile, you can drag the 'Start POPFile in Background' link from the POPFile group in the Start menu to the Start -> Programs -> Startup group. Now, Windows will load POPFile each time. - -
- - - -
- - - -

Okay. Now we've done that, it's time to set up your mail filters, so that once POPFile has done its work, your email program can take that and put everything in the right folder.

- - - -

For advanced users, you have the option to modify the subject line to add a [classification] tag or not. It's near the bottom of the Configuration tab in the web UI. No matter which option you choose, the X-Text-Classification header is still added.

- - - - - - - - - - - -
- - - -Just choose your email program and follow the column down. While these instructions might look complicated, they actually only take about two minutes - and it's hard to go wrong. (Just in case, make a note of your original settings in case you need to go back.) - - - -
- - - -

Outlook

- - - -
    - -
  • In Outlook select the Tools->Rules Wizard... [screenshot] - -
  • The Rules Wizard appears. Click New... and select Start from a blank rule. [screenshot] - -
  • Outlook can use the X-Text-Classification header, which allows mail filtering to occur completely in the background. Click Next and select with specific words in the message header. - -
  • Now click the grey highlighted specific words link and enter "X-Text-Classification: " followed by the name of one of your buckets in the box that appears and hit Add, then OK. - -
  • Click Next and select move it to the specified folder. - -
  • Click the grey highlighted word specified and a list of folders appears. Select whichever folder you want to move messages from that bucket to and hit OK. - -
  • Hit OK, then Finish. - -
  • Repeat the process for each of your buckets, then OK out. - -
  • You're done! - -
  • One minor note: in the POPFile web interface, under the Configuration tab, check that the Subject Line Modification option is turned off. - -
- - - -		 - - - -

Outlook Express

- - - -
    - -
  • In Outlook Express select the Tools->Message Rules->Mail... [screenshot] - -
  • The New Mail Rule window appears. [screenshot] - -
  • Outlook Express cannot use the X-Text-Classification header, which would allow mail filtering to occur completely in the background. So instead, click Where the Subject line contains specific words and also click - -Move it to the specified folder [screenshot] - -
  • Now click the blue highlighted contains specific words link and the Type Specific Words dialog appears [screenshot] - -
  • Enter the name of one of your buckets, surrounded by [square brackets], then hit OK. Now click the blue highlighted specified word and the Move dialog appears. Click the folder you want to move messages from that bucket to and hit OK. [screenshot] - -
  • Hit OK. - -
  • Repeat the process for each of your buckets, and then OK out. - -
  • You're done! - -
  • One minor note: in the POPFile web interface, under the Configuration tab, check that the Subject Line Modification option is turned on. - -
- - - -		 - - - -

Eudora

- - - -

Eudora allows filtering based on any mail header, which is great - everything can be done completely in the background, without changing the subject line!

- - - -
    - -
  • Select the Tools->Filters menu. [screenshot] - -
  • The Filters window appears. Click New to create a new filter. [screenshot] - -
  • In the Header box type X-Text-Classification and in the box next to contains type the name of one of your buckets. Don't add square brackets around it. [screenshot] - -
  • The select Transfer To in the first Action box and select the mailbox you want to file message from this bucket into. [screenshot] - -
  • Repeat this for each of your buckets. - -
  • Close the Filters windows and say Yes when asked to save changes. - -
  • You're done! - -
  • One minor note: in the POPFile web interface, under the Configuration tab, check that the Subject Line Modification option is turned off. - -
- - - -		 - - - -

Pegasus

- - - -
    - -
  • In Pegasus select the Tools->Mail Filtering Rules ->Edit New Mail Filtering Rules ->Rules Applied When Folder is Opened. - -
  • The New Mail Filtering Rules window appears. - -
  • Click the New Rule button. The Create a New Filtering Rule window appears. - -
  • Click on the Expression button. Note that using the Expression filter will work even if the POPFile Subject Line Modification option is turned off. If you use the Header filter, the POPFile Subject Line Modification option must be turned on. - -
  • Select the If this regular expression dialog box - -
  • Enter the name of one of your buckets, preceded X-Text-Classification:, for example: X-Text-Classification: spam - -
  • Select the Headers or body radio button - -
  • Select the desired action from the Action drop down list. For example Move - -
  • If an action such as Move or Forward has been chosen, click the Set button. - -
  • Select the destination folder or enter the forward to address as appropriate for the Action selected. - -
  • Click the OK button to add the rule to the rule list. - -
  • Repeat the process for each rule you need. - -
  • The order in which the filter rules are applied can be adjusted using the red / blue (up / down) arrows in the New Mail Filter Rules window. - -
  • Select the Save button to save the rules set changes. - -
  • Select the OK button. - -
  • You're done! - -
- - - -
- - - -

That's all there it to it!... but...

- - - -Despite all this, POPFile still won't filter mail right now. Why not? It doesn't know what any of the buckets you entered mean. It has no idea what 'spam' and 'genuine' mean, or what 'work' and 'personal' are. It doesn't even know what language your e-mail is in - and it doesn't care. You need to train it to distinguish spam from regular email, or one project from another. You do this through training - and we'll deal with that next. - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - - - diff -pruN 0.22.4-1.2/manual/en/firewalls.html 1.0.1-0ubuntu2/manual/en/firewalls.html --- 0.22.4-1.2/manual/en/firewalls.html 2003-02-05 10:48:48.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/firewalls.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ -POPFile Documentation - - - -
  POPFile Documentation 

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
- -
- - - - - -

Using POPFile with firewalls

- - - -

POPFile needs to be given full permissions on your act as a server for your local machine, and have permission to access the rest of the Internet. Remember that, since POPFile is programmed in the Perl programming language, you'll need to give permissions to perl.exe, wperl.exe, or your Perl parser on other operating systems. - - - -

In ZoneAlarm, you can simply answer 'Yes' to each question and check the 'Always allow...' box. POPFile does not need to have access to the Internet as a Server unless you want other people off your machine to share your copy of POPFile.

- - - -

Important note: this gives all Perl programs permission to act as servers!

- - - -

There are currently no known issues with POPFile and firewalls, provided it's allowed to connect on the port it requires.

- - - -
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - - - diff -pruN 0.22.4-1.2/manual/en/firsttime.html 1.0.1-0ubuntu2/manual/en/firsttime.html --- 0.22.4-1.2/manual/en/firsttime.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/firsttime.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - - -

Bucket Setup

- -

POPFile is an extremely versatile program. You can tell it to just try and tell spam from non-spam e-mail, or to separate work, family and junk mail, or to automatically filter between a dozen projects that you get email about.

- -

A bucket is just what it sounds like - it's one of any number of folders that your email can be classified into. You can have one for junk mail and one for regular mail, or one for your personal email, one for work, and one for spam. It's up to you.

- -

If you've just installed POPFile and you're looking at the web interface for the first time, you'll be looking at a blank 'History' page. Click on the 'Buckets' tab at the top of the interface.

- -

To set up your buckets, let's assume that you want three buckets: work, personal and spam. A little way down the 'buckets' page, there's a 'Maintenance' tab, with a box labelled 'Create bucket with name:'. Create each bucket in turn - remember, tailor them to whatever you want - 'spam' and 'real', or 'work', 'home' and 'spam' - or one for each of your projects.

- -

(Note: the more buckets there are, the longer POPFile takes to train - but the more useful it may eventually be.)

- -

When all the buckets you want are created, POPFile is ready to classify mail. It's time to get your e-mail program to talk to POPFile.

- - -
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/installing.html 1.0.1-0ubuntu2/manual/en/installing.html --- 0.22.4-1.2/manual/en/installing.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/installing.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - - -

Installing POPFile

- -

POPFile comes in two versions - an easy-to-install Windows version, and a cross-platform version for technically-minded users. Once installed, the two are identical.

- -

Easy-to-Install Windows Version

- -

Download the Windows installer from the POPFile Download Page, and run setup.exe and follow the instructions in there. You can launch POPFile from the Start Menu (Start > Programs > POPFile > Run POPFile in Background), or reboot and it will start automatically. Important note: nothing will appear on your screen! To check if it's running correctly, read the "Accessing POPFile" section below.

- -

System Requirements

- -

You'll need several things to get started with POPFile.

-
    -
  1. The latest POPFile release.
    2. -
  2. An e-mail account that uses the POP3 protocol (most accounts do, although you can't use POPFile with web-based services like Hotmail and Yahoo! Mail without extra software)
    3. -
  3. Around 2MB free disk space
    4. -
- -

You can obtain the latest POPFile release as a zip file at the top of the -package list at the POPFile -download page. Windows users will want the file under the section labeled Windows Only.

-

POPFile itself occupies just over a megabyte. The word lists (called the corpus) used to classify -your email will take some additional space depending on how much mail you use to train POPFile and how many buckets you create.

- -

Cross-Platform Version

- -

Get Perl running on your machine, then download the POPFile Perl zip from the POPFile Home Page, and extract it to a directory of your choice. On Windows platforms, launch with the command perl popfile.pl. - -

- -

Checking POPFile is running correctly

- -

POPFile doesn't have a traditional interface like most programs - you access it through your web browser. Don't worry - unless you say otherwise, no-one outside your machine can access it.

- -

To load POPFile, go to http://127.0.0.1:8080, or (for the Windows version) click on the 'POPFile Web Interface' link in your Start Menu. Important note: if, during the Windows install process, you chose a different port to talk to POPFile on, replace the "8080" part with whatever you chose.

- -

If you get an error message, check that POPFile is really running, and that you have the port number correct (it should be 8080, but if you changed it, you'll also need to change that in the web address you're going to.)

- -

If you get a POPFile screen, congratulations! Now it's time to set up how you want your mail sorted. Let's go on to the Bucket Setup. >>

-
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/manual.html 1.0.1-0ubuntu2/manual/en/manual.html --- 0.22.4-1.2/manual/en/manual.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/manual.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - - -

Welcome to POPFile.

- -

POPFile is an automatic mail classification tool. Once properly set up and trained, it will work in the background of your computer, scanning mail as it arrives and filing it however you wish. You can give it a simple job, like separating out junk e-mail, or a complicated one - like filing mail into a dozen folders. Think of it as a personal assistant for your inbox.

- -

To learn how to set up POPFile, please choose one of the following options.

- -
    -
  1. Installing POPFile -
  2. Setting up Buckets for mail classification -
  3. Getting your email program to work with POPFile -
  4. Training POPFile - -

    Once you are done with the basics of POPFile you'll find answers to additional questions in the sections covering:

    - -
  5. Using POPFile with a firewall -
  6. POPFile and Secure Password Authentication (including MSN) -
  7. POPFile and other proxies -
  8. Using POPFile with multiple email addresses -
- -
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/multiple.html 1.0.1-0ubuntu2/manual/en/multiple.html --- 0.22.4-1.2/manual/en/multiple.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/multiple.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - -

Using POPFile with multiple accounts

- -

POPFile will automatically cope with multiple email accounts; you don't need to bother. - -

POPFile will use the same set of Buckets and the same History for all email accounts.

- -
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/proxies.html 1.0.1-0ubuntu2/manual/en/proxies.html --- 0.22.4-1.2/manual/en/proxies.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/proxies.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - -

Using POPFile with other proxies such as virus scanners

- -

If you use an email scanning proxy that has changed your email setting like some versions of Norton Antivirus, then POPFile won't work straight off the bat: the email proxy will grab them instead. You need to configure POPFile to talk to the email scanner. (If your virus scanner didn't change your email POP3 server setting then there is no need to follow these instructions).

- -

(So, basically, emails get downloaded by the scanner, passed to POPFile, and then - finally - passed to your email program.)

- -

Now, since different brands of email scanners work differently, we'll work like this: - -

  1. Disable the email scanner and return your settings to normal. -
  2. Tell POPFile to listen for connections on a different port. -
  3. Tell your email program to connect to POPFile on a different port. -
  4. Re-enable your email scanner with the new settings.

- -

Disabling your e-mail scanner

- -

Follow your manufacturer's instructions for this.

- -

Change POPFile's port

- -

Head to the Web Interface's Configuration tab, and change your POP3 Listen Port to any similar number - we recommend 123. Click Apply.

- -

Change your email program's port

- - - - - -
- -Just choose your email program and follow the column down. While these instructions might look complicated, they actually only take about two minutes - and it's hard to go wrong. (Just in case, make a note of your original settings in case you need to go back.) - -
- -

Outlook

- -
    -
  • Go to the Tools -> Email Accounts menu. -
  • Click on View or change existing e-mail accounts and then click Next. -
  • Select your account, then click on Change. -
  • Click on the More Settings button. -
  • Click on the Advanced tab. -
  • Beside Outgoing server (POP3), enter the same number as you chose earlier (we recommended 123). -
  • Click OK, and repeat the process for each of the accounts you want to use POPFile with. -
- -		 - -

Outlook Express

- -
    -
  • Go to the Tools -> Accounts menu. -
  • Select your account and click Properties. -
  • Click on the Advanced tab. -
  • Beside Incoming Mail (POP3), enter the same number as you chose earlier (we recommended 123). -
  • Click OK, and repeat the process for each of the accounts you want to use POPFile with. -
- -		 - -

Eudora

- -
    -
  • Eudora's port setting is in its hidden, 'esoteric' settings. -
  • Go to 'My Computer' and navigate to the directory that Eudora is installed in - it's usually C:\Program Files\Qualcomm\Eudora -
  • Click on the 'extrastuff' folder. -
  • Select the 'esoteric.epi' file, and copy it using the Edit > Copy menu. -
  • Go back to the main Eudora folder, and paste it using Edit > Paste. -
  • Start Eudora. -
  • Go to the Tools -> Options menu. -
  • Scroll to the bottom of the list of option menus and choose 'Ports & Protocols'. -
  • Next to 'POP3', enter the same number as you chose earlier (we recommended 123). -
  • Click OK. You're done. -
- -
- -

Re-enable your email scanner.

- -Reactivate your scanner (consult your scanner's manual) and it should automatcally set everything up for you. Mail should now be scanned and sorted. - -
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/spa.html 1.0.1-0ubuntu2/manual/en/spa.html --- 0.22.4-1.2/manual/en/spa.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/spa.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - -

Using POPFile with Secure Password Authentication

- -

Head to the web interface's Security tab, and enter the server name and port of your Secure Password Authentication-protected server. Once done, you simply need to change the server name in your mail program to 127.0.0.1 - you don't need to change the username.

- -

Unfortunately, you can currently only have one SPA account through each installation of POPFile.

- -

A note about MSN Secure Password Authentication

- -
    -
  1. You have to start popfile with the following command -(type it in exactly) -
    perl popfile.pl -port 110 -server pop3.email.msn.com -sport -110
    - -
  2. On your accounts, server page, make sure you have the -following information: -

    -Incoming mail server: 127.0.0.1
    -Account name: YOUR_MSN_ACCOUNT_NAME_ONLY -

    -Make sure that "Log on using Secure Password -authentication" is checked -

    -On the Advanced tab, make sure that your incoming mail -port is set to 110 and the "This server requires a secure -connection (SSL)" is UNCHECKED. -

    -

  3. You should be able to check your mail now by clicking -on the account name in the "Mail Icon drop down". -
-
-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file diff -pruN 0.22.4-1.2/manual/en/training.html 1.0.1-0ubuntu2/manual/en/training.html --- 0.22.4-1.2/manual/en/training.html 2003-01-23 22:42:44.000000000 +0000 +++ 1.0.1-0ubuntu2/manual/en/training.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -POPFile Documentation - -
  POPFile Documentation 

- - - - - - - - - - - - - -
First Time Setup:Step 1
 Installing		Step 2
 Bucket Setup		Step 3
 Email Programs		Step 4
 Training		 
- - - - - - - - - - - - - -
Using POPFile with: Firewalls Secure Password Authentication Other Proxies
 Multiple Email Accounts
-
- - -

Training POPFile

- -

Straight out of the box, POPFile is stupid. It doesn't know what spam is, what e-mail is, or what any of the buckets you specified mean. It's going to take a little time to train it.

- -

When POPFile Makes A Mistake (...and it will!)

- -

POPFile's classification system needs to be trained for a while before it becomes effective - the more it's trained, the more effective it becomes. In fact, it won't even classify mail the first time you use it - it'll leave it as "unclassified".

- -

Whenever POPFile misclassifies an email, or doesn't classify it, head to the web interface and take a look at the 'History' tab (it loads by default). There, you'll see the last twenty or so emails you received, along with how POPFile classified them. (If you want to see why POPFile classified an email how it did, click on the subject line.) For each email that was wrong, correct POPFile by selecting the correct classification in the right-hand column.

- -

(These emails are already stored - you can happily move them around or delete them in your email program without affecting what POPFile thinks about them! POPFile only learns when you reclassify an email - it works under the theory of 'if it ain't broke, don't fix it'.)

- -

Give POPFile time. The more you train it, the better it gets.

- -

You're done! - -

And that's the end of the First Time Setup! POPFile is now ready to rock.

- -

-
- - - - - - - - - - - -
Web Links: Home Page Forums Bug Database 
- - \ No newline at end of file Binary files 0.22.4-1.2/manual/e_popfile1.gif and 1.0.1-0ubuntu2/manual/e_popfile1.gif differ Binary files 0.22.4-1.2/manual/e_popfile2.gif and 1.0.1-0ubuntu2/manual/e_popfile2.gif differ Binary files 0.22.4-1.2/manual/e_popfile3.gif and 1.0.1-0ubuntu2/manual/e_popfile3.gif differ Binary files 0.22.4-1.2/manual/oe_filter1.gif and 1.0.1-0ubuntu2/manual/oe_filter1.gif differ Binary files 0.22.4-1.2/manual/oe_filter2.gif and 1.0.1-0ubuntu2/manual/oe_filter2.gif differ Binary files 0.22.4-1.2/manual/oe_filter3.gif and 1.0.1-0ubuntu2/manual/oe_filter3.gif differ Binary files 0.22.4-1.2/manual/oe_filter4.gif and 1.0.1-0ubuntu2/manual/oe_filter4.gif differ Binary files 0.22.4-1.2/manual/oe_filter5.gif and 1.0.1-0ubuntu2/manual/oe_filter5.gif differ Binary files 0.22.4-1.2/manual/oe_popfile1.gif and 1.0.1-0ubuntu2/manual/oe_popfile1.gif differ Binary files 0.22.4-1.2/manual/oe_popfile2.gif and 1.0.1-0ubuntu2/manual/oe_popfile2.gif differ Binary files 0.22.4-1.2/manual/oe_popfile3.gif and 1.0.1-0ubuntu2/manual/oe_popfile3.gif differ Binary files 0.22.4-1.2/manual/oe_popfile4.gif and 1.0.1-0ubuntu2/manual/oe_popfile4.gif differ Binary files 0.22.4-1.2/manual/o_filter1.gif and 1.0.1-0ubuntu2/manual/o_filter1.gif differ Binary files 0.22.4-1.2/manual/o_filter2.gif and 1.0.1-0ubuntu2/manual/o_filter2.gif differ Binary files 0.22.4-1.2/manual/o_filter3.gif and 1.0.1-0ubuntu2/manual/o_filter3.gif differ Binary files 0.22.4-1.2/manual/o_filter4.gif and 1.0.1-0ubuntu2/manual/o_filter4.gif differ Binary files 0.22.4-1.2/manual/o_filter5.gif and 1.0.1-0ubuntu2/manual/o_filter5.gif differ Binary files 0.22.4-1.2/manual/o_filter6.gif and 1.0.1-0ubuntu2/manual/o_filter6.gif differ Binary files 0.22.4-1.2/manual/o_popfile1.gif and 1.0.1-0ubuntu2/manual/o_popfile1.gif differ Binary files 0.22.4-1.2/manual/o_popfile2.gif and 1.0.1-0ubuntu2/manual/o_popfile2.gif differ Binary files 0.22.4-1.2/manual/o_popfile3.gif and 1.0.1-0ubuntu2/manual/o_popfile3.gif differ Binary files 0.22.4-1.2/manual/p_filter1.gif and 1.0.1-0ubuntu2/manual/p_filter1.gif differ Binary files 0.22.4-1.2/manual/p_filter2.gif and 1.0.1-0ubuntu2/manual/p_filter2.gif differ Binary files 0.22.4-1.2/manual/p_filter3.gif and 1.0.1-0ubuntu2/manual/p_filter3.gif differ Binary files 0.22.4-1.2/manual/p_filter4.gif and 1.0.1-0ubuntu2/manual/p_filter4.gif differ Binary files 0.22.4-1.2/manual/p_popfile1.gif and 1.0.1-0ubuntu2/manual/p_popfile1.gif differ Binary files 0.22.4-1.2/manual/p_popfile2.gif and 1.0.1-0ubuntu2/manual/p_popfile2.gif differ Binary files 0.22.4-1.2/manual/p_popfile3.gif and 1.0.1-0ubuntu2/manual/p_popfile3.gif differ Binary files 0.22.4-1.2/manual/zonealaram.gif and 1.0.1-0ubuntu2/manual/zonealaram.gif differ diff -pruN 0.22.4-1.2/pipe.pl 1.0.1-0ubuntu2/pipe.pl --- 0.22.4-1.2/pipe.pl 2006-02-16 15:36:14.000000000 +0000 +++ 1.0.1-0ubuntu2/pipe.pl 2008-04-18 14:49:22.000000000 +0100 @@ -3,7 +3,7 @@ # # pipe.pl --- Read a message in on STDIN and write out the modified version on STDOUT # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/API.pm 1.0.1-0ubuntu2/POPFile/API.pm --- 0.22.4-1.2/POPFile/API.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/API.pm 2008-04-18 14:49:30.000000000 +0100 @@ -4,7 +4,7 @@ package POPFile::API; # # API.pm -- The API to POPFile available through XML-RPC # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/Configuration.pm 1.0.1-0ubuntu2/POPFile/Configuration.pm --- 0.22.4-1.2/POPFile/Configuration.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/Configuration.pm 2008-04-18 14:49:30.000000000 +0100 @@ -11,7 +11,7 @@ use POPFile::Module; # register specific parameters with this module. This module also handles # POPFile's command line parsing # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -661,7 +661,13 @@ sub parameter } } - return $self->{configuration_parameters__}{$name}{value}; + # If $self->{configuration_parameters__}{$name} is undefined, simply + # return undef to avoid defining $self->{configuration_parameters__}{$name}. + if ( defined($self->{configuration_parameters__}{$name}) ) { + return $self->{configuration_parameters__}{$name}{value}; + } else { + return undef; + } } # ---------------------------------------------------------------------------- diff -pruN 0.22.4-1.2/POPFile/History.pm 1.0.1-0ubuntu2/POPFile/History.pm --- 0.22.4-1.2/POPFile/History.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/History.pm 2008-04-18 14:49:30.000000000 +0100 @@ -9,7 +9,7 @@ use POPFile::Module; # This module handles POPFile's history. It manages entries in the POPFile # database and on disk that store messages previously classified by POPFile. # -# Copyright (c) 2004-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -277,12 +277,17 @@ sub reserve_slot my ( $self ) = @_; my $r; + my $in_transaction = ! ( $self->db__()->{AutoCommit} ); + $self->log_( 2, "already in a transaction." ) if ($in_transaction); while (1) { $r = int(rand( 1000000000 )+2); $self->log_( 2, "reserve_slot selected random number $r" ); + # Avoid another POPFile process using the same committed id + $self->db__()->begin_work unless ($in_transaction); + # TODO Replace the hardcoded user ID 1 with the looked up # user ID from the session key @@ -290,6 +295,7 @@ sub reserve_slot "select id from history where committed = $r limit 1;"); if ( defined( $test ) ) { + $self->db__()->commit unless ($in_transaction); next; } @@ -305,6 +311,7 @@ sub reserve_slot my $result = $self->db__()->selectrow_arrayref( "select id from history where committed = $r limit 1;"); + $self->db__()->commit unless ($in_transaction); my $slot = $result->[0]; @@ -338,7 +345,7 @@ sub release_slot unlink $file; - # It's not possible that the directory for the slot file is empty + # It's now possible that the directory for the slot file is empty # and we want to delete it so that things get cleaned up automatically $file =~ s/popfile[a-f0-9]{2}\.msg$//i; @@ -346,17 +353,10 @@ sub release_slot my $depth = 3; while ( $depth > 0 ) { - my @files = glob( $file . '*' ); - - if ( $#files == -1 ) { - if ( !( rmdir( $file ) ) ) { - last; - } - $file =~ s![a-f0-9]{2}/$!!i; - } else { + if ( !( rmdir( $file ) ) ) { last; } - + $file =~ s![a-f0-9]{2}/$!!i; $depth--; } } @@ -501,6 +501,7 @@ sub commit_history__ return; } + $self->db__()->begin_work; foreach my $entry (@{$self->{commit_list__}}) { my ( $session, $slot, $bucket, $magnet ) = @{$entry}; @@ -579,7 +580,7 @@ sub commit_history__ ${$header{$h}}[0] = $self->{classifier__}->{parser__}->decode_string( ${$header{$h}}[0] ); - + if ( !defined ${$header{$h}}[0] || ${$header{$h}}[0] =~ /^\s*$/ ) { if ( $h ne 'cc' ) { ${$header{$h}}[0] = "<$h header missing>"; @@ -587,7 +588,7 @@ sub commit_history__ ${$header{$h}}[0] = ''; } } - + ${$header{$h}}[0] =~ s/\0//g; ${$header{$h}}[0] = $self->db__()->quote( ${$header{$h}}[0] ); } @@ -639,6 +640,7 @@ sub commit_history__ $self->release_slot( $slot ); } } + $self->db__()->commit; $self->{commit_list__} = (); $self->force_requery__(); @@ -721,6 +723,7 @@ sub start_deleting my ( $self ) = @_; $self->{classifier__}->tweak_sqlite( 1, 1, $self->db__() ); + $self->db__()->begin_work; } #---------------------------------------------------------------------------- @@ -735,6 +738,7 @@ sub stop_deleting { my ( $self ) = @_; + $self->db__()->commit; $self->{classifier__}->tweak_sqlite( 1, 0, $self->db__() ); } diff -pruN 0.22.4-1.2/POPFile/Loader.pm 1.0.1-0ubuntu2/POPFile/Loader.pm --- 0.22.4-1.2/POPFile/Loader.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/Loader.pm 2008-01-25 09:39:20.000000000 +0000 @@ -11,7 +11,7 @@ package POPFile::Loader; # Subroutines not so marked are suitable for use by POPFile-based # utilities to assist in loading and executing modules # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/Logger.pm 1.0.1-0ubuntu2/POPFile/Logger.pm --- 0.22.4-1.2/POPFile/Logger.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/Logger.pm 2008-01-25 09:39:20.000000000 +0000 @@ -9,7 +9,7 @@ use POPFile::Module; # This module handles POPFile's logger. It is used to save debugging # information to disk or to send it to the screen. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -136,9 +136,27 @@ sub start $self->calculate_today__(); + $self->debug( 0, '-----------------------' ); + $self->debug( 0, 'POPFile ' . $self->version() . ' starting' ); + return 1; } +#---------------------------------------------------------------------------- +# +# stop +# +# Called to stop the logger module +# +#---------------------------------------------------------------------------- +sub stop +{ + my ( $self ) = @_; + + $self->debug( 0, 'POPFile stopped' ); + $self->debug( 0, '---------------' ); +} + # --------------------------------------------------------------------------- # # service diff -pruN 0.22.4-1.2/POPFile/Module.pm 1.0.1-0ubuntu2/POPFile/Module.pm --- 0.22.4-1.2/POPFile/Module.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/Module.pm 2008-04-18 14:49:30.000000000 +0100 @@ -2,7 +2,7 @@ # # This is POPFile's top level Module object. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/MQ.pm 1.0.1-0ubuntu2/POPFile/MQ.pm --- 0.22.4-1.2/POPFile/MQ.pm 2006-02-16 15:36:18.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/MQ.pm 2008-04-18 14:49:30.000000000 +0100 @@ -39,7 +39,7 @@ use POPFile::Module; # # RELSE Sent when a session key is being released by a client # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/Mutex.pm 1.0.1-0ubuntu2/POPFile/Mutex.pm --- 0.22.4-1.2/POPFile/Mutex.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/Mutex.pm 2008-04-18 14:49:30.000000000 +0100 @@ -5,7 +5,7 @@ package POPFile::Mutex; # This is a mutex object that uses mkdir() to provide exclusive access # to a region on a per thread or per process basis. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/POPFile/popfile_version 1.0.1-0ubuntu2/POPFile/popfile_version --- 0.22.4-1.2/POPFile/popfile_version 2006-02-16 15:38:58.000000000 +0000 +++ 1.0.1-0ubuntu2/POPFile/popfile_version 2008-04-18 21:41:26.000000000 +0100 @@ -1,3 +1,3 @@ -0 -22 -4 +1 +0 +1 diff -pruN 0.22.4-1.2/popfile.pck 1.0.1-0ubuntu2/popfile.pck --- 0.22.4-1.2/popfile.pck 2006-02-22 16:18:12.000000000 +0000 +++ 1.0.1-0ubuntu2/popfile.pck 2008-05-26 12:11:56.000000000 +0100 @@ -1,10 +1,12 @@ OPTIONAL-Upgrades from v0.20.x 0.0.0 BerkeleyDB +REQUIRED 0.0.0 Carp REQUIRED 0.0.0 DBI REQUIRED 0.0.0 Date::Format REQUIRED 0.0.0 Date::Parse REQUIRED 0.0.0 Digest::MD5 OPTIONAL-Japanese Language Support 0.0.0 Encode OPTIONAL-Japanese Language Support 0.0.0 Encode::Guess +REQUIRED 0.0.0 Fcntl REQUIRED 0.0.0 File::Copy REQUIRED 0.0.0 Getopt::Long REQUIRED 0.0.0 HTML::Tagset @@ -17,6 +19,7 @@ OPTIONAL-SSL Connection Support 0.0.0 IO OPTIONAL-Socks Proxy Support 0.0.0 IO::Socket::Socks REQUIRED 0.0.0 MIME::Base64 REQUIRED 0.0.0 MIME::QuotedPrint +OPTIONAL-Japanese Language Support 0.0.0 MeCab REQUIRED 0.0.0 POSIX REQUIRED 0.0.0 Sys::Hostname OPTIONAL-Japanese Language Support 0.0.0 Text::Kakasi diff -pruN 0.22.4-1.2/popfile.pl 1.0.1-0ubuntu2/popfile.pl --- 0.22.4-1.2/popfile.pl 2006-02-16 15:36:16.000000000 +0000 +++ 1.0.1-0ubuntu2/popfile.pl 2008-02-29 10:21:32.000000000 +0000 @@ -8,7 +8,7 @@ # header X-Text-Classification: into the header to tell the client # which category the message belongs in and much more... # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -37,7 +37,7 @@ $packing_list =~ s/[\\\/]$//; $packing_list .= '/popfile.pck'; my $fatal = 0; -my $log = ''; +my @log; if ( open PACKING, "<$packing_list" ) { while () { @@ -59,19 +59,19 @@ if ( open PACKING, "<$packing_list" ) { $fatal = 1; print STDERR "ERROR: POPFile needs Perl module $module, please install it.\n"; } else { - $log .= "WARNING: POPFile may require Perl module $module; it is needed for \"$why\".\n"; + push @log, ("Warning: POPFile may require Perl module $module; it is needed only for \"$why\"."); } } } } close PACKING; } else { - $log .= "WARNING: Couldn't open POPFile packing list ($packing_list) so cannot check configuration\n"; + push @log, ("Warning: Couldn't open POPFile packing list ($packing_list) so cannot check configuration (this probably doesn't matter)"); } use strict; use locale; -use lib defined($ENV{POPFILE_ROOT})?$ENV{POPFILE_ROOT}:'./'; +use lib defined( $ENV{POPFILE_ROOT} ) ? $ENV{POPFILE_ROOT} : '.'; use POPFile::Loader; # POPFile is actually loaded by the POPFile::Loader object which does all @@ -104,10 +104,14 @@ if ( $POPFile->CORE_config() ) { # If there were any log messages from the packing list check then # log them now - if ( $log ne '' ) { - $POPFile->get_module( 'POPFile::Logger' )->debug( 0, $log ); + if ( $#log != -1 ) { + foreach my $m (@log) { + $POPFile->get_module( 'POPFile::Logger' )->debug( 0, $m ); + } } + $POPFile->get_module( 'POPFile::Logger' )->debug( 0, "POPFile successfully started" ); + # This is the main POPFile loop that services requests, it will # exit only when we need to exit diff -pruN 0.22.4-1.2/Proxy/NNTP.pm 1.0.1-0ubuntu2/Proxy/NNTP.pm --- 0.22.4-1.2/Proxy/NNTP.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/Proxy/NNTP.pm 2008-04-18 14:49:32.000000000 +0100 @@ -8,7 +8,7 @@ use Proxy::Proxy; # # This module handles proxying the NNTP protocol for POPFile. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/Proxy/POP3.pm 1.0.1-0ubuntu2/Proxy/POP3.pm --- 0.22.4-1.2/Proxy/POP3.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/Proxy/POP3.pm 2008-04-18 14:49:32.000000000 +0100 @@ -9,7 +9,7 @@ use Digest::MD5; # # This module handles proxying the POP3 protocol for POPFile. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/Proxy/Proxy.pm 1.0.1-0ubuntu2/Proxy/Proxy.pm --- 0.22.4-1.2/Proxy/Proxy.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/Proxy/Proxy.pm 2008-04-18 14:49:32.000000000 +0100 @@ -4,7 +4,7 @@ package Proxy::Proxy; # # This module implements the base class for all POPFile proxy Modules # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # @@ -127,7 +127,7 @@ sub start my ( $self ) = @_; # Open the socket used to receive request for proxy service - + $self->log_( 1, "Opening listening socket on port " . $self->config_('port') . '.' ); $self->{server__} = IO::Socket::INET->new( Proto => 'tcp', # PROFILE BLOCK START ($self->config_( 'local' ) || 0) == 1 ? (LocalAddr => 'localhost') : (), LocalPort => $self->config_( 'port' ), @@ -220,7 +220,7 @@ sub service if ( $self->{api_session__} eq '' ) { $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' ); - } + } # Check that this is a connection from the local machine, # if it's not then we drop it immediately without any @@ -251,7 +251,7 @@ sub service $self->{api_session__} ); exit(0) if ( defined( $pid ) ); } - } else { + } else { pipe my $reader, my $writer; $self->{child_}( $self, $client, $self->{api_session__} ); @@ -332,9 +332,9 @@ sub echo_to_regexp_ $self->log_( 2, "Suppressed: $line" ); } - if ( $line =~ $regexp ) { + if ( $line =~ $regexp ) { last; - } + } } } @@ -450,7 +450,7 @@ sub echo_response_ if ( $ok == 1 ) { if ( $response =~ /$self->{good_response_}/ ) { return 0; - } else { + } else { return 1; } } else { @@ -491,6 +491,9 @@ sub verify_connected_ ProxyPort => $self->config_( 'socks_port' ), ConnectAddr => $hostname, ConnectPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to socks server at " + . $self->config_( 'socks_server' ) . ":" + . ProxyPort => $self->config_( 'socks_port' ) ); } else { if ( $ssl ) { require IO::Socket::SSL; @@ -498,11 +501,16 @@ sub verify_connected_ Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP - } else { + $self->log_( 0, "Attempting to connect to SSL server at " + . "$hostname:$port" ); + + } else { $mail = IO::Socket::INET->new( # PROFILE BLOCK START Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to POP server at " + . "$hostname:$port" ); } } @@ -517,7 +525,7 @@ sub verify_connected_ if ( !$ssl ) { binmode( $mail ); - } + } # Wait 10 seconds for a response from the remote server and if # there isn't one then give up trying to connect diff -pruN 0.22.4-1.2/Proxy/SMTP.pm 1.0.1-0ubuntu2/Proxy/SMTP.pm --- 0.22.4-1.2/Proxy/SMTP.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/Proxy/SMTP.pm 2008-04-18 14:49:32.000000000 +0100 @@ -8,7 +8,7 @@ use Proxy::Proxy; # # This module handles proxying the SMTP protocol for POPFile. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # # This file is part of POPFile # diff -pruN 0.22.4-1.2/Services/IMAP/Client.pm 1.0.1-0ubuntu2/Services/IMAP/Client.pm --- 0.22.4-1.2/Services/IMAP/Client.pm 1970-01-01 01:00:00.000000000 +0100 +++ 1.0.1-0ubuntu2/Services/IMAP/Client.pm 2008-04-18 14:49:40.000000000 +0100 @@ -0,0 +1,989 @@ +# ---------------------------------------------------------------------------- +# +# Services::IMAP::Client--- Helper module for the POPFile IMAP module +# +# Copyright (c) 2001-2008 John Graham-Cumming +# +# $Revision: 1.1.2.8 $ +# +# This file is part of POPFile +# +# POPFile is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# POPFile is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with POPFile; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Originally created by Manni Heumann (mannih2001@users.sourceforge.net) +# Modified by Sam Schinke (sschinke@users.sourceforge.net) +# Patches by David Lang (davidlang@users.sourceforge.net) +# +# ---------------------------------------------------------------------------- + +package Services::IMAP::Client; +use base qw/ POPFile::Module /; + +use strict; +use warnings; + +use IO::Socket; +use Carp; + +my $eol = "\015\012"; +my $cfg_separator = "-->"; + +# ---------------------------------------------------------------------------- +# +# new - Create a new IMAP client object +# +# IN: two subroutine refs and an integer +# config -> reference to the config_ sub +# log -> reference to logger module +# global_config -> reference to the global_config_ sub +# +# OUT: a blessed object or undef if the config hash was incomplete +# ---------------------------------------------------------------------------- + +sub new { + my $class = shift; + my $config = shift; + my $log = shift; + my $global_config = shift; + + my $self = bless {}, $class; + + # This is needed when the client module is run in POPFile 0.22.2 context + $self->{logger__} = $log or return; + # And this one is for the 0.23 (aka 2.0) context: + $self->{modules__}{logger} = $log; + + $self->{config__} = $config or return; + $self->{global_config__} = $global_config or return; + + $self->{host} = $self->config_( 'hostname' ); + $self->{port} = $self->config_( 'port' ); + $self->{login} = $self->config_( 'login' ); + $self->{pass} = $self->config_( 'password' ); + $self->{ssl} = $self->config_( 'use_ssl' ); + + $self->{timeout} = $self->global_config_( 'timeout' ); + $self->{cutoff} = $self->global_config_( 'message_cutoff' ); + + + $self->{socket} = undef; + $self->{folder} = undef; + $self->{tag} = 0; + $self->{name__} = 'IMAP-Client'; + + return $self; +} + + +# ---------------------------------------------------------------------------- +# +# config_ - Replacement for POPFile::Module::config_ +# ---------------------------------------------------------------------------- + +sub config_ { + my $self = shift; + return &{$self->{config__}}( @_ ); +} + + +# ---------------------------------------------------------------------------- +# +# global_config_ - Replacement for POPFile::Module::global_config_ +# ---------------------------------------------------------------------------- + +sub global_config_ { + my $self = shift; + return &{$self->{global_config__}}( @_ ); +} + + +# ---------------------------------------------------------------------------- +# +# connect - Connect to the IMAP server. +# +# IN: - +# OUT: true on success +# undef on error +# ---------------------------------------------------------------------------- + +sub connect { + my $self = shift; + + my $hostname = $self->{host}; + my $port = $self->{port}; + my $use_ssl = $self->{ssl}; + my $timeout = $self->{timeout}; + + $self->log_( 1, "Connecting to $hostname:$port" ); + + if ( $hostname ne '' && $port ne '' ) { + my $response = ''; + my $imap; + + if ( $use_ssl ) { + require IO::Socket::SSL; + $imap = IO::Socket::SSL->new ( + Proto => "tcp", + PeerAddr => $hostname, + PeerPort => $port, + Timeout => $timeout, + ) + or $self->log_(0, "IO::Socket::SSL error: $@"); + } + else { + $imap = IO::Socket::INET->new( + Proto => "tcp", + PeerAddr => $hostname, + PeerPort => $port, + Timeout => $timeout, + ) + or $self->log_(0, "IO::Socket::INET error: $@"); + } + + + # Check that the connect succeeded for the remote server + if ( $imap ) { + if ( $imap->connected ) { + # Set binmode on the socket so that no translation of CRLF + # occurs + binmode( $imap ) if $use_ssl == 0; + + # Wait for a response from the remote server and if + # there isn't one then give up trying to connect + my $selector = IO::Select->new( $imap ); + unless ( () = $selector->can_read( $timeout ) ) { + $self->log_( 0, "Connection timed out for $hostname:$port" ); + return; + } + + $self->log_( 0, "Connected to $hostname:$port timeout $timeout" ); + + # Read the response from the real server + my $buf = $self->slurp_( $imap ); + $self->log_( 1, ">> $buf" ); + $self->{socket} = $imap; + return 1; + } + } + } + else { + $self->log_( 0, "Invalid port or hostname. Will not connect to server." ); + return; + } +} + + +# ---------------------------------------------------------------------------- +# +# login - Login on the IMAP server. +# +# IN: - +# OUT: true on success +# undef on error +# ---------------------------------------------------------------------------- + +sub login { + my $self = shift; + + my $login = $self->{login}; + my $pass = $self->{pass}; + + $self->log_( 1, "Logging in" ); + + $self->say( 'LOGIN "' . $login . '" "' . $pass . '"' ); + + if ( $self->get_response() == 1 ) { + return 1; + } + else { + return; + } +} + +# ---------------------------------------------------------------------------- +# +# noop - Do a NOOP on the server. Whatever that might be good for. +# +# IN: - +# OUT: see get_response() +# ---------------------------------------------------------------------------- + +sub noop { + my $self = shift; + + $self->say( 'NOOP' ); + my $result = $self->get_response(); + $self->log_( 0, "NOOP failed (return value $result)" ) unless $result == 1; + + return $result; +} + +# ---------------------------------------------------------------------------- +# +# status - Do a STATUS on the server, asking for UIDNEXT and UIDVALIDITY +# information. +# +# IN: $folder - name of the mailbox to be STATUSed +# OUT: hasref with the keys UIDNEXT and UIDVALIDITY +# ---------------------------------------------------------------------------- + +sub status { + my $self = shift; + my $folder = shift; + my $ret = { UIDNEXT => undef, UIDVALIDITY => undef }; + + $self->say( "STATUS \"$folder\" (UIDNEXT UIDVALIDITY)" ); + if ( $self->get_response() == 1 ) { + my @lines = split /$eol/, $self->{last_response}; + + foreach ( @lines ) { + if ( /^\* STATUS/ ) { + if ( /UIDNEXT (\d+)/ ) { + $ret->{UIDNEXT} = $1; + } + if ( /UIDVALIDITY (\d+)/ ) { + $ret->{UIDVALIDITY} = $1; + } + } + last; + } + } + else { + # TODO: what now? + } + + foreach ( keys %$ret ) { + if ( ! defined $ret->{$_}) { + $self->log_( 0, "Could not get $_ STATUS for folder $folder." ); + } + } + return $ret; +} + +# ---------------------------------------------------------------------------- +# +# DESTROY - Destructor called by Perl +# +# Will close the socket if it's connected. +# TODO: This method could be friendly and try to logout first. OTOH, we +# might no longer be logged in. +# +# ---------------------------------------------------------------------------- + +sub DESTROY { + my $self = shift; + $self->log_( 1, "IMAP-Client is exiting" ); + $self->{socket}->shutdown( 2 ) if defined $self->{socket}; +} + + +# ---------------------------------------------------------------------------- +# +# expunge - Issue an EXPUNGE command. We need to be in a SELECTED state for +# this to work. +# +# IN: - +# OUT: see get_response() +# ---------------------------------------------------------------------------- + +sub expunge { + my $self = shift; + $self->say( 'EXPUNGE' ); + $self->get_response(); +} + + +# ---------------------------------------------------------------------------- +# +# say - Say something to the server. This method will also provide a valid +# tag and a nice line ending. +# +# IN: $command - String containing the command +# OUT: true und success, undef on error +# ---------------------------------------------------------------------------- + +sub say { + my $self = shift; + my $command = shift; + + $self->{last_command} = $command; + my $tag = $self->{tag}; + + my $cmdstr = sprintf "A%05d %s%s", $tag, $command, $eol; + + # Talk to the server + unless( print {$self->{socket}} $cmdstr ) { + $self->bail_out( "Lost connection while I tried to say '$cmdstr'." ); + } + + # Log command + # Obfuscate login and password for logins: + $cmdstr =~ s/^(A\d+) LOGIN ".+?" ".+"(.+)/$1 LOGIN "xxxxx" "xxxxx"$2/; + $self->log_( 1, "<< $cmdstr" ); + + return 1; +} + + +# ---------------------------------------------------------------------------- +# +# get_response +# +# Get a response from our server. You should normally not need to call this function +# directly. Use get_response__ instead. +# +# Arguments: +# +# $imap: A valid socket object +# $last_command: The command we are issued before. +# $tag_ref: A reference to a scalar that will receive tag value that can be +# used to tag the next command +# $response_ref: A reference to a scalar that will receive the servers response. +# +# Return value: +# undef lost connection +# 1 Server answered OK +# 0 Server answered NO +# -1 Server answered BAD +# -2 Server gave unexpected tagged answer +# -3 Server didn't say anything, but the connection is still valid (I guess this cannot happen) +# +# ---------------------------------------------------------------------------- + +sub get_response { + my $self = shift; + my $imap = $self->{socket}; + + local $SIG{ALRM} + = sub { + alarm 0; + $self->bail_out( "The connection to the IMAP server timed out while we waited for a response." ); + }; + alarm $self->global_config_( 'timeout' ); + + # What is the actual tag we have to look for? + my $actual_tag = sprintf "A%05d", $self->{tag}; + + my $response = ''; + my $count_octets = 0; + my $octet_count = 0; + + # Slurp until we find a reason to quit + while ( my $buf = $self->slurp_( $imap ) ) { + + # Check for lost connections: + if ( $response eq '' && ! defined $buf ) { + $self->bail_out( "The connection to the IMAP server was lost while trying to get a response to command '$self->{last_command}'." ); + } + + # If this is the first line of the response and + # if we find an octet count in curlies before the + # newline, then we will rely on the octet count + + if ( $response eq '' && $buf =~ m/{(\d+)}$eol/ ) { + + # Add the length of the first line to the + # octet count provided by the server + + $count_octets = $1 + length( $buf ); + } + + $response .= $buf; + + if ( $count_octets ) { + $octet_count += length $buf; + + # There doesn't seem to be a requirement for the message to end with + # a newline. So we cannot go for equality + + if ( $octet_count >= $count_octets ) { + $count_octets = 0; + } + $self->log_( 2, ">> $buf" ); + } + + # If we aren't counting octets (anymore), we look out for tag + # followed by BAD, NO, or OK and we also keep an eye open + # for untagged responses that the server might send us unsolicited + if ( $count_octets == 0 ) { + if ( $buf =~ /^$actual_tag (OK|BAD|NO)/ ) { + + if ( $1 ne 'OK' ) { + $self->log_( 0, ">> $buf" ); + } + else { + $self->log_( 1, ">> $buf" ); + } + + last; + } + + # Here we look for untagged responses and decide whether they are + # solicited or not based on the last command we gave the server. + + if ( $buf =~ /^\* (.+)/ ) { + my $untagged_response = $1; + + $self->log_( 1, ">> $buf" ); + + # This should never happen, but under very rare circumstances, + # we might get a change of the UIDVALIDITY value while we + # are connected + if ( $untagged_response =~ /UIDVALIDITY/ + && ( $self->{last_command} !~ /^SELECT/ && $self->{last_command} !~ /^STATUS/ ) ) { + $self->log_( 0, "Got unsolicited UIDVALIDITY response from server while reading response for $self->{last_command}." ); + } + + # This could happen, but will be caught by the eval in service(). + # Nevertheless, we look out for unsolicited bye-byes here. + if ( $untagged_response =~ /^BYE/ + && $self->{last_command} !~ /^LOGOUT/ ) { + $self->log_( 0, "Got unsolicited BYE response from server while reading response for $self->{last_command}." ); + } + } + } + } + + # save result away so we can always have a look later on + $self->{last_response} = $response; + + alarm 0; + + # Increment tag for the next command/reply sequence: + $self->{tag}++; + + if ( $response ) { + + # determine our return value + + # We got 'OK' and the correct tag. + if ( $response =~ /^$actual_tag OK/m ) { + return 1; + } + # 'NO' plus correct tag + elsif ( $response =~ /^$actual_tag NO/m ) { + return 0; + } + # 'BAD' and correct tag. + elsif ( $response =~ /^$actual_tag BAD/m ) { + return -1; + } + # Someting else, probably a different tag, but who knows? + else { + $self->log_( 0, "!!! Server said something unexpected !!!" ); + return -2; + } + } + else { + $self->bail_out( "The connection to the IMAP server was lost while trying to get a response to command '$self->{last_command}'" ); + } +} + + +# ---------------------------------------------------------------------------- +# +# select +# +# Do a SELECT on the passed-in folder. Returns the result of get_response() +# +# Arguments: +# $folder: The name of a mailbox on the server +# +# Return value: +# +# INT 1 is ok, everything else is an error +# ---------------------------------------------------------------------------- + +sub select { + my $self = shift; + my $folder = shift; + + $self->say( "SELECT \"$folder\"" ); + my $result = $self->get_response(); + + if ( $result == 1 ) { + $self->{folder} = $folder; + } + + return $result +} + + +# ---------------------------------------------------------------------------- +# +# get_mailbox_list +# +# Request a list of mailboxes from the server behind the passed in socket object. +# The list is sorted and returned +# +# Arguments: none +# +# Return value: list of mailboxes, possibly emtpy (or error) +# ---------------------------------------------------------------------------- + +sub get_mailbox_list { + my $self = shift; + + $self->log_( 1, "Getting mailbox list" ); + + $self->say( 'LIST "" "*"' ); + my $result = $self->get_response(); + + if ( $result != 1 ) { + $self->log_( 0, "LIST command failed (return value [$result])." ); + return; + } + + my @lines = split /$eol/, $self->{last_response}; + my @mailboxes; + + foreach ( @lines ) { + next unless /^\*/; + s/^\* LIST \(.*\) .+? (.+)$/$1/; + s/"(.*?)"/$1/; + push @mailboxes, $1; + } + + return sort @mailboxes; +} + + +# ---------------------------------------------------------------------------- +# +# logout +# +# log out of the the server we are currently connected to. +# +# Arguments: none +# +# Return values: +# 0 on failure +# 1 on success +# ---------------------------------------------------------------------------- + +sub logout { + my $self = shift; + + $self->log_( 1, "Logging out" ); + + $self->say( 'LOGOUT' ); + + if ( $self->get_response() == 1 ) { + $self->{socket}->shutdown( 2 ); + $self->{folder} = undef; + $self->{socket} = undef; + return 1; + } + else { + return 0; + } +} + + +# ---------------------------------------------------------------------------- +# +# move_message +# +# Will try to move a message on the IMAP server. +# +# arguments: +# +# $msg: +# The UID of the message +# $destination: +# The destination folder. +# +# ---------------------------------------------------------------------------- + +sub move_message { + my $self = shift; + my $msg = shift; + my $destination = shift; + + $self->log_( 1, "Moving message $msg to $destination" ); + + # Copy message to destination + $self->say( "UID COPY $msg \"$destination\"" ); + my $ok = $self->get_response(); + + # If that went well, flag it as deleted + if ( $ok == 1 ) { + $self->say( "UID STORE $msg +FLAGS (\\Deleted)" ); + $ok = $self->get_response(); + } + else { + $self->log_( 0, "Could not copy message ($ok)!" ); + } + + return ( $ok ? 1 : 0 ); +} + + +# ---------------------------------------------------------------------------- +# +# get_new_message_list +# +# Will search for messages on the IMAP server that are not flagged as deleted +# that have a UID greater than or equal to the value stored as UIDNEXTfor +# the currently SELECTed folder. +# +# arguments: none +# +# return value: +# +# A sorted list (possibly empty) of the UIDs of matching messages. +# +# ---------------------------------------------------------------------------- + +sub get_new_message_list { + my $self = shift; + + my $folder = $self->{folder}; + my $uid = $self->uid_next( $folder ); + + $self->log_( 1, "Getting uids ge $uid in folder $folder" ); + + $self->say( "UID SEARCH UID $uid:* UNDELETED" ); + my $result = $self->get_response(); + + if ( $result != 1 ) { + $self->log_( 0, "SEARCH command failed (return value: $result, used UID was [$uid])!" ); + } + + # The server will respond with an untagged search reply. + # This can either be empty ("* SEARCH") or if a + # message was found it contains the numbers of the matching + # messages, e.g. "* SEARCH 2 5 9". + # In the latter case, the regexp below will match and + # capture the list of messages in $1 + + my @matching = (); + + if ( $self->{last_response} =~ /\* SEARCH (.+)$eol/ ) { + @matching = split / /, $1; + } + + my @return_list = (); + + # Make sure that the UIDs reported by the server are really greater + # than or equal to our passed in comparison value + + foreach my $num ( @matching ) { + if ( $num >= $uid ) { + push @return_list, $num; + } + } + + return ( sort { $a <=> $b } @return_list ); +} + + +# ---------------------------------------------------------------------------- +# +# get_new_message_list_unselected +# +# If we are not in the selected state, you can use this routine to get a list +# of new messages on the server in a specific mailbox. +# The routine will do a STATUS (UIDNEXT) and compare our old +# UIDNEXT value to the new one. +# If it turns out that the new value is larger than the old, the mailbox +# is selected and the list of new UIDs gets retrieved. In that case, +# we will remain in a selected state. +# +# arguments: $folder - the folder that should be examined +# returns: see get_new_message_list +# ---------------------------------------------------------------------------- + +sub get_new_message_list_unselected { + my $self = shift; + my $folder = shift; + + my $last_known = $self->uid_next( $folder ); + + my $info = $self->status( $folder ); + + if ( ! defined $info ) { + $self->bail_out( "Could not get a valid response to the STATUS command." ); + } + else { + my $new_next = $info->{UIDNEXT}; + my $new_vali = $info->{UIDVALIDITY}; + + if ( $new_vali != $self->uid_validity( $folder ) ) { + $self->log_( 0, "The folder $folder has a new UIDVALIDTIY value! Skipping new messages (if any)." ); + $self->uid_validity( $folder, $new_vali ); + return; + } + + if ( $last_known < $new_next ) { + $self->select( $folder ); + return $self->get_new_message_list(); + } + } + + return; +} + + +# ---------------------------------------------------------------------------- +# +# fetch_message_part +# +# This function will fetch a specified part of a specified message from +# the IMAP server and return the message as a list of lines. +# It assumes that a folder is already SELECTed +# +# arguments: +# +# $msg: UID of the message +# $part: The part of the message you want to fetch. Could be 'HEADER' for the +# message headers, 'TEXT' for the body (including any attachments), or '' to +# fetch the complete message. Other values are also possible, but currently +# not used. 'BODYSTRUCTURE' could be interesting. +# +# return values: +# +# a boolean value indicating success/fallure and +# a list containing the lines of the retrieved message (part). +# +# ---------------------------------------------------------------------------- + +sub fetch_message_part { + my $self = shift; + my $msg = shift; + my $part = shift; + + my $folder = $self->{folder}; + + if ( $part ne '' ) { + $self->log_( 1, "Fetching $part of message $msg" ); + } + else { + $self->log_( 1, "Fetching message $msg" ); + } + + if ( $part eq 'TEXT' || $part eq '' ) { + my $limit = $self->{cutoff} || 0; + $self->say( "UID FETCH $msg (FLAGS BODY.PEEK[$part]<0.$limit>)" ); + } + else { + $self->say( "UID FETCH $msg (FLAGS BODY.PEEK[$part])" ); + } + + my $result = $self->get_response(); + + if ( $part ne '' ) { + $self->log_( 1, "Got $part of message # $msg, result: $result." ); + } + else { + $self->log_( 1, "Got message # $msg, result: $result." ); + } + + if ( $result == 1 ) { + my @lines = (); + + # The first line now MUST start with "* x FETCH" where x is a message + # sequence number anything else indicates that something went wrong + # or that something changed. E.g. the message we wanted + # to fetch is no longer there. + + my $last_response = $self->{last_response}; + + if ( $last_response =~ m/\^* \d+ FETCH/ ) { + + # The first line should contain the number of octets the server send us + + if ( $last_response =~ m/(?!$eol){(\d+)}$eol/ ) { + my $num_octets = $1; + + # Grab the number of octets reported: + + my $pos = index $last_response, "{$num_octets}$eol"; + $pos += length "{$num_octets}$eol"; + + my $message = substr $last_response, $pos, $num_octets; + + # Take the large chunk and chop it into single lines + + # We cannot use split here, because this would get rid of + # trailing and leading newlines and thus omit complete lines. + + while ( $message =~ m/(.*?(?:$eol|\012|\015))/g ) { + push @lines, $1; + } + } + # No number of octets: fall back, but issue a warning + else { + while ( $last_response =~ m/(.*?(?:$eol|\012|\015))/g ) { + push @lines, $1; + } + + # discard the first and the two last lines; these are server status responses. + shift @lines; + pop @lines; + pop @lines; + + $self->log_( 0, "Could not find octet count in server's response!" ); + } + } + else { + $self->log_( 0, "Unexpected server response to the FETCH command!" ); + } + + return 1, @lines; + } + else { + return 0; + } +} + + + +#--------------------------------------------------------------------------------------------- +# +# uid_validity +# +# Get the stored UIDVALIDITY value for the passed-in folder +# or pass in new UIDVALIDITY value to store the value +# +# arguments: $folder [, $new_uidvalidity_value] +# returns: the stored UIDVALIDITY value or undef if no value was stored previously +#--------------------------------------------------------------------------------------------- + +sub uid_validity { + my $self = shift; + my $folder = shift or confess "gimme a folder!"; + my $uidval = shift; + + my $all = $self->config_( 'uidvalidities' ); + + my %hash; + + if ( defined $all ) { + %hash = split /$cfg_separator/, $all; + } + + # set + if ( defined $uidval ) { + $hash{$folder} = $uidval; + $all = ''; + while ( my ( $key, $value ) = each %hash ) { + $all .= "$key$cfg_separator$value$cfg_separator"; + } + $self->config_( 'uidvalidities', $all ); + $self->log_( 1, "Updated UIDVALIDITY value for folder $folder to $uidval." ); + } + # get + else { + if ( exists $hash{$folder} && $hash{$folder} =~ /^\d+$/ ) { + return $hash{$folder}; + } + else { + return undef; + } + } +} + + +#--------------------------------------------------------------------------------------------- +# +# uid_next +# +# Get the stored UIDNEXT value for the passed-in folder +# or pass in a new UIDNEXT value to store the value +# +# arguments: $folder [, $new_uidnext_value] +# returns: the stored UIDVALIDITY value or undef if no value was stored previously +#--------------------------------------------------------------------------------------------- + +sub uid_next { + my $self = shift; + my $folder = shift or confess "I need a folder"; + my $uidnext = shift; + + my $all = $self->config_( 'uidnexts' ); + my %hash = (); + + if ( defined $all ) { + %hash = split /$cfg_separator/, $all; + } + + # set + if ( defined $uidnext ) { + $hash{$folder} = $uidnext; + $all = ''; + while ( my ( $key, $value ) = each %hash ) { + $all .= "$key$cfg_separator$value$cfg_separator"; + } + $self->config_( 'uidnexts', $all ); + $self->log_( 1, "Updated UIDNEXT value for folder $folder to $uidnext." ); + } + # get + else { + if ( exists $hash{$folder} && $hash{$folder} =~ /^\d+$/ ) { + return $hash{$folder}; + } + return; + } +} + + +# ---------------------------------------------------------------------------- +# +# check_uidvalidity - Compare the stored UIDVALIDITY value to the passed-in +# value +# +# IN: $folder, $uidvalidity_value +# OUT: true if the values are equal, undef otherwise +# ---------------------------------------------------------------------------- +sub check_uidvalidity { + my $self = shift; + my $folder = shift; + my $new_val = shift; + + confess "check_uidvalidity needs a new uidvalidity!" unless defined $new_val; + confess "check_uidvalidity needs a folder name!" unless defined $folder; + + # Save old UIDVALIDITY value (if we have one) + my $old_val = $self->uid_validity( $folder ); + + # Check whether the old value is still valid + if ( $new_val != $old_val ) { + return; + } + else { + return 1; + } +} + + +sub connected { + my $self = shift; + return $self->{socket} ? 1 : undef; +} + + +sub bail_out { + my $self = shift; + my $msg = shift; + + $self->{socket}->shutdown( 2 ) if defined $self->{socket}; + $self->{socket} = undef; + my ( $package, $filename, $line, $subroutine ) = caller(); + $self->log_( 0, $msg ); + die "POPFILE-IMAP-EXCEPTION: $msg ($filename ($line))"; +} + + +1; diff -pruN 0.22.4-1.2/Services/IMAP.pm 1.0.1-0ubuntu2/Services/IMAP.pm --- 0.22.4-1.2/Services/IMAP.pm 2006-02-16 15:36:20.000000000 +0000 +++ 1.0.1-0ubuntu2/Services/IMAP.pm 2008-04-18 14:49:40.000000000 +0100 @@ -1,15 +1,18 @@ # POPFILE LOADABLE MODULE package Services::IMAP; use POPFile::Module; +use Services::IMAP::Client; @ISA = ("POPFile::Module"); +use Carp; +use Fcntl; # ---------------------------------------------------------------------------- # # IMAP.pm --- a module to use POPFile for an IMAP connection. # -# Copyright (c) 2001-2006 John Graham-Cumming +# Copyright (c) 2001-2008 John Graham-Cumming # -# $Revision: 1.9.4.2 $ +# $Revision: 1.9.4.23 $ # # This file is part of POPFile # @@ -36,13 +39,11 @@ use POPFile::Module; # # ---------------------------------------------------------------------------- -use IO::Socket; use Digest::MD5 qw( md5_hex ); use strict; use warnings; use locale; -my $eol = "\015\012"; my $cfg_separator = "-->"; #---------------------------------------------------------------------------- @@ -51,12 +52,9 @@ my $cfg_separator = "-->"; # Class new() function #---------------------------------------------------------------------------- -sub new -{ +sub new { my $type = shift; - my $self = POPFile::Module->new(); - - bless $self, $type; + my $self = $type->SUPER::new(); $self->name( 'imap' ); @@ -100,6 +98,8 @@ sub new $self->{history__} = 0; + $self->{imap_error} = ''; + return $self; } @@ -111,9 +111,8 @@ sub new # # ---------------------------------------------------------------------------- -sub initialize -{ - my ( $self ) = @_; +sub initialize { + my $self = shift; $self->config_( 'hostname', '' ); $self->config_( 'port', 143 ); @@ -157,9 +156,8 @@ sub initialize # # ---------------------------------------------------------------------------- -sub start -{ - my ( $self ) = @_; +sub start { + my $self = shift; if ( $self->config_( 'enabled' ) == 0 ) { return 2; @@ -203,28 +201,17 @@ sub start # ---------------------------------------------------------------------------- # stop # -# Not much to do here. +# Clean up - release the session key # # ---------------------------------------------------------------------------- -sub stop -{ - my ( $self ) = @_; - - if ( $self->{api_session__} ne '' ) { - $self->{classifier__}->release_session_key( $self->{api_session__} ); - } +sub stop { + my $self = shift; - foreach ( keys %{$self->{folders__}} ) { - if ( exists $self->{folders__}{$_}{imap} ) { - $self->{folders__}{$_}{imap}->shutdown( 2 ); - delete $self->{folders__}{$_}{imap}; - } - } + $self->disconnect_folders__(); } - # ---------------------------------------------------------------------------- # # service @@ -235,19 +222,13 @@ sub stop # # ---------------------------------------------------------------------------- -sub service -{ - my ( $self ) = @_; +sub service { + my $self = shift; if ( time - $self->{last_update__} >= $self->config_( 'update_interval' ) ) { - # Check to see if we have obtained a session key yet - if ( $self->{api_session__} eq '' ) { - $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' ); - } - - # Since say__() as well as get_response__() can throw an exception, i.e. die if - # they detect a lost connection, we eval the following code to be able + # Since the IMAP-Client module can throw an exception, i.e. die if + # it detects a lost connection, we eval the following code to be able # to catch the exception. We also tell Perl to ignore broken pipes. eval { @@ -255,44 +236,40 @@ sub service local $SIG{'__DIE__'}; if ( $self->config_( 'training_mode' ) == 1 ) { - $self->train_on_archive__(); - } else { # If we haven't yet set up a list of serviced folders, # or if the list was changed by the user, build up a # list of folder in $self->{folders__} - if ( ( keys %{$self->{folders__}} == 0 ) || ( $self->{folder_change_flag__} == 1 ) ) { $self->build_folder_list__(); } - # Try to establish connections, log in, and select for - # all of our folders - $self->connect_folders__(); + $self->connect_server__(); - # Reset the hash containing the hash values we have seen the + # Reset the hash containing the hash values we have seen the # last time through service. $self->{hash_values__} = (); # Now do the real job foreach my $folder ( keys %{$self->{folders__}} ) { - if ( exists $self->{folders__}{$folder}{imap} ) { - $self->scan_folder( $folder ); - } } } }; # if an exception occurred, we try to catch it here if ( $@ ) { + $self->disconnect_folders__(); + # If we caught an exception, we better reset training_mode + $self->config_( 'training_mode', 0 ); + # say__() and get_response__() will die with this message: - if ( $@ =~ /The connection to the IMAP server was lost/ ) { - $self->log_( 0, $@ ); + if ( $@ =~ /^POPFILE-IMAP-EXCEPTION: (.+\)\))/ ) { + $self->log_( 0, $1 ); } # If we didn't die but somebody else did, we have empathy. else { @@ -328,9 +305,8 @@ sub service # none. #---------------------------------------------------------------------------- -sub build_folder_list__ -{ - my ( $self ) = @_; +sub build_folder_list__ { + my $self = shift; $self->log_( 1, "Building list of serviced folders." ); @@ -342,12 +318,12 @@ sub build_folder_list__ %{$self->{folders__}} = (); # watched folders - foreach ( $self->watched_folders__() ) { - $self->{folders__}{$_}{watched} = 1; + foreach my $folder ( $self->watched_folders__() ) { + $self->{folders__}{$folder}{watched} = 1; } # output folders - foreach my $bucket ( $self->{classifier__}->get_all_buckets( $self->{api_session__} ) ) { + foreach my $bucket ( $self->classifier()->get_all_buckets( $self->api_session() ) ) { my $folder = $self->folder_for_bucket__( $bucket ); @@ -370,92 +346,106 @@ sub build_folder_list__ } - -#---------------------------------------------------------------------------- -# connect_folders__ -# -# This function will iterate over each folder found in the %{$self->{folders__}} -# hash. For each folder it will try to establish a connection, log in, and select -# the folder. -# The corresponding socket object, will be stored in -# $self->{folders__}{$folder}{imap} +# ---------------------------------------------------------------------------- # -# arguments: -# none. +# connect_server__ - Connect to the IMAP server if we are only using a single +# connection. The method will connect to the server, login +# retrieve the list of mailboxes and do a status on each +# of the folders that we are interested in to see whether +# the UIDVALIDITY has changed. # -# return value: -# none. -#---------------------------------------------------------------------------- +# IN: - +# OUT: will die on failure +# ---------------------------------------------------------------------------- -sub connect_folders__ -{ - my ( $self ) = @_; +sub connect_server__ { + my $self = shift; - # Establish a connection for each folder in the hash + # Establish a single connection but gather all the data + # we need for each folder. - foreach my $folder ( keys %{$self->{folders__}} ) { + my $imap = undef; - # We may already have a valid connection for this folder: + foreach my $folder ( keys %{$self->{folders__}} ) { + # We may already have a valid connection: if ( exists $self->{folders__}{$folder}{imap} ) { - next; + last; } - - $self->{folders__}{$folder}{server} = 1; - $self->{folders__}{$folder}{tag} = 0; - # The folder may be write-only: if ( exists $self->{folders__}{$folder}{output} && ! exists $self->{folders__}{$folder}{watched} && - $self->{classifier__}->is_pseudo_bucket( $self->{api_session__}, - $self->{folders__}{$folder}{output} ) ) { + $self->classifier()->is_pseudo_bucket( $self->api_session(), + $self->{folders__}{$folder}{output} ) ) { next; } - $self->log_( 1, "Trying to connect to ". $self->config_( 'hostname' ) . " for folder $folder." ); - $self->{folders__}{$folder}{imap} = $self->connect( $self->config_( 'hostname' ), $self->config_( 'port' ) ); - - # Did the connection succeed? - if ( defined $self->{folders__}{$folder}{imap} ) { + # We may have to create a fresh connection here. + if ( ! defined $imap ) { + # Have we got a stored active connection? + $imap = $self->{folders__}{$folder}{imap}; + + # Nope, must be the first time we end up here. + if ( ! defined $imap ) { + $imap = $self->new_imap_client(); + if ( $imap ) { + $self->{folders__}{$folder}{imap} = $imap; + } + else { + die "POPFILE-IMAP-EXCEPTION: Could not connect: $self->{imap_error} " . __FILE__ . '(' . __LINE__ . '))'; + } + } + } - if ( $self->login( $folder ) ) { + # Build a list of IMAP mailboxes if we haven't already got one: + unless ( @{$self->{mailboxes__}} ) { + @{$self->{mailboxes__}} = $imap->get_mailbox_list(); + } - # Build a list of IMAP mailboxes if we haven't already got one: - unless ( @{$self->{mailboxes__}} ) { - $self->get_mailbox_list( $self->{folders__}{$folder}{imap} ); - } + # Do a STATUS to check UIDVALIDITY and UIDNEXT + my $info = $imap->status( $folder ); + my $uidnext = $info->{UIDNEXT}; + my $uidvalidity = $info->{UIDVALIDITY}; - # Change to / SELECT the folder - $self->say__( $folder, "SELECT \"$folder\"" ); - if ( $self->get_response__( $folder ) != 1 ) { + if ( defined $uidvalidity && defined $uidnext ) { + $self->{folders__}{$folder}{imap} = $imap; - $self->log_( 0, "Could not SELECT folder $folder." ); - $self->say__( $folder, "LOGOUT" ); - $self->get_response__( $folder ); - delete $self->{folders__}{$folder}{imap}; + # If we already have a UIDVALIDITY value stored, + # we compare the old and the new value. + if ( defined $imap->uid_validity( $folder ) ) { + if ( $imap->check_uidvalidity( $folder, $uidvalidity ) ) { + # That's the nice case. + # But let's make sure that our UIDNEXT value is also valid + unless ( defined $imap->uid_next( $folder ) ) { + $self->log_( 0, "Detected invalid UIDNEXT configuration value for folder $folder. Some new messages might have been skipped." ); + $imap->uid_next( $folder, $uidnext ); + } } else { - # And now check that our UIDs are valid - unless ( $self->folder_uid_status__( $folder ) ) { - $self->log_( 0, "Changed UIDVALIDITY for folder $folder. Some new messages might have been skipped." ); - } + # The validity has changed, we log this and update our stored + # values for UIDNEXT and UIDVALIDITY + $self->log_( 0, "Changed UIDVALIDITY for folder $folder. Some new messages might have been skipped." ); + $imap->uid_validity( $folder, $uidvalidity ); + $imap->uid_next( $folder, $uidnext ); } } else { - $self->log_( 0, "Could not LOGIN for folder $folder." ); - delete $self->{folders__}{$folder}{imap}; + # We don't have a stored value, so let's change that. + $self->log_( 0, "Storing UIDVALIDITY for folder $folder." ); + $imap->uid_validity( $folder, $uidvalidity ); + $imap->uid_next( $folder, $uidnext ); } } else { - $self->log_( 0, "Could not CONNECT for folder $folder." ); - delete $self->{folders__}{$folder}{imap}; + $self->log_( 0, "Could not STATUS folder $folder." ); + $imap->logout(); + die "POPFILE-IMAP-EXCEPTION: Lost connection while trying to log out (" . __FILE__ . '(' . __LINE__ . '))'; } } } - # ---------------------------------------------------------------------------- # # disconnect_folders__ @@ -465,15 +455,16 @@ sub connect_folders__ # # ---------------------------------------------------------------------------- -sub disconnect_folders__ -{ - my ( $self ) = @_; +sub disconnect_folders__ { + my $self = shift; + + $self->log_( 1, "Trying to disconnect all connections." ); foreach my $folder ( keys %{$self->{folders__}} ) { - # We may already have a valid connection for this folder: - if ( exists $self->{folders__}{$folder}{imap} ) { - $self->logout( $folder ); + my $imap = $self->{folders__}{$folder}{imap}; + if ( defined $imap && $imap->connected() ) { + $imap->logout( $folder ); } } %{$self->{folders__}} = (); @@ -499,27 +490,28 @@ sub disconnect_folders__ # # ---------------------------------------------------------------------------- -sub scan_folder -{ - my ( $self, $folder) = @_; +sub scan_folder { + my $self = shift; + my $folder = shift; # make the flags more accessible. my $is_watched = ( exists $self->{folders__}{$folder}{watched} ) ? 1 : 0; - my $is_output = ( exists $self->{folders__}{$folder}{output} ) ? $self->{folders__}{$folder}{output} : ''; + my $is_output = ( exists $self->{folders__}{$folder}{output } ) ? $self->{folders__}{$folder}{output} : ''; $self->log_( 1, "Looking for new messages in folder $folder." ); + my $imap = $self->{folders__}{$folder}{imap}; + # Do a NOOP first. Certain implementations won't tell us about # new messages while we are connected and selected otherwise: - - $self->say__( $folder, "NOOP" ); - my $result = $self->get_response__( $folder ); - if ( $result != 1 ) { - $self->log_( 0, "NOOP failed (return value $result)" ); + if ( ! $imap->noop() ) { + # Now what? } my $moved_message = 0; - my @uids = $self->get_new_message_list( $folder ); + my @uids = (); + + @uids = $imap->get_new_message_list_unselected( $folder ); # We now have a list of messages with UIDs greater than or equal # to our last stored UIDNEXT value (of course, the list might be @@ -529,17 +521,20 @@ sub scan_folder $self->log_( 1, "Found new message in folder $folder (UID: $msg)" ); my $hash = $self->get_hash( $folder, $msg ); + $imap->uid_next( $folder, $msg + 1 ); - $self->uid_next__( $folder, $msg + 1 ); + if ( ! defined $hash ) { + $self->log_( 0, "Skipping message $msg." ); + next; + } # Watch our for those pesky duplicate and triplicate spam messages: if ( exists $self->{hash_values__}{$hash} ) { - my $destination = $self->{hash_values__}{$hash}; if ( $destination ne $folder ) { $self->log_( 0, "Found duplicate hash value: $hash. Moving the message to $destination." ); - $self->move_message( $folder, $msg, $destination ); + $imap->move_message( $msg, $destination ); $moved_message++; } else { @@ -571,9 +566,7 @@ sub scan_folder if ( my $bucket = $is_output ) { if ( my $old_bucket = $self->can_reclassify__( $hash, $bucket ) ) { - my $result = $self->reclassify_message( $folder, $msg, $old_bucket, $hash ); - next; } } @@ -584,10 +577,8 @@ sub scan_folder # After we are done with the folder, we issue an EXPUNGE command # if we were told to do so. - if ( $moved_message && $self->config_( 'expunge' ) ) { - $self->say__( $folder, "EXPUNGE" ); - $self->get_response__( $folder ); + $imap->expunge(); } } @@ -616,9 +607,11 @@ sub scan_folder # # ---------------------------------------------------------------------------- -sub classify_message -{ - my ( $self, $msg, $hash, $folder ) = @_; +sub classify_message { + my $self = shift; + my $msg = shift; + my $hash = shift; + my $folder = shift; my $moved_a_msg = ''; @@ -626,8 +619,9 @@ sub classify_message # use to read the message in binary, read-write mode: my $pseudo_mailer; my $file = $self->get_user_path_( 'imap.tmp' ); - unless ( open $pseudo_mailer, "+>$file" ) { - $self->log_( 0, "Unable to open temporary file $file. Nothing done to message $msg." ); + + unless ( sysopen( $pseudo_mailer, $file, O_RDWR | O_CREAT ) ) { + $self->log_( 0, "Unable to open temporary file $file. Nothing done to message $msg. ($!)" ); return; } @@ -640,12 +634,12 @@ sub classify_message # E.g. we could generate a list of parts by # first looking at the parts the message really has. - my @message_parts = qw/HEADER TEXT/; + my $imap = $self->{folders__}{$folder}{imap}; PART: - foreach my $part ( @message_parts ) { + foreach my $part ( qw/ HEADER TEXT / ) { - my ($ok, @lines ) = $self->fetch_message_part__( $folder, $msg, $part ); + my ($ok, @lines ) = $imap->fetch_message_part( $msg, $part ); unless ( $ok ) { $self->log_( 0, "Could not fetch the $part part of message $msg." ); @@ -654,7 +648,7 @@ sub classify_message } foreach ( @lines ) { - print $pseudo_mailer "$_"; + syswrite $pseudo_mailer, $_; } my ( $class, $slot, $magnet_used ); @@ -663,12 +657,12 @@ sub classify_message # classifier have a non-save go: if ( $part eq 'HEADER' ) { - seek $pseudo_mailer, 0, 0; - ( $class, $slot, $magnet_used ) = $self->{classifier__}->classify_and_modify( $self->{api_session__}, $pseudo_mailer, undef, 1, '', undef, 0, undef ); + sysseek $pseudo_mailer, 0, 0; + ( $class, $slot, $magnet_used ) = $self->classifier()->classify_and_modify( $self->api_session(), $pseudo_mailer, undef, 1, '', undef, 0, undef ); if ( $magnet_used ) { - $self->log_( 0, "Message was classified as $class using a magnet." ); - print $pseudo_mailer "\nThis message was classified based on a magnet.\nThe body of the message was not retrieved from the server.\n"; + $self->log_( 0, "Message with slot $slot was classified as $class using a magnet." ); + syswrite $pseudo_mailer, "\nThis message was classified based on a magnet.\nThe body of the message was not retrieved from the server.\n"; } else { next PART; @@ -678,9 +672,9 @@ sub classify_message # We will only get here if the message was magnetized or we # are looking at the complete message. Thus we let the classifier have # a look and make it save the message to history: - seek $pseudo_mailer, 0, 0; + sysseek $pseudo_mailer, 0, 0; - ( $class, $slot, $magnet_used ) = $self->{classifier__}->classify_and_modify( $self->{api_session__}, $pseudo_mailer, undef, 0, '', undef, 0, undef ); + ( $class, $slot, $magnet_used ) = $self->classifier()->classify_and_modify( $self->api_session(), $pseudo_mailer, undef, 0, '', undef, 0, undef ); close $pseudo_mailer; unlink $file; @@ -692,7 +686,7 @@ sub classify_message my $destination = $self->folder_for_bucket__( $class ); if ( defined $destination ) { if ( $folder ne $destination ) { - $self->move_message( $folder, $msg, $destination ); + $imap->move_message( $msg, $destination ); $moved_a_msg = $destination; } } @@ -710,7 +704,6 @@ sub classify_message } - # ---------------------------------------------------------------------------- # # reclassify_message @@ -735,16 +728,19 @@ sub classify_message # # ---------------------------------------------------------------------------- -sub reclassify_message -{ - my ( $self, $folder, $msg, $old_bucket, $hash ) = @_; +sub reclassify_message { + my $self = shift; + my $folder = shift; + my $msg = shift; + my $old_bucket = shift; + my $hash = shift; my $new_bucket = $self->{folders__}{$folder}{output}; - my ( $ok, @lines ) = $self->fetch_message_part__( $folder, $msg, '' ); + my $imap = $self->{folders__}{$folder}{imap}; + my ( $ok, @lines ) = $imap->fetch_message_part( $msg, '' ); unless ( $ok ) { $self->log_( 0, "Could not fetch message $msg!" ); - return; } @@ -752,1116 +748,257 @@ sub reclassify_message # I simply use "imap.tmp" as the file name here. my $file = $self->get_user_path_( 'imap.tmp' ); - unless ( open TMP, ">$file" ) { - $self->log_( 0, "Cannot open temp file $file" ); - - return; - }; - - foreach ( @lines ) { - print TMP $_; - } - close TMP; - - my $slot = $self->{history__}->get_slot_from_hash( $hash ); - - $self->{classifier__}->add_message_to_bucket( $self->{api_session__}, $new_bucket, $file ); + if ( open my $TMP, '>', $file ) { + foreach ( @lines ) { + print $TMP $_; + } + close $TMP; - $self->{classifier__}->reclassified( $self->{api_session__}, $old_bucket, $new_bucket, 0 ); - $self->{history__}->change_slot_classification( $slot, $new_bucket, $self->{api_session__}, 0); + my $slot = $self->history()->get_slot_from_hash( $hash ); + $self->classifier()->add_message_to_bucket( $self->api_session(), $new_bucket, $file ); + $self->classifier()->reclassified( $self->api_session(), $old_bucket, $new_bucket, 0 ); + $self->history()->change_slot_classification( $slot, $new_bucket, $self->api_session(), 0); - $self->log_( 0, "Reclassified the message with UID $msg from bucket $old_bucket to bucket $new_bucket." ); + $self->log_( 0, "Reclassified the message with UID $msg from bucket $old_bucket to bucket $new_bucket." ); - unlink $file; + unlink $file; + } + else { + $self->log_( 0, "Cannot open temp file $file" ); + return; + } } # ---------------------------------------------------------------------------- # -# folder_uid_status__ +# (g|s)etters for configuration variables # -# This function checks the UID status of a given folder on the server. -# To this end, we look at $self->{last_response} and look for an untagged -# OK response containing UIDVALIDITY information. -# Such a response must be send be the server in response to the SELECT -# command. Thus, this function must only be called after SELECTing a folder. # -# arguments: + + + +# ---------------------------------------------------------------------------- # -# $folder: The name of the folder to be inspected. +# folder_for_bucket__ # -# return value: -# undef on error (changed uidvalidity) -# true otherwise -# ---------------------------------------------------------------------------- +# Pass in a bucket name only to get a corresponding folder name +# Pass in a bucket name and a folder name to set the pair +# +#--------------------------------------------------------------------------------------------- -sub folder_uid_status__ -{ - my ( $self, $folder ) = @_; - - # Save old UIDVALIDITY value (if we have one) - my $old_val = $self->uid_validity__( $folder ); - - # Extract current UIDVALIDITY value from server response - my @lines = split /$eol/, $self->{folders__}{$folder}{last_response}; - my $uidvalidity; - foreach ( @lines ) { - if ( /^\* OK \[UIDVALIDITY (\d+)\]/ ) { - $uidvalidity = $1; - last; - } - } +sub folder_for_bucket__ { + my $self = shift; + my $bucket = shift; + my $folder = shift; + my $all = $self->config_( 'bucket_folder_mappings' ); + my %mapping = split /$cfg_separator/, $all; - # if we didn't get the value, we have a problem - unless ( defined $uidvalidity ) { - $self->log_( 0, "Could not extract UIDVALIDITY status from server response!" ); - return; - } + # set + if ( $folder ) { + $mapping{$bucket} = $folder; - # Check whether the old value is still valid - if ( defined $old_val ) { - if ( $uidvalidity != $old_val ) { - $self->log_( 0, "UIDVALIDITY has changed! Expected $old_val, got $uidvalidity." ); - undef $old_val; + $all = ''; + while ( my ( $k, $v ) = each %mapping ) { + $all .= "$k$cfg_separator$v$cfg_separator"; } + $self->config_( 'bucket_folder_mappings', $all ); } - - # If we haven't got a valid validity value yet, then this - # must be a new folder for us. - # In that case, we do an extra STATUS command to get the current value - # for UIDNEXT. - unless ( defined $old_val ) { - - $self->say__( $folder, "STATUS \"$folder\" (UIDNEXT)" ); - my $response = $self->get_response__( $folder ); - - if ( $response == 1 ) { - - @lines = split /$eol/, $self->{folders__}{$folder}{last_response}; - - my $uidnext; - - foreach ( @lines ) { - my $line = $_; - - # We are only interested in untagged responses to the STATUS command - next unless $line =~ /\* STATUS/; - - $line =~ /UIDNEXT (.+?)( |\))/i; - $uidnext = $1; - - unless ( defined $uidnext ) { - $self->log_( 0, "Could not extract UIDNEXT value from server response!!" ); - return; - } - - $self->uid_next__( $folder, $uidnext ); - $self->uid_validity__( $folder, $uidvalidity ); - $self->log_( 1, "Updated folder status (UIDVALIDITY and UIDNEXT) for folder $folder." ); - } + # get + else { + if ( exists $mapping{$bucket} ) { + return $mapping{$bucket}; } else { - $self->log_( 0, "Could not STATUS folder $folder!!" ); return; } } - return 1; } - - -# ---------------------------------------------------------------------------- +#--------------------------------------------------------------------------------------------- # -# connect +# watched_folders__ # -# Get host and port from the configuration information and -# connect. -# Return the socket on sucess or undef on failure +# Returns a list of watched folders when called with no arguments +# Otherwise set the list of watched folders to whatever argument happens to be. # -# ---------------------------------------------------------------------------- - -sub connect -{ - my ( $self, $hostname, $port ) = @_; - - $self->log_( 1, "Connecting to $hostname:$port" ); - - if ( $hostname ne '' && $port ne '' ) { - - my $response = ''; - - my $imap; - - if ( $self->config_( 'use_ssl' ) ) { - require IO::Socket::SSL; - $imap = IO::Socket::SSL->new ( - Proto => "tcp", - PeerAddr => $hostname, - PeerPort => $port, - Timeout => $self->global_config_( 'timeout' ) - ); - } - else { - $imap = IO::Socket::INET->new( - Proto => "tcp", - PeerAddr => $hostname, - PeerPort => $port, - Timeout => $self->global_config_( 'timeout' ) - ); - } - - - # Check that the connect succeeded for the remote server - if ( $imap ) { - if ( $imap->connected ) { - - # Set binmode on the socket so that no translation of CRLF - # occurs - - if ( $self->config_( 'use_ssl' ) == 0 ) { - binmode( $imap ); - } - - # Wait for a response from the remote server and if - # there isn't one then give up trying to connect +#--------------------------------------------------------------------------------------------- - my $selector = new IO::Select( $imap ); - unless ( () = $selector->can_read( $self->global_config_( 'timeout' ) ) ) { - $self->log_( 0, "Connection timed out for $hostname:$port" ); - return; - } +sub watched_folders__ { + my $self = shift; + my @folders = @_; - $self->log_( 0, "Connected to $hostname:$port timeout " . $self->global_config_( 'timeout' ) ); + my $all = $self->config_( 'watched_folders' ); - # Read the response from the real server - my $buf = $self->slurp_( $imap ); - $self->log_( 1, ">> $buf" ); - return $imap; - } + # set + if ( @folders ) { + $all = ''; + foreach ( @folders ) { + $all .= "$_$cfg_separator"; } + $self->config_( 'watched_folders', $all ); } + # get else { - $self->log_( 0, "Invalid port or hostname. Will not connect to server." ); - return; + return split /$cfg_separator/, $all; } } - - - # ---------------------------------------------------------------------------- # -# login +# classifier - Called by the framework to set our classifier +# - call it without any arguments and you'll get the classifier # -# log in to the server we are currently connected to. -# -# Arguments: -# $imap: a valid socket object or the name of a folder. -# -# Return values: -# 0 on failure -# 1 on success # ---------------------------------------------------------------------------- -sub login -{ - my ( $self, $imap ) = @_; - my ( $login, $pass ) = ( $self->config_( 'login' ), $self->config_( 'password' ) ); - - $self->log_( 1, "Logging in" ); +sub classifier { + my $self = shift; + my $classifier = shift; - $self->say__( $imap, "LOGIN \"$login\" \"$pass\"" ); - - if ( $self->get_response__( $imap ) == 1 ) { - return 1; + if ( defined $classifier ) { + $self->{classifier__} = $classifier; } else { - return 0; + return $self->{classifier__}; } } # ---------------------------------------------------------------------------- # -# logout -# -# log out of the the server we are currently connected to. -# -# Arguments: -# $imap_or_folder: a valid socket object or the name of a folder +# history - Called by the framework to set our history module, called it +# without any arguments to get the history module # -# Return values: -# 0 on failure -# 1 on success # ---------------------------------------------------------------------------- -sub logout -{ - my ( $self, $imap_or_folder ) = @_; - - $self->log_( 1, "Logging out" ); +sub history { + my $self = shift; + my $history = shift; - $self->say__( $imap_or_folder, "LOGOUT" ); - - if ( $self->get_response__( $imap_or_folder ) == 1 ) { - return 1; + if ( defined $history ) { + $self->{history__} = $history; } else { - return 0; + return $self->{history__}; } } + # ---------------------------------------------------------------------------- # -# raw_say -# -# The worker function for say__. You should normally not need to call this -# function directly. -# -# Arguments: -# -# $imap: A valid socket object -# $tag: A numeric value that will be used to tag the commmand -# $command: What you want to say to the server -# -# Return value: -# undef on error. True on success. +# api_session - Return the API session key and get one if we haven't done so +# already. # # ---------------------------------------------------------------------------- -sub raw_say -{ - my ( $self, $imap, $tag, $command ) = @_; - - my $cmdstr = sprintf "A%05d %s%s", $tag, $command, $eol; +sub api_session { + my $self = shift; - # Talk to the server - unless( print $imap $cmdstr ) { - $imap->shutdown( 2 ); - return; + if ( ! $self->{api_session__} ) { + $self->{api_session__} = $self->classifier()->get_session_key( 'admin', '' ); } - # Log command - # Obfuscate login and password for logins: - $cmdstr =~ s/^(A\d+) LOGIN ".+?" ".+"(.+)/$1 LOGIN "xxxxx" "xxxxx"$2/; - $self->log_( 1, "<< $cmdstr" ); - - return 1; + return $self->{api_session__}; } - -# ---------------------------------------------------------------------------- -# -# say__ +#---------------------------------------------------------------------------- +# get hash # -# Issue a command to the server we are connected to. +# Computes a hash of the MID and Date header lines of this message. +# Note that a folder on the server needs to be selected for this to work. # # Arguments: # -# $imap_or_folder: -# This can be either a valid socket object or the name of a -# folder in the $self->{folders__} hash -# $command: -# What you want to say to the server without the tag, though. +# $folder: Name of the folder we are currently servicing. +# $msg: message UID # # Return value: -# None. Will die on error, though. +# A string containing the hash value or undef on error. # -# ---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- -sub say__ -{ - my ( $self, $imap_or_folder, $command ) = @_; +sub get_hash { + my $self = shift; + my $folder = shift; + my $msg = shift; - # Did we get a socket object? - if ( ref( $imap_or_folder ) eq 'IO::Socket::INET' || ref( $imap_or_folder ) eq 'IO::Socket::SSL' ) { + my $imap = $self->{folders__}{$folder}{imap}; - $self->{last_command__} = $command; + my ( $ok, @lines ) = $imap->fetch_message_part( $msg, "HEADER.FIELDS (Message-id Date Subject Received)" ); - unless ( $self->raw_say ( $imap_or_folder, $self->{tag__}, $command ) ) { - die( "The connection to the IMAP server was lost. Could not talk to the server." ); - } - } - # or a folder? - else { + if ( $ok ) { + my %header; + my $last; - $self->{folders__}{$imap_or_folder}{last_command} = $command; + foreach ( @lines ) { - # Is there a socket connection in the folders hash? + s/[\r\n]//g; - unless ( exists $self->{folders__}{$imap_or_folder}{imap} ) { - # No! commit suicide. - $self->log_( 0, "Got a folder ($imap_or_folder) with no attached socket in say!" ); - die( "The connection to the IMAP server was lost. Could not talk to the server." ); - } + last if /^$/; - unless ( $self->raw_say( $self->{folders__}{$imap_or_folder}{imap}, - $self->{folders__}{$imap_or_folder}{tag}, - $command ) ) { - # If we failed to talk to the server, delete socket object, and die. - delete $self->{folders__}{$imap_or_folder}{imap}; - die( "The connection to the IMAP server was lost. Could not talk to the server (folder $imap_or_folder)." ); + if ( /^([^ \t]+):[ \t]*(.*)$/ ) { + $last = lc $1; + push @{$header{$last}}, $2; + } + else { + if ( defined $last ) { + ${$header{$last}}[$#{$header{$last}}] .= $_; + } + } } + + my $mid = ${$header{'message-id'}}[0]; + my $date = ${$header{'date'}}[0]; + my $subject = ${$header{'subject'}}[0]; + my $received = ${$header{'received'}}[0]; + + my $hash = $self->history()->get_message_hash( $mid, $date, $subject, $received ); + + $self->log_( 1, "Hashed message: $subject." ); + $self->log_( 1, "Message $msg has hash value $hash" ); + + return $hash; + } + else { + $self->log_( 0, "Could not FETCH the header fields of message $msg!" ); + return; } } -# ---------------------------------------------------------------------------- -# -# raw_get_response -# -# Get a response from our server. You should normally not need to call this function -# directly. Use get_response__ instead. -# -# Arguments: +#---------------------------------------------------------------------------- +# can_classify__ # -# $imap: A valid socket object -# $last_command: The command we are issued before. -# $tag_ref: A reference to a scalar that will receive tag value that can be -# used to tag the next command -# $response_ref: A reference to a scalar that will receive the servers response. +# This function is a decider. It decides whether a message can be +# classified if found in one of our watched folders or not. # -# Return value: -# undef lost connection -# 1 Server answered OK -# 0 Server answered NO -# -1 Server answered BAD -# -2 Server gave unexpected tagged answer -# -3 Server didn't say anything, but the connection is still valid (I guess this cannot happen) +# arguments: +# $hash: The hash value for this message # -# ---------------------------------------------------------------------------- - -sub raw_get_response -{ - my ( $self, $imap, $last_command, $tag_ref, $response_ref ) = @_; - - # What is the actual tag we have to look for? - my $actual_tag = sprintf "A%05d", $$tag_ref; - - my $response = ''; - my $count_octets = 0; - my $octet_count = 0; - - # Slurp until we find a reason to quit - while ( my $buf = $self->slurp_( $imap ) ) { +# returns true or false +#---------------------------------------------------------------------------- - # Check for lost connections: - if ( $response eq '' && ! defined $buf ) { - $imap->shutdown( 2 ); - return; - } +sub can_classify__ { + my $self = shift; + my $hash = shift; - # If this is the first line of the response and - # if we find an octet count in curlies before the - # newline, then we will rely on the octet count + my $slot = $self->history()->get_slot_from_hash( $hash ); - if ( $response eq '' && $buf =~ m/{(\d+)}$eol/ ) { + if ( $slot ne '' ) { + $self->log_( 1, "Message was already classified (slot $slot)." ); + return; + } + else { + $self->log_( 1, "The message is not yet in history." ); + return 1; + } +} - # Add the length of the first line to the - # octet count provided by the server - - $count_octets = $1 + length( $buf ); - } - - $response .= $buf; - - if ( $count_octets ) { - $octet_count += length $buf; - - # There doesn't seem to be a requirement for the message to end with - # a newline. So we cannot go for equality - - if ( $octet_count >= $count_octets ) { - $count_octets = 0; - } - $self->log_( 2, ">> $buf" ); - } - - # If we aren't counting octets (anymore), we look out for tag - # followed by BAD, NO, or OK and we also keep an eye open - # for untagged responses that the server might send us unsolicited - if ( $count_octets == 0 ) { - if ( $buf =~ /^$actual_tag (OK|BAD|NO)/ ) { - - if ( $1 ne 'OK' ) { - $self->log_( 0, ">> $buf" ); - } - else { - $self->log_( 1, ">> $buf" ); - } - - last; - } - - # Here we look for untagged responses and decide whether they are - # solicited or not based on the last command we gave the server. - - if ( $buf =~ /^\* (.+)/ ) { - my $untagged_response = $1; - - $self->log_( 1, ">> $buf" ); - - # This should never happen, but under very rare circumstances, - # we might get a change of the UIDVALIDITY value while we - # are connected - if ( $untagged_response =~ /UIDVALIDITY/ - && $last_command !~ /^SELECT/ ) { - $self->log_( 0, "Got unsolicited UIDVALIDITY response from server while reading response for $last_command." ); - } - - # This could happen, but will be caught by the eval in service(). - # Nevertheless, we look out for unsolicited bye-byes here. - if ( $untagged_response =~ /^BYE/ - && $last_command !~ /^LOGOUT/ ) { - $self->log_( 0, "Got unsolicited BYE response from server while reading response for $last_command." ); - } - } - } - } - - # save result away so we can always have a look later on - $$response_ref = $response; - - # Increment tag for the next command/reply sequence: - $$tag_ref++; - - if ( $response ) { - - # determine our return value - - # We got 'OK' and the correct tag. - if ( $response =~ /^$actual_tag OK/m ) { - return 1; - } - # 'NO' plus correct tag - elsif ( $response =~ /^$actual_tag NO/m ) { - return 0; - } - # 'BAD' and correct tag. - elsif ( $response =~ /^$actual_tag BAD/m ) { - return -1; - } - # Someting else, probably a different tag, but who knows? - else { - $self->log_( 0, "!!! Server said something unexpected !!!" ); - return -2; - } - } - else { - $imap->shutdown( 2 ); - return; - } -} - - - -# ---------------------------------------------------------------------------- -# -# get_response__ -# -# Use this function to get a response from the server. The response will be stored in -# $self->{last_response__} if you pass in a socket object or in -# $self->{folders}{$folder}{last_response} if you pass in a folder name -# -# Arguments: -# $imap_or_folder: -# Either a valid socket object or the name of a folder that is stored in the -# folders hash. -# -# Return values: -# 1: Server said OK to our last command -# 0: Server said NO to our last command -# -1: Server said BAD to our last command -# -2: Server said something else or reponded to another command -# -3: Server didn't say anything -# Will die on lost connections! -# ---------------------------------------------------------------------------- - -sub get_response__ -{ - my ( $self, $imap_or_folder ) = @_; - - my $result; - - # Are we dealing with a socket object? - if ( ref( $imap_or_folder ) eq 'IO::Socket::INET' || ref( $imap_or_folder ) eq 'IO::Socket::SSL' ) { - $result = $self->raw_get_response( $imap_or_folder, - $self->{last_command__}, - \$self->{tag__}, - \$self->{last_response__} ); - unless ( defined $result ) { - die "The connection to the IMAP server was lost. Could not listen to the server."; - } - } - # Or did we get a folder name? - else { - - # Is there a socket object stored in the folders hash? - unless ( exists $self->{folders__}{$imap_or_folder}{imap} ) { - $self->log_( 0, "Got a folder with no attached socket in get_response!" ); - die( "The connection to the IMAP server was lost. Could not listen to the server." ); - } - - $result = $self->raw_get_response ( $self->{folders__}{$imap_or_folder}{imap}, - $self->{folders__}{$imap_or_folder}{last_command}, - \$self->{folders__}{$imap_or_folder}{tag}, - \$self->{folders__}{$imap_or_folder}{last_response} ); - - # die if we didn't succeed. - unless ( defined $result ) { - delete $self->{folders__}{$imap_or_folder}{imap}; - die "The connection to the IMAP server was lost. Could not listen to the server."; - } - - } - - # return what raw_get_response gave us. - return $result; -} - - - -# ---------------------------------------------------------------------------- -# -# get_mailbox_list -# -# Request a list of mailboxes from the server behind the passed in socket object. -# The list is stored away in @{$self->{mailboxes__}} and returned. -# -# Arguments: -# $imap: contains a valid connection to our IMAP server. -# -# Return value: -# -# The list of mailboxes -# ---------------------------------------------------------------------------- - -sub get_mailbox_list -{ - my ( $self, $imap ) = @_; - - $self->log_( 1, "Getting mailbox list" ); - - $self->say__( $imap, "LIST \"\" \"*\"" ); - my $result = $self->get_response__( $imap ); - if ( $result != 1 ) { - $self->log_( 0, "LIST command failed (return value $result)." ); - } - - my @lines = split /$eol/, $self->{last_response__}; - my @mailboxes; - - foreach ( @lines ) { - next unless /^\*/; - s/^\* LIST \(.*\) .+? (.+)$/$1/; - s/"(.*?)"/$1/; - push @mailboxes, $1; - } - - @{$self->{mailboxes__}} = sort @mailboxes; - - return @{$self->{mailboxes__}}; -} - - - - - - -# ---------------------------------------------------------------------------- -# -# fetch_message_part__ -# -# This function will fetch a specified part of a specified message from -# the IMAP server and return the message as a list of lines. -# It assumes that a folder is already SELECTed -# -# arguments: -# -# $folder: the currently selected folder -# $msg: UID of the message -# $part: The part of the message you want to fetch. Could be 'HEADER' for the -# message headers, 'TEXT' for the body (including any attachments), or '' to -# fetch the complete message. Other values are also possible, but currently -# not used. 'BODYSTRUCTURE' could be interesting. -# -# return values: -# -# a boolean value indicating success/fallure and -# a list containing the lines of the retrieved message (part). -# -# ---------------------------------------------------------------------------- - -sub fetch_message_part__ -{ - my ( $self, $folder, $msg, $part ) = @_; - - if ( $part ne '' ) { - $self->log_( 1, "Fetching $part of message $msg" ); - } - else { - $self->log_( 1, "Fetching message $msg" ); - } - - if ( $part eq 'TEXT' || $part eq '' ) { - my $limit = $self->global_config_( 'message_cutoff' ); - $self->say__( $folder, "UID FETCH $msg (FLAGS BODY.PEEK[$part]<0.$limit>)" ); - } - else { - $self->say__( $folder, "UID FETCH $msg (FLAGS BODY.PEEK[$part])" ); - } - - my $result = $self->get_response__( $folder ); - - if ( $part ne '' ) { - $self->log_( 1, "Got $part of message # $msg, result: $result." ); - } - else { - $self->log_( 1, "Got message # $msg, result: $result." ); - } - - if ( $result == 1 ) { - my @lines = (); - - # The first line now MUST start with "* x FETCH" where x is a message - # sequence number anything else indicates that something went wrong - # or that something changed. E.g. the message we wanted - # to fetch is no longer there. - - if ( $self->{folders__}{$folder}{last_response} =~ m/\^* \d+ FETCH/ ) { - - # The first line should contain the number of octets the server send us - - if ( $self->{folders__}{$folder}{last_response} =~ m/(?!$eol){(\d+)}$eol/ ) { - my $num_octets = $1; - - # Grab the number of octets reported: - - my $pos = index $self->{folders__}{$folder}{last_response}, "{$num_octets}$eol"; - $pos += length "{$num_octets}$eol"; - - my $message = substr $self->{folders__}{$folder}{last_response}, $pos, $num_octets; - - # Take the large chunk and chop it into single lines - - # We cannot use split here, because this would get rid of - # trailing and leading newlines and thus omit complete lines. - - while ( $message =~ m/(.*?$eol)/g ) { - push @lines, $1; - } - } - # No number of octets: fall back, but issue a warning - else { - while ( $self->{folders__}{$folder}{last_response} =~ m/(.*?$eol)/g ) { - push @lines, $1; - } - - # discard the first and the two last lines; these are server status responses. - shift @lines; - pop @lines; - pop @lines; - - $self->log_( 0, "Could not find octet count in server's response!" ); - } - } - else { - $self->log_( 0, "Unexpected server response to the FETCH command!" ); - } - - return 1, @lines; - } - else { - return 0; - } -} - - -# ---------------------------------------------------------------------------- -# -# move_message -# -# Will try to move a message on the IMAP server. -# -# arguments: -# -# $imap: -# connection to server -# $msg: -# The UID of the message -# $destination: -# The destination folder. -# -# ---------------------------------------------------------------------------- - -sub move_message -{ - my ( $self, $folder, $msg, $destination ) = @_; - - $self->log_( 1, "Moving message $msg to $destination" ); - - my $ok = 0; - - if ( $self->{folders__}{$folder}{server} == $self->{folders__}{$destination}{server} ) { - - # Copy message to destination - $self->say__( $folder, "UID COPY $msg \"$destination\"" ); - my $ok = $self->get_response__( $folder ); - - # If that went well, flag it as deleted - if ( $ok == 1 ) { - $self->say__( $folder, "UID STORE $msg +FLAGS (\\Deleted)" ); - $ok = $self->get_response__( $folder ); - } - else { - $self->log_( 0, "Could not copy message ($ok)!" ); - } - } - else { - $self->log_( 0, "We don't yet know how to move messages between servers" ); - } - - return ( $ok ? 1 : 0 ); -} - - -# ---------------------------------------------------------------------------- -# -# get_new_message_list -# -# Will search for messages on the IMAP server that are not flagged as deleted -# that have a UID greater than or equal to the value stored for the passed in folder. -# -# arguments: -# -# $folder: Name of the folder we are looking at. -# -# return value: -# -# A list (possibly empty) of the UIDs of matching messages. -# -# ---------------------------------------------------------------------------- - -sub get_new_message_list -{ - my ( $self, $folder ) = @_; - - my $uid = $self->uid_next__( $folder ); - - $self->log_( 1, "Getting uids ge $uid" ); - - $self->say__( $folder, "UID SEARCH UID $uid:* UNDELETED" ); - my $result = $self->get_response__( $folder ); - if ( $result != 1 ) { - $self->log_( 0, "SEARCH command failed (return value: $result)!" ); - } - - # The server will respond with an untagged search reply. - # This can either be empty ("* SEARCH") or if a - # message was found it contains the numbers of the matching - # messages, e.g. "* SEARCH 2 5 9". - # In the latter case, the regexp below will match and - # capture the list of messages in $1 - - my @matching = (); - - if ( $self->{folders__}{$folder}{last_response} =~ /\* SEARCH (.+)$eol/ ) { - - @matching = split / /, $1; - } - - my @return_list = (); - - # Make sure that the UIDs reported by the server are really greater - # than or equal to our passed in comparison value - - foreach my $num ( @matching ) { - if ( $num >= $uid ) { - push @return_list, $num; - } - } - - return ( sort { $a <=> $b } @return_list ); -} - - - -# ---------------------------------------------------------------------------- -# -# (g|s)etters for configuration variables -# -# - - - -# ---------------------------------------------------------------------------- -# -# folder_for_bucket__ -# -# Pass in a bucket name only to get a corresponding folder name -# Pass in a bucket name and a folder name to set the pair -# -#--------------------------------------------------------------------------------------------- - -sub folder_for_bucket__ -{ - my ( $self, $bucket, $folder ) = @_; - - my $all = $self->config_( 'bucket_folder_mappings' ); - my %mapping = split /$cfg_separator/, $all; - - # set - if ( $folder ) { - $mapping{$bucket} = $folder; - - $all = ''; - while ( my ( $k, $v ) = each %mapping ) { - $all .= "$k$cfg_separator$v$cfg_separator"; - } - $self->config_( 'bucket_folder_mappings', $all ); - } - # get - else { - if ( exists $mapping{$bucket} ) { - return $mapping{$bucket}; - } - else { - return; - } - } -} - - -#--------------------------------------------------------------------------------------------- -# -# watched_folders__ -# -# Returns a list of watched folders when called with no arguments -# Otherwise set the list of watched folders to whatever argument happens to be. -# -#--------------------------------------------------------------------------------------------- - -sub watched_folders__ -{ - my ( $self, @folders ) = @_; - - my $all = $self->config_( 'watched_folders' ); - - # set - if ( @folders ) { - $all = ''; - foreach ( @folders ) { - $all .= "$_$cfg_separator"; - } - $self->config_( 'watched_folders', $all ); - } - # get - else { - return split /$cfg_separator/, $all; - } -} - - -#--------------------------------------------------------------------------------------------- -# -# uid_validity__ -# -# Pass in a folder name only to get the stored UIDVALIDITY value for that folder -# Pass in folder name and new UIDVALIDITY value to store the value -# -#--------------------------------------------------------------------------------------------- - -sub uid_validity__ -{ - my ( $self, $folder, $uidval ) = @_; - - my $all = $self->config_( 'uidvalidities' ); - my %hash; - - if ( defined $all ) { - %hash = split /$cfg_separator/, $all; - } - - - # set - if ( defined $uidval ) { - $hash{$folder} = $uidval; - $all = ''; - while ( my ( $key, $value ) = each %hash ) { - $all .= "$key$cfg_separator$value$cfg_separator"; - } - $self->config_( 'uidvalidities', $all ); - $self->log_( 1, "Updated UIDVALIDITY value for folder $folder to $uidval." ); - } - # get - else { - if ( exists $hash{$folder} ) { - return $hash{$folder}; - } - else { - return; - } - } -} - - -#--------------------------------------------------------------------------------------------- -# -# uid_next__ -# -# Pass in a folder name only to get the stored UIDNEXT value for that folder -# Pass in folder name and new UIDNEXT value to store the value -# -#--------------------------------------------------------------------------------------------- - -sub uid_next__ -{ - my ( $self, $folder, $uidnext ) = @_; - - - my $all = $self->config_( 'uidnexts' ); - my %hash; - - if ( defined $all ) { - %hash = split /$cfg_separator/, $all; - } - - - # set - if ( defined $uidnext ) { - $hash{$folder} = $uidnext; - $all = ''; - while ( my ( $key, $value ) = each %hash ) { - $all .= "$key$cfg_separator$value$cfg_separator"; - } - $self->config_( 'uidnexts', $all ); - $self->log_( 1, "Updated UIDNEXT value for folder $folder to $uidnext." ); - } - # get - else { - if ( exists $hash{$folder} ) { - return $hash{$folder}; - } - return; - } -} - - - -# SETTER - -sub classifier -{ - my ( $self, $classifier ) = @_; - - $self->{classifier__} = $classifier; -} - - -sub history -{ - my ( $self, $history ) = @_; - - $self->{history__} = $history; -} - - -#---------------------------------------------------------------------------- -# get hash -# -# Computes a hash of the MID and Date header lines of this message. -# Note that a folder on the server needs to be selected for this to work. -# -# Arguments: -# -# $folder: Name of the folder we are currently servicing. -# $msg: message UID -# -# Return value: -# A string containing the hash value or undef on error. -# -#---------------------------------------------------------------------------- - -sub get_hash -{ - my ( $self, $folder, $msg ) = @_; - - my ( $ok, @lines ) = $self->fetch_message_part__( $folder, $msg, "HEADER.FIELDS (Message-id Date Subject Received)" ); - - if ( $ok ) { - - my %header; - my $last; - - foreach ( @lines ) { - - s/[\r\n]//g; - - last if /^$/; - - if ( /^([^ \t]+):[ \t]*(.*)$/ ) { - $last = lc $1; - push @{$header{$last}}, $2; - } - else { - if ( defined $last ) { - ${$header{$last}}[$#{$header{$last}}] .= $_; - } - } - } - - my $mid = ${$header{'message-id'}}[0]; - my $date = ${$header{'date'}}[0]; - my $subject = ${$header{'subject'}}[0]; - my $received = ${$header{'received'}}[0]; - - my $hash = $self->{history__}->get_message_hash( $mid, $date, $subject, $received ); - - $self->log_( 1, "Hashed message: $subject." ); - $self->log_( 1, "Message $msg has hash value $hash" ); - - return $hash; - } - else { - $self->log_( 0, "Could not FETCH the header fields of message $msg!" ); - return; - } -} - - - -#---------------------------------------------------------------------------- -# can_classify__ -# -# This function is a decider. It decides whether a message can be -# classified if found in one of our watched folders or not. -# -# arguments: -# $hash: The hash value for this message -# -# returns true or false -#---------------------------------------------------------------------------- - -sub can_classify__ -{ - my ( $self, $hash ) = @_; - - my $slot = $self->{history__}->get_slot_from_hash( $hash ); - - if ( $slot ne '' ) { - $self->log_( 1, "Message was already classified (slot $slot)." ); - return 0; - } - else { - $self->log_( 1, "The message is not yet in history." ); - return 1; - } -} #---------------------------------------------------------------------------- # can_reclassify__ @@ -1871,24 +1008,24 @@ sub can_classify__ # # arguments: # $hash: The hash value for this message +# $new_bucket: The name of the bucket the message should be classified to # # return value: # undef if the message should not be reclassified # the current classification if a reclassification is ok #---------------------------------------------------------------------------- -sub can_reclassify__ -{ - my ( $self, $hash, $new_bucket ) = @_; +sub can_reclassify__ { + my $self = shift; + my $hash = shift; + my $new_bucket = shift; # We must already know the message - - my $slot = $self->{history__}->get_slot_from_hash( $hash ); + my $slot = $self->history()->get_slot_from_hash( $hash ); if ( $slot ne '' ) { - - my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified ) = - $self->{history__}->get_slot_fields( $slot ); + my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified, undef, $magnetized ) = + $self->history()->get_slot_fields( $slot ); $self->log_( 2, "get_slot_fields returned the following information:" ); $self->log_( 2, "id: $id" ); @@ -1901,20 +1038,35 @@ sub can_reclassify__ $self->log_( 2, "inserted: $inserted" ); $self->log_( 2, "bucket: $bucket" ); $self->log_( 2, "reclassified: $reclassified" ); + $self->log_( 2, "magnetized: $magnetized" ); - # We must not reclassify a reclassified message - if ( ! $reclassified ) { + # We cannot reclassify magnetized messages + if ( ! $magnetized ) { - # new and old bucket must be different - if ( $new_bucket ne $bucket ) { - return $bucket; + # We must not reclassify a reclassified message + if ( ! $reclassified ) { + + # new and old bucket must be different + if ( $new_bucket ne $bucket ) { + + # The new bucket must not be a pseudo-bucket + if ( ! $self->classifier()->is_pseudo_bucket( $self->api_session(), $new_bucket ) ) { + return $bucket; + } + else { + $self->log_( 1, "Will not reclassify to pseudo-bucket ($new_bucket)" ); + } + } + else { + $self->log_( 1, "Will not reclassify to same bucket ($new_bucket)." ); + } } else { - $self->log_( 1, "Will not reclassify to same bucket ($new_bucket)." ); + $self->log_( 1, "The message was already reclassified." ); } } else { - $self->log_( 1, "The message was already reclassified." ); + $self->log_( 1, "The message was classified using a manget and cannot be reclassified." ); } } else { @@ -1939,9 +1091,11 @@ sub can_reclassify__ # # ---------------------------------------------------------------------------- -sub configure_item -{ - my ( $self, $name, $templ, $language ) = @_; +sub configure_item { + my $self = shift; + my $name = shift; + my $templ = shift; + my $language = shift; # conection details if ( $name eq 'imap_0_connection_details' ) { @@ -1949,12 +1103,13 @@ sub configure_item $templ->param( 'IMAP_port', $self->config_( 'port' ) ); $templ->param( 'IMAP_login', $self->config_( 'login' ) ); $templ->param( 'IMAP_password', $self->config_( 'password' ) ); + $templ->param( 'IMAP_ssl_checked', $self->config_( 'use_ssl' ) ? 'checked="checked"' : '' ); } # Which mailboxes/folders should we be watching? if ( $name eq 'imap_1_watch_folders' ) { - # We can only configure this when we have a list of mailboxes available on the server + # We can only configure this if we have a list of mailboxes on the server available if ( @{$self->{mailboxes__}} < 1 || ( ! $self->watched_folders__() ) ) { $templ->param( IMAP_if_mailboxes => 0 ); } @@ -2030,7 +1185,7 @@ sub configure_item else { $templ->param( IMAP_if_mailboxes => 1 ); - my @buckets = $self->{classifier__}->get_all_buckets( $self->{api_session__} ); + my @buckets = $self->classifier()->get_all_buckets( $self->api_session() ); my @outer_loop = (); @@ -2064,8 +1219,6 @@ sub configure_item } } - - # Read the list of mailboxes from the server. Now! if ( $name eq 'imap_4_update_mailbox_list' ) { if ( $self->config_( 'hostname' ) eq '' ) { @@ -2076,7 +1229,6 @@ sub configure_item } } - # Various options for the IMAP module if ( $name eq 'imap_5_options' ) { @@ -2103,56 +1255,26 @@ sub configure_item # # ---------------------------------------------------------------------------- -sub validate_item -{ - my ( $self, $name, $templ, $language, $form ) = @_; +sub validate_item { + my $self = shift; + my $name = shift; + my $templ = shift; + my $language = shift; + my $form = shift; # conn