popfile-commit — CVS commit list messages

[popfile-commit] windows/languages Hungarian-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24822

Modified Files:
	Hungarian-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: Hungarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Hungarian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- Hungarian-pfi.nsh	9 Jul 2003 13:21:51 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages German-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24766

Modified Files:
	German-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: German-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** German-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- German-pfi.nsh	9 Jul 2003 13:21:26 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages French-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24701

Modified Files:
	French-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: French-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** French-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- French-pfi.nsh	9 Jul 2003 13:21:06 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages Finnish-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24668

Modified Files:
	Finnish-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: Finnish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Finnish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- Finnish-pfi.nsh	9 Jul 2003 13:20:40 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages English-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24632

Modified Files:
	English-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: English-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** English-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- English-pfi.nsh	9 Jul 2003 13:20:16 -0000	1.4
***************
*** 138,146 ****
  ; Message box text strings
  
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1      "Sorry! 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      "Sorry! 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"
--- 138,146 ----
  ; 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"
***************
*** 153,157 ****
  !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     "Sorry! 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."
--- 153,157 ----
  !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."
***************
*** 159,166 ****
  !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      "Sorry! 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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 159,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages Dutch-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24523

Modified Files:
	Dutch-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: Dutch-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Dutch-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- Dutch-pfi.nsh	9 Jul 2003 13:19:57 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages Danish-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24500

Modified Files:
	Danish-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: Danish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Danish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- Danish-pfi.nsh	9 Jul 2003 13:19:37 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows/languages Bulgarian-pfi.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24465

Modified Files:
	Bulgarian-pfi.nsh 
Log Message:
Avoid very wide message boxes.

Index: Bulgarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Bulgarian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
--- Bulgarian-pfi.nsh	9 Jul 2003 13:19:15 -0000	1.4
***************
*** 162,166 ****
  !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' control panel to create the missing bucket(s)."
  
  #--------------------------------------------------------------------------
--- 162,166 ----
  !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)."
  
  #--------------------------------------------------------------------------
***************
*** 235,240 ****
  !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? (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."
--- 235,243 ----
  !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."

[popfile-commit] windows installer.nsi,1.82,1.83

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27939

Modified Files:
	installer.nsi 
Log Message:
Message boxes now use icons. Uninstall 'not found' message box now defaults to 'No' button.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** installer.nsi	3 Jul 2003 12:05:15 -0000	1.82
--- installer.nsi	8 Jul 2003 08:16:22 -0000	1.83
***************
*** 10,14 ****
  #--------------------------------------------------------------------------
  
! ; Modified to work with NSIS 2.0b4 (CVS) or later
  
  #--------------------------------------------------------------------------
--- 10,14 ----
  #--------------------------------------------------------------------------
  
! ; Modified to work with NSIS 2.0b4 (CVS) [ MAKENSIS.EXE dated 28 June 2003 @ 06:44 or later ]
  
  #--------------------------------------------------------------------------
***************
*** 24,53 ****
  # LANGUAGE SUPPORT:
  #
! # The installer defaults to supporting a number of languages (the default is 'English').
  #
  # If required, a command-line switch can be used to build an English-only version.
  #
! # Normal multi-language build command:  makensis installer.nsi
  #
! # To build an English-only installer:   makensis /DENGLISH_ONLY installer.nsi
  #
  # To remove any of the additional languages, only TWO lines need to be commented-out:
- #
  # (a) comment-out the relevant '!insertmacro PFI_LANG_LOAD' line in the list of languages
  #     in the 'Language Support for the installer and uninstaller' block of code
- #
  # (b) comment-out the relevant '!insertmacro UI_LANG_CONFIG' line in the list of languages
  #     in the code which handles the 'UI Languages' component
  #
  # For example, to remove support for the 'Dutch' language, comment-out the line
- #
  #     !insertmacro PFI_LANG_LOAD "Dutch"
- #
  # in the list of languages supported by the installer, and comment-out the line
- #
  #     !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
- #
  # in the code which handles the 'UI Languages' component (Section "Languages").
  #
  # The number of languages which can be supported depends upon the availability of:
  #
--- 24,52 ----
  # LANGUAGE SUPPORT:
  #
! # The installer defaults to multi-language mode ('English' plus a number of other languages).
  #
  # If required, a command-line switch can be used to build an English-only version.
  #
! # Normal multi-language build command:  makensis.exe installer.nsi
! # To build an English-only installer:   makensis.exe  /DENGLISH_ONLY installer.nsi
  #
! #--------------------------------------------------------------------------
! # Removing support for a particular language:
  #
  # To remove any of the additional languages, only TWO lines need to be commented-out:
  # (a) comment-out the relevant '!insertmacro PFI_LANG_LOAD' line in the list of languages
  #     in the 'Language Support for the installer and uninstaller' block of code
  # (b) comment-out the relevant '!insertmacro UI_LANG_CONFIG' line in the list of languages
  #     in the code which handles the 'UI Languages' component
  #
  # For example, to remove support for the 'Dutch' language, comment-out the line
  #     !insertmacro PFI_LANG_LOAD "Dutch"
  # in the list of languages supported by the installer, and comment-out the line
  #     !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
  # in the code which handles the 'UI Languages' component (Section "Languages").
  #
+ #--------------------------------------------------------------------------
+ # Adding support for a particular language (it must be supported by NSIS):
+ #
  # The number of languages which can be supported depends upon the availability of:
  #
***************
*** 56,65 ****
  #     (2) an up-to-date NSIS MUI Language file ({NSIS}\Contrib\Modern UI\Language files\*.nsh)
  #
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # At present (02 July 2003) support for 'Bulgarian' and 'Danish' has been disabled (as described
- # above) because in these two cases the corresponding NLF file is out-of-step and this could
- # result in the wrong messages being displayed during the installation.
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- #
  # To add support for a language which is already supported by the NSIS MUI package, two files
  # are required:
--- 55,58 ----
***************
*** 76,79 ****
--- 69,78 ----
  # 'Languages' component to allow the installer to select the appropriate UI language.
  #--------------------------------------------------------------------------
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # At present (02 July 2003) support for 'Bulgarian' and 'Danish' has been disabled (as described
+ # above) because in these two cases the corresponding NLF file is out-of-step and this could
+ # result in wrong/missing messages during the installation.
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ #--------------------------------------------------------------------------
  
    ; POPFile constants have been given names beginning with 'C_' (eg C_README)
***************
*** 173,180 ****
    ;-----------------------------------------
  
!   ; Select either "accept/do not accept" radio buttons or "accept" checkbox for the license page
  
- #  !define MUI_LICENSEPAGE_RADIOBUTTONS
    !define MUI_LICENSEPAGE_CHECKBOX
  
    ;-----------------------------------------
--- 172,183 ----
    ;-----------------------------------------
  
!   ; Three styles of 'License Agreement' page are available:
!   ; (1) New style with an 'I accept' checkbox below the license window
!   ; (2) New style with 'I accept/I do not accept' radio buttons below the license window
!   ; (3) Classic style with the 'Next' button replaced by an 'Agree' button
!   ;     (to get the 'Classic' style,  comment-out the CHECKBOX and the RADIOBUTTONS 'defines')
  
    !define MUI_LICENSEPAGE_CHECKBOX
+ #  !define MUI_LICENSEPAGE_RADIOBUTTONS
  
    ;-----------------------------------------
***************
*** 341,354 ****
  
  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Bulgarian"    ; NSIS MUI file out-of-date as of 27-Jun-03
! 
          !insertmacro PFI_LANG_LOAD "SimpChinese"
          !insertmacro PFI_LANG_LOAD "TradChinese"
- 
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Danish"       ; NSIS MUI file out-of-date as of 27-Jun-03
! 
          !insertmacro PFI_LANG_LOAD "Dutch"
!         !insertmacro PFI_LANG_LOAD "Finnish"      ; NSIS MUI file out-of-date as of 27-Jun-03
          !insertmacro PFI_LANG_LOAD "French"
          !insertmacro PFI_LANG_LOAD "German"
--- 344,354 ----
  
  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
! #        !insertmacro PFI_LANG_LOAD "Bulgarian"    ; 'New style' license msgs missing (27-Jun-03)
          !insertmacro PFI_LANG_LOAD "SimpChinese"
          !insertmacro PFI_LANG_LOAD "TradChinese"
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
! #        !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"
***************
*** 441,445 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBRELNOTES_2)"
    StrCpy ${L_MSG} "${L_MSG}$\r$\n$\r$\n${L_TXT}"
!   MessageBox MB_YESNO ${L_MSG} IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
--- 441,445 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBRELNOTES_2)"
    StrCpy ${L_MSG} "${L_MSG}$\r$\n$\r$\n${L_TXT}"
!   MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO exit
    StrCmp ${G_NOTEPAD} "" use_file_association
    ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
***************
*** 532,536 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.default')"
!   MessageBox MB_YESNO ${L_MSG} IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
    SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
--- 532,536 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBSTPWDS_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT} 'stopwords.default')"
!   MessageBox MB_YESNO|MB_ICONQUESTION ${L_MSG} IDNO copy_default_stopwords
    IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
    SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
***************
*** 559,563 ****
    StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_YESNO "${L_MSG}" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
  
--- 559,563 ----
    StrCpy ${L_TXT} "$(PFI_LANG_MBCFGBK_4)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_YESNO|MB_ICONQUESTION "${L_MSG}" IDNO update_config
    SetFileAttributes "$INSTDIR\popfile.cfg.bak" NORMAL
  
***************
*** 822,835 ****
  
          !insertmacro UI_LANG_CONFIG "ENGLISH" "English"
- 
  # [02 July 03] "Bulgarian" disabled because the main NSIS NLF language file is out of date
  #        !insertmacro UI_LANG_CONFIG "BULGARIAN" "Bulgarian"
- 
          !insertmacro UI_LANG_CONFIG "SIMPCHINESE" "Chinese-Simplified"
          !insertmacro UI_LANG_CONFIG "TRADCHINESE" "Chinese-Traditional"
- 
  # [02 July 03]  "Danish" disabled because the main NSIS NLF language file is out of date
  #        !insertmacro UI_LANG_CONFIG "DANISH" "Dansk"
- 
          !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
          !insertmacro UI_LANG_CONFIG "FINNISH" "Suomi"
--- 822,831 ----
***************
*** 1280,1284 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK ${L_MSG}
    Goto bad_exit
  
--- 1276,1280 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBPOP3_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
    Goto bad_exit
  
***************
*** 1297,1301 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK ${L_MSG}
    Goto bad_exit
  
--- 1293,1297 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBGUI_3)"
    StrCpy ${L_MSG} "${L_MSG}${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
    Goto bad_exit
  
***************
*** 1304,1308 ****
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBDIFF_2)"
    StrCpy ${L_MSG} "${L_MSG}$\n$\n${L_TXT}"
!   MessageBox MB_OK ${L_MSG}
  
  bad_exit:
--- 1300,1304 ----
    StrCpy ${L_TXT} "$(PFI_LANG_OPTIONS_MBDIFF_2)"
    StrCpy ${L_MSG} "${L_MSG}$\n$\n${L_TXT}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION ${L_MSG}
  
  bad_exit:
***************
*** 2103,2107 ****
      StrCpy ${L_TEMP} "$(un.PFI_LANG_MBNOTFOUND_2)"
      StrCpy ${L_MSG} "${L_MSG} '$INSTDIR'.$\r$\n$\r$\n${L_TEMP}"
!     MessageBox MB_YESNO "${L_MSG}" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"
  
--- 2099,2103 ----
      StrCpy ${L_TEMP} "$(un.PFI_LANG_MBNOTFOUND_2)"
      StrCpy ${L_MSG} "${L_MSG} '$INSTDIR'.$\r$\n$\r$\n${L_TEMP}"
!     MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 "${L_MSG}" IDYES skip_confirmation
      Abort "$(un.PFI_LANG_ABORT_1)"
  

[popfile-commit] windows CBP.nsh,1.10,1.11

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv27338

Modified Files:
	CBP.nsh 
Log Message:
Message boxes now have an icon.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CBP.nsh	4 Jul 2003 19:47:19 -0000	1.10
--- CBP.nsh	8 Jul 2003 08:12:28 -0000	1.11
***************
*** 1223,1227 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBDUPERR_3)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_OK "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
--- 1223,1227 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBDUPERR_3)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
***************
*** 1234,1238 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBMAXERR_2)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
--- 1234,1238 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBMAXERR_2)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
***************
*** 1245,1249 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBNAMERR_4)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
--- 1245,1249 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBNAMERR_4)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
***************
*** 1258,1262 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBDONE_3)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_YESNO "${CBP_L_RESULT}" IDYES finished_buckets
    goto get_next_bucket_cmd
  
--- 1258,1262 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBDONE_3)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_YESNO|MB_ICONQUESTION "${CBP_L_RESULT}" IDYES finished_buckets
    goto get_next_bucket_cmd
  
***************
*** 1265,1273 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBCONTERR_2)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_OK "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
  too_few:
!   MessageBox MB_OK "$(PFI_LANG_CBP_MBCONTERR_3)"
    goto get_next_bucket_cmd
  
--- 1265,1273 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBCONTERR_2)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT}$\n$\n${CBP_L_TEMP}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION "${CBP_L_RESULT}"
    goto get_next_bucket_cmd
  
  too_few:
!   MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_CBP_MBCONTERR_3)"
    goto get_next_bucket_cmd
  
***************
*** 1290,1294 ****
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBMAKERR_4)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK "${CBP_L_RESULT}"
  
  finished_now:
--- 1290,1294 ----
    StrCpy ${CBP_L_TEMP} "$(PFI_LANG_CBP_MBMAKERR_4)"
    StrCpy ${CBP_L_RESULT} "${CBP_L_RESULT} ${CBP_L_TEMP}"
!   MessageBox MB_OK|MB_ICONEXCLAMATION "${CBP_L_RESULT}"
  
  finished_now:

[popfile-commit] engine traintest.pl,1.5,1.6

[<ssc...@us...>]

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv12282

Modified Files:
	traintest.pl 
Log Message:
update for message queue changes to allow traintest.pl to run

Index: traintest.pl
===================================================================
RCS file: /cvsroot/popfile/engine/traintest.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** traintest.pl	29 May 2003 05:49:42 -0000	1.5
--- traintest.pl	8 Jul 2003 01:54:37 -0000	1.6
***************
*** 11,14 ****
--- 11,15 ----
  use Classifier::Bayes;
  use POPFile::Configuration;
+ use POPFile::MQ;
  
  my $debug = 0;
***************
*** 64,68 ****
  {
      my ($config) = @_;
!     
      $config->parameter("csv",$DEFAULT_CSV);
      $config->parameter("toe",$DEFAULT_TOE);
--- 65,69 ----
  {
      my ($config) = @_;
! 
      $config->parameter("csv",$DEFAULT_CSV);
      $config->parameter("toe",$DEFAULT_TOE);
***************
*** 79,84 ****
  sub cvs_out
  {
!     my ($config, $file, @log) = @_;    
!  
      if ($file eq 'auto') {
          if ($config->parameter('toe') == 1) {
--- 80,85 ----
  sub cvs_out
  {
!     my ($config, $file, @log) = @_;
! 
      if ($file eq 'auto') {
          if ($config->parameter('toe') == 1) {
***************
*** 90,113 ****
               ( $config->parameter('window2') ne $DEFAULT_WINDOW2 ) ) {
              $file .= "$config->parameter('window1')and$config->parameter('window2')";
!                 
          }
!         
          if ( $config->parameter('stopwords') ne $DEFAULT_STOP ) {
              $file .= "_";
!             if ($config->parameter('stopwords') != 1) {                
                  $file .= "no";
              }
!             $file .= "stop";                
          }
!         
!         
          $file .= ".csv";
      }
!     
      print STDERR "Printing data to $file\n";
!     
      open CSV, ">$file";
!     
!     
      $, = ",";
  
--- 91,114 ----
               ( $config->parameter('window2') ne $DEFAULT_WINDOW2 ) ) {
              $file .= "$config->parameter('window1')and$config->parameter('window2')";
! 
          }
! 
          if ( $config->parameter('stopwords') ne $DEFAULT_STOP ) {
              $file .= "_";
!             if ($config->parameter('stopwords') != 1) {
                  $file .= "no";
              }
!             $file .= "stop";
          }
! 
! 
          $file .= ".csv";
      }
! 
      print STDERR "Printing data to $file\n";
! 
      open CSV, ">$file";
! 
! 
      $, = ",";
  
***************
*** 122,130 ****
          print CSV "\n";
      }
!     
      print STDERR "Data saved to $file\n";
!     
      $, = "";
!     
  }
  
--- 123,131 ----
          print CSV "\n";
      }
! 
      print STDERR "Data saved to $file\n";
! 
      $, = "";
! 
  }
  
***************
*** 151,155 ****
  {
      my ($toe,$predicted,$actual) = @_;
!     
      if ($toe == 1) {
          return ($predicted ne $actual);
--- 152,156 ----
  {
      my ($toe,$predicted,$actual) = @_;
! 
      if ($toe == 1) {
          return ($predicted ne $actual);
***************
*** 167,175 ****
      my $dir = $self->{configuration__}->parameter('corpus_out');
      mkdir($dir);
!     
      foreach my $abucket ( keys %{$self->{total__}} ) {
!         
          print "saving $abucket corpus.\n";
!         
          my $subdir = $dir;
          $subdir .= "/$abucket";
--- 168,176 ----
      my $dir = $self->{configuration__}->parameter('corpus_out');
      mkdir($dir);
! 
      foreach my $abucket ( keys %{$self->{total__}} ) {
! 
          print "saving $abucket corpus.\n";
! 
          my $subdir = $dir;
          $subdir .= "/$abucket";
***************
*** 185,190 ****
                  }
              }
!         }        
!     }    
  }
  
--- 186,191 ----
                  }
              }
!         }
!     }
  }
  
***************
*** 272,278 ****
--- 273,285 ----
      my $b = new Classifier::Bayes;
      my $c = new POPFile::Configuration;
+     my $mq = new POPFile::MQ;
  
      $b->configuration( $c );
      $c->configuration( $c );
+     $mq->configuration( $c);
+ 
+     $b->mq( $mq );
+     $c->mq( $mq );
+     $mq->mq( $mq );
  
      $c->initialize();
***************
*** 281,296 ****
  
      $c->load_configuration();
!     
      $c->parse_command_line();
!     
  #    $b->{unclassified} = ($c->parameter('unclassified_probability') || 0.0001);
      $b->{unclassified__} = log($c->parameter("bayes_unclassified_probability") || 0.5);
!     
!     # test with or without stop-words    
       if ( $c->parameter("stopwords") eq 0 ) {
          $b->{parser__}->{mangle__}->{stop__} = {};
          $b->{mangler__}->{stop__} = {};
      }
!     
  
      my $archive = $c->parameter("html_archive_dir");
--- 288,303 ----
  
      $c->load_configuration();
! 
      $c->parse_command_line();
! 
  #    $b->{unclassified} = ($c->parameter('unclassified_probability') || 0.0001);
      $b->{unclassified__} = log($c->parameter("bayes_unclassified_probability") || 0.5);
! 
!     # test with or without stop-words
       if ( $c->parameter("stopwords") eq 0 ) {
          $b->{parser__}->{mangle__}->{stop__} = {};
          $b->{mangler__}->{stop__} = {};
      }
! 
  
      my $archive = $c->parameter("html_archive_dir");
***************
*** 355,362 ****
          my $message_count = $index + 1;
          $index = $#sorted_messages - $index;
!         print "\n$self->{messages}->{messages}{ @sorted_messages[$index] }{long}:" if ($debug);        
          $bucket_class = $b->classify_file( $self->{messages}->{messages}{ @sorted_messages[$index] }{long});
          $bucket_true = $self->{messages}->{messages}{ @sorted_messages[$index] }{bucket};
!         
          $b->{parser__}->{subject__} =~ s/(\r\n|\n|\r)[ \t]+//gm;
  
--- 362,369 ----
          my $message_count = $index + 1;
          $index = $#sorted_messages - $index;
!         print "\n$self->{messages}->{messages}{ @sorted_messages[$index] }{long}:" if ($debug);
          $bucket_class = $b->classify_file( $self->{messages}->{messages}{ @sorted_messages[$index] }{long});
          $bucket_true = $self->{messages}->{messages}{ @sorted_messages[$index] }{bucket};
! 
          $b->{parser__}->{subject__} =~ s/(\r\n|\n|\r)[ \t]+//gm;
  
***************
*** 425,434 ****
  
      my $end_time = time;
!     
      if ($c->parameter("dump")) {
          dump_corpus($b);
!         
      }
!     
  
      my $total_messages = $#sorted_messages + 1;
--- 432,441 ----
  
      my $end_time = time;
! 
      if ($c->parameter("dump")) {
          dump_corpus($b);
! 
      }
! 
  
      my $total_messages = $#sorted_messages + 1;

[popfile-commit] windows/languages Bulgarian-pfi.nsh,1.2,1.3 Danish-pfi.nsh,1.2,1.3 Dutch-pfi.nsh,1.2,1.3 English-pfi.nsh,1.2,1.3 Finnish-pfi.nsh,1.2,1.3 French-pfi.nsh,1.2,1.3 German-pfi.nsh,1.2,1.3 Hungarian-pfi.nsh,1.2,1.3 Japanese-pfi.nsh,1.3,1.4 Korean-pfi.nsh,1.3,1.4 Portuguese-pfi.nsh,1.2,1.3 PortugueseBR-pfi.nsh,1.2,1.3 Russian-pfi.nsh,1.2,1.3 SimpChinese-pfi.nsh,1.2,1.3 Slovak-pfi.nsh,1.2,1.3 Spanish-pfi.nsh,1.2,1.3 Swedish-pfi.nsh,1.2,1.3 TradChinese-pfi.nsh,1.3,1.4 Ukrainian-pfi.nsh,1.2,1.3

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv14418

Modified Files:
	Bulgarian-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh 
	Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh 
	Hungarian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh 
	Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh 
	SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh 
	Swedish-pfi.nsh TradChinese-pfi.nsh Ukrainian-pfi.nsh 
Log Message:
Improved message format and description.

Index: Bulgarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Bulgarian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Bulgarian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Danish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Danish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Danish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Dutch-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dutch-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Dutch-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: English-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** English-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- English-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "Sorry! You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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     "Sorry! You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  

Index: Finnish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Finnish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Finnish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: French-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** French-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- French-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: German-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** German-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- German-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Hungarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hungarian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Hungarian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Japanese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Japanese-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
--- Japanese-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.4
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Korean-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Korean-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
--- Korean-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.4
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Portuguese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Portuguese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Portuguese-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: PortugueseBR-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PortugueseBR-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- PortugueseBR-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Russian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Russian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Russian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: SimpChinese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpChinese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- SimpChinese-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Slovak-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Slovak-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Slovak-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Spanish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Spanish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Spanish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Swedish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Swedish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Swedish-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: TradChinese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TradChinese-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
--- TradChinese-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.4
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

Index: Ukrainian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Ukrainian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Ukrainian-pfi.nsh	7 Jul 2003 18:38:40 -0000	1.3
***************
*** 12,22 ****
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to _IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' string in 'Custom Page - POPFile Classification Bucket Creation'
! #  shows how the \r\n\r\n sequence is used)
  #--------------------------------------------------------------------------
  
--- 12,30 ----
  #
  #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_MB* text used for message boxes):
! #
! #   (1) The sequence  $\r$\n        inserts a newline
! #   (2) The sequence  $\r$\n$\r\$n  inserts a blank line
! #
! # (the 'PFI_LANG_CBP_MBCONTERR_2' message box string which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
! #--------------------------------------------------------------------------
! # String Formatting (applies to PFI_LANG_*_IO_ text used for custom pages):
  #
  #   (1) The sequence  \r\n      inserts a newline
  #   (2) The sequence  \r\n\r\n  inserts a blank line
  #
! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading
! # 'Custom Page - POPFile Classification Bucket Creation' includes some examples)
  #--------------------------------------------------------------------------
  
***************
*** 144,148 ****
  
  !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, either by picking a suggested name from the drop-down list or by typing in a name of your own choice."
  !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3     "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
  
--- 152,156 ----
  
  !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."
  

[popfile-commit] windows/languages Finnish-mui.nsh,1.3,1.4

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv14287

Modified Files:
	Finnish-mui.nsh 
Log Message:
NSIS file 'Finnish.nsh' has been updated [see NSIS Bugs item # 766707] so there is no need for a local fix.

Index: Finnish-mui.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Finnish-mui.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Finnish-mui.nsh	3 Jul 2003 09:16:27 -0000	1.3
--- Finnish-mui.nsh	7 Jul 2003 18:35:49 -0000	1.4
***************
*** 52,68 ****
  
  #--------------------------------------------------------------------------
- # Standard MUI Page - Uninstall Finish
- #--------------------------------------------------------------------------
- 
- ; As of 27 June 2003, the NSIS MUI language file uses the wrong name for the following
- ; two UNTEXT strings.
- 
- !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISH_TITLE \
- "Poisto valmis"
- 
- !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISH_SUBTITLE \
- "Ohjelma on poistettu onnistuneesti."
- 
- #--------------------------------------------------------------------------
  # End of 'Finnish-mui.nsh'
  #--------------------------------------------------------------------------
--- 52,55 ----

[popfile-commit] engine/Classifier Bayes.pm,1.160,1.161

[<ssc...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2559

Modified Files:
	Bayes.pm 
Log Message:
removed stripping of path in classify_and_modify by retrieving filename without path (again)

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** Bayes.pm	6 Jul 2003 07:49:19 -0000	1.160
--- Bayes.pm	6 Jul 2003 07:59:30 -0000	1.161
***************
*** 983,986 ****
--- 983,987 ----
  
      my $temp_file  = $self->history_filename($dcount,$mcount, ".msg",1);
+     my $nopath_temp_file = $self->history_filename($dcount,$mcount,".msg",0);    
      
      # Get the class-file info without the path, since we'd just need to strip it
***************
*** 1100,1106 ****
  
      # Add the XPL header
-     my $nopath_temp_file = $temp_file;
-     $nopath_temp_file =~ s/.*\/([^\/]+)/$1/;
- 
      my $xpl = '';
  
--- 1101,1104 ----

[popfile-commit] engine/Classifier Bayes.pm,1.159,1.160

[<ssc...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv1781

Modified Files:
	Bayes.pm 
Log Message:
move file unlinking to unlink after new caching code when nosave is 1
add ability to retrieve file-names for dcount, mcount without appended path
retrieve path-less filename for class-files (class-file API handles paths)



Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** Bayes.pm	4 Jul 2003 03:55:00 -0000	1.159
--- Bayes.pm	6 Jul 2003 07:49:19 -0000	1.160
***************
*** 834,844 ****
  # $mcount   - the message count for this message
  # $ext      - the extension for this message (defaults to .msg)
  #
  # ---------------------------------------------------------------------------------------------
  sub history_filename
  {
!     my ( $self, $dcount, $mcount, $ext) = @_;
  
!     return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:'.msg');
  }
  
--- 834,847 ----
  # $mcount   - the message count for this message
  # $ext      - the extension for this message (defaults to .msg)
+ # $path     - 1 to return the path configuration info, 0 to return just the filename (default 0)
  #
  # ---------------------------------------------------------------------------------------------
  sub history_filename
  {
!     my ( $self, $dcount, $mcount, $ext, $path) = @_;
!     
!     $path = 0 if (!defined($path));
  
!     return ($path?$self->global_config_( 'msgdir' ):'') . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:'.msg');
  }
  
***************
*** 979,984 ****
      my $getting_headers = 1;
  
!     my $temp_file  = $self->history_filename($dcount,$mcount, ".msg");
!     my $class_file = $self->history_filename($dcount,$mcount, ".cls");
  
      open TEMP, ">$temp_file";
--- 982,989 ----
      my $getting_headers = 1;
  
!     my $temp_file  = $self->history_filename($dcount,$mcount, ".msg",1);
!     
!     # Get the class-file info without the path, since we'd just need to strip it
!     my $class_file = $self->history_filename($dcount,$mcount, ".cls",0);
  
      open TEMP, ">$temp_file";
***************
*** 1090,1097 ****
      $msg_head_before .= $eol;
  
-     if ( $nosave ) {
-         unlink( $temp_file );
-     }
- 
      # Add the XTC header
      $msg_head_after .= "X-Text-Classification: $classification$eol" if ( ( $self->global_config_( 'xtc' ) ) &&
--- 1095,1098 ----
***************
*** 1173,1178 ****
      }
  
      if ( !$nosave ) {
-         $class_file =~ s/^([^\/])*\///;
          $self->history_write_class($class_file, undef, $classification, undef, ($self->{magnet_used__}?$self->{magnet_detail__}:undef))
      }
--- 1174,1182 ----
      }
  
+     if ( $nosave ) {
+         unlink( $temp_file );
+     }
+ 
      if ( !$nosave ) {
          $self->history_write_class($class_file, undef, $classification, undef, ($self->{magnet_used__}?$self->{magnet_detail__}:undef))
      }

[popfile-commit] engine/UI HTML.pm,1.176,1.177

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv709

Modified Files:
	HTML.pm 
Log Message:
Fix problem with number of hash elements in magnet updates

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** HTML.pm	6 Jul 2003 01:08:33 -0000	1.176
--- HTML.pm	6 Jul 2003 01:18:38 -0000	1.177
***************
*** 1434,1440 ****
  
                  for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                     my %magnets = $self->{classifier__}->get_magnets( $bucket, $mtype );
  
!                     if ( defined( $magnets{$mtext} ) ) {
                          $found  = 1;
                          $magnet_message .= "<blockquote>\n<div class=\"error02\">\n<b>";
--- 1434,1441 ----
  
                  for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                     my %magnets;
!                     @magnets{ $self->{classifier__}->get_magnets( $bucket, $mtype )} = ();
  
!                     if ( exists( $magnets{$mtext} ) ) {
                          $found  = 1;
                          $magnet_message .= "<blockquote>\n<div class=\"error02\">\n<b>";
***************
*** 1447,1451 ****
                  if ( $found == 0 )  {
                      for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                         my %magnets = $self->{classifier__}->get_magnets( $bucket, $mtype );
  
                          for my $from (keys %magnets)  {
--- 1448,1453 ----
                  if ( $found == 0 )  {
                      for my $bucket ($self->{classifier__}->get_buckets_with_magnets()) {
!                         my %magnets;
!                         @magnets{ $self->{classifier__}->get_magnets( $bucket, $mtype )} = ();
  
                          for my $from (keys %magnets)  {

[popfile-commit] engine bayes.pl,1.17,1.18 pipe.pl,1.1,1.2

[<jgr...@us...>]

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv32323

Modified Files:
	bayes.pl pipe.pl 
Log Message:
Load user configuration

Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** bayes.pl	26 Jun 2003 17:48:22 -0000	1.17
--- bayes.pl	6 Jul 2003 01:11:47 -0000	1.18
***************
*** 42,45 ****
--- 42,48 ----
  
      $b->initialize();
+ 
+     $c->load_configuration();
+ 
      $b->start();
  

Index: pipe.pl
===================================================================
RCS file: /cvsroot/popfile/engine/pipe.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pipe.pl	26 Jun 2003 18:00:03 -0000	1.1
--- pipe.pl	6 Jul 2003 01:11:47 -0000	1.2
***************
*** 45,52 ****
      $c->logger( $l );
  
-     $l->initialize();
      $c->initialize();
      $b->initialize();
      $u->initialize();
  
      $b->start();
--- 45,54 ----
      $c->logger( $l );
  
      $c->initialize();
+     $l->initialize();
      $b->initialize();
      $u->initialize();
+ 
+     $c->load_configuration();
  
      $b->start();

[popfile-commit] engine/UI HTML.pm,1.175,1.176

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv31933

Modified Files:
	HTML.pm 
Log Message:
Preserve case for header: pseudowords in lookup function

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** HTML.pm	6 Jul 2003 01:02:09 -0000	1.175
--- HTML.pm	6 Jul 2003 01:08:33 -0000	1.176
***************
*** 2146,2150 ****
  
      if ( ( defined($self->{form_}{lookup}) ) || ( defined($self->{form_}{word}) ) ) {
!        my $word = $self->{classifier__}->{mangler__}->mangle($self->{form_}{word}, 1);
  
          $body .= "<blockquote>\n";
--- 2146,2154 ----
  
      if ( ( defined($self->{form_}{lookup}) ) || ( defined($self->{form_}{word}) ) ) {
!         my $word = $self->{form_}{word};
! 
!         if ( !( $word =~ /^header:/ ) ) {
!            $word = $self->{classifier__}->{mangler__}->mangle($word, 1);
!         }
  
          $body .= "<blockquote>\n";
***************
*** 2155,2159 ****
          $heading .= "<tr>\n<td>\n";
          $heading .= "<table summary=\"\">\n";
!         $heading .= "<caption><strong>$self->{language__}{Bucket_LookupMessage2} $self->{form_}{word}</strong><br /><br /></caption>";
          $heading .= "<tr>\n<th scope=\"col\">$self->{language__}{Bucket}</th>\n<th>&nbsp;</th>\n";
          $heading .= "<th scope=\"col\">$self->{language__}{Frequency}</th>\n<th>&nbsp;</th>\n";
--- 2159,2163 ----
          $heading .= "<tr>\n<td>\n";
          $heading .= "<table summary=\"\">\n";
!         $heading .= "<caption><strong>$self->{language__}{Bucket_LookupMessage2} $word</strong><br /><br /></caption>";
          $heading .= "<tr>\n<th scope=\"col\">$self->{language__}{Bucket}</th>\n<th>&nbsp;</th>\n";
          $heading .= "<th scope=\"col\">$self->{language__}{Frequency}</th>\n<th>&nbsp;</th>\n";
***************
*** 2209,2216 ****
              if ( $max_bucket ne '' ) {
                  $body .= "</table>\n<br /><br />";
!                 $body .= sprintf( $self->{language__}{Bucket_LookupMostLikely}, $self->{form_}{word}, $self->{classifier__}->get_bucket_color($max_bucket), $max_bucket);
                  $body .= "</td>\n</tr>\n</table>";
              } else {
!                 $body .= sprintf( $self->{language__}{Bucket_DoesNotAppear}, $self->{form_}{word} );
              }
          } else {
--- 2213,2220 ----
              if ( $max_bucket ne '' ) {
                  $body .= "</table>\n<br /><br />";
!                 $body .= sprintf( $self->{language__}{Bucket_LookupMostLikely}, $word, $self->{classifier__}->get_bucket_color($max_bucket), $max_bucket);
                  $body .= "</td>\n</tr>\n</table>";
              } else {
!                 $body .= sprintf( $self->{language__}{Bucket_DoesNotAppear}, $word );
              }
          } else {

[popfile-commit] engine/UI HTML.pm,1.174,1.175

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv31054

Modified Files:
	HTML.pm 
Log Message:
Fix bug where rename wouldn't work with numbers in the names

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** HTML.pm	29 Jun 2003 21:01:39 -0000	1.174
--- HTML.pm	6 Jul 2003 01:02:09 -0000	1.175
***************
*** 1841,1846 ****
      }
  
      if ( ( defined($self->{form_}{cname}) ) && ( $self->{form_}{cname} ne '' ) ) {
!         if ( $self->{form_}{cname} =~ /[^[:lower:]\-_0-9]/ )  {
              $create_message = "<blockquote><div class=\"error01\">$self->{language__}{Bucket_Error1}</div></blockquote>";
          } else {
--- 1841,1851 ----
      }
  
+     # This regular expression defines the characters that are NOT valid
+     # within a bucket name
+ 
+     my $invalid_bucket_chars = '[^[:lower:]\-_0-9]';
+ 
      if ( ( defined($self->{form_}{cname}) ) && ( $self->{form_}{cname} ne '' ) ) {
!         if ( $self->{form_}{cname} =~ /$invalid_bucket_chars/ )  {
              $create_message = "<blockquote><div class=\"error01\">$self->{language__}{Bucket_Error1}</div></blockquote>";
          } else {
***************
*** 1861,1865 ****
  
      if ( ( defined($self->{form_}{newname}) ) && ( $self->{form_}{oname} ne '' ) ) {
!         if ( $self->{form_}{newname} =~ /[^[:lower:]\-_]/ )  {
              $rename_message = "<blockquote><div class=\"error01\">$self->{language__}{Bucket_Error1}</div></blockquote>";
          } else {
--- 1866,1870 ----
  
      if ( ( defined($self->{form_}{newname}) ) && ( $self->{form_}{oname} ne '' ) ) {
!         if ( $self->{form_}{newname} =~ /$invalid_bucket_chars/ )  {
              $rename_message = "<blockquote><div class=\"error01\">$self->{language__}{Bucket_Error1}</div></blockquote>";
          } else {

[popfile-commit] windows ioB.ini,1.6,1.7 ioC.ini,1.5,1.6

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv3183

Modified Files:
	ioB.ini ioC.ini 
Log Message:
Adjust widths of the text fields to improve handling of foreign languages.

Index: ioB.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioB.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ioB.ini	2 Jul 2003 16:04:42 -0000	1.6
--- ioB.ini	5 Jul 2003 12:44:24 -0000	1.7
***************
*** 19,23 ****
  Text=
  Left=0
! Right=-1
  Top=0
  Bottom=20
--- 19,23 ----
  Text=
  Left=0
! Right=300
  Top=0
  Bottom=20
***************
*** 27,31 ****
  Text=
  Left=0
! Right=-1
  Top=20
  Bottom=40
--- 27,31 ----
  Text=
  Left=0
! Right=300
  Top=20
  Bottom=40
***************
*** 35,39 ****
  Text=
  Left=16
! Right=300
  Top=59
  Bottom=75
--- 35,39 ----
  Text=
  Left=16
! Right=95
  Top=59
  Bottom=75
***************
*** 43,47 ****
  Text=
  Left=16
! Right=300
  Top=75
  Bottom=91
--- 43,47 ----
  Text=
  Left=16
! Right=95
  Top=75
  Bottom=91
***************
*** 51,55 ****
  Text=
  Left=16
! Right=300
  Top=91
  Bottom=107
--- 51,55 ----
  Text=
  Left=16
! Right=95
  Top=91
  Bottom=107
***************
*** 59,63 ****
  Text=
  Left=0
! Right=-1
  Top=118
  Bottom=137
--- 59,63 ----
  Text=
  Left=0
! Right=300
  Top=118
  Bottom=137

Index: ioC.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioC.ini,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ioC.ini	2 Jul 2003 16:04:42 -0000	1.5
--- ioC.ini	5 Jul 2003 12:44:24 -0000	1.6
***************
*** 19,23 ****
  Text=
  Left=10
! Right=-10
  Top=0
  Bottom=60
--- 19,23 ----
  Text=
  Left=10
! Right=290
  Top=0
  Bottom=60
***************
*** 27,31 ****
  Text=
  Left=30
! Right=-30
  Top=12
  Bottom=22
--- 27,31 ----
  Text=
  Left=30
! Right=288
  Top=12
  Bottom=22
***************
*** 36,40 ****
  Text=
  Left=30
! Right=-30
  Top=27
  Bottom=37
--- 36,40 ----
  Text=
  Left=30
! Right=288
  Top=27
  Bottom=37
***************
*** 44,48 ****
  Text=
  Left=30
! Right=-30
  Top=42
  Bottom=52
--- 44,48 ----
  Text=
  Left=30
! Right=288
  Top=42
  Bottom=52
***************
*** 53,57 ****
  Text=
  Left=10
! Right=-10
  Top=75
  Bottom=135
--- 53,57 ----
  Text=
  Left=10
! Right=290
  Top=75
  Bottom=135
***************
*** 62,66 ****
  Text=
  Left=15
! Right=-15
  Top=85
  Bottom=130
--- 62,66 ----
  Text=
  Left=15
! Right=288
  Top=85
  Bottom=130

[popfile-commit] windows/languages Japanese-pfi.nsh,1.2,1.3 Korean-pfi.nsh,1.2,1.3 TradChinese-pfi.nsh,1.2,1.3

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv28333

Modified Files:
	Japanese-pfi.nsh Korean-pfi.nsh TradChinese-pfi.nsh 
Log Message:
Correct some minor typographic errors.

Index: Japanese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Japanese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Japanese-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
***************
*** 82,86 ****
  !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_ENDSEC    "Click Next to continue"
  !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..."
--- 82,85 ----

Index: Korean-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Korean-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- Korean-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
***************
*** 54,58 ****
  
  !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 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"
--- 54,58 ----
  
  !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"

Index: TradChinese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TradChinese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
--- TradChinese-pfi.nsh	4 Jul 2003 20:30:20 -0000	1.3
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"

[popfile-commit] windows CBP.nsh,1.9,1.10

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21681

Modified Files:
	CBP.nsh 
Log Message:
Adjusted field widths to make more room for the language texts.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CBP.nsh	2 Jul 2003 16:03:29 -0000	1.9
--- CBP.nsh	4 Jul 2003 19:47:19 -0000	1.10
***************
*** 702,716 ****
  
    !define CBP_INFO_LEFT_MARGIN      0
!   !define CBP_INFO_RIGHT_MARGIN   131
  
    ; Constants used to position the bucket names
  
    !define CBP_BN_NAME_LEFT        157
!   !define CBP_BN_NAME_RIGHT       -44
  
    ; Constants used to position the "Remove" boxes
  
!   !define CBP_BN_REMOVE_LEFT      255
!   !define CBP_BN_REMOVE_RIGHT     300
  
    ; Constants used to define the position of the 8 rows in the bucket list
--- 702,716 ----
  
    !define CBP_INFO_LEFT_MARGIN      0
!   !define CBP_INFO_RIGHT_MARGIN   141
  
    ; Constants used to position the bucket names
  
    !define CBP_BN_NAME_LEFT        157
!   !define CBP_BN_NAME_RIGHT       253
  
    ; Constants used to position the "Remove" boxes
  
!   !define CBP_BN_REMOVE_LEFT      253
!   !define CBP_BN_REMOVE_RIGHT     298
  
    ; Constants used to define the position of the 8 rows in the bucket list
***************
*** 824,828 ****
        "Label" \
        "$(PFI_LANG_CBP_IO_DELETE)" \
!       "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "110" "190"
  
    ; Label used to display progress reports
--- 824,828 ----
        "Label" \
        "$(PFI_LANG_CBP_IO_DELETE)" \
!       "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "110" "140"
  
    ; Label used to display progress reports
***************
*** 831,835 ****
        "Label" \
        " " \
!       "155" "-1" "132" "140"
  
    ; Box enclosing the list of bucket names defined so far
--- 831,835 ----
        "Label" \
        " " \
!       "155" "299" "132" "140"
  
    ; Box enclosing the list of bucket names defined so far

[popfile-commit] windows ioA.ini,1.12,1.13

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21418

Modified Files:
	ioA.ini 
Log Message:
Adjusted field widths to make more room for the language texts.

Index: ioA.ini
===================================================================
RCS file: /cvsroot/popfile/windows/ioA.ini,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ioA.ini	2 Jul 2003 16:04:42 -0000	1.12
--- ioA.ini	4 Jul 2003 19:44:38 -0000	1.13
***************
*** 17,21 ****
  Text=
  Left=0
! Right=-1
  Top=0
  Bottom=10
--- 17,21 ----
  Text=
  Left=0
! Right=300
  Top=0
  Bottom=10
***************
*** 33,37 ****
  Text=
  Left=0
! Right=-1
  Top=40
  Bottom=50
--- 33,37 ----
  Text=
  Left=0
! Right=300
  Top=40
  Bottom=50
***************
*** 49,53 ****
  Text=
  Left=0
! Right=-1
  Top=80
  Bottom=90
--- 49,53 ----
  Text=
  Left=0
! Right=300
  Top=80
  Bottom=90
***************
*** 57,61 ****
  Text=
  Left=0
! Right=-1
  Top=100
  Bottom=-5
--- 57,61 ----
  Text=
  Left=0
! Right=300
  Top=100
  Bottom=-5
***************
*** 64,69 ****
  Type=label
  Text=
! Left=7
! Right=-7
  Top=115
  Bottom=125
--- 64,69 ----
  Type=label
  Text=
! Left=6
! Right=298
  Top=115
  Bottom=125

[popfile-commit] windows/languages Bulgarian-pfi.nsh,1.1,1.2 Danish-pfi.nsh,1.1,1.2 Dutch-pfi.nsh,1.1,1.2 English-pfi.nsh,1.1,1.2 Finnish-pfi.nsh,1.1,1.2 French-pfi.nsh,1.1,1.2 German-pfi.nsh,1.1,1.2 Hungarian-pfi.nsh,1.1,1.2 Japanese-pfi.nsh,1.1,1.2 Korean-pfi.nsh,1.1,1.2 Portuguese-pfi.nsh,1.1,1.2 PortugueseBR-pfi.nsh,1.1,1.2 Russian-pfi.nsh,1.1,1.2 SimpChinese-pfi.nsh,1.1,1.2 Slovak-pfi.nsh,1.1,1.2 Spanish-pfi.nsh,1.1,1.2 Swedish-pfi.nsh,1.1,1.2 TradChinese-pfi.nsh,1.1,1.2 Ukrainian-pfi.nsh,1.1,1.2

[<xue...@us...>]

Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv21111

Modified Files:
	Bulgarian-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh 
	Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh 
	Hungarian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh 
	Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh 
	SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh 
	Swedish-pfi.nsh TradChinese-pfi.nsh Ukrainian-pfi.nsh 
Log Message:
Some texts shortened to reduce chances of text being truncated.

Index: Bulgarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Bulgarian-pfi.nsh	2 Jul 2003 12:41:28 -0000	1.1
--- Bulgarian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Danish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Danish-pfi.nsh	2 Jul 2003 12:26:48 -0000	1.1
--- Danish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Dutch-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dutch-pfi.nsh	2 Jul 2003 12:28:50 -0000	1.1
--- Dutch-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: English-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** English-pfi.nsh	1 Jul 2003 19:38:24 -0000	1.1
--- English-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Finnish-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Finnish-pfi.nsh	2 Jul 2003 12:29:45 -0000	1.1
--- Finnish-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: French-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** French-pfi.nsh	2 Jul 2003 12:30:46 -0000	1.1
--- French-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: German-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** German-pfi.nsh	2 Jul 2003 12:31:33 -0000	1.1
--- German-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Hungarian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Hungarian-pfi.nsh	2 Jul 2003 12:32:19 -0000	1.1
--- Hungarian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Japanese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Japanese-pfi.nsh	2 Jul 2003 12:33:16 -0000	1.1
--- Japanese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 115,119 ****
  
  !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 in the box below."
  !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"
--- 115,119 ----
  
  !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"
***************
*** 193,197 ****
  !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 POPFile '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."
--- 193,197 ----
  !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."

Index: Korean-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Korean-pfi.nsh	2 Jul 2003 12:34:17 -0000	1.1
--- Korean-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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 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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Portuguese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Portuguese-pfi.nsh	2 Jul 2003 12:34:59 -0000	1.1
--- Portuguese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: PortugueseBR-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortugueseBR-pfi.nsh	2 Jul 2003 12:35:34 -0000	1.1
--- PortugueseBR-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: Russian-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Russian-pfi.nsh	2 Jul 2003 12:45:53 -0000	1.1
--- Russian-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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 in the box below."
  !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"
--- 114,118 ----
  
  !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"
***************
*** 192,196 ****
  !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 POPFile '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."
--- 192,196 ----
  !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."

Index: SimpChinese-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpChinese-pfi.nsh	2 Jul 2003 12:39:00 -0000	1.1
--- SimpChinese-pfi.nsh	4 Jul 2003 19:43:57 -0000	1.2
***************
*** 54,61 ****
  
  !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 number for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP  "Run POPFile automatically when Windows starts (runs in background, no window seen)"
  !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 THE EXISTING VERSION"
  
  ; Message Boxes used when validating user's selections
--- 54,61 ----
  
  !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
***************
*** 114,118 ****
  
  !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, d...
 
[truncated message content]

[popfile-commit] engine/Classifier Bayes.pm,1.158,1.159

[<ssc...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv20295

Modified Files:
	Bayes.pm 
Log Message:
keep filename variable static across classify_and_modify

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** Bayes.pm	2 Jul 2003 09:50:14 -0000	1.158
--- Bayes.pm	4 Jul 2003 03:55:00 -0000	1.159
***************
*** 1099,1103 ****
  
      # Add the XPL header
!     $temp_file =~ s/.*\/([^\/]+)/$1/;
  
      my $xpl = '';
--- 1099,1104 ----
  
      # Add the XPL header
!     my $nopath_temp_file = $temp_file;
!     $nopath_temp_file =~ s/.*\/([^\/]+)/$1/;
  
      my $xpl = '';
***************
*** 1105,1109 ****
      $xpl .= "http://";
      $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' );
!     $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$temp_file$eol";
  
      if ( $self->global_config_( 'xpl' ) && ( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {
--- 1106,1110 ----
      $xpl .= "http://";
      $xpl .= $self->module_config_( 'html', 'local' )?"127.0.0.1":$self->config_( 'hostname' );
!     $xpl .= ":" . $self->module_config_( 'html', 'port' ) . "/jump_to_message?view=$nopath_temp_file$eol";
  
      if ( $self->global_config_( 'xpl' ) && ( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {
***************
*** 1136,1140 ****
                  print $client 'X-POPFile-Link: ' . $xpl if ( $self->global_config_( 'xpl' ) );
                  print $client "MIME-Version: 1.0$eol";
!                 print $client "Content-Type: multipart/report; boundary=\"$temp_file\"$eol$eol--$temp_file$eol";
                  print $client "Content-Type: text/plain$eol$eol";
                  print $client "POPFile has quarantined a message.  It is attached to this email.$eol$eol";
--- 1137,1141 ----
                  print $client 'X-POPFile-Link: ' . $xpl if ( $self->global_config_( 'xpl' ) );
                  print $client "MIME-Version: 1.0$eol";
!                 print $client "Content-Type: multipart/report; boundary=\"$nopath_temp_file\"$eol$eol--$nopath_temp_file$eol";
                  print $client "Content-Type: text/plain$eol$eol";
                  print $client "POPFile has quarantined a message.  It is attached to this email.$eol$eol";
***************
*** 1146,1150 ****
                  print $client "The first 20 words found in the email are:$eol$eol";
                  print $client $self->{parser__}->first20();
!                 print $client "$eol--$temp_file$eol";
                  print $client "Content-Type: message/rfc822$eol$eol";
              }
--- 1147,1151 ----
                  print $client "The first 20 words found in the email are:$eol$eol";
                  print $client $self->{parser__}->first20();
!                 print $client "$eol--$nopath_temp_file$eol";
                  print $client "Content-Type: message/rfc822$eol$eol";
              }