Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <xue...@us...> - 2003-08-08 00:14:36
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv6497
Modified Files:
pfi-library.nsh
Log Message:
Oops! New 'WaitUntilUnlocked' macro-based function was leaving something on the stack.
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pfi-library.nsh 6 Aug 2003 16:34:32 -0000 1.8
--- pfi-library.nsh 8 Aug 2003 00:14:31 -0000 1.9
***************
*** 927,931 ****
Pop ${L_TIMEOUT}
Pop ${L_FILE_HANDLE}
! Exch ${L_EXE}
!undef L_EXE
--- 927,931 ----
Pop ${L_TIMEOUT}
Pop ${L_FILE_HANDLE}
! Pop ${L_EXE}
!undef L_EXE
|
|
From: <xue...@us...> - 2003-08-07 11:22:42
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv18214
Modified Files:
installer.nsi
Log Message:
Replace hard-coded Registry and Start Menu entries by references to the MUI_PRODUCT define.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** installer.nsi 6 Aug 2003 21:45:41 -0000 1.101
--- installer.nsi 7 Aug 2003 11:22:38 -0000 1.102
***************
*** 96,100 ****
--- 96,102 ----
#--------------------------------------------------------------------------
+ ;--------------------------------------------------------------------------
; POPFile constants have been given names beginning with 'C_' (eg C_README)
+ ;--------------------------------------------------------------------------
!define MUI_PRODUCT "POPFile"
***************
*** 163,167 ****
VIProductVersion "0.20.0.0"
! VIAddVersionKey "ProductName" "POPFile"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
--- 165,169 ----
VIProductVersion "0.20.0.0"
! VIAddVersionKey "ProductName" "${MUI_PRODUCT}"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
***************
*** 280,284 ****
; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
! ; leaves more room for the TITLE and SUB-TITLE text.
!define MUI_UI_HEADERBITMAP_RIGHT "UI\pfi_headerbmpr.exe"
--- 282,286 ----
; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
! ; leaves more room for the TITLE and SUBTITLE text.
!define MUI_UI_HEADERBITMAP_RIGHT "UI\pfi_headerbmpr.exe"
***************
*** 357,361 ****
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
! !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\POPFile"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
--- 359,363 ----
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
! !define MUI_LANGDLL_REGISTRY_KEY "SOFTWARE\${MUI_PRODUCT}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
***************
*** 419,423 ****
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
! InstallDirRegKey HKLM SOFTWARE\POPFile InstallLocation
#--------------------------------------------------------------------------
--- 421,425 ----
InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
! InstallDirRegKey HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation
#--------------------------------------------------------------------------
***************
*** 520,524 ****
!insertmacro MUI_INSTALLOPTIONS_READ ${G_STARTUP} "ioA.ini" "Field 5" "State"
! WriteRegStr HKLM SOFTWARE\POPFile InstallLocation $INSTDIR
; Install the POPFile Core files
--- 522,526 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${G_STARTUP} "ioA.ini" "Field 5" "State"
! WriteRegStr HKLM "SOFTWARE\${MUI_PRODUCT}" InstallLocation $INSTDIR
; Install the POPFile Core files
***************
*** 717,742 ****
; ('SetOutPath' is one way to change the value of $OUTDIR)
! SetOutPath $SMPROGRAMS\POPFile
SetOutPath $INSTDIR
! CreateShortCut "$SMPROGRAMS\POPFile\Run POPFile.lnk" \
"$INSTDIR\perl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\POPFile\Run POPFile in background.lnk" \
"$INSTDIR\wperl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\POPFile\Uninstall POPFile.lnk" \
"$INSTDIR\uninstall.exe"
! SetOutPath $SMPROGRAMS\POPFile
! WriteINIStr "$SMPROGRAMS\POPFile\POPFile User Interface.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/"
! WriteINIStr "$SMPROGRAMS\POPFile\Shutdown POPFile.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/shutdown"
! WriteINIStr "$SMPROGRAMS\POPFile\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
! WriteINIStr "$SMPROGRAMS\POPFile\FAQ.url" \
"InternetShortcut" "URL" \
"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137"
! SetOutPath $SMPROGRAMS\POPFile\Support
! WriteINIStr "$SMPROGRAMS\POPFile\Support\POPFile Home Page.url" \
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
--- 719,744 ----
; ('SetOutPath' is one way to change the value of $OUTDIR)
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
SetOutPath $INSTDIR
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile.lnk" \
"$INSTDIR\perl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk" \
"$INSTDIR\wperl.exe" popfile.pl \
"$INSTDIR\Platform\POPFileIcon.dll"
! CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall POPFile.lnk" \
"$INSTDIR\uninstall.exe"
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\POPFile User Interface.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Shutdown POPFile.url" \
"InternetShortcut" "URL" "http://127.0.0.1:${G_GUI}/shutdown"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Manual.url" \
"InternetShortcut" "URL" "file://$INSTDIR/manual/en/manual.html"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\FAQ.url" \
"InternetShortcut" "URL" \
"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137"
! SetOutPath "$SMPROGRAMS\${MUI_PRODUCT}\Support"
! WriteINIStr "$SMPROGRAMS\${MUI_PRODUCT}\Support\POPFile Home Page.url" \
"InternetShortcut" "URL" "http://popfile.sourceforge.net/"
***************
*** 1728,1732 ****
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
goto wait_for_popfile
--- 1730,1734 ----
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile.lnk"
goto wait_for_popfile
***************
*** 1752,1756 ****
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
wait_for_popfile:
--- 1754,1758 ----
Push ${L_EXE}
Call WaitUntilUnlocked
! ExecShell "open" "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk"
wait_for_popfile:
***************
*** 2020,2030 ****
SetDetailsPrint listonly
! Delete $SMPROGRAMS\POPFile\Support\*.url
! RMDir $SMPROGRAMS\POPFile\Support
! Delete $SMPROGRAMS\POPFile\*.lnk
! Delete $SMPROGRAMS\POPFile\*.url
Delete "$SMSTARTUP\Run POPFile in background.lnk"
! RMDir $SMPROGRAMS\POPFile
SetDetailsPrint textonly
--- 2022,2032 ----
SetDetailsPrint listonly
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\Support\*.url"
! RMDir "$SMPROGRAMS\${MUI_PRODUCT}\Support"
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.lnk"
! Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.url"
Delete "$SMSTARTUP\Run POPFile in background.lnk"
! RMDir "$SMPROGRAMS\${MUI_PRODUCT}"
SetDetailsPrint textonly
***************
*** 2158,2162 ****
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"
! DeleteRegKey HKLM SOFTWARE\POPFile
; if $INSTDIR was removed, skip these next ones
--- 2160,2164 ----
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"
! DeleteRegKey HKLM "SOFTWARE\${MUI_PRODUCT}"
; if $INSTDIR was removed, skip these next ones
|
|
From: <xue...@us...> - 2003-08-06 21:45:44
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv29172
Modified Files:
installer.nsi
Log Message:
Updated to use customised UI and new header bitmap (to make more room for TITLE and SUBTITLE texts).
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** installer.nsi 6 Aug 2003 16:34:32 -0000 1.100
--- installer.nsi 6 Aug 2003 21:45:41 -0000 1.101
***************
*** 278,286 ****
;-----------------------------------------
; The "Special" bitmap appears on the "Welcome" and "Finish" pages,
; the "Header" bitmap appears on the other pages of the installer.
!define MUI_SPECIALBITMAP "special.bmp"
! !define MUI_HEADERBITMAP "hdr-right.bmp"
!define MUI_HEADERBITMAP_RIGHT
--- 278,292 ----
;-----------------------------------------
+ ; The 'hdr-common.bmp' icon is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
+ ; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
+ ; leaves more room for the TITLE and SUB-TITLE text.
+
+ !define MUI_UI_HEADERBITMAP_RIGHT "UI\pfi_headerbmpr.exe"
+
; The "Special" bitmap appears on the "Welcome" and "Finish" pages,
; the "Header" bitmap appears on the other pages of the installer.
!define MUI_SPECIALBITMAP "special.bmp"
! !define MUI_HEADERBITMAP "hdr-common.bmp"
!define MUI_HEADERBITMAP_RIGHT
|
|
From: <xue...@us...> - 2003-08-06 21:43:23
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv28798 Added Files: hdr-common.bmp Log Message: This 90 x 57 icon is smaller than the standard NSIS size (157 x 57) and allows more room for the TITLE and SUBTITLE text when used with a suitable UI. --- NEW FILE: hdr-common.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: <xue...@us...> - 2003-08-06 21:42:25
|
Update of /cvsroot/popfile/windows/UI In directory sc8-pr-cvs1:/tmp/cvs-serv28608 Added Files: pfi_headerbmpr.exe Log Message: Customised UI based upon v1.5 of NSIS 'modern_headerbmpr.exe' v1.5. Header bitmap width reduced, TITLE and SUBTITLE width increased. --- NEW FILE: pfi_headerbmpr.exe --- (This appears to be a binary file; contents omitted.) |
|
From: <xue...@us...> - 2003-08-06 21:41:50
|
Update of /cvsroot/popfile/windows/UI In directory sc8-pr-cvs1:/tmp/cvs-serv28452 Added Files: pfi_headerbmp.exe Log Message: Customised UI based upon v1.5 of NSIS 'modern_headerbmp.exe'. Header bitmap width reduced, TITLE and SUBTITLE width increased. --- NEW FILE: pfi_headerbmp.exe --- (This appears to be a binary file; contents omitted.) |
|
From: <xue...@us...> - 2003-08-06 21:40:37
|
Update of /cvsroot/popfile/windows/UI In directory sc8-pr-cvs1:/tmp/cvs-serv28221/UI Log Message: Directory /cvsroot/popfile/windows/UI added to the repository |
|
From: <xue...@us...> - 2003-08-06 16:34:35
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv29651
Modified Files:
installer.nsi pfi-library.nsh
Log Message:
Handle message history in the same way as corpus data. Simple 'sleep' delays replaced by more intelligent file monitoring when shutting down POPFile.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** installer.nsi 3 Aug 2003 00:47:21 -0000 1.99
--- installer.nsi 6 Aug 2003 16:34:32 -0000 1.100
***************
*** 109,127 ****
!define C_RELEASE_NOTES "..\engine\${C_README}"
! ;-----------------------------------------
! ; Root directory for the Perl files used to build the installer
! ;-----------------------------------------
!define C_PERL_DIR "C:\Perl"
-
- ;-----------------------------------------
- ; Delay (in milliseconds) used after issuing a POPFile 'shutdown' request
- ;-----------------------------------------
-
- !define C_SHUTDOWN_DELAY 1500
! ;-----------------------------------------
; Define PFI_VERBOSE to get more compiler output
! ;-----------------------------------------
# !define PFI_VERBOSE
--- 109,145 ----
!define C_RELEASE_NOTES "..\engine\${C_README}"
! ;----------------------------------------------------------------------
! ; Root directory for the Perl files (used when building the installer)
! ;----------------------------------------------------------------------
!define C_PERL_DIR "C:\Perl"
! ;--------------------------------------------------------------------------------
! ; Constants for the timeout loop used after issuing a POPFile 'shutdown' request
! ;--------------------------------------------------------------------------------
!
! ; Timeout loop counter start value (counts down to 0)
!
! !define C_SHUTDOWN_LIMIT 10
!
! ; Delay (in milliseconds) used inside the timeout loop
!
! !define C_SHUTDOWN_DELAY 500
!
! ;-------------------------------------------------------------------------------
! ; Constants for the timeout loop used after issuing a POPFile 'startup' request
! ;-------------------------------------------------------------------------------
!
! ; Timeout loop counter start value (counts down to 0)
!
! !define C_STARTUP_LIMIT 10
!
! ; Delay (in milliseconds) used inside the timeout loop
!
! !define C_STARTUP_DELAY 500
!
! ;------------------------------------------------
; Define PFI_VERBOSE to get more compiler output
! ;------------------------------------------------
# !define PFI_VERBOSE
***************
*** 321,332 ****
; Same "Language selection" dialog is used for the installer and the uninstaller
; so we override the standard "Installer Language" title to avoid confusion.
!
!define MUI_TEXT_LANGDLL_WINDOWTITLE "Language Selection"
!
; Always show the language selection dialog, even if a language has been stored in the
; registry (the language stored in the registry will be selected as the default language)
!define MUI_LANGDLL_ALWAYSSHOW
!
; Remember user's language selection and offer this as the default when re-installing
; (uninstaller also uses this setting to determine which language is to be used)
--- 339,350 ----
; Same "Language selection" dialog is used for the installer and the uninstaller
; so we override the standard "Installer Language" title to avoid confusion.
!
!define MUI_TEXT_LANGDLL_WINDOWTITLE "Language Selection"
!
; Always show the language selection dialog, even if a language has been stored in the
; registry (the language stored in the registry will be selected as the default language)
!define MUI_LANGDLL_ALWAYSSHOW
!
; Remember user's language selection and offer this as the default when re-installing
; (uninstaller also uses this setting to determine which language is to be used)
***************
*** 878,909 ****
!define L_CFG $R9 ; file handle
! !define L_NEW_GUI $R8
! !define L_OLD_GUI $R7
! !define L_RESULT $R6
Push ${L_CFG}
Push ${L_NEW_GUI}
Push ${L_OLD_GUI}
Push ${L_RESULT}
- ; A quick test ignoring fact that popfile.cfg may specify a non-default location for PID file
-
- IfFileExists "$INSTDIR\popfile.pid" attempt_shutdown
-
; If we are about to overwrite an existing version which is still running,
; then one of the EXE files will be 'locked' which means we have to shutdown POPFile
! IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
! SetFileAttributes "$INSTDIR\wperl.exe" NORMAL
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\wperl.exe" a
FileClose ${L_CFG}
IfErrors attempt_shutdown
other_perl:
! IfFileExists "$INSTDIR\perl.exe" 0 exit_now
! SetFileAttributes "$INSTDIR\perl.exe" NORMAL
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\perl.exe" a
FileClose ${L_CFG}
IfErrors 0 exit_now
--- 896,927 ----
!define L_CFG $R9 ; file handle
! !define L_EXE $R8 ; name of EXE file to be monitored
! !define L_NEW_GUI $R7
! !define L_OLD_GUI $R6
! !define L_RESULT $R5
Push ${L_CFG}
+ Push ${L_EXE}
Push ${L_NEW_GUI}
Push ${L_OLD_GUI}
Push ${L_RESULT}
; If we are about to overwrite an existing version which is still running,
; then one of the EXE files will be 'locked' which means we have to shutdown POPFile
! StrCpy ${L_EXE} "$INSTDIR\wperl.exe"
! IfFileExists "${L_EXE}" 0 other_perl
! SetFileAttributes "${L_EXE}" NORMAL
ClearErrors
! FileOpen ${L_CFG} "${L_EXE}" a
FileClose ${L_CFG}
IfErrors attempt_shutdown
other_perl:
! StrCpy ${L_EXE} "$INSTDIR\perl.exe"
! IfFileExists "${L_EXE}" 0 exit_now
! SetFileAttributes "${L_EXE}" NORMAL
ClearErrors
! FileOpen ${L_CFG} "${L_EXE}" a
FileClose ${L_CFG}
IfErrors 0 exit_now
***************
*** 920,926 ****
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
- Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT}
! StrCmp ${L_RESULT} "success" exit_now
try_other_port:
--- 938,943 ----
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
! StrCmp ${L_RESULT} "success" check_exe
try_other_port:
***************
*** 928,945 ****
Call StrCheckDecimal
Pop ${L_NEW_GUI}
! StrCmp ${L_NEW_GUI} "" exit_now
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
- Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT} ; Ignore the result
exit_now:
Pop ${L_RESULT}
Pop ${L_OLD_GUI}
Pop ${L_NEW_GUI}
Pop ${L_CFG}
!undef L_CFG
!undef L_NEW_GUI
!undef L_OLD_GUI
--- 945,967 ----
Call StrCheckDecimal
Pop ${L_NEW_GUI}
! StrCmp ${L_NEW_GUI} "" check_exe
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
+ check_exe:
+ Push ${L_EXE}
+ Call WaitUntilUnlocked
+
exit_now:
Pop ${L_RESULT}
Pop ${L_OLD_GUI}
Pop ${L_NEW_GUI}
+ Pop ${L_EXE}
Pop ${L_CFG}
!undef L_CFG
+ !undef L_EXE
!undef L_NEW_GUI
!undef L_OLD_GUI
***************
*** 1019,1023 ****
StrCpy ${L_CMPRE} ${L_LNE} 8
StrCmp ${L_CMPRE} "ui_port " got_ui_port
!
StrCmp ${L_STRIPLANG} "" transfer
--- 1041,1045 ----
StrCpy ${L_CMPRE} ${L_LNE} 8
StrCmp ${L_CMPRE} "ui_port " got_ui_port
!
StrCmp ${L_STRIPLANG} "" transfer
***************
*** 1178,1184 ****
; Ensure custom page shows the "Shutdown" warning message box.
!
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "NumFields" "7"
!
IfFileExists "$INSTDIR\popfile.pl" 0 continue
--- 1200,1206 ----
; Ensure custom page shows the "Shutdown" warning message box.
!
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "NumFields" "7"
!
IfFileExists "$INSTDIR\popfile.pl" 0 continue
***************
*** 1602,1606 ****
!insertmacro PFI_IO_TEXT "ioC.ini" "3" "$(PFI_LANG_LAUNCH_IO_DOSBOX)"
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
!
!insertmacro PFI_IO_TEXT "ioC.ini" "6" "$(PFI_LANG_LAUNCH_IO_NOTE_1)"
!insertmacro PFI_IO_TEXT "ioC.ini" "7" "$(PFI_LANG_LAUNCH_IO_NOTE_2)"
--- 1624,1628 ----
!insertmacro PFI_IO_TEXT "ioC.ini" "3" "$(PFI_LANG_LAUNCH_IO_DOSBOX)"
!insertmacro PFI_IO_TEXT "ioC.ini" "4" "$(PFI_LANG_LAUNCH_IO_BCKGRND)"
!
!insertmacro PFI_IO_TEXT "ioC.ini" "6" "$(PFI_LANG_LAUNCH_IO_NOTE_1)"
!insertmacro PFI_IO_TEXT "ioC.ini" "7" "$(PFI_LANG_LAUNCH_IO_NOTE_2)"
***************
*** 1636,1643 ****
Function CheckLaunchOptions
! !define L_RESULT $R9
! !define L_TEMP $R8
! Push ${L_RESULT}
Push ${L_TEMP}
--- 1658,1667 ----
Function CheckLaunchOptions
! !define L_CFG $R9 ; file handle
! !define L_EXE $R8 ; full path of perl EXE to be monitored
! !define L_TEMP $R7
! Push ${L_CFG}
! Push ${L_EXE}
Push ${L_TEMP}
***************
*** 1650,1653 ****
--- 1674,1685 ----
StrCmp ${L_TEMP} "" exit_without_banner
StrCmp ${L_TEMP} "no" exit_without_banner
+ StrCmp ${L_TEMP} "background" background_to_no
+ StrCpy ${L_EXE} "$INSTDIR\perl.exe"
+ Goto lastaction_no
+
+ background_to_no:
+ StrCpy ${L_EXE} "$INSTDIR\wperl.exe"
+
+ lastaction_no:
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "no"
***************
*** 1655,1664 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
! goto exit_without_banner
run_popfile:
; Field 4 = 'Run POPFile in background' radio button
--- 1687,1701 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_TEMP} ; Get the return value (and ignore it)
! Push ${L_EXE}
! Call WaitUntilUnlocked
! Goto exit_without_banner
run_popfile:
+ ; Set ${L_EXE} to "" as we do not yet know if we are going to monitor a file in $INSTDIR
+
+ StrCpy ${L_EXE} ""
+
; Field 4 = 'Run POPFile in background' radio button
***************
*** 1670,1673 ****
--- 1707,1714 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Run Status" "LastAction"
StrCmp ${L_TEMP} "DOS-box" exit_without_banner
+ StrCmp ${L_TEMP} "no" lastaction_DOS_box
+ StrCpy ${L_EXE} "$INSTDIR\wperl.exe"
+
+ lastaction_DOS_box:
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "DOS-box"
***************
*** 1678,1684 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
!
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
goto wait_for_popfile
--- 1719,1725 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_TEMP} ; Get the return value (and ignore it)
! Push ${L_EXE}
! Call WaitUntilUnlocked
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
goto wait_for_popfile
***************
*** 1690,1693 ****
--- 1731,1738 ----
!insertmacro MUI_INSTALLOPTIONS_READ ${L_TEMP} "ioC.ini" "Run Status" "LastAction"
StrCmp ${L_TEMP} "background" exit_without_banner
+ StrCmp ${L_TEMP} "no" lastaction_background
+ StrCpy ${L_EXE} "$INSTDIR\perl.exe"
+
+ lastaction_background:
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Run Status" "LastAction" "background"
***************
*** 1698,1704 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
!
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
--- 1743,1749 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Pop ${L_TEMP} ; Get the return value (and ignore it)
! Push ${L_EXE}
! Call WaitUntilUnlocked
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
***************
*** 1707,1717 ****
; Wait until POPFile is ready to display the UI (may take a second or so)
! StrCpy ${L_TEMP} 10 ; Timeout limit to avoid an infinite loop
check_if_ready:
NSISdl::download_quiet http://127.0.0.1:${G_GUI} "$PLUGINSDIR\ui.htm"
! Pop ${L_RESULT} ; Did POPFile return an HTML page?
! StrCmp ${L_RESULT} "success" remove_banner
! Sleep 500 ; milliseconds
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
--- 1752,1762 ----
; Wait until POPFile is ready to display the UI (may take a second or so)
! StrCpy ${L_TEMP} ${C_STARTUP_LIMIT} ; Timeout limit to avoid an infinite loop
check_if_ready:
NSISdl::download_quiet http://127.0.0.1:${G_GUI} "$PLUGINSDIR\ui.htm"
! Pop ${L_TEMP} ; Did POPFile return an HTML page?
! StrCmp ${L_TEMP} "success" remove_banner
! Sleep ${C_STARTUP_DELAY}
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
***************
*** 1723,1729 ****
Pop ${L_TEMP}
! Pop ${L_RESULT}
! !undef L_RESULT
!undef L_TEMP
--- 1768,1776 ----
Pop ${L_TEMP}
! Pop ${L_EXE}
! Pop ${L_CFG}
! !undef L_CFG
! !undef L_EXE
!undef L_TEMP
***************
*** 1828,1833 ****
!define L_UPGRADE $R3 ; "yes" if this is an upgrade, "no" if we are just uninstalling
!define L_CORPUS $R2 ; holds full path to the POPFile corpus data
! !define L_SUBFOLDER $R1 ; "yes" if corpus is in a subfolder of $INSTDIR, otherwise "no"
!define L_OLDUI $R0 ; holds old-style UI port (if previous POPFile is an old version)
; When a normal uninstall is performed, the uninstaller is copied to a uniquely named
--- 1875,1883 ----
!define L_UPGRADE $R3 ; "yes" if this is an upgrade, "no" if we are just uninstalling
!define L_CORPUS $R2 ; holds full path to the POPFile corpus data
! !define L_SUBCORPUS $R1 ; "yes" if corpus is in a subfolder of $INSTDIR, otherwise "no"
!define L_OLDUI $R0 ; holds old-style UI port (if previous POPFile is an old version)
+ !define L_HISTORY $9 ; holds full path to the message history data
+ !define L_SUBHISTORY $8 ; "yes" if history data in subfolder of $INSTDIR, otherwise "no"
+ !define L_EXE $7 ; full path of the EXE to be monitored
; When a normal uninstall is performed, the uninstaller is copied to a uniquely named
***************
*** 1855,1859 ****
skip_confirmation:
! StrCpy ${L_SUBFOLDER} "yes"
Push $INSTDIR
--- 1905,1909 ----
skip_confirmation:
! StrCpy ${L_SUBCORPUS} "yes"
Push $INSTDIR
***************
*** 1864,1869 ****
Call un.StrStr
Pop ${L_TEMP}
StrCmp ${L_TEMP} "" 0 check_if_running
! StrCpy ${L_SUBFOLDER} "no"
check_if_running:
--- 1914,1932 ----
Call un.StrStr
Pop ${L_TEMP}
+ StrCmp ${L_TEMP} "" 0 check_msg_folder
+ StrCpy ${L_SUBCORPUS} "no"
+
+ check_msg_folder:
+ StrCpy ${L_SUBHISTORY} "yes"
+
+ Push $INSTDIR
+ Call un.GetHistoryPath
+ Pop ${L_HISTORY}
+ Push ${L_HISTORY}
+ Push $INSTDIR
+ Call un.StrStr
+ Pop ${L_TEMP}
StrCmp ${L_TEMP} "" 0 check_if_running
! StrCpy ${L_SUBHISTORY} "no"
check_if_running:
***************
*** 1873,1894 ****
SetDetailsPrint listonly
- ; A quick test ignoring fact that popfile.cfg may specify a non-default location for PID file
-
- IfFileExists "$INSTDIR\popfile.pid" attempt_shutdown
-
; If the POPFile we are to uninstall is still running, one of the EXE files will be 'locked'
! IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
! SetFileAttributes "$INSTDIR\wperl.exe" NORMAL
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\wperl.exe" a
FileClose ${L_CFG}
IfErrors attempt_shutdown
other_perl:
! IfFileExists "$INSTDIR\perl.exe" 0 remove_shortcuts
! SetFileAttributes "$INSTDIR\perl.exe" NORMAL
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\perl.exe" a
FileClose ${L_CFG}
IfErrors 0 remove_shortcuts
--- 1936,1955 ----
SetDetailsPrint listonly
; If the POPFile we are to uninstall is still running, one of the EXE files will be 'locked'
! StrCpy ${L_EXE} "$INSTDIR\wperl.exe"
! IfFileExists "${L_EXE}" 0 other_perl
! SetFileAttributes "${L_EXE}" NORMAL
ClearErrors
! FileOpen ${L_CFG} "${L_EXE}" a
FileClose ${L_CFG}
IfErrors attempt_shutdown
other_perl:
! StrCpy ${L_EXE} "$INSTDIR\perl.exe"
! IfFileExists "${L_EXE}" 0 remove_shortcuts
! SetFileAttributes "${L_EXE}" NORMAL
ClearErrors
! FileOpen ${L_CFG} "${L_EXE}" a
FileClose ${L_CFG}
IfErrors 0 remove_shortcuts
***************
*** 1897,1903 ****
StrCpy ${G_GUI} ""
StrCpy ${L_OLDUI} ""
!
ClearErrors
! FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
loop:
--- 1958,1964 ----
StrCpy ${G_GUI} ""
StrCpy ${L_OLDUI} ""
!
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\popfile.cfg" r
loop:
***************
*** 1907,1911 ****
StrCpy ${L_TEMP} ${L_LNE} 10
StrCmp ${L_TEMP} "html_port " got_html_port
!
StrCpy ${L_TEMP} ${L_LNE} 8
StrCmp ${L_TEMP} "ui_port " got_ui_port
--- 1968,1972 ----
StrCpy ${L_TEMP} ${L_LNE} 10
StrCmp ${L_TEMP} "html_port " got_html_port
!
StrCpy ${L_TEMP} ${L_LNE} 8
StrCmp ${L_TEMP} "ui_port " got_ui_port
***************
*** 1919,1926 ****
StrCpy ${L_OLDUI} ${L_LNE} 5 8
Goto loop
!
ui_port_done:
FileClose ${L_CFG}
!
StrCmp ${G_GUI} "" use_other_port
Push ${G_GUI}
--- 1980,1987 ----
StrCpy ${L_OLDUI} ${L_LNE} 5 8
Goto loop
!
ui_port_done:
FileClose ${L_CFG}
!
StrCmp ${G_GUI} "" use_other_port
Push ${G_GUI}
***************
*** 1932,1938 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep ${C_SHUTDOWN_DELAY}
! Goto remove_shortcuts
!
use_other_port:
Push ${L_OLDUI}
--- 1993,1998 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Goto check_shutdown
!
use_other_port:
Push ${L_OLDUI}
***************
*** 1944,1951 ****
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
- Sleep ${C_SHUTDOWN_DELAY}
! remove_shortcuts:
SetDetailsPrint textonly
DetailPrint "$(un.PFI_LANG_PROGRESS_2)"
--- 2004,2013 ----
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! check_shutdown:
! Push ${L_EXE}
! Call un.WaitUntilUnlocked
+ remove_shortcuts:
SetDetailsPrint textonly
DetailPrint "$(un.PFI_LANG_PROGRESS_2)"
***************
*** 2066,2070 ****
StrCmp ${L_UPGRADE} "yes" remove_perl
! !insertmacro SafeRecursiveRMDir "$INSTDIR\messages"
remove_perl:
--- 2128,2132 ----
StrCmp ${L_UPGRADE} "yes" remove_perl
! RMDir /r "${L_HISTORY}"
remove_perl:
***************
*** 2115,2120 ****
!undef L_UPGRADE
!undef L_CORPUS
! !undef L_SUBFOLDER
!undef L_OLDUI
SectionEnd
--- 2177,2185 ----
!undef L_UPGRADE
!undef L_CORPUS
! !undef L_SUBCORPUS
!undef L_OLDUI
+ !undef L_HISTORY
+ !undef L_SUBHISTORY
+ !undef L_EXE
SectionEnd
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pfi-library.nsh 1 Aug 2003 00:29:12 -0000 1.7
--- pfi-library.nsh 6 Aug 2003 16:34:32 -0000 1.8
***************
*** 97,101 ****
#--------------------------------------------------------------------------
#
! # Macro used by the uninstaller (guards against unexpectedly removing the corpus)
#
#--------------------------------------------------------------------------
--- 97,102 ----
#--------------------------------------------------------------------------
#
! # Macro used by the uninstaller
! # (guards against unexpectedly removing the corpus or message history)
#
#--------------------------------------------------------------------------
***************
*** 103,118 ****
!macro SafeRecursiveRMDir PATH
! ; if corpus is not in a subfolder, no precautions are needed
!
! StrCmp ${L_SUBFOLDER} "no" +6
Push ${L_CORPUS}
Push "${PATH}"
Call un.StrStr
! POP ${L_TEMP}
!
! ; if we are about to remove the path containing the corpus, skip the command
! StrCmp ${L_TEMP} "" 0 +2
RMDir /r "${PATH}"
!macroend
--- 104,127 ----
!macro SafeRecursiveRMDir PATH
! StrCmp ${L_SUBCORPUS} "no" +6 ; if "no" then goto pseudo-label A
Push ${L_CORPUS}
Push "${PATH}"
Call un.StrStr
! Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 +8 ; if not "" then goto pseudo-label C
! ; pseudo-label A
! StrCmp ${L_SUBHISTORY} "no" +6 ; if "no" then goto pseudo-label B
! Push ${L_HISTORY}
! Push "${PATH}"
! Call un.StrStr
! Pop ${L_TEMP}
! StrCmp ${L_TEMP} "" 0 +2 ; if not "" then goto pseudo-label C
!
! ; pseudo-label B
RMDir /r "${PATH}"
+
+ ; pseudo-label C
+
!macroend
***************
*** 212,219 ****
#
# This function is used by the uninstaller when uninstalling a previous version of POPFile.
! # It uses the 'corpus' parameter in 'popfile.cfg' file to determine the full path of the
! # directory where the corpus files are stored. By default POPFile stores the corpus in the
! # '$INSTDIR\corpus' directory but the 'popfile.cfg' file can define a different location, using
! # a variety of paths (eg relative, absolute, local or even remote).
#
# If 'popfile.cfg' is found in the specified folder, we use the corpus parameter (if present)
--- 221,228 ----
#
# This function is used by the uninstaller when uninstalling a previous version of POPFile.
! # It uses 'popfile.cfg' file to determine the full path of the directory where the corpus files
! # are stored. By default POPFile stores the corpus in the '$INSTDIR\corpus' directory but the
! # 'popfile.cfg' file can define a different location, using a variety of paths (eg relative,
! # absolute, local or even remote).
#
# If 'popfile.cfg' is found in the specified folder, we use the corpus parameter (if present)
***************
*** 242,246 ****
!define L_TEMP $R5
! Exch ${L_SOURCE} ; where we are supposed to look for the corpus data
Push ${L_RESULT}
Exch
--- 251,255 ----
!define L_TEMP $R5
! Exch ${L_SOURCE} ; where we are supposed to look for the 'popfile.cfg' file
Push ${L_RESULT}
Exch
***************
*** 305,308 ****
--- 314,424 ----
#--------------------------------------------------------------------------
+ # Function: un.GetHistoryPath
+ #
+ # This function is used by the uninstaller when uninstalling a previous version of POPFile.
+ # It uses 'popfile.cfg' file to determine the full path of the directory where the message
+ # history files are stored. By default POPFile stores these files in the '$INSTDIR\messages'
+ # directory but the 'popfile.cfg' file can define a different location, using a variety of
+ # paths (eg relative, absolute, local or even remote).
+ #
+ # If 'popfile.cfg' is found in the specified folder, we use the history parameter (if present)
+ # otherwise we assume the default location is to be used (the sub-folder called 'messages').
+ #
+ # Note that the path specified in 'popfile.cfg' uses a trailing slash (which we do not return)
+ #
+ # Inputs:
+ # (top of stack) - the path where 'popfile.cfg' is to be found
+ #
+ # Outputs:
+ # (top of stack) - string containing full (unambiguous) path to message history
+ #
+ # Usage Example:
+ # Push $INSTDIR
+ # Call un.GetHistoryPath
+ # Pop $R0
+ #
+ # ($R0 will be "C:\Program Files\POPFile\messages" if POPFile is installed in default
+ # location and if the history parameter in 'popfile.cfg' is set to 'messages/')
+ #--------------------------------------------------------------------------
+
+ Function un.GetHistoryPath
+
+ !define L_FILE_HANDLE $R9
+ !define L_HISTORY $R8
+ !define L_RESULT $R7
+ !define L_SOURCE $R6
+ !define L_TEMP $R5
+
+ Exch ${L_SOURCE} ; where we are supposed to look for the 'popfile.cfg' file
+ Push ${L_RESULT}
+ Exch
+ Push ${L_HISTORY}
+ Push ${L_FILE_HANDLE}
+ Push ${L_TEMP}
+
+ StrCpy ${L_HISTORY} ""
+
+ IfFileExists "${L_SOURCE}\popfile.cfg" 0 use_default_locn
+ ClearErrors
+ FileOpen ${L_FILE_HANDLE} "${L_SOURCE}\popfile.cfg" r
+
+ loop:
+ FileRead ${L_FILE_HANDLE} ${L_TEMP}
+ IfErrors cfg_file_done
+ StrCpy ${L_RESULT} ${L_TEMP} 7
+ StrCmp ${L_RESULT} "msgdir " got_old_msgdir
+ StrCpy ${L_RESULT} ${L_TEMP} 14
+ StrCmp ${L_RESULT} "GLOBAL_msgdir " got_new_msgdir
+ Goto loop
+
+ got_old_msgdir:
+ StrCpy ${L_HISTORY} ${L_TEMP} "" 7
+ Goto loop
+
+ got_new_msgdir:
+ StrCpy ${L_HISTORY} ${L_TEMP} "" 14
+ Goto loop
+
+ cfg_file_done:
+ FileClose ${L_FILE_HANDLE}
+ Push ${L_HISTORY}
+ Call un.TrimNewlines
+ Pop ${L_HISTORY}
+ StrCmp ${L_HISTORY} "" use_default_locn use_cfg_data
+
+ use_default_locn:
+ StrCpy ${L_RESULT} "${L_SOURCE}\messages"
+ Goto got_result
+
+ use_cfg_data:
+ StrCpy ${L_TEMP} ${L_HISTORY} 1 -1
+ StrCmp ${L_TEMP} "/" strip_slash no_trailing_slash
+ StrCmp ${L_TEMP} "\" 0 no_trailing_slash
+
+ strip_slash:
+ StrCpy ${L_HISTORY} ${L_HISTORY} -1
+
+ no_trailing_slash:
+ Push ${L_SOURCE}
+ Push ${L_HISTORY}
+ Call un.GetDataPath
+ Pop ${L_RESULT}
+
+ got_result:
+ Pop ${L_TEMP}
+ Pop ${L_FILE_HANDLE}
+ Pop ${L_HISTORY}
+ Pop ${L_SOURCE}
+ Exch ${L_RESULT} ; place full path of 'messages' directory on top of the stack
+
+ !undef L_FILE_HANDLE
+ !undef L_HISTORY
+ !undef L_RESULT
+ !undef L_SOURCE
+ !undef L_TEMP
+
+ FunctionEnd
+
+ #--------------------------------------------------------------------------
# Function: un.GetDataPath
#
***************
*** 311,315 ****
# 'C:\Program Files\POPFile' and 'corpus' into 'C:\Program Files\POPFile\corpus'.
#
! # It is assumed that the 'base directory' is in standard Windows format.
#
# The 'data folder' may be supplied in a variety of different formats, for example:
--- 427,431 ----
# 'C:\Program Files\POPFile' and 'corpus' into 'C:\Program Files\POPFile\corpus'.
#
! # It is assumed that the 'base directory' is in standard Windows format with no trailing slash.
#
# The 'data folder' may be supplied in a variety of different formats, for example:
***************
*** 362,365 ****
--- 478,482 ----
slashconversion:
+ StrCmp ${L_DATA} "." source_folder
Push ${L_DATA}
Call un.StrBackSlash ; ensure parameter uses backslashes
***************
*** 384,387 ****
--- 501,508 ----
Goto got_path
+ source_folder:
+ StrCpy ${L_DATA} ${L_BASEDIR}
+ Goto got_path
+
sub_folder:
StrCpy ${L_DATA} ${L_DATA} "" 2
***************
*** 538,542 ****
# (top of stack) - string starting with the match, if any
#
! # Usage:
# Push "this is a long string"
# Push "long"
--- 659,664 ----
# (top of stack) - string starting with the match, if any
#
! # Usage (after macro has been 'inserted'):
! #
# Push "this is a long string"
# Push "long"
***************
*** 618,622 ****
# (top of stack) - the input string (if valid) or "" (if invalid)
#
! # Usage:
# Push "12345"
# Call un.StrCheckDecimal
--- 740,745 ----
# (top of stack) - the input string (if valid) or "" (if invalid)
#
! # Usage (after macro has been 'inserted'):
! #
# Push "12345"
# Call un.StrCheckDecimal
***************
*** 707,711 ****
# (top of stack) - the input string with the trailing newlines (if any) removed
#
! # Usage:
# Push "whatever$\r$\n"
# Call un.TrimNewlines
--- 830,835 ----
# (top of stack) - the input string with the trailing newlines (if any) removed
#
! # Usage (after macro has been 'inserted'):
! #
# Push "whatever$\r$\n"
# Call un.TrimNewlines
***************
*** 753,756 ****
--- 877,953 ----
!insertmacro TrimNewlines "un."
+
+
+ #--------------------------------------------------------------------------
+ # Macro: WaitUntilUnlocked
+ #
+ # The installation process and the uninstall process both use a function which checks if
+ # either '$INSTDIR\wperl.exe' or $INSTDIR\perl.exe' is being used. It may take a little
+ # while for POPFile to shutdown so the installer/uninstaller calls this function which
+ # waits in a loop until the specified EXE file is no longer in use. A timeout counter
+ # is used to avoid an infinite loop.
+ #
+ # Inputs:
+ # (top of stack) - the full path of the EXE file to be checked
+ #
+ # Outputs:
+ # (none)
+ #
+ # Usage (after macro has been 'inserted'):
+ #
+ # Push "$INSTDIR\wperl.exe"
+ # Call WaitUntilUnlocked
+ #
+ #--------------------------------------------------------------------------
+
+ !macro WaitUntilUnlocked UN
+ Function ${UN}WaitUntilUnlocked
+ !define L_EXE $R9 ; full path to the EXE file which is to be monitored
+ !define L_FILE_HANDLE $R8
+ !define L_TIMEOUT $R7 ; used to avoid an infinite loop
+
+ Exch ${L_EXE}
+ Push ${L_FILE_HANDLE}
+ Push ${L_TIMEOUT}
+
+ IfFileExists "${L_EXE}" 0 exit_now
+ SetFileAttributes "${L_EXE}" NORMAL
+ StrCpy ${L_TIMEOUT} ${C_SHUTDOWN_LIMIT}
+
+ check_if_unlocked:
+ Sleep ${C_SHUTDOWN_DELAY}
+ ClearErrors
+ FileOpen ${L_FILE_HANDLE} "${L_EXE}" a
+ FileClose ${L_FILE_HANDLE}
+ IfErrors 0 exit_now
+ IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1
+ IntCmp ${L_TIMEOUT} 0 exit_now exit_now check_if_unlocked
+
+ exit_now:
+ Pop ${L_TIMEOUT}
+ Pop ${L_FILE_HANDLE}
+ Exch ${L_EXE}
+
+ !undef L_EXE
+ !undef L_FILE_HANDLE
+ !undef L_TIMEOUT
+ FunctionEnd
+ !macroend
+
+ #--------------------------------------------------------------------------
+ # Installer Function: WaitUntilUnlocked
+ #
+ # This function is used during the installation process
+ #--------------------------------------------------------------------------
+
+ !insertmacro WaitUntilUnlocked ""
+
+ #--------------------------------------------------------------------------
+ # Uninstaller Function: un.WaitUntilUnlocked
+ #
+ # This function is used during the uninstall process
+ #--------------------------------------------------------------------------
+
+ !insertmacro WaitUntilUnlocked "un."
#--------------------------------------------------------------------------
|
|
From: <xue...@us...> - 2003-08-06 14:08:41
|
Update of /cvsroot/popfile/windows/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv27450
Modified Files:
Korean-mui.nsh Korean-pfi.nsh
Log Message:
Translations provided by Joonyup Jeon (flyingfish)
Index: Korean-mui.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Korean-mui.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Korean-mui.nsh 1 Aug 2003 00:30:29 -0000 1.4
--- Korean-mui.nsh 6 Aug 2003 14:08:37 -0000 1.5
***************
*** 40,52 ****
#--------------------------------------------------------------------------
! ; POPFile translation not available - use default NSIS message
!
! ;!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! ;"This wizard will guide you through the installation of POPFile.\r\n\r\n\It is recommended that you close all other applications before starting Setup.\r\n\r\n"
!
! ; Default NSIS message:
!
! ;!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! ;"ÀÌ ¸¶¹ý»ç´Â ´ç½ÅÀÇ ÄÄÇ»ÅÍ¿¡ POPFile(À»)¸¦ ¼³Ä¡ÇÒ °ÍÀÔ´Ï´Ù.\r\n\r\n¼³Ä¡¸¦ ½ÃÀÛÇϱâ Àü¿¡ ¸ðµç ÇÁ·Î±×·¥À» Á¾·áÇØÁֽñ⠹ٶø´Ï´Ù. ÇÁ·Î±×·¥À» Á¾·áÇÏ°Ô µÇ¸é ½Ã½ºÅÛÀ» ÀçºÎÆà ÇÏÁö ¾Ê°í¼µµ ƯÁ¤ÇÑ ½Ã½ºÅÛ ÆÄÀÏÀ» ¼öÁ¤ÇÒ ¼ö Àֱ⠶§¹®ÀÔ´Ï´Ù.\r\n\r\n"
#--------------------------------------------------------------------------
--- 40,45 ----
#--------------------------------------------------------------------------
! !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT \
! "ÀÌ ¸¶¹ý»ç´Â ±ÍÇÏÀÇ ÄÄÇ»ÅÍ¿¡ POPFile(ÆËÆÄÀÏ)À» ¼³Ä¡ÇÒ °ÍÀÔ´Ï´Ù.\r\n\r\n¼³Ä¡¸¦ ½ÃÀÛÇϱâ Àü¿¡ ¸ðµç ÇÁ·Î±×·¥À» Á¾·á½Ãų °ÍÀ» ±ÇÀåÇÕ´Ï´Ù.\r\n\r\n"
#--------------------------------------------------------------------------
***************
*** 57,61 ****
!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
! "POPFile User Interface"
#--------------------------------------------------------------------------
--- 50,54 ----
!insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN \
! "ÆËÆÄÀÏ »ç¿ëÀÚ È¸é"
#--------------------------------------------------------------------------
Index: Korean-pfi.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Korean-pfi.nsh 1 Aug 2003 00:33:27 -0000 1.9
--- Korean-pfi.nsh 6 Aug 2003 14:08:37 -0000 1.10
***************
*** 59,64 ****
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)"
#--------------------------------------------------------------------------
--- 59,64 ----
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "POPFile(ÆËÆÄÀÏ) ¸±¸®Áî ³ëÆ®¸¦ Ç¥½ÃÇÒ±î¿ä?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "POPFileÀ» ¾÷±×·¹À̵åÇϽô °ÍÀ̶ó¸é '¿¹' ¸¦ ±ÇÀåÇÕ´Ï´Ù. (¼³Ä¡ Àü¿¡ POPFile Æú´õ¸¦ ¹é¾÷ÇÏ¼Å¾ß ÇÒ ¼öµµ ÀÖ½À´Ï´Ù.)"
#--------------------------------------------------------------------------
***************
*** 66,72 ****
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl."
! !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface."
! !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI."
#--------------------------------------------------------------------------
--- 66,72 ----
#--------------------------------------------------------------------------
! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "POPFile¿¡ ÇÊ¿äÇÑ ÇÙ½É ÆÄÀÏ(PerlÀÇ ÃÖ¼Ò¼³Ä¡ ¹öÀü Æ÷ÇÔ)À» ¼³Ä¡ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING DESC_SecSkins "»ç¿ëÀÚ ÀÎÅÍÆäÀ̽º ȸéÀÇ ¸ð¾çÀ» ¹Ù²Ü ¼ö ÀÖ´Â POPFile ½ºÅ²À» ¼³Ä¡ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING DESC_SecLangs "POPFile »ç¿ëÀÚȸéÀÇ ´Ù±¹¾î ¹öÀüÀ» ¼³Ä¡ÇÕ´Ï´Ù."
#--------------------------------------------------------------------------
***************
*** 76,111 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts (runs in background)"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN EXISTING VERSION"
; Message Boxes used when validating user's selections
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Please change your POP3 port selection."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "The 'User Interface' port cannot be set to"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "The port must be a number in the range 1 to 65535."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Please change your 'User Interface' port selection."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections."
; Banner message displayed whilst uninstalling old version
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..."
#--------------------------------------------------------------------------
--- 76,111 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile(ÆËÆÄÀÏ) ¼³Ä¡ ¿É¼Ç"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "±»ÀÌ ¹Ù²Ù¼Å¾ß ÇÏÁö ¾ÊÀ¸¸é ¹Ù²ÙÁö ¸¶½Ê½Ã¿À."
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "POP3 ¿¬°áÀ» À§ÇÑ µðÆúÆ® Æ÷Æ® ¹øÈ£¸¦ ¼±ÅÃÇϽʽÿÀ(110À» ±ÇÀåÇÕ´Ï´Ù)."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "'»ç¿ëÀÚ È¸é' ¿¬°áÀ» À§ÇÑ µðÆúÆ® Æ÷Æ® ¹øÈ£¸¦ ¼±ÅÃÇϽʽÿÀ(8080À» ±ÇÀåÇÕ´Ï´Ù)."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "À©µµ¿ì ½ÃÀ۽ÿ¡ ÀÚµ¿À¸·Î POPFileÀ» ½ÇÇàÇÕ´Ï´Ù(¹é±×¶ó¿îµå·Î ½ÇÇà)."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "°æ°í"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "POPFileÀ» ¾÷±×·¹À̵åÇϽô °ÍÀ̶ó¸é ÀνºÅç·¯´Â ÇöÀç ¹öÀüÀ» Á¾·á½Ãų °ÍÀÔ´Ï´Ù."
; Message Boxes used when validating user's selections
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "ÀÌÀü ¹öÀüÀÇ POPFile(ÆËÆÄÀÏ)ÀÌ ¼³Ä¡µÈ °ÍÀÌ °¨ÁöµÇ¾ú½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "¾ðÀνºÅç ÇϽðڽÀ´Ï±î?"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'¿¹' °¡ ±ÇÀåµË´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "POP3 Æ÷Æ®°¡ ¼³Á¤µÉ ¼ö ¾ø½À´Ï´Ù - Æ÷Æ®:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "Æ÷Æ®´Â 1¿¡¼ 65535 ±îÁöÀÇ ¼ýÀÚ¿©¾ß¸¸ ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "POP3 Æ÷Æ® ¼±ÅÃÀ» º¯°æÇϽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "'»ç¿ëÀÚ È¸é' Æ÷Æ®°¡ ¼³Á¤µÉ ¼ö ¾ø½À´Ï´Ù - Æ÷Æ®:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "Æ÷Æ®´Â 1¿¡¼ 65535 ±îÁöÀÇ ¼ýÀÚ¿©¾ß¸¸ ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "'»ç¿ëÀÚ È¸é' Æ÷Æ® ¼±ÅÃÀ» º¯°æÇϽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "POP3 Æ÷Æ®´Â '»ç¿ëÀÚ È¸é' Æ÷Æ®¿Í ¹Ýµå½Ã ´Þ¶ó¾ß ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Æ÷Æ® ¼±ÅÃÀ» º¯°æÇϽʽÿÀ."
; Banner message displayed whilst uninstalling old version
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "ÀÌÀü ¹öÀü Á¦°Å Áß"
! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "¸îÃÊ Á¤µµ °É¸± ¼ö ÀÖ½À´Ï´Ù..."
#--------------------------------------------------------------------------
***************
*** 115,141 ****
; Installation Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Click Next to continue"
; Installation Log Messages
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Shutting down previous version of POPFile using port"
; Message Box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "file from previous installation found."
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "OK to update this file ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Click 'Yes' to update it (old file will be saved as"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Click 'No' to keep the old file (new file will saved as"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup copy of"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "already exists"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "OK to overwrite this file?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Click 'Yes' to overwrite, click 'No' to skip making a backup copy"
#--------------------------------------------------------------------------
--- 115,141 ----
; Installation Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "¾÷±×·¹ÀÌµå ¼³Ä¡ÀÎÁö È®ÀÎ Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "POPFile ÇÙ½É ÆÄÀÏÀ» ¼³Ä¡ Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Perl ÃÖ¼Ò ¼³Ä¡ Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "POPFile ¹Ù·Î°¡±â »ý¼º Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "POPFile ½ºÅ² ÆÄÀÏ ¼³Ä¡ Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "POPFile UI ¾ð¾î ÆÄÀÏ ¼³Ä¡ Áß..."
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "°è¼Ó ÁøÇàÇϱâ À§ÇØ '´ÙÀ½'À» ´©¸£½Ê½Ã¿À."
; Installation Log Messages
! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "ÀÌÀü ¹öÀüÀÇ POPFileÀ» Á¾·á Áß - Æ÷Æ®:"
; Message Box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "ÀÌÀü ¼³Ä¡¿¡ ÀÇÇÑ ÆÄÀÏ ¹ß°ß."
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "ÀÌ ÆÄÀÏÀ» ¾÷µ¥ÀÌÆ® ÇϽðڽÀ´Ï±î?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "'¿¹'¸¦ ´©¸£¸é ¾÷µ¥ÀÌÆ®ÇÕ´Ï´Ù. (ÀÌÀü ÆÄÀÏÀº ´ÙÀ½À¸·Î ÀúÀåµÉ °ÍÀÔ´Ï´Ù:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "'¾Æ´Ï¿À'¸¦ ´©¸£¸é ÀÌÀü ÆÄÀÏÀ» º¸Á¸ÇÕ´Ï´Ù. (»õ ÆÄÀÏÀº ´ÙÀ½À¸·Î ÀúÀåµÉ °ÍÀÔ´Ï´Ù:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "¹é¾÷:"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "ÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "ÀÌ ÆÄÀÏÀ» µ¤¾î ¾²½Ã°Ú½À´Ï±î?"
! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "'¿¹'¸¦ ´©¸£½Ã¸é µ¤¾î ¾¹´Ï´Ù. '¾Æ´Ï¿À'¸¦ ´©¸£½Ã¸é ¹é¾÷À» ¸¸µéÁö ¾Ê½À´Ï´Ù."
#--------------------------------------------------------------------------
***************
*** 145,195 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email"
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Remove"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continue"
; Text strings used for status messages under the bucket list
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets"
; Message box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "A bucket called"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "has already been defined."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Please choose a different name for the new bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "The installer can only create up to"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "buckets."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Once POPFile has been installed you can create more than"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "The name"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "is not a valid name for a bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Bucket names can only contain the letters a to z in lower case, numbers 0 to 9, plus - and _"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Please choose a different name for the new bucket."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,$\r$\n$\r$\neither by picking a suggested name from the drop-down list$\r$\n$\r$\nor by typing in a name of your own choice."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "buckets have been defined for use by POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Do you want to configure POPFile to use these buckets?"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Click 'No' if you wish to change your bucket selections."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "The installer was unable to create"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "of the"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "buckets you selected."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Once POPFile has been installed you can use its 'User Interface'$\r$\n$\r$\ncontrol panel to create the missing bucket(s)."
#--------------------------------------------------------------------------
--- 145,195 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile ºÐ·ù ¹öŶ »ý¼º"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFileÀº ¸ÞÀÏ ºÐ·ù¸¦ À§ÇØ ÃÖ¼ÒÇÑ 2°³ÀÇ ¹öŶÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù."
; Text strings displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "ÇÊ¿ä¿¡ µû¶ó, ¼³Ä¡ ÈÄ¿¡µµ ¹öŶ °¹¼ö¿Í À̸§À» ½±°Ô ¹Ù²Ù½Ç ¼ö ÀÖ½À´Ï´Ù.\r\n\r\n¹öŶ À̸§Àº ¹Ýµå½Ã ¿µ¾î ¼Ò¹®ÀÚ¿Í ¼ýÀÚ, ÇÏÀÌÇ°ú ¾ð´õ½ºÄÚ¾î(_)¸¸À¸·Î ÀÌ·ç¾îÁø ÇÑ ´Ü¾î¿©¾ß ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "¹öŶÀ» »ý¼ºÇϽʽÿÀ. µå¶ø ´Ù¿î ¸Þ´º¿¡¼ Á¦°øµÈ °ÍÀ» ¼±ÅÃÇϽðųª ¿øÇϽô À̸§À» Á÷Á¢ Ä¡½Ê½Ã¿À."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "¸ñ·Ï¿¡ ÀÖ´Â ¹öŶÀ» »èÁ¦ÇϽ÷Á¸é 'Á¦°Å' üũ¹Ú½º¿¡ üũǥ½Ã ÇϽðí '°è¼Ó' ¹öÆ°À» Ŭ¸¯ÇϽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "POPFileÀÌ »ç¿ëÇÒ ¹öŶ"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Á¦°Å"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "°è¼Ó"
; Text strings used for status messages under the bucket list
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "¹öŶÀ» ´õ Ãß°¡ÇÒ ÇÊ¿ä´Â ¾ø½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "ÃÖ¼ÒÇÑ 2°³ÀÇ ¹öŶÀ» Á¤ÀÇÇØ¾ß ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "¹öŶÀÌ ÃÖ¼ÒÇÑ 1°³ ´õ ÇÊ¿äÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "ÀνºÅç·¯´Â "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "°³ ÀÌ»óÀÇ ¹öŶÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
; Message box text strings
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 " "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "À̶ó´Â ¹öŶÀÌ ÀÌ¹Ì Á¤ÀǵǾú½À´Ï´Ù. "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "»õ ¹öŶ¿¡ ´Ù¸¥ À̸§À» ÁֽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "ÀνºÅç·¯´Â ÃÖ´ë "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "°³ÀÇ ¹öŶÀ» »ý¼ºÇÒ ¼ö ÀÖ½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "POPFileÀÌ ¼³Ä¡µÈ ÈÄ¿¡ ´õ ¸¹Àº ¹öŶÀ» »ý¼ºÇÒ ¼ö ÀÖ½À´Ï´Ù"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 " "
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "Àº(´Â) À¯È¿ÇÑ ¹öŶ À̸§ÀÌ ¾Æ´Õ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "¹öŶ À̸§Àº ¹Ýµå½Ã ¿µ¾î¼Ò¹®ÀÚ¿Í ¼ýÀÚ, ±×¸®°í - ¿Í _ ¸¸À¸·Î ÀÌ·ç¾îÁø ÇÑ ´Ü¾î¿©¾ß ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "ÀÌ ¹öŶ¿¡ ´Ù¸¥ À̸§À» ÁöÁ¤ÇØ ÁֽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFileÀÌ ¸ÞÀÏ ºÐ·ù¸¦ Çϱâ À§Çؼ´Â ÃÖ¼ÒÇÑ 2°³ÀÇ ¹öŶÀÌ ÇÊ¿äÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "»ý¼ºÇÒ ¹öŶ À̸§À» ÀÔ·ÂÇϽʽÿÀ-$\r$\n$\r$\nµå¶ø ´Ù¿î ¸Þ´º¿¡¼ Á¦°øµÈ °ÍÀ» ¼±ÅÃÇϽðųª$\r$\n$\r$\n¿øÇϽô À̸§À» Á÷Á¢ Ä¡½Ê½Ã¿À."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "¼³Ä¡°¡ °è¼Ó µÇ·Á¸é ÃÖ¼ÒÇÑ 2°³ÀÇ ¹öŶÀ» Á¤ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "°³ÀÇ POPFileÀÌ »ç¿ëÇÒ ¹öŶÀÌ Á¤ÀǵǾú½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "POPFileÀÌ ÀÌ ¹öŶÀ» »ç¿ëÇϵµ·Ï ¼³Á¤ÇϽðڽÀ´Ï±î?"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "¹öŶ ¼±ÅÃÀ» º¯°æÇÏ·Á¸é '¾Æ´Ï¿À'¸¦ Ŭ¸¯ÇϽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "ÀνºÅç·¯´Â ´ÙÀ½ ¹öŶÀ» »ý¼ºÇÒ ¼ö ¾ø¾ú½À´Ï´Ù:"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "Áß"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "ÀÇ ¼±ÅÃÇϽŠ¹öŶ"
! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "POPFileÀÌ ¼³Ä¡µÈ ÈÄ '»ç¿ëÀÚ È¸é'À» ÀÌ¿ëÇÏ¿© ¹öŶÀ» Ãß°¡ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù.$\r$\n$\r$\n"
#--------------------------------------------------------------------------
***************
*** 199,216 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigure Outlook Express"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile can reconfigure Outlook Express for you"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigure this account to work with POPFile"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email address:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 server:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 username:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "account for the"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identity"
#--------------------------------------------------------------------------
--- 199,216 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "¾Æ¿ô·è ÀͽºÇÁ·¹½º ¼³Á¤À» º¯°æÇϽʽÿÀ."
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFileÀº ¾Æ¿ô·è ÀͽºÇÁ·¹½º ¼³Á¤À» º¯°æÇص帱 ¼ö ÀÖ½À´Ï´Ù."
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "´ÙÀ½°ú °°Àº ¾Æ¿ô·è ÀͽºÇÁ·¹½º ¸ÞÀÏ °èÁ¤ÀÌ ¹ß°ßµÇ¾ú½À´Ï´Ù. POPFile°ú ¿¬µ¿µÇµµ·Ï ÀÚµ¿À¸·Î ¼³Á¤À» º¯°æÇÒ ¼ö ÀÖ½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "ÀÌ °èÁ¤À» POPFile°ú ¿¬µ¿µÇµµ·Ï ¼³Á¤ º¯°æÇÔ"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "ÀüÀÚ ¸ÞÀÏ ÁÖ¼Ò:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "¹Þ´Â ¸ÞÀÏ(POP3) ¼¹ö:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "°èÁ¤ À̸§:"
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "POPFileÀ» ¾ðÀνºÅç ÇÏ½Ã¸é ¿ø·¡ ¼³Á¤ÀÌ º¹¿øµÉ °ÍÀÔ´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "°èÁ¤ ("
! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 ")"
#--------------------------------------------------------------------------
***************
*** 220,240 ****
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started"
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface."
; Banner message displayed whilst waiting for POPFile to start
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile."
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..."
#--------------------------------------------------------------------------
--- 220,240 ----
; Page Title and Sub-title displayed in the page header
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "ÀÌÁ¦ POPFileÀ» ½ÃÀÛÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "POPFile »ç¿ëÀÚ È¸éÀº POPFileÀÌ ½ÃÀÛµÈ ÈÄ¿¡ »ç¿ë°¡´ÉÇÕ´Ï´Ù."
; Text displayed on the custom page
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "POPFileÀ» Áö±Ý ½ÃÀÛÇÒ±î¿ä?"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "¾Æ´Ï¿À ('»ç¿ëÀÚ È¸é'Àº POPFileÀÌ ½ÃÀÛµÇÁö ¾ÊÀ¸¸é »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù.)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "POPFile ½ÃÀÛ (â¿¡¼)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "POPFileÀ» ¹é±×¶ó¿îµå¿¡¼ ½ÃÀÛ (âÀÌ ³ªÅ¸³ªÁö ¾Ê½À´Ï´Ù)"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "POPFile ½ÃÀÛµÇ°í ³ª¸é '»ç¿ëÀÚ È¸é'À» Ç¥½ÃÇÒ ¼ö ÀÖ½À´Ï´Ù."
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 " (a) ½Ã½ºÅÛ Æ®·¹ÀÌÀÇ POPFile ¾ÆÀÌÄÜÀ» Ŭ¸¯ÇϽðųª,"
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 " (b) ½ÃÀÛ --> ÇÁ·Î±×·¥(P) --> POPFile --> POPFile User Interface ¸¦ ¼±ÅÃÇϽʽÿÀ."
; Banner message displayed whilst waiting for POPFile to start
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "POPFileÀ» ½Ãµ¿ Áغñ Áß."
! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "¸îÃÊ Á¤µµ °É¸± ¼ö ÀÖ½À´Ï´Ù..."
#--------------------------------------------------------------------------
***************
*** 244,274 ****
; Uninstall Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Shutting down POPFile..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Deleting 'Start Menu' entries for POPFile..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Deleting POPFile core files..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Restoring Outlook Express settings..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Deleting POPFile skins files..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Deleting minimal Perl files..."
; Uninstall Log Messages
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Shutting down POPFile using port"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Opened"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Restored"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Closed"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Removing all files from POPFile directory"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Note: unable to remove all files from POPFile directory"
; Message Box text strings
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continue anyway (not recommended) ?"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Uninstall aborted by user"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?$\r$\n$\r$\n(If you have anything you created that you want to keep, click No)"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Note"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "could not be removed."
#--------------------------------------------------------------------------
--- 244,274 ----
; Uninstall Progress Reports displayed above the progress bar
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "POPFile Á¾·á Áß..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "'½ÃÀÛ' ¸Þ´º Áß POPFile Ç׸ñÀ» »èÁ¦ Áß..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "POPFile ÇÙ½É ÆÄÀÏÀ» »èÁ¦ Áß..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "¾Æ¿ô·è ÀͽºÇÁ·¹½º ¼³Á¤À» º¹¿ø Áß..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "POPFile ½ºÅ² ÆÄÀÏ »èÁ¦ Áß..."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Perl ÃÖ¼Ò ¼³Ä¡ ÆÄÀÏ »èÁ¦ Áß..."
; Uninstall Log Messages
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "POPFileÀ» Á¾·á Áß - Æ÷Æ®:"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "¿¸²"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "º¹¿øµÊ"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "´ÝÈû"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "POPFile µð·ºÅ丮ÀÇ ¸ðµç ÆÄÀÏÀ» Á¦°Å Áß."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Âü°í: POPFile µð·ºÅ丮·ÎºÎÅÍ ¸ðµç ÆÄÀÏÀ» Á¦°ÅÇÒ ¼ö ¾ø½À´Ï´Ù."
; Message Box text strings
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "POPFileÀÌ µð·ºÅ丮¿¡ ¼³Ä¡µÇÁö ¾ÊÀº °Í °°½À´Ï´Ù."
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "±×·¡µµ °è¼ÓÇϽðڽÀ´Ï±î?(±ÇÀåÇÏÁö ¾ÊÀ½)"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "»ç¿ëÀÚ¿¡ ÀÇÇØ ¾ðÀνºÅçÀÌ Ãë¼ÒµÊ"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "POPFile µð·ºÅ丮ÀÇ ¸ðµç ÆÄÀÏÀ» Á¦°ÅÇϽðڽÀ´Ï±î?$\r$\n$\r$\n(Á÷Á¢ »ý¼ºÇϽŠÆÄÀÏÀÌ ÀÖ°í, º¸Á¸ÇÏ°í ½ÍÀ¸½Ã¸é '¾Æ´Ï¿À'¸¦ Ŭ¸¯ÇϽʽÿÀ"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Âü°í"
! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "´Â Á¦°ÅµÉ ¼ö ¾ø¾ú½À´Ï´Ù."
#--------------------------------------------------------------------------
|
|
From: <jgr...@us...> - 2003-08-06 14:01:16
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv26037 Modified Files: Suomi.msg Log Message: Updated Suomi with copyright/GPL notice Index: Suomi.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Suomi.msg,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Suomi.msg 11 Jun 2003 14:45:14 -0000 1.8 --- Suomi.msg 6 Aug 2003 14:01:13 -0000 1.9 *************** *** 1,4 **** ! MIME-Version: 1.0 ! # Identify the language and character set used for the interface --- 1,20 ---- ! # Copyright (c) 2001-2003 John Graham-Cumming ! # ! # This file is part of POPFile ! # ! # POPFile is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # POPFile is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with POPFile; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! # # Identify the language and character set used for the interface |
|
From: <xue...@us...> - 2003-08-06 00:27:31
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv1216 Modified Files: Spanish-pfi.nsh Log Message: Spelling corrections and other improvements. Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Spanish-pfi.nsh 5 Aug 2003 14:32:08 -0000 1.9 --- Spanish-pfi.nsh 6 Aug 2003 00:27:28 -0000 1.10 *************** *** 59,64 **** #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "¿ Mostrar Notas sobre esta versión de POPFile ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Si' recomendado si está actualizando POPFile (puede que necesite hacer una copia de seguridad ANTES DE actualizar)" #-------------------------------------------------------------------------- --- 59,64 ---- #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "¿Desea ver las Notas sobre esta versión de POPFile?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Si' recomendado si está actualizando POPFile (puede que $\r$\nnecesite hacer una copia de seguridad ANTES DE actualizar)" #-------------------------------------------------------------------------- *************** *** 68,72 **** !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Instalar los archivos esenciales de POPFile, incluyendo una versión mínima de Perl." !insertmacro PFI_LANG_STRING DESC_SecSkins "Instalar skins de POPFile que le permitirán cambiar el aspecto del interface de usuario de POPFile." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Instalar versiones de lenguaje no-Inglesas del UI de POPFile." #-------------------------------------------------------------------------- --- 68,72 ---- !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Instalar los archivos esenciales de POPFile, incluyendo una versión mínima de Perl." !insertmacro PFI_LANG_STRING DESC_SecSkins "Instalar skins de POPFile que le permitirán cambiar el aspecto del interface de usuario de POPFile." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Instalar versiones de idiomas no-Ingleses para el IU de POPFile." #-------------------------------------------------------------------------- *************** *** 85,89 **** !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Cargar automaticamente POPFile en cada inicio de Windows (funciona en 2º plano)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "ADVERTENCIA IMPORTANTE" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "SI ESTA ACUTUALIZANDO POPFILE --- EL INSTALADOR CERRARA LA VERSION EXISTENTE" ; Message Boxes used when validating user's selections --- 85,89 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Cargar automaticamente POPFile en cada inicio de Windows (funciona en 2º plano)" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "ADVERTENCIA IMPORTANTE" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "SI ESTÁ ACTUALIZANDO POPFILE --- EL INSTALADOR CERRARÁ LA VERSION EXISTENTE" ; Message Boxes used when validating user's selections *************** *** 94,105 **** !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "No se puede usar este puerto POP3" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "El puerto debe ser un numero entre 1 y 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Cambie por favor su elección del puerto POP3." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "No se puede usar el puerto del 'Interface de Usuario'" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "El puerto debe ser un numero entre 1 y 65535" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Cambie por favor su elección de puerto para 'Interface de Usuario'." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "Los puertos para POP3 e 'Interface de Usuario' tiene que ser diferentes." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Cambie por favor su elección de puertos." --- 94,105 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "No se puede usar este puerto POP3" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "El puerto debe ser un número entre 1 y 65535." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Cambie por favor su elección del puerto POP3." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "No se puede usar el puerto del 'Interface de Usuario'" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "El puerto debe ser un número entre 1 y 65535" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Cambie por favor su elección de puerto para 'Interface de Usuario'." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "Los puertos para POP3 e 'Interface de Usuario' tiene que ser diferentes." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Cambie por favor su elección de puertos." *************** *** 125,136 **** ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Cerrando version anterior de POPFile usando puerto" ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "hallado archivo de una instalación anterior." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "¿OK para actualizarlo?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Clic 'Si' para actualizarlo (el anterior se guardara como" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Clic 'No' para seguir con el anterior (el nuevo se guardara como" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Copia de seguridad de" --- 125,136 ---- ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Cerrando versión anterior de POPFile usando puerto" ; Message Box text strings !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "hallado archivo de una instalación anterior." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "¿Desea actualizarlo?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Clic 'Si' para actualizarlo (el anterior se guardará como" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Clic 'No' para seguir con el anterior (el nuevo se guardará como" !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Copia de seguridad de" *************** *** 145,157 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "Creación de Categorias de Clasificación de POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile necesita AL MENOS DOS categorias para poder clasificar en ellas su correo" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "Tras la instalacion, es facil cambiar el numero de categorias (y sus nombres) para acomodarlo a sus necesidades.\r\n\r\nLos nombres de las Categorias deben ser palabras unicas, con minusculas, numeros del 0 al 9, guiones y subrayado." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Cree una nueva categoria seleccionando un nombre de la lista inferior o tecleando un nombre de su eleccion." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "Para borrar una o mas categorias de la lista, marque la correspondiente casilla(s) 'Borrar' y pinche en el boton 'Continuar'." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Categorias a usar por POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Borrar" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continuar" --- 145,157 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "Creación de las Categorías para Clasificación de POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile necesita AL MENOS DOS categorías para poder clasificar en ellas su correo" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "Tras la instalacion, es facil cambiar el numero de categorías (y sus nombres) para acomodarlo a sus necesidades.\r\n\r\nLos nombres de las Categorías deben ser palabras unicas, con minusculas, números del 0 al 9, guiones y subrayado." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Cree una nueva categoría seleccionando un nombre de la lista inferior o tecleando un nombre de su eleccion." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "Para borrar una o mas categorías de la lista, marque la correspondiente casilla(s) 'Borrar' y pinche en el boton 'Continuar'." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Categorías a usar por POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Borrar" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continuar" *************** *** 159,195 **** ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "No es necesario añadir mas categorias" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "Debe definir AL MENOS DOS categirias" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "Como minimo se necesita una categoia mas" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "El instalador no puede crear mas de" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "categorias" ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "Una categoria de nombre" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "ya se ha definido." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Elija por favor otro nombre para la nueva categoria." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "El instalador solo puede crear hasta" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "categorias." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Una vez que haya instalado POPFile, puede crear mas de" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "El nombre" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "no es valido como nombre para una categoria." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Elija por favor un nombre diferente para la nueva catgegoria." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile necesita AL MENOS DOS categorias antes de poder clasificar su correo en ellas." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Por favor ponga nombre a la categoria a crear,$\r$\n$\r$\neleigiendolo de la lista desplegable de nombres$\r$\n$\r$\no tecleando el suyo propio." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "Debe definir AL MENOS DOS categorias antes de poder continuar instalando POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "categorias se han definido para usarlas con POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "¿Quiere configurar POPFile para usarlas?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Clic 'No' si desea cambiar su selección de categorias." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "El instalador ha sido incapaz de crear" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "de las" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "categorias que usted eligio." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Una vez que se haya instalado POPFile usted podra usar su panel de control del $\r$\n$\r$\n'Interface de Usuario'para crear la(s) categoria(s) que falten." #-------------------------------------------------------------------------- --- 159,195 ---- ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "No es necesario añadir mas categorías" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "Debe definir AL MENOS DOS categorías" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "Como minimo se necesita una categoría mas" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "El instalador no puede crear mas de" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "categorías" ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "Una categoría de nombre" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "ya se ha definido." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Elija por favor otro nombre para la nueva categoría." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "El instalador solo puede crear hasta" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "categorías." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Una vez que haya instalado POPFile, puede crear mas de" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "El nombre" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "no es válido como nombre para una categoría." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Elija por favor un nombre diferente para la nueva categoría." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile necesita AL MENOS DOS categorías antes de poder clasificar su correo en ellas." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Por favor ponga nombre a la categoría a crear,$\r$\n$\r$\neligiéndolo de la lista desplegable de nombres$\r$\n$\r$\no tecleando el suyo propio." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "Debe definir AL MENOS DOS categorías antes de poder continuar instalando POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "categorías se han definido para usarlas con POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "¿Quiere configurar POPFile para usarlas?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Clic 'No' si desea cambiar su selección de categorías." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "El instalador ha sido incapaz de crear" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "de las" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "categorías que usted eligió." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Una vez que se haya instalado POPFile usted podra usar su panel de control del $\r$\n$\r$\n'Interface de Usuario'para crear la(s) categoría(s) que falten." #-------------------------------------------------------------------------- *************** *** 230,239 **** !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Arrancar POPFile en segundo plano (no se muestra ventana)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Una vez que se haya iniciado POPFile, puede ver el 'Interface de Usuario' mediante" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) doble-clic el el icono de POPFile en la bandeja de sistema, O" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) usando Inicio --> Programas --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparandose para iniciar POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "Puede que tarde unos segundos..." --- 230,239 ---- !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Arrancar POPFile en segundo plano (no se muestra ventana)" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Una vez que se haya iniciado POPFile, puede ver el 'Interface de Usuario' mediante" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) doble-clic el el icono de POPFile en la bandeja de sistema, o" !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) usando Inicio --> Programas --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparándose para iniciar POPFile." !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "Puede que tarde unos segundos..." *************** *** 267,271 **** !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Desinstalación abortada por el usuario" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "¿Quiere elminar todos los arcchivos de su carpeta de POPFile ?$\r$\n$\r$\n(Si quiere guardar algo que usted haya creado, clic en No)" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Nota" --- 267,271 ---- !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Desinstalación abortada por el usuario" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "¿Quiere eliminar todos los archivos en su carpeta de POPFile?$\r$\n$\r$\n(Si quiere guardar algo que usted haya creado, haga clic en No)" !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Nota" |
|
From: <jgr...@us...> - 2003-08-05 21:27:15
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv400 Modified Files: Czech.msg Log Message: Updated Czech translation Index: Czech.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Czech.msg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Czech.msg 31 Jul 2003 16:32:22 -0000 1.2 --- Czech.msg 5 Aug 2003 21:27:12 -0000 1.3 *************** *** 17,21 **** # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # ! # Translation Jan Pavloviè (xp...@fi...) # Identify the language and character set used for the interface --- 17,21 ---- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # ! # Translation Jan Pavloviè (xp...@fi...) version 1.1 # Identify the language and character set used for the interface *************** *** 36,40 **** Previous Pøedcházející Next Nasledující ! From Odesilatel Subject Subjekt Classification Klasifikace --- 36,40 ---- Previous Pøedcházející Next Nasledující ! From Odesílatel Subject Subjekt Classification Klasifikace *************** *** 113,117 **** Configuration_XPLInsertion Pøidání hlavièky X-POPFile-Link Configuration_Logging Protokol zpracování ! Configuration_None ádná Configuration_ToScreen Na obrazovku Configuration_ToFile Do souboru --- 113,117 ---- Configuration_XPLInsertion Pøidání hlavièky X-POPFile-Link Configuration_Logging Protokol zpracování ! Configuration_None ádný Configuration_ToScreen Na obrazovku Configuration_ToFile Do souboru *************** *** 130,134 **** Advanced_Message1 POPFile ignoruje nasledující, èasto pouívaná slova: Advanced_AddWord Pøidat slovo ! Advanced_RemoveWord Odstránit slovo History_Filter (zobrazuje se jen ko <font color="%s">%s</font>) --- 130,134 ---- Advanced_Message1 POPFile ignoruje nasledující, èasto pouívaná slova: Advanced_AddWord Pøidat slovo ! Advanced_RemoveWord Odstranit slovo History_Filter (zobrazuje se jen ko <font color="%s">%s</font>) *************** *** 163,168 **** Security_NoStealthMode Ne (Utajený mód) Security_ExplainStats (Pokud je toto zapnuté, POPFile pole jednou za den následující tøi hodnoty na stránku www.usethesource.com: bc (celkový poèet koù, které má), mc (celkový poèet zpráv, které POPFile klasifikoval) a ec (celkový poèet chybných klasifikací). Tyto hodnoty se ukladají do souboru a budou pouité na vyhodnocení nìkterých statistik o tom jak lidé pouívají POPFile a jak dobøe funguje. Mùj web server uchováva tyto informacie pøibline 5 dní a poté je smae; Neuchovávam informace propojující statistické údaje s konkrétnímy IP adresamy.) ! Security_ExplainUpdate (pokud je toto zapnuté, POPFile pole jedno jednou za den následující tøi hodnoty na stránku www.usethesource.com: ma (hlavní èíslo verze pouívaného POPFile), mi (vedlejí èíslo verze pouívaného POPFile) a bn (èíslo kompilace pouívaného POPFile). POPFile dostane odpoveï ve formì obrázku, který se zobrazí na vrchu stránky, pokud je k dispozici nová verze. Mùj web server uchováva tyto informacie pøibline 5 dní a poté je smae; Neuchovávam informace propojující statistické údaje s konkrétnímy IP adresamy.) ! Security_PasswordTitle Heslo uívatelského rozhraní Security_Password Heslo Security_PasswordUpdate Heslo zmìnìné na %s --- 163,168 ---- Security_NoStealthMode Ne (Utajený mód) Security_ExplainStats (Pokud je toto zapnuté, POPFile pole jednou za den následující tøi hodnoty na stránku www.usethesource.com: bc (celkový poèet koù, které má), mc (celkový poèet zpráv, které POPFile klasifikoval) a ec (celkový poèet chybných klasifikací). Tyto hodnoty se ukladají do souboru a budou pouité na vyhodnocení nìkterých statistik o tom jak lidé pouívají POPFile a jak dobøe funguje. Mùj web server uchováva tyto informacie pøibline 5 dní a poté je smae; Neuchovávam informace propojující statistické údaje s konkrétnímy IP adresamy.) ! Security_ExplainUpdate (pokud je toto zapnuté, POPFile pole jednou za den následující tøi hodnoty na stránku www.usethesource.com: ma (hlavní èíslo verze pouívaného POPFile), mi (vedlejí èíslo verze pouívaného POPFile) a bn (èíslo kompilace pouívaného POPFile). POPFile dostane odpoveï ve formì obrázku, který se zobrazí na vrchu stránky, pokud je k dispozici nová verze. Mùj web server uchováva tyto informacie pøibline 5 dní a poté je smae; Neuchovávam informace propojující statistické údaje s konkrétnímy IP adresamy.) ! Security_PasswordTitle Heslo uivatelského rozhraní Security_Password Heslo Security_PasswordUpdate Heslo zmìnìné na %s *************** *** 177,181 **** Security_Update Kontroluj dennì nové verze programu POPFile Security_StatsTitle Oznamovat statistiky ! Security_Stats Posilat statistiky dennì Magnet_Error1 Magnet '%s' u existuje v koi '%s' --- 177,181 ---- Security_Update Kontroluj dennì nové verze programu POPFile Security_StatsTitle Oznamovat statistiky ! Security_Stats Posílat statistiky dennì Magnet_Error1 Magnet '%s' u existuje v koi '%s' *************** *** 196,200 **** Bucket_Error5 Ko je pøejmenovaný z %s na %s Bucket_Error6 Zmazaný ko %s ! Bucket_Title Prehlad Bucket_BucketName Název koe Bucket_WordCount Poèet slov --- 196,200 ---- Bucket_Error5 Ko je pøejmenovaný z %s na %s Bucket_Error6 Zmazaný ko %s ! Bucket_Title Pøehled Bucket_BucketName Název koe Bucket_WordCount Poèet slov |
|
From: <xue...@us...> - 2003-08-05 14:32:11
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv21239 Modified Files: Spanish-pfi.nsh Log Message: Spanish translation provided by Manuel Periago (ricesvinto). Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Spanish-pfi.nsh 1 Aug 2003 00:33:27 -0000 1.8 --- Spanish-pfi.nsh 5 Aug 2003 14:32:08 -0000 1.9 *************** *** 59,64 **** #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "Display POPFile Release Notes ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Yes' recommended if you are upgrading POPFile (you may need to backup BEFORE upgrading)" #-------------------------------------------------------------------------- --- 59,64 ---- #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "¿ Mostrar Notas sobre esta versión de POPFile ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "'Si' recomendado si está actualizando POPFile (puede que necesite hacer una copia de seguridad ANTES DE actualizar)" #-------------------------------------------------------------------------- *************** *** 66,72 **** #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Installs the core files needed by POPFile, including a minimal version of Perl." ! !insertmacro PFI_LANG_STRING DESC_SecSkins "Installs POPFile skins that allow you to change the look and feel of the POPFile user interface." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Installs non-English language versions of the POPFile UI." #-------------------------------------------------------------------------- --- 66,72 ---- #-------------------------------------------------------------------------- ! !insertmacro PFI_LANG_STRING DESC_SecPOPFile "Instalar los archivos esenciales de POPFile, incluyendo una versión mínima de Perl." ! !insertmacro PFI_LANG_STRING DESC_SecSkins "Instalar skins de POPFile que le permitirán cambiar el aspecto del interface de usuario de POPFile." ! !insertmacro PFI_LANG_STRING DESC_SecLangs "Instalar versiones de lenguaje no-Inglesas del UI de POPFile." #-------------------------------------------------------------------------- *************** *** 76,111 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "POPFile Installation Options" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Leave these options unchanged unless you need to change them" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Choose the default port number for POP3 connections (110 recommended)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Choose the default port for 'User Interface' connections (8080 recommended)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Run POPFile automatically when Windows starts (runs in background)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "IMPORTANT WARNING" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "IF UPGRADING POPFILE --- INSTALLER WILL SHUTDOWN EXISTING VERSION" ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Previous installation found at" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Yes' recommended" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Please change your POP3 port selection." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "The 'User Interface' port cannot be set to" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "The port must be a number in the range 1 to 65535." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Please change your 'User Interface' port selection." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- --- 76,111 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_TITLE "Opciones de Instalación para POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_SUBTITLE "Deje estas estas opciones así, a menos que necesite cambiarlas" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_POP3 "Elija el nº de puerto por defecto para conexiones POP3 (recomendado el 110)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_GUI "Elija el puerto por defecto para conectar al 'Interface de Usuario' (recomendado el 8080)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_STARTUP "Cargar automaticamente POPFile en cada inicio de Windows (funciona en 2º plano)" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_WARNING "ADVERTENCIA IMPORTANTE" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_IO_MESSAGE "SI ESTA ACUTUALIZANDO POPFILE --- EL INSTALADOR CERRARA LA VERSION EXISTENTE" ; Message Boxes used when validating user's selections ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "Hallada una instalación previa en" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "¿ Permite desinstalarla ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "'Si' recomendado" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "No se puede usar este puerto POP3" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "El puerto debe ser un numero entre 1 y 65535." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_3 "Cambie por favor su elección del puerto POP3." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_1 "No se puede usar el puerto del 'Interface de Usuario'" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_2 "El puerto debe ser un numero entre 1 y 65535" ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBGUI_3 "Cambie por favor su elección de puerto para 'Interface de Usuario'." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "Los puertos para POP3 e 'Interface de Usuario' tiene que ser diferentes." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Cambie por favor su elección de puertos." ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Aguarde por favor." ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "Tardará unos pocos segundos..." #-------------------------------------------------------------------------- *************** *** 115,141 **** ; Installation Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Checking if this is an upgrade installation..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Installing POPFile core files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Installing minimal Perl files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creating POPFile shortcuts..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Installing POPFile skin files..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Installing POPFile UI language files..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Presione Siguiente para continuar" ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Shutting down previous version of POPFile using port" ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "file from previous installation found." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "OK to update this file ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Click 'Yes' to update it (old file will be saved as" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Click 'No' to keep the old file (new file will saved as" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Backup copy of" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "already exists" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "OK to overwrite this file?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Click 'Yes' to overwrite, click 'No' to skip making a backup copy" #-------------------------------------------------------------------------- --- 115,141 ---- ; Installation Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_UPGRADE "Comprobando si se está actualizando..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_CORE "Instalando los archivos esenciales de POPFile..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_PERL "Instalando el minimo de archivos Perl..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SHORT "Creando enlaces para POPFile..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_SKINS "Instalando skins para POPFile..." ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_LANGS "Instalando archivos de lenguaje para IU de POPFile..." !insertmacro PFI_LANG_STRING PFI_LANG_INST_PROG_ENDSEC "Presione Siguiente para continuar" ; Installation Log Messages ! !insertmacro PFI_LANG_STRING PFI_LANG_INST_LOG_1 "Cerrando version anterior de POPFile usando puerto" ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_1 "hallado archivo de una instalación anterior." ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_2 "¿OK para actualizarlo?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_3 "Clic 'Si' para actualizarlo (el anterior se guardara como" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_4 "Clic 'No' para seguir con el anterior (el nuevo se guardara como" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_1 "Copia de seguridad de" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_2 "ya existe" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_3 "¿OK para sobrescribirla?" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBCFGBK_4 "Clic 'Si' para sobrescribirla, clic 'No' para saltar el hacer una copia" #-------------------------------------------------------------------------- *************** *** 145,157 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "POPFile Classification Bucket Creation" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile needs AT LEAST TWO buckets in order to be able to classify your email" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "After installation, POPFile makes it easy to change the number of buckets (and their names) to suit your needs.\r\n\r\nBucket names must be single words, using lowercase letters, digits 0 to 9, hyphens and underscores." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Create a new bucket by either selecting a name from the list below or typing a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "To delete one or more buckets from the list, tick the relevant 'Remove' box(es) then click the 'Continue' button." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Buckets to be used by POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Borrar" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continuar" --- 145,157 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_TITLE "Creación de Categorias de Clasificación de POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_SUBTITLE "POPFile necesita AL MENOS DOS categorias para poder clasificar en ellas su correo" ; Text strings displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_INTRO "Tras la instalacion, es facil cambiar el numero de categorias (y sus nombres) para acomodarlo a sus necesidades.\r\n\r\nLos nombres de las Categorias deben ser palabras unicas, con minusculas, numeros del 0 al 9, guiones y subrayado." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CREATE "Cree una nueva categoria seleccionando un nombre de la lista inferior o tecleando un nombre de su eleccion." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_DELETE "Para borrar una o mas categorias de la lista, marque la correspondiente casilla(s) 'Borrar' y pinche en el boton 'Continuar'." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_LISTHDR "Categorias a usar por POPFile" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_REMOVE "Borrar" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_CONTINUE "Continuar" *************** *** 159,195 **** ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "There is no need to add more buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "You must define AT LEAST TWO buckets" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "At least one more bucket is required" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "Installer cannot create more than" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "buckets" ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "A bucket called" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "has already been defined." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Please choose a different name for the new bucket." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "The installer can only create up to" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "buckets." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Once POPFile has been installed you can create more than" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "The name" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "is not a valid name for a bucket." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Please choose a different name for the new bucket." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile requires AT LEAST TWO buckets before it can classify your email." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Please enter the name of a bucket to be created,$\r$\n$\r$\neither by picking a suggested name from the drop-down list$\r$\n$\r$\nor by typing in a name of your own choice." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "You must define AT LEAST TWO buckets before continuing with the installation of POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "buckets have been defined for use by POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "Do you want to configure POPFile to use these buckets?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Click 'No' if you wish to change your bucket selections." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "The installer was unable to create" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "of the" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "buckets you selected." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Once POPFile has been installed you can use its 'User Interface'$\r$\n$\r$\ncontrol panel to create the missing bucket(s)." #-------------------------------------------------------------------------- --- 159,195 ---- ; Text strings used for status messages under the bucket list ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_1 "No es necesario añadir mas categorias" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_2 "Debe definir AL MENOS DOS categirias" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_3 "Como minimo se necesita una categoia mas" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_4 "El instalador no puede crear mas de" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_IO_MSG_5 "categorias" ; Message box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_1 "Una categoria de nombre" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_2 "ya se ha definido." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDUPERR_3 "Elija por favor otro nombre para la nueva categoria." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_1 "El instalador solo puede crear hasta" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_2 "categorias." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAXERR_3 "Una vez que haya instalado POPFile, puede crear mas de" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_1 "El nombre" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_2 "no es valido como nombre para una categoria." !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_3 "Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBNAMERR_4 "Elija por favor un nombre diferente para la nueva catgegoria." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_1 "POPFile necesita AL MENOS DOS categorias antes de poder clasificar su correo en ellas." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_2 "Por favor ponga nombre a la categoria a crear,$\r$\n$\r$\neleigiendolo de la lista desplegable de nombres$\r$\n$\r$\no tecleando el suyo propio." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBCONTERR_3 "Debe definir AL MENOS DOS categorias antes de poder continuar instalando POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_1 "categorias se han definido para usarlas con POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_2 "¿Quiere configurar POPFile para usarlas?" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_3 "Clic 'No' si desea cambiar su selección de categorias." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_1 "El instalador ha sido incapaz de crear" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_2 "de las" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_3 "categorias que usted eligio." ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBMAKERR_4 "Una vez que se haya instalado POPFile usted podra usar su panel de control del $\r$\n$\r$\n'Interface de Usuario'para crear la(s) categoria(s) que falten." #-------------------------------------------------------------------------- *************** *** 199,216 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigure Outlook Express" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile can reconfigure Outlook Express for you" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile has detected the following Outlook Express email account and can automatically configure it to work with POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigure this account to work with POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Email address:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "POP3 server:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "POP3 username:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "If you uninstall POPFile the original settings will be restored" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "account for the" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identity" #-------------------------------------------------------------------------- --- 199,216 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_TITLE "Reconfigurar Outlook Express" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_SUBTITLE "POPFile puede reconfigurar Outlook Express por usted" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_INTRO "POPFile ha detectado las siguientes cuentas de correo en Outlook Express y puede configurarlas automaticamente para que funcionen con POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_CHECKBOX "Reconfigurar esta cuenta para funcionar con POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_EMAIL "Dirección Email:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_SERVER "Servidor POP3:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_USERNAME "Usuario POP3:" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_RESTORE "Si desinstala POPFile se restaurarán los valores originales" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_1 "cuenta para la" ! !insertmacro PFI_LANG_STRING PFI_LANG_OECFG_IO_LINK_2 "identidad" #-------------------------------------------------------------------------- *************** *** 220,240 **** ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "POPFile can now be started" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "The POPFile User Interface only works if POPFile has been started" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "Start POPFile now ?" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (the 'User Interface' cannot be used if POPFile is not started)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Run POPFile (in a window)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Run POPFile in background (no window displayed)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Once POPFile has been started, you can display the 'User Interface' by" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) double-clicking the POPFile icon in the system tray, OR" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) using Start --> Programs --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparing to start POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- --- 220,240 ---- ; Page Title and Sub-title displayed in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_TITLE "Ya se puede arrancar POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_SUBTITLE "El Interface de Usuario de POPFile solo funciona si POPFile esta funcionando" ; Text displayed on the custom page ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_INTRO "¿Arrancar ahora POPFile?" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NO "No (el 'Interface de Usuario' no se puede utilizar si no se inicia POPFile)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_DOSBOX "Arrancar POPFile (en una ventana)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_BCKGRND "Arrancar POPFile en segundo plano (no se muestra ventana)" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_1 "Una vez que se haya iniciado POPFile, puede ver el 'Interface de Usuario' mediante" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_2 "(a) doble-clic el el icono de POPFile en la bandeja de sistema, O" ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_IO_NOTE_3 "(b) usando Inicio --> Programas --> POPFile --> POPFile User Interface." ; Banner message displayed whilst waiting for POPFile to start ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_1 "Preparandose para iniciar POPFile." ! !insertmacro PFI_LANG_STRING PFI_LANG_LAUNCH_BANNER_2 "Puede que tarde unos segundos..." #-------------------------------------------------------------------------- *************** *** 244,274 **** ; Uninstall Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Shutting down POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Deleting 'Start Menu' entries for POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Deleting POPFile core files..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Restoring Outlook Express settings..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Deleting POPFile skins files..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Deleting minimal Perl files..." ; Uninstall Log Messages ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Shutting down POPFile using port" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Opened" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Restored" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Closed" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Removing all files from POPFile directory" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Note: unable to remove all files from POPFile directory" ; Message Box text strings ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "It does not appear that POPFile is installed in the directory" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continue anyway (not recommended) ?" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Uninstall aborted by user" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?$\r$\n$\r$\n(If you have anything you created that you want to keep, click No)" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Note" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "could not be removed." #-------------------------------------------------------------------------- --- 244,274 ---- ; Uninstall Progress Reports displayed above the progress bar ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_1 "Cerrando POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_2 "Borrando elementos del 'Menu de Inicio' para POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_3 "Borrando archivos esenciales de POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_4 "Recuperando valores de Outlook Express..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_5 "Borrando skins de POPFile..." ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_PROGRESS_6 "Borrando archivos minimos de Perl..." ; Uninstall Log Messages ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_1 "Cerrando POPFile usando puerto" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_2 "Abierto" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_3 "Recuperado" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_4 "Cerrado" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_5 "Eliminando todos los archivos de la carpeta de POPFile" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_LOG_6 "Nota: incapaz de eliminar todos los archivos de la carpeta de POPFile" ; Message Box text strings ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_1 "No parece que POPFile esté instalado en esta carpeta" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBNOTFOUND_2 "Continuar de todas formas (no recomendado) ?" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_ABORT_1 "Desinstalación abortada por el usuario" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMDIR_1 "¿Quiere elminar todos los arcchivos de su carpeta de POPFile ?$\r$\n$\r$\n(Si quiere guardar algo que usted haya creado, clic en No)" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_1 "Nota" ! !insertmacro PFI_LANG_UNSTRING PFI_LANG_MBREMERR_2 "no se pudo eliminar." #-------------------------------------------------------------------------- |
|
From: <xue...@us...> - 2003-08-03 23:45:38
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv9241 Modified Files: ioC.ini Log Message: Safer to preset all three radio buttons instead of just the one which is selected by default. Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ioC.ini 1 Aug 2003 00:29:12 -0000 1.10 --- ioC.ini 3 Aug 2003 23:45:34 -0000 1.11 *************** *** 47,50 **** --- 47,51 ---- Bottom=26 Flags=Group + State=0 [Field 3] *************** *** 55,58 **** --- 56,60 ---- Top=30 Bottom=46 + State=0 [Field 4] |
|
From: <xue...@us...> - 2003-08-03 00:47:24
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv15102
Modified Files:
installer.nsi
Log Message:
Update VersionInformation and undo previous mod [POP3 server string, see bug 774315]
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** installer.nsi 2 Aug 2003 17:23:17 -0000 1.98
--- installer.nsi 3 Aug 2003 00:47:21 -0000 1.99
***************
*** 143,152 ****
; representing the following values: Major.Minor.Release.Build
! VIProductVersion "0.19.0.0"
VIAddVersionKey "ProductName" "POPFile"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
- # VIAddVersionKey "LegalTrademarks" "POPFile"
VIAddVersionKey "LegalCopyright" "© 2001-2003 John Graham-Cumming"
VIAddVersionKey "FileDescription" "POPFile Automatic email classification"
--- 143,151 ----
; representing the following values: Major.Minor.Release.Build
! VIProductVersion "0.20.0.0"
VIAddVersionKey "ProductName" "POPFile"
VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
VIAddVersionKey "LegalCopyright" "© 2001-2003 John Graham-Cumming"
VIAddVersionKey "FileDescription" "POPFile Automatic email classification"
***************
*** 1021,1029 ****
StrCmp ${L_CMPRE} "ui_port " got_ui_port
- ; Remove old POP3 server string to ensure the new installation identifies itself properly
-
- StrCpy ${L_CMPRE} ${L_LNE} 20
- StrCmp ${L_CMPRE} "pop3_welcome_string " loop
-
StrCmp ${L_STRIPLANG} "" transfer
--- 1020,1023 ----
|
|
From: <xue...@us...> - 2003-08-02 17:23:20
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17910
Modified Files:
installer.nsi
Log Message:
Do not preserve the POP3 server string when upgrading [see Bug 774315]
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** installer.nsi 1 Aug 2003 00:35:48 -0000 1.97
--- installer.nsi 2 Aug 2003 17:23:17 -0000 1.98
***************
*** 1020,1023 ****
--- 1020,1028 ----
StrCpy ${L_CMPRE} ${L_LNE} 8
StrCmp ${L_CMPRE} "ui_port " got_ui_port
+
+ ; Remove old POP3 server string to ensure the new installation identifies itself properly
+
+ StrCpy ${L_CMPRE} ${L_LNE} 20
+ StrCmp ${L_CMPRE} "pop3_welcome_string " loop
StrCmp ${L_STRIPLANG} "" transfer
|
|
From: <jgr...@us...> - 2003-08-01 02:45:45
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv10736/Proxy
Modified Files:
POP3.pm
Log Message:
Fix bug in our AUTH handling
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** POP3.pm 1 Aug 2003 00:50:54 -0000 1.71
--- POP3.pm 1 Aug 2003 02:45:42 -0000 1.72
***************
*** 215,225 ****
while ( ( ! ( $response =~ /\+OK/ ) ) && ( ! ( $response =~ /-ERR/ ) ) ) {
-
- # Check for an abort
-
- if ( $self->{alive} == 0 ) {
- last;
- }
-
my $auth;
$auth = <$client>;
--- 215,218 ----
|
|
From: <jgr...@us...> - 2003-08-01 02:45:20
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv10688/tests
Modified Files:
TestPOP3.tst
Log Message:
Completed test suite for the POP3 proxy; the only missing parts are the handling of the HTML forms for changing ports which will be done when I write the HTML.pm test suite
Index: TestPOP3.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestPOP3.tst,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestPOP3.tst 1 Aug 2003 01:09:50 -0000 1.9
--- TestPOP3.tst 1 Aug 2003 02:45:17 -0000 1.10
***************
*** 217,235 ****
}
! if ( $command =~ /CAPA/i ) {
! print $client "+OK I can handle$eol" . "AUTH$eol" . "USER$eol" . "APOP$eol.$eol";
! next;
! }
!
! if ( $command =~ /APOP (.*) (.*)/i ) {
! print $client "+OK Welcome APOPer$eol";
next;
}
! if ( $command =~ /AUTH ([^ ]+)/ ) {
next;
}
! if ( $command =~ /AUTH/ ) {
next;
}
--- 217,238 ----
}
! if ( $command =~ /AUTH ([^ ]+)/ ) {
! print $client "$1$eol";
! my $echoit = <$client>;
! print $client "Got $echoit";
! $echoit = <$client>;
! print $client "Got $echoit";
! $echoit = <$client>;
! print $client "+OK Done$eol";
next;
}
! if ( $command =~ /CAPA|AUTH/i ) {
! print $client "+OK I can handle$eol" . "AUTH$eol" . "USER$eol" . "APOP$eol.$eol";
next;
}
! if ( $command =~ /APOP (.*) (.*)/i ) {
! print $client "+OK Welcome APOPer$eol";
next;
}
***************
*** 360,365 ****
my $command = <$dreader>;
- print "[$command]\n";
-
if ( $command =~ /__QUIT/ ) {
print $uwriter "OK\n";
--- 363,366 ----
***************
*** 372,375 ****
--- 373,390 ----
next;
}
+
+ if ( $command =~ /__SECUREBAD/ ) {
+ $p->config_( 'secure_server', '127.0.0.1' );
+ $p->config_( 'secure_port', 8111 );
+ print $uwriter "OK\n";
+ next;
+ }
+
+ if ( $command =~ /__SECUREOK/ ) {
+ $p->config_( 'secure_server', '127.0.0.1' );
+ $p->config_( 'secure_port', 8110 );
+ print $uwriter "OK\n";
+ next;
+ }
}
}
***************
*** 695,699 ****
test_assert_equal( $line, "OK\n" );
-
my $client = IO::Socket::INET->new(
Proto => "tcp",
--- 710,713 ----
***************
*** 981,985 ****
close $client;
! # TODO SPA/AUTH tests with good, bad servers
# Send the remote server a special message that makes it die
--- 995,1097 ----
close $client;
! # Test SPA/AUTH with a bad server
!
! print $dwriter "__SECUREBAD\n";
! my $line = <$ureader>;
! test_assert_equal( $line, "OK\n" );
!
! my $client = IO::Socket::INET->new(
! Proto => "tcp",
! PeerAddr => 'localhost',
! PeerPort => $port );
!
! test_assert( defined( $client ) );
! test_assert( $client->connected );
!
! my $result = <$client>;
! test_assert_equal( $result, "+OK POP3 POPFile (test suite) server ready$eol" );
!
! print $client "CAPA$eol";
! $result = <$client>;
! test_assert_equal( $result, "-ERR can't connect to 127.0.0.1:8111$eol" );
!
! print $client "AUTH$eol";
! $result = <$client>;
! test_assert_equal( $result, "-ERR can't connect to 127.0.0.1:8111$eol" );
!
! print $client "AUTH username$eol";
! $result = <$client>;
! test_assert_equal( $result, "-ERR can't connect to 127.0.0.1:8111$eol" );
!
! print $client "QUIT$eol";
! $result = <$client>;
! test_assert_equal( $result, "+OK goodbye$eol" );
!
! close $client;
!
! # Test SPA/AUTH tests with good server
!
! print $dwriter "__SECUREOK\n";
! my $line = <$ureader>;
! test_assert_equal( $line, "OK\n" );
!
! my $client = IO::Socket::INET->new(
! Proto => "tcp",
! PeerAddr => 'localhost',
! PeerPort => $port );
!
! test_assert( defined( $client ) );
! test_assert( $client->connected );
!
! my $result = <$client>;
! test_assert_equal( $result, "+OK POP3 POPFile (test suite) server ready$eol" );
!
! print $client "AUTH$eol";
! $result = <$client>;
! test_assert_equal( $result, "+OK I can handle$eol" );
! $result = <$client>;
! test_assert_equal( $result, "AUTH$eol" );
! $result = <$client>;
! test_assert_equal( $result, "USER$eol" );
! $result = <$client>;
! test_assert_equal( $result, "APOP$eol" );
! $result = <$client>;
! test_assert_equal( $result, ".$eol" );
!
! print $client "QUIT$eol";
! $result = <$client>;
! test_assert_equal( $result, "+OK Bye$eol" );
!
! close $client;
!
! my $client = IO::Socket::INET->new(
! Proto => "tcp",
! PeerAddr => 'localhost',
! PeerPort => $port );
!
! test_assert( defined( $client ) );
! test_assert( $client->connected );
!
! my $result = <$client>;
! test_assert_equal( $result, "+OK POP3 POPFile (test suite) server ready$eol" );
!
! print $client "AUTH gooduser$eol";
! $result = <$client>;
! test_assert_equal( $result, "gooduser$eol" );
! print $client "repeatthis$eol";
! $result = <$client>;
! test_assert_equal( $result, "Got repeatthis$eol" );
! print $client "repeatthat$eol";
! $result = <$client>;
! test_assert_equal( $result, "Got repeatthat$eol" );
! print $client "done$eol";
! $result = <$client>;
! test_assert_equal( $result, "+OK Done$eol" );
!
! print $client "QUIT$eol";
! $result = <$client>;
! test_assert_equal( $result, "+OK Bye$eol" );
!
! close $client;
# Send the remote server a special message that makes it die
|
|
From: <jgr...@us...> - 2003-08-01 01:11:46
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv29648
Modified Files:
tests.pl
Log Message:
Verbose output
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** tests.pl 31 Jul 2003 16:32:20 -0000 1.25
--- tests.pl 1 Aug 2003 01:11:43 -0000 1.26
***************
*** 61,64 ****
--- 61,65 ----
}
$test_failures += 1;
+ # print "Test fail at $file:$line\n";
} else {
# print "Test pass at $file:$line\n";
|
|
From: <jgr...@us...> - 2003-08-01 01:11:31
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv29613/Proxy
Modified Files:
Proxy.pm
Log Message:
Added suppress option to echo_response_
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Proxy.pm 31 Jul 2003 16:32:21 -0000 1.29
--- Proxy.pm 1 Aug 2003 01:11:28 -0000 1.30
***************
*** 449,452 ****
--- 449,453 ----
# $command The text of the command to send (we add an EOL)
# $null_resp Allow a null response
+ # $suppress If set to 1 then the response does not go to the client
#
# Send $command to $mail, receives the response and echoes it to the $client and the debug
***************
*** 457,463 ****
sub get_response_
{
! my ( $self, $mail, $client, $command, $null_resp ) = @_;
$null_resp = 0 if (!defined $null_resp);
unless ( defined($mail) && $mail->connected ) {
--- 458,465 ----
sub get_response_
{
! my ( $self, $mail, $client, $command, $null_resp, $suppress ) = @_;
$null_resp = 0 if (!defined $null_resp);
+ $suppress = 0 if (!defined $suppress);
unless ( defined($mail) && $mail->connected ) {
***************
*** 481,486 ****
if ( $response ) {
# Echo the response up to the mail client
! $self->tee_( $client, $response );
return $response;
}
--- 483,490 ----
if ( $response ) {
+
# Echo the response up to the mail client
!
! $self->tee_( $client, $response ) if ( !$suppress );
return $response;
}
***************
*** 505,508 ****
--- 509,513 ----
# $client The local mail client (created with IO::) that needs the response
# $command The text of the command to send (we add an EOL)
+ # $suppress If set to 1 then the response does not go to the client
#
# Send $command to $mail, receives the response and echoes it to the $client and the debug
***************
*** 512,520 ****
sub echo_response_
{
! my ( $self, $mail, $client, $command ) = @_;
# Determine whether the response began with the string +OK. If it did then return 1
# else return 0
! return ( $self->get_response_( $mail, $client, $command ) =~ /$self->{good_response_}/ );
}
--- 517,525 ----
sub echo_response_
{
! my ( $self, $mail, $client, $command, $suppress ) = @_;
# Determine whether the response began with the string +OK. If it did then return 1
# else return 0
! return ( $self->get_response_( $mail, $client, $command, 0, $suppress ) =~ /$self->{good_response_}/ );
}
|
|
From: <jgr...@us...> - 2003-08-01 01:09:52
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29410/tests
Modified Files:
TestPOP3.tst
Log Message:
Added tests for TOP handling including toptoo and our caching mechanism. Of all the tests I've written so far these were the most interesting because they flushed out multiple bugs in our TOP handling/caching which are now fixed
Index: TestPOP3.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestPOP3.tst,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestPOP3.tst 31 Jul 2003 23:36:07 -0000 1.8
--- TestPOP3.tst 1 Aug 2003 01:09:50 -0000 1.9
***************
*** 308,311 ****
--- 308,330 ----
my $port = 9000 + int(rand(1000));
+
+ # This pipe is used to send signals to the child running
+ # the proxy to change its state, the following commands can
+ # be sent
+ #
+ # __QUIT Causes the child to terminate proxy service and
+ # exit
+ #
+ # __TOPTOO Causes the child to enable the toptoo option in
+ # the proxy
+ #
+ # __SECUREBAD Causes the child to define an incorrect secure
+ # server
+ #
+ # __SECUREOK Causes the child to define the correct secure
+ # server
+
+ pipe my $dreader, my $dwriter;
+ pipe my $ureader, my $uwriter;
my $pid2 = fork();
***************
*** 314,317 ****
--- 333,341 ----
# CHILD THAT WILL RUN THE POP3 PROXY
+ close $dwriter;
+ close $ureader;
+
+ $uwriter->autoflush(1);
+
my $p = new Proxy::POP3;
***************
*** 330,338 ****
$p->start();
! my $now = time;
! while ( $p->service() && ( ( $now + 15 ) > time ) ) {
}
my @kids = keys %{$p->{children__}};
while ( $#kids >= 0 ) {
--- 354,381 ----
$p->start();
! while ( 1 ) {
! last if !$p->service();
! if ( pipeready( $dreader ) ) {
! my $command = <$dreader>;
!
! print "[$command]\n";
!
! if ( $command =~ /__QUIT/ ) {
! print $uwriter "OK\n";
! last;
! }
!
! if ( $command =~ /__TOPTOO/ ) {
! $p->config_( 'toptoo', 1 );
! print $uwriter "OK\n";
! next;
! }
! }
}
+ close $dreader;
+ close $uwriter;
+
my @kids = keys %{$p->{children__}};
while ( $#kids >= 0 ) {
***************
*** 349,352 ****
--- 392,399 ----
# PARENT THAT WILL SEND COMMAND TO THE PROXY
+ close $dreader;
+ close $uwriter;
+ $dwriter->autoflush(1);
+
my $client = IO::Socket::INET->new(
Proto => "tcp",
***************
*** 634,641 ****
test_assert_equal( $magnet, '' );
- # TODO Test basic TOP capability with toptoo gets classification
- # TODO Test RETR after TOP comes from cache
- # TODO Test TOP after TOP comes from cache
-
# Check that we echo the remote servers QUIT response
--- 681,684 ----
***************
*** 646,649 ****
--- 689,879 ----
close $client;
+ # Test basic TOP capability with toptoo gets classification
+
+ print $dwriter "__TOPTOO\n";
+ my $line = <$ureader>;
+ test_assert_equal( $line, "OK\n" );
+
+
+ my $client = IO::Socket::INET->new(
+ Proto => "tcp",
+ PeerAddr => 'localhost',
+ PeerPort => $port );
+
+ test_assert( defined( $client ) );
+ test_assert( $client->connected );
+
+ my $result = <$client>;
+ test_assert_equal( $result, "+OK POP3 POPFile (test suite) server ready$eol" );
+
+ print $client "USER 127.0.0.1:8110:gooduser$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK Welcome gooduser$eol" );
+
+ $countdown = 2;
+ print $client "TOP 8 $countdown$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK " . ( -s $messages[7] ) . "$eol" );
+
+ $cam = $messages[7];
+ $cam =~ s/msg$/cam/;
+ test_assert( open FILE, "<$cam" );
+ $headers = 1;
+ while ( ( my $line = <FILE> ) && ( $countdown > 0 ) ) {
+ $result = <$client>;
+ $result =~ s/popfile2=8/popfile0=0/;
+ test_assert_equal( $result, $line );
+ if ( $headers == 0 ) {
+ $countdown -= 1;
+ }
+ if ( $line =~ /^[\r\n]+$/ ) {
+ $headers = 0;
+ }
+ }
+ close FILE;
+
+ $result = <$client>;
+ test_assert_equal( $result, "$eol" );
+ $result = <$client>;
+ test_assert_equal( $result, ".$eol" );
+
+ test_assert( -e 'messages/popfile2=8.msg' );
+ test_assert( -e 'messages/popfile2=8.cls' );
+
+ test_assert( open FILE, "<$messages[7]" );
+ test_assert( open HIST, "<messages/popfile2=8.msg" );
+ while ( ( my $fl = <FILE> ) && ( my $ml = <HIST> ) ) {
+ $fl =~ s/[\r\n]//g;
+ $ml =~ s/[\r\n]//g;
+ test_assert_equal( $fl, $ml );
+ }
+ test_assert( eof(FILE) );
+ test_assert( eof(HIST) );
+ close FILE;
+ close HIST;
+
+ my ( $reclassified, $bucket, $usedtobe, $magnet ) = $b->history_read_class( 'popfile2=8.msg' );
+ test_assert( !$reclassified );
+ test_assert_equal( $bucket, 'spam' );
+ test_assert( !defined( $usedtobe ) );
+ test_assert_equal( $magnet, '' );
+
+ # Test RETR after TOP comes from cache
+
+ print $client "RETR 8$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK " . ( -s 'messages/popfile2=8.msg' ) . " bytes from POPFile cache$eol" );
+
+ $cam = $messages[7];
+ $cam =~ s/msg$/cam/;
+ test_assert( open FILE, "<$cam" );
+ $headers = 1;
+ while ( my $line = <FILE> ) {
+ $line =~ s/[\r\n]//g;
+ $result = <$client>;
+ $result =~ s/[\r\n]//g;
+ $result =~ s/popfile2=8/popfile0=0/;
+ test_assert_equal( $result, $line );
+ }
+ close FILE;
+
+ $result = <$client>;
+ test_assert_equal( $result, ".$eol" );
+
+ # Test RETR after RETR returns cached copy
+
+ print $client "RETR 9$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK " . ( -s $messages[8] ) . "$eol" );
+ my $cam = $messages[8];
+ $cam =~ s/msg$/cam/;
+
+ test_assert( open FILE, "<$cam" );
+ while ( <FILE> ) {
+ my $line = $_;
+ $result = <$client>;
+ $result =~ s/popfile2=9/popfile0=0/;
+ test_assert_equal( $result, $line );
+ }
+ close FILE;
+
+ $result = <$client>;
+ test_assert_equal( $result, "$eol" );
+ $result = <$client>;
+ test_assert_equal( $result, ".$eol" );
+
+ select( undef, undef, undef, 0.1 );
+
+ test_assert( -e 'messages/popfile2=9.msg' );
+ test_assert( -e 'messages/popfile2=9.cls' );
+
+ test_assert( open FILE, "<$messages[8]" );
+ test_assert( open HIST, "<messages/popfile2=9.msg" );
+ while ( ( my $fl = <FILE> ) && ( my $ml = <HIST> ) ) {
+ $fl =~ s/[\r\n]//g;
+ $ml =~ s/[\r\n]//g;
+ test_assert_equal( $fl, $ml );
+ }
+ test_assert( eof(FILE) );
+ test_assert( eof(HIST) );
+ close FILE;
+ close HIST;
+
+ my ( $reclassified, $bucket, $usedtobe, $magnet ) = $b->history_read_class( 'popfile2=9.msg' );
+ test_assert( !$reclassified );
+ test_assert_equal( $bucket, 'spam' );
+ test_assert( !defined( $usedtobe ) );
+ test_assert_equal( $magnet, '' );
+
+ print $client "RETR 9$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK " . ( -s 'messages/popfile2=9.msg' ) . " bytes from POPFile cache$eol" );
+
+ $cam = $messages[8];
+ $cam =~ s/msg$/cam/;
+ test_assert( open FILE, "<$cam" );
+ $headers = 1;
+ while ( my $line = <FILE> ) {
+ $line =~ s/[\r\n]//g;
+ $result = <$client>;
+ $result =~ s/[\r\n]//g;
+ $result =~ s/popfile2=9/popfile0=0/;
+ test_assert_equal( $result, $line );
+ }
+ close FILE;
+
+ $result = <$client>;
+ test_assert_equal( $result, ".$eol" );
+
+ # TODO Test RETR after TOP/RETR with correct CLS file
+
+ unlink( 'messages/popfile2=9.cls' );
+
+ print $client "RETR 9$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK " . ( -s 'messages/popfile2=9.msg' ) . " bytes from POPFile cache$eol" );
+
+ $cam = $messages[8];
+ $cam =~ s/msg$/cam/;
+ test_assert( open FILE, "<$cam" );
+ $headers = 1;
+ while ( my $line = <FILE> ) {
+ $line =~ s/[\r\n]//g;
+ $result = <$client>;
+ $result =~ s/[\r\n]//g;
+ $result =~ s/popfile2=9/popfile0=0/;
+ test_assert_equal( $result, $line );
+ }
+ close FILE;
+
+ $result = <$client>;
+ test_assert_equal( $result, ".$eol" );
+
+ print $client "QUIT$eol";
+ $result = <$client>;
+ test_assert_equal( $result, "+OK Bye$eol" );
+
+ close $client;
+
# Test QUIT straight after connect
***************
*** 775,778 ****
--- 1005,1016 ----
close $client;
+
+ # Tell the proxy to die
+
+ print $dwriter "__QUIT\n";
+ $line = <$ureader>;
+ test_assert_equal( $line, "OK\n" );
+ close $dwriter;
+ close $ureader;
while ( waitpid( $pid, &WNOHANG ) != $pid ) {
|
|
From: <jgr...@us...> - 2003-08-01 00:59:59
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv28038/Classifier
Modified Files:
Bayes.pm
Log Message:
Ensure that the output from history_read_class is consistent if the file CLS file does not exist or is empty; add appropriate test case
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** Bayes.pm 31 Jul 2003 16:32:20 -0000 1.178
--- Bayes.pm 1 Aug 2003 00:59:56 -0000 1.179
***************
*** 931,935 ****
my $reclassified = 0;
! my $bucket = "unknown class";
my $usedtobe;
my $magnet = '';
--- 931,935 ----
my $reclassified = 0;
! my $bucket = 'unknown class';
my $usedtobe;
my $magnet = '';
***************
*** 954,959 ****
$self->log_( "Error: " . $self->global_config_( 'msgdir' ) . "$filename: $!" );
! return ( undef, undef, undef, undef );
}
return ( $reclassified, $bucket, $usedtobe, $magnet );
}
--- 954,962 ----
$self->log_( "Error: " . $self->global_config_( 'msgdir' ) . "$filename: $!" );
! return ( undef, $bucket, undef, undef );
}
+
+ $bucket = 'unknown class' if ( !defined( $bucket ) );
+
return ( $reclassified, $bucket, $usedtobe, $magnet );
}
|
|
From: <jgr...@us...> - 2003-08-01 00:59:59
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv28038/tests Modified Files: TestBayes.tst Log Message: Ensure that the output from history_read_class is consistent if the file CLS file does not exist or is empty; add appropriate test case Index: TestBayes.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** TestBayes.tst 31 Jul 2003 16:32:22 -0000 1.21 --- TestBayes.tst 1 Aug 2003 00:59:56 -0000 1.22 *************** *** 564,568 **** my ( $reclassified, $bucket, $usedtobe, $magnet ) = $b->history_read_class( 'two.msg' ); test_assert( !defined( $reclassified ) ); ! test_assert( !defined( $bucket ) ); test_assert( !defined( $usedtobe ) ); test_assert( !defined( $magnet ) ); --- 564,575 ---- my ( $reclassified, $bucket, $usedtobe, $magnet ) = $b->history_read_class( 'two.msg' ); test_assert( !defined( $reclassified ) ); ! test_assert_equal( $bucket, 'unknown class' ); ! test_assert( !defined( $usedtobe ) ); ! test_assert( !defined( $magnet ) ); ! ! `touch messages/two.cls`; ! my ( $reclassified, $bucket, $usedtobe, $magnet ) = $b->history_read_class( 'two.msg' ); ! test_assert( !defined( $reclassified ) ); ! test_assert_equal( $bucket, 'unknown class' ); test_assert( !defined( $usedtobe ) ); test_assert( !defined( $magnet ) ); |
|
From: <jgr...@us...> - 2003-08-01 00:50:58
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv25597/Proxy
Modified Files:
POP3.pm
Log Message:
Fix bug where after doing RETR x after TOP x we not return the file from cache because we weren't getting the filename write; also fixed bug where even if we did get from cache the XPL would be wrong; and if we did get from cache we'd drop out of the if and send the ETR again
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** POP3.pm 1 Aug 2003 00:36:26 -0000 1.70
--- POP3.pm 1 Aug 2003 00:50:54 -0000 1.71
***************
*** 393,397 ****
my $class;
! my $file = $self->{classifier__}->history_filename($download_count, $count);
my $short_file = $file;
--- 393,399 ----
my $class;
! # The 1 here indicates that we need the path to the history file
!
! my $file = $self->{classifier__}->history_filename($download_count, $count, undef, 1);
my $short_file = $file;
***************
*** 410,418 ****
# Give the client an +OK:
! print $client "+OK file data cached by POPFile$eol";
# Load the last classification
! my ( $reclassified, $bucket, $usedtobe, $magnet) = $self->{classifier__}->history_load_class($short_file);
if ($bucket ne 'unknown class') {
--- 412,420 ----
# Give the client an +OK:
! print $client "+OK " . ( -s $file ) . " bytes from POPFile cache$eol";
# Load the last classification
! my ( $reclassified, $bucket, $usedtobe, $magnet) = $self->{classifier__}->history_read_class($short_file);
if ($bucket ne 'unknown class') {
***************
*** 420,429 ****
# echo file, inserting known classification, without saving
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, $bucket );
} else {
# If the class wasn't saved properly, classify from disk normally
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, '' );
print $pipe "CLASS:$class$eol";
--- 422,431 ----
# echo file, inserting known classification, without saving
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, $count, 1, $bucket );
} else {
# If the class wasn't saved properly, classify from disk normally
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, $count, 1, '' );
print $pipe "CLASS:$class$eol";
***************
*** 454,460 ****
$self->flush_extra_( $mail, $client, 0 );
}
-
- next;
}
}
--- 456,462 ----
$self->flush_extra_( $mail, $client, 0 );
}
}
+
+ next;
}
|
|
From: <xue...@us...> - 2003-08-01 00:47:50
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv22324
Modified Files:
installer.nsi
Log Message:
Support for Polish added (the latest addition to the list of UI languages)
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** installer.nsi 31 Jul 2003 16:32:23 -0000 1.96
--- installer.nsi 1 Aug 2003 00:35:48 -0000 1.97
***************
*** 368,371 ****
--- 368,372 ----
!insertmacro PFI_LANG_LOAD "Japanese"
!insertmacro PFI_LANG_LOAD "Korean"
+ !insertmacro PFI_LANG_LOAD "Polish"
!insertmacro PFI_LANG_LOAD "Portuguese"
!insertmacro PFI_LANG_LOAD "PortugueseBR"
***************
*** 823,826 ****
--- 824,828 ----
!insertmacro UI_LANG_CONFIG "JAPANESE" "Nihongo"
!insertmacro UI_LANG_CONFIG "KOREAN" "Korean"
+ !insertmacro UI_LANG_CONFIG "POLISH" "Polish"
!insertmacro UI_LANG_CONFIG "PORTUGUESE" "Português"
!insertmacro UI_LANG_CONFIG "PORTUGUESEBR" "Português do Brasil"
|
11 messages has been excluded from this view by a project administrator.
