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: John Graham-C. <jgr...@us...> - 2005-09-13 19:02:14
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260/test Modified Files: Tag: b0_22_2 pfidiag.nsi Log Message: Commit Brian's new installer to branch (without first and second patches) Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** pfidiag.nsi 21 Oct 2004 12:39:09 -0000 1.8 --- pfidiag.nsi 13 Sep 2005 19:01:55 -0000 1.8.4.1 *************** *** 5,9 **** # by the Windows installer for POPFile v0.21.0 (or later). # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # by the Windows installer for POPFile v0.21.0 (or later). # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 25,30 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. #-------------------------------------------------------------------------- --- 25,47 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found #-------------------------------------------------------------------------- *************** *** 61,65 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.50" !define C_OUTFILE "pfidiag.exe" --- 78,82 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.53" !define C_OUTFILE "pfidiag.exe" *************** *** 84,115 **** #-------------------------------------------------------------------------- ! # Version Information settings (for the utility's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! ! VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "PFI Diagnostic Utility" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2004 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! VIAddVersionKey "Build Script" "${__FILE__}$\r$\n(${__TIMESTAMP__})" #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define PFIDIAG ! !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- --- 101,135 ---- #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define PFIDIAG ! !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- ! # Version Information settings (for the utility's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "PFI Diagnostic Utility" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "PFI Diagnostic Utility" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! !ifdef C_PFI_LIBRARY_VERSION ! VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" ! !endif ! VIAddVersionKey "Build Script" "${__FILE__}$\r$\n(${__TIMESTAMP__})" #-------------------------------------------------------------------------- *************** *** 347,351 **** ; (for convenience the leading slash is stripped from the value used internally) ! Call GetParameters Pop ${L_DIAG_MODE} StrCpy ${L_TEMP} ${L_DIAG_MODE} 1 --- 367,371 ---- ; (for convenience the leading slash is stripped from the value used internally) ! Call PFI_GetParameters Pop ${L_DIAG_MODE} StrCpy ${L_TEMP} ${L_DIAG_MODE} 1 *************** *** 411,415 **** DetailPrint "IsNT return code = ${L_WIN_OS_TYPE}" ! Call GetIEVersion Pop ${L_TEMP} DetailPrint "Internet Explorer = ${L_TEMP}" --- 431,435 ---- DetailPrint "IsNT return code = ${L_WIN_OS_TYPE}" ! Call PFI_GetIEVersion Pop ${L_TEMP} DetailPrint "Internet Explorer = ${L_TEMP}" *************** *** 797,801 **** Push ${L_EXPECTED_ROOT} Push " " ! Call StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" 0 check_user --- 817,821 ---- Push ${L_EXPECTED_ROOT} Push " " ! Call PFI_StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" 0 check_user *************** *** 817,821 **** Push ${L_EXPECTED_USER} Push " " ! Call StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" 0 check_vars --- 837,841 ---- Push ${L_EXPECTED_USER} Push " " ! Call PFI_StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" 0 check_vars *************** *** 889,893 **** exit: ! Call GetDateTimeStamp Pop ${L_TEMP} DetailPrint "------------------------------------------------------------" --- 909,913 ---- exit: ! Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "------------------------------------------------------------" *************** *** 895,898 **** --- 915,924 ---- DetailPrint "------------------------------------------------------------" + StrCmp ${L_DIAG_MODE} "simple" 0 quiet_exit + + ; For 'simple' reports, scroll to the LFN and SFN versions of the installation locations + + Call ScrollToShowPaths + quiet_exit: SetDetailsPrint textonly *************** *** 985,989 **** Push ${L_TEMP} Push " " ! Call StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" exit --- 1011,1015 ---- Push ${L_TEMP} Push " " ! Call PFI_StrStr Pop ${L_TEMP} StrCmp ${L_TEMP} "" exit *************** *** 1039,1042 **** --- 1065,1137 ---- FunctionEnd + + #-------------------------------------------------------------------------- + # Function used to manipulate the contents of the details view + #-------------------------------------------------------------------------- + + ;------------------------------------------------------------------------ + ; Constants used when accessing the details view + ;------------------------------------------------------------------------ + + !define C_LVM_GETITEMCOUNT 0x1004 + !define C_LVM_ENSUREVISIBLE 0x1013 + + #-------------------------------------------------------------------------- + # Installer Function: ScrollToShowPaths + # + # Scrolls the details view up to make it show the locations of the + # program files and the 'User Data' files in LFN and SFN formats. + # + # Inputs: + # none + # + # Outputs: + # none + # + # Usage: + # Call ScrollToShowPaths + # + #-------------------------------------------------------------------------- + + Function ScrollToShowPaths + + !define L_TEMP $R9 + !define L_TOPROW $R8 ; item index of the line we want to be at the top of the window + + Push ${L_TEMP} + Push ${L_TOPROW} + + ; Even the 'simple' report is too long to fit in the details view window so we + ; automatically scroll the view to make it display the LFN and SFN versions of + ; the POPFile program and 'User Data' folder locations (on the assumption that + ; this is the information most users will want to find first). + + StrCpy ${L_TOPROW} 9 ; index of the blank line immediately before "Current UserName" + + ; Check how many 'details' lines there are + + FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TEMP} ${C_LVM_GETITEMCOUNT} 0 0 ${L_TEMP} + + ; No point in trying to display a non-existent line + + IntCmp ${L_TEMP} ${L_TOPROW} exit exit + + ; Scroll up (in effect) to show Current UserName, Program folder & User Data folder entries + + FindWindow ${L_TEMP} "#32770" "" $HWNDPARENT + GetDlgItem ${L_TEMP} ${L_TEMP} 0x3F8 ; This is the Control ID of the details view + SendMessage ${L_TEMP} ${C_LVM_ENSUREVISIBLE} ${L_TOPROW} 0 + + exit: + Pop ${L_TOPROW} + Pop ${L_TEMP} + + !undef L_TEMP + !undef L_TOPROW + + FunctionEnd + #-------------------------------------------------------------------------- # End of 'pfidiag.nsi' |
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260/languages Modified Files: Tag: b0_22_2 Arabic-pfi.nsh Bulgarian-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Turkish-pfi.nsh Ukrainian-pfi.nsh Log Message: Commit Brian's new installer to branch (without first and second patches) Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.59 retrieving revision 1.59.4.1 diff -C2 -d -r1.59 -r1.59.4.1 *** PortugueseBR-pfi.nsh 15 Oct 2004 11:15:31 -0000 1.59 --- PortugueseBR-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.59.4.1 *************** *** 3,12 **** # # This file contains the "PortugueseBR" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1205 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Clique em Cancelar para continuar" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Uma outra cópia do 'Monitor de Conversão do Corpus' já está rodando!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "O 'Monitor de Conversão do Corpus' é parte do instalador do POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Erro: o arquivo de dados da conversão do Corpus não existe!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Erro: falta o caminho do POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Ocorreu um erro ao iniciar o processo de conversão do corpus" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Ocorreu um erro fatal durante o processo de conversão do corpus!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Tempo restante estimado: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutos" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(esperando pelo primeiro arquivo a ser convertido)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Existem $G_BUCKET_COUNT arquivos de balde para serem convertidos" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Depois de $G_ELAPSED_TIME.$G_DECPLACES minutos existem $G_STILL_TO_DO arquivos para converter" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Depois de $G_ELAPSED_TIME.$G_DECPLACES minutos existe um arquivo para converter" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "A Conversão do Corpus levou $G_ELAPSED_TIME.$G_DECPLACES minutos" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** SimpChinese-pfi.nsh 8 Oct 2004 18:05:42 -0000 1.43 --- SimpChinese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "SimpChinese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1171 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Finnish-pfi.nsh 8 Oct 2004 17:58:23 -0000 1.43 --- Finnish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Finnish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.33 retrieving revision 1.33.4.1 diff -C2 -d -r1.33 -r1.33.4.1 *** Italian-pfi.nsh 8 Oct 2004 18:01:56 -0000 1.33 --- Italian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.33.4.1 *************** *** 3,12 **** # # This file contains the "Italian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1171 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Swedish-pfi.nsh 8 Oct 2004 18:05:43 -0000 1.43 --- Swedish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Swedish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.45.4.1 diff -C2 -d -r1.45 -r1.45.4.1 *** French-pfi.nsh 8 Oct 2004 18:07:08 -0000 1.45 --- French-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.45.4.1 *************** *** 3,12 **** # # This file contains the "French" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1206 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Cliquez 'Annuler' pour continuer" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Une autre instance de 'Corpus Conversion Monitor' est déjà en cours d'exécution !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' fait partie de l'installateur de POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Erreur : le fichier de données de la conversion de Corpus n'existe pas !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Erreur : chemin d'accès à POPFile manquant" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Une erreur est survenue lors du lancement du processus de conversion de corpus" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Une erreur fatale est survenue lors du processus de conversion de corpus !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Temps restant estimé : " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(attente du premier fichier à convertir)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Il y a $G_BUCKET_COUNT fichiers de catégories à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Après $G_ELAPSED_TIME.$G_DECPLACES minutes, il reste $G_STILL_TO_DO fichiers à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Après $G_ELAPSED_TIME.$G_DECPLACES minutes il reste un fichier à convertir" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "La conversion de Corpus a pris $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.45 retrieving revision 1.45.4.1 diff -C2 -d -r1.45 -r1.45.4.1 *** English-pfi.nsh 8 Oct 2004 17:58:23 -0000 1.45 --- English-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.45.4.1 *************** *** 3,12 **** # # This file contains the "English" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1153 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.16 retrieving revision 1.16.4.1 diff -C2 -d -r1.16 -r1.16.4.1 *** Arabic-pfi.nsh 8 Oct 2004 17:58:22 -0000 1.16 --- Arabic-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.16.4.1 *************** *** 3,12 **** # # This file contains the "Arabic" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile [...1204 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "ÇáÑÌÇÁ ÇáÖÛØ Úáì ÅáÛÇÁ ááãÊÇÈÚÉ" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "äÓÎÉ ÃÎÑì ãä 'Corpus Conversion Monitor' ÊÚãá ãÓÈÞÇð !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' ÚÈÇÑÉ Úä ÞÓã ãä ãäÕøÈ POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Îáá: ãáÝÇÊ ÊÍæíá ãÚáæãÇÊ ÇáãÏæøäÉ ÛíÑ ãæÌæÏÉ !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Îáá: áã íÊã ÇáÚËæÑ Úáì ãÓÇÑ POPFile" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "áÞÏ ÍÕá Îáá ÃËäÇÁ ÊÔÛíá ÚãáíÉ ÊÍæíá ÇáãÏæøäÉ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "ÇáÒãä ÇáãÊÈÞí: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "ÏÞÇÆÞ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(ÅäÊÙÇÑ ÊÍæíá ÇáãáÝ ÇáÃæá)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "åäÇß $G_BUCKET_COUNT ÏáÇÁ áíÊã ÊÍæíáåÇ" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "ÈÚÏ $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ íÊÈÞì åäÇß $G_STILL_TO_DO ãáÝÇÊ ááÊÍæíá" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "ÈÚÏ $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ íÈÞì åäÇß ãáÝ æÇÍÏ áíÊã ÊÍæíáå" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "ÅÓÊÛÑÞÊ ÚãáíÉ ÊÍæíá ÇáãÏæøäÉ Åáì $G_ELAPSED_TIME.$G_DECPLACES ÏÞíÞÉ" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Portuguese-pfi.nsh 8 Oct 2004 18:01:57 -0000 1.43 --- Portuguese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Portuguese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Hungarian-pfi.nsh 8 Oct 2004 18:01:56 -0000 1.43 --- Hungarian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Hungarian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Russian-pfi.nsh 8 Oct 2004 18:05:42 -0000 1.43 --- Russian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Russian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Ukrainian-pfi.nsh 8 Oct 2004 18:05:43 -0000 1.43 --- Ukrainian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Ukrainian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Danish-pfi.nsh 8 Oct 2004 17:58:22 -0000 1.43 --- Danish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Danish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.35 retrieving revision 1.35.4.1 diff -C2 -d -r1.35 -r1.35.4.1 *** Greek-pfi.nsh 8 Oct 2004 18:01:54 -0000 1.35 --- Greek-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.35.4.1 *************** *** 3,12 **** # # This file contains the "Greek" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.38 retrieving revision 1.38.4.1 diff -C2 -d -r1.38 -r1.38.4.1 *** Czech-pfi.nsh 8 Oct 2004 17:58:22 -0000 1.38 --- Czech-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.38.4.1 *************** *** 3,12 **** # # This file contains the "Czech" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.48.4.1 diff -C2 -d -r1.48 -r1.48.4.1 *** Spanish-pfi.nsh 8 Oct 2004 18:05:42 -0000 1.48 --- Spanish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.48.4.1 *************** *** 3,12 **** # # This file contains the "Spanish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1205 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -C2 -d -r1.44 -r1.44.4.1 *** Korean-pfi.nsh 8 Oct 2004 18:01:56 -0000 1.44 --- Korean-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.44.4.1 *************** *** 3,12 **** # # This file contains the "Korean" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1206 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.43 retrieving revision 1.43.4.1 diff -C2 -d -r1.43 -r1.43.4.1 *** Slovak-pfi.nsh 8 Oct 2004 18:05:42 -0000 1.43 --- Slovak-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.43.4.1 *************** *** 3,12 **** # # This file contains the "Slovak" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.32 retrieving revision 1.32.4.1 diff -C2 -d -r1.32 -r1.32.4.1 *** Turkish-pfi.nsh 8 Oct 2004 18:05:43 -0000 1.32 --- Turkish-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.32.4.1 *************** *** 3,12 **** # # This file contains the "Turkish" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1171 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54 retrieving revision 1.54.4.1 diff -C2 -d -r1.54 -r1.54.4.1 *** Japanese-pfi.nsh 12 Dec 2004 00:27:18 -0000 1.54 --- Japanese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.54.4.1 *************** *** 3,12 **** # # This file contains the "Japanese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1206 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "±s·éÉÍuLZvðNbNµÄº³¢B" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "ÊÌ 'Corpus Conversion Monitor' ªùÉN®Å·I" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "'Corpus Conversion Monitor' Í POPFile CXg[[ÌêÅ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "G[: Corpus Ï·f[^t@Cª¶ÝµÜ¹ñI" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "G[: POPFile ÌpXª©Â©èܹñB" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Corpus Ï·ÌvZXðN®ÉG[ª¶µÜµ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Corpus Ï·ÌvZXÉv½IÈG[ª¶µÜµ½I" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "\zcèÔ: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "ª" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(ÅÌt@CªÏ·³êéÌðÒÁĢܷB)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "$G_BUCKET_COUNT ÂÌoPct@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "$G_ELAPSED_TIME.$G_DECPLACES ªoßB Æ $G_STILL_TO_DO ÂÌt@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "$G_ELAPSED_TIME.$G_DECPLACES ªoßB Æ1ÂÌt@CðÏ·µÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus ÌÏ·ÉÍ $G_ELAPSED_TIME.$G_DECPLACES ª©©èܵ½B" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.48 retrieving revision 1.48.4.1 diff -C2 -d -r1.48 -r1.48.4.1 *** German-pfi.nsh 8 Oct 2004 17:58:23 -0000 1.48 --- German-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.48.4.1 *************** *** 3,12 **** # # This file contains the "German" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1219 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Bitte klicken Sie auf Abbrechen, um fortzufahren." ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Eine andere Version der Corpus Konvertierung läuft bereits!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "Die 'Corpus Konvertierung' ist Teil des POPFile Installationsprogramms" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Fehler: Konvertierungsdatendatei existiert nicht!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Fehler: POPFile Pfad nicht gefunden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "Ein Fehler ist beim Start des Konvertierungsprozesses aufgetreten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "Ein schwerer Fehler ist während der Konvertierung des Corpus aufgetreten!" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Geschätzte Wartezeit: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "Minuten" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(warte auf Konvertierung der ersten Datei)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "Es müssen insgesamt $G_BUCKET_COUNT Dateien konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "Nach $G_ELAPSED_TIME.$G_DECPLACES Minuten müssen noch $G_STILL_TO_DO Dateien konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "Nach $G_ELAPSED_TIME.$G_DECPLACES Minuten muß noch eine Datei konvertiert werden" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Die Konvertierung dauerte $G_ELAPSED_TIME.$G_DECPLACES Minuten" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -C2 -d -r1.44 -r1.44.4.1 *** TradChinese-pfi.nsh 8 Oct 2004 18:05:43 -0000 1.44 --- TradChinese-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.44.4.1 *************** *** 3,12 **** # # This file contains the "TradChinese" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1171 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_TOTALFILES "There are $G_BUCKET_COUNT bucket files to be converted" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_N "After $G_ELAPSED_TIME.$G_DECPLACES minutes there are $G_STILL_TO_DO files left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PROGRESS_1 "After $G_ELAPSED_TIME.$G_DECPLACES minutes there is one file left to convert" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_SUMMARY "Corpus Conversion took $G_ELAPSED_TIME.$G_DECPLACES minutes" ! ! ########################################################################### ! ########################################################################### #-------------------------------------------------------------------------- Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.29 retrieving revision 1.29.4.1 diff -C2 -d -r1.29 -r1.29.4.1 *** Norwegian-pfi.nsh 8 Oct 2004 18:01:57 -0000 1.29 --- Norwegian-pfi.nsh 13 Sep 2005 19:01:55 -0000 1.29.4.1 *************** *** 3,12 **** # # This file contains the "Norwegian" text strings used by the Windows installer ! # for POPFile (includes customised versions of strings provided by NSIS and ! # strings which are unique to POPFile). # ! # These strings are grouped according to the page/window where they are used # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile [...1161 lines suppressed...] ! !insertmacro PFI_LANG_STRING PFI_LANG_BADCONVERT_SUBTITLE "Please click Cancel to continue" ! ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MUTEX "Another copy of the 'Corpus Conversion Monitor' is already running !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_PRIVATE "The 'Corpus Conversion Monitor' is part of the POPFile installer" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOFILE "Error: Corpus conversion data file does not exist !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_NOPOPFILE "Error: POPFile path missing" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_STARTERR "An error occurred when starting the corpus conversion process" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_FATALERR "A fatal error occurred during the corpus conversion process !" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_ESTIMATE "Estimated time remaining: " ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_MINUTES "minutes" ! !insertmacro PFI_LANG_STRING PFI_LANG_CONVERT_WAITING "(waiting for first file to be converted)" ! !insertmacro PFI_LA... [truncated message content] |
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6260 Modified Files: Tag: b0_22_2 CBP.nsh MonitorCC.nsi WriteEnvStr.nsh installer.nsi msgcapture.nsi pfi-languages.nsh pfi-library.nsh runpopfile.nsi runsqlite.nsi stop_popfile.nsi Added Files: Tag: b0_22_2 adduser-EmailConfig.nsh adduser-Uninstall.nsh adduser-Version.nsh installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer-Uninstall.nsh Log Message: Commit Brian's new installer to branch (without first and second patches) Index: CBP.nsh =================================================================== RCS file: /cvsroot/popfile/windows/CBP.nsh,v retrieving revision 1.33 retrieving revision 1.33.4.1 diff -C2 -d -r1.33 -r1.33.4.1 *** CBP.nsh 26 Oct 2004 16:59:13 -0000 1.33 --- CBP.nsh 13 Sep 2005 19:01:55 -0000 1.33.4.1 *************** *** 6,10 **** # can be overridden by creating suitable "!define" statements in 'adduser.nsi'. # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile --- 6,10 ---- # can be overridden by creating suitable "!define" statements in 'adduser.nsi'. # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 315,324 **** StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 7 StrCmp ${CBP_L_RESULT} "corpus " got_flat_corpus StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 13 StrCmp ${CBP_L_RESULT} "bayes_corpus " got_bdb_corpus StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 15 ! StrCmp ${CBP_L_RESULT} "bayes_database " got_sql_corpus StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 16 ! StrCmp ${CBP_L_RESULT} "bayes_dbconnect " got_sql_connect Goto check_eol --- 315,330 ---- StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 7 StrCmp ${CBP_L_RESULT} "corpus " got_flat_corpus + StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 13 StrCmp ${CBP_L_RESULT} "bayes_corpus " got_bdb_corpus + + StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 18 + StrCmp ${CBP_L_RESULT} "database_database " got_sql_corpus + StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 19 + StrCmp ${CBP_L_RESULT} "database_dbconnect " got_sql_connect StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 15 ! StrCmp ${CBP_L_RESULT} "bayes_database " got_sql_old_corpus StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 16 ! StrCmp ${CBP_L_RESULT} "bayes_dbconnect " got_sql_old_connect Goto check_eol *************** *** 331,340 **** Goto check_eol ! got_sql_corpus: StrCpy ${CBP_L_SQL_CORPUS} ${CBP_L_TEMP} "" 15 Goto check_eol ! got_sql_connect: StrCpy ${CBP_L_SQL_CONNECT} ${CBP_L_TEMP} "" 16 ; Now read file until we get to end of the current line --- 337,354 ---- Goto check_eol ! got_sql_old_corpus: StrCpy ${CBP_L_SQL_CORPUS} ${CBP_L_TEMP} "" 15 Goto check_eol ! got_sql_old_connect: StrCpy ${CBP_L_SQL_CONNECT} ${CBP_L_TEMP} "" 16 + Goto check_eol + + got_sql_corpus: + StrCpy ${CBP_L_SQL_CORPUS} ${CBP_L_TEMP} "" 18 + Goto check_eol + + got_sql_connect: + StrCpy ${CBP_L_SQL_CONNECT} ${CBP_L_TEMP} "" 19 ; Now read file until we get to end of the current line *************** *** 1363,1382 **** !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_1)" goto update_lists zero_so_far: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_2)" goto update_lists just_one: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_3)" goto update_lists at_the_limit: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_4) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_IO_MSG_5)" update_lists: --- 1377,1397 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_A)" goto update_lists zero_so_far: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_B)" goto update_lists just_one: !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_C)" goto update_lists at_the_limit: + StrCpy $G_PLS_FIELD_1 "${CBP_C_MAX_BNCOUNT}" !insertmacro MUI_INSTALLOPTIONS_WRITE "${CBP_C_INIFILE}" "Field ${CBP_C_MESSAGE}" \ ! "Text" "$(PFI_LANG_CBP_IO_MSG_D)" update_lists: *************** *** 1564,1587 **** name_exists: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBDUPERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBDUPERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDUPERR_3)" goto get_next_bucket_cmd too_many: MessageBox MB_OK|MB_ICONINFORMATION \ ! "$(PFI_LANG_CBP_MBMAXERR_1) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAXERR_3) ${CBP_C_MAX_BNCOUNT} $(PFI_LANG_CBP_MBMAXERR_2)" goto get_next_bucket_cmd bad_name: MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBNAMERR_1) $\"${CBP_L_CREATE_NAME}$\" $(PFI_LANG_CBP_MBNAMERR_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_3)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_4)" goto get_next_bucket_cmd --- 1579,1605 ---- name_exists: + StrCpy $G_PLS_FIELD_1 "${CBP_L_CREATE_NAME}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBDUPERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDUPERR_B)" goto get_next_bucket_cmd too_many: + StrCpy $G_PLS_FIELD_1 "${CBP_C_MAX_BNCOUNT}" MessageBox MB_OK|MB_ICONINFORMATION \ ! "$(PFI_LANG_CBP_MBMAXERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAXERR_B)" goto get_next_bucket_cmd bad_name: + StrCpy $G_PLS_FIELD_1 "${CBP_L_CREATE_NAME}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBNAMERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBNAMERR_C)" goto get_next_bucket_cmd *************** *** 1589,1598 **** IntCmp ${CBP_L_COUNT} 0 need_buckets IntCmp ${CBP_L_COUNT} 1 too_few MessageBox MB_YESNO|MB_ICONQUESTION \ ! "${CBP_L_COUNT} $(PFI_LANG_CBP_MBDONE_1)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_2)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_3)" IDYES finished_buckets goto get_next_bucket_cmd --- 1607,1617 ---- IntCmp ${CBP_L_COUNT} 0 need_buckets IntCmp ${CBP_L_COUNT} 1 too_few + StrCpy $G_PLS_FIELD_1 "${CBP_L_COUNT}" MessageBox MB_YESNO|MB_ICONQUESTION \ ! "$(PFI_LANG_CBP_MBDONE_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_B)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBDONE_C)" IDYES finished_buckets goto get_next_bucket_cmd *************** *** 1618,1626 **** Pop ${CBP_L_RESULT} StrCmp ${CBP_L_RESULT} "0" finished_now MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBMAKERR_1) ${CBP_L_RESULT} $(PFI_LANG_CBP_MBMAKERR_2) ${CBP_L_COUNT} \ ! $(PFI_LANG_CBP_MBMAKERR_3)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAKERR_4)" finished_now: --- 1637,1646 ---- Pop ${CBP_L_RESULT} StrCmp ${CBP_L_RESULT} "0" finished_now + StrCpy $G_PLS_FIELD_1 "${CBP_L_RESULT}" + StrCpy $G_PLS_FIELD_2 "${CBP_L_COUNT}" MessageBox MB_OK|MB_ICONEXCLAMATION \ ! "$(PFI_LANG_CBP_MBMAKERR_A)\ ${MB_NL}${MB_NL}\ ! $(PFI_LANG_CBP_MBMAKERR_B)" finished_now: Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19 retrieving revision 1.19.4.1 diff -C2 -d -r1.19 -r1.19.4.1 *** MonitorCC.nsi 20 Oct 2004 14:01:09 -0000 1.19 --- MonitorCC.nsi 13 Sep 2005 19:01:55 -0000 1.19.4.1 *************** *** 5,9 **** # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 25,31 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no patches applied. ! ; ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date. --- 25,48 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found ! ; Expect 3 compiler warnings, all related to standard NSIS language files which are out-of-date. *************** *** 94,100 **** !define C_PFI_PRODUCT "POPFile Corpus Conversion Monitor" Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.17" ; Mention the version number in the window title --- 111,120 ---- !define C_PFI_PRODUCT "POPFile Corpus Conversion Monitor" + Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.19" ! ! !define C_OUTFILE "monitorcc.exe" ; Mention the version number in the window title *************** *** 121,137 **** ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_PFI_VERSION}.0" ! VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2004 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" ! VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" ! VIAddVersionKey "Build" "Multi-Language" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #-------------------------------------------------------------------------- --- 141,161 ---- ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_PFI_VERSION}.0" ! VIAddVersionKey "ProductName" "${C_PFI_PRODUCT}" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" ! VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build" "Multi-Language" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! !ifdef C_PFI_LIBRARY_VERSION ! VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" ! !endif ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #-------------------------------------------------------------------------- *************** *** 306,310 **** ; Specify NSIS output filename ! OutFile "monitorcc.exe" ; Ensure CRC checking cannot be turned off using the /NCRC command-line switch --- 330,334 ---- ; Specify NSIS output filename ! OutFile "${C_OUTFILE}" ; Ensure CRC checking cannot be turned off using the /NCRC command-line switch Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** msgcapture.nsi 20 Oct 2004 14:01:09 -0000 1.7 --- msgcapture.nsi 13 Sep 2005 19:01:55 -0000 1.7.4.1 *************** *** 7,11 **** # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 7,11 ---- # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 27,32 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. #-------------------------------------------------------------------------- --- 27,49 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found #-------------------------------------------------------------------------- *************** *** 94,98 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.57" !define C_OUTFILE "msgcapture.exe" --- 111,115 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.61" !define C_OUTFILE "msgcapture.exe" *************** *** 100,104 **** ; The timeout used when the installer calls this utility to monitor the SQL database upgrade ! !define C_INSTALLER_TIMEOUT 30 ;-------------------------------------------------------------------------- --- 117,121 ---- ; The timeout used when the installer calls this utility to monitor the SQL database upgrade ! !define C_INSTALLER_TIMEOUT 15 ;-------------------------------------------------------------------------- *************** *** 116,147 **** #-------------------------------------------------------------------------- ! # Version Information settings (for the utility's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! ! VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "PFI Message Capture Utility" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2004 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "PFI Message Capture Utility (0-99 sec timeout)" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define MSGCAPTURE ! !include "pfi-library.nsh" #-------------------------------------------------------------------------- --- 133,167 ---- #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define MSGCAPTURE ! !include "pfi-library.nsh" #-------------------------------------------------------------------------- ! # Version Information settings (for the utility's EXE file) #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "PFI Message Capture Utility" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "PFI Message Capture Utility (0-99 sec timeout)" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! !ifdef C_PFI_LIBRARY_VERSION ! VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" ! !endif ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" #-------------------------------------------------------------------------- *************** *** 290,294 **** StrCpy $G_MODE_FLAG "" ; select 'normal' mode by default ! Call GetParameters Pop $G_TIMEOUT StrCmp $G_TIMEOUT "" default --- 310,314 ---- StrCpy $G_MODE_FLAG "" ; select 'normal' mode by default ! Call PFI_GetParameters Pop $G_TIMEOUT StrCmp $G_TIMEOUT "" default *************** *** 298,302 **** StrCmp ${L_TEMP} "PFI" installer_mode Push ${L_TEMP} ! Call StrCheckDecimal Pop ${L_TEMP} StrCmp ${L_TEMP} "" usage_error --- 318,322 ---- StrCmp ${L_TEMP} "PFI" installer_mode Push ${L_TEMP} ! Call PFI_StrCheckDecimal Pop ${L_TEMP} StrCmp ${L_TEMP} "" usage_error *************** *** 366,373 **** !define L_PFI_ROOT $R9 ; path to the POPFile program (popfile.pl, and other files) ! !define L_PFI_USER $R8 ; path to user's 'popfile.cfg' file !define L_RESULT $R7 !define L_TEMP $R6 !define L_TRAYICON $R5 ; system tray icon enabled ("i" ) or disabled ("") flag SetDetailsPrint textonly --- 386,395 ---- !define L_PFI_ROOT $R9 ; path to the POPFile program (popfile.pl, and other files) ! !define L_PFI_USER $R8 ; path to user's 'popfile.cfg' file !define L_RESULT $R7 !define L_TEMP $R6 !define L_TRAYICON $R5 ; system tray icon enabled ("i" ) or disabled ("") flag + !define L_OPTIONS $R4 ; POPFile 0.23.0 no longer displays startup messages by default + ; so we use the --verbose option to turn them back on SetDetailsPrint textonly *************** *** 425,428 **** --- 447,461 ---- DetailPrint "POPFILE_ROOT = ${L_PFI_ROOT}" DetailPrint "POPFILE_USER = ${L_PFI_USER}" + + ; Starting with the 0.23.0 release, POPFile no longer displays startup messages + ; so we use the 'verbose' option to turn them on. Earlier POPFile releases do not + ; recognize this option and will not run if it is used, so we use the Database.pm + ; file as a simple POPFile version test (this file was first used in 0.23.0) + + StrCpy ${L_OPTIONS} "" + IfFileExists "${L_PFI_ROOT}\POPFile\Database.pm" 0 look_for_exe + StrCpy ${L_OPTIONS} "--verbose" + + look_for_exe: IfFileExists "${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe" found_exe DetailPrint "" *************** *** 436,440 **** DetailPrint "------------------------------------------------------------" ! Call GetDateTimeStamp Pop ${L_TEMP} DetailPrint "(report started ${L_TEMP})" --- 469,473 ---- DetailPrint "------------------------------------------------------------" ! Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "(report started ${L_TEMP})" *************** *** 443,451 **** StrCmp $G_TIMEOUT "0" no_timeout StrCpy ${L_TEMP} "/TIMEOUT=$G_TIMEOUT000" ! nsExec::ExecToLog ${L_TEMP} '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe"' Goto get_result no_timeout: ! nsExec::ExecToLog '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe"' get_result: --- 476,484 ---- StrCmp $G_TIMEOUT "0" no_timeout StrCpy ${L_TEMP} "/TIMEOUT=$G_TIMEOUT000" ! nsExec::ExecToLog ${L_TEMP} '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe" ${L_OPTIONS}' Goto get_result no_timeout: ! nsExec::ExecToLog '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe" ${L_OPTIONS}' get_result: *************** *** 460,464 **** DetailPrint "Status code: ${L_RESULT}" ! Call GetDateTimeStamp Pop ${L_TEMP} DetailPrint "------------------------------------------------------------" --- 493,497 ---- DetailPrint "Status code: ${L_RESULT}" ! Call PFI_GetDateTimeStamp Pop ${L_TEMP} DetailPrint "------------------------------------------------------------" --- NEW FILE: installer-SecMinPerl-body.nsh --- #-------------------------------------------------------------------------- # # installer-SecMinPerl-body.nsh --- This 'include' file contains the body of the "MinPerl" # Section of the main 'installer.nsi' NSIS script used to # create the Windows installer for POPFile. The "MinPerl" # section installs a minimal Perl which suits the default # POPFile configuration. For some of the optional POPFile # components (e.g. XMLRPC) additional Perl components are # required and these are installed at the same time as the # optional POPFile component. # # Copyright (c) 2005 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # Section "-Minimal Perl" SecMinPerl # !include "installer-SecMinPerl-body.nsh" # SectionEnd #-------------------------------------------------------------------------- ; Section "-Minimal Perl" SecMinPerl ; This section installs the "core" version of the minimal Perl. Some of the optional ; POPFile components, such as the Kakasi package and POPFile's XMLRPC module, require ; extra Perl components which are added when the optional POPFile components are installed. !insertmacro SECTIONLOG_ENTER "Minimal Perl" ; Install the Minimal Perl files SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_PERL)" SetDetailsPrint listonly ; Remove empty minimal Perl folder (error flag set if folder not empty) ClearErrors RMDir "$G_MPLIBDIR" IfErrors 0 install_now StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR" MessageBox MB_YESNO|MB_ICONQUESTION "$(PFI_LANG_MINPERL_MBREMOLD)" IDNO install_now DetailPrint "Remove old minimal Perl folder" RMDir /r "$G_MPLIBDIR" DetailPrint "" install_now: SetOutPath "$G_ROOTDIR" File "${C_PERL_DIR}\bin\perl.exe" File "${C_PERL_DIR}\bin\wperl.exe" File "${C_PERL_DIR}\bin\perl58.dll" SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\AutoLoader.pm" File "${C_PERL_DIR}\lib\Carp.pm" File "${C_PERL_DIR}\lib\Config.pm" File "${C_PERL_DIR}\lib\Config_heavy.pl" File "${C_PERL_DIR}\lib\constant.pm" File "${C_PERL_DIR}\lib\DynaLoader.pm" File "${C_PERL_DIR}\lib\Errno.pm" File "${C_PERL_DIR}\lib\Exporter.pm" File "${C_PERL_DIR}\lib\Fcntl.pm" File "${C_PERL_DIR}\lib\integer.pm" File "${C_PERL_DIR}\lib\IO.pm" File "${C_PERL_DIR}\lib\lib.pm" File "${C_PERL_DIR}\lib\locale.pm" File "${C_PERL_DIR}\lib\POSIX.pm" File "${C_PERL_DIR}\lib\re.pm" File "${C_PERL_DIR}\lib\SelectSaver.pm" File "${C_PERL_DIR}\lib\Socket.pm" File "${C_PERL_DIR}\lib\strict.pm" File "${C_PERL_DIR}\lib\Symbol.pm" File "${C_PERL_DIR}\lib\vars.pm" File "${C_PERL_DIR}\lib\warnings.pm" File "${C_PERL_DIR}\lib\XSLoader.pm" SetOutPath "$G_MPLIBDIR\Carp" File "${C_PERL_DIR}\lib\Carp\*" SetOutPath "$G_MPLIBDIR\Date" File "${C_PERL_DIR}\site\lib\Date\Format.pm" File "${C_PERL_DIR}\site\lib\Date\Parse.pm" SetOutPath "$G_MPLIBDIR\Digest" File "${C_PERL_DIR}\lib\Digest\MD5.pm" SetOutPath "$G_MPLIBDIR\Exporter" File "${C_PERL_DIR}\lib\Exporter\*" SetOutPath "$G_MPLIBDIR\File" File "${C_PERL_DIR}\lib\File\Copy.pm" File "${C_PERL_DIR}\lib\File\Glob.pm" File "${C_PERL_DIR}\lib\File\Spec.pm" SetOutPath "$G_MPLIBDIR\File\Spec" File "${C_PERL_DIR}\lib\File\Spec\Unix.pm" File "${C_PERL_DIR}\lib\File\Spec\Win32.pm" SetOutPath "$G_MPLIBDIR\Getopt" File "${C_PERL_DIR}\lib\Getopt\Long.pm" SetOutPath "$G_MPLIBDIR\HTML" File "${C_PERL_DIR}\site\lib\HTML\Tagset.pm" File "${C_PERL_DIR}\site\lib\HTML\Template.pm" SetOutPath "$G_MPLIBDIR\IO" File "${C_PERL_DIR}\lib\IO\*" SetOutPath "$G_MPLIBDIR\IO\Socket" File "${C_PERL_DIR}\lib\IO\Socket\*" SetOutPath "$G_MPLIBDIR\MIME" File "${C_PERL_DIR}\lib\MIME\*" SetOutPath "$G_MPLIBDIR\Sys" File "${C_PERL_DIR}\lib\Sys\*" SetOutPath "$G_MPLIBDIR\Text" File "${C_PERL_DIR}\lib\Text\ParseWords.pm" SetOutPath "$G_MPLIBDIR\Time" File "${C_PERL_DIR}\lib\Time\Local.pm" File "${C_PERL_DIR}\site\lib\Time\Zone.pm" SetOutPath "$G_MPLIBDIR\warnings" File "${C_PERL_DIR}\lib\warnings\register.pm" SetOutPath "$G_MPLIBDIR\auto\Digest\MD5" File "${C_PERL_DIR}\lib\auto\Digest\MD5\*" SetOutPath "$G_MPLIBDIR\auto\DynaLoader" File "${C_PERL_DIR}\lib\auto\DynaLoader\*" SetOutPath "$G_MPLIBDIR\auto\Fcntl" File "${C_PERL_DIR}\lib\auto\Fcntl\Fcntl.dll" SetOutPath "$G_MPLIBDIR\auto\File\Glob" File "${C_PERL_DIR}\lib\auto\File\Glob\*" SetOutPath "$G_MPLIBDIR\auto\IO" File "${C_PERL_DIR}\lib\auto\IO\*" SetOutPath "$G_MPLIBDIR\auto\MIME\Base64" File "${C_PERL_DIR}\lib\auto\MIME\Base64\*" SetOutPath "$G_MPLIBDIR\auto\POSIX" File "${C_PERL_DIR}\lib\auto\POSIX\POSIX.dll" File "${C_PERL_DIR}\lib\auto\POSIX\autosplit.ix" File "${C_PERL_DIR}\lib\auto\POSIX\load_imports.al" SetOutPath "$G_MPLIBDIR\auto\Socket" File "${C_PERL_DIR}\lib\auto\Socket\*" SetOutPath "$G_MPLIBDIR\auto\Sys\Hostname" File "${C_PERL_DIR}\lib\auto\Sys\Hostname\*" ; Install Perl modules and library files for BerkeleyDB support. Although POPFile now uses ; SQLite (or another SQL database) to store the corpus and other essential data, it retains ; the ability to automatically convert old BerkeleyDB format corpus files to the SQL database ; format. Therefore the installer still installs the BerkeleyDB Perl components. SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\site\lib\BerkeleyDB.pm" File "${C_PERL_DIR}\lib\UNIVERSAL.pm" SetOutPath "$G_MPLIBDIR\auto\BerkeleyDB" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\autosplit.ix" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.bs" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.dll" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.exp" File "${C_PERL_DIR}\site\lib\auto\BerkeleyDB\BerkeleyDB.lib" ; Install Perl modules and library files for SQLite support SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\overload.pm" File "${C_PERL_DIR}\site\lib\DBI.pm" ; Required in order to use any version of SQLite SetOutPath "$G_MPLIBDIR\auto\DBI" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.bs" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.dll" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.exp" File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.lib" ; Install SQLite support (using an old SQLite 2.x verison of the SQLite module) SetOutPath "$G_MPLIBDIR\DBD" File "${C_PERL_DIR}\site\lib\DBD\SQLite.pm" SetOutPath "$G_MPLIBDIR\auto\DBD\SQLite" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.bs" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.dll" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.exp" File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.lib" SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !insertmacro SECTIONLOG_EXIT "Minimal Perl" ; SectionEnd #-------------------------------------------------------------------------- # End of 'installer-SecMinPerl-body.nsh' #-------------------------------------------------------------------------- Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** runsqlite.nsi 21 Oct 2004 12:32:53 -0000 1.1 --- runsqlite.nsi 13 Sep 2005 19:01:55 -0000 1.1.4.1 *************** *** 10,14 **** # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 10,14 ---- # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 40,45 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied. ;-------------------------------------------------------------------------- --- 40,62 ---- #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found ;-------------------------------------------------------------------------- *************** *** 59,63 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.1" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 76,80 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 78,109 **** #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_VERSION}.1" ! VIAddVersionKey "ProductName" "Run SQLite 2.x/3.x utility to examine a POPFile database" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2004 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" ! #---------------------------------------------------------------------------------------- ! #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions ! #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define RUNSQLITE ! !include "pfi-library.nsh" #-------------------------------------------------------------------------- --- 95,129 ---- #-------------------------------------------------------------------------- + # Include private library functions and macro definitions + #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define RUNSQLITE ! !include "pfi-library.nsh" ! #-------------------------------------------------------------------------- ! ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535 ! ; representing the following values: Major.Minor.Release.Build ! VIProductVersion "${C_VERSION}.0" ! VIAddVersionKey "ProductName" "Run SQLite 2.x/3.x utility to examine a POPFile database" ! VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" ! VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" ! VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" ! VIAddVersionKey "FileVersion" "${C_VERSION}" ! VIAddVersionKey "OriginalFilename" "${C_OUTFILE}" ! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}" ! !ifdef C_PFI_LIBRARY_VERSION ! VIAddVersionKey "Build Library Version" "${C_PFI_LIBRARY_VERSION}" ! !endif ! VIAddVersionKey "Build Script" "${__FILE__}${MB_NL}(${__TIMESTAMP__})" ! #---------------------------------------------------------------------------------------- #-------------------------------------------------------------------------- *************** *** 136,140 **** !insertmacro RSU_TEXT RSU_LANG_UTILNOTFOUND "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)${MB_NL}${MB_NL}(looked in $EXEDIR folder)" !insertmacro RSU_TEXT RSU_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" ! !insertmacro RSU_TEXT RSU_LANG_UNKNOWNFORMAT "Unable to tell if '$G_DATABASE' is a SQLite database file${MB_NL}${MB_NL}File format not known $G_DBFORMAT" ;-------------------------------------------------------------------------- --- 156,160 ---- !insertmacro RSU_TEXT RSU_LANG_UTILNOTFOUND "Unable to find the '$G_SQLITEUTIL' file (the SQLite $G_DBFORMAT utility)${MB_NL}${MB_NL}(looked in $EXEDIR folder)" !insertmacro RSU_TEXT RSU_LANG_STARTERROR "Unable to start the '$G_SQLITEUTIL' utility" ! !insertmacro RSU_TEXT RSU_LANG_UNKNOWNFORMAT "Unable to tell if '$G_DATABASE' is a SQLite database file${MB_NL}${MB_NL}File format not known $G_DBFORMAT${MB_NL}${MB_NL}Please shutdown POPFile before using this utility" ;-------------------------------------------------------------------------- *************** *** 153,157 **** SetOutPath "${L_TEMP}" ! Call GetParameters Pop $G_DATABASE StrCmp $G_DATABASE "" no_file_supplied --- 173,177 ---- SetOutPath "${L_TEMP}" ! Call PFI_GetParameters Pop $G_DATABASE StrCmp $G_DATABASE "" no_file_supplied *************** *** 167,171 **** continue: Push $G_DATABASE ! Call GetSQLiteFormat Pop $G_DBFORMAT StrCpy $G_SQLITEUTIL "sqlite.exe" --- 187,191 ---- continue: Push $G_DATABASE ! Call PFI_GetSQLiteFormat Pop $G_DBFORMAT StrCpy $G_SQLITEUTIL "sqlite.exe" --- NEW FILE: installer-SecPOPFile-body.nsh --- #-------------------------------------------------------------------------- # # installer-SecPOPFile-body.nsh --- This 'include' file contains the body of the "POPFile" # Section of the main 'installer.nsi' NSIS script used to # create the Windows installer for POPFile. # # The non-library functions used in this file are contained # in a separate file (see 'installer-SecPOPFile-func.nsh') # # Copyright (c) 2005 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 # #-------------------------------------------------------------------------- # The 'installer.nsi' script file contains the following code: # # Section "POPFile" SecPOPFile # !include "installer-SecPOPFile-body.nsh" # SectionEnd # # ; Functions used only by "installer-SecPOPFile-body.nsh" # # !include "installer-SecPOPFile-func.nsh" #-------------------------------------------------------------------------- # Processing performed: # # (a) If upgrading, shutdown existing version and rearrange minimal Perl files # (b) Create registry entries (HKLM and/or HKCU) for POPFile program files # (c) Install POPFile core program files and release notes # (d) Write the uninstaller program and create/update the Start Menu shortcuts # (e) Create 'Add/Remove Program' entry #-------------------------------------------------------------------------- ; Section "POPFile" SecPOPFile !insertmacro SECTIONLOG_ENTER "POPFile" ; Make this section mandatory (i.e. it is always installed) SectionIn RO !define L_RESULT $R9 !define L_TEMP $R8 Push ${L_RESULT} Push ${L_TEMP} SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_UPGRADE) $(PFI_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ; Before POPFile 0.21.0, POPFile and the minimal Perl shared the same folder structure ; and there was only one set of user data (stored in the same folder as POPFile). ; Phase 1 of the multi-user support introduced in 0.21.0 required some slight changes ; to the folder structure (to permit POPFile to be run from any folder after setting the ; POPFILE_ROOT and POPFILE_USER environment variables to appropriate values). ; The folder arrangement used for this build: ; ; (a) $INSTDIR - main POPFile installation folder, holds popfile.pl and several ; other *.pl scripts, runpopfile.exe, popfile*.exe plus three of the ; minimal Perl files (perl.exe, wperl.exe and perl58.dll) ; ; (b) $INSTDIR\kakasi - holds the Kakasi package used to process Japanese email ; (only installed when Japanese support is required) ; ; (c) $INSTDIR\lib - minimal Perl installation (except for the three files stored ; in the $INSTDIR folder to avoid runtime problems) ; ; (d) $INSTDIR\* - the remaining POPFile folders (Classifier, languages, skins, etc) ; ; For this build, each user is expected to have separate user data folders. By default each ; user data folder will contain popfile.cfg, stopwords, stopwords.default, popfile.db, ; the messages folder, etc. The 'Add POPFile User' wizard (adduser.exe) is responsible for ; creating/updating these user data folders and for handling conversion of existing flat file ; or BerkeleyDB corpus files to the new SQL database format. ; ; For increased flexibility, some global user variables are used in addition to $INSTDIR ; (this makes it easier to change the folder structure used by the installer). ; $G_ROOTDIR is initialised by 'CheckExistingProgDir' (the DIRECTORY page's "leave" function) StrCpy $G_MPLIBDIR "$G_ROOTDIR\lib" IfFileExists "$G_ROOTDIR\*.*" rootdir_exists ClearErrors CreateDirectory "$G_ROOTDIR" IfErrors 0 rootdir_exists SetDetailsPrint both DetailPrint "Fatal error: unable to create folder for the POPFile program files" SetDetailsPrint listonly MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "Error: Unable to create folder for the POPFile program files\ ${MB_NL}${MB_NL}\ ($G_ROOTDIR)" Abort rootdir_exists: ; Starting with POPFile 0.22.0 the system tray icon uses 'localhost' instead of '127.0.0.1' ; to display the User Interface (and the installer has been updated to follow suit), so we ; need to ensure Win9x systems have a suitable 'hosts' file Call PFI_IsNT Pop ${L_RESULT} StrCmp ${L_RESULT} "1" continue Call CheckHostsFile continue: ; If we are installing over a previous version, ensure that version is not running Call MakeRootDirSafe ; Starting with 0.21.0, a new structure is used for the minimal Perl (to enable POPFile to ; be started from any folder, once POPFILE_ROOT and POPFILE_USER have been initialized) Call MinPerlRestructure ; Now that the HTML for the UI is no longer embedded in the Perl code, a new skin system is ; used so we attempt to convert the existing skins to work with the new system Call SkinsRestructure StrCmp $G_WINUSERTYPE "Admin" 0 current_user_root WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language" "$LANGUAGE" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Major Version" "${C_POPFILE_MAJOR_VERSION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Minor Version" "${C_POPFILE_MINOR_VERSION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Revision" "${C_POPFILE_REVISION}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile RevStatus" "${C_POPFILE_RC}" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" "$G_ROOTDIR" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "setup.exe" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" "$G_ROOTDIR" StrCmp $G_SFN_DISABLED "0" find_HKLM_root_sfn StrCpy ${L_TEMP} "Not supported" Goto save_HKLM_root_sfn find_HKLM_root_sfn: GetFullPathName /SHORT ${L_TEMP} "$G_ROOTDIR" save_HKLM_root_sfn: WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_SFN" "${L_TEMP}" current_user_root: WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language" "$LANGUAGE" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Major Version" "${C_POPFILE_MAJOR_VERSION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Minor Version" "${C_POPFILE_MINOR_VERSION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile Revision" "${C_POPFILE_REVISION}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "POPFile RevStatus" "${C_POPFILE_RC}" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" "$G_ROOTDIR" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "Author" "setup.exe" WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" "$G_ROOTDIR" StrCmp $G_SFN_DISABLED "0" find_HKCU_root_sfn StrCpy ${L_TEMP} "Not supported" Goto save_HKCU_root_sfn find_HKCU_root_sfn: GetFullPathName /SHORT ${L_TEMP} "$G_ROOTDIR" save_HKCU_root_sfn: WriteRegStr HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_SFN" "${L_TEMP}" ; Install the POPFile Core files SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_CORE)" SetDetailsPrint listonly SetOutPath "$G_ROOTDIR" ; Remove redundant files (from earlier test versions of the installer) Delete "$G_ROOTDIR\wrapper.exe" Delete "$G_ROOTDIR\wrapperf.exe" Delete "$G_ROOTDIR\wrapperb.exe" ; Install POPFile 'core' files File "..\engine\license" File "${C_RELEASE_NOTES}" CopyFiles /SILENT /FILESONLY "$PLUGINSDIR\${C_README}.txt" "$G_ROOTDIR\${C_README}.txt" ; The experimental 'setup-repack587.exe' installer installed some NSIS-based replacements ; for the non-service EXE files plus renamed versions of the old 0.22.2 EXE files. These ; old ActivePerl 5.8.4 files can now be deleted as this installer contains versions based ; upon ActivePerl 5.8.7. Delete "$G_ROOTDIR\popfile-584.exe" Delete "$G_ROOTDIR\popfilef-584.exe" Delete "$G_ROOTDIR\popfileb-584.exe" Delete "$G_ROOTDIR\popfileif-584.exe" Delete "$G_ROOTDIR\popfileib-584.exe" Delete "$G_ROOTDIR\popfile-service-584.exe" ; The experimental 'setup-repack587.exe' installer had to use 'perlmsgcap.exe' since the ; NSIS-based replacements were not compatible with the standard "Message Capture" utility Delete "$G_ROOTDIR\perlmsgcap.exe" ; Install the POPFile EXE files File "..\engine\popfile.exe" File "..\engine\popfilef.exe" File "..\engine\popfileb.exe" File "..\engine\popfileif.exe" File "..\engine\popfileib.exe" File "..\engine\popfile-service.exe" File /nonfatal "/oname=pfi-stopwords.default" "..\engine\stopwords" File "runpopfile.exe" File "stop_pf.exe" File "sqlite.exe" File "runsqlite.exe" File "adduser.exe" File /nonfatal "test\pfidbstatus.exe" File /nonfatal "test\pfidiag.exe" File "msgcapture.exe" IfFileExists "$G_ROOTDIR\pfimsgcapture.exe" 0 app_paths Delete "$G_ROOTDIR\pfimsgcapture.exe" File "/oname=pfimsgcapture.exe" "msgcapture.exe" app_paths: ; Add 'stop_pf.exe' to 'App Paths' to allow it to be run using Start -> Run -> stop_pf params WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\stop_pf.exe" \ "" "$G_ROOTDIR\stop_pf.exe" SetOutPath "$G_ROOTDIR" File "..\engine\popfile.pl" File "..\engine\popfile.pck" File "..\engine\insert.pl" File "..\engine\bayes.pl" File "..\engine\pipe.pl" File "..\engine\favicon.ico" SetOutPath "$G_ROOTDIR\Classifier" File "..\engine\Classifier\Bayes.pm" File "..\engine\Classifier\WordMangle.pm" File "..\engine\Classifier\MailParse.pm" IfFileExists "$G_ROOTDIR\Classifier\popfile.sql" update_the_schema no_previous_version: WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "Owner" "$G_WINUSERNAME" DeleteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "OldSchema" Goto install_schema update_the_schema: Push "$G_ROOTDIR\Classifier\popfile.sql" Call PFI_GetPOPFileSchemaVersion Pop ${L_RESULT} StrCmp ${L_RESULT} "()" assume_early_schema StrCpy ${L_TEMP} ${L_RESULT} 1 StrCmp ${L_TEMP} "(" no_previous_version remember_version assume_early_schema: StrCpy ${L_RESULT} "0" remember_version: WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "Owner" "$G_WINUSERNAME" WriteINIStr "$G_ROOTDIR\pfi-data.ini" "Settings" "OldSchema" "${L_RESULT}" install_schema: File "..\engine\Classifier\popfile.sql" SetOutPath "$G_ROOTDIR\Platform" File "..\engine\Platform\MSWin32.pm" Delete "$G_ROOTDIR\Platform\POPFileIcon.dll" SetOutPath "$G_ROOTDIR\POPFile" File "..\engine\POPFile\MQ.pm" File "..\engine\POPFile\History.pm" File "..\engine\POPFile\Loader.pm" File "..\engine\POPFile\Logger.pm" File "..\engine\POPFile\Module.pm" File "..\engine\POPFile\Mutex.pm" File "..\engine\POPFile\Configuration.pm" File "..\engine\POPFile\popfile_version" SetOutPath "$G_ROOTDIR\Proxy" File "..\engine\Proxy\Proxy.pm" File "..\engine\Proxy\POP3.pm" SetOutPath "$G_ROOTDIR\UI" File "..\engine\UI\HTML.pm" File "..\engine\UI\HTTP.pm" ;----------------------------------------------------------------------- ; Default UI language SetOutPath "$G_ROOTDIR\languages" File "..\engine\languages\English.msg" ;----------------------------------------------------------------------- ; Default UI skin (the POPFile UI looks better if a skin is used) SetOutPath "$G_ROOTDIR\skins\default" File "..\engine\skins\default\*.*" ;----------------------------------------------------------------------- ; Create the uninstall program BEFORE creating the shortcut to it ; (this ensures that the correct "uninstall" icon appears in the START MENU shortcut) SetOutPath "$G_ROOTDIR" Delete "$G_ROOTDIR\uninstall.exe" WriteUninstaller "$G_ROOTDIR\uninstall.exe" ; Attempt to remove some StartUp and Start Menu shortcuts created by previous installations SetShellVarContext all Delete "$SMSTARTUP\Run POPFile.lnk" Delete "$SMSTARTUP\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\QuickStart Guide.url" SetShellVarContext current Delete "$SMSTARTUP\Run POPFile.lnk" Delete "$SMSTARTUP\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile in background.lnk" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Manual.url" Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\QuickStart Guide.url" ; Create the START MENU entries SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_SHORT)" SetDetailsPrint listonly ; 'CreateShortCut' uses '$OUTDIR' as the working directory for the shortcut ; ('SetOutPath' is one way to change the value of $OUTDIR) ; 'CreateShortCut' fails to update existing shortcuts if they are read-only, so try to clear ; the read-only attribute first. Similar handling is required for the Internet shortcuts. ; If the user has 'Admin' rights, create a 'POPFile' folder with a set of shortcuts in ; the 'All Users' Start Menu . If the user does not have 'Admin' rights, the shortcuts ; are created in the 'Current User' Start Menu. ; If the 'All Users' folder is not found, NSIS will return the 'Current User' folder. SetShellVarContext all StrCmp $G_WINUSERTYPE "Admin" create_shortcuts SetShellVarContext current create_shortcuts: SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}" SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Run POPFile.lnk" \ "$G_ROOTDIR\runpopfile.exe" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Uninstall POPFile.lnk" \ "$G_ROOTDIR\uninstall.exe" SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Release Notes.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Release Notes.lnk" \ "$G_ROOTDIR\${C_README}.txt" SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\POPFile User Interface.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\POPFile User Interface.url" \ "InternetShortcut" "URL" "http://${C_UI_URL}:$G_GUI/" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile.url" \ "InternetShortcut" "URL" "http://${C_UI_URL}:$G_GUI/shutdown" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" NORMAL !ifndef ENGLISH_MODE StrCmp $LANGUAGE ${LANG_JAPANESE} japanese_faq !endif WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?FrequentlyAskedQuestions" !ifndef ENGLISH_MODE Goto support japanese_faq: WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\FAQ.url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?JP_FrequentlyAskedQuestions" support: !endif SetOutPath "$SMPROGRAMS\${C_PFI_PRODUCT}\Support" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Home Page.url" NORMAL WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Home Page.url" \ "InternetShortcut" "URL" "http://getpopfile.org/" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" NORMAL !ifndef ENGLISH_MODE StrCmp $LANGUAGE ${LANG_JAPANESE} japanese_wiki !endif WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?POPFileDocumentationProject" !ifndef ENGLISH_MODE Goto pfidiagnostic japanese_wiki: WriteINIStr "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\POPFile Support (Wiki).url" \ "InternetShortcut" "URL" \ "http://getpopfile.org/cgi-bin/wiki.pl?JP_POPFileDocumentationProject" pfidiagnostic: !endif IfFileExists "$G_ROOTDIR\pfidiag.exe" 0 silent_shutdown Delete "$SMPROGRAMS\${C_PFI_PRODUCT}\PFI Diagnostic utility.lnk" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (simple).lnk" \ "$G_ROOTDIR\pfidiag.exe" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (full).lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Support\PFI Diagnostic utility (full).lnk" \ "$G_ROOTDIR\pfidiag.exe" "/full" silent_shutdown: SetOutPath "$G_ROOTDIR" SetFileAttributes "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile silently.lnk" NORMAL CreateShortCut "$SMPROGRAMS\${C_PFI_PRODUCT}\Shutdown POPFile silently.lnk" \ "$G_ROOTDIR\stop_pf.exe" "/showerrors $G_GUI" ; Create entry in the Control Panel's "Add/Remove Programs" list StrCmp $G_WINUSERTYPE "Admin" use_HKLM WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" Goto end_section use_HKLM: WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "UninstallString" "$G_ROOTDIR\uninstall.exe" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoModify" "1" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" end_section: SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly !insertmacro SECTIONLOG_EXIT "POPFile" Pop ${L_TEMP} Pop ${L_RESULT} !undef L_RESULT !undef L_TEMP ; SectionEnd #-------------------------------------------------------------------------- # End of 'installer-SecPOPFile-body.nsh' #-------------------------------------------------------------------------- Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14 retrieving revision 1.14.4.1 diff -C2 -d -r1.14 -r1.14.4.1 *** stop_popfile.nsi 20 Oct 2004 14:01:09 -0000 1.14 --- stop_popfile.nsi 13 Sep 2005 19:01:55 -0000 1.14.4.1 *************** *** 3,7 **** # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2004 John Graham-Cumming # # This file is part of POPFile --- 3,7 ---- # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile *************** *** 82,87 **** # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected. #------------------------------------------------------------------------------------------- ! # This version was tested using "NSIS 2 Release Candidate 2" released 5 January 2004 ! #------------------------------------------------------------------------------------------- ;-------------------------------------------------------------------------- --- 82,105 ---- # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected. #------------------------------------------------------------------------------------------- ! ! ; This version of the script has been tested with the "NSIS 2.0" compiler (final), ! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler ! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download ! ! !define ${NSIS_VERSION}_found ! ! !ifndef v2.0_found ! !warning \ ! "$\r$\n\ ! $\r$\n*** NSIS COMPILER WARNING:\ ! $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\ ! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ ! $\r$\n***\ ! $\r$\n*** The resulting 'installer' program should be tested carefully!\ ! $\r$\n$\r$\n" ! !endif ! ! !undef ${NSIS_VERSION}_found ;-------------------------------------------------------------------------- *************** *** 90,99 **** ; ${IO_NL} is used for InstallOption... [truncated message content] |
|
From: John Graham-C. <jgr...@us...> - 2005-09-13 18:57:03
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5851 Modified Files: Tag: b0_22_2 adduser.nsi Log Message: Test commit of part of Brian's update installer (before first and second patches) Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59 retrieving revision 1.59.4.1 diff -C2 -d -r1.59 -r1.59.4.1 *** adduser.nsi 13 Dec 2004 13:24:32 -0000 1.59 --- adduser.nsi 13 Sep 2005 18:56:55 -0000 1.59.4.1 *************** *** 8,12 **** # be done using this wizard. # ! # Copyright (c) 2004 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # be done using this wizard. # ! # Copyright (c) 2004-2005 John Graham-Cumming # [...4958 lines suppressed...] ! FunctionEnd ! !macroend #-------------------------------------------------------------------------- ! # Installer Function: ShowPleaseWaitBanner # ! # This function is used during the installation process #-------------------------------------------------------------------------- ! !insertmacro ShowPleaseWaitBanner "" #-------------------------------------------------------------------------- ! # Uninstaller Function: un.ShowPleaseWaitBanner # ! # This function is used during the uninstall process #-------------------------------------------------------------------------- ! ;!insertmacro ShowPleaseWaitBanner "un." #-------------------------------------------------------------------------- |
|
From: Joseph C. <tex...@us...> - 2005-09-10 08:49:49
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25704/skins/default Modified Files: corpus-page.thtml Log Message: Commit 0.23 version of Jim's bucket statistics. Needs work and discussion. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** corpus-page.thtml 10 Sep 2005 08:44:02 -0000 1.23 --- corpus-page.thtml 10 Sep 2005 08:49:41 -0000 1.24 *************** *** 26,29 **** --- 26,195 ---- </TMPL_IF> + <!-- Jim's stuff --> + + <table class="bucketsTable" cellpadding="0" cellspacing="5" valign="top" align="center" summary="<TMPL_VAR NAME="Localize_Bucket_StatisticsTableSummary">"> + <tr> + <th scope="col" rowspan="2" align="center"> + <TMPL_VAR NAME="Localize_Bucket_BucketName"> + </th> + + <th scope="col" colspan="2" align="center" nowrap> + <TMPL_VAR NAME="Localize_Bucket_EmailsClassifiedUpper"> + </th> + + <th scope="col" rowspan="2" align="center"> + <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFN"> + </th> + + + <th scope="col" rowspan="2" align="right"> + <TMPL_VAR NAME="Localize_Bucket_HitRate"> + </th> + + + <th scope="col" rowspan="2" align="center"> + <TMPL_VAR NAME="Localize_Bucket_BreakClassificationFP"> + </th> + + + <th scope="col" rowspan="2" align="right"> + <TMPL_VAR NAME="Localize_Bucket_StrikeRate"> + </th> + + + <th scope="col" colspan="2" align="center" nowrap> + <TMPL_VAR NAME="Localize_Words"> + </th> + + + <th scope="col" rowspan="2" align="right"> + <TMPL_VAR NAME="Localize_Bucket_UniqueWords"> + </th> + </tr> + + <tr> + <th align="right"> + <TMPL_VAR NAME="Localize_Count"> + </th> + + <th align="right"> + <TMPL_VAR NAME="Localize_Percent"> + </th> + + <th align="right"> + <TMPL_VAR NAME="Localize_Count"> + </th> + + <th align="right"> + <TMPL_VAR NAME="Localize_Percent"> + </th> + </tr> + + <TMPL_LOOP NAME="Corpus_Loop_Buckets"> + <TMPL_IF NAME="__odd__"> + <tr class="rowOdd"> + <TMPL_ELSE> + <tr class="rowEven"> + </TMPL_IF> + <td align="right"> + <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> + <a href="/buckets?session=<TMPL_VAR NAME="Session_Key">&showbucket=<TMPL_VAR NAME="Corpus_Bucket">"> + </TMPL_IF> + <span style="color:<TMPL_VAR NAME="Corpus_Bucket_Color">; white-space: nowrap;"> + <b> + <TMPL_VAR NAME="Corpus_Bucket"> + </b> + </span> + <TMPL_IF NAME="Corpus_If_Bucket_Not_Pseudo"> + </a> + </TMPL_IF> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Message_Count"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Message_Percent">% + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_False_Negative"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Hit_Rate"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_False_Positive"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Strike_Rate"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Word_Count"> + </td> + + <td align="right"> + <TMPL_VAR NAME="Bucket_Word_Percent">% + </td> + + <td align="right"> + <TMPL_VAR NAME="Corpus_Bucket_Unique"> + </td> + </tr> + </TMPL_LOOP> <!-- corpus loop buckets --> + <tr> + <td align="center"> + <b> + <TMPL_VAR NAME="Localize_Total"> + </b> + </td> + + <td align="right"> + <b> + <TMPL_VAR NAME="Corpus_Message_Count"> + </b> + </td> + + <td></td> + + <td align="right"> + <b> + <TMPL_VAR NAME="Corpus_Error_Count"> + </b> + </td> + + <td align="right"> + <b> + <TMPL_VAR NAME="Corpus_Accuracy"> + </b> + </td> + + <td></td> + + <td></td> + + <td align="right"> + <b> + <TMPL_VAR NAME="Corpus_Word_Count"> + </b> + </td> + + <td></td> + + <td align="right"> + <b> + <TMPL_VAR NAME="Corpus_Total_Unique"> + </b> + </td> + </tr> + </table> + + <!-- end Jim's stuff --> + <table class="settingsTable" width="100%" cellpadding="10%" cellspacing="0" summary="<TMPL_VAR NAME="Localize_Bucket_MaintenanceTableSummary">"> <tr> |
|
From: Joseph C. <tex...@us...> - 2005-09-10 08:49:49
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25704/UI Modified Files: HTML.pm Log Message: Commit 0.23 version of Jim's bucket statistics. Needs work and discussion. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.356 retrieving revision 1.357 diff -C2 -d -r1.356 -r1.357 *** HTML.pm 21 Aug 2005 22:17:48 -0000 1.356 --- HTML.pm 10 Sep 2005 08:49:41 -0000 1.357 *************** *** 2278,2281 **** --- 2278,2302 ---- my @corpus_data; + #***** Jim's stuff 1 ***** + my $total_messages = $self->mcount__( $session ); + if ( $total_messages != 0 ) { + $templ->param( 'Corpus_If_Message_Count' => 1 ); + } + else { + $templ->param( 'Corpus_If_Message_Count' => 0 ); + } + my $total_words = 0; + for my $bucket (@buckets) { + $total_words += $self->classifier_()->get_bucket_word_count( $session, $bucket ); + } + $templ->param( 'Corpus_Word_Count' => $self->pretty_number( $total_words ) ); + if ( $total_words != 0 ) { + $templ->param( 'Corpus_If_Word_Count' => 1 ); + } + else { + $templ->param( 'Corpus_If_Word_Count' => 0 ); + } + #**** end Jim's stuff 1 **** + foreach my $bucket ( @buckets ) { my %row_data; *************** *** 2297,2300 **** --- 2318,2365 ---- $row_data{Localize_Apply} = $self->{language__}{Apply}; $row_data{Corpus_Loop_Loop_Colors} = \@color_data; + #************ Jim's stuff 2 ********* + my $messages = $self->get_bucket_parameter__( $session, $bucket, 'count' ) || 0; + if ( $total_messages == 0 ) { + $total_messages = 1; # prevent div by 0 with empty corpus (needs better solution) + } + $row_data{Bucket_Message_Percent} = sprintf( "%.2f", ( 100 * ( $messages / $total_messages ) ) ); + $row_data{Bucket_Message_Count} = $self->pretty_number( $messages ); + my $positives = $self->get_bucket_parameter__($session, $bucket, 'fpcount' ) || 0; + $row_data{Bucket_False_Positive} = $self->pretty_number( $positives ); + if ( ( $total_messages - $messages ) == 0 ) { + $row_data{Bucket_Strike_Rate} = "n/a"; + } + else { + $row_data{Bucket_Strike_Rate} = sprintf( "%.2f%%", ( 100 * ( $positives ) / ( $total_messages - $messages ) ) ); + } + my $negatives = $self->get_bucket_parameter__( $session, $bucket, 'fncount' ) || 0; + $row_data{Bucket_False_Negative} = $self->pretty_number( $negatives ); + if ( ( $messages + $negatives ) == 0 ) { + $row_data{Bucket_Hit_Rate} = "n/a"; + } + else { + $row_data{Bucket_Hit_Rate} = sprintf( "%.2f%%", ( 100 * ( $messages ) / ( $messages + $negatives ) ) ); + } + my $words = $self->classifier_()->get_bucket_word_count( $session, $bucket ) || 0; + $row_data{Bucket_Word_Count} = $self->pretty_number( $words ); + if ( $total_words != 0 ) { + $row_data{Bucket_Word_Percent} = sprintf( "%.2f", ( 100 * ( $words / $total_words ) ) ); + } + else { + $row_data{Bucket_Word_Percent} = " "; + } + if ( $messages != 0 ) { + $row_data{Bar_If_Message_Count} = 1; + } + else { + $row_data{Bar_If_Message_Count} = 0; + } + if ( $words != 0 ) { + $row_data{Bar_If_Word_Count} = 1; + } + else { + $row_data{Bar_If_Word_Count} = 0; + } + #********* end Jim's stuff 2 ******** push ( @corpus_data, \%row_data ); } |
|
From: Joseph C. <tex...@us...> - 2005-09-10 08:49:49
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25704/languages Modified Files: English.msg Log Message: Commit 0.23 version of Jim's bucket statistics. Needs work and discussion. Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** English.msg 22 Aug 2005 08:41:37 -0000 1.97 --- English.msg 10 Sep 2005 08:49:41 -0000 1.98 *************** *** 496,497 **** --- 496,511 ---- tip_Footer_MailingList Want to hear about changes to POPFile? Sign up. tip_Footer_FeedMe Like POPFile? Contribute to making it more successful. + + # Jim's Bucket Stats stuff + Words Words + Percent Percent + Header_ConfigurationShort Configure + Footer_HomePage_short Home Page + Footer_QuickStart Quick Start + Footer_WikiShort Documents + Bucket_BreakEmailsClassifiedUpper Messages<br>Classified + Bucket_ClassificationErrorsUpper Classification Errors + Bucket_BreakClassificationFP False<br>Positives + Bucket_BreakClassificationFN False<br>Negatives + Bucket_HitRate Hit<br>Rate + Bucket_StrikeRate Strike<br>Rate |
|
From: Joseph C. <tex...@us...> - 2005-09-10 08:44:11
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24913/skins/default Modified Files: corpus-page.thtml Log Message: Some minor validation fixes. Index: corpus-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** corpus-page.thtml 20 Aug 2005 07:20:48 -0000 1.22 --- corpus-page.thtml 10 Sep 2005 08:44:02 -0000 1.23 *************** *** 6,10 **** <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> ! <p /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 6,10 ---- <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> ! <br /><br /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> *************** *** 18,22 **** <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Training"> ! <p /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 18,22 ---- <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Training"> ! <br /><br /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> *************** *** 433,438 **** <TMPL_VAR NAME="Localize_Bucket_LookupMessage2"> <TMPL_VAR NAME="Corpus_Word"> </strong> - <p /> </caption> <tr> --- 433,438 ---- <TMPL_VAR NAME="Localize_Bucket_LookupMessage2"> <TMPL_VAR NAME="Corpus_Word"> + <br /> </strong> </caption> <tr> |
|
From: Joseph C. <tex...@us...> - 2005-09-09 23:00:55
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28456/skins/default Modified Files: advanced-page.thtml bucket-page.thtml configuration-bar.thtml handheld.css history-page.thtml imap-options.thtml magnet-page.thtml password-page.thtml style.css users-page.thtml view-scores-widget.thtml Log Message: Improve HTML validation (mostly just warnings). Correct and add some styles to make look between IE and Moz more consistant. Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** history-page.thtml 6 Sep 2005 08:53:02 -0000 1.69 --- history-page.thtml 9 Sep 2005 23:00:42 -0000 1.70 *************** *** 37,41 **** <table width="100%" summary=""> <tr> ! <td align="left"> <h2 class="history" title="<TMPL_VAR NAME="Localize_tip_History_RecentNum">"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> </td> --- 37,41 ---- <table width="100%" summary=""> <tr> ! <td> <h2 class="history" title="<TMPL_VAR NAME="Localize_tip_History_RecentNum">"><TMPL_VAR NAME="Localize_History_Title"> (<TMPL_VAR NAME="History_Count">)</h2> </td> *************** *** 63,67 **** </table> ! <form action="/history" method="post"> <div class="removeButtonsTop"> <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick('<TMPL_VAR NAME="Localize_tip_History_RemoveChecked">')" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" title="<TMPL_VAR NAME="Localize_tip_History_RemoveChecked">" /> --- 63,67 ---- </table> ! <form action="/history" method="post" class="historyForm"> <div class="removeButtonsTop"> <input type="submit" class="submit removeButton" name="clearchecked" onClick="return confirmClick('<TMPL_VAR NAME="Localize_tip_History_RemoveChecked">')" value="<TMPL_VAR NAME="Localize_History_RemoveChecked">" title="<TMPL_VAR NAME="Localize_tip_History_RemoveChecked">" /> *************** *** 76,80 **** <th scope="col"> ! <table width="100%" cellspacing="0"> <tr> <td class="columnControls"> --- 76,80 ---- <th scope="col"> ! <table width="100%" cellspacing="0" summary=""> <tr> <td class="columnControls"> *************** *** 191,195 **** <TMPL_IF NAME="History_If_Reclassified"> ! <TMPL_VAR NAME="Localize_History_Reclassified"> <input type="submit" class="submit undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> --- 191,195 ---- <TMPL_IF NAME="History_If_Reclassified"> ! <span class="reclassifyText"><TMPL_VAR NAME="Localize_History_Reclassified"></span> <input type="submit" class="submit undoButton" name="undo_<TMPL_VAR NAME="History_I">" value="<TMPL_VAR NAME="Localize_Undo">" /> Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** users-page.thtml 22 Aug 2005 08:37:44 -0000 1.6 --- users-page.thtml 9 Sep 2005 23:00:42 -0000 1.7 *************** *** 3,7 **** <form action="/users" method="post"> ! <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%"> <tr> <td class="settingsPanel" valign="top"> --- 3,7 ---- <form action="/users" method="post"> ! <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%" summary=""> <tr> <td class="settingsPanel" valign="top"> *************** *** 18,22 **** </td></tr></table></form> ! <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%"> <tr> <td class="settingsPanel" valign="top"> --- 18,22 ---- </td></tr></table></form> ! <table cellpadding="10%" cellspacing="0" class="settingsTable" width="100%" summary=""> <tr> <td class="settingsPanel" valign="top"> *************** *** 37,41 **** <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> </form> ! <p > <TMPL_IF NAME="Users_If_Remove"> <hr /> --- 37,41 ---- <input type="submit" class="submit" name="create" value="<TMPL_VAR NAME="Localize_Create">" /> </form> ! <br /> <TMPL_IF NAME="Users_If_Remove"> <hr /> Index: imap-options.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-options.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** imap-options.thtml 16 Mar 2005 21:49:46 -0000 1.9 --- imap-options.thtml 9 Sep 2005 23:00:42 -0000 1.10 *************** *** 7,11 **** <TMPL_VAR NAME="Localize_Imap_Expunge"> </label> ! <p /> <label for="imap_update_interval" class="configurationLabel"> --- 7,11 ---- <TMPL_VAR NAME="Localize_Imap_Expunge"> </label> ! <br /> <label for="imap_update_interval" class="configurationLabel"> *************** *** 14,18 **** <br /> <input id="imap_update_interval" type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" /> ! <p /> <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" /> --- 14,18 ---- <br /> <input id="imap_update_interval" type="text" name="imap_options_update_interval" value="<TMPL_VAR NAME="IMAP_interval">" /> ! <br /> <input type="submit" class="submit" name="update_imap_5_options" value="<TMPL_VAR NAME="Localize_Apply">" /> Index: view-scores-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-scores-widget.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** view-scores-widget.thtml 15 Aug 2005 03:49:41 -0000 1.10 --- view-scores-widget.thtml 9 Sep 2005 23:00:42 -0000 1.11 *************** *** 1,9 **** - <a name="scores"> <h4 class="viewHeadings"> <TMPL_VAR NAME="Localize_Scores"> </h4> ! </a> <hr /> ! <table class="top20Words"> <tr> <th scope="col"> --- 1,10 ---- <h4 class="viewHeadings"> + <a name="scores"> <TMPL_VAR NAME="Localize_Scores"> + </a> </h4> ! <hr /> ! <table class="top20Words" summary=""> <tr> <th scope="col"> *************** *** 79,83 **** </table> <hr /> ! <table width="100%"> <tr> <td class="top20" align="left"> --- 80,84 ---- </table> <hr /> ! <table width="100%" summary=""> <tr> <td class="top20" align="left"> *************** *** 119,123 **** <TMPL_IF NAME="View_Score_If_Table"> <br /> ! <table class="top20Words"> <tr> <th scope="col"> --- 120,124 ---- <TMPL_IF NAME="View_Score_If_Table"> <br /> ! <table class="top20Words" summary=""> <tr> <th scope="col"> *************** *** 203,207 **** </h4> <p> ! <table> <tr> <th colspan="2" align="center" style="color: <TMPL_VAR NAME="Color_Bucket_1">;"> --- 204,208 ---- </h4> <p> ! <table summary=""> <tr> <th colspan="2" align="center" style="color: <TMPL_VAR NAME="Color_Bucket_1">;"> Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configuration-bar.thtml 6 Sep 2005 08:53:02 -0000 1.20 --- configuration-bar.thtml 9 Sep 2005 23:00:42 -0000 1.21 *************** *** 7,11 **** </h2> ! <table class="configBarBody" cellspacing="0" width="100%"> <TMPL_IF NAME="Is_history_page"> --- 7,11 ---- </h2> ! <table class="configBarBody" cellspacing="0" width="100%" summary=""> <TMPL_IF NAME="Is_history_page"> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** magnet-page.thtml 27 Aug 2005 08:52:37 -0000 1.14 --- magnet-page.thtml 9 Sep 2005 23:00:42 -0000 1.15 *************** *** 97,101 **** </table> ! <table> <tr><td> <div class="magnetsNewWidget"> --- 97,101 ---- </table> ! <table summary=""> <tr><td> <div class="magnetsNewWidget"> Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/style.css,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** style.css 15 Aug 2005 03:49:41 -0000 1.23 --- style.css 9 Sep 2005 23:00:42 -0000 1.24 *************** *** 222,235 **** /* Positioning */ ! table.historyWidgetsTop { ! width: 100%; ! margin-left: 1.5em; ! margin-top: 0.6em; ! margin-bottom: 1.0em; } ! table.historyWidgetsBottom { ! width: 100%; ! margin-top: 0.6em; } --- 222,233 ---- /* Positioning */ ! td.historyWidgetsTop form { ! margin: 0; ! padding: 0; } ! form.historyForm { ! margin: 0; ! padding: 0; } Index: advanced-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/advanced-page.thtml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** advanced-page.thtml 22 May 2005 11:18:49 -0000 1.15 --- advanced-page.thtml 9 Sep 2005 23:00:42 -0000 1.16 *************** *** 2,11 **** <TMPL_INCLUDE NAME="common-middle.thtml"> ! <table cellpadding="10%" cellspacing="0" class="settingsTable"> <tr> <td class="settingsPanel" valign="top"> <h2 class="advanced"><TMPL_VAR NAME="Localize_Advanced_StopWords"></h2> <TMPL_VAR NAME="Localize_Advanced_Message1"> ! <p /> <table summary="<TMPL_VAR NAME="Localize_Advanced_MainTableSummary">"> --- 2,11 ---- <TMPL_INCLUDE NAME="common-middle.thtml"> ! <table cellpadding="10%" cellspacing="0" class="settingsTable" summary=""> <tr> <td class="settingsPanel" valign="top"> <h2 class="advanced"><TMPL_VAR NAME="Localize_Advanced_StopWords"></h2> <TMPL_VAR NAME="Localize_Advanced_Message1"> ! <br /><br /> <table summary="<TMPL_VAR NAME="Localize_Advanced_MainTableSummary">"> *************** *** 24,28 **** </table> ! <p /> <div class="advancedWidgets"> <form action="/advanced" method="post"> --- 24,28 ---- </table> ! <br /> <div class="advancedWidgets"> <form action="/advanced" method="post"> *************** *** 63,67 **** <form action="/advanced" method="post"> ! <table width="100%"> <tr> <th width="50%" align="left"><TMPL_VAR NAME="Localize_Advanced_Parameter"></th> --- 63,67 ---- <form action="/advanced" method="post"> ! <table width="100%" summary=""> <tr> <th width="50%" align="left"><TMPL_VAR NAME="Localize_Advanced_Parameter"></th> Index: password-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/password-page.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** password-page.thtml 22 May 2005 10:45:43 -0000 1.10 --- password-page.thtml 9 Sep 2005 23:00:42 -0000 1.11 *************** *** 4,8 **** <h2 class="password"><TMPL_VAR NAME="Localize_Password_Title"></h2> <form action="/password" method="post"> ! <table><tr><td> <label class="passwordLabel" for="theUsername"> <TMPL_VAR NAME="Localize_Password_Username">: --- 4,8 ---- <h2 class="password"><TMPL_VAR NAME="Localize_Password_Title"></h2> <form action="/password" method="post"> ! <table summary=""><tr><td> <label class="passwordLabel" for="theUsername"> <TMPL_VAR NAME="Localize_Password_Username">: Index: handheld.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/handheld.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** handheld.css 31 Aug 2005 07:41:25 -0000 1.3 --- handheld.css 9 Sep 2005 23:00:42 -0000 1.4 *************** *** 116,117 **** --- 116,122 ---- display: none; } + + /* + span.reclassifyText { + display: none; + }*/ Index: bucket-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bucket-page.thtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bucket-page.thtml 22 May 2005 10:45:43 -0000 1.11 --- bucket-page.thtml 9 Sep 2005 23:00:42 -0000 1.12 *************** *** 106,110 **** </td> <td valign="top"> ! <table> <TMPL_LOOP NAME="Bucket_Loop_Row"> --- 106,110 ---- </td> <td valign="top"> ! <table summary=""> <TMPL_LOOP NAME="Bucket_Loop_Row"> |
|
From: Joseph C. <tex...@us...> - 2005-09-06 08:53:10
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1172/skins/default Modified Files: common-javascript.thtml configuration-bar.thtml history-javascript.thtml history-page.thtml Log Message: Some validation improvements. Index: configuration-bar.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/configuration-bar.thtml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configuration-bar.thtml 25 Aug 2005 08:39:20 -0000 1.19 --- configuration-bar.thtml 6 Sep 2005 08:53:02 -0000 1.20 *************** *** 98,102 **** <span class="configurationLabel"><TMPL_VAR NAME="Localize_Configuration_ConfirmPassword">:</span> <input type="password" name="confirm_password" size="10"> ! <input type="submit" class="submit" name="change_password" value="<TMPL_VAR NAME="Localize_Apply">" /> </div> --- 98,102 ---- <span class="configurationLabel"><TMPL_VAR NAME="Localize_Configuration_ConfirmPassword">:</span> <input type="password" name="confirm_password" size="10"> ! <input type="submit" class="submit" name="change_password" id="configPassword" value="<TMPL_VAR NAME="Localize_Apply">" /> </div> Index: history-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** history-page.thtml 21 Aug 2005 22:17:51 -0000 1.68 --- history-page.thtml 6 Sep 2005 08:53:02 -0000 1.69 *************** *** 6,10 **** <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> ! <p /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 6,10 ---- <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Bucket_Setup"> ! <br /><br /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_bucket_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> *************** *** 18,22 **** <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Training"> ! <p /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> --- 18,22 ---- <div class="helpMessage"> <TMPL_VAR NAME="Localize_Help_Training"> ! <br /><br /> <form method="post" action="/buckets"> <input type="submit" class="submit" name="nomore_training_help" value="<TMPL_VAR NAME="Localize_Help_No_More">" /> Index: history-javascript.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/history-javascript.thtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** history-javascript.thtml 21 Aug 2005 22:17:51 -0000 1.9 --- history-javascript.thtml 6 Sep 2005 08:53:02 -0000 1.10 *************** *** 15,18 **** return 0; } ! --> </script> --- 15,18 ---- return 0; } ! // --> </script> Index: common-javascript.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-javascript.thtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** common-javascript.thtml 21 Aug 2005 08:37:30 -0000 1.5 --- common-javascript.thtml 6 Sep 2005 08:53:02 -0000 1.6 *************** *** 1,4 **** <script type="text/javascript"> ! <TMPL_IF NAME="If_Javascript_OK"> warnings = 1; // confirmation dialogs enabled --- 1,4 ---- <script type="text/javascript"> ! <!-- <TMPL_IF NAME="If_Javascript_OK"> warnings = 1; // confirmation dialogs enabled *************** *** 16,19 **** return 0; } ! </script> --- 16,19 ---- return 0; } ! // --> </script> |
|
From: Brian S. <xue...@us...> - 2005-09-02 17:07:18
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31077 Modified Files: installer-Uninstall.nsh installer.nsi Log Message: Stop using an anonymous "Language Selection" dialog for the main installer and uninstaller wizards. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.260 retrieving revision 1.261 diff -C2 -d -r1.260 -r1.261 *** installer.nsi 12 Aug 2005 12:58:23 -0000 1.260 --- installer.nsi 2 Sep 2005 17:07:04 -0000 1.261 *************** *** 467,474 **** ;---------------------------------------------------------------- ! ; 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_LANGDLL_WINDOWTITLE "Language Selection" ; Always show the language selection dialog, even if a language has been stored in the --- 467,473 ---- ;---------------------------------------------------------------- ! ; Override the standard "Installer Language" title for the language selection dialogue ! !define MUI_LANGDLL_WINDOWTITLE "POPFile Installer Language Selection" ; Always show the language selection dialog, even if a language has been stored in the Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** installer-Uninstall.nsh 12 Aug 2005 12:58:23 -0000 1.3 --- installer-Uninstall.nsh 2 Sep 2005 17:07:03 -0000 1.4 *************** *** 61,64 **** --- 61,69 ---- ; (if the language entry is not found in the registry, a 'language selection' dialog is shown) + ; Use a different "Language selection" dialog title for the uninstaller + + !undef MUI_LANGDLL_WINDOWTITLE + !define MUI_LANGDLL_WINDOWTITLE "POPFile Uninstaller Language Selection" + !insertmacro MUI_UNGETLANGUAGE |
|
From: Manni H. <man...@us...> - 2005-08-31 17:50:55
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14681/UI Modified Files: HTTP.pm Log Message: Make encryption work with newer versions of Crypt::CBC, retaining backwards compatibility. Remove two tab characters while we're at it. Index: HTTP.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** HTTP.pm 21 Aug 2005 22:17:50 -0000 1.31 --- HTTP.pm 31 Aug 2005 17:50:44 -0000 1.32 *************** *** 107,111 **** 'padding' => 'standard', 'prepend_iv' => 0, ! 'regenerate_key' => 0 } ); return 1; --- 107,112 ---- 'padding' => 'standard', 'prepend_iv' => 0, ! 'regenerate_key' => 0, ! 'salt' => 1 } ); return 1; *************** *** 322,329 **** if ( $need_array ) { ! if ( $#{ $self->{form_}{$arg . "_array"} } == -1 ) { push( @{ $self->{form_}{$arg . "_array"} }, $self->{form_}{$arg} ); ! } ! } $self->{form_}{$arg} = $2; --- 323,330 ---- if ( $need_array ) { ! if ( $#{ $self->{form_}{$arg . "_array"} } == -1 ) { push( @{ $self->{form_}{$arg . "_array"} }, $self->{form_}{$arg} ); ! } ! } $self->{form_}{$arg} = $2; |
|
From: Joseph C. <tex...@us...> - 2005-08-31 07:41:32
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21816/skins/default Modified Files: handheld.css Log Message: A few more changes. Fixes overlap with IE. Index: handheld.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/handheld.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** handheld.css 30 Aug 2005 20:55:26 -0000 1.2 --- handheld.css 31 Aug 2005 07:41:25 -0000 1.3 *************** *** 48,51 **** --- 48,55 ---- } + .historyWidgetsTop { + // padding-top: 2em; + } + .columnControls { display: none !important; *************** *** 58,61 **** --- 62,69 ---- } + .rowOdd td { + border: none !important; + } + tr.rowHeader { width: auto !important; *************** *** 76,79 **** --- 84,91 ---- } + .historyNavigatorTop form { + display:inline; + } + td.historyNavigatorTop div.refreshLink { display: none; *************** *** 87,89 **** display: block; text-align: left; ! } \ No newline at end of file --- 99,117 ---- display: block; text-align: left; ! } ! ! .shell { ! border: 1px; ! } ! ! .shellTopCenter, .shellTopRight, .shellTopLeft { ! display: none; ! } ! ! .shellRight, .shellLeft { ! display: none; ! } ! ! .shellBottomCenter, .shellBottomRight, .shellBottomLeft { ! display: none; ! } |
|
From: Joseph C. <tex...@us...> - 2005-08-30 20:55:34
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21917/skins/default Modified Files: common-top.thtml handheld.css Log Message: More work on handheld styles. Works well in Moz and Opera. Tables do not work the same in IE so collapsing the history rows does not seem possible. And in IE historyNavigatorTop overlaps historyWidgetsTop. Someone with a handheld device needs to try this out. Index: common-top.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-top.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** common-top.thtml 27 Aug 2005 08:52:37 -0000 1.8 --- common-top.thtml 30 Aug 2005 20:55:26 -0000 1.9 *************** *** 6,11 **** <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" media="all" title="POPFile"> <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">rtl.css" media="all"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">print.css" media="print" title="print"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">handheld.css" media="handheld" title="handheld"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> --- 6,11 ---- <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" media="all" title="POPFile"> <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">rtl.css" media="all"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">print.css" media="print"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">handheld.css" media="handheld"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> Index: handheld.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/handheld.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** handheld.css 27 Aug 2005 08:52:37 -0000 1.1 --- handheld.css 30 Aug 2005 20:55:26 -0000 1.2 *************** *** 1,40 **** ! /* styles for handheld devices */ ! ! body { ! font-size: 1em; ! margin: 0; ! padding: 0; ! } ! ! a:link, a:link:visited { ! text-decoration: underline !important; ! } ! ! .openMessageBody { ! font-size: 0.9em; ! } ! ! .historyNavigatorBottom { ! display: none; ! } ! ! .removeButtonsBottom { ! display: none; ! } ! ! .columnControls { ! display: none; ! } ! ! .helpMessage { ! display: none; ! } ! ! .footer { ! display: none; ! } ! ! .configBarOption { ! display: block; ! float: none; ! } --- 1,89 ---- ! /* styles for handheld devices */ ! ! body { ! font-size: 0.9em; ! margin: 0; ! padding: 0; ! } ! ! a:link, a:link:visited { ! text-decoration: underline !important; ! } ! ! .openMessageBody { ! font-size: 0.9em; ! } ! ! .historyNavigatorBottom { ! display: none; ! } ! ! .removeButtonsBottom { ! display: none; ! } ! ! .columnControls { ! display: none; ! } ! ! .helpMessage { ! display: none; ! } ! ! .footer { ! display: none; ! } ! ! .configBar { ! position: relative !important; ! } ! ! .configBarOption { ! display: block; ! float: none; ! } ! ! table.historyTable td, table.historyTable tr { ! display: block; ! } ! ! .columnControls { ! display: none !important; ! } ! ! table.historyTable > tr.rowOdd td, table.historyTable > tr.rowOdd, ! table.historyTable > tr.rowEven td, table.historyTable > tr.rowEven { ! display: block !important; ! width: 100% !important; ! } ! ! tr.rowHeader { ! width: auto !important; ! display: block !important; ! } ! ! h2.history { ! display: none; ! } ! ! td.head { ! font-size: 1.1em; ! } ! ! td.historyNavigatorTop { ! display: block; ! text-align: left !important; ! } ! ! td.historyNavigatorTop div.refreshLink { ! display: none; ! } ! ! td.menuIndent { ! display: none; ! } ! ! th.historyLabel { ! display: block; ! text-align: left; ! } \ No newline at end of file |
|
From: Joseph C. <tex...@us...> - 2005-08-27 08:52:46
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16324/skins/default Modified Files: common-top.thtml magnet-page.thtml Added Files: handheld.css print.css Log Message: Add stylesheets for print and handhelds. Both remove some UI elements in effort to save paper and increase screen area for handheld users (assuming there are any). Both are general enough that they work with all skins. Move magnet page warning to top of table cell. Index: common-top.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-top.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** common-top.thtml 27 Aug 2005 06:35:58 -0000 1.7 --- common-top.thtml 27 Aug 2005 08:52:37 -0000 1.8 *************** *** 4,9 **** <title><TMPL_VAR NAME="Localize_Header_Title"></title> <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">rtl.css"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> --- 4,11 ---- <title><TMPL_VAR NAME="Localize_Header_Title"></title> <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" media="all" title="POPFile"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">rtl.css" media="all"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">print.css" media="print" title="print"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">handheld.css" media="handheld" title="handheld"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> Index: magnet-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** magnet-page.thtml 22 Aug 2005 08:37:44 -0000 1.13 --- magnet-page.thtml 27 Aug 2005 08:52:37 -0000 1.14 *************** *** 161,167 **** </td> ! <td> <div class="helpMessage"> ! <TMPL_VAR NAME="Localize_Magnet_Note"> </div> </td></tr></table> --- 161,167 ---- </td> ! <td valign="top"> <div class="helpMessage"> ! <TMPL_VAR NAME="Localize_Magnet_Note"> </div> </td></tr></table> --- NEW FILE: print.css --- /* styles for Printing */ body { font-size: 11pt; margin: 0; padding: 0; } a:link, a:link:visited { text-decoration: underline !important; } .openMessageBody { font-size: 10pt; } .headShutdown { display: none; } .historyNavigatorTop, .historyNavigatorBottom { display: none; } .removeButtonsTop, .removeButtonsBottom { display: none; } .columnControls { display: none; } .helpMessage form { display: none; } .openMessageCloser { display: none; } .footer { display: none; } .configBarHidden { display: none; } --- NEW FILE: handheld.css --- /* styles for handheld devices */ body { font-size: 1em; margin: 0; padding: 0; } a:link, a:link:visited { text-decoration: underline !important; } .openMessageBody { font-size: 0.9em; } .historyNavigatorBottom { display: none; } .removeButtonsBottom { display: none; } .columnControls { display: none; } .helpMessage { display: none; } .footer { display: none; } .configBarOption { display: block; float: none; } |
|
From: Joseph C. <tex...@us...> - 2005-08-27 06:36:08
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27327/skins/default Modified Files: common-top.thtml Added Files: rtl.css Log Message: Add beginings of automatic RTL skin support. Needs template conditional code to hide line 7 in normal LTR language cases. Index: common-top.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-top.thtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** common-top.thtml 19 May 2005 22:51:28 -0000 1.6 --- common-top.thtml 27 Aug 2005 06:35:58 -0000 1.7 *************** *** 4,8 **** <title><TMPL_VAR NAME="Localize_Header_Title"></title> <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile-Style"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> --- 4,9 ---- <title><TMPL_VAR NAME="Localize_Header_Title"></title> <link rel="icon" href="favicon.ico"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">style.css" title="POPFile"> ! <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="Skin_Root">rtl.css"> <TMPL_INCLUDE NAME="common-javascript.thtml"> </head> --- NEW FILE: rtl.css --- /* styles for Right to Left languages */ |
|
From: Joseph C. <tex...@us...> - 2005-08-27 06:36:08
|
Update of /cvsroot/popfile/engine/skins/sleet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27327/skins/sleet Added Files: rtl.css Log Message: Add beginings of automatic RTL skin support. Needs template conditional code to hide line 7 in normal LTR language cases. --- NEW FILE: rtl.css --- /* styles for Right to Left languages */ .shellTopLeft { background-image: url(topRight.gif); } .shellTopRight { background-image: url(topLeft.gif); } .shellLeft { background-image: url(right.gif); } .shellRight { background-image: url(left.gif); } .shellBottomLeft { background-image: url(bottomRight.gif); } .shellBottomRight { background-image: url(bottomLeft.gif); } |
|
From: Joseph C. <tex...@us...> - 2005-08-26 07:40:02
|
Update of /cvsroot/popfile/engine/skins/green In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/skins/green Modified Files: style.css Log Message: Update for 0.23 and remove the dashed borders. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/green/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** style.css 31 Jul 2004 18:04:31 -0000 1.3 --- style.css 26 Aug 2005 07:39:52 -0000 1.4 *************** *** 24,28 **** .shell, .shellTop { background-color: #7AAC80; ! border: 1px white dashed; color: white; } --- 24,28 ---- .shell, .shellTop { background-color: #7AAC80; ! border: 1px white solid; color: white; } *************** *** 56,60 **** background-color: #7AAC80; width: 8%; ! border: 1px white dashed; height: 20px; color: white; --- 56,60 ---- background-color: #7AAC80; width: 8%; ! border: 1px white solid; height: 20px; color: white; *************** *** 99,103 **** table.footer { background-color: #7AAC80; ! border: 1px white dashed; color: white; width: 100%; --- 99,103 ---- table.footer { background-color: #7AAC80; ! border: 1px white solid; color: white; width: 100%; *************** *** 220,224 **** } ! td.logo2menuSpace { height: 0.8em; } --- 220,224 ---- } ! td.logo2menuSpace { height: 0.8em; } *************** *** 255,262 **** --- 255,409 ---- } + /*********************************************************/ + /* Shell structure */ + + .shellStatusMessage { + color: #000000; + background-color: #EDEDCA; + border: 3px #CCCC99 solid; + width: 100%; + } + + .shellErrorMessage { + color: #FF0000; + background-color: #EDEDCA; + border: 3px #CCCC99 solid; + width: 100%; + } + + /*********************************************************/ + /* Menu Settings */ + + .menuLink { + display: block; + width: 100%; + } + + /*********************************************************/ + /* Messages */ + div.helpMessage { background-color: #3A8643; border: 1px solid #2A582F; padding: 0.3em; + } + + div.helpMessage form { + margin: 0; + } + + /*********************************************************/ + /* Form Labels */ + + th.historyLabel { + text-align: left; + } + + /*********************************************************/ + /* Positioning */ + + .historyNavigatorTop, .historyNavigatorBottom { + text-align: right; + vertical-align: top; + } + + .refreshLink { + margin-top: 0.5em; + } + + h2.history { + margin-top: 0; + margin-bottom: 0.3em; + } + + .search { + display: inline; + float: left; + padding-right: 1em; + } + + .filter { + display: inline; + } + + .removeButtonsTop { + padding-bottom: 1em; + } + + .viewHeadings { + display: inline; + } + + /*********************************************************/ + /* Config Bars */ + + .configBar, .configBarHidden { + padding-top: 1em; + } + + .configBarTitle { + font-size: 1em; + display: inline; + } + + .configBarTitle a { + border: 1px white solid; + padding: 0.3em; padding-bottom: 0; + margin-left: 0.3em; + background-color: #2A582F; + font-weight: normal; + font-size: 0.8em; + } + + .configBarBody { + background-color: #3A8643; + border-top: 1px solid white; + } + + .configBar td { + border: 1px solid white; + border-top: 0; + } + + .configBarBody form { + margin: 0; + } + + .configBarOption { + border: 1px solid white; + margin: 0.3em; + padding: 0.3em; + display: inline; + float: left; + min-height: 3em; + background-color: #2A582F; + } + + .checkLabel { + border: 1px solid white; + white-space: nowrap; + } + + .configBarBody input.submit { + margin-top: 0.1em; + } + + .configBarBody label.configurationLabel { + display: block; + } + + /*********************************************************/ + /* History Column Controls */ + + .columnControls { + white-space:nowrap; + vertical-align: top; + width: 10px; + } + + .columnRemove, .columnMove { + display: block; + width:100%; + height: 1em; } |
|
From: Joseph C. <tex...@us...> - 2005-08-26 07:21:15
|
Update of /cvsroot/popfile/engine/skins/smalldefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27021/skins/smalldefault Modified Files: style.css Log Message: Add missing padding above config bar. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/smalldefault/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** style.css 15 Aug 2005 03:49:42 -0000 1.5 --- style.css 26 Aug 2005 07:21:05 -0000 1.6 *************** *** 341,344 **** --- 341,348 ---- /* Config Bar */ + .configBar { + padding-top: 1em; + } + .configBarTitle { display: inline; |
|
From: Joseph C. <tex...@us...> - 2005-08-26 07:21:14
|
Update of /cvsroot/popfile/engine/skins/tinygrey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27021/skins/tinygrey Modified Files: style.css Log Message: Add missing padding above config bar. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/tinygrey/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** style.css 26 Aug 2005 06:33:35 -0000 1.5 --- style.css 26 Aug 2005 07:21:06 -0000 1.6 *************** *** 436,444 **** .rowOdd select { ! font-size: 75%; } .rowEven select { ! font-size: 75%; } --- 436,444 ---- .rowOdd select { ! font-size: 100%; } .rowEven select { ! font-size: 100%; } *************** *** 568,571 **** --- 568,575 ---- /* Config Bars */ + .configBar { + padding-top: 1em; + } + .configBarTitle { display: inline; |
|
From: Joseph C. <tex...@us...> - 2005-08-26 07:21:14
|
Update of /cvsroot/popfile/engine/skins/smallgrey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27021/skins/smallgrey Modified Files: style.css Log Message: Add missing padding above config bar. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/smallgrey/style.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** style.css 24 Aug 2005 09:06:09 -0000 1.4 --- style.css 26 Aug 2005 07:21:06 -0000 1.5 *************** *** 422,425 **** --- 422,429 ---- /* Config Bars */ + .configBar { + padding-top: 1em; + } + .configBarTitle { font-size: 100%; |
|
From: Joseph C. <tex...@us...> - 2005-08-26 07:21:14
|
Update of /cvsroot/popfile/engine/skins/oceanblue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27021/skins/oceanblue Modified Files: style.css Log Message: Add missing padding above config bar. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/oceanblue/style.css,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** style.css 15 Aug 2005 03:49:42 -0000 1.10 --- style.css 26 Aug 2005 07:21:05 -0000 1.11 *************** *** 428,432 **** .configBar, .configBarHidden { ! padding-top: 0; } --- 428,432 ---- .configBar, .configBarHidden { ! padding-top: 0.5em; } |
|
From: Joseph C. <tex...@us...> - 2005-08-26 06:33:43
|
Update of /cvsroot/popfile/engine/skins/tinygrey In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17017/skins/tinygrey Modified Files: style.css Log Message: Some minor improvements. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/tinygrey/style.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** style.css 25 Aug 2005 08:41:42 -0000 1.4 --- style.css 26 Aug 2005 06:33:35 -0000 1.5 *************** *** 428,432 **** input { ! font-size: 67%; } --- 428,432 ---- input { ! font-size: 70%; } *************** *** 480,483 **** --- 480,487 ---- } + optgroup { + font-size: inherit; /* fix Moz 1.0 bug with % font sizes */ + } + /*********************************************************/ /* Shell structure */ *************** *** 583,587 **** background-color: #cccccc; border-bottom: 1px solid #666699; - } --- 587,590 ---- *************** *** 633,635 **** height: 1em; } - --- 636,637 ---- |
|
From: Joseph C. <tex...@us...> - 2005-08-25 09:06:16
|
Update of /cvsroot/popfile/engine/skins/sleet-rtl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21353/skins/sleet-rtl Modified Files: style.css Log Message: Update Sleet-RTL for 0.23. Remove comments in Sleet that mess up Moz parsing. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/sleet-rtl/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** style.css 10 Aug 2004 02:11:17 -0000 1.5 --- style.css 25 Aug 2005 09:06:07 -0000 1.6 *************** *** 398,405 **** } div.helpMessage { background-color: #545F74; border: 1px solid #888888; padding: 0.4em; ! padding-bottom: 0; } --- 398,562 ---- } + /*********************************************************/ + /* Shell structure */ + + .shellStatusMessage { + color: #000000; + background-color: #EDEDCA; + border: 3px #CCCC99 solid; + width: 100%; + } + + .shellErrorMessage { + color: #FF0000; + background-color: #EDEDCA; + border: 3px #CCCC99 solid; + width: 100%; + } + + /*********************************************************/ + /* Menu Settings */ + + .menuLink { + display: block; + width: 100%; + } + + /*********************************************************/ + /* Messages */ + div.helpMessage { background-color: #545F74; border: 1px solid #888888; padding: 0.4em; ! } ! ! div.helpMessage form { ! margin: 0; ! } ! ! /*********************************************************/ ! /* Form Labels */ ! ! th.historyLabel { ! text-align: left; ! } ! ! /*********************************************************/ ! /* Positioning */ ! ! .historyNavigatorTop, .historyNavigatorBottom { ! text-align: right; ! vertical-align: top; ! } ! ! .historyNavigatorTop form, .historyNavigatorBottom form { ! display:inline; ! } ! ! .refreshLink { ! margin-top: 0.5em; ! } ! ! h2.history { ! margin-top: 0; ! margin-bottom: 0.3em; ! } ! ! .search { ! display: inline; ! float: left; ! padding-right: 1em; ! } ! ! .filter { ! display: inline; ! } ! ! .removeButtonsTop { ! padding-bottom: 1em; ! } ! ! .viewHeadings { ! display: inline; ! } ! ! /*********************************************************/ ! /* Config Bars */ ! ! .configBar, .configBarHidden { ! padding-top: 1em; ! } ! ! .configBarTitle { ! font-size: 1em; ! display: inline; ! } ! ! .configBarTitle a { ! border: 1px #888888 solid; ! border-bottom: 0; ! padding: 0.3em 0.8em; ! padding-bottom: 2px; ! margin-left: 1em; ! background-color: #545F74; ! font-weight: bold; ! font-size: 1em; ! text-decoration: none; ! } ! ! .configBarHidden .configBarTitle a { ! border: 1px #888888 solid; ! } ! ! .configBarBody { ! background-color: #545F74; ! border-bottom: 1px solid #888888; ! } ! ! .configBar td { ! border: 1px solid #888888; ! border-bottom: 0; ! } ! ! .configBarBody form { ! margin: 0; ! } ! ! .configBarOption { ! border: 1px solid #888888; ! margin: 0.3em; ! padding: 0.3em; ! display: inline; ! float: left; ! min-height: 3em; ! background-color: #424D63; ! } ! ! .checkLabel { ! border: 1px solid #888888; ! white-space: nowrap; ! } ! ! .configBarBody input.submit { ! margin-top: 0.1em; ! } ! ! .configBarBody label.configurationLabel { ! display: block; ! } ! ! /*********************************************************/ ! /* History Column Controls */ ! ! .columnControls { ! white-space:nowrap; ! vertical-align: top; ! width: 10px; ! } ! ! .columnRemove, .columnMove { /* makes area around the controls clickable for bigger target */ ! display: block; ! width:100%; ! height: 1em; } |
|
From: Joseph C. <tex...@us...> - 2005-08-25 09:06:16
|
Update of /cvsroot/popfile/engine/skins/sleet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21353/skins/sleet Modified Files: style.css Log Message: Update Sleet-RTL for 0.23. Remove comments in Sleet that mess up Moz parsing. Index: style.css =================================================================== RCS file: /cvsroot/popfile/engine/skins/sleet/style.css,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** style.css 15 Aug 2005 08:43:01 -0000 1.6 --- style.css 25 Aug 2005 09:06:07 -0000 1.7 *************** *** 401,405 **** /* Shell structure */ ! .shellStatusMessage { // error message bar that appears between shelltop and shell color: #000000; background-color: #EDEDCA; --- 401,405 ---- /* Shell structure */ ! .shellStatusMessage { color: #000000; background-color: #EDEDCA; *************** *** 408,412 **** } ! .shellErrorMessage { // error message bar that appears between shelltop and shell color: #FF0000; background-color: #EDEDCA; --- 408,412 ---- } ! .shellErrorMessage { color: #FF0000; background-color: #EDEDCA; *************** *** 418,422 **** /* Menu Settings */ ! .menuLink { /* makes entire menu tab clickable */ display: block; width: 100%; --- 418,422 ---- /* Menu Settings */ ! .menuLink { display: block; width: 100%; *************** *** 440,444 **** th.historyLabel { ! text-align: left; // optional } --- 440,444 ---- th.historyLabel { ! text-align: left; } *************** *** 452,468 **** .historyNavigatorTop form, .historyNavigatorBottom form { ! display:inline; // optional, lets Go box be on same line as navigation widget } ! .refreshLink { // optional, link can be hidden margin-top: 0.5em; } ! h2.history { // optional margin-top: 0; margin-bottom: 0.3em; } ! .search { // search part of search widget display: inline; float: left; --- 452,468 ---- .historyNavigatorTop form, .historyNavigatorBottom form { ! display:inline; } ! .refreshLink { margin-top: 0.5em; } ! h2.history { margin-top: 0; margin-bottom: 0.3em; } ! .search { display: inline; float: left; *************** *** 470,478 **** } ! .filter { // filter part of search widget ! display: inline; // force search widget forms to appear on one line } ! .removeButtonsTop { // spacing for top remove buttons (can be used to hide the top set of buttons) padding-bottom: 1em; } --- 470,478 ---- } ! .filter { ! display: inline; } ! .removeButtonsTop { padding-bottom: 1em; } *************** *** 510,514 **** } - .configBarBody { background-color: #545F74; --- 510,513 ---- *************** *** 557,561 **** } ! .columnRemove, .columnMove { /* makes area around the controls clickable for bigger target */ display: block; width:100%; --- 556,560 ---- } ! .columnRemove, .columnMove { display: block; width:100%; |
11 messages has been excluded from this view by a project administrator.
