Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jgr...@us...> - 2003-08-20 11:16:03
|
Update of /cvsroot/popfile/engine/tests/languages In directory sc8-pr-cvs1:/tmp/cvs-serv8832/tests/languages Added Files: English-UK.msg English.msg Log Message: Start of test suite for HTML interface --- NEW FILE: English-UK.msg --- # Copyright (c) 2001-2003 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Identify the language and character set used for the interface LanguageCode en LanguageCharset ISO-8859-1 # This is used to get the appropriate subdirectory for the manual ManualLanguage en # Common words that are used on their own all over the interface Apply Apply On On Off Off TurnOn Turn On TurnOff Turn Off Add Add Remove Remove Previous Previous Next Next From From Subject Subject Cc Cc Classification Classification Reclassify Reclassify Probability Probability Scores Scores QuickMagnets QuickMagnets Undo Undo Close Close Find Find Filter Filter Yes Yes No No ChangeToYes Change to Yes ChangeToNo Change to No Bucket Bucket Magnet Magnet Delete Delete Create Create To To Total Total Rename Rename Frequency Frequency Probability Probability Score Score Lookup Lookup Word Word Count Count Update Update Refresh Refresh # The header and footer that appear on every UI page Header_Title POPFile Control Centre Header_Shutdown Shutdown POPFile Header_History History Header_Buckets Buckets Header_Configuration Configuration Header_Advanced Advanced Header_Security Security Header_Magnets Magnets Footer_HomePage POPFile Home Page Footer_Manual Manual Footer_Forums Forums Footer_FeedMe Donate Footer_RequestFeature Request Feature Footer_MailingList Mailing List Configuration_Error1 The separator character must be a single character Configuration_Error2 The user interface port must be a number between 1 and 65535 Configuration_Error3 The POP3 listen port must be a number between 1 and 65535 Configuration_Error4 The page size must be a number between 1 and 1000 Configuration_Error5 The number of days in the history must be a number between 1 and 366 Configuration_Error6 The TCP timeout must be a number between 10 and 300 Configuration_Error7 The XML RPC listen port must be a number between 1 and 65535 Configuration_POP3Port POP3 listen port Configuration_POP3Update Updated POP3 port to %s; this change will not take affect until you restart POPFile Configuration_XMLRPCUpdate Updated XML-RPC port to %s; this change will not take affect until you restart POPFile Configuration_XMLRPCPort XML-RPC listen port Configuration_SMTPPort SMTP listen port Configuration_SMTPUpdate Updated SMTP port to %s; this change will not take affect until you restart POPFile Configuration_NNTPPort NNTP listen port Configuration_NNTPUpdate Updated NNTP port to %s; this change will not take affect until you restart POPFile Configuration_POP3Separator POP3 host:port:user separator character Configuration_NNTPSeparator NNTP host:port:user separator character Configuration_POP3SepUpdate Updated POP3 separator to %s Configuration_NNTPSepUpdate Updated NNTP separator to %s Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile Configuration_History Number of messages per page Configuration_HistoryUpdate Updated number of messages per page to %s Configuration_Days Number of days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins Configuration_SkinsChoose Choose skin Configuration_Language Language Configuration_LanguageChoose Choose language Configuration_ListenPorts Module Options Configuration_HistoryView History View Configuration_TCPTimeout Connection Timeout Configuration_TCPTimeoutSecs Connection timeout in seconds Configuration_TCPTimeoutUpdate Updated connection timeout to %s Configuration_ClassificationInsertion Message Text Insertion Configuration_SubjectLine Subject line modification Configuration_XTCInsertion X-Text-Classification Header Configuration_XPLInsertion X-POPFile-Link Header Configuration_Logging Logging Configuration_None None Configuration_ToScreen To Screen Configuration_ToFile To File Configuration_ToScreenFile To Screen and File Configuration_LoggerOutput Logger output Configuration_GeneralSkins Skins Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins Configuration_CurrentLogFile <current log file> Advanced_Error1 '%s' already in the Ignored Words list Advanced_Error2 Ignored words can only contain alphanumeric, ., _, -, or @ characters Advanced_Error3 '%s' added to the Ignored Words list Advanced_Error4 '%s' is not in the Ignored Words list Advanced_Error5 '%s' removed from the Ignored Words list Advanced_StopWords Ignored Words Advanced_Message1 POPFile ignores the following frequently-used words: Advanced_AddWord Add word Advanced_RemoveWord Remove word History_Filter (just showing bucket <font color="%s">%s</font>) History_FilterBy Filter By History_Search (searched for from/subject %s) History_Title Recent Messages History_Jump Jump to message History_ShowAll Show All History_ShouldBe Should be History_NoFrom no from line History_NoSubject no subject line History_ClassifyAs Classify as History_MagnetUsed Magnet used History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s History_Already Reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page History_Remove To remove entries in the history click History_SearchMessage Search From/Subject History_NoMessages No messages History_ShowMagnet magnetized History_ShowNoMagnet unmagnetized History_Magnet (just showing magnet classified messages) History_NoMagnet (just showing non-magnet classified messages) History_ResetSearch Reset Password_Title Password Password_Enter Enter password Password_Go Go! Password_Error1 Incorrect password Security_Error1 The port must be a number between 1 and 65535 Security_Stealth Stealth Mode/Server Operation Security_NoStealthMode No (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_PasswordTitle User Interface Password Security_Password Password Security_PasswordUpdate Updated password to %s Security_AUTHTitle Remote Servers Security_SecureServer POP3 SPA/AUTH server Security_SecureServerUpdate Updated POP3 SPA/AUTH secure server to %s; this change will not take affect until you restart POPFile Security_SecurePort POP3 SPA/AUTH port Security_SecurePortUpdate Updated POP3 SPA/AUTH port to %s; this change will not take affect until you restart POPFile Security_SMTPServer SMTP chain server Security_SMTPServerUpdate Updated SMTP chain server to %s; this change will not take affect until you restart POPFile Security_SMTPPort SMTP chain port Security_SMTPPortUpdate Updated SMTP chain port to %s; this change will not take affect until you restart POPFile Security_POP3 Accept POP3 connections from remote machines (requires POPFile restart) Security_SMTP Accept SMTP connections from remote machines (requires POPFile restart) Security_NNTP Accept NNTP connections from remote machines (requires POPFile restart) Security_UI Accept HTTP (User Interface) connections from remote machines (requires POPFile restart) Security_XMLRPC Accept XML-RPC connections from remote machines (requires POPFile restart) Security_UpdateTitle Automatic Update Checking Security_Update Check daily for updates to POPFile Security_StatsTitle Reporting Statistics Security_Stats Send statistics daily Magnet_Error1 Magnet '%s' already exists in bucket '%s' Magnet_Error2 New magnet '%s' clashes with magnet '%s' in bucket '%s' and could cause ambiguous results. New magnet was not added. Magnet_Error3 Create new magnet '%s' in bucket '%s' Magnet_CurrentMagnets Current Magnets Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet Magnet_Explanation These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Value Magnet_Always Always goes to bucket Magnet_Jump Jump to magnet page Bucket_Error1 Bucket names can only contain the letters a to z in lower case, numbers 0 to 9, plus - and _ Bucket_Error2 Bucket named %s already exists Bucket_Error3 Created bucket named %s Bucket_Error4 Please enter a non-blank word Bucket_Error5 Renamed bucket %s to %s Bucket_Error6 Deleted bucket %s Bucket_Title Summary Bucket_BucketName Bucket Name Bucket_WordCount Word Count Bucket_WordCounts Word Counts Bucket_UniqueWords Unique Words Bucket_SubjectModification Subject Modification Bucket_ChangeColor Change Colour Bucket_NotEnoughData Not enough data Bucket_ClassificationAccuracy Classification Accuracy Bucket_EmailsClassified Messages classified Bucket_EmailsClassifiedUpper Messages Classified Bucket_ClassificationErrors Classification errors Bucket_Accuracy Accuracy Bucket_ClassificationCount Classification Count Bucket_ClassificationFP False Positives Bucket_ClassificationFN False Negatives Bucket_ResetStatistics Reset Statistics Bucket_LastReset Last Reset Bucket_CurrentColor %s current colour is %s Bucket_SetColorTo Set %s colour to %s Bucket_Maintenance Maintenance Bucket_CreateBucket Create bucket with name Bucket_DeleteBucket Delete bucket named Bucket_RenameBucket Rename bucket named Bucket_Lookup Lookup Bucket_LookupMessage Lookup word in buckets Bucket_LookupMessage2 Lookup result for Bucket_LookupMostLikely <b>%s</b> is most likely to appear in <font color="%s">%s</font> Bucket_DoesNotAppear <p><b>%s</b> does not appear in any of the buckets Bucket_DisabledGlobally Disabled globally Bucket_To to Bucket_Quarantine Quarantine SingleBucket_Title Detail for %s SingleBucket_WordCount Bucket word count SingleBucket_TotalWordCount Total word count SingleBucket_Percentage Percentage of total SingleBucket_WordTable Word Table for %s SingleBucket_Message1 Click a letter in the index to see the list of words that start with that letter. Click any word to lookup its probability for all buckets. SingleBucket_Unique %s unique SingleBucket_ClearBucket Remove All Words Session_Title POPFile Session Expired Session_Error Your POPFile session has expired. This could have been caused by starting and stopping POPFile but leaving your web browser open. Please click one of the links above to continue using POPFile. View_Title Single Message View Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control centre. History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. History_OpenMessageSummary This table contains the full text of a message message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the message's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the colour used in displaying anything related to that bucket in the control centre. Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many messages have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. Bucket_MaintenanceTableSummary This table contains forms that allow you to create, delete or rename buckets, and to lookup a word in all of the buckets to see its relative probabilities. Bucket_AccuracyChartSummary This table graphically represents the accuracy of the message classification. Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of messages classified, and total word counts. Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency that that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in a message. Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify message according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. Configuration_MainTableSummary This table contains a number of forms to allow you to control the configuration of POPFile. Configuration_InsertionTableSummary This table contains buttons that determine whether or not certain modifications are made to the headers or subject line of the message before it is passed on to the message client. Security_MainTableSummary This table provides sets of controls that affect the security of the overall configuration of POPFile, whether it should automatically check for updates to the program, and whether statistics about POPFile's performance should be sent to the central datastore of the program's author for general information. Advanced_MainTableSummary This table provides a list of words that POPFile ignores when classifying message due to their relative frequency in message in general. They are organized per row according to the first letter of the words. --- NEW FILE: English.msg --- # Copyright (c) 2001-2003 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Identify the language and character set used for the interface LanguageCode en LanguageCharset ISO-8859-1 LanguageDirection ltr # This is used to get the appropriate subdirectory for the manual ManualLanguage en # Common words that are used on their own all over the interface Apply Apply On On Off Off TurnOn Turn On TurnOff Turn Off Add Add Remove Remove Previous Previous Next Next From From Subject Subject Cc Cc Classification Classification Reclassify Reclassify Probability Probability Scores Scores QuickMagnets QuickMagnets Undo Undo Close Close Find Find Filter Filter Yes Yes No No ChangeToYes Change to Yes ChangeToNo Change to No Bucket Bucket Magnet Magnet Delete Delete Create Create To To Total Total Rename Rename Frequency Frequency Probability Probability Score Score Lookup Lookup Word Word Count Count Update Update Refresh Refresh # The header and footer that appear on every UI page Header_Title POPFile Control Center Header_Shutdown Shutdown POPFile Header_History History Header_Buckets Buckets Header_Configuration Configuration Header_Advanced Advanced Header_Security Security Header_Magnets Magnets Footer_HomePage POPFile Home Page Footer_Manual Manual Footer_Forums Forums Footer_FeedMe Donate Footer_RequestFeature Request Feature Footer_MailingList Mailing List Configuration_Error1 The separator character must be a single character Configuration_Error2 The user interface port must be a number between 1 and 65535 Configuration_Error3 The POP3 listen port must be a number between 1 and 65535 Configuration_Error4 The page size must be a number between 1 and 1000 Configuration_Error5 The number of days in the history must be a number between 1 and 366 Configuration_Error6 The TCP timeout must be a number between 10 and 300 Configuration_Error7 The XML RPC listen port must be a number between 1 and 65535 Configuration_POP3Port POP3 listen port Configuration_POP3Update Updated POP3 port to %s; this change will not take affect until you restart POPFile Configuration_XMLRPCUpdate Updated XML-RPC port to %s; this change will not take affect until you restart POPFile Configuration_XMLRPCPort XML-RPC listen port Configuration_SMTPPort SMTP listen port Configuration_SMTPUpdate Updated SMTP port to %s; this change will not take affect until you restart POPFile Configuration_NNTPPort NNTP listen port Configuration_NNTPUpdate Updated NNTP port to %s; this change will not take affect until you restart POPFile Configuration_POP3Separator POP3 host:port:user separator character Configuration_NNTPSeparator NNTP host:port:user separator character Configuration_POP3SepUpdate Updated POP3 separator to %s Configuration_NNTPSepUpdate Updated NNTP separator to %s Configuration_UI User interface web port Configuration_UIUpdate Updated user interface web port to %s; this change will not take affect until you restart POPFile Configuration_History Number of messages per page Configuration_HistoryUpdate Updated number of messages per page to %s Configuration_Days Number of days of history to keep Configuration_DaysUpdate Updated number of days of history to %s Configuration_UserInterface User Interface Configuration_Skins Skins Configuration_SkinsChoose Choose skin Configuration_Language Language Configuration_LanguageChoose Choose language Configuration_ListenPorts Module Options Configuration_HistoryView History View Configuration_TCPTimeout Connection Timeout Configuration_TCPTimeoutSecs Connection timeout in seconds Configuration_TCPTimeoutUpdate Updated connection timeout to %s Configuration_ClassificationInsertion Message Text Insertion Configuration_SubjectLine Subject line modification Configuration_XTCInsertion X-Text-Classification Header Configuration_XPLInsertion X-POPFile-Link Header Configuration_Logging Logging Configuration_None None Configuration_ToScreen To Screen Configuration_ToFile To File Configuration_ToScreenFile To Screen and File Configuration_LoggerOutput Logger output Configuration_GeneralSkins Skins Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins Configuration_CurrentLogFile <current log file> Advanced_Error1 '%s' already in the Ignored Words list Advanced_Error2 Ignored words can only contain alphanumeric, ., _, -, or @ characters Advanced_Error3 '%s' added to the Ignored Words list Advanced_Error4 '%s' is not in the Ignored Words list Advanced_Error5 '%s' removed from the Ignored Words list Advanced_StopWords Ignored Words Advanced_Message1 POPFile ignores the following frequently-used words: Advanced_AddWord Add word Advanced_RemoveWord Remove word 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. History_Filter (just showing bucket <font color="%s">%s</font>) History_FilterBy Filter By History_Search (searched for from/subject %s) History_Title Recent Messages History_Jump Jump to message History_ShowAll Show All History_ShouldBe Should be History_NoFrom no from line History_NoSubject no subject line History_ClassifyAs Classify as History_MagnetUsed Magnet used History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s History_Already Reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page History_Remove To remove entries in the history click History_SearchMessage Search From/Subject History_NoMessages No messages History_ShowMagnet magnetized History_ShowNoMagnet unmagnetized History_Magnet (just showing magnet classified messages) History_NoMagnet (just showing non-magnet classified messages) History_ResetSearch Reset Password_Title Password Password_Enter Enter password Password_Go Go! Password_Error1 Incorrect password Security_Error1 The port must be a number between 1 and 65535 Security_Stealth Stealth Mode/Server Operation Security_NoStealthMode No (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_PasswordTitle User Interface Password Security_Password Password Security_PasswordUpdate Updated password to %s Security_AUTHTitle Remote Servers Security_SecureServer POP3 SPA/AUTH server Security_SecureServerUpdate Updated POP3 SPA/AUTH secure server to %s; this change will not take affect until you restart POPFile Security_SecurePort POP3 SPA/AUTH port Security_SecurePortUpdate Updated POP3 SPA/AUTH port to %s; this change will not take affect until you restart POPFile Security_SMTPServer SMTP chain server Security_SMTPServerUpdate Updated SMTP chain server to %s; this change will not take affect until you restart POPFile Security_SMTPPort SMTP chain port Security_SMTPPortUpdate Updated SMTP chain port to %s; this change will not take affect until you restart POPFile Security_POP3 Accept POP3 connections from remote machines (requires POPFile restart) Security_SMTP Accept SMTP connections from remote machines (requires POPFile restart) Security_NNTP Accept NNTP connections from remote machines (requires POPFile restart) Security_UI Accept HTTP (User Interface) connections from remote machines (requires POPFile restart) Security_XMLRPC Accept XML-RPC connections from remote machines (requires POPFile restart) Security_UpdateTitle Automatic Update Checking Security_Update Check daily for updates to POPFile Security_StatsTitle Reporting Statistics Security_Stats Send statistics daily Magnet_Error1 Magnet '%s' already exists in bucket '%s' Magnet_Error2 New magnet '%s' clashes with magnet '%s' in bucket '%s' and could cause ambiguous results. New magnet was not added. Magnet_Error3 Create new magnet '%s' in bucket '%s' Magnet_CurrentMagnets Current Magnets Magnet_Message1 The following magnets cause mail to always be classified into the specified bucket. Magnet_CreateNew Create New Magnet Magnet_Explanation These types of magnets are available:</b> <ul><li><b>From address or name:</b> For example: jo...@co... to match a specific address, <br />company.com to match everyone who sends from company.com, <br />John Doe to match a specific person, John to match all Johns</li><li><b>To/Cc address or name:</b> Like a From: magnet but for the To:/Cc: address in a message</li> <li><b>Subject words:</b> For example: hello to match all messages with hello in the subject</li></ul> Magnet_MagnetType Magnet type Magnet_Value Value Magnet_Always Always goes to bucket Magnet_Jump Jump to magnet page Bucket_Error1 Bucket names can only contain the letters a to z in lower case, numbers 0 to 9, plus - and _ Bucket_Error2 Bucket named %s already exists Bucket_Error3 Created bucket named %s Bucket_Error4 Please enter a non-blank word Bucket_Error5 Renamed bucket %s to %s Bucket_Error6 Deleted bucket %s Bucket_Title Summary Bucket_BucketName Bucket Name Bucket_WordCount Word Count Bucket_WordCounts Word Counts Bucket_UniqueWords Unique Words Bucket_SubjectModification Subject Modification Bucket_ChangeColor Change Color Bucket_NotEnoughData Not enough data Bucket_ClassificationAccuracy Classification Accuracy Bucket_EmailsClassified Messages classified Bucket_EmailsClassifiedUpper Messages Classified Bucket_ClassificationErrors Classification errors Bucket_Accuracy Accuracy Bucket_ClassificationCount Classification Count Bucket_ClassificationFP False Positives Bucket_ClassificationFN False Negatives Bucket_ResetStatistics Reset Statistics Bucket_LastReset Last Reset Bucket_CurrentColor %s current color is %s Bucket_SetColorTo Set %s color to %s Bucket_Maintenance Maintenance Bucket_CreateBucket Create bucket with name Bucket_DeleteBucket Delete bucket named Bucket_RenameBucket Rename bucket named Bucket_Lookup Lookup Bucket_LookupMessage Lookup word in buckets Bucket_LookupMessage2 Lookup result for Bucket_LookupMostLikely <b>%s</b> is most likely to appear in <font color="%s">%s</font> Bucket_DoesNotAppear <p><b>%s</b> does not appear in any of the buckets Bucket_DisabledGlobally Disabled globally Bucket_To to Bucket_Quarantine Quarantine SingleBucket_Title Detail for %s SingleBucket_WordCount Bucket word count SingleBucket_TotalWordCount Total word count SingleBucket_Percentage Percentage of total SingleBucket_WordTable Word Table for %s SingleBucket_Message1 Click a letter in the index to see the list of words that start with that letter. Click any word to lookup its probability for all buckets. SingleBucket_Unique %s unique SingleBucket_ClearBucket Remove All Words Session_Title POPFile Session Expired Session_Error Your POPFile session has expired. This could have been caused by starting and stopping POPFile but leaving your web browser open. Please click one of the links above to continue using POPFile. View_Title Single Message View Windows_TrayIcon Show POPFile icon in Windows system tray? Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. History_OpenMessageSummary This table contains the full text of a message message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the message's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the color used in displaying anything related to that bucket in the control center. Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many messages have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. Bucket_MaintenanceTableSummary This table contains forms that allow you to create, delete or rename buckets, and to lookup a word in all of the buckets to see its relative probabilities. Bucket_AccuracyChartSummary This table graphically represents the accuracy of the message classification. Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of messages classified, and total word counts. Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency that that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in a message. Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify message according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. Configuration_MainTableSummary This table contains a number of forms to allow you to control the configuration of POPFile. Configuration_InsertionTableSummary This table contains buttons that determine whether or not certain modifications are made to the headers or subject line of the message before it is passed on to the message client. Security_MainTableSummary This table provides sets of controls that affect the security of the overall configuration of POPFile, whether it should automatically check for updates to the program, and whether statistics about POPFile's performance should be sent to the central datastore of the program's author for general information. Advanced_MainTableSummary This table provides a list of words that POPFile ignores when classifying message due to their relative frequency in message in general. They are organized per row according to the first letter of the words. |
|
From: <jgr...@us...> - 2003-08-20 10:31:20
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv8832/POPFile
Modified Files:
Configuration.pm
Log Message:
Start of test suite for HTML interface
Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Configuration.pm 31 Jul 2003 16:32:21 -0000 1.26
--- Configuration.pm 20 Aug 2003 03:09:03 -0000 1.27
***************
*** 222,226 ****
print STDERR $error;
return $pid;
! }
}
return undef;
--- 222,228 ----
print STDERR $error;
return $pid;
! } else {
! print STDERR "\nThe other POPFile failed to signal back, starting new copy\n";
! }
}
return undef;
|
|
From: <jgr...@us...> - 2003-08-20 10:31:20
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv8832/tests
Modified Files:
TestHTML.tst
Log Message:
Start of test suite for HTML interface
Index: TestHTML.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestHTML.tst,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestHTML.tst 31 Jul 2003 16:32:22 -0000 1.3
--- TestHTML.tst 20 Aug 2003 03:09:03 -0000 1.4
***************
*** 23,26 ****
--- 23,49 ----
# ---------------------------------------------------------------------------------------------
+ use POSIX ":sys_wait_h";
+
+ sub pipeready
+ {
+ my ( $pipe ) = @_;
+
+ if ( !defined( $pipe ) ) {
+ return 0;
+ }
+
+ if ( $^O eq 'MSWin32' ) {
+ return ( ( -s $pipe ) > 0 );
+ } else {
+ my $rin = '';
+ vec( $rin, fileno( $pipe ), 1 ) = 1;
+ my $ready = select( $rin, undef, undef, 0.01 );
+ return ( $ready > 0 );
+ }
+ }
+
+ test_assert( `rm -rf messages` == 0 );
+
+ use Classifier::Bayes;
use UI::HTML;
use POPFile::Configuration;
***************
*** 31,38 ****
--- 54,63 ----
my $mq = new POPFile::MQ;
my $l = new POPFile::Logger;
+ my $b = new Classifier::Bayes;
$c->configuration( $c );
$c->mq( $mq );
$c->logger( $l );
+ $c->initialize();
$l->configuration( $c );
***************
*** 46,49 ****
--- 71,80 ----
$mq->logger( $l );
+ $b->configuration( $c );
+ $b->mq( $mq );
+ $b->logger( $l );
+
+ $b->initialize();
+
my $h = new UI::HTML;
***************
*** 51,54 ****
--- 82,87 ----
$h->mq( $mq );
$h->logger( $l );
+ $h->classifier( $b );
+ $h->initialize();
test_assert_equal( $h->url_encode_( ']' ), '%5d' );
***************
*** 56,58 ****
--- 89,159 ----
test_assert_equal( $h->url_encode_( '[]' ), '%5b%5d' );
test_assert_equal( $h->url_encode_( '[foo]' ), '%5bfoo%5d' );
+
+ my $port = 9000 + int(rand(1000));
+ pipe my $dreader, my $dwriter;
+ pipe my $ureader, my $uwriter;
+ my $pid = fork();
+
+ if ( $pid == 0 ) {
+
+ # CHILD THAT WILL RUN THE HTML INTERFACE
+
+ close $dwriter;
+ close $ureader;
+
+ $h->version( 'testsuite' );
+ $h->config_( 'port', $port );
+ $h->start();
+
+ while ( 1 ) {
+ last if !$h->service();
+
+ if ( pipeready( $dreader ) ) {
+ my $command = <$dreader>;
+
+ if ( $command =~ /__QUIT/ ) {
+ print $uwriter "OK\n";
+ last;
+ }
+ }
+ }
+
+ close $dreader;
+ close $uwriter;
+
+ exit(0);
+ } else {
+
+ # PARENT THAT WILL SEND COMMANDS TO THE WEB INTERFACE
+
+ close $dreader;
+ close $uwriter;
+ $dwriter->autoflush(1);
+
+ use LWP::Simple;
+ use URI::URL;
+
+ # Test the simplest functionality of the HTML interface
+
+ my $url = url( "http://127.0.0.1:$port" );
+ my $content = get($url);
+
+ # TODO Look for elements that should appear at the TOP and BOTTOM
+ # of every page
+
+ test_assert_regexp( $content, "<title>POPFile Control Center</title>" );
+
+ # TODO Validate every page in the interface against the W3C HTML 4.01
+ # validation service
+
+ print $dwriter "__QUIT\n";
+ $content = <$ureader>;
+ test_assert_equal( $content, "OK\n" );
+ close $dwriter;
+ close $ureader;
+
+ while ( waitpid( $pid, &WNOHANG ) != $pid ) {
+ }
+ }
+
|
|
From: <ssc...@us...> - 2003-08-20 09:00:32
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv19492 Modified Files: TestPOP3.tst Log Message: some tests require the messages subdirectory to be present Index: TestPOP3.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestPOP3.tst,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TestPOP3.tst 1 Aug 2003 02:45:17 -0000 1.10 --- TestPOP3.tst 20 Aug 2003 04:29:15 -0000 1.11 *************** *** 284,287 **** --- 284,290 ---- $b->start(); + # some tests require this directory to be present + mkdir( 'messages' ); + my $pid = fork(); |
|
From: <ssc...@us...> - 2003-08-20 08:25:35
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv32462
Modified Files:
Bayes.pm
Log Message:
fix last checkin
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** Bayes.pm 20 Aug 2003 06:11:07 -0000 1.180
--- Bayes.pm 20 Aug 2003 06:12:15 -0000 1.181
***************
*** 1724,1728 ****
my ( $self, $mail, $client, $file, $before ) = @_;
! my $isopen = (open FILE, "$file" if ( defined( $file ) ));
while ( <$mail> ) {
--- 1724,1728 ----
my ( $self, $mail, $client, $file, $before ) = @_;
! my $isopen = open FILE, "$file" if ( defined( $file ) );
while ( <$mail> ) {
|
|
From: <jgr...@us...> - 2003-08-20 07:27:48
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv8832/UI
Modified Files:
HTML.pm HTTP.pm
Log Message:
Start of test suite for HTML interface
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -d -r1.190 -r1.191
*** HTML.pm 20 Aug 2003 01:52:49 -0000 1.190
--- HTML.pm 20 Aug 2003 03:09:03 -0000 1.191
***************
*** 641,645 ****
$result .= "href=\"skins/" . $self->config_( 'skin' ) . ".css\" title=\"" . $self->config_( 'skin' ) . "\">\n";
$result .= "<link rel=\"shortcut icon\" type=\"image/x-icon\" ";
! $result .= "href=\"favicon.ico\"" . "\">\n";
}
--- 641,645 ----
$result .= "href=\"skins/" . $self->config_( 'skin' ) . ".css\" title=\"" . $self->config_( 'skin' ) . "\">\n";
$result .= "<link rel=\"shortcut icon\" type=\"image/x-icon\" ";
! $result .= "href=\"favicon.ico\">\n";
}
Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** HTTP.pm 31 Jul 2003 16:32:22 -0000 1.12
--- HTTP.pm 20 Aug 2003 03:09:03 -0000 1.13
***************
*** 359,362 ****
--- 359,363 ----
$header .= length($contents);
$header .= "$eol$eol";
+ $self->log_( $header );
print $client $header . $contents;
} else {
|
|
From: <ssc...@us...> - 2003-08-20 06:48:28
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv32299
Modified Files:
Bayes.pm
Log Message:
echo_to_dot_ fix. caller specifies open style for now (>> may not always be desired?)
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** Bayes.pm 1 Aug 2003 00:59:56 -0000 1.179
--- Bayes.pm 20 Aug 2003 06:11:07 -0000 1.180
***************
*** 1712,1716 ****
# $mail The stream (created with IO::) to send the message to (the remote mail server)
# $client (optional) The local mail client (created with IO::) that needs the response
! # $file (optional) A file to print the response to
# $before (optional) String to send to client before the dot is sent
#
--- 1712,1716 ----
# $mail The stream (created with IO::) to send the message to (the remote mail server)
# $client (optional) The local mail client (created with IO::) that needs the response
! # $file (optional) A file to print the response to, caller specifies open style
# $before (optional) String to send to client before the dot is sent
#
***************
*** 1724,1728 ****
my ( $self, $mail, $client, $file, $before ) = @_;
! open FILE, ">>$file" if ( defined( $file ) );
while ( <$mail> ) {
--- 1724,1728 ----
my ( $self, $mail, $client, $file, $before ) = @_;
! my $isopen = (open FILE, "$file" if ( defined( $file ) ));
while ( <$mail> ) {
***************
*** 1739,1743 ****
if ( defined( $before ) && ( $before ne '' ) ) {
print $client $before if ( defined( $client ) );
! print FILE $before if ( defined( $file ) );
}
--- 1739,1743 ----
if ( defined( $before ) && ( $before ne '' ) ) {
print $client $before if ( defined( $client ) );
! print FILE $before if ( defined( $isopen ) );
}
***************
*** 1751,1759 ****
print $client $_ if ( defined( $client ) );
! print FILE $_ if ( defined( $file ) );
}
! close FILE if ( defined( $file ) );
}
--- 1751,1759 ----
print $client $_ if ( defined( $client ) );
! print FILE $_ if ( defined( $isopen ) );
}
! close FILE if ( $isopen );
}
|
|
From: <ssc...@us...> - 2003-08-20 06:25:15
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv31641
Modified Files:
MailParse.pm
Log Message:
make decode_string properly case-insensitive
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** MailParse.pm 20 Aug 2003 02:08:33 -0000 1.155
--- MailParse.pm 20 Aug 2003 06:05:59 -0000 1.156
***************
*** 1336,1344 ****
while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*?)\?=/ig ) {
! if ($1 eq "B") {
$decode_it = decode_base64( $2 );
$mystring =~ s/=\?[\w-]+\?B\?(.*?)\?=/$decode_it/i;
} else {
! if ($1 eq "Q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
--- 1336,1344 ----
while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*?)\?=/ig ) {
! if ($1 eq "B" || $1 eq "b") {
$decode_it = decode_base64( $2 );
$mystring =~ s/=\?[\w-]+\?B\?(.*?)\?=/$decode_it/i;
} else {
! if ($1 eq "Q" || $1 eq "q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
***************
*** 1455,1458 ****
--- 1455,1459 ----
if ( $header =~ /^Subject$/i ) {
+
$prefix = 'subject';
$argument = $self->decode_string( $argument );
|
|
From: <jgr...@us...> - 2003-08-20 05:48:23
|
Update of /cvsroot/popfile/engine/tests/languages In directory sc8-pr-cvs1:/tmp/cvs-serv7364/languages Log Message: Directory /cvsroot/popfile/engine/tests/languages added to the repository |
|
From: <jgr...@us...> - 2003-08-20 03:44:19
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv27810 Modified Files: Español.msg Log Message: Updated Spanish translation Index: Español.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Español.msg,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Español.msg 31 Jul 2003 16:32:22 -0000 1.4 --- Español.msg 20 Aug 2003 01:22:43 -0000 1.5 *************** *** 1,283 **** ! # Copyright (c) 2001-2003 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # POPFile is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with POPFile; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! # ! ! # Identify the language and character set used for the interface ! LanguageCode es ! LanguageCharset ISO-8859-1 ! ! # This is used to get the appropriate subdirectory for the manual ! ManualLanguage en ! ! # Common words that are used on their own all over the interface ! Apply Aplicar ! On Activado ! Off Desactivado ! TurnOn Activar ! TurnOff Desactivar ! Add Añadir ! Remove Borrar ! Previous Anterior ! Next Siguiente ! From De ! Subject Asunto ! Classification Clasificación ! Reclassify Reclasificar ! Undo Deshacer ! Close Cerrar ! Find Encontrar ! Filter Filtro ! Yes Si ! No No ! ChangeToYes Cambiar a si ! ChangeToNo Cambiar a No ! Bucket Categoría ! Magnet Imán ! Delete Borrar ! Create Crear ! To A ! Total Total ! Rename Renombrar ! Frequency Frecuencia ! Probability Probabilidad ! Score Puntuación ! Scores Puntuaciones ! Lookup Búsqueda ! Cc Cc ! Count Contadas ! Word Palabra ! Refresh Recargar ! Update Actualizar ! QuickMagnets Iman Rapido ! ! ! # The header and footer that appear on every UI page ! Header_Title Centro de Control POPFile ! Header_Shutdown Cerrar POPFile ! Header_History Historia ! Header_Buckets Categorías ! Header_Configuration Configuración ! Header_Advanced Avanzada ! Header_Security Seguridad ! Header_Magnets Imanes ! ! Footer_HomePage Web de POPFile ! Footer_Manual Manual ! Footer_Forums Foros ! Footer_FeedMe Donar ! Footer_RequestFeature Petición de Característica ! Footer_MailingList Lista de Correo ! ! Configuration_Error1 El caracter separador debe ser sólo un caracter ! Configuration_Error2 El puerto de la interfaz de usuario debe ser un número entre 1 y 65535 ! Configuration_Error3 El puerto de escucha POP3 debe ser un número entre 1 and 65535 ! Configuration_Error4 El tamaño de página debe ser un número entre 1 y 1000 ! Configuration_Error5 El número de días en la Historia debe ser un número entre 1 and 366 ! Configuration_Error6 El tiempo límite de TCP debe ser un número entre 10 y 300 ! Configuration_Error7 El puerto de XML RPC debe ser un número entre 1 y 65535 ! Configuration_POP3Port Puerto de escucha POP3 ! Configuration_POP3Update Actualizado el puerto POP3 a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_UI Puerto de la interfaz de usuario ! Configuration_UIUpdate Puerto de la interfaz de usuario actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_History Número de mensajes por página ! Configuration_HistoryUpdate Número de mensajes por página actualizado a %s ! Configuration_Days Número de días a guardar en la historia ! Configuration_DaysUpdate Número de días a guardar en la historia actualizado a %s ! Configuration_UserInterface Interfaz de usuario ! Configuration_Skins Skins ! Configuration_SkinsChoose Elegir skin ! Configuration_Language Languaje ! Configuration_LanguageChoose Escoger languaje ! Configuration_ListenPorts Opciones del módulo ! Configuration_HistoryView Vista de la Historia ! Configuration_TCPTimeout Tiempo límite de la conexión ! Configuration_TCPTimeoutSecs Tiempo límite de la conexión en segundos ! Configuration_TCPTimeoutUpdate Tiempo límite de la conexión actualizado a %s ! Configuration_ClassificationInsertion Inserción de la Clasificación ! Configuration_SubjectLine Modificación del Asunto ! Configuration_XTCInsertion Añadir cabecera X-Text-Classification ! Configuration_XPLInsertion Añadir cabecera X-POPFile-Link ! Configuration_Logging Logging ! Configuration_CurrentLogFile <fichero actual de log> ! Configuration_None Ninguna ! Configuration_ToScreen En pantalla ! Configuration_ToFile En un fichero ! Configuration_ToScreenFile En pantalla y fichero ! Configuration_LoggerOutput Salida del Logger ! Configuration_GeneralSkins Skins ! Configuration_SmallSkins Small Skins ! Configuration_TinySkins Tiny Skins ! Configuration_NNTPPort Puerto de escucha NNTP ! Configuration_NNTPSepUpdate Caracter separador NNTP actualizado a %s ! Configuration_NNTPSeparator Caracter separador en servidor:puerto:usuario para NNTP ! Configuration_NNTPUpdate Actualizado el puerto NNTP a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_POP3SepUpdate Caracter separador POP3 actualizado a %s ! Configuration_POP3Separator Caracter separador en servidor:puerto:usuario para POP3 ! Configuration_SMTPPort Puerto de escucha SMTP ! Configuration_SMTPUpdate Actualizado el puerto SMTP a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_XMLRPCPort Puerto de escucha XML RPC ! Configuration_XMLRPCUpdate Actualizado el puerto XML RPC a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! ! Advanced_Error1 '%s' ya está en la lista de Palabras a Ignorar ! Advanced_Error2 Las Palabras a Ignorar sólo pueden incluir caracteres alfanuméricos, ., _, -, o @ ! Advanced_Error3 '%s' añadida a la lista de Palabras a Ignorar ! Advanced_Error4 '%s' no está en la lista de Palabras a Ignorar ! Advanced_Error5 '%s' borrada de la lista de Palabras a Ignorar ! Advanced_StopWords Palabras a Ignorar ! Advanced_Message1 POPFile ignora las siguientes palabras de uso frecuente: ! Advanced_AddWord Añadir palabra ! Advanced_RemoveWord Borrar palabra ! ! History_Filter (Sólo mostrando Categoría <font color="%s">%s</font>) ! History_FilterBy Filtrar por ! History_Search (Buscado por De/Asunto %s) ! History_Title Correos recientes ! History_Jump Saltar a Correo ! History_ShowAll Mostrar todos ! History_ShouldBe Debería ser ! History_NoFrom Sin línea De ! History_NoSubject Sin línea Asunto ! History_ClassifyAs Clasificar como ! History_MagnetUsed Imán usado ! History_ChangedTo Cambiado a <font color="%s">%s ! History_Already Ya reclasificado como <font color="%s">%s</font> ! History_RemoveAll Borrar Todos ! History_RemovePage Borrar Página ! History_Remove Para remover entradas en la historia haga click ! History_SearchMessage Busqueda por De/Asunto ! History_NoMessages Ningún Correo ! History_ShowMagnet Magnetizado ! History_Magnet (Mostrando sólo mensajes magnetizados) ! History_ResetSearch Reiniciar ! History_MagnetBecause <b>Imán Usado</b><p>Clasificado en <font color="%s">%s</font> debido al Imán %s </p> ! History_NoMagnet (Mostrando sólo mensajes no magnetizados) ! History_ShowNoMagnet No Magnetizado ! ! Password_Title Contraseña ! Password_Enter Introduzca contraseña ! Password_Go Adelante! ! Password_Error1 Contraseña Incorrecta ! ! Security_Error1 El puerto debe ser un número entre 1 and 65535 ! Security_Stealth Modo Invisible/Operación del Servidor ! Security_NoStealthMode No (Modo invisible) ! Security_ExplainStats (Con esto activado POPFile envía una vez al dia los siguientes tres valores a un script en www.usethesource.com: bc (el número total de categorías que tiene), mc (el número total de correos que POPFile ha clasificado) y ec (el número total de errores clasificación). Todo esto se guarda en un fichero que usarémos para publicar estadísticas de como usa POPFile la gente y cómo de bien funciona. Mi servidor web guarda sus ficheros de log 5 días y luego son borrados; no se guarda ninguna conexión entre las estadísticas y las direcciones IP particulares.) ! Security_ExplainUpdate (Con esto activado POPFile envía una vez al dia los siguientes tres valores a un script en www.usethesource.com: ma (el número mayor de versión del POPFile instalado), mi (el número menor de versión del POPFile instalado) y bn (el número de compilación del POPFile instalado). POPFile recibe una respuesta en forma de un gráfico que aparece en la página indicando si hay una nueva versión disponible. Mi servidor web guarda sus ficheros de log 5 días y luego son borrados; no se guarda ninguna conexión entre los chequeos de actualización y las direcciones IP particulares.) ! Security_PasswordTitle Contraseña de la Interfaz de Usuario ! Security_Password Contraseña ! Security_PasswordUpdate Contraseña actualizada a %s ! Security_AUTHTitle Servidores Remotos ! Security_SecureServer Sevidor POP3 SPA/AUTH seguro ! Security_SecureServerUpdate Sevidor POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_SecurePort Puerto POP3 SPA/AUTH ! Security_SecurePortUpdate Puerto POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_POP3 Aceptar conexiones POP3 de máquinas remotas (hay que reiniciar POPFile) ! Security_UI Aceptar conexiones HTTP (Interfaz de Usuario) de máquinas remotas (hay que reiniciar POPFile) ! Security_UpdateTitle Comprobación de Actualizaciones ! Security_Update Comprobar diariamente si hay actualizaciones de POPFile ! Security_StatsTitle Enviar Stadísticas ! Security_Stats Enviar Stadísticas diariamente ! Security_NNTP Aceptar conexiones NNTP de máquinas remotas (hay que reiniciar POPFile) ! Security_SMTP Aceptar conexiones SMTP de máquinas remotas (hay que reiniciar POPFile) ! Security_SMTPPort SMTP chain port ! Security_SMTPPortUpdate SMTP chain port actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_SMTPServer SMTP chain server ! Security_SMTPServerUpdate SMTP chain server actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_XMLRPC Aceptar conexiones POP3 de máquinas remotas (hay que reiniciar POPFile) ! ! Magnet_Error1 El Imán '%s' ya existe en la Categoría '%s' ! Magnet_Error2 El nuevo Imán '%s' colisiona con el '%s' en la Categoría '%s' y podría causar resultados ambiguos. Nuevo Imán no añadido. ! Magnet_Error3 Crear Imán nuevo '%s' en la Categoría '%s' ! Magnet_CurrentMagnets Imánes actuales ! Magnet_Message1 Los siguientes Imanes clasifican siempre el correo en la Categoría especificada. ! Magnet_CreateNew Crear nuevo Imán ! Magnet_Explanation Hay tres tipos de Imán:</b> <ul><li><b>Nombre o dirección en campo De:</b> Por ejemplo: jos...@em... para clasificar una dirección específica, <br />empresa.com para clasificar a todos los que envien desde empresa.com, <br />José Garcia para clasificar a una persona concreta, José para clasificar todos los Josés</li><li><b>A dirección o nombres:</b> Igual que el Imán para campo De: pero para el campo A: en el correo electrónico</li> <li><b>Palabras en campo Asunto:</b> Por ejemplo: hola para clasificar todos los correos con hola en el Asunto</li></ul> ! Magnet_MagnetType Tipo de Imán ! Magnet_Value Valor ! Magnet_Always Clasificar siempre en ! Magnet_Jump Ir a página de Imanes ! ! Bucket_Error1 Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _ ! Bucket_Error2 Ya existe una Categoría llamada %s ! Bucket_Error3 Categoría %s creada ! Bucket_Error4 Escriba una palabra no vacia ! Bucket_Error5 Categoría %s renombrada a %s ! Bucket_Error6 Categoría %s borrada ! Bucket_Title Resumen ! Bucket_BucketName Nombre de Categoría ! Bucket_WordCount Total (Palabras) ! Bucket_WordCounts Total (Palabras) ! Bucket_UniqueWords Palabras Únicas ! Bucket_SubjectModification Modificación del Asunto ! Bucket_ChangeColor Cambiar Color ! Bucket_NotEnoughData Faltan datos ! Bucket_ClassificationAccuracy Precisión de la Clasificación ! Bucket_EmailsClassified Mensajes Clasificados ! Bucket_EmailsClassifiedUpper Mensajes Clasificados ! Bucket_ClassificationErrors Errores de Clasificación ! Bucket_Accuracy Precisión ! Bucket_ClassificationCount Total Clasificados ! Bucket_ResetStatistics Reiniciar Estadísticas ! Bucket_LastReset Último reinicio ! Bucket_CurrentColor El color actual de %s es %s ! Bucket_SetColorTo Establecido %s como color de %s ! Bucket_Maintenance Mantenimiento ! Bucket_CreateBucket Crear Categoría de nombre ! Bucket_DeleteBucket Borrar Categoría de nombre ! Bucket_RenameBucket Renombrar Categoría de nombre ! Bucket_Lookup Busquedas ! Bucket_LookupMessage Buscar palabras en Categorías ! Bucket_LookupMessage2 Resultados de la búsqueda para ! Bucket_LookupMostLikely La palabra <b>%s</b> es más probable que aparezca en <font color="%s">%s</font> ! Bucket_DoesNotAppear <p><b>%s</b> no aparece en ninguna de las Categorías ! Bucket_DisabledGlobally Deshabilitado Globalmente ! Bucket_To A ! Bucket_Quarantine Cuarentena ! Bucket_ClassificationFN Falsos Negativos ! Bucket_ClassificationFP Falsos Positivos ! ! SingleBucket_Title Detalles para %s ! SingleBucket_WordCount Total palabras en Categoría ! SingleBucket_TotalWordCount Total de Palabras ! SingleBucket_Percentage Porcentaje del total ! SingleBucket_WordTable Tabla de palabras para %s ! SingleBucket_Message1 "Pincha" una letra en el indice para ver las palabras que empiezan por ella. "Pincha" en cualquier palabra para conocer su probabilidad en todas las Categorías. ! SingleBucket_Unique %s únicas ! SingleBucket_ClearBucket Borrar todas las Palabras ! ! Session_Title Ha expirado la sesión de POPFile ! Session_Error Ha expirado tu sesión de POPFile. Esto puede ser debido a que haya dejado su navegador abierto mientras reiniciaba POPFile. Por favor, pinche en uno de los enlaces superiores para continuar usando POPFile. ! ! View_Title Vista de un solo mensaje ! ! Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. ! History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. ! History_OpenMessageSummary This table contains the full text of an email message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. ! Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the email's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the color used in displaying anything related to that bucket in the control center. ! Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many emails have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. ! Bucket_MaintenanceTableSummary This table contains forms that allow you to create, delete or rename buckets, and to lookup a word in all of the buckets to see its relative probabilities. ! Bucket_AccuracyChartSummary This table graphically represents the accuracy of the email classification. ! Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of emails classified, and total word counts. ! Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency that that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in an email. ! Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. ! Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify email according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. ! Configuration_MainTableSummary This table contains a number of forms to allow you to control the configuration of POPFile. ! Configuration_InsertionTableSummary This table contains buttons that determine whether or not certain modifications are made to the headers or subject line of the email before it is passed on to the email client. ! Security_MainTableSummary This table provides sets of controls that affect the security of the overall configuration of POPFile, whether it should automatically check for updates to the program, and whether statistics about POPFile's performance should be sent to the central datastore of the program's author for general information. ! Advanced_MainTableSummary This table provides a list of words that POPFile ignores when classifying email due to their relative frequency in email in general. They are organized per row according to the first letter of the words. ! --- 1,266 ---- ! # Copyright (c) 2001-2003 John Graham-Cumming ! ! # Identify the language and character set used for the interface ! LanguageCode es ! LanguageCharset ISO-8859-1 ! ! # This is used to get the appropriate subdirectory for the manual ! ManualLanguage es ! ! # Common words that are used on their own all over the interface ! Apply Aplicar ! On Activo ! Off Inactivo ! TurnOn Activar ! TurnOff Desactivar ! Add Añadir ! Remove Quitar ! Previous Previa ! Next Seguir ! From De ! Subject Asunto ! Cc Cc ! Classification Clasificación ! Reclassify Reclasificar ! Probability Probabilidad ! Scores Puntuaciones ! QuickMagnets Superimanes ! Undo Deshacer ! Close Cerrar ! Find Buscar ! Filter Filtro ! Yes Si ! No No ! ChangeToYes cambiar a Sí ! ChangeToNo cambiar a No ! Bucket Categoría ! Magnet Imán ! Delete Borrar ! Create Crear ! To Para ! Total Total ! Rename Renombrar ! Frequency Frequencia ! Probability Probabilidad ! Score Puntuación ! Lookup Búsqueda ! Word Palabra ! Count Cuenta ! Update Actualizar ! Refresh Refrescar ! ! # The header and footer that appear on every UI page ! Header_Title POPFile - Centro de Control ! Header_Shutdown Apagar POPFile ! Header_History Historial ! Header_Buckets Categorías ! Header_Configuration Configuración ! Header_Advanced Avanzado ! Header_Security Seguridad ! Header_Magnets Imanes ! ! Footer_HomePage Página Web de POPFile ! Footer_Manual Manual ! Footer_Forums Foros ! Footer_FeedMe Donar ! Footer_RequestFeature Pedir Característica ! Footer_MailingList Lista de Correo ! ! Configuration_Error1 El carácter separador tiene que ser uno solo ! Configuration_Error2 El puerto del GUI tiene que ser un nº entre 1 y 65535 ! Configuration_Error3 El puerto de escucha POP3 tiene que ser un nº entre 1 y 65535 ! Configuration_Error4 El tamaño de la página tiene que ser un nº entre 1 y 1000 ! Configuration_Error5 El nº de dias en el historial tiene que ser un nº entre 1 y 366 ! Configuration_Error6 La temporización TCP debe ser un nº entre 10 y 300 ! Configuration_Error7 El puerto de escucha XML RPC listen debe ser un número entre 1 y 65535 ! Configuration_POP3Port Puerto de escucha POP3 ! Configuration_POP3Update Puerto actualizado a %s; este cambio será efectivo al siguiente reinicio de POPFile ! Configuration_XMLRPCUpdate Puerto XML-RPC actualizado a %s; este cambio será efectivo en el siguiente arranque de POPFile ! Configuration_XMLRPCPort Puerto de escucha XML-RPC ! Configuration_SMTPPort Puerto de escucha SMTP ! Configuration_SMTPUpdate Puerto SMTP actualizado a %s; este cambio será efectivo en el siguiente arranque de POPFile ! Configuration_NNTPPort Puerto de escucha NNTP ! Configuration_NNTPUpdate Puerto NNTP actualizado a %s; este cambio será efectivo en el siguiente arranque de POPFile ! Configuration_POP3Separator POP3 host:puerto:usuario caracter separador ! Configuration_NNTPSeparator NNTP host:puerto:usuario caracter separador ! Configuration_POP3SepUpdate Separador POP3 actualizado a %s ! Configuration_NNTPSepUpdate Separador NNTP actualizado a %s ! Configuration_UI Puerto web del interface de Usuario ! Configuration_UIUpdate El puerto web del interface de usuario ha sido actualizado a %s ; este cambio será efectivo en el siguiente reinicio de POPFile ! Configuration_History Número de correos por página ! Configuration_HistoryUpdate Nº de correos por página actualizado a %s ! Configuration_Days Nº de dias que se guarda el historial ! Configuration_DaysUpdate Actualizado el número de días en historial a %s ! Configuration_UserInterface Interface de Usuario ! Configuration_Skins Apariencias ! Configuration_SkinsChoose Elegir una apariencia ! Configuration_Language Lenguaje ! Configuration_LanguageChoose Elegir lenguaje ! Configuration_ListenPorts Puertos de escucha ! Configuration_HistoryView Vista de Historial ! Configuration_TCPTimeout Temporización de la conexión TCP ! Configuration_TCPTimeoutSecs Temporización en segundos ! Configuration_TCPTimeoutUpdate Temporización de la conexión TCP establecida en %s ! Configuration_ClassificationInsertion Inserción de texto en E-Mail ! Configuration_SubjectLine Modificar la línea de asunto ! Configuration_XTCInsertion Insertar Clasificación-X-Text ! Configuration_XPLInsertion Insertar enlace-X-POPFile ! Configuration_Logging Registro ! Configuration_None Nada ! Configuration_ToScreen A Pantalla ! Configuration_ToFile A Fichero ! Configuration_ToScreenFile A Pantalla y Fichero ! Configuration_LoggerOutput Salida ! Configuration_GeneralSkins Apariencias ! Configuration_SmallSkins Apariencias pequeñas ! Configuration_TinySkins Apariencias enanas ! Configuration_CurrentLogFile <arch. de registro actual> ! ! Advanced_Error1 '%s' ya está en la lista de palabras ignoradas ! Advanced_Error2 Las palabras ignoradas solo pueden contener caracteres alfanuméricos, ., _, -, ó @ ! Advanced_Error3 '%s' añadida a la lista de palabras ignoradas ! Advanced_Error4 '%s' no está en la lista de palabras ignoradas ! Advanced_Error5 '%s' quitada de la lista de palabras ignoradas ! Advanced_StopWords Palabras Ignoradas ! Advanced_Message1 POPFile ignora las siguientes palabras de uso frecuente: ! Advanced_AddWord Añadir palabra ! Advanced_RemoveWord Quitar palabra ! ! History_Filter (mostrando sólo la categoría <font color="%s">%s</font>) ! History_FilterBy Filtrar Por ! History_Search (buscando en de/asunto %s) ! History_Title Mensajes Recientes ! History_Jump Ir al mensaje ! History_ShowAll Mostrar Todo ! History_ShouldBe Debería ser ! History_NoFrom sin línea de ! History_NoSubject sin línea de asunto ! History_ClassifyAs Clasificar como ! History_MagnetUsed Imán utilizado ! History_MagnetBecause <b>Iman usado</b><p>Clasificado a <font color="%s">%s</font> por el iman %s </p> ! History_ChangedTo Cambiado a <font color="%s">%s ! History_Already Anteriormente clasificado como <font color="%s">%s</font> ! History_RemoveAll Quitar Todo ! History_RemovePage Quitar Página ! History_Remove Para borrar las entradas en el historial clic ! History_SearchMessage Buscar De/Asunto ! History_NoMessages Sin mensajes ! History_ShowMagnet magnetizado ! History_ShowNoMagnet desmagnetizado ! History_Magnet (mostrando solo mensajes clasificados por imán) ! History_NoMagnet (Mostrando sólo mensajes no-clasificados magnéticamente) ! History_ResetSearch Reiniciar ! ! Password_Title Contraseña ! Password_Enter Escriba contraseña ! Password_Go ¡Venga! ! Password_Error1 Contraseña incorrecta ! ! 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: <b>bc</b> (el nº de categorías que tienes), <b>mc</b> (el nº total de mensajes que ha clasificado POPFile) y <b>ec</b> (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: <b>ma</b> (el nº de versión de tu POPFile), <b>mi</b> (el nº de revisión de tu POPFile) y <b>bn</b> (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 a %s ! Security_AUTHTitle Autentificación por Contraseña Segura/AUTH ! Security_SecureServer Servidor seguro ! Security_SecureServerUpdate Actualizado el servidor seguro a %s; este cambio será efectivo en el siguiente reinicio de POPFile ! Security_SecurePort Puerto seguro ! Security_SecurePortUpdate Puerto actualizado a %s; este cambio será efectivo en el siguiente reinicio de POPFile ! Security_SMTPServer servidor chain SMTP ! Security_SMTPServerUpdate Actualizado el servidor chain SMTP a %s; este cambio será efectivo en el siguiente reinicio de POPFile ! Security_SMTPPort Puerto chain SMTP ! Security_SMTPPortUpdate Actualizado elpuerto chain SMTP a %s; este cambio será efectivo en el siguiente reinicio de POPFile ! Security_POP3 Aceptar conexiones POP3 desde máquinas remotas (necesita reiniciar POPFile) ! Security_SMTP Aceptar conexiones SMTP desde máquinas remotas (necesita reiniciar POPFile) ! Security_NNTP Aceptar conexiones NNTP desde máquinas remotas (necesita reiniciar POPFile) ! Security_UI Aceptar conexiones HTTP (Interface del Usuario) desde máquinas remotas (necesita reiniciar POPFile) ! Security_XMLRPC Aceptar conexiones XML-RPC desde máquinas remotas (necesita reiniciar POPFile) ! Security_UpdateTitle Comprobación automática de actualización ! Security_Update Buscar actualizaciones POPFile a diario ! Security_StatsTitle Enviar Estadísticas ! Security_Stats Enviar estadísticas diariamente ! ! Magnet_Error1 El imán '%s' ya existía en la categoría '%s' ! Magnet_Error2 El nuevo imán '%s' interfiere con el imán '%s' de la categoría '%s' y puede dar lugar a resultados ambiguos. No se ha añadido el nuevo. ! Magnet_Error3 Crear imán nuevo '%s' en la categoría '%s' ! Magnet_CurrentMagnets Imanes Actuales ! Magnet_Message1 Los siguientes imanes hacen que el correo sea clasificado siempre en la categoría especificada. ! Magnet_CreateNew Crear Imán Nuevo ! Magnet_Explanation Hay tres tipos de imanes disponibles:</b> <ul><li><b>Dirección de procedencia o nombre del remitente:</b> Por ejemplo:<br /> <i>fe...@co...</i> para capturar esta dirección específica, <br /><i>company.com</i> para capturar a cualquiera que envíe desde <i>company.com</i>, <br /><i>Felipe Martinez</i> para capturar esa persona específica,<br /> <i>Felipe</i> para capturar a todos los Felipes</li><li><b>Dirección <i>Para:</i> o nombre del destinatario:</b> Como un imán De: pero con la dirección <i>Para:</i> en un correo</li> <li><b>Palabras en el Asunto:</b> Por ejem.: <i>hola</i> para capturar todos los mensajes con <i>hola</i> en el asunto</li></ul> ! Magnet_MagnetType Tipo de Imán ! Magnet_Value Valor ! Magnet_Always Ir siempre a categoría ! Magnet_Jump Ir a la página iman ! ! Bucket_Error1 Los nombres de categoría sólo pueden contener las letras de la "a" a la "z" en minusculas, - y _ ! Bucket_Error2 Ya existe la categoría %s ! Bucket_Error3 Categoría %s creada ! Bucket_Error4 Ponga por favor una palabra no-vacía ! Bucket_Error5 Categoría %s renombrada a %s ! Bucket_Error6 Categoría %s borrada ! Bucket_Title Sumario ! Bucket_BucketName Nombre de Categoría ! Bucket_WordCount Contador de Palabras ! Bucket_WordCounts Nº de palabras ! Bucket_UniqueWords Palabras únicas ! Bucket_SubjectModification Modificación del asunto ! Bucket_ChangeColor Cambiar Color ! Bucket_NotEnoughData No hay bastantes datos ! Bucket_ClassificationAccuracy Exactitud de la Clasificación ! Bucket_EmailsClassified correos clasificados ! Bucket_EmailsClassifiedUpper Correos Clasificados ! Bucket_ClassificationErrors Errores de clasificación ! Bucket_Accuracy Exactitud ! Bucket_ClassificationCount Contador de Clasificación ! Bucket_ClassificationFP Falsos Positivos ! Bucket_ClassificationFN Falsos Negativos ! Bucket_ResetStatistics Reiniciar Estadísticas ! Bucket_LastReset Ultimo Reinicio ! Bucket_CurrentColor El color actual de %s es %s ! Bucket_SetColorTo Cambiar el color de %s a %s ! Bucket_Maintenance Mantenimiento ! Bucket_CreateBucket Nombre de categoría ! Bucket_DeleteBucket Borrar categoría ! Bucket_RenameBucket Renombrar categoría ! Bucket_Lookup Búsqueda ! Bucket_LookupMessage Buscar palabra en categorías ! Bucket_LookupMessage2 Buscar en resultados por ! Bucket_LookupMostLikely <b>%s</b> en su mayoría aparece en <font color="%s">%s</font> ! Bucket_DoesNotAppear <p><b>%s</b> no aparece en ninguna de las categorías ! Bucket_DisabledGlobally Desactivado globalmente ! Bucket_To a ! Bucket_Quarantine Cuarentena ! ! SingleBucket_Title Detalle de %s ! SingleBucket_WordCount Categoría nº de palabras ! SingleBucket_TotalWordCount Nº total de palabras ! SingleBucket_Percentage Porcentaje del total ! SingleBucket_WordTable Palabra Table for %s ! SingleBucket_Message1 Las palabras con estrellas (*) se han usado para clasificar en esta sesión de POPFile. Clic en cualquier palabra para buscar su probabilidad para todos las categorías. ! SingleBucket_Unique %s único ! SingleBucket_ClearBucket Borrar Todas las Palabras ! ! Session_Title Terminada la Sesión POPFile ! Session_Error Ha expirado tu sesión en POPFile, y puede ser debido a arrancar y parar POPFile dejando tu navegador abierto. Por favor, pincha uno de los enlaces de arriba para seguir con POPFile. ! ! View_Title Vista de un solo mensaje ! ! Header_MenuSummary Esta tabla es el menú de navegación que le permite acceder a cada una de las páginas del centro de control. ! History_MainTableSummary Esta tabla muestra el remitente y asunto de los mensajes recibidos recientemente y permite que sean revisados y reclasificados. Pinchando en la línea de asunto se mostrará el texto completo del mensaje, junto con información acerca del porqué se clasificó así. La columna 'Debería ser' le permite especificar a qué categoría pertenece el mensaje, o deshacer el cambio. La columna 'Borrar' le permite borrar mensajes específicos del historial si usted ya no los necesita. ! History_OpenMessageSummary Esta tabla contiene el texto completo de un mensaje de correo, enfatizando las palabras que se han utilizado para clasificarlos acorde con la categoría que era más relevante para cada una. ! Bucket_MainTableSummary Esta tabla proporciona una visión global de las categorías de clasificación. Cada fila muestra el nombre de la categoría, el nº total de palabras de esta categoría, el nº actual de palabras unicas en cada categoría, si el asunto del correo se modificará al clasificarlo es esa categoría, si pondrá en cuarentena los mensajes recibidos en esa categoría, y una tabla de la que escoger el color con el que se visualizará en el centro de control lo relacionado con esa categoría. ! Bucket_StatisticsTableSummary Esta tabla proporciona tres conjuntos de estadísticas sobre el comportamiento global de POPFile. El 1º es sobre lo acertada des su clasificación, el 2º es cuántos correos se han clasificado, y en qué categorías, y el 3º es cuántas palabras hay en cada categoría, y cuáles son sus porcentajes relativos. ! Bucket_MaintenanceTableSummary Esta tabla confiene formularios que te permiten crear, borrar o renombrar categorías, y buscar palabras en todas las categorías para ver sus probabilidades relativas. ! Bucket_AccuracyChartSummary Esta tabla representa gráficamente la exactitud de la clasificación de correo. ! Bucket_BarChartSummary Esta tabla representa gráficamente un distribución percentual de cada una de las diferentes categorías. Esto se necesita para al nº de correos clasificados, y el conteo total de palabras. ! Bucket_LookupResultsSummary Esta tabla muestra las probabilidades asociadas con una palabra dada en el corpus. Para cada categoría, muestra la frecuencia con que se encuentra esa palabra, la probabilidad de que vuelava a encontrarse en esa categoría, y el efecto en general sobre la puntuación de la categoría si esa palabra existe en un correo. ! Bucket_WordListTableSummary Esta tabla proporciona un listado de todas las palabras de una categoría en particular, ordenadas por la primera letra común de cada fila. ! Magnet_MainTableSummary Esta tabla muestra la lista de imanes que se han usado para autoclasificar el correo de acuerdo a reglas fijas. Cada fila muestra cómo está definido el imán, para qué categoría se ha ideado, y un botón para borrar el imán. ! Configuration_MainTableSummary Esta tabla contiene los formularios que te permitirán controlar la configuración de POPFile. ! Configuration_InsertionTableSummary Esta tabla contiene botones que determinan cuando se harán o no, ciertas modificaciones a la cabecera o al título del correo antes de enviarlo al cliente de correo. ! Security_MainTableSummary Esta tabla proporciona grupos de controles que afectan a la seguridad de la configuración global de POPFile, si tiene que comprobar automáticamente la existencia de actualizaciones del programa, y si las estadísticas sobre el comportamiento de POPFile tienen que enviarse al almacén de datos centralizado del autor del programa (para obtener información general). ! Advanced_MainTableSummary Esta tabla proporciona un listado de palabras que POPFile ignora cuando clasifica correos debido a su frecuencia relativa en todos ellos. Están ordenadas por filas de acuerdo con la primera letra de las palabras. ! |
|
From: <jgr...@us...> - 2003-08-20 03:06:00
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv29027 Modified Files: popfile.ico Log Message: Better icon Index: popfile.ico =================================================================== RCS file: /cvsroot/popfile/engine/popfile.ico,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvssYyibW and /tmp/cvsUjgp6H differ |
|
From: <jgr...@us...> - 2003-08-20 02:49:41
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv1187
Modified Files:
MailParse.pm
Log Message:
Merge patch for the entity hash
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** MailParse.pm 31 Jul 2003 16:32:20 -0000 1.154
--- MailParse.pm 20 Aug 2003 02:08:33 -0000 1.155
***************
*** 35,63 ****
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225, # PROFILE BLOCK START
! 'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
! 'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
! 'atilde' => 226, 'Atilde' => 204, 'Auml' => 196, 'auml' => 228,
! 'brvbar' => 166, 'ccedil' => 230, 'Ccedil' => 208, 'cedil' => 193,
! 'cent' => 162, 'copy' => 169, 'curren' => 164, 'deg' => 185,
! 'divide' => 246, 'Eacute' => 210, 'eacute' => 232, 'ecirc' => 233,
! 'Ecirc' => 211, 'Egrave' => 209, 'egrave' => 231, 'ETH' => 217,
! 'eth' => 239, 'Euml' => 212, 'euml' => 234, 'frac12' => 198,
! 'frac14' => 197, 'frac34' => 199, 'iacute' => 236, 'Iacute' => 214,
! 'icirc' => 237, 'Icirc' => 215, 'iexcl' => 161, 'igrave' => 235,
! 'Igrave' => 213, 'iquest' => 200, 'iuml' => 238, 'Iuml' => 216,
! 'laquo' => 180, 'macr' => 184, 'micro' => 190, 'middot' => 192,
! 'nbsp' => 160, 'not' => 181, 'ntilde' => 240, 'Ntilde' => 218,
! 'oacute' => 242, 'Oacute' => 210, 'Ocirc' => 211, 'ocirc' => 243,
! 'Ograve' => 219, 'ograve' => 241, 'ordf' => 170, 'ordm' => 195,
! 'oslash' => 247, 'Oslash' => 215, 'Otilde' => 212, 'otilde' => 244,
! 'Ouml' => 214, 'ouml' => 246, 'para' => 191, 'plusmn' => 186,
! 'pound' => 163, 'raquo' => 196, 'reg' => 183, 'sect' => 167,
! 'shy' => 182, 'sup1' => 194, 'sup2' => 187, 'sup3' => 188,
! 'szlig' => 223, 'thorn' => 253, 'THORN' => 221, 'times' => 214,
! 'Uacute' => 217, 'uacute' => 249, 'ucirc' => 250, 'Ucirc' => 218,
! 'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
! 'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254); # PROFILE BLOCK STOP
#----------------------------------------------------------------------------
--- 35,63 ----
# character code
! my %entityhash = ('aacute' => 225, 'Aacute' => 193, 'Acirc' => 194, 'acirc' => 226, # PROFILE BLOCK START
! 'acute' => 180, 'AElig' => 198, 'aelig' => 230, 'Agrave' => 192,
! 'agrave' => 224, 'amp' => 38, 'Aring' => 197, 'aring' => 229,
! 'atilde' => 227, 'Atilde' => 195, 'Auml' => 196, 'auml' => 228,
! 'brvbar' => 166, 'ccedil' => 231, 'Ccedil' => 199, 'cedil' => 184,
! 'cent' => 162, 'copy' => 169, 'curren' => 164, 'deg' => 176,
! 'divide' => 247, 'Eacute' => 201, 'eacute' => 233, 'ecirc' => 234,
! 'Ecirc' => 202, 'Egrave' => 200, 'egrave' => 232, 'ETH' => 208,
! 'eth' => 240, 'Euml' => 203, 'euml' => 235, 'frac12' => 189,
! 'frac14' => 188, 'frac34' => 190, 'iacute' => 237, 'Iacute' => 205,
! 'icirc' => 238, 'Icirc' => 206, 'iexcl' => 161, 'igrave' => 236,
! 'Igrave' => 204, 'iquest' => 191, 'iuml' => 239, 'Iuml' => 207,
! 'laquo' => 171, 'macr' => 175, 'micro' => 181, 'middot' => 183,
! 'nbsp' => 160, 'not' => 172, 'ntilde' => 241, 'Ntilde' => 209,
! 'oacute' => 243, 'Oacute' => 211, 'Ocirc' => 212, 'ocirc' => 244,
! 'Ograve' => 210, 'ograve' => 242, 'ordf' => 170, 'ordm' => 186,
! 'oslash' => 248, 'Oslash' => 216, 'Otilde' => 213, 'otilde' => 245,
! 'Ouml' => 214, 'ouml' => 246, 'para' => 182, 'plusmn' => 177,
! 'pound' => 163, 'raquo' => 187, 'reg' => 174, 'sect' => 167,
! 'shy' => 173, 'sup1' => 185, 'sup2' => 178, 'sup3' => 179,
! 'szlig' => 223, 'thorn' => 254, 'THORN' => 222, 'times' => 215,
! 'Uacute' => 218, 'uacute' => 250, 'ucirc' => 251, 'Ucirc' => 219,
! 'ugrave' => 249, 'Ugrave' => 217, 'uml' => 168, 'Uuml' => 220,
! 'uuml' => 252, 'Yacute' => 221, 'yacute' => 253, 'yen' => 165,
! 'yuml' => 255 ); # PROFILE BLOCK STOP
#----------------------------------------------------------------------------
|
|
From: <jgr...@us...> - 2003-08-20 02:28:41
|
Update of /cvsroot/popfile/engine/skins
In directory sc8-pr-cvs1:/tmp/cvs-serv28097
Modified Files:
windows.css
Log Message:
Updated Windows skin based on texasfett patch
Index: windows.css
===================================================================
RCS file: /cvsroot/popfile/engine/skins/windows.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** windows.css 17 Jun 2003 17:26:39 -0000 1.3
--- windows.css 20 Aug 2003 01:24:11 -0000 1.4
***************
*** 5,9 ****
is ok but doesn't show the full effect, IE 5 is ugly but usable. Opera 7.10
and KDE Konqueror 3.04 are pretty good. Konqueror 2, and Mac OS9 IE 5 are not
! bad. Its does well on OS X's Safari 1.0 beta Opera, and IE 5. It seems on
most Mac browsers the "title bar" is not working correctly due to the way
they handle system colors.
--- 5,9 ----
is ok but doesn't show the full effect, IE 5 is ugly but usable. Opera 7.10
and KDE Konqueror 3.04 are pretty good. Konqueror 2, and Mac OS9 IE 5 are not
! bad. Its does well on OS X's Safari 1.0 beta, Opera, and IE 5. It seems on
most Mac browsers the "title bar" is not working correctly due to the way
they handle system colors.
***************
*** 172,176 ****
table.menu {
! padding-top: 20px;
}
--- 172,176 ----
table.menu {
! padding-top: 5px;
}
|
|
From: <jgr...@us...> - 2003-08-18 15:30:46
|
Update of /cvsroot/popfile/engine/manual/jp In directory sc8-pr-cvs1:/tmp/cvs-serv13483/jp Log Message: Directory /cvsroot/popfile/engine/manual/jp added to the repository |
Update of /cvsroot/popfile/engine/manual/jp In directory sc8-pr-cvs1:/tmp/cvs-serv13581/jp Added Files: email.html firewalls.html firsttime.html installing.html manual.html multiple.html proxies.html spa.html training.html Log Message: Added Japanese manual --- NEW FILE: email.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firewalls.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firsttime.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: installing.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: manual.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: multiple.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: proxies.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spa.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: training.html --- (This appears to be a binary file; contents omitted.) |
|
From: <xue...@us...> - 2003-08-18 12:15:54
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv14111
Modified Files:
installer.nsi
Log Message:
Version information updated, stop destroying local registers in .onInit (to make it easier to debug)
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** installer.nsi 13 Aug 2003 16:36:57 -0000 1.107
--- installer.nsi 18 Aug 2003 12:15:51 -0000 1.108
***************
*** 93,98 ****
# <NSIS Language NAME>-pfi.nsh - holds strings used on the custom pages and elsewhere
#
! # Once these files have been prepared and placed in the 'languages' directory with the other
! # *-mui.nsh and *-pfi.nsh files, add a new '!insertmacro PFI_LANG_LOAD' line to load these
# two new files and, if there is a suitable POPFile UI language file for the new language,
# add a suitable '!insertmacro UI_LANG_CONFIG' line in the section which handles the optional
--- 93,98 ----
# <NSIS Language NAME>-pfi.nsh - holds strings used on the custom pages and elsewhere
#
! # Once these files have been prepared and placed in the 'windows\languages' directory with the
! # other *-mui.nsh and *-pfi.nsh files, add a new '!insertmacro PFI_LANG_LOAD' line to load these
# two new files and, if there is a suitable POPFile UI language file for the new language,
# add a suitable '!insertmacro UI_LANG_CONFIG' line in the section which handles the optional
***************
*** 105,114 ****
!define MUI_PRODUCT "POPFile"
!
! !ifndef ENGLISH_ONLY
! !define MUI_VERSION "0.20.0 (ML)"
! !else
! !define MUI_VERSION "0.20.0 (English)"
! !endif
!define C_README "v0.19.1.change"
--- 105,109 ----
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (CVS)"
!define C_README "v0.19.1.change"
***************
*** 162,167 ****
#--------------------------------------------------------------------------
- ; This feature is "under construction" (and has not yet been documented in NSIS user manual)
-
; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535
; representing the following values: Major.Minor.Release.Build
--- 157,160 ----
***************
*** 177,187 ****
!ifndef ENGLISH_ONLY
! VIAddVersionKey "Build" "Multi-Language (Experimental)"
!else
! VIAddVersionKey "Build" "English-Only (Experimental)"
!endif
VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
! VIAddVersionKey "Build Script" "${__FILE__} (${__TIMESTAMP__})"
#----------------------------------------------------------------------------------------
--- 170,180 ----
!ifndef ENGLISH_ONLY
! VIAddVersionKey "Build" "Multi-Language (CVS)"
!else
! VIAddVersionKey "Build" "English-Only (CVS)"
!endif
VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
! VIAddVersionKey "Build Script" "${__FILE__}$\r$\n(${__TIMESTAMP__})"
#----------------------------------------------------------------------------------------
***************
*** 459,462 ****
--- 452,459 ----
!define L_LINE $R7
+ Push ${L_INPUT_FILE_HANDLE}
+ Push ${L_OUTPUT_FILE_HANDLE}
+ Push ${L_LINE}
+
; Conditional compilation: if ENGLISH_ONLY is defined, support only 'English'
***************
*** 491,494 ****
--- 488,495 ----
FileClose ${L_INPUT_FILE_HANDLE}
FileClose ${L_OUTPUT_FILE_HANDLE}
+
+ Pop ${L_LINE}
+ Pop ${L_OUTPUT_FILE_HANDLE}
+ Pop ${L_INPUT_FILE_HANDLE}
!undef L_INPUT_FILE_HANDLE
|
|
From: <xue...@us...> - 2003-08-18 11:57:17
|
Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv11443
Modified Files:
Japanese-mui.nsh Japanese-pfi.nsh
Log Message:
Translation provided by Junya Ishihara (jishiha)
Index: Japanese-mui.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Japanese-mui.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Japanese-mui.nsh 1 Aug 2003 00:30:29 -0000 1.4
--- Japanese-mui.nsh 18 Aug 2003 11:57:13 -0000 1.5
***************
*** 40,52 ****
#--------------------------------------------------------------------------
! ; POPFile translation not available - use default NSIS message
!
! ;!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! ;"This wizard will guide you through the installation of POPFile.\r\n\r\n\It is recommended that you close all other applications before starting Setup.\r\n\r\n"
!
! ; Default NSIS message:
!
! ;!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! ;"±ÌEBU[hÍAPOPFile ÌCXg[ðKChµÄ¢«Ü·B\r\n\r\nZbgAbvðJn·éOÉA¼Ì·×ÄÌAvP[VðI¹·é±Æð§µÜ·B±êÉæÁÄAZbgAbvª±ÌRs
[^ðÄN®¹¸ÉAmÀÉVXe t@CðAbvf[g·é±Æªoéæ¤ÉÈèÜ·B\r\n\r\n"
#--------------------------------------------------------------------------
--- 40,45 ----
#--------------------------------------------------------------------------
! !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! "±ÌEBU[hÍAPOPFile ÌCXg[ðKChµÄ¢«Ü·B\r\n\r\nZbgAbvðJn·éOÉA¼Ì·×ÄÌAvP[VðI¹·é±Æð§µÜ·B\r\n\r\n"
#--------------------------------------------------------------------------
***************
*** 57,61 ****
!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
! "POPFile User Interface"
#--------------------------------------------------------------------------
--- 50,54 ----
!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
! "POPFile [U[C^[tF[X"
#--------------------------------------------------------------------------
Index: Japanese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Japanese-pfi.nsh 1 Aug 2003 00:33:27 -0000 1.9
--- Japanese-pfi.nsh 18 Aug 2003 11:57:13 -0000 1.10
***************
*** 59,64 ****
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)"
#--------------------------------------------------------------------------
--- 59,64 ----
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "POPFile Ì[Xm[gð\¦µÜ·©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "AbvO[hÌêÍuYesvð§µÜ·(AbvO[hÌOÉobNAbvðæé±Æð¨©ßµÜ·)"
#--------------------------------------------------------------------------
***************
*** 66,72 ****
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl."
! !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
! !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI."
#--------------------------------------------------------------------------
--- 66,72 ----
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "POPFile ÌRAt@CðCXg[µÜ·BŬo[WÌ Perl àÜÝÜ·B"
! !insertmacro PFI_LANG_STRING DESC_SecSkins "POPFile [U[C^[tF[XÌfUCðϦé±ÆªÅ«é POPFile XLðCXg[µÜ·B"
! !insertmacro PFI_LANG_STRING DESC_SecLangs "POPFile UI ÌpêÈOÌo[WðCXg[µÜ·B"
#--------------------------------------------------------------------------
***************
*** 76,111 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts (runs in background)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN EXISTING VERSION"
; Message Boxes used when validating user's selections
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Please change your POP3 port selection."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "The 'User Interface' port cannot be set to"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "The port must be a number in the range 1 to 65535."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Please change your 'User Interface' port selection."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections."
; Banner message displayed whilst uninstalling old version
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..."
#--------------------------------------------------------------------------
--- 76,111 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile CXg[IvV"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "±êçÌIvVÍKvÅÈ¢ÀèÏXµÈ¢Åº³¢"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "POP3 Ú±Égp·éftHg|[gÔðIñź³¢ (§l:110)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "u[U[C^[tF[XvÉgp·éftHg|[gÔðIñź³¢ (§l:8080)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Windows ÌN®É POPFile ð©®IÉN®·é (obNOEhÅN®)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "dvÈx"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "POPFile ÌAbvO[hÌê --- CXg[[Í»ÝÌo[WðVbg_EµÜ·"
; Message Boxes used when validating user's selections
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "ÌêÉÈOÉCXg[³ê½ POPFile ª©Â©èܵ½:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "ACXg[µÜ·©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "uYesvð§µÜ·"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "³øÈ POP3 |[gÔ:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "|[gÔÉÍ 1 ©ç 65535 ÜÅÌÔðIñź³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "POP3 |[gÔðÏXµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "³øÈu[U[C^[tF[Xv|[gÔ:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "|[gÔÉÍ 1 ©ç 65535 ÜÅÌÔðIñź³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "u[U[C^[tF[Xv|[gÔðÏXµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "POP3 |[gÔÍu[U[C^[tF[Xv|[gÔÆÍá¤ÔðIñź³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "|[gÔðÏXµÄº³¢B"
; Banner message displayed whilst uninstalling old version
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "¨Ò¿º³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "±ÌÉ͵ÎçÔª©©èÜ·..."
#--------------------------------------------------------------------------
***************
*** 115,141 ****
; Installation Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue"
; Installation Log Messages
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Shutting down previous version of POPFile using port"
; Message Box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "file from previous installation found."
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "OK to update this file ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Click 'Yes' to update it (old file will be saved as"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Click 'No' to keep the old file (new file will saved as"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup copy of"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "already exists"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "OK to overwrite this file?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Click 'Yes' to overwrite, click 'No' to skip making a backup copy"
#--------------------------------------------------------------------------
--- 115,141 ----
; Installation Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "AbvO[hCXg[©Ç¤©`FbNµÄ¢Ü·..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "POPFile ÌRAt@CðCXg[..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Ŭo[WÌ Perl ðCXg[..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "POPFile ÌV[gJbgðì¬..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "POPFile ÌXLt@CðCXg[..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "POPFile UI Languages t@CðCXg[..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "uÖvðNbNµÄ±sµÄº³¢"
; Installation Log Messages
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "ÈOÌo[WÌ POPFile ðVbg_EµÜ·B|[gÔ:"
; Message Box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "ÈOÉCXg[³ê½t@CðoµÜµ½B"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "Abvf[gµÄàæ뵢ŷ©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Abvf[g·éÉÍuYesvðNbNµÄº³¢B(ât@CÍ̼OÅÛ¶³êÜ·:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "ât@Cðc·ÉÍuNovðNbNµÄº³¢B(Vµ¢t@CÍ̼OÅÛ¶³êÜ·:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Ìt@CÌobNAbv:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "Íùɶݵܷ"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "㫵Äàæ뵢ŷ©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "ã«·éÉÍuYesvAobNAbvðXLbv·éÈçuNovðNbNµÄ¾³¢"
#--------------------------------------------------------------------------
***************
*** 145,195 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Remove"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continue"
; Text strings used for status messages under the bucket list
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets"
; Message box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "A bucket called"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "has already been defined."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Please choose a different name for the new bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "The installer can only create up to"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "buckets."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Once POPFile has been installed you can create more than"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "The name"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "is not a valid name for a bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Bucket names can only contain the letters a to z in lower case, numbers 0 to 9, plus - and _"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Please choose a different name for the new bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,$\r$\n$\r$\neither by picking a suggested name from the drop-down list$\r$\n$\r$\nor by typing in a name of your own choice."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "buckets have been defined for use by POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Do you want to configure POPFile to use these buckets?"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Click 'No' if you wish to change your bucket selections."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "The installer was unable to create"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "of the"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "buckets you selected."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Once POPFile has been installed you can use its 'User Interface'$\r$\n$\r$\ncontrol panel to create the missing bucket(s)."
#--------------------------------------------------------------------------
--- 145,195 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile ̪ÞpÌoPcì¬"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile ÍAdq[ðªÞ·éÌÉÅáñÂÌoPcðKvƵܷ"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "CXg[ÌãÅàAKvɶÄÈPÉoPcÌà¼OàÏX·é±ÆªÅ«Ü·B\r\n\r\noPc̼OÉÍAt@xbg̬¶A0 ©ç 9 ÌA- Ü½Í _ ©çÈéPêðgpµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "ȺÌXgæèIÔ©AKȼOðü͵ÄVµ¢oPcð쬵ĺ³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "ê©»êÈãÌoPcðXgæèí·éÉÍAηéuív{bNXÉ`FbNðüêÄu±sv{^ðNbNµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "POPFile Égp·éoPc"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "í"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "±s"
; Text strings used for status messages under the bucket list
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "ऱêÈãÌoPcÍKv èܹñ"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "ÅáñÂÌoPcðè`µÄº³¢"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "Åáà¤êÂÌoPcªKvÅ·"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "CXg[[ÍA"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "ÂÈãÌoPcðìé±ÆÍūܹñ"
; Message box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "oPc"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "ÍùÉè`³êĢܷB"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Vµ¢oPcÉÍ᤼OðIñź³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "CXg[[ªì¬Å«éoPcÍ"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "Â"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "CXg[ãÉ»ÝÌÂÈãÌoPcðì¬Å«Ü·B»ÝÌoPcÌÂ:"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "oPc¼:"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "ͳøȼOÅ·B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "oPc̼OÉÍ a ©ç z ̬¶A0 ©ç 9 ÌA- Ü½Í _ ðgpµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Vµ¢oPcÉÍ᤼OðIñź³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile ÍAdq[ðªÞ·éÌÉÅáñÂÌoPcðKvƵܷ"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "쬷éoPc̼Oðü͵ĺ³¢B$\r$\n$\r$\nhbv_EXgÌáæèIð·é©A$\r$\n$\r$\nKȼOðü͵ĺ³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "POPFile ÌCXg[ð±s·éÉÍAÅáñÂÌoPcðè`µÈ¯êÎÈèܹñB"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "ÂÌoPcª POPFile pÉè`³êܵ½B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "±êçÌoPcðg¤æ¤ POPFile ðÝèµÄàæ뵢ŷ©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "oPcÌIððÏX·éÉÍuNovðNbNµÄº³¢B"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "CXg[[ÍIð³ê½oPcðSÄì¬Å«Ü¹ñŵ½Bì¬É¸sµ½oPc:"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 " / Ið³ê½oPc:"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "Â "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "ì¬Å«È©Á½oPcÍAPOPFile ÌCXg[ãÉ$\r$\n$\r$\nu[U[C^[tF[XvRg[plæèì¬Å«Ü·B"
#--------------------------------------------------------------------------
***************
*** 199,216 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigure Outlook Express"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile can reconfigure Outlook Express for you"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigure this account to work with POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email address:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 server:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 username:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "account for the"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identity"
#--------------------------------------------------------------------------
--- 199,216 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Outlook Express ÌÝèÏX"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile Í Outlook Express ÌÝèðÏX·é±ÆªÅ«Ü·"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile ÍÈºÌ Outlook Express [AJEgðoµÜµ½BPOPFile ªgpÅ«éæ¤É©®IÉÝè·é±ÆªÅ«Ü·B"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "POPFile ªgpÅ«éæ¤É±ÌAJEgÌÝèðÏX·é"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "[AhX:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 T[o[:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 [U[l[:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "POPFile ðACXg[·êγÌÝèÉßèÜ·"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "AJEgÌ"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "ACfeBeB"
#--------------------------------------------------------------------------
***************
*** 220,240 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface."
; Banner message displayed whilst waiting for POPFile to start
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..."
#--------------------------------------------------------------------------
--- 220,240 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile ÌN®"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "[U[C^[tF[XÍ POPFile ðN®µÈ¢Æg¦Ü¹ñ"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "POPFile ðN®µÜ·©H"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "¢¢¦(u[U[C^[tF[XvÍ POPFile ðN®µÈ¢Æg¦Ü¹ñ)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "POPFile ðN®(R\[)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "POPFile ðobNOhÅN®(R\[ȵ)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "POPFile ðN®·êÎȺÌû@Åu[U[C^[tF[Xvªg¦Ü·"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) VXegCÌ POPFile ACRð_uNbN·é©A"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) X^[g --> vO --> POPFile --> POPFile User Interface ðIð"
; Banner message displayed whilst waiting for POPFile to start
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "POPFile ðN®"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "µÎç¨Ò¿¾³¢..."
#--------------------------------------------------------------------------
***************
*** 244,274 ****
; Uninstall Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Shutting down POPFile..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Deleting 'Start Menu' entries for POPFile..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Deleting POPFile core files..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Restoring Outlook Express settings..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Deleting POPFile skins files..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Deleting minimal Perl files..."
; Uninstall Log Messages
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Shutting down POPFile using port"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Opened"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Restored"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Closed"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Removing all files from POPFile directory"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Note: unable to remove all files from POPFile directory"
; Message Box text strings
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continue anyway (not recommended) ?"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Uninstall aborted by user"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?$\r$\n$\r$\n(If you have anything you created that you want to keep, click No)"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Note"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "could not be removed."
#--------------------------------------------------------------------------
--- 244,274 ----
; Uninstall Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "POPFile ðVbg_E..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "uX^[gj
[v©ç POPFile ðí..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "POPFile ÌRAt@Cðí..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Outlook Express ÌÝèð³ÉߵĢܷ..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "POPFile ÌXLt@Cðí..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Ŭo[WÌ Perl ðí..."
; Uninstall Log Messages
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "POPFile ðVbg_EµÜ·B|[gÔ:"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "I[v"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "³"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "N[Y"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "POPFile fBNgȺÌSÄÌt@Cðí"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Ó: POPFile fBNgȺÌSÄÌt@Cðíūܹñŵ½"
; Message Box text strings
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "POPFile ÍÌfBNgÉÍCXg[³êĢȢæ¤Å·:"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "»êÅà±sµÜ·©(§Å«Ü¹ñ)H"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "ACXg[Í[U[æè~³êܵ½"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "POPFile fBNgȺÌSÄÌt@CðíµÜ·©H$\r$\n$\r$\n(cµ½¢t@Cª êÎ No ðNbNµÄº³¢)"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Ó"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "Ííūܹñŵ½B"
#--------------------------------------------------------------------------
|
|
From: <xue...@us...> - 2003-08-15 22:12:21
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv6261 Added Files: translator.nsi Log Message: Simple test program to help check installer/uninstaller translations. --- NEW FILE: translator.nsi --- #-------------------------------------------------------------------------- # # translator.nsi --- This NSIS script is used to create a special version # of the POPFile Windows installer. This test program does not # install POPFile, it only installs a few files and allows # buckets to be created - it is designed to provide a realistic # testbed for the POPFile Installer/Uninstaller language files. # # Copyright (c) 2001-2003 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of [...1996 lines suppressed...] SetDetailsPrint both !undef L_CFG !undef L_LNE !undef L_REG_KEY !undef L_REG_SUBKEY !undef L_REG_VALUE !undef L_TEMP !undef L_UPGRADE !undef L_CORPUS !undef L_SUBCORPUS !undef L_OLDUI !undef L_HISTORY !undef L_SUBHISTORY !undef L_EXE SectionEnd #-------------------------------------------------------------------------- # End of 'translator.nsi' #-------------------------------------------------------------------------- |
|
From: <xue...@us...> - 2003-08-13 20:59:06
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26013
Modified Files:
pfi-library.nsh
Log Message:
New function created to help validate the POP3 and GUI port selections.
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pfi-library.nsh 10 Aug 2003 10:41:47 -0000 1.10
--- pfi-library.nsh 13 Aug 2003 16:35:55 -0000 1.11
***************
*** 214,217 ****
--- 214,263 ----
FunctionEnd
+ #--------------------------------------------------------------------------
+ # Installer Function: StrStripLZS
+ #
+ # Strips any combination of leading zeroes and spaces from a string.
+ #
+ # Inputs:
+ # (top of stack) - string to be processed
+ # Outputs:
+ # (top of stack) - processed string (with no leading zeroes or spaces)
+ #
+ # Usage:
+ # Push " 123" ; the strings "000123" or " 0 0 0123" will give same result
+ # Call StrStripLZS
+ # Pop $R0
+ #
+ # ($R0 at this point is "123")
+ #
+ #--------------------------------------------------------------------------
+
+ Function StrStripLZS
+
+ !define L_CHAR $R9
+ !define L_STRING $R8
+
+ Exch ${L_STRING}
+ Push ${L_CHAR}
+
+ loop:
+ StrCpy ${L_CHAR} ${L_STRING} 1
+ StrCmp ${L_CHAR} "" done
+ StrCmp ${L_CHAR} " " strip_char
+ StrCmp ${L_CHAR} "0" strip_char
+ Goto done
+
+ strip_char:
+ StrCpy ${L_STRING} ${L_STRING} "" 1
+ Goto loop
+
+ done:
+ Pop ${L_CHAR}
+ Exch ${L_STRING}
+
+ !undef L_CHAR
+ !undef L_STRING
+
+ FunctionEnd
#==============================================================================================
|
|
From: <xue...@us...> - 2003-08-13 20:48:36
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26185
Modified Files:
installer.nsi
Log Message:
POP3 and GUI port selection validation now handles leading zeroes and spaces properly.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** installer.nsi 12 Aug 2003 13:52:31 -0000 1.106
--- installer.nsi 13 Aug 2003 16:36:57 -0000 1.107
***************
*** 1318,1321 ****
--- 1318,1326 ----
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioA.ini"
+
+ ; Store validated data (for use when the "POPFile" section is processed)
+
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "State" $G_POP3
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "State" $G_GUI
Pop ${L_RESULT}
***************
*** 1344,1347 ****
--- 1349,1361 ----
!insertmacro MUI_INSTALLOPTIONS_READ $G_GUI "ioA.ini" "Field 4" "State"
+ ; strip leading zeroes and spaces from user input
+
+ Push $G_POP3
+ Call StrStripLZS
+ Pop $G_POP3
+ Push $G_GUI
+ Call StrStripLZS
+ Pop $G_GUI
+
StrCmp $G_POP3 $G_GUI ports_must_differ
Push $G_POP3
|
|
From: <xue...@us...> - 2003-08-12 14:37:53
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv6790
Modified Files:
installer.nsi
Log Message:
Newer NSIS compiler seems to solve the Access Violation problem on Korean Windows.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** installer.nsi 10 Aug 2003 14:53:46 -0000 1.105
--- installer.nsi 12 Aug 2003 13:52:31 -0000 1.106
***************
*** 43,47 ****
;
; This version of the script has been tested with NSIS 2.0b4 (CVS) after updating it by using
! ; the 4 August 2003 (07:44 GMT) version of the NSIS CVS snapshot.
#--------------------------------------------------------------------------
--- 43,47 ----
;
; This version of the script has been tested with NSIS 2.0b4 (CVS) after updating it by using
! ; the 11 August 2003 (19:44 GMT) version of the NSIS CVS snapshot.
#--------------------------------------------------------------------------
***************
*** 385,391 ****
; Additional languages supported by the installer.
- ; Entries will appear in the drop-down list of languages in the order given below.
; To remove a language, comment-out the relevant '!insertmacro PFI_LANG_LOAD' line
; from this list. (To remove all of these languages, use /DENGLISH_ONLY on command-line)
!insertmacro PFI_LANG_LOAD "Bulgarian" ; 'New style' license msgs missing (27-Jun-03)
--- 385,393 ----
; Additional languages supported by the installer.
; To remove a language, comment-out the relevant '!insertmacro PFI_LANG_LOAD' line
; from this list. (To remove all of these languages, use /DENGLISH_ONLY on command-line)
+
+ ; Entries will appear in the drop-down list of languages in the order given below
+ ; (the order used here ensures that the list entries appear in alphabetic order).
!insertmacro PFI_LANG_LOAD "Bulgarian" ; 'New style' license msgs missing (27-Jun-03)
|
|
From: <xue...@us...> - 2003-08-10 19:35:38
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27342
Modified Files:
CBP.nsh
Log Message:
Add copyright/GPL notice to CBP.ini.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CBP.nsh 1 Aug 2003 00:29:12 -0000 1.20
--- CBP.nsh 10 Aug 2003 19:35:35 -0000 1.21
***************
*** 45,49 ****
!else
!define CBP.nsh_included
!
#//////////////////////////////////////////////////////////////////////////////////////////////
#
--- 45,49 ----
!else
!define CBP.nsh_included
!
#//////////////////////////////////////////////////////////////////////////////////////////////
#
***************
*** 810,813 ****
--- 810,854 ----
# Now create the INI file for the "Create Buckets" custom page
#----------------------------------------------------------------------------------------------
+
+ ; Issue standard copyright and GPL notices
+
+ !define L_INI_HANDLE $R9
+ Push ${L_INI_HANDLE}
+
+ FileOpen ${L_INI_HANDLE} "$PLUGINSDIR\${CBP_C_INIFILE}" w
+
+ ; WARNING:
+ ; This 'FileWrite' uses a string which is only SIX characters less than the maximum allowed !
+
+ FileWrite ${L_INI_HANDLE} \
+ "#-------------------------------------------------------------------$\r$\n\
+ #$\r$\n\
+ # CBP.ini --- generated by the 'CBP_CreateINIfile' function$\r$\n\
+ #$\r$\n\
+ # Copyright (c) 2001-2003 John Graham-Cumming$\r$\n\
+ #$\r$\n\
+ # This file is part of POPFile$\r$\n\
+ #$\r$\n\
+ # POPFile is free software; you can redistribute it and/or modify$\r$\n\
+ # it under the terms of the GNU General Public License as published by$\r$\n\
+ # the Free Software Foundation; either version 2 of the License, or$\r$\n\
+ # (at your option) any later version.$\r$\n\
+ #$\r$\n\
+ # POPFile is distributed in the hope that it will be useful,$\r$\n\
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of$\r$\n\
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the$\r$\n\
+ # GNU General Public License for more details.$\r$\n\
+ #$\r$\n\
+ # You should have received a copy of the GNU General Public License$\r$\n\
+ # along with POPFile; if not, write to the Free Software$\r$\n\
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA$\r$\n\
+ #$\r$\n\
+ #-------------------------------------------------------------------$\r$\n\
+ $\r$\n"
+
+ FileClose ${L_INI_HANDLE}
+
+ Pop ${L_INI_HANDLE}
+ !undef L_INI_HANDLE
; The INI file header (all fields made visible)
|
|
From: <xue...@us...> - 2003-08-10 14:53:50
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv18749
Modified Files:
installer.nsi
Log Message:
Before displaying the "Release Notes", the installer now converts the file to a form which the standard Windows NOTEPAD.EXE can display. The converted file is also copied to the installation directory for later use. [See RFE #776214]
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** installer.nsi 10 Aug 2003 10:41:47 -0000 1.104
--- installer.nsi 10 Aug 2003 14:53:46 -0000 1.105
***************
*** 453,456 ****
--- 453,460 ----
Function .onInit
+ !define L_INPUT_FILE_HANDLE $R9
+ !define L_OUTPUT_FILE_HANDLE $R8
+ !define L_LINE $R7
+
; Conditional compilation: if ENGLISH_ONLY is defined, support only 'English'
***************
*** 463,468 ****
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini"
! !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${C_RELEASE_NOTES}" "release.txt"
FunctionEnd
--- 467,496 ----
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini"
! !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${C_RELEASE_NOTES}" "${C_README}"
+ ; Ensure the release notes are in a format which the standard Windows NOTEPAD.EXE can use.
+ ; When the "POPFile" section is processed, the converted release notes will be copied to the
+ ; installation directory to ensure user has a copy which can be read by NOTEPAD.EXE later.
+
+ FileOpen ${L_INPUT_FILE_HANDLE} "$PLUGINSDIR\${C_README}" r
+ FileOpen ${L_OUTPUT_FILE_HANDLE} "$PLUGINSDIR\${C_README}.txt" w
+ ClearErrors
+
+ loop:
+ FileRead ${L_INPUT_FILE_HANDLE} ${L_LINE}
+ IfErrors close_files
+ Push ${L_LINE}
+ Call TrimNewlines
+ Pop ${L_LINE}
+ FileWrite ${L_OUTPUT_FILE_HANDLE} ${L_LINE}$\r$\n
+ Goto loop
+
+ close_files:
+ FileClose ${L_INPUT_FILE_HANDLE}
+ FileClose ${L_OUTPUT_FILE_HANDLE}
+
+ !undef L_INPUT_FILE_HANDLE
+ !undef L_OUTPUT_FILE_HANDLE
+ !undef L_LINE
FunctionEnd
***************
*** 484,492 ****
$(PFI_LANG_MBRELNOTES_2)" IDNO exit
StrCmp $G_NOTEPAD "" use_file_association
! ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
GoTo exit
use_file_association:
! ExecShell "open" "$PLUGINSDIR\release.txt"
exit:
--- 512,520 ----
$(PFI_LANG_MBRELNOTES_2)" IDNO exit
StrCmp $G_NOTEPAD "" use_file_association
! ExecWait 'notepad.exe "$PLUGINSDIR\${C_README}.txt"'
GoTo exit
use_file_association:
! ExecShell "open" "$PLUGINSDIR\${C_README}.txt"
exit:
***************
*** 542,549 ****
File "..\engine\license"
File "${C_RELEASE_NOTES}"
! StrCmp $G_NOTEPAD "" 0 readme_ok
! File /oname=${C_README}.txt "${C_RELEASE_NOTES}"
!
! readme_ok:
File "..\engine\popfile.pl"
File "..\engine\insert.pl"
--- 570,574 ----
File "..\engine\license"
File "${C_RELEASE_NOTES}"
! CopyFiles /SILENT /FILESONLY "$PLUGINSDIR\${C_README}.txt" "$INSTDIR\${C_README}.txt"
File "..\engine\popfile.pl"
File "..\engine\insert.pl"
***************
*** 1849,1853 ****
StrCmp $G_NOTEPAD "" use_file_association
! Exec 'notepad.exe "$INSTDIR\${C_README}"'
goto exit
--- 1874,1878 ----
StrCmp $G_NOTEPAD "" use_file_association
! Exec 'notepad.exe "$INSTDIR\${C_README}.txt"'
goto exit
|
|
From: <xue...@us...> - 2003-08-10 10:41:51
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv13659
Modified Files:
installer.nsi pfi-library.nsh
Log Message:
A new NSIS feature makes it easy to avoid using tricky-to-maintain relative jumps in macros.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** installer.nsi 9 Aug 2003 17:53:08 -0000 1.103
--- installer.nsi 10 Aug 2003 10:41:47 -0000 1.104
***************
*** 284,288 ****
;-----------------------------------------
! ; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
; leaves more room for the TITLE and SUBTITLE text.
--- 284,288 ----
;-----------------------------------------
! ; The 'hdr-common.bmp' logo is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
; leaves more room for the TITLE and SUBTITLE text.
***************
*** 2151,2163 ****
SetDetailsPrint listonly
! !insertmacro SafeRecursiveRMDir "$INSTDIR\auto"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Carp"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\File"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\IO"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\MIME"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Sys"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Text"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\warnings"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Win32"
StrCmp ${L_UPGRADE} "yes" Removed
--- 2151,2163 ----
SetDetailsPrint listonly
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\auto"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\Carp"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\File"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\IO"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\MIME"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\Sys"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\Text"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\warnings"
! !insertmacro SafeRecursiveRMDir ${__LINE__} "$INSTDIR\Win32"
StrCmp ${L_UPGRADE} "yes" Removed
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pfi-library.nsh 8 Aug 2003 00:14:31 -0000 1.9
--- pfi-library.nsh 10 Aug 2003 10:41:47 -0000 1.10
***************
*** 100,126 ****
# (guards against unexpectedly removing the corpus or message history)
#
#--------------------------------------------------------------------------
! !macro SafeRecursiveRMDir PATH
! StrCmp ${L_SUBCORPUS} "no" +6 ; if "no" then goto pseudo-label A
Push ${L_CORPUS}
Push "${PATH}"
Call un.StrStr
Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 +8 ; if not "" then goto pseudo-label C
! ; pseudo-label A
! StrCmp ${L_SUBHISTORY} "no" +6 ; if "no" then goto pseudo-label B
Push ${L_HISTORY}
Push "${PATH}"
Call un.StrStr
Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 +2 ; if not "" then goto pseudo-label C
!
! ; pseudo-label B
RMDir /r "${PATH}"
!
! ; pseudo-label C
!macroend
--- 100,130 ----
# (guards against unexpectedly removing the corpus or message history)
#
+ # Usage:
+ # !insertmacro SafeRecursiveRMDir ${__LINE__} $(L_CORPUS}
+ #
+ # ${__LINE__} holds the linenumber of the '!insertmacro' command
#--------------------------------------------------------------------------
! !macro SafeRecursiveRMDir UNIQUE_ID PATH
! StrCmp ${L_SUBCORPUS} "no" Label_A_${UNIQUE_ID}
Push ${L_CORPUS}
Push "${PATH}"
Call un.StrStr
Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 Label_C_${UNIQUE_ID}
! Label_A_${UNIQUE_ID}:
! StrCmp ${L_SUBHISTORY} "no" Label_B_${UNIQUE_ID}
Push ${L_HISTORY}
Push "${PATH}"
Call un.StrStr
Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 Label_C_${UNIQUE_ID}
!
! Label_B_${UNIQUE_ID}:
RMDir /r "${PATH}"
!
! Label_C_${UNIQUE_ID}:
!macroend
***************
*** 297,301 ****
Call un.GetDataPath
Pop ${L_RESULT}
!
got_result:
Pop ${L_TEMP}
--- 301,305 ----
Call un.GetDataPath
Pop ${L_RESULT}
!
got_result:
Pop ${L_TEMP}
***************
*** 398,402 ****
strip_slash:
StrCpy ${L_HISTORY} ${L_HISTORY} -1
!
no_trailing_slash:
Push ${L_SOURCE}
--- 402,406 ----
strip_slash:
StrCpy ${L_HISTORY} ${L_HISTORY} -1
!
no_trailing_slash:
Push ${L_SOURCE}
***************
*** 404,408 ****
Call un.GetDataPath
Pop ${L_RESULT}
!
got_result:
Pop ${L_TEMP}
--- 408,412 ----
Call un.GetDataPath
Pop ${L_RESULT}
!
got_result:
Pop ${L_TEMP}
***************
*** 461,465 ****
Push ${L_RESULT}
Push ${L_TEMP}
!
StrCmp ${L_DATA} "" 0 strip_quotes
StrCpy ${L_DATA} ${L_BASEDIR}
--- 465,469 ----
Push ${L_RESULT}
Push ${L_TEMP}
!
StrCmp ${L_DATA} "" 0 strip_quotes
StrCpy ${L_DATA} ${L_BASEDIR}
***************
*** 906,918 ****
!define L_FILE_HANDLE $R8
!define L_TIMEOUT $R7 ; used to avoid an infinite loop
!
Exch ${L_EXE}
Push ${L_FILE_HANDLE}
Push ${L_TIMEOUT}
!
! IfFileExists "${L_EXE}" 0 exit_now
SetFileAttributes "${L_EXE}" NORMAL
StrCpy ${L_TIMEOUT} ${C_SHUTDOWN_LIMIT}
!
check_if_unlocked:
Sleep ${C_SHUTDOWN_DELAY}
--- 910,922 ----
!define L_FILE_HANDLE $R8
!define L_TIMEOUT $R7 ; used to avoid an infinite loop
!
Exch ${L_EXE}
Push ${L_FILE_HANDLE}
Push ${L_TIMEOUT}
!
! IfFileExists "${L_EXE}" 0 exit_now
SetFileAttributes "${L_EXE}" NORMAL
StrCpy ${L_TIMEOUT} ${C_SHUTDOWN_LIMIT}
!
check_if_unlocked:
Sleep ${C_SHUTDOWN_DELAY}
***************
*** 923,932 ****
IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1
IntCmp ${L_TIMEOUT} 0 exit_now exit_now check_if_unlocked
!
exit_now:
Pop ${L_TIMEOUT}
Pop ${L_FILE_HANDLE}
Pop ${L_EXE}
!
!undef L_EXE
!undef L_FILE_HANDLE
--- 927,936 ----
IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1
IntCmp ${L_TIMEOUT} 0 exit_now exit_now check_if_unlocked
!
exit_now:
Pop ${L_TIMEOUT}
Pop ${L_FILE_HANDLE}
Pop ${L_EXE}
!
!undef L_EXE
!undef L_FILE_HANDLE
|
|
From: <xue...@us...> - 2003-08-09 17:53:12
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17466
Modified Files:
installer.nsi
Log Message:
'Global' registers replaced by 'User variables' (so we now have 20 'local' registers, not 10). Alphabetic order used in menu for non-English languages.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** installer.nsi 7 Aug 2003 11:22:38 -0000 1.102
--- installer.nsi 9 Aug 2003 17:53:08 -0000 1.103
***************
*** 26,43 ****
#--------------------------------------------------------------------------
! ; This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirements:
;
! ; (1) "NSIS Modern User Interface" version 1.65 (17 June 2003 or later)
! ; This script uses the new (simplified) page configuration system and other improvements.
;
! ; (2) '{NSIS}\makensis.exe' dated 08 July 2003 (NSIS CVS version 1.203) or later
! ; This is required to ensure that out-of-date NLF files do not result in blank messages
! ; and to ensure that language strings can be combined with other strings.
;
! ; (3) '{NSIS}\NSIS\Contrib\UIs\modern.exe' dated 09 July 2003 (NSIS CVS v1.31) or later
! ; This is required to ensure the installer works properly when 'Japanese' is selected.
;
! ; NSIS CVS snapshot dated 09 July 2003 @ 13:44 contains suitable versions of these NSIS files
! ; (the 09 July 2003 @ 07:44 snapshot is NOT suitable).
#--------------------------------------------------------------------------
--- 26,47 ----
#--------------------------------------------------------------------------
! ; As of 9 August 2003, the latest release of the NSIS compiler is 2.0b3. Since its release in
! ; March 2003, the compiler has been greatly improved. This script uses many of the improvements
! ; introduced since then. Although the NSIS compiler has been updated to 2.0b4 (CVS), the only
! ; way to obtain this version is to install the 2.0b3 release and then apply some CVS updates.
;
! ; There are two ways to apply these CVS updates:
;
! ; (a) use the 'NSIS Update' feature provided by the 'NSIS Menu', or
;
! ;(b) obtain a NSIS 'Nightly' CVS update and use it to upgrade the 2.0b3 installation.
;
! ; The 'NSIS Update' feature does not work reliably at the moment, due to SourceForge.net's
! ; current CVS server problems, so the quickest way to update NSIS to 2.0b4 (CVS) is by means
! ; of the snapshot which is a ZIP file created several times a day from data on the 'real' CVS
! ; servers (so it is NOT subject to the same problems as the 'NSIS Update' feature).
! ;
! ; This version of the script has been tested with NSIS 2.0b4 (CVS) after updating it by using
! ; the 4 August 2003 (07:44 GMT) version of the NSIS CVS snapshot.
#--------------------------------------------------------------------------
***************
*** 321,337 ****
#--------------------------------------------------------------------------
; NSIS provides 20 general purpose user registers:
! ; (a) $0 to $9 are used as global registers
! ; (b) $R0 to $R9 are used as local registers
!
! ; Global registers referred to by 'defines' use names starting with 'G_'
!
! !define G_POP3 $0 ; POP3 port (1-65535)
! !define G_GUI $1 ; GUI port (1-65535)
! !define G_STARTUP $2 ; automatic startup flag (1 = yes, 0 = no)
! !define G_NOTEPAD $3 ; path to notepad.exe ("" = not found in search path)
; Local registers referred to by 'defines' use names starting with 'L_' (eg L_LNE, L_OLDUI)
; and the scope of these 'defines' is limited to the "routine" where they are used.
; POPFile constants have been given names beginning with 'C_' (eg C_README)
--- 325,345 ----
#--------------------------------------------------------------------------
+ ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data.
+
+ Var G_POP3 ; POP3 port (1-65535)
+ Var G_GUI ; GUI port (1-65535)
+ Var G_STARTUP ; automatic startup flag (1 = yes, 0 = no)
+ Var G_NOTEPAD ; path to notepad.exe ("" = not found in search path)
+
; NSIS provides 20 general purpose user registers:
! ; (a) $R0 to $R9 are used as local registers
! ; (b) $0 to $9 are used as additional local registers
; Local registers referred to by 'defines' use names starting with 'L_' (eg L_LNE, L_OLDUI)
; and the scope of these 'defines' is limited to the "routine" where they are used.
+
+ ; In earlier versions of the NSIS compiler, 'User Variables' did not exist, and the convention
+ ; was to use $R0 to $R9 as 'local' registers and $0 to $9 as 'global' ones. This is why this
+ ; script uses registers $R0 to $R9 in preference to registers $0 to $9.
; POPFile constants have been given names beginning with 'C_' (eg C_README)
***************
*** 386,396 ****
!insertmacro PFI_LANG_LOAD "Czech"
!insertmacro PFI_LANG_LOAD "Danish" ; 'New style' license msgs missing (27-Jun-03)
- !insertmacro PFI_LANG_LOAD "Dutch"
- !insertmacro PFI_LANG_LOAD "Finnish" ; 'New style' license msgs missing (27-Jun-03)
- !insertmacro PFI_LANG_LOAD "French"
!insertmacro PFI_LANG_LOAD "German"
! !insertmacro PFI_LANG_LOAD "Hungarian"
!insertmacro PFI_LANG_LOAD "Japanese"
!insertmacro PFI_LANG_LOAD "Korean"
!insertmacro PFI_LANG_LOAD "Polish"
!insertmacro PFI_LANG_LOAD "Portuguese"
--- 394,404 ----
!insertmacro PFI_LANG_LOAD "Czech"
!insertmacro PFI_LANG_LOAD "Danish" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "German"
! !insertmacro PFI_LANG_LOAD "Spanish"
! !insertmacro PFI_LANG_LOAD "French"
!insertmacro PFI_LANG_LOAD "Japanese"
!insertmacro PFI_LANG_LOAD "Korean"
+ !insertmacro PFI_LANG_LOAD "Hungarian"
+ !insertmacro PFI_LANG_LOAD "Dutch"
!insertmacro PFI_LANG_LOAD "Polish"
!insertmacro PFI_LANG_LOAD "Portuguese"
***************
*** 398,402 ****
!insertmacro PFI_LANG_LOAD "Russian"
!insertmacro PFI_LANG_LOAD "Slovak"
! !insertmacro PFI_LANG_LOAD "Spanish"
!insertmacro PFI_LANG_LOAD "Swedish"
!insertmacro PFI_LANG_LOAD "Ukrainian"
--- 406,410 ----
!insertmacro PFI_LANG_LOAD "Russian"
!insertmacro PFI_LANG_LOAD "Slovak"
! !insertmacro PFI_LANG_LOAD "Finnish" ; 'New style' license msgs missing (27-Jun-03)
!insertmacro PFI_LANG_LOAD "Swedish"
!insertmacro PFI_LANG_LOAD "Ukrainian"
***************
*** 470,479 ****
Function PFIGUIInit
! SearchPath ${G_NOTEPAD} notepad.exe
MessageBox MB_YESNO|MB_ICONQUESTION \
"$(PFI_LANG_MBRELNOTES_1)\
$\r$\n$\r$\n\
$(PFI_LANG_MBRELNOTES_2)" IDNO exit
! StrCmp ${G_NOTEPAD} "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
GoTo exit
--- 478,487 ----
Function PFIGUIInit
! SearchPath $G_NOTEPAD notepad.exe
MessageBox MB_YESNO|MB_ICONQUESTION \
"$(PFI_LANG_MBRELNOTES_1)\
$\r$\n$\r$\n\
$(PFI_LANG_MBRELNOTES_2)" IDNO exit
! StrCmp $G_NOTEPAD "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
GoTo exit
***************
*** 518,524 ****
; POPFile run in the Startup group
! !insertmacro MUI_INSTALLOPTIONS_READ ${G_POP3} "ioA.ini" "Field 2" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ ${G_GUI} "ioA.ini" "Field 4" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ ${G_STARTUP} "ioA.ini" "Field 5" "State"
WriteRegStr HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation $INSTDIR
--- 526,532 ----
; POPFile run in the Startup group
! !insertmacro MUI_INSTALLOPTIONS_READ $G_POP3 "ioA.ini" "Field 2" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ $G_GUI "ioA.ini" "Field 4" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ $G_STARTUP "ioA.ini" "Field 5" "State"
WriteRegStr HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation $INSTDIR
***************
*** 534,538 ****
File "..\engine\license"
File "${C_RELEASE_NOTES}"
! StrCmp ${G_NOTEPAD} "" 0 readme_ok
File /oname=${C_README}.txt "${C_RELEASE_NOTES}"
--- 542,546 ----
File "..\engine\license"
File "${C_RELEASE_NOTES}"
! StrCmp $G_NOTEPAD "" 0 readme_ok
File /oname=${C_README}.txt "${C_RELEASE_NOTES}"
***************
*** 568,573 ****
FileOpen ${L_CFG} $PLUGINSDIR\popfile.cfg a
FileSeek ${L_CFG} 0 END
! FileWrite ${L_CFG} "pop3_port ${G_POP3}$\r$\n"
! FileWrite ${L_CFG} "html_port ${G_GUI}$\r$\n"
FileClose ${L_CFG}
IfFileExists "$INSTDIR\popfile.cfg" 0 update_config
--- 576,581 ----
FileOpen ${L_CFG} $PLUGINSDIR\popfile.cfg a
FileSeek ${L_CFG} 0 END
! FileWrite ${L_CFG} "pop3_port $G_POP3$\r$\n"
! FileWrite ${L_CFG} "html_port $G_GUI$\r$\n"
FileClose ${L_CFG}
IfFileExists "$INSTDIR\popfile.cfg" 0 update_config
***************
*** 731,737 ****
SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url" \
! "InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Shutdown POPFile.url" \
! "InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/shutdown"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
--- 739,745 ----
SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url" \
! "InternetShortcut" "URL" "http://127.0.0.1:$G_GUI/"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Shutdown POPFile.url" \
! "InternetShortcut" "URL" "http://127.0.0.1:$G_GUI/shutdown"
WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
***************
*** 743,747 ****
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
! StrCmp ${G_STARTUP} "1" 0 skip_autostart_set
SetOutPath $SMSTARTUP
SetOutPath $INSTDIR
--- 751,755 ----
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
! StrCmp $G_STARTUP "1" 0 skip_autostart_set
SetOutPath $SMSTARTUP
SetOutPath $INSTDIR
***************
*** 842,852 ****
!insertmacro UI_LANG_CONFIG "CZECH" "Czech"
!insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
- !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
- !insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
- !insertmacro UI_LANG_CONFIG "FRENCH" "Francais"
!insertmacro UI_LANG_CONFIG "GERMAN" "Deutsch"
! !insertmacro UI_LANG_CONFIG "HUNGARIAN" "Hungarian"
!insertmacro UI_LANG_CONFIG "JAPANESE" "Nihongo"
!insertmacro UI_LANG_CONFIG "KOREAN" "Korean"
!insertmacro UI_LANG_CONFIG "POLISH" "Polish"
!insertmacro UI_LANG_CONFIG "PORTUGUESE" "Português"
--- 850,860 ----
!insertmacro UI_LANG_CONFIG "CZECH" "Czech"
!insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
!insertmacro UI_LANG_CONFIG "GERMAN" "Deutsch"
! !insertmacro UI_LANG_CONFIG "SPANISH" "Español"
! !insertmacro UI_LANG_CONFIG "FRENCH" "Francais"
!insertmacro UI_LANG_CONFIG "JAPANESE" "Nihongo"
!insertmacro UI_LANG_CONFIG "KOREAN" "Korean"
+ !insertmacro UI_LANG_CONFIG "HUNGARIAN" "Hungarian"
+ !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
!insertmacro UI_LANG_CONFIG "POLISH" "Polish"
!insertmacro UI_LANG_CONFIG "PORTUGUESE" "Português"
***************
*** 854,858 ****
!insertmacro UI_LANG_CONFIG "RUSSIAN" "Russian"
!insertmacro UI_LANG_CONFIG "SLOVAK" "Slovak"
! !insertmacro UI_LANG_CONFIG "SPANISH" "Español"
!insertmacro UI_LANG_CONFIG "SWEDISH" "Svenska"
!insertmacro UI_LANG_CONFIG "UKRAINIAN" "Ukrainian"
--- 862,866 ----
!insertmacro UI_LANG_CONFIG "RUSSIAN" "Russian"
!insertmacro UI_LANG_CONFIG "SLOVAK" "Slovak"
! !insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
!insertmacro UI_LANG_CONFIG "SWEDISH" "Svenska"
!insertmacro UI_LANG_CONFIG "UKRAINIAN" "Ukrainian"
***************
*** 1023,1028 ****
init_port_vars:
! StrCpy ${G_POP3} ""
! StrCpy ${G_GUI} ""
StrCpy ${L_OLDUI} ""
--- 1031,1036 ----
init_port_vars:
! StrCpy $G_POP3 ""
! StrCpy $G_GUI ""
StrCpy ${L_OLDUI} ""
***************
*** 1064,1072 ****
got_port:
! StrCpy ${G_POP3} ${L_LNE} 5 5
Goto loop
got_pop3_port:
! StrCpy ${G_POP3} ${L_LNE} 5 10
Goto loop
--- 1072,1080 ----
got_port:
! StrCpy $G_POP3 ${L_LNE} 5 5
Goto loop
got_pop3_port:
! StrCpy $G_POP3 ${L_LNE} 5 10
Goto loop
***************
*** 1076,1080 ****
got_html_port:
! StrCpy ${G_GUI} ${L_LNE} 5 10
Goto loop
--- 1084,1088 ----
got_html_port:
! StrCpy $G_GUI ${L_LNE} 5 10
Goto loop
***************
*** 1083,1093 ****
FileClose ${L_CLEANCFG}
! Push ${G_POP3}
Call TrimNewlines
! Pop ${G_POP3}
! Push ${G_GUI}
Call TrimNewlines
! Pop ${G_GUI}
Push ${L_OLDUI}
--- 1091,1101 ----
FileClose ${L_CLEANCFG}
! Push $G_POP3
Call TrimNewlines
! Pop $G_POP3
! Push $G_GUI
Call TrimNewlines
! Pop $G_GUI
Push ${L_OLDUI}
***************
*** 1097,1101 ****
; Save the UI port settings (from popfile.cfg) for later use by the 'MakeItSafe' function
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "UI Port" "NewStyle" "${G_GUI}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "UI Port" "OldStyle" "${L_OLDUI}"
--- 1105,1109 ----
; Save the UI port settings (from popfile.cfg) for later use by the 'MakeItSafe' function
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "UI Port" "NewStyle" "$G_GUI"
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "UI Port" "OldStyle" "${L_OLDUI}"
***************
*** 1103,1108 ****
; If 'ui_port' and 'html_port' settings were found, we use the last 'html_port' we found.
! StrCmp ${G_GUI} "" 0 validity_checks
! StrCpy ${G_GUI} ${L_OLDUI}
validity_checks:
--- 1111,1116 ----
; If 'ui_port' and 'html_port' settings were found, we use the last 'html_port' we found.
! StrCmp $G_GUI "" 0 validity_checks
! StrCpy $G_GUI ${L_OLDUI}
validity_checks:
***************
*** 1110,1149 ****
; check port values (config file may have no port data or invalid port data)
! StrCmp ${G_POP3} ${G_GUI} 0 ports_differ
; Config file has no port data or same port used for POP3 and GUI
; (i.e. the data is not valid), so use POPFile defaults
! StrCpy ${G_POP3} "110"
! StrCpy ${G_GUI} "8080"
Goto ports_ok
ports_differ:
! StrCmp ${G_POP3} "" default_pop3
! Push ${G_POP3}
Call StrCheckDecimal
! Pop ${G_POP3}
! StrCmp ${G_POP3} "" default_pop3
! IntCmp ${G_POP3} 1 pop3_ok default_pop3
! IntCmp ${G_POP3} 65535 pop3_ok pop3_ok
default_pop3:
! StrCpy ${G_POP3} "110"
! StrCmp ${G_POP3} ${G_GUI} 0 pop3_ok
! StrCpy ${G_POP3} "111"
pop3_ok:
! StrCmp ${G_GUI} "" default_gui
! Push ${G_GUI}
Call StrCheckDecimal
! Pop ${G_GUI}
! StrCmp ${G_GUI} "" default_gui
! IntCmp ${G_GUI} 1 ports_ok default_gui
! IntCmp ${G_GUI} 65535 ports_ok ports_ok
default_gui:
! StrCpy ${G_GUI} "8080"
! StrCmp ${G_POP3} ${G_GUI} 0 ports_ok
! StrCpy ${G_GUI} "8081"
ports_ok:
--- 1118,1157 ----
; check port values (config file may have no port data or invalid port data)
! StrCmp $G_POP3 $G_GUI 0 ports_differ
; Config file has no port data or same port used for POP3 and GUI
; (i.e. the data is not valid), so use POPFile defaults
! StrCpy $G_POP3 "110"
! StrCpy $G_GUI "8080"
Goto ports_ok
ports_differ:
! StrCmp $G_POP3 "" default_pop3
! Push $G_POP3
Call StrCheckDecimal
! Pop $G_POP3
! StrCmp $G_POP3 "" default_pop3
! IntCmp $G_POP3 1 pop3_ok default_pop3
! IntCmp $G_POP3 65535 pop3_ok pop3_ok
default_pop3:
! StrCpy $G_POP3 "110"
! StrCmp $G_POP3 $G_GUI 0 pop3_ok
! StrCpy $G_POP3 "111"
pop3_ok:
! StrCmp $G_GUI "" default_gui
! Push $G_GUI
Call StrCheckDecimal
! Pop $G_GUI
! StrCmp $G_GUI "" default_gui
! IntCmp $G_GUI 1 ports_ok default_gui
! IntCmp $G_GUI 65535 ports_ok ports_ok
default_gui:
! StrCpy $G_GUI "8080"
! StrCmp $G_POP3 $G_GUI 0 ports_ok
! StrCpy $G_GUI "8081"
ports_ok:
***************
*** 1234,1238 ****
continue:
! ; The function "CheckExistingConfig" loads ${G_POP3} and ${G_GUI} with the settings found in
; a previously installed "popfile.cfg" file or if no such file is found, it loads the
; POPFile default values. Now we display these settings and allow the user to change them.
--- 1242,1246 ----
continue:
! ; The function "CheckExistingConfig" loads $G_POP3 and $G_GUI with the settings found in
; a previously installed "popfile.cfg" file or if no such file is found, it loads the
; POPFile default values. Now we display these settings and allow the user to change them.
***************
*** 1240,1244 ****
; The POP3 and GUI port numbers must be in the range 1 to 65535 inclusive, and they
; must be different. This function assumes that the values "CheckExistingConfig" has loaded
! ; into ${G_POP3} and ${G_GUI} are valid.
!insertmacro MUI_HEADER_TEXT "$(PFI_LANG_OPTIONS_TITLE)" "$(PFI_LANG_OPTIONS_SUBTITLE)"
--- 1248,1252 ----
; The POP3 and GUI port numbers must be in the range 1 to 65535 inclusive, and they
; must be different. This function assumes that the values "CheckExistingConfig" has loaded
! ; into $G_POP3 and $G_GUI are valid.
!insertmacro MUI_HEADER_TEXT "$(PFI_LANG_OPTIONS_TITLE)" "$(PFI_LANG_OPTIONS_SUBTITLE)"
***************
*** 1249,1257 ****
!insertmacro MUI_INSTALLOPTIONS_READ ${L_PORTLIST} "ioA.ini" "Field 2" "ListItems"
Push |${L_PORTLIST}|
! Push |${G_POP3}|
Call StrStr
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" 0 POP3_is_in_list
! StrCpy ${L_PORTLIST} ${L_PORTLIST}|${G_POP3}
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "ListItems" ${L_PORTLIST}
--- 1257,1265 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${L_PORTLIST} "ioA.ini" "Field 2" "ListItems"
Push |${L_PORTLIST}|
! Push |$G_POP3|
Call StrStr
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" 0 POP3_is_in_list
! StrCpy ${L_PORTLIST} ${L_PORTLIST}|$G_POP3
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "ListItems" ${L_PORTLIST}
***************
*** 1259,1267 ****
!insertmacro MUI_INSTALLOPTIONS_READ ${L_PORTLIST} "ioA.ini" "Field 4" "ListItems"
Push |${L_PORTLIST}|
! Push |${G_GUI}|
Call StrStr
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" 0 GUI_is_in_list
! StrCpy ${L_PORTLIST} ${L_PORTLIST}|${G_GUI}
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "ListItems" ${L_PORTLIST}
--- 1267,1275 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${L_PORTLIST} "ioA.ini" "Field 4" "ListItems"
Push |${L_PORTLIST}|
! Push |$G_GUI|
Call StrStr
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" 0 GUI_is_in_list
! StrCpy ${L_PORTLIST} ${L_PORTLIST}|$G_GUI
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "ListItems" ${L_PORTLIST}
***************
*** 1275,1280 ****
show_defaults:
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "State" ${G_POP3}
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "State" ${G_GUI}
; Now display the custom page and wait for the user to make their selections.
--- 1283,1288 ----
show_defaults:
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "State" $G_POP3
! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "State" $G_GUI
; Now display the custom page and wait for the user to make their selections.
***************
*** 1306,1323 ****
Push ${L_RESULT}
! !insertmacro MUI_INSTALLOPTIONS_READ ${G_POP3} "ioA.ini" "Field 2" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ ${G_GUI} "ioA.ini" "Field 4" "State"
! StrCmp ${G_POP3} ${G_GUI} ports_must_differ
! Push ${G_POP3}
Call StrCheckDecimal
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" bad_pop3
! IntCmp ${G_POP3} 1 pop3_ok bad_pop3
! IntCmp ${G_POP3} 65535 pop3_ok pop3_ok
bad_pop3:
MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"${G_POP3}$\"'.\
$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBPOP3_2)\
--- 1314,1331 ----
Push ${L_RESULT}
! !insertmacro MUI_INSTALLOPTIONS_READ $G_POP3 "ioA.ini" "Field 2" "State"
! !insertmacro MUI_INSTALLOPTIONS_READ $G_GUI "ioA.ini" "Field 4" "State"
! StrCmp $G_POP3 $G_GUI ports_must_differ
! Push $G_POP3
Call StrCheckDecimal
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" bad_pop3
! IntCmp $G_POP3 1 pop3_ok bad_pop3
! IntCmp $G_POP3 65535 pop3_ok pop3_ok
bad_pop3:
MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBPOP3_1) $\"$G_POP3$\"'.\
$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBPOP3_2)\
***************
*** 1327,1340 ****
pop3_ok:
! Push ${G_GUI}
Call StrCheckDecimal
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" bad_gui
! IntCmp ${G_GUI} 1 good_exit bad_gui
! IntCmp ${G_GUI} 65535 good_exit good_exit
bad_gui:
MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBGUI_1) $\"${G_GUI}$\".\
$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBGUI_2)\
--- 1335,1348 ----
pop3_ok:
! Push $G_GUI
Call StrCheckDecimal
Pop ${L_RESULT}
StrCmp ${L_RESULT} "" bad_gui
! IntCmp $G_GUI 1 good_exit bad_gui
! IntCmp $G_GUI 65535 good_exit good_exit
bad_gui:
MessageBox MB_OK|MB_ICONEXCLAMATION \
! "$(PFI_LANG_OPTIONS_MBGUI_1) $\"$G_GUI$\".\
$\r$\n$\r$\n\
$(PFI_LANG_OPTIONS_MBGUI_2)\
***************
*** 1427,1431 ****
!define L_ORDINALS $R1 ; "Identity Ordinals" flag (1 = found, 0 = not found)
!define L_SEPARATOR $R0 ; char used to separate the pop3 server from the username
! !define LG_TEMP $9 ; a global register "borrowed" for use locally
Push ${L_ACCOUNT}
--- 1435,1439 ----
!define L_ORDINALS $R1 ; "Identity Ordinals" flag (1 = found, 0 = not found)
!define L_SEPARATOR $R0 ; char used to separate the pop3 server from the username
! !define L_TEMP $9
Push ${L_ACCOUNT}
***************
*** 1439,1443 ****
Push ${L_ORDINALS}
Push ${L_SEPARATOR}
! Push ${LG_TEMP}
; Determine the separator character to be used when configuring an email account for POPFile
--- 1447,1451 ----
Push ${L_ORDINALS}
Push ${L_SEPARATOR}
! Push ${L_TEMP}
; Determine the separator character to be used when configuring an email account for POPFile
***************
*** 1460,1465 ****
StrCpy ${L_ORDINALS} "1"
! ReadRegDWORD ${LG_TEMP} HKCU "Identities\${L_GUID}" "Identity Ordinal"
! IntCmp ${LG_TEMP} 1 firstOrdinal noOrdinals otherOrdinal
firstOrdinal:
--- 1468,1473 ----
StrCpy ${L_ORDINALS} "1"
! ReadRegDWORD ${L_TEMP} HKCU "Identities\${L_GUID}" "Identity Ordinal"
! IntCmp ${L_TEMP} 1 firstOrdinal noOrdinals otherOrdinal
firstOrdinal:
***************
*** 1502,1507 ****
Push ${L_SEPARATOR}
Call StrStr
! Pop ${LG_TEMP}
! StrCmp ${LG_TEMP} "" 0 try_next_account
!insertmacro MUI_HEADER_TEXT "$(PFI_LANG_OECFG_TITLE)" "$(PFI_LANG_OECFG_SUBTITLE)"
--- 1510,1515 ----
Push ${L_SEPARATOR}
Call StrStr
! Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 try_next_account
!insertmacro MUI_HEADER_TEXT "$(PFI_LANG_OECFG_TITLE)" "$(PFI_LANG_OECFG_SUBTITLE)"
***************
*** 1525,1530 ****
Push ${L_SEPARATOR}
Call StrStr
! Pop ${LG_TEMP}
! StrCmp ${LG_TEMP} "" 0 try_next_account
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Field 9" "Text" ${L_OEDATA}
--- 1533,1538 ----
Push ${L_SEPARATOR}
Call StrStr
! Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 try_next_account
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Field 9" "Text" ${L_OEDATA}
***************
*** 1543,1559 ****
!insertmacro MUI_INSTALLOPTIONS_DISPLAY_RETURN "ioB.ini"
! Pop ${LG_TEMP}
! StrCmp ${LG_TEMP} "cancel" finished_this_guid
! StrCmp ${LG_TEMP} "back" finished_this_guid
; Has the user ticked the 'configure this account' check box ?
! !insertmacro MUI_INSTALLOPTIONS_READ ${LG_TEMP} "ioB.ini" "Field 2" "State"
! StrCmp ${LG_TEMP} "1" change_oe try_next_account
change_oe:
ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "POP3 User Name"
! ReadRegStr ${LG_TEMP} HKCU ${L_ACCOUNT} "POP3 Server"
; To be able to restore the registry to previous settings when we uninstall we
--- 1551,1567 ----
!insertmacro MUI_INSTALLOPTIONS_DISPLAY_RETURN "ioB.ini"
! Pop ${L_TEMP}
! StrCmp ${L_TEMP} "cancel" finished_this_guid
! StrCmp ${L_TEMP} "back" finished_this_guid
; Has the user ticked the 'configure this account' check box ?
! !insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioB.ini" "Field 2" "State"
! StrCmp ${L_TEMP} "1" change_oe try_next_account
change_oe:
ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "POP3 User Name"
! ReadRegStr ${L_TEMP} HKCU ${L_ACCOUNT} "POP3 Server"
; To be able to restore the registry to previous settings when we uninstall we
***************
*** 1572,1579 ****
FileWrite ${L_CFG} "${L_ACCOUNT}$\n"
FileWrite ${L_CFG} "POP3 Server$\n"
! FileWrite ${L_CFG} "${LG_TEMP}$\n"
FileClose ${L_CFG}
! WriteRegStr HKCU ${L_ACCOUNT} "POP3 User Name" "${LG_TEMP}${L_SEPARATOR}${L_OEDATA}"
WriteRegStr HKCU ${L_ACCOUNT} "POP3 Server" "127.0.0.1"
--- 1580,1587 ----
FileWrite ${L_CFG} "${L_ACCOUNT}$\n"
FileWrite ${L_CFG} "POP3 Server$\n"
! FileWrite ${L_CFG} "${L_TEMP}$\n"
FileClose ${L_CFG}
! WriteRegStr HKCU ${L_ACCOUNT} "POP3 User Name" "${L_TEMP}${L_SEPARATOR}${L_OEDATA}"
WriteRegStr HKCU ${L_ACCOUNT} "POP3 Server" "127.0.0.1"
***************
*** 1593,1597 ****
finished_oe_config:
! Pop ${LG_TEMP}
Pop ${L_SEPARATOR}
Pop ${L_ORDINALS}
--- 1601,1605 ----
finished_oe_config:
! Pop ${L_TEMP}
Pop ${L_SEPARATOR}
Pop ${L_ORDINALS}
***************
*** 1615,1619 ****
!undef L_ORDINALS
!undef L_SEPARATOR
! !undef LG_TEMP
FunctionEnd
--- 1623,1627 ----
!undef L_ORDINALS
!undef L_SEPARATOR
! !undef L_TEMP
FunctionEnd
***************
*** 1694,1698 ****
; User has changed their mind: Shutdown the newly installed version of POPFile
! NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
--- 1702,1706 ----
; User has changed their mind: Shutdown the newly installed version of POPFile
! NSISdl::download_quiet http://127.0.0.1:$G_GUI/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
***************
*** 1726,1730 ****
; is running on the same UI port as the newly installed version.
! NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
--- 1734,1738 ----
; is running on the same UI port as the newly installed version.
! NSISdl::download_quiet http://127.0.0.1:$G_GUI/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
***************
*** 1750,1754 ****
; is running on the same UI port as the newly installed version.
! NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
--- 1758,1762 ----
; is running on the same UI port as the newly installed version.
! NSISdl::download_quiet http://127.0.0.1:$G_GUI/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP} ; Get the return value (and ignore it)
Push ${L_EXE}
***************
*** 1763,1767 ****
check_if_ready:
! NSISdl::download_quiet http://127.0.0.1:${G_GUI} "$PLUGINSDIR\ui.htm"
Pop ${L_TEMP} ; Did POPFile return an HTML page?
StrCmp ${L_TEMP} "success" remove_banner
--- 1771,1775 ----
check_if_ready:
! NSISdl::download_quiet http://127.0.0.1:$G_GUI "$PLUGINSDIR\ui.htm"
Pop ${L_TEMP} ; Did POPFile return an HTML page?
StrCmp ${L_TEMP} "success" remove_banner
***************
*** 1829,1833 ****
Function RunUI
! ExecShell "open" "http://127.0.0.1:${G_GUI}"
FunctionEnd
--- 1837,1841 ----
Function RunUI
! ExecShell "open" "http://127.0.0.1:$G_GUI"
FunctionEnd
***************
*** 1840,1844 ****
Function ShowReadMe
! StrCmp ${G_NOTEPAD} "" use_file_association
Exec 'notepad.exe "$INSTDIR\${C_README}"'
goto exit
--- 1848,1852 ----
Function ShowReadMe
! StrCmp $G_NOTEPAD "" use_file_association
Exec 'notepad.exe "$INSTDIR\${C_README}"'
goto exit
***************
*** 1964,1968 ****
attempt_shutdown:
! StrCpy ${G_GUI} ""
StrCpy ${L_OLDUI} ""
--- 1972,1976 ----
attempt_shutdown:
! StrCpy $G_GUI ""
StrCpy ${L_OLDUI} ""
***************
*** 1982,1986 ****
got_html_port:
! StrCpy ${G_GUI} ${L_LNE} 5 10
Goto loop
--- 1990,1994 ----
got_html_port:
! StrCpy $G_GUI ${L_LNE} 5 10
Goto loop
***************
*** 1992,2003 ****
FileClose ${L_CFG}
! StrCmp ${G_GUI} "" use_other_port
! Push ${G_GUI}
Call un.TrimNewlines
Call un.StrCheckDecimal
! Pop ${G_GUI}
! StrCmp ${G_GUI} "" use_other_port
! DetailPrint "$(un.PFI_LANG_LOG_1) ${G_GUI}"
! NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
Goto check_shutdown
--- 2000,2011 ----
FileClose ${L_CFG}
! StrCmp $G_GUI "" use_other_port
! Push $G_GUI
Call un.TrimNewlines
Call un.StrCheckDecimal
! Pop $G_GUI
! StrCmp $G_GUI "" use_other_port
! DetailPrint "$(un.PFI_LANG_LOG_1) $G_GUI"
! NSISdl::download_quiet http://127.0.0.1:$G_GUI/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
Goto check_shutdown
|
11 messages has been excluded from this view by a project administrator.
