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: naoki i. <am...@us...> - 2007-10-16 17:19:49
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24449/POPFile Modified Files: Tag: b0_22_2 History.pm Log Message: Use transactions inserting, updating and deleting records in history table to improve performance and avoid 'database is locked' error messages. Index: History.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/History.pm,v retrieving revision 1.29.4.1 retrieving revision 1.29.4.2 diff -C2 -d -r1.29.4.1 -r1.29.4.2 *** History.pm 6 Feb 2006 15:15:53 -0000 1.29.4.1 --- History.pm 16 Oct 2007 17:19:52 -0000 1.29.4.2 *************** *** 284,287 **** --- 284,290 ---- $self->log_( 2, "reserve_slot selected random number $r" ); + # Avoid another POPFile process using the same committed id + $self->db__()->begin_work; + # TODO Replace the hardcoded user ID 1 with the looked up # user ID from the session key *************** *** 291,294 **** --- 294,298 ---- if ( defined( $test ) ) { + $self->db__()->commit; next; } *************** *** 306,309 **** --- 310,314 ---- my $result = $self->db__()->selectrow_arrayref( "select id from history where committed = $r limit 1;"); + $self->db__()->commit; my $slot = $result->[0]; *************** *** 502,505 **** --- 507,511 ---- } + $self->db__()->begin_work; foreach my $entry (@{$self->{commit_list__}}) { my ( $session, $slot, $bucket, $magnet ) = @{$entry}; *************** *** 640,643 **** --- 646,650 ---- } } + $self->db__()->commit; $self->{commit_list__} = (); *************** *** 722,725 **** --- 729,733 ---- $self->{classifier__}->tweak_sqlite( 1, 1, $self->db__() ); + $self->db__()->begin_work; } *************** *** 736,739 **** --- 744,748 ---- my ( $self ) = @_; + $self->db__()->commit; $self->{classifier__}->tweak_sqlite( 1, 0, $self->db__() ); } |
|
From: naoki i. <am...@us...> - 2007-10-16 15:56:40
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26712/languages Modified Files: Tag: b0_22_2 Japanese-parser.nsh Japanese-pfi.nsh Log Message: Update Japanese translation Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.6 retrieving revision 1.54.4.7 diff -C2 -d -r1.54.4.6 -r1.54.4.7 *** Japanese-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.54.4.6 --- Japanese-pfi.nsh 16 Oct 2007 15:56:42 -0000 1.54.4.7 *************** *** 28,32 **** # # Translation created by: Junya Ishihara (UTF-8: E79FB3 E58E9F E6B7B3 E4B99F) (jishiha at users.sourceforge.net) ! # Translation updated by: Junya Ishihara (UTF-8: E79FB3 E58E9F E6B7B3 E4B99F) (jishiha at users.sourceforge.net) # #-------------------------------------------------------------------------- --- 28,32 ---- # # Translation created by: Junya Ishihara (UTF-8: E79FB3 E58E9F E6B7B3 E4B99F) (jishiha at users.sourceforge.net) ! # Translation updated by: Naoki IIMURA (UTF-8: E38184 E38184 E38280 E38289 E381AA E3818A E3818D) (amatubu at users.sourceforge.net) # #-------------------------------------------------------------------------- *************** *** 170,174 **** ; Installation Log Messages [installer.nsi, addssl.nsi] ! !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "Saving install log file..." ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] --- 170,174 ---- ; Installation Log Messages [installer.nsi, addssl.nsi] ! !insertmacro PFI_LANG_STRING PFI_LANG_PROG_SAVELOG "CXg[Ot@CðÛ¶µÄ¢Ü·..." ; Message Box text strings [installer.nsi, adduser.nsi, pfi-library.nsh] *************** *** 224,228 **** !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "POPFile Ì[Xm[gð\¦µÜ·©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "AbvO[hÌêÍuYesvð§µÜ·B(AbvO[hÌOÉobNAbvðæé±Æð§µÜ·B)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 224,228 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_1 "POPFile Ì[Xm[gð\¦µÜ·©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBRELNOTES_2 "AbvO[hÌêÍuÍ¢vð§µÜ·B(AbvO[hÌOÉobNAbvðæé±Æð§µÜ·B)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 355,359 **** ; Message box used to get permission to delete the old minimal Perl before installing the new one ! !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Vµ¢o[WðCXg[·éOÉAÈOÌŬo[WÌPerltH_ȺÌSÄÌt@CðíµÄàæ¢Å·©?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 355,359 ---- ; Message box used to get permission to delete the old minimal Perl before installing the new one ! !insertmacro PFI_LANG_STRING PFI_LANG_MINPERL_MBREMOLD "Vµ¢o[WðCXg[·éOÉAÈOÌŬo[WÌ Perl tH_ȺÌSÄÌt@CðíµÄàæ¢Å·©?${MB_NL}${MB_NL}($G_PLS_FIELD_1)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 363,378 **** ; Page Title and Sub-title displayed in the page header of the uninstaller's first page ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" ; Text for the MODIFY mode radio-button and the label underneath it ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support, change the Nihongo parser)" ; Text for the UNINSTALL mode radio-button and the label underneath it ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 363,378 ---- ; Page Title and Sub-title displayed in the page header of the uninstaller's first page ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "POPFile ACXg[Ì®ì[hÌIð" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "$INSTDIR tH_ÉCXg[³êÄ¢é POPFile ðÏXàµÍACXg[µÜ·" ; Text for the MODIFY mode radio-button and the label underneath it ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "·ÅÉCXg[³êÄ¢é POPFile ÌÏX" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(á : SSL T|[gðÇÁµ½èú{êp[TðÏXµ½èµÜ·)" ; Text for the UNINSTALL mode radio-button and the label underneath it ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "POPFile vOÌACXg[" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(Rs [^©ç POPFile vOð·×ÄíµÜ·)" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 382,395 **** ; Page Title/Sub-Title shown in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" ; Text explaining what this page shows ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" ; Text shown above the box showing the folder where the extra components will be installed ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 382,395 ---- ; Page Title/Sub-Title shown in the page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "·ÅÉ POPFile ªCXg[³êÄ¢éê" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "Ið³ê½ POPFile R|[lgªCXg[³êéêÅ·" ; Text explaining what this page shows ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "ZbgAbvÍÇÁR|[lgð±ÌtH_ÉCXg[³êÄ¢é POPFile ÉÇÁµÜ·BR|[lgðIðµÈ¨·êÍAßé{^ðNbNµÄ¾³¢B $_CLICK" ; Text shown above the box showing the folder where the extra components will be installed ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Vµ¢ POPFile R|[lgÌCXg[ætH_" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 399,413 **** ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." ; Uninstall Progress Reports displayed above the progress bar --- 399,413 ---- ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "$(^NameDA) ªAbvf[g³êéÜÅÌÔµÎç¨Ò¿¾³¢" ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "ÇÁ^íª®¹µÜµ½" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "ÇÁ^íͳíÉ®¹µÜµ½B" ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "ÇÁ^í͸sµÜµ½" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "ÇÁ^íͳíÉ®¹µÜ¹ñŵ½B" ; Uninstall Progress Reports displayed above the progress bar *************** *** 425,429 **** ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "POPFile fBNgȺÌSÄÌt@CðíµÜ·©H${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(cµ½¢t@Cª êÎ No ðNbNµÄº³¢B)" --- 425,429 ---- ; Message Box text strings ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "POPFile fBNgȺÌSÄÌt@CðíµÜ·©H${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(cµ½¢t@Cª êÎ ¢¢¦ ðNbNµÄº³¢B)" *************** *** 525,529 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "The SSL Support files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "$G_PLS_FIELD_1 t@Cð_E[hūܹñŵ½B" --- 525,529 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_CHECKINTERNET "SSL pÌt@CÍC^[lbg©ç_E[h³êÜ·B${MB_NL}${MB_NL}C^[lbgÚ±ª_EµÄ¢é©³øÉÈÁÄ¢éæ¤Å·B${MB_NL}${MB_NL}CXg[ð±¯éÉÍÚ±µÈ¨µÄ©ç Retry ðNbNµÄ¾³¢" !insertmacro PFI_LANG_STRING PFI_LANG_MB_NSISDLFAIL_1 "$G_PLS_FIELD_1 t@Cð_E[hūܹñŵ½B" *************** *** 532,536 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "$G_PLS_FIELD_1 tH_ÉηéCXg[ìÆÉG[ªo³êܵ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "SSLpÌt@CðCXg[ūܹñŵ½B${MB_NL}${MB_NL}ÄxCXg[ðÝéÉÍAãÅÌR}hðÀsµÄ¾³¢B${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 532,536 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "$G_PLS_FIELD_1 tH_ÉηéCXg[ìÆÉG[ªo³êܵ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "SSL pÌt@CðCXg[ūܹñŵ½B${MB_NL}${MB_NL}ÄxCXg[ðÝéÉÍAãÅÌR}hðÀsµÄ¾³¢B${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 538,545 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "Downgrading SSL.pm to v0.97" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm patch status: $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm file has been downgraded to v0.97" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm file has not been downgraded to v0.97" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 538,545 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPREPAREPATCH "SSL.pm ð v0.97 É_EO[hµÄ¢Ü·" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHSTATUS "SSL.pm pb`Xe[^X: $G_PLS_FIELD_2" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHCOMPLETED "SSL.pm t@CÍ v0.97 É_EO[h³êܵ½" ! !insertmacro PFI_LANG_STRING PFI_LANG_SSLPATCHFAILED "SSL.pm t@CÍ v0.97 É_EO[h³êܹñŵ½" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 638,643 **** !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_A "POPFile 'stopwords' ÍÈOÉCXg[³ê½t@CÅ·B" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_B "Abvf[gµÄàæ뵢ŷ©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_C "Abvf[g·éÉÍuYesvðNbNµÄº³¢B(ât@CÍ̼OÅÛ¶³êÜ·: 'stopwords.bak')" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_D "ât@Cðc·ÉÍuNovðNbNµÄº³¢B(Vµ¢t@CÍ̼OÅÛ¶³êÜ·: 'stopwords.default')" !insertmacro PFI_LANG_STRING PFI_LANG_MBCORPUS_1 "â corpus ðobNAbvÉG[ª©Â©èܵ½B" --- 638,643 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_A "POPFile 'stopwords' ÍÈOÉCXg[³ê½t@CÅ·B" !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_B "Abvf[gµÄàæ뵢ŷ©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_C "Abvf[g·éÉÍuÍ¢vðNbNµÄº³¢B(ât@CÍ̼OÅÛ¶³êÜ·: 'stopwords.bak')" ! !insertmacro PFI_LANG_STRING PFI_LANG_MBSTPWDS_D "ât@Cðc·ÉÍu¢¢¦vðNbNµÄº³¢B(Vµ¢t@CÍ̼OÅÛ¶³êÜ·: 'stopwords.default')" !insertmacro PFI_LANG_STRING PFI_LANG_MBCORPUS_1 "â corpus ðobNAbvÉG[ª©Â©èܵ½B" *************** *** 772,776 **** !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_A "$G_PLS_FIELD_1 ÂÌoPcª POPFile pÉ쬳êܵ½B" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_B "±êçÌoPcðg¤æ¤ POPFile ðÝèµÄàæ뵢ŷ©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_C "oPcÌIððÏX·éÉÍuNovðNbNµÄº³¢B" ; TempTranslationNote: PFI_LANG_CBP_MBMAKERR_A = PFI_LANG_CBP_MBMAKERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAKERR_2 + " $G_PLS_FIELD_2 " + PFI_LANG_CBP_MBMAKERR_3 --- 772,776 ---- !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_A "$G_PLS_FIELD_1 ÂÌoPcª POPFile pÉ쬳êܵ½B" !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_B "±êçÌoPcðg¤æ¤ POPFile ðÝèµÄàæ뵢ŷ©H" ! !insertmacro PFI_LANG_STRING PFI_LANG_CBP_MBDONE_C "oPcÌIððÏX·éÉÍu¢¢¦vðNbNµÄº³¢B" ; TempTranslationNote: PFI_LANG_CBP_MBMAKERR_A = PFI_LANG_CBP_MBMAKERR_1 + " $G_PLS_FIELD_1 " + PFI_LANG_CBP_MBMAKERR_2 + " $G_PLS_FIELD_2 " + PFI_LANG_CBP_MBMAKERR_3 *************** *** 795,799 **** !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "[NCAgÌÝèÏXÍLZ³êܵ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "No suitable email clients found" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 795,799 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_CANCEL "[NCAgÌÝèÏXÍLZ³êܵ½B" ! !insertmacro PFI_LANG_STRING PFI_LANG_MAILCFG_IO_NOMATCHES "ÝèÏXªÂ\È[NCAgª©Â©èܹñŵ½" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 1008,1015 **** !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_1 "¢Â©Ì[NCAgÌÝèð³Éß·±ÆªÅ«Ü¹ñŵ½I" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_2 "(Ú×É¢ÄÍ $INSTDIR tH_ðQƵľ³¢B)" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_3 "'No' ðNbN·êÎG[ð³µÄSÄðíµÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_4 "'Yes' ðNbN·êÎf[^ÍÛ¶³êÜ·B(±êÍAãÅܽÄs·é̽ßÅ·B)" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_2 "POPFileu[U[f[^vfBNgȺÌSÄÌt@CðíµÜ·©H${MB_NL}${MB_NL}$G_USERDIR${MB_NL}${MB_NL}(cµ½¢t@Cª êÎ No ðNbNµÄº³¢B)" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBDELMSGS_1 "'Recent Messages' fBNgÌSÄÌt@CðíµÜ·©H" --- 1008,1015 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_1 "¢Â©Ì[NCAgÌÝèð³Éß·±ÆªÅ«Ü¹ñŵ½I" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_2 "(Ú×É¢ÄÍ $INSTDIR tH_ðQƵľ³¢B)" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_3 "'¢¢¦' ðNbN·êÎG[ð³µÄSÄðíµÜ·B" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBRERUN_4 "'Í¢' ðNbN·êÎf[^ÍÛ¶³êÜ·B(±êÍAãÅܽÄs·é̽ßÅ·B)" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_2 "POPFileu[U[f[^vfBNgȺÌSÄÌt@CðíµÜ·©H${MB_NL}${MB_NL}$G_USERDIR${MB_NL}${MB_NL}(cµ½¢t@Cª êÎ ¢¢¦ ðNbNµÄº³¢B)" !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBDELMSGS_1 "'Recent Messages' fBNgÌSÄÌt@CðíµÜ·©H" Index: Japanese-parser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Attic/Japanese-parser.nsh,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Japanese-parser.nsh 14 Oct 2007 17:26:07 -0000 1.1.2.2 --- Japanese-parser.nsh 16 Oct 2007 15:56:42 -0000 1.1.2.3 *************** *** 83,91 **** ; Message shown if internet connection does not appear to be working ! !define C_NPLS_CHECKINTERNET "The MeCab files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" ; Message shown if unable to download and install the MeCab files) ! !define C_NPLS_REPEATMECAB "Unable to install the MeCab files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1${MB_NL}${MB_NL}or use 'Add/Remove Programs' entry for POPFile" #-------------------------------------------------------------------------- --- 83,91 ---- ; Message shown if internet connection does not appear to be working ! !define C_NPLS_CHECKINTERNET "MeCab Ìt@CÍC^[lbg©ç_E[h³êÜ·B${MB_NL}${MB_NL}C^[lbgÚ±ª_EµÄ¢é©³øÉÈÁÄ¢éæ¤Å·B${MB_NL}${MB_NL}CXg[ð±¯éÉÍÚ±µÈ¨µÄ©ç Retry ðNbNµÄ¾³¢" ; Message shown if unable to download and install the MeCab files) ! !define C_NPLS_REPEATMECAB "MeCab Ìt@CðCXg[ūܹñŵ½!${MB_NL}${MB_NL}ÄxCXg[ðÝéÉÍAãÅÌR}h${MB_NL}${MB_NL}$G_PLS_FIELD_1${MB_NL}${MB_NL}ðÀs·é©AuvOÌÇÁÆívÌ POPFile ÌÚðgpµÄ¾³¢" #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:49:20
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27608 Modified Files: Tag: b0_22_2 adduser.nsi Log Message: The next release will be 1.0.0 (instead of 0.22.6) Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.17 retrieving revision 1.59.4.18 diff -C2 -d -r1.59.4.17 -r1.59.4.18 *** adduser.nsi 5 Oct 2007 18:28:45 -0000 1.59.4.17 --- adduser.nsi 14 Oct 2007 17:49:20 -0000 1.59.4.18 *************** *** 2238,2243 **** # currently uses DBD::SQLite then change the configuration in popfile.cfg to use DBD::SQLite2. # ! # The 0.22.6 release introduced the ability to select the parser used to split Japanese text ! # into words. Previous releases only supported the 'Kakasi' parser but 0.22.6 offers a choice # of 'Kakasi', 'MeCab' or 'Internal', controlled by the new 'bayes_nihongo_parser' parameter. # Valid values for this new popfile.cfg parameter are kakasi, mecab or internal. --- 2238,2243 ---- # currently uses DBD::SQLite then change the configuration in popfile.cfg to use DBD::SQLite2. # ! # The 1.0.0 release introduced the ability to select the parser used to split Japanese text ! # into words. Previous releases only supported the 'Kakasi' parser but 1.0.0 offers a choice # of 'Kakasi', 'MeCab' or 'Internal', controlled by the new 'bayes_nihongo_parser' parameter. # Valid values for this new popfile.cfg parameter are kakasi, mecab or internal. *************** *** 2257,2261 **** !define L_TEXTEND $R0 ; used to ensure correct handling of lines longer than 1023 chars !define L_SKIN $9 ; current skin setting ! !define L_PARSER $8 ; current Nihongo parser setting (introduced in 0.22.6 release) Push ${L_CFG} --- 2257,2261 ---- !define L_TEXTEND $R0 ; used to ensure correct handling of lines longer than 1023 chars !define L_SKIN $9 ; current skin setting ! !define L_PARSER $8 ; current Nihongo parser setting (introduced in 1.0.0 release) Push ${L_CFG} |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:42:58
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812 Modified Files: Tag: b0_22_2 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: Add the extra strings used by the uninstaller when it is modifying an existing installation. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Swedish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 --- Swedish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.59.4.4 retrieving revision 1.59.4.5 diff -C2 -d -r1.59.4.4 -r1.59.4.5 *** PortugueseBR-pfi.nsh 29 Aug 2006 16:17:51 -0000 1.59.4.4 --- PortugueseBR-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.59.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.44.4.4 retrieving revision 1.44.4.5 diff -C2 -d -r1.44.4.4 -r1.44.4.5 *** TradChinese-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.44.4.4 --- TradChinese-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.44.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 352,358 **** --- 352,408 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.48.4.4 retrieving revision 1.48.4.5 diff -C2 -d -r1.48.4.4 -r1.48.4.5 *** Spanish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.48.4.4 --- Spanish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.48.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** SimpChinese-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 --- SimpChinese-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 352,358 **** --- 352,408 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Portuguese-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.43.4.4 --- Portuguese-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Slovak-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 --- Slovak-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.36.4.4 retrieving revision 1.36.4.5 diff -C2 -d -r1.36.4.4 -r1.36.4.5 *** Polish-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.36.4.4 --- Polish-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.36.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Russian-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 --- Russian-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Ukrainian-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.43.4.4 --- Ukrainian-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.32.4.4 retrieving revision 1.32.4.5 diff -C2 -d -r1.32.4.4 -r1.32.4.5 *** Turkish-pfi.nsh 29 Aug 2006 16:17:52 -0000 1.32.4.4 --- Turkish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.32.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:34:24
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21358 Modified Files: Tag: b0_22_2 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 Log Message: Add the extra strings used by the uninstaller when it is modifying an existing installation. Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.45.4.4 retrieving revision 1.45.4.5 diff -C2 -d -r1.45.4.4 -r1.45.4.5 *** French-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.45.4.4 --- French-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.45.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.35.4.4 retrieving revision 1.35.4.5 diff -C2 -d -r1.35.4.4 -r1.35.4.5 *** Greek-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.35.4.4 --- Greek-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.35.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.48.4.4 retrieving revision 1.48.4.5 diff -C2 -d -r1.48.4.4 -r1.48.4.5 *** German-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.48.4.4 --- German-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.48.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 360,366 **** --- 360,416 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.29.4.4 retrieving revision 1.29.4.5 diff -C2 -d -r1.29.4.4 -r1.29.4.5 *** Norwegian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.29.4.4 --- Norwegian-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.29.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.44.4.4 retrieving revision 1.44.4.5 diff -C2 -d -r1.44.4.4 -r1.44.4.5 *** Korean-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.44.4.4 --- Korean-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.44.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.33.4.4 retrieving revision 1.33.4.5 diff -C2 -d -r1.33.4.4 -r1.33.4.5 *** Italian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.33.4.4 --- Italian-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.33.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Hungarian-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.43.4.4 --- Hungarian-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.5 retrieving revision 1.54.4.6 diff -C2 -d -r1.54.4.5 -r1.54.4.6 *** Japanese-pfi.nsh 29 Aug 2006 16:13:06 -0000 1.54.4.5 --- Japanese-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.54.4.6 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support, change the Nihongo parser)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Finnish-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 --- Finnish-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:29:41
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19852 Modified Files: Tag: b0_22_2 Arabic-pfi.nsh Bulgarian-pfi.nsh Catalan-pfi.nsh Czech-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Log Message: Add the extra strings used by the uninstaller when it is modifying an existing installation. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Danish-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 --- Danish-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.38.4.4 retrieving revision 1.38.4.5 diff -C2 -d -r1.38.4.4 -r1.38.4.5 *** Czech-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.38.4.4 --- Czech-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.38.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.45.4.4 retrieving revision 1.45.4.5 diff -C2 -d -r1.45.4.4 -r1.45.4.5 *** English-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.45.4.4 --- English-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.45.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 343,349 **** --- 343,399 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support, change the Nihongo parser)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Catalan-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Catalan-pfi.nsh,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** Catalan-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.1.2.5 --- Catalan-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.1.2.6 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2005-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.16.4.4 retrieving revision 1.16.4.5 diff -C2 -d -r1.16.4.4 -r1.16.4.5 *** Arabic-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.16.4.4 --- Arabic-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.16.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 358,364 **** --- 358,414 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Dutch-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 --- Dutch-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.43.4.4 retrieving revision 1.43.4.5 diff -C2 -d -r1.43.4.4 -r1.43.4.5 *** Bulgarian-pfi.nsh 29 Aug 2006 16:07:40 -0000 1.43.4.4 --- Bulgarian-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 *************** *** 8,12 **** # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # These strings are grouped according to the page/window and script where they are used # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 348,354 **** --- 348,404 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Custom Page - Select uninstaller mode [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title and Sub-title displayed in the page header of the uninstaller's first page + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_TITLE "Select POPFile uninstaller mode" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_MODE_SUBTITLE "Modify or uninstall the installation in the $INSTDIR folder" + + ; Text for the MODIFY mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_RADIO "Modify the existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_MODE_LABEL "(e.g. add SSL Support)" + + ; Text for the UNINSTALL mode radio-button and the label underneath it + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_RADIO "Uninstall the POPFile program" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_IO_UNINST_LABEL "(remove all of the POPFile program files from the computer)" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_DIRECTORY [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + ; Page Title/Sub-Title shown in the page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TITLE "Location of existing POPFile installation" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_SUBTITLE "This is where the selected POPFile components will be installed" + + ; Text explaining what this page shows + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "Setup will modify the POPFile installation in this folder by adding extra components to it. To change the component selection, click the Back button. $_CLICK" + + ; Text shown above the box showing the folder where the extra components will be installed + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_TEXT_DESTN "Destination folder for the new POPFile components" + + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ; POPFile Installer: Standard MUI Page - UNPAGE_INSTFILES [installer.nsi] ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; Page Sub-title displayed when MODIFYING the installation (one of the standard MUI strings is used for the Title) + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_SUBTITLE "Please wait while $(^NameDA) is being updated" + + ; Page Title and Sub-Title shown instead of the default "Uninstallation complete..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_TITLE "Add/Remove operation complete" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_OK_SUBTITLE "Add/Remove operation was completed successfully." + + ; Page Title and Sub-Title shown instead of the default "Uninstallation Aborted..." page header + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_TITLE "Add/Remove operation aborted" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_INST_BAD_SUBTITLE "Add/Remove operation was not completed successfully." + ; Uninstall Progress Reports displayed above the progress bar |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:26:06
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19497 Modified Files: Tag: b0_22_2 English-parser.nsh Japanese-parser.nsh Log Message: Extra strings for use when downloading the MeCab files. To do: stop referring to the program name when using the uninstaller! Index: Japanese-parser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Attic/Japanese-parser.nsh,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Japanese-parser.nsh 5 Oct 2007 18:36:51 -0000 1.1.2.1 --- Japanese-parser.nsh 14 Oct 2007 17:26:07 -0000 1.1.2.2 *************** *** 77,80 **** --- 77,92 ---- !define C_NPLS_SUMMARY_INTERNAL "ú{êvOiuà p[Tvªgp³êÜ·j" + ;------------------------------------------------------------------------------------------- + ; Standard MUI Page - INSTFILES (messages displayed when attempting to download the MeCab files) + ;------------------------------------------------------------------------------------------- + + ; Message shown if internet connection does not appear to be working + + !define C_NPLS_CHECKINTERNET "The MeCab files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" + + ; Message shown if unable to download and install the MeCab files) + + !define C_NPLS_REPEATMECAB "Unable to install the MeCab files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1${MB_NL}${MB_NL}or use 'Add/Remove Programs' entry for POPFile" + #-------------------------------------------------------------------------- # End of 'Japanese-parser.nsh' Index: English-parser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Attic/English-parser.nsh,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** English-parser.nsh 5 Oct 2007 18:36:51 -0000 1.1.2.1 --- English-parser.nsh 14 Oct 2007 17:26:07 -0000 1.1.2.2 *************** *** 77,80 **** --- 77,92 ---- !define C_NPLS_SUMMARY_INTERNAL "Nihongo parser (the 'internal' parser will be used)" + ;------------------------------------------------------------------------------------------- + ; Standard MUI Page - INSTFILES (messages displayed when attempting to download the MeCab files) + ;------------------------------------------------------------------------------------------- + + ; Message shown if internet connection does not appear to be working + + !define C_NPLS_CHECKINTERNET "The MeCab files will be downloaded from the Internet.${MB_NL}${MB_NL}Your Internet connection seems to be down or disabled.${MB_NL}${MB_NL}Please reconnect and click Retry to resume installation" + + ; Message shown if unable to download and install the MeCab files) + + !define C_NPLS_REPEATMECAB "Unable to install the MeCab files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1${MB_NL}${MB_NL}or use 'Add/Remove Programs' entry for POPFile" + #-------------------------------------------------------------------------- # End of 'English-parser.nsh' |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:25:21
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19480 Added Files: Tag: b0_22_2 ioUM.ini Log Message: Defines the layout of the new custom page displayed when the uninstaller is started. This page offers a choice between modifying the installation and removing it from the computer. --- NEW FILE: ioUM.ini --- #------------------------------------------------------------------- # # ioUM.ini --- This file is used by "installer.nsi", one of the NSIS scripts # used to create the Windows installer (and the uninstaller) for # POPFile. This file defines the layout of the custom page used # to select the uninstaller mode. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #------------------------------------------------------------------- [Settings] NumFields=4 [Field 1] Type=radiobutton Text=Modify the existing POPFile installation Left=20 Right=-1 Top=30 Bottom=40 [Field 2] Type=radiobutton Text=Uninstall the POPFile program Left=20 Right=-1 Top=75 Bottom=85 [Field 3] Type=label Text= Left=35 Right=-1 Top=45 Bottom=65 [Field 4] Type=label Text= Left=35 Right=-1 Top=90 Bottom=110 #-------------------- # End of ioUM.ini #-------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:24:18
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18760 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: Updated to cope with the uninstaller being changed to allow it to modify an existing installation. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.9 retrieving revision 1.53.4.10 diff -C2 -d -r1.53.4.9 -r1.53.4.10 *** pfi-library.nsh 5 Oct 2007 18:39:24 -0000 1.53.4.9 --- pfi-library.nsh 14 Oct 2007 17:24:20 -0000 1.53.4.10 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.1" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.4" #-------------------------------------------------------------------------- *************** *** 411,415 **** # # Installer Function: PFI_GetIEVersion - # Installer Function: PFI_GetParameters # Installer Function: PFI_GetRoot # Installer Function: PFI_GetSeparator --- 411,414 ---- *************** *** 527,590 **** - !ifndef BACKUP - #-------------------------------------------------------------------------- - # Installer Function: PFI_GetParameters - # - # Returns the command-line parameters (if any) supplied when the installer was started - # - # Inputs: - # none - # Outputs: - # (top of stack) - all of the parameters supplied on the command line (may be "") - # - # Usage: - # Call PFI_GetParameters - # Pop $R0 - # - # (if 'setup.exe /SSL' was used to start the installer, $R0 will hold '/SSL') - # - #-------------------------------------------------------------------------- - - Function PFI_GetParameters - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - StrCpy $R2 1 - StrLen $R3 $CMDLINE - - ; Check for quote or space - - StrCpy $R0 $CMDLINE $R2 - StrCmp $R0 '"' 0 +3 - StrCpy $R1 '"' - Goto loop - - StrCpy $R1 " " - - loop: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 $R1 get - StrCmp $R2 $R3 get - Goto loop - - get: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 " " get - StrCpy $R0 $CMDLINE "" $R2 - - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - - FunctionEnd - !endif - - !ifdef ADDUSER | INSTALLER | RESTORE #-------------------------------------------------------------------------- --- 526,529 ---- *************** *** 1019,1022 **** --- 958,965 ---- # Uninstaller Function: un.PFI_GetMessagesPath # + # Macro: PFI_GetParameters + # Installer Function: PFI_GetParameters + # Uninstaller Function: un.PFI_GetParameters + # # Macro: PFI_GetParent # Installer Function: PFI_GetParent *************** *** 2796,2799 **** --- 2739,2831 ---- #-------------------------------------------------------------------------- + # Macro: PFI_GetParameters + # + # The installation process and the uninstall process may need a function which extracts + # the parameters (if any) supplied on the command-line. This macro makes maintenance + # easier by ensuring that both processes use identical functions, with the only difference + # being their names. + # + # NOTE: + # The !insertmacro PFI_GetParameters "" and !insertmacro PFI_GetParameters "un." commands are + # included in this file so the NSIS script can use 'Call PFI_GetParameters' and + # 'Call un.PFI_GetParameters' without additional preparation. + # + # Inputs: + # none + # + # Outputs: + # top of stack) - all of the parameters supplied on the command line (may be "") + # + # Usage (after macro has been 'inserted'): + # + # Call PFI_GetParameters + # Pop $R0 + # + # (if 'setup.exe /SSL' was used to start the installer, $R0 will hold '/SSL') + #-------------------------------------------------------------------------- + + !macro PFI_GetParameters UN + Function ${UN}PFI_GetParameters + + Push $R0 + Push $R1 + Push $R2 + Push $R3 + + StrCpy $R2 1 + StrLen $R3 $CMDLINE + + ; Check for quote or space + + StrCpy $R0 $CMDLINE $R2 + StrCmp $R0 '"' 0 +3 + StrCpy $R1 '"' + Goto loop + + StrCpy $R1 " " + + loop: + IntOp $R2 $R2 + 1 + StrCpy $R0 $CMDLINE 1 $R2 + StrCmp $R0 $R1 get + StrCmp $R2 $R3 get + Goto loop + + get: + IntOp $R2 $R2 + 1 + StrCpy $R0 $CMDLINE 1 $R2 + StrCmp $R0 " " get + StrCpy $R0 $CMDLINE "" $R2 + + Pop $R3 + Pop $R2 + Pop $R1 + Exch $R0 + + FunctionEnd + !macroend + + !ifndef BACKUP + #-------------------------------------------------------------------------- + # Installer Function: PFI_GetParameters + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + !insertmacro PFI_GetParameters "" + !endif + + !ifdef INSTALLER + #-------------------------------------------------------------------------- + # Uninstaller Function: un.PFI_GetParameters + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + !insertmacro PFI_GetParameters "un." + !endif + + + #-------------------------------------------------------------------------- # Macro: PFI_GetParent # *************** *** 4227,4231 **** !endif ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_StrBackSlash --- 4259,4263 ---- !endif ! !ifdef ADDUSER | INSTALLER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_StrBackSlash *************** *** 4631,4635 **** !endif ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_WaitUntilUnlocked --- 4663,4667 ---- !endif ! !ifdef ADDUSER | INSTALLER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_WaitUntilUnlocked |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:22:56
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18393 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Converted to use macro-based sections and functions for use by the installer, uninstaller and the POPFile SSL Support wizard when adding SSL support to an installation. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.16 retrieving revision 1.6.2.17 diff -C2 -d -r1.6.2.16 -r1.6.2.17 *** getssl.nsh 5 Oct 2007 18:30:39 -0000 1.6.2.16 --- getssl.nsh 14 Oct 2007 17:22:52 -0000 1.6.2.17 *************** *** 9,34 **** # programs download and install the same SSL files. # ! # On 18 July 2006 the University of Winnipeg repository was updated to provide ! # IO::Socket::SSL v0.99 which is not compatible with POPFile so a patch will be ! # applied to downgrade the SSL.pm file to the compatible v0.97 version. ! # ! # On 18 August 2006 the University of Winnipeg repository was updated to supply ! # IO::Socket::SSL v0.999 which is not compatible with POPFile so a patch will ! # be applied to downgrade the SSL.pm file to the compatible v0.97 version. ! # [...2078 lines suppressed...] + !macroend + + + #-------------------------------------------------------------------------- + # Code block to be used when compiling the POPFile SSL Setup Wizard + #-------------------------------------------------------------------------- + + !ifdef ADDSSL + + !insertmacro SECTION_SSLSUPPORT "" + !insertmacro FUNCTION_GETSSLFILE "" + !insertmacro FUNCTION_EXTRACTMD5SUM "" + !insertmacro FUNCTION_STRCHECKHEXADECIMAL "" + !insertmacro FUNCTION_EOL2CRLF "" + !insertmacro FUNCTION_DOWNLOADPATCHES "" + !insertmacro FUNCTION_APPLYPATCHES "" + + !endif #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:21:57
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18029 Added Files: Tag: b0_22_2 getparser.nsh Log Message: Contains macro-based sections and functions for use by the installer and uninstaller when handling the selection and installation of the Nihongo (Japanese) parser. The files required for the Kakasi and internal parsers are contained in the installer/uninstaller but the MeCab files have to be downloaded (at ~13 MB they are too big to include in it). --- NEW FILE: getparser.nsh --- #-------------------------------------------------------------------------- # # getparser.nsh --- Japanese (Nihongo) text does not use spaces between words so # POPFile uses a 'Nihongo Parser' to split the text into words # to allow the text to be analysed properly. POPFile 0.22.5 # (and earlier) only supported the 'Kakasi' parser. The 1.0.0 # release offers a choice of three parsers (Kakasi, MeCab and # internal. To make it easier to change the Nihongo Parser # the 1.0.0 release creates a "Change" option in the "Add/Remove # Programs" entry for POPFile. This new option is handled by the # POPFile uninstaller. # # The 'MeCab' parser is too big (about 13 MB) to include in the # installer so it is downloaded from the Internet when the user # selects this parser. # # Since the installer and uninstaller both need to offer a choice # of Nihongo Parser and may need to download the MeCab files, this # INCLUDE file contains macro-based SECTION and FUNCTION definitions # to make future maintenance easier. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #-------------------------------------------------------------------------- ;------------------------------------------------ ; This script requires the 'Inetc' NSIS plugin ;------------------------------------------------ ; This script uses a special NSIS plugin (inetc) to download the SSL files. This plugin ; has much better proxy support than the standard NSISdl plugin shipped with NSIS. ; ; The 'NSIS Wiki' page for the 'Inetc' plugin (description, example and download links): ; http://nsis.sourceforge.net/Inetc_plug-in ; ; To compile this script, copy the 'inetc.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\). The 'Inetc' documentation, example & source files can be unzipped ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ; Tested with the inetc.dll plugin timestamped 11 August 2007 19:06:24 ;------------------------------------------------ ; This script requires the 'md5dll' NSIS plugin ;------------------------------------------------ ; This script uses a special NSIS plugin (md5dll) to calculate the MD5 sum for a file. ; ; The 'NSIS Wiki' page for the 'md5dll' plugin (description, example and download links): ; http://nsis.sourceforge.net/MD5_plugin ; ; Alternative download links can be found at the 'md5dll' author's site: ; http://www.darklogic.org/win32/nsis/plugins/md5dll/ ; ; To compile this script, copy the 'md5dll.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\). The 'md5dll' source and example files can be unzipped to the ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ; Tested with version 0.4 of the 'md5dll' plugin. ;------------------------------------------------ ; This script requires the 'untgz' NSIS plugin ;------------------------------------------------ ; This script uses a special NSIS plugin (untgz) to extract files from the *.tar.gz archives. ; ; The 'NSIS Wiki' page for the 'untgz' plugin (description, example and download links): ; http://nsis.sourceforge.net/UnTGZ_plug-in ; ; Alternative download links can be found at the 'untgz' author's site: ; http://www.darklogic.org/win32/nsis/plugins/ ; ; To compile this script, copy the 'untgz.dll' file to the standard NSIS plugins folder ; (${NSISDIR}\Plugins\). The 'untgz' documentation, example & source files can be unzipped ; to the appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ; Tested with versions 1.0.5, 1.0.6, 1.0.7 and 1.0.8 of the 'untgz' plugin. #-------------------------------------------------------------------------- # URLs used to download the 'MeCab' parser support files from the POPFile # website (the Perl package, Windows binaries and the large dictionary files # are to big to include in the POPFile installer) #-------------------------------------------------------------------------- ; Temporarily use the "downloads" directory on the project's "new" server: !define C_NPD_MECAB_PERL "http://h1212143.stratoserver.net/downloads/MeCab.tar.gz" !define C_NPD_MECAB_DICT "http://h1212143.stratoserver.net/downloads/mecab-ipadic.zip" ;; !define C_NPD_MECAB_PERL "http://getpopfile.org/parser/MeCab.tar.gz" ;; !define C_NPD_MECAB_DICT "http://getpopfile.org/parser/mecab-ipadic.zip" #-------------------------------------------------------------------------- # User Registers (Global) #-------------------------------------------------------------------------- Var G_MECAB_FILEURL ; full URL used to download a MeCab file Var G_PLS_FIELD_2 ; used to customise translated text strings #============================================================================================== # # Macro-based Sections which may be used by the installer and uninstaller # # Macro: SECTION_NIHONGO_PARSER # Installer Section: Section "Nihongo Parser" SecParser # Uninstaller Section: un.Section "Nihongo Parser" un.SecParser # # Macro: SECTION_KAKASI # Installer Section: Section "-Kakasi" SecKakasi # Uninstaller Section: un.Section "-Kakasi" un.SecKakasi # # Macro: SECTION_MECAB # Installer Section: Section "-MeCab" SecMeCab # Uninstaller Section: un.Section "-MeCab" un.SecMeCab # # Macro: SECTION_INTERNALPARSER # Installer Section: Section "-Internal" SecInternalParser # Uninstaller Section: un.Section "-Internal" un.SecInternalParser # #============================================================================================== #-------------------------------------------------------------------------- # Macro: SECTION_NIHONGO_PARSER # # The installation process and the uninstall process both need a 'Nihongo Parser' # section which is listed on the COMPONENTS page when the Nihongo (Japanese) language # has been selected, otherwise it is hidden by the 'ShowOrHideNihongoParser' function # (or the equivalent uninstaller function). This macro makes maintenance easier by # ensuring that both processes do the same thing. # # If an English-only build of the installer or uninstaller is used then this section # must appear in the COMPONENTS page in case the user needs to install a parser. # # Note that this section must always be executed and must always come before # the sections for the 'Kakasi', 'MeCab' and 'Internal' Nihongo parsers as # it performs some essential initialisation. # #-------------------------------------------------------------------------- !macro SECTION_NIHONGO_PARSER UN Section "${UN}Nihongo Parser" ${UN}SecParser !if '${UN}' == 'un.' StrCmp $G_UNINST_MODE "uninstall" skip_section !endif SectionIn RO !insertmacro SECTIONLOG_ENTER "Nihongo Parser" DeleteRegValue HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" DetailPrint "Removed the 'NihongoParser' setting from the registry (HKLM)" !insertmacro SECTIONLOG_EXIT "Nihongo Parser" !if '${UN}' == 'un.' skip_section: !endif SectionEnd !macroend #-------------------------------------------------------------------------- # Macro: SECTION_KAKASI # # The installation process and the uninstall process both need a section which # installs the 'Kakasi' parser, one of the three parsers supported by POPFile. # This macro makes maintenance easier by ensuring that both processes do the # same thing. # # Although the COMPONENTS page will show a 'Nihongo Parser' component when the # installer language is set to 'Nihongo' (or when an English-only build of the # installer or uninstaller is used), the individual parser components are never # shown on the COMPONENTS page. #-------------------------------------------------------------------------- !macro SECTION_KAKASI UN Section "-${UN}Kakasi" ${UN}SecKakasi !if '${UN}' == 'un.' StrCmp $G_UNINST_MODE "uninstall" skip_section !endif !insertmacro SECTIONLOG_ENTER "Kakasi" StrCmp $G_PARSER "kakasi" 0 do_nothing !define L_RESERVED $0 ; used in system.dll call Push ${L_RESERVED} ;-------------------------------------------------------------------------- ; Install Kakasi package ;-------------------------------------------------------------------------- SetOutPath "$G_ROOTDIR" File /r "${C_KAKASI_DIR}\kakasi" ; Add Environment Variables for Kakasi Push "ITAIJIDICTPATH" Push "$G_ROOTDIR\kakasi\share\kakasi\itaijidict" StrCmp $G_WINUSERTYPE "Admin" all_users_1 Call ${UN}PFI_WriteEnvStr Goto next_var all_users_1: Call ${UN}PFI_WriteEnvStrNTAU next_var: Push "KANWADICTPATH" Push "$G_ROOTDIR\kakasi\share\kakasi\kanwadict" StrCmp $G_WINUSERTYPE "Admin" all_users_2 Call ${UN}PFI_WriteEnvStr Goto set_env all_users_2: Call ${UN}PFI_WriteEnvStrNTAU set_env: IfRebootFlag set_vars_now ; Running on a non-Win9x system which already has the correct Kakasi environment data ; or running on a non-Win9x system Call ${UN}PFI_IsNT Pop ${L_RESERVED} StrCmp ${L_RESERVED} "0" continue ; Running on a non-Win9x system so we ensure the Kakasi environment variables ; are updated to match this installation set_vars_now: System::Call 'Kernel32::SetEnvironmentVariableA(t, t) \ i("ITAIJIDICTPATH", "$G_ROOTDIR\kakasi\share\kakasi\itaijidict").r0' StrCmp ${L_RESERVED} 0 0 itaiji_set_ok MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_CONVERT_ENVNOTSET) (ITAIJIDICTPATH)" itaiji_set_ok: System::Call 'Kernel32::SetEnvironmentVariableA(t, t) \ i("KANWADICTPATH", "$G_ROOTDIR\kakasi\share\kakasi\kanwadict").r0' StrCmp ${L_RESERVED} 0 0 continue MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_CONVERT_ENVNOTSET) (KANWADICTPATH)" continue: ;-------------------------------------------------------------------------- ; Install Perl modules: base.pm, bytes.pm, the Encode collection and Text::Kakasi ; (the requirement for bytes_heavy.pl was added when the minimal Perl was updated ; to use ActivePerl 5.8.7 components) ;-------------------------------------------------------------------------- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\bytes.pm" File "${C_PERL_DIR}\lib\bytes_heavy.pl" File "${C_PERL_DIR}\lib\Encode.pm" SetOutPath "$G_MPLIBDIR\Encode" File /r "${C_PERL_DIR}\lib\Encode\*" SetOutPath "$G_MPLIBDIR\auto\Encode" File /r "${C_PERL_DIR}\lib\auto\Encode\*" SetOutPath "$G_MPLIBDIR\Text" File "${C_PERL_DIR}\site\lib\Text\Kakasi.pm" SetOutPath "$G_MPLIBDIR\auto\Text\Kakasi" File "${C_PERL_DIR}\site\lib\auto\Text\Kakasi\*" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" Pop ${L_RESERVED} !undef L_RESERVED do_nothing: !insertmacro SECTIONLOG_EXIT "Kakasi" !if '${UN}' == 'un.' skip_section: !endif SectionEnd !macroend #-------------------------------------------------------------------------- # Macro: SECTION_MECAB # # The installation process and the uninstall process both need a section which # downloads and installs the 'MeCab' parser, one of the three parsers supported # by POPFile. This macro makes maintenance easier by ensuring that both processes # do the same thing. # # Although the COMPONENTS page will show a 'Nihongo Parser' component when the # installer language is set to 'Nihongo' (or when an English-only build of the # installer or uninstaller is used), the individual parser components are never # shown on the COMPONENTS page. #-------------------------------------------------------------------------- !macro SECTION_MECAB UN Section "-${UN}MeCab" ${UN}SecMeCab !if '${UN}' == 'un.' StrCmp $G_UNINST_MODE "uninstall" skip_section !endif !insertmacro SECTIONLOG_ENTER "MeCab" StrCmp $G_PARSER "mecab" 0 do_nothing ; The main installer does not contain the MeCab support files so we provide an estimate ; which includes a slack space allowance (based upon the development system's statistics) AddSize 43000 !define L_RESERVED $0 ; used in system.dll call !define L_RESULT $R0 ; result from 'GetSSLFile' function or the 'untgz' plugin ; WARNING: The 'untgz' plugin is hard-coded to use $R0 !define L_DLG_ITEM $R1 ; used to disable/enable the "Show Details" button !define L_LISTSIZE $R2 ; number of patches to be applied Push ${L_RESERVED} Push ${L_RESULT} Push ${L_DLG_ITEM} Push ${L_LISTSIZE} ; Unlike the NSISdl plugin shipped with NSIS, the Inetc plugin leaves the "Show Details" ; button in view so we temporarily disable it during the download to avoid a messy display ; (if the user has already clicked the button then they'll just need to put up with the mess) ; ; In order to avoid screen flicker effects as a result of downloading several files, we ; disable the button "for the duration" instead of disabling/enabling it for every transfer FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x403 EnableWindow ${L_DLG_ITEM} 0 ; Download the MeCab archives Push "${C_NPD_MECAB_PERL}" Call ${UN}GetMeCabFile Pop ${L_RESULT} StrCmp ${L_RESULT} "OK" 0 installer_error_exit Push "${C_NPD_MECAB_DICT}" Call ${UN}GetMeCabFile Pop ${L_RESULT} StrCmp ${L_RESULT} "OK" 0 installer_error_exit ; Now install the files required for the MeCab parser StrCpy $G_PLS_FIELD_1 "$G_ROOTDIR\lib" DetailPrint "" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "MeCab.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractFile -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\MeCab.tar.gz" "MeCab.pm" StrCmp ${L_RESULT} "success" 0 error_exit DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_ROOTDIR\lib\auto\MeCab" DetailPrint "" CreateDirectory $G_PLS_FIELD_1 SetDetailsPrint both StrCpy $G_PLS_FIELD_2 "MeCab.tar.gz" DetailPrint "$(PFI_LANG_PROG_FILEEXTRACT)" SetDetailsPrint listonly untgz::extractV -j -d "$G_PLS_FIELD_1" "$PLUGINSDIR\MeCab.tar.gz" -i "MeCab.bs" "MeCab.dll" -- StrCmp ${L_RESULT} "success" check_bs_file error_exit: SetDetailsPrint listonly DetailPrint "" SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_UNPACKFAIL)" SetDetailsPrint listonly DetailPrint "" MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MB_UNPACKFAIL)" ; Enable the "Show Details" button now that we have stopped downloading files EnableWindow ${L_DLG_ITEM} 1 installer_error_exit: Push $R1 ; No need to preserve $R0 here as it is known as ${L_RESULT} in this 'Section' ; The first system call gets the full pathname (returned in $R0) and the second call ; extracts the filename (and possibly the extension) part (returned in $R1) System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' StrCpy $G_PLS_FIELD_1 $R1 MessageBox MB_OK|MB_ICONEXCLAMATION "${C_NPLS_REPEATMECAB}" Pop $R1 Goto exit check_bs_file: ; 'untgz' versions earlier than 1.0.6 (released 28 November 2004) are unable to extract ; empty files so this script creates the empty 'MeCab.bs' file if necessary IfFileExists "$G_PLS_FIELD_1\MeCab.bs" unpack_dictionaries File "/oname=$G_PLS_FIELD_1\MeCab.bs" "zerobyte.file" unpack_dictionaries: DetailPrint "" ZipDLL::extractall "$PLUGINSDIR\mecab-ipadic.zip" "$G_ROOTDIR" Pop ${L_RESULT} DetailPrint "" DetailPrint "Unzip result = ${L_RESULT}" ; Add the Environment Variable for MeCab Push "MECABRC" Push "$G_ROOTDIR\mecab\etc\mecabrc" StrCmp $G_WINUSERTYPE "Admin" all_users_1 Call ${UN}PFI_WriteEnvStr Goto set_env all_users_1: Call ${UN}PFI_WriteEnvStrNTAU set_env: IfRebootFlag set_vars_now ; Running on a non-Win9x system which already has the correct MeCab environment data ; or running on a non-Win9x system Call ${UN}PFI_IsNT Pop ${L_RESERVED} StrCmp ${L_RESERVED} "0" update_minPerl ; Running on a non-Win9x system so we ensure the MeCab environment variable ; is updated to match this installation set_vars_now: System::Call 'Kernel32::SetEnvironmentVariableA(t, t) \ i("MECABRC", "$G_ROOTDIR\mecab\etc\mecabrc").r0' StrCmp ${L_RESERVED} 0 0 update_minPerl MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_CONVERT_ENVNOTSET) (MECABRC)" update_minPerl: ;-------------------------------------------------------------------------- ; Install additional Perl modules: base.pm, bytes.pm and the Encode collection ;-------------------------------------------------------------------------- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\bytes.pm" File "${C_PERL_DIR}\lib\bytes_heavy.pl" File "${C_PERL_DIR}\lib\Encode.pm" SetOutPath "$G_MPLIBDIR\Encode" File /r "${C_PERL_DIR}\lib\Encode\*" SetOutPath "$G_MPLIBDIR\auto\Encode" File /r "${C_PERL_DIR}\lib\auto\Encode\*" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" exit: SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly Pop ${L_LISTSIZE} Pop ${L_DLG_ITEM} Pop ${L_RESULT} Pop ${L_RESERVED} !undef L_RESERVED !undef L_RESULT !undef L_DLG_ITEM !undef L_LISTSIZE do_nothing: !insertmacro SECTIONLOG_EXIT "MeCab" !if '${UN}' == 'un.' skip_section: !endif SectionEnd !macroend #-------------------------------------------------------------------------- # Macro: SECTION_INTERNALPARSER # # The installation process and the uninstall process both need a section which # installs the 'Internal' parser, one of the three parsers supported by POPFile. # This macro makes maintenance easier by ensuring that both processes do the # same thing. # # Although the COMPONENTS page will show a 'Nihongo Parser' component when the # installer language is set to 'Nihongo' (or when an English-only build of the # installer or uninstaller is used), the individual parser components are never # shown on the COMPONENTS page. #-------------------------------------------------------------------------- !macro SECTION_INTERNALPARSER UN Section "-${UN}Internal" ${UN}SecInternalParser !if '${UN}' == 'un.' StrCmp $G_UNINST_MODE "uninstall" skip_section !endif !insertmacro SECTIONLOG_ENTER "Internal Parser" StrCmp $G_PARSER "internal" 0 do_nothing SetDetailsPrint textonly DetailPrint "Internal parser selected during installation" SetDetailsPrint listonly ;-------------------------------------------------------------------------- ; Install Perl modules: base.pm, bytes.pm and the Encode collection ;-------------------------------------------------------------------------- SetOutPath "$G_MPLIBDIR" File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\bytes.pm" File "${C_PERL_DIR}\lib\bytes_heavy.pl" File "${C_PERL_DIR}\lib\Encode.pm" SetOutPath "$G_MPLIBDIR\Encode" File /r "${C_PERL_DIR}\lib\Encode\*" SetOutPath "$G_MPLIBDIR\auto\Encode" File /r "${C_PERL_DIR}\lib\auto\Encode\*" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" SetDetailsPrint textonly DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly do_nothing: !insertmacro SECTIONLOG_EXIT "Internal Parser" !if '${UN}' == 'un.' skip_section: !endif SectionEnd !macroend #============================================================================================== # # Macro-based Functions which may be used by the installer and uninstaller # # Macro: FUNCTION_GETMECABFILE # Installer Function: GetMeCabFile # Uninstaller Function: un.GetMeCabFile # # Macro: FUNCTION_SHOW_OR_HIDE_NIHONGO_PARSER # Installer Function: ShowOrHideNihongoParser # Uninstaller Function: un.ShowOrHideNihongoParser # # Macro: FUNCTION_CHOOSEPARSER # Installer Function: ChooseParser # Uninstaller Function: un.ChooseParser # # Macro: FUNCTION_HANDLE_PARSER_SELECTION # Installer Function: HandleParserSelection # Uninstaller Function: un.HandleParserSelection # #============================================================================================== #-------------------------------------------------------------------------- # Macro: FUNCTION_GETMECABFILE # # The installation process and the uninstall process may both need a function which # downloads a single MeCab support file from the POPFile website. This macro makes # maintenance easier by ensuring that both processes use identical functions, with # the only difference being their names. # # Inputs: # (top of stack) - full URL used to download the MeCab file # # Outputs: # (top of stack) - status returned by the download plugin # # Usage (after macro has been 'inserted'): # # Push "http://www.example.com/download/MeCab.zip" # Call GetMeCabFile # Pop $0 # # ($R0 at this point is "OK" if the file was downloaded without any errors being detected) # #-------------------------------------------------------------------------- !define C_NSISDL_TRANSLATIONS "/TRANSLATE '$(PFI_LANG_NSISDL_DOWNLOADING)' '$(PFI_LANG_NSISDL_CONNECTING)' '$(PFI_LANG_NSISDL_SECOND)' '$(PFI_LANG_NSISDL_MINUTE)' '$(PFI_LANG_NSISDL_HOUR)' '$(PFI_LANG_NSISDL_PLURAL)' '$(PFI_LANG_NSISDL_PROGRESS)' '$(PFI_LANG_NSISDL_REMAINING)'" !macro FUNCTION_GETMECABFILE UN Function ${UN}GetMeCabFile Pop $G_MECAB_FILEURL StrCpy $G_PLS_FIELD_1 $G_MECAB_FILEURL Push $G_PLS_FIELD_1 Call ${UN}PFI_StrBackSlash Call ${UN}PFI_GetParent Pop $G_PLS_FIELD_2 StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2 IntOp $G_PLS_FIELD_2 $G_PLS_FIELD_2 + 1 StrCpy $G_PLS_FIELD_1 "$G_PLS_FIELD_1" "" $G_PLS_FIELD_2 StrCpy $G_PLS_FIELD_2 "$G_MECAB_FILEURL" $G_PLS_FIELD_2 DetailPrint "" DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" inetc::get /CAPTION "Internet Download" /RESUME "${C_NPLS_CHECKINTERNET}" ${C_NSISDL_TRANSLATIONS} "$G_MECAB_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END Pop $G_PLS_FIELD_2 StrCmp $G_PLS_FIELD_2 "OK" file_received SetDetailsPrint both DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_1)" SetDetailsPrint listonly DetailPrint "$(PFI_LANG_MB_NSISDLFAIL_2)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_NSISDLFAIL_1)${MB_NL}$(PFI_LANG_MB_NSISDLFAIL_2)" SetDetailsPrint listonly DetailPrint "" file_received: Push $G_PLS_FIELD_2 FunctionEnd !macroend #-------------------------------------------------------------------------- # Macro: FUNCTION_SHOW_OR_HIDE_NIHONGO_PARSER # # Called by 'PFIGUIInit', our custom '.onGUIInit' function (or 'un.PFIGUIInit', # our custom 'un.onGUIInit' function). # # The installation process and the uninstall process may both need a function which # ensures that when 'Nihongo' (Japanese) has been selected as the language for the # installer, 'Nihongo Parser' appears in the list of components. # # If any other language is selected, this component is hidden from view and the # three parser sections are disabled (i.e. unselected so nothing gets installed). # # The default parser is 'Kakasi', as used by POPFile 0.22.5 and earlier releases, # and this default is set up here, including the initial state of the three # radio buttons used on the "Choose Parser" custom page. # # Note that the 'Nihongo Parser' section is _always_ executed, even if the user # does not select the 'Nihongo' language. # # Note also that when an English-only build of the installer or uninstaller is # used then 'Nihongo Parser' must appear in the COMPONENTS page. # # This macro makes maintenance easier by ensuring that both processes use identical # functions, with the only difference being their names. #-------------------------------------------------------------------------- !macro FUNCTION_SHOW_OR_HIDE_NIHONGO_PARSER UN Function ${UN}ShowOrHideNihongoParser !ifndef ENGLISH_MODE StrCmp $LANGUAGE ${LANG_JAPANESE} select_default_parser ; The user has not selected 'Nihongo' language for this installation so there ; is no need to install a Nihongo parser. Make the 'Nihongo Parser' component ; invisible and disable the three sections used to install the Nihongo parsers. StrCpy $G_PARSER "" SectionSetText ${${UN}SecParser} "" ; this makes the component invisible !insertmacro UnselectSection ${${UN}SecKakasi} Goto deselect_other_parsers select_default_parser: !endif StrCpy $G_PARSER "kakasi" !insertmacro SelectSection ${${UN}SecKakasi} !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 1" "State" "1" !ifndef ENGLISH_MODE deselect_other_parsers: !endif !insertmacro UnselectSection ${${UN}SecMeCab} !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 2" "State" "0" !insertmacro UnselectSection ${${UN}SecInternalParser} !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 3" "State" "0" FunctionEnd !macroend #-------------------------------------------------------------------------- # Macro: FUNCTION_CHOOSEPARSER # # Unlike English and many other languages, Japanese text does not use spaces to separate # the words so POPFile has to use a parser in order to analyse the words in a Japanese # message. The 1.0.0 release of POPFile is the first to offer a choice of parser (previous # releases of POPFile always used the "Kakasi" parser). # # Three parsers are currently supported: Internal, Kakasi and MeCab. The installer contains # all of the files needed for the first two but the MeCab parser uses a large dictionary # (a 12 MB download) which will be downloaded during installation if MeCab is selected. # # This macro makes maintenance easier by ensuring that the installer and uninstaller use # identical functions, with the only difference being their names. #-------------------------------------------------------------------------- !macro FUNCTION_CHOOSEPARSER UN Function ${UN}ChooseParser !ifndef ENGLISH_MODE ; If 'Nihongo' (Japanese) has been selected then we need to let the user choose which parser to install StrCmp $LANGUAGE ${LANG_JAPANESE} choose_parser StrCpy $G_PARSER "" Goto exit choose_parser: !endif StrCmp $G_SSL_ONLY "1" exit ; if we are only installing SSL support there is no need to display this page !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 1" "Text" "${C_NPLS_Option_Kakasi}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 2" "Text" "${C_NPLS_Option_MeCab}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 3" "Text" "${C_NPLS_Option_Internal}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 5" "Text" "${C_NPLS_Note}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 6" "Text" "${C_NPLS_Link}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 6" "State" "${C_NPLS_Link}" Push '"${C_NPLS_DESC_Kakasi}"' Call ${UN}NSIS2IO Pop $G_PLS_FIELD_1 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 4" "State" "$G_PLS_FIELD_1" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 4" "Flags" "${C_NPLS_DESC_Flags}" !insertmacro MUI_HEADER_TEXT "${C_NPLS_HEADER_ChooseParser}" "${C_NPLS_DESC_ChooseParser}" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioP.ini" StrCmp $G_PARSER "kakasi" enable_Kakasi StrCmp $G_PARSER "mecab" enable_MeCab StrCmp $G_PARSER "internal" enable_Internal MessageBox MB_OK|MB_ICONEXCLAMATION "Internal Error:\ ${MB_NL}${MB_NL}\ Unexpected $$G_PARSER value ('$G_PARSER')\ ${MB_NL}${MB_NL}\ Defaulting to 'Kakasi' parser" StrCpy $G_PARSER "kakasi" Goto enable_Kakasi enable_Internal: !insertmacro UnselectSection ${${UN}SecKakasi} !insertmacro UnselectSection ${${UN}SecMeCab} !insertmacro SelectSection ${${UN}SecInternalParser} Goto exit enable_Kakasi: !insertmacro SelectSection ${${UN}SecKakasi} !insertmacro UnselectSection ${${UN}SecMeCab} !insertmacro UnselectSection ${${UN}SecInternalParser} Goto exit enable_MeCab: !insertmacro UnselectSection ${${UN}SecKakasi} !insertmacro SelectSection ${${UN}SecMeCab} !insertmacro UnselectSection ${${UN}SecInternalParser} exit: FunctionEnd !macroend #-------------------------------------------------------------------------- # Macro: FUNCTION_HANDLE_PARSER_SELECTION # # (the "leave" function for the Nihongo Parser selection page) # # Used to handle user input on the Nihongo Parser selection page. # # This macro makes maintenance easier by ensuring that the installer and # uninstaller use identical functions, with the only difference being their # names. #-------------------------------------------------------------------------- !macro FUNCTION_HANDLE_PARSER_SELECTION UN Function ${UN}HandleParserSelection !define L_SELECTION $R9 Push ${L_SELECTION} !insertmacro MUI_INSTALLOPTIONS_READ ${L_SELECTION} "ioP.ini" "Settings" "State" StrCmp ${L_SELECTION} 0 done ; "Next" button clicked !insertmacro MUI_INSTALLOPTIONS_READ $G_DLGITEM "ioP.ini" "Field 4" "HWND" StrCmp ${L_SELECTION} 1 kakasi StrCmp ${L_SELECTION} 2 mecab StrCmp ${L_SELECTION} 3 internal Goto return_to_page kakasi: StrCpy $G_PARSER "kakasi" SendMessage $G_DLGITEM ${WM_SETTEXT} 1 "STR:${C_NPLS_DESC_Kakasi}" Goto return_to_page mecab: StrCpy $G_PARSER "mecab" SendMessage $G_DLGITEM ${WM_SETTEXT} 1 "STR:${C_NPLS_DESC_MeCab}" Goto return_to_page internal: StrCpy $G_PARSER "internal" SendMessage $G_DLGITEM ${WM_SETTEXT} 1 "STR:${C_NPLS_DESC_Internal}" return_to_page: Pop ${L_SELECTION} Abort done: Pop ${L_SELECTION} !undef L_SELECTION FunctionEnd !macroend #-------------------------------------------------------------------------- # End of 'getparser.nsh' #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:20:34
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17646 Modified Files: Tag: b0_22_2 installer-SecPOPFile-body.nsh Log Message: Change the way in which the uninstall information is stored in the registry. This new approach makes it less likely that Vista will prevent the UAC plugin from functioning properly when a 'standard' account is used to launch the uninstaller to modify (or uninstall) POPFile. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.9 retrieving revision 1.3.2.10 diff -C2 -d -r1.3.2.9 -r1.3.2.10 *** installer-SecPOPFile-body.nsh 21 Sep 2007 01:18:53 -0000 1.3.2.9 --- installer-SecPOPFile-body.nsh 14 Oct 2007 17:20:33 -0000 1.3.2.10 *************** *** 468,494 **** ; 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" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "InstallLocation" "$G_ROOTDIR" 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" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "InstallLocation" "$G_ROOTDIR" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "NoModify" "1" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" --- 468,500 ---- ; Create entry in the Control Panel's "Add/Remove Programs" list 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" /UNINSTALL' WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "InstallLocation" "$G_ROOTDIR" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "NoModify" "0" ! WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "ModifyPath" '"$G_ROOTDIR\uninstall.exe" /MODIFY' ! WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "NoElevateOnModify" "1" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" ! StrCmp $G_WINUSERTYPE "Admin" 0 end_section ! 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" /UNINSTALL' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "InstallLocation" "$G_ROOTDIR" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "NoModify" "0" ! WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "ModifyPath" '"$G_ROOTDIR\uninstall.exe" /MODIFY' ! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ ! "NoElevateOnModify" "1" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \ "NoRepair" "1" |
|
From: Brian S. <xue...@us...> - 2007-10-14 17:20:28
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16834 Modified Files: Tag: b0_22_2 installer-SecPOPFile-func.nsh installer-Uninstall.nsh installer.nsi WriteEnvStr.nsh Log Message: The uninstaller for the next release (1.0.0) will be able to modify an existing installation by downloading and adding SSL support to it or, if Nihongo has been selected, changing the Nihongo parser. This new feature will be accessed via the "Change" button in POPFile's "Add/Remove Programs" entry or the "Uninstall POPFile" shortcut in the Start Menu. The uninstaller now offers choice between modifying the installation or removing it. To support this new feature several sections and functions have been changed into macro-based ones to make future maintenance easier. To do: Change installer-Uninstall.nsh because the current code makes the installer about 40% bigger than before. More aggressive conditional compilation statements are required here! Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.13 retrieving revision 1.242.4.14 diff -C2 -d -r1.242.4.13 -r1.242.4.14 *** installer.nsi 5 Oct 2007 18:36:52 -0000 1.242.4.13 --- installer.nsi 14 Oct 2007 17:19:41 -0000 1.242.4.14 *************** *** 47,50 **** --- 47,51 ---- # (5) installer-Uninstall.nsh - source for the POPFile uninstaller (uninstall.exe) # (6) getssl.nsh - section & functions used to download the SSL support files + # (7) getparser.nsh - macro-based sections and functions to install the Nihongo Parser #-------------------------------------------------------------------------- *************** *** 167,171 **** # Japanese text does not use spaces between words so POPFile uses a parser to split the text # into words so the text can be analysed properly. POPFile 0.22.5 (and earlier) only supported [...1036 lines suppressed...] ! FunctionEnd ! !macroend ! ! #-------------------------------------------------------------------------- ! # Installer Function: NSIS2IO ! # ! # This function is used during the installation process ! #-------------------------------------------------------------------------- ! ! !insertmacro NSIS2IO "" ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.NSIS2IO ! # ! # This function is used during the uninstall process ! #-------------------------------------------------------------------------- ! ! !insertmacro NSIS2IO "un." #-------------------------------------------------------------------------- Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** installer-SecPOPFile-func.nsh 21 Sep 2007 01:18:53 -0000 1.1.2.6 --- installer-SecPOPFile-func.nsh 14 Oct 2007 17:19:41 -0000 1.1.2.7 *************** *** 37,41 **** # # CheckHostsFile - # MakeRootDirSafe # MinPerlRestructure # SkinsRestructure --- 37,40 ---- *************** *** 43,46 **** --- 42,56 ---- #-------------------------------------------------------------------------- + # The following functions are used by the 'installer-SecPOPFile-body.nsh' file + # and the 'getssl.nsh' file: + # + # MakeRootDirSafe + # un.MakeRootDirSafe + # + # (this is a macro-based function, to ensure that the installer and uninstaller + # use identical functions) + #-------------------------------------------------------------------------- + + #-------------------------------------------------------------------------- # Installer Function: CheckHostsFile # *************** *** 119,346 **** #-------------------------------------------------------------------------- - # Installer Function: MakeRootDirSafe - # - # If we are installing on top of a previous installation, we try to shut it down - # (to allow the files to be overwritten without requiring a reboot) - # - # We also need to check if any of the PFI utilities are running (to avoid Abort/Retry/Ignore - # messages or the need to reboot in order to update them) - #-------------------------------------------------------------------------- - - Function MakeRootDirSafe - - ; Use HKLM as a simple workaround for the case where installer is started by a non-admin user - - Push $G_ROOTDIR - - ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" - StrCmp $G_ROOTDIR "" 0 check_folder_exists - MessageBox MB_OK|MB_ICONEXCLAMATION "Internal Error: UAC_RootDir not defined\ - ${MB_NL}${MB_NL}\ - Click OK to continue" - ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" - StrCmp $G_ROOTDIR "" try_other_entries - MessageBox MB_OK|MB_ICONINFORMATION "Good News: UAC_RootDir now defined" - Goto check_folder_exists - - try_other_entries: ; ??? - ReadRegStr $G_ROOTDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" - StrCmp $G_ROOTDIR "" 0 check_folder_exists - ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" - - check_folder_exists: - DeleteRegValue HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" - - ; If we are upgrading an existing installation we need to ensure it is not running - - IfFileExists "$G_ROOTDIR\*.exe" 0 nothing_to_check - - !define L_CFG $R9 ; file handle - !define L_EXE $R8 ; name of EXE file to be monitored - !define L_LINE $R7 - !define L_NEW_GUI $R6 - !define L_OLD_GUI $R5 - !define L_PARAM $R4 - !define L_RESULT $R3 - !define L_TEXTEND $R2 ; used to ensure correct handling of lines longer than 1023 chars - - Push ${L_CFG} - Push ${L_EXE} - Push ${L_LINE} - Push ${L_NEW_GUI} - Push ${L_OLD_GUI} - Push ${L_PARAM} - Push ${L_RESULT} - Push ${L_TEXTEND} - - ; Starting with POPfile 0.21.0 an experimental version of 'popfile-service.exe' was included - ; to allow POPFile to be run as a Windows service. - - Push "POPFile" - Call PFI_ServiceRunning - Pop ${L_RESULT} - StrCmp ${L_RESULT} "true" manual_shutdown - - ; If we are about to overwrite an existing version which is still running, - ; then one of the EXE files will be 'locked' which means we have to shutdown POPFile. - ; - ; POPFile v0.20.0 and later may be using 'popfileb.exe', 'popfilef.exe', 'popfileib.exe', - ; 'popfileif.exe', 'perl.exe' or 'wperl.exe'. - ; - ; Earlier versions of POPFile use only 'perl.exe' or 'wperl.exe'. - - Push $G_ROOTDIR - Call PFI_FindLockedPFE - Pop ${L_EXE} - StrCmp ${L_EXE} "" check_pfi_utils - - ; The program files we are about to update are in use so we need to shut POPFile down - - DetailPrint "... it is locked." - - ; Attempt to discover which POPFile UI port is used by the current user, so we can issue - ; a shutdown request. The following cases are considered: - ; - ; (a) upgrading a 0.21.0 or later installation and runpopfile.exe was used to start POPFile, - ; so POPFile is using environment variables which match the HKCU RootDir_SFN and - ; UserDir_SFN registry data (or HKCU RootDir_LFN and UserDir_LFN if short file names are - ; not supported) - ; - ; (b) upgrading a pre-0.21.0 installation, so popfile.cfg is in the $G_ROOTDIR folder. Need to - ; look for old-style and new-style UI port specifications just like the old installer did. - - ReadRegStr ${L_CFG} HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" - StrCmp ${L_CFG} "" try_root_dir - IfFileExists "${L_CFG}\popfile.cfg" check_cfg_file - - try_root_dir: - IfFileExists "$G_ROOTDIR\popfile.cfg" 0 manual_shutdown - StrCpy ${L_CFG} "$G_ROOTDIR" - - check_cfg_file: - StrCpy ${L_NEW_GUI} "" - StrCpy ${L_OLD_GUI} "" - - ; See if we can get the current gui port from an existing configuration. - ; There may be more than one entry for this port in the file - use the last one found - ; (but give priority to any "html_port" entry). - - FileOpen ${L_CFG} "${L_CFG}\popfile.cfg" r - - found_eol: - StrCpy ${L_TEXTEND} "<eol>" - - loop: - FileRead ${L_CFG} ${L_LINE} - StrCmp ${L_LINE} "" done - StrCmp ${L_TEXTEND} "<eol>" 0 check_eol - StrCmp ${L_LINE} "$\n" loop - - StrCpy ${L_PARAM} ${L_LINE} 10 - StrCmp ${L_PARAM} "html_port " got_html_port - - StrCpy ${L_PARAM} ${L_LINE} 8 - StrCmp ${L_PARAM} "ui_port " got_ui_port - Goto check_eol - - got_ui_port: - StrCpy ${L_OLD_GUI} ${L_LINE} 5 8 - Goto check_eol - - got_html_port: - StrCpy ${L_NEW_GUI} ${L_LINE} 5 10 - - ; Now read file until we get to end of the current line - ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) - - check_eol: - StrCpy ${L_TEXTEND} ${L_LINE} 1 -1 - StrCmp ${L_TEXTEND} "$\n" found_eol - StrCmp ${L_TEXTEND} "$\r" found_eol loop - - done: - FileClose ${L_CFG} - - Push ${L_NEW_GUI} - Call PFI_TrimNewlines - Pop ${L_NEW_GUI} - - Push ${L_OLD_GUI} - Call PFI_TrimNewlines - Pop ${L_OLD_GUI} - - StrCmp ${L_NEW_GUI} "" try_old_style - DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_NEW_GUI} [new style port]" - DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" - Push ${L_NEW_GUI} - Call PFI_ShutdownViaUI - Pop ${L_RESULT} - DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" - StrCmp ${L_RESULT} "success" check_exe - StrCmp ${L_RESULT} "password?" manual_shutdown - - try_old_style: - StrCmp ${L_OLD_GUI} "" manual_shutdown - DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_OLD_GUI} [old style port]" - DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" - Push ${L_OLD_GUI} - Call PFI_ShutdownViaUI - Pop ${L_RESULT} - DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" - StrCmp ${L_RESULT} "success" check_exe - Goto manual_shutdown - - check_exe: - DetailPrint "Waiting for '${L_EXE}' to unlock after NSISdl request..." - DetailPrint "Please be patient, this may take more than 30 seconds" - Push ${L_EXE} - Call PFI_WaitUntilUnlocked - DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." - Push "${C_EXE_END_MARKER}" - Push ${L_EXE} - Call PFI_CheckIfLocked - Pop ${L_EXE} - StrCmp ${L_EXE} "" unlocked_now - - manual_shutdown: - StrCpy $G_PLS_FIELD_1 "POPFile" - DetailPrint "Unable to shutdown $G_PLS_FIELD_1 automatically - manual intervention requested" - MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(PFI_LANG_MBMANSHUT_1)\ - ${MB_NL}${MB_NL}\ - $(PFI_LANG_MBMANSHUT_2)\ - ${MB_NL}${MB_NL}\ - $(PFI_LANG_MBMANSHUT_3)" - Goto check_pfi_utils - - unlocked_now: - DetailPrint "File is now unlocked" - - check_pfi_utils: - Push $G_ROOTDIR - Call PFI_RequestPFIUtilsShutdown - - Pop ${L_TEXTEND} - Pop ${L_RESULT} - Pop ${L_PARAM} - Pop ${L_OLD_GUI} - Pop ${L_NEW_GUI} - Pop ${L_LINE} - Pop ${L_EXE} - Pop ${L_CFG} - - !undef L_CFG - !undef L_EXE - !undef L_LINE - !undef L_NEW_GUI - !undef L_OLD_GUI - !undef L_PARAM - !undef L_RESULT - !undef L_TEXTEND - - nothing_to_check: - Pop $G_ROOTDIR - FunctionEnd - - #-------------------------------------------------------------------------- # Installer Function: MinPerlRestructure # --- 129,132 ---- *************** *** 511,514 **** --- 297,534 ---- #-------------------------------------------------------------------------- + # Macro: Make_RootDir_Safe + # + # If we are installing on top of a previous installation or modifying an existing + # installation, we try to shut it down (to allow the files to be overwritten without + # requiring a reboot) + # + # We also need to check if any of the PFI utilities shipped with POPFile are running + # (to avoid Abort/Retry/Ignore messages or the need to reboot in order to update them) + # + # This macro makes maintenance easier by ensuring that both processes use identical + # functions, with the only difference being their names. + #-------------------------------------------------------------------------- + + !macro MAKE_ROOTDIR_SAFE UN + Function ${UN}MakeRootDirSafe + + ; Use HKLM as a simple workaround for the case where installer is started by a non-admin user + + Push $G_ROOTDIR + + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + StrCmp $G_ROOTDIR "" 0 check_folder_exists + MessageBox MB_OK|MB_ICONEXCLAMATION "Internal Error: UAC_RootDir not defined\ + ${MB_NL}${MB_NL}\ + Click OK to continue" + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + StrCmp $G_ROOTDIR "" try_other_entries + MessageBox MB_OK|MB_ICONINFORMATION "Good News: UAC_RootDir now defined" + Goto check_folder_exists + + try_other_entries: ; ??? + ReadRegStr $G_ROOTDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" + StrCmp $G_ROOTDIR "" 0 check_folder_exists + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" + + check_folder_exists: + DeleteRegValue HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + + ; If we are upgrading an existing installation we need to ensure it is not running + + IfFileExists "$G_ROOTDIR\*.exe" 0 nothing_to_check + + !define L_CFG $R9 ; file handle + !define L_EXE $R8 ; name of EXE file to be monitored + !define L_LINE $R7 + !define L_NEW_GUI $R6 + !define L_OLD_GUI $R5 + !define L_PARAM $R4 + !define L_RESULT $R3 + !define L_TEXTEND $R2 ; used to ensure correct handling of lines longer than 1023 chars + + Push ${L_CFG} + Push ${L_EXE} + Push ${L_LINE} + Push ${L_NEW_GUI} + Push ${L_OLD_GUI} + Push ${L_PARAM} + Push ${L_RESULT} + Push ${L_TEXTEND} + + ; Starting with POPfile 0.21.0 an experimental version of 'popfile-service.exe' was included + ; to allow POPFile to be run as a Windows service. + + Push "POPFile" + Call ${UN}PFI_ServiceRunning + Pop ${L_RESULT} + StrCmp ${L_RESULT} "true" manual_shutdown + + ; If we are about to overwrite an existing version which is still running, + ; then one of the EXE files will be 'locked' which means we have to shutdown POPFile. + ; + ; POPFile v0.20.0 and later may be using 'popfileb.exe', 'popfilef.exe', 'popfileib.exe', + ; 'popfileif.exe', 'perl.exe' or 'wperl.exe'. + ; + ; Earlier versions of POPFile use only 'perl.exe' or 'wperl.exe'. + + Push $G_ROOTDIR + Call ${UN}PFI_FindLockedPFE + Pop ${L_EXE} + StrCmp ${L_EXE} "" check_pfi_utils + + ; The program files we are about to update are in use so we need to shut POPFile down + + DetailPrint "... oen of them is locked." + + ; Attempt to discover which POPFile UI port is used by the current user, so we can issue + ; a shutdown request. The following cases are considered: + ; + ; (a) upgrading a 0.21.0 or later installation and runpopfile.exe was used to start POPFile, + ; so POPFile is using environment variables which match the HKCU RootDir_SFN and + ; UserDir_SFN registry data (or HKCU RootDir_LFN and UserDir_LFN if short file names are + ; not supported) + ; + ; (b) upgrading a pre-0.21.0 installation, so popfile.cfg is in the $G_ROOTDIR folder. Need to + ; look for old-style and new-style UI port specifications just like the old installer did. + + ReadRegStr ${L_CFG} HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" + StrCmp ${L_CFG} "" try_root_dir + IfFileExists "${L_CFG}\popfile.cfg" check_cfg_file + + try_root_dir: + IfFileExists "$G_ROOTDIR\popfile.cfg" 0 manual_shutdown + StrCpy ${L_CFG} "$G_ROOTDIR" + + check_cfg_file: + StrCpy ${L_NEW_GUI} "" + StrCpy ${L_OLD_GUI} "" + + ; See if we can get the current gui port from an existing configuration. + ; There may be more than one entry for this port in the file - use the last one found + ; (but give priority to any "html_port" entry). + + FileOpen ${L_CFG} "${L_CFG}\popfile.cfg" r + + found_eol: + StrCpy ${L_TEXTEND} "<eol>" + + loop: + FileRead ${L_CFG} ${L_LINE} + StrCmp ${L_LINE} "" done + StrCmp ${L_TEXTEND} "<eol>" 0 check_eol + StrCmp ${L_LINE} "$\n" loop + + StrCpy ${L_PARAM} ${L_LINE} 10 + StrCmp ${L_PARAM} "html_port " got_html_port + + StrCpy ${L_PARAM} ${L_LINE} 8 + StrCmp ${L_PARAM} "ui_port " got_ui_port + Goto check_eol + + got_ui_port: + StrCpy ${L_OLD_GUI} ${L_LINE} 5 8 + Goto check_eol + + got_html_port: + StrCpy ${L_NEW_GUI} ${L_LINE} 5 10 + + ; Now read file until we get to end of the current line + ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) + + check_eol: + StrCpy ${L_TEXTEND} ${L_LINE} 1 -1 + StrCmp ${L_TEXTEND} "$\n" found_eol + StrCmp ${L_TEXTEND} "$\r" found_eol loop + + done: + FileClose ${L_CFG} + + Push ${L_NEW_GUI} + Call ${UN}PFI_TrimNewlines + Pop ${L_NEW_GUI} + + Push ${L_OLD_GUI} + Call ${UN}PFI_TrimNewlines + Pop ${L_OLD_GUI} + + StrCmp ${L_NEW_GUI} "" try_old_style + DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_NEW_GUI} [new style port]" + DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" + Push ${L_NEW_GUI} + Call ${UN}PFI_ShutdownViaUI + Pop ${L_RESULT} + DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" + StrCmp ${L_RESULT} "success" check_exe + StrCmp ${L_RESULT} "password?" manual_shutdown + + try_old_style: + StrCmp ${L_OLD_GUI} "" manual_shutdown + DetailPrint "$(PFI_LANG_INST_LOG_SHUTDOWN) ${L_OLD_GUI} [old style port]" + DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" + Push ${L_OLD_GUI} + Call ${UN}PFI_ShutdownViaUI + Pop ${L_RESULT} + DetailPrint "PFI_ShutdownViaUI result: ${L_RESULT}" + StrCmp ${L_RESULT} "success" check_exe + Goto manual_shutdown + + check_exe: + DetailPrint "Waiting for '${L_EXE}' to unlock after NSISdl request..." + DetailPrint "Please be patient, this may take more than 30 seconds" + Push ${L_EXE} + Call ${UN}PFI_WaitUntilUnlocked + DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." + Push "${C_EXE_END_MARKER}" + Push ${L_EXE} + Call ${UN}PFI_CheckIfLocked + Pop ${L_EXE} + StrCmp ${L_EXE} "" unlocked_now + + manual_shutdown: + StrCpy $G_PLS_FIELD_1 "POPFile" + DetailPrint "Unable to shutdown $G_PLS_FIELD_1 automatically - manual intervention requested" + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(PFI_LANG_MBMANSHUT_1)\ + ${MB_NL}${MB_NL}\ + $(PFI_LANG_MBMANSHUT_2)\ + ${MB_NL}${MB_NL}\ + $(PFI_LANG_MBMANSHUT_3)" + Goto check_pfi_utils + + unlocked_now: + DetailPrint "File is now unlocked" + + check_pfi_utils: + Push $G_ROOTDIR + Call ${UN}PFI_RequestPFIUtilsShutdown + + Pop ${L_TEXTEND} + Pop ${L_RESULT} + Pop ${L_PARAM} + Pop ${L_OLD_GUI} + Pop ${L_NEW_GUI} + Pop ${L_LINE} + Pop ${L_EXE} + Pop ${L_CFG} + + !undef L_CFG + !undef L_EXE + !undef L_LINE + !undef L_NEW_GUI + !undef L_OLD_GUI + !undef L_PARAM + !undef L_RESULT + !undef L_TEXTEND + + nothing_to_check: + Pop $G_ROOTDIR + FunctionEnd + !macroend + + !insertmacro MAKE_ROOTDIR_SAFE "" + + !insertmacro MAKE_ROOTDIR_SAFE "un." + + #-------------------------------------------------------------------------- # End of 'installer-SecPOPFile-func.nsh' #-------------------------------------------------------------------------- Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.12.4.4 retrieving revision 1.12.4.5 diff -C2 -d -r1.12.4.4 -r1.12.4.5 *** WriteEnvStr.nsh 5 Oct 2007 18:36:52 -0000 1.12.4.4 --- WriteEnvStr.nsh 14 Oct 2007 17:19:42 -0000 1.12.4.5 *************** *** 43,340 **** !ifndef ADDUSER #-------------------------------------------------------------------------- - # Installer Function: PFI_WriteEnv - # - # Writes an environment variable which is available to the 'current user' on a modern OS. - # On Win9x systems, AUTOEXEC.BAT is updated and the Reboot flag is set to request a reboot - # to make the new variable available for use. - # - # Inputs: - # (top of stack) - value for the new environment variable - # (top of stack - 1) - name of the new environment variable - # - # Outputs: - # none - # - # Usage: - # Push "HOMEDIR" - # Push "C:\New Home Dir" - # Call PFI_WriteEnvStr - # - #-------------------------------------------------------------------------- - - Function PFI_WriteEnvStr - - ; Registers common to Win9x and non-Win9x processing - - !define ENV_NAME $R9 ; name of the environment variable - !define ENV_VALUE $R8 ; value of the environment variable - !define TEMP $R7 - - ; Registers used only for Win9x processing - - !define DESTN $R6 ; used to access the revised AUTOEXEC.BAT file - !define ENV_FOUND $R5 ; 0 = variable not found, 1 = variable found in AUTOEXEC.BAT - !define ENV_SETLEN $R4 ; length of the string in ${ENV_SETNAME} - !define ENV_SETNAME $R3 ; left-hand side of SET command for the variable, incl '=' - !define LINE $R2 ; a line from AUTOEXEC.BAT - !define SOURCE $R1 ; used to access original AUTOEXEC.BAT file - !define TEMPFILE $R0 ; name of file used to build the revised AUTOEXEC.BAT file - - Exch ${ENV_VALUE} - Exch - Exch ${ENV_NAME} - Push ${TEMP} - - Call PFI_IsNT - Pop ${TEMP} - StrCmp ${TEMP} 1 WriteEnvStr_NT - - ; On Win9x system, so we add the new data to AUTOEXEC.BAT if it is not already there - - Push ${DESTN} - Push ${ENV_FOUND} - Push ${ENV_SETLEN} - Push ${ENV_SETNAME} - Push ${LINE} - Push ${SOURCE} - Push ${TEMPFILE} - - StrCpy ${ENV_SETNAME} "SET ${ENV_NAME}=" - StrLen ${ENV_SETLEN} ${ENV_SETNAME} - - StrCpy ${SOURCE} $WINDIR 2 ; Get the drive used for Windows (usually 'C:') - FileOpen ${SOURCE} "${SOURCE}\autoexec.bat" r - GetTempFileName ${TEMPFILE} - FileOpen ${DESTN} ${TEMPFILE} w - - StrCpy ${ENV_FOUND} 0 - - loop: - FileRead ${SOURCE} ${LINE} ; Read line from AUTOEXEC.BAT - StrCmp ${LINE} "" eof_found - Push ${LINE} - Call PFI_TrimNewlines - Pop ${LINE} - StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make - StrCpy ${TEMP} ${LINE} ${ENV_SETLEN} - StrCmp ${TEMP} ${ENV_SETNAME} 0 copy_line - StrCpy ${ENV_FOUND} 1 ; Have found a match. Now check the value it defines. - StrCpy ${TEMP} ${LINE} "" ${ENV_SETLEN} - StrCmp ${TEMP} ${ENV_VALUE} 0 different_value - ReadEnvStr ${TEMP} ${ENV_NAME} ; Identical value found. Now see if it currently exists. - StrCmp ${TEMP} ${ENV_VALUE} copy_line - SetRebootFlag true ; Value does not exist, so we need to reboot - - copy_line: - FileWrite ${DESTN} "${LINE}${MB_NL}" - Goto loop - - different_value: - FileWrite ${DESTN} "REM ${LINE}${MB_NL}" ; 'Comment out' the incorrect value - FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" - SetRebootFlag true - Goto loop - - eof_found: - StrCmp ${ENV_FOUND} 1 autoexec_done - FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" ; Append line for the new variable - SetRebootFlag true - - autoexec_done: - FileClose ${SOURCE} - FileClose ${DESTN} - - IfRebootFlag 0 win9x_done - StrCpy ${SOURCE} $WINDIR 2 - Delete "${SOURCE}\autoexec.bat" - CopyFiles /SILENT ${TEMPFILE} "${SOURCE}\autoexec.bat" - Delete ${TEMPFILE} - - win9x_done: - Pop ${TEMPFILE} - Pop ${SOURCE} - Pop ${LINE} - Pop ${ENV_SETNAME} - Pop ${ENV_SETLEN} - Pop ${ENV_FOUND} - Pop ${DESTN} - Goto WriteEnvStr_done - - ; More modern OS case (AUTOEXEC.BAT not relevant) - - WriteEnvStr_NT: - WriteRegExpandStr HKCU "Environment" ${ENV_NAME} ${ENV_VALUE} - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - - WriteEnvStr_done: - Pop ${TEMP} - Pop ${ENV_NAME} - Pop ${ENV_VALUE} - - !undef ENV_NAME - !undef ENV_VALUE - !undef TEMP - - !undef DESTN - !undef ENV_FOUND - !undef ENV_SETLEN - !undef ENV_SETNAME - !undef LINE - !undef SOURCE - !undef TEMPFILE - - FunctionEnd - - - #-------------------------------------------------------------------------- - # Installer Function: PFI_WriteEnvNTAU - # - # Writes an environment variable which is available to all users on a modern OS. - # On Win9x systems, AUTOEXEC.BAT is updated and the Reboot flag is set to request a reboot - # to make the new variable available for use. - # - # Inputs: - # (top of stack) - value for the new environment variable - # (top of stack - 1) - name of the new environment variable - # - # Outputs: - # none - # - # Usage: - # Push "HOMEDIR" - # Push "C:\New Home Dir" - # Call PFI_WriteEnvStrNTAU - # - #-------------------------------------------------------------------------- - - Function PFI_WriteEnvStrNTAU - - ; Registers common to Win9x and non-Win9x processing - - !define ENV_NAME $R9 ; name of the environment variable - !define ENV_VALUE $R8 ; value of the environment variable - !define TEMP $R7 - - ; Registers used only for Win9x processing - - !define DESTN $R6 ; used to access the revised AUTOEXEC.BAT file - !define ENV_FOUND $R5 ; 0 = variable not found, 1 = variable found in AUTOEXEC.BAT - !define ENV_SETLEN $R4 ; length of the string in ${ENV_SETNAME} - !define ENV_SETNAME $R3 ; left-hand side of SET command for the variable, incl '=' - !define LINE $R2 ; a line from AUTOEXEC.BAT - !define SOURCE $R1 ; used to access original AUTOEXEC.BAT file - !define TEMPFILE $R0 ; name of file used to build the revised AUTOEXEC.BAT file - - Exch ${ENV_VALUE} - Exch - Exch ${ENV_NAME} - Push ${TEMP} - - Call PFI_IsNT - Pop ${TEMP} - StrCmp ${TEMP} 1 WriteEnvStr_NT - - ; On Win9x system, so we add the new data to AUTOEXEC.BAT if it is not already there - - Push ${DESTN} - Push ${ENV_FOUND} - Push ${ENV_SETLEN} - Push ${ENV_SETNAME} - Push ${LINE} - Push ${SOURCE} - Push ${TEMPFILE} - - StrCpy ${ENV_SETNAME} "SET ${ENV_NAME}=" - StrLen ${ENV_SETLEN} ${ENV_SETNAME} - - StrCpy ${SOURCE} $WINDIR 2 ; Get the drive used for Windows (usually 'C:') - FileOpen ${SOURCE} "${SOURCE}\autoexec.bat" r - GetTempFileName ${TEMPFILE} - FileOpen ${DESTN} ${TEMPFILE} w - - StrCpy ${ENV_FOUND} 0 - - loop: - FileRead ${SOURCE} ${LINE} ; Read line from AUTOEXEC.BAT - StrCmp ${LINE} "" eof_found - Push ${LINE} - Call PFI_TrimNewlines - Pop ${LINE} - StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make - StrCpy ${TEMP} ${LINE} ${ENV_SETLEN} - StrCmp ${TEMP} ${ENV_SETNAME} 0 copy_line - StrCpy ${ENV_FOUND} 1 ; Have found a match. Now check the value it defines. - StrCpy ${TEMP} ${LINE} "" ${ENV_SETLEN} - StrCmp ${TEMP} ${ENV_VALUE} 0 different_value - ReadEnvStr ${TEMP} ${ENV_NAME} ; Identical value found. Now see if it currently exists. - StrCmp ${TEMP} ${ENV_VALUE} copy_line - SetRebootFlag true ; Value does not exist, so we need to reboot - - copy_line: - FileWrite ${DESTN} "${LINE}${MB_NL}" - Goto loop - - different_value: - FileWrite ${DESTN} "REM ${LINE}${MB_NL}" ; 'Comment out' the incorrect value - FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" - SetRebootFlag true - Goto loop - - eof_found: - StrCmp ${ENV_FOUND} 1 autoexec_done - FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" ; Append line for the new variable - SetRebootFlag true - - autoexec_done: - FileClose ${SOURCE} - FileClose ${DESTN} - - IfRebootFlag 0 win9x_done - StrCpy ${SOURCE} $WINDIR 2 - Delete "${SOURCE}\autoexec.bat" - CopyFiles /SILENT ${TEMPFILE} "${SOURCE}\autoexec.bat" - Delete ${TEMPFILE} - - win9x_done: - Pop ${TEMPFILE} - Pop ${SOURCE} - Pop ${LINE} - Pop ${ENV_SETNAME} - Pop ${ENV_SETLEN} - Pop ${ENV_FOUND} - Pop ${DESTN} - Goto WriteEnvStr_done - - ; More modern OS case (AUTOEXEC.BAT not relevant) - - WriteEnvStr_NT: - WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" \ - ${ENV_NAME} ${ENV_VALUE} - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - - WriteEnvStr_done: - Pop ${TEMP} - Pop ${ENV_NAME} - Pop ${ENV_VALUE} - - !undef ENV_NAME - !undef ENV_VALUE - !undef TEMP - - !undef DESTN - !undef ENV_FOUND - !undef ENV_SETLEN - !undef ENV_SETNAME - !undef LINE - !undef SOURCE - !undef TEMPFILE - - FunctionEnd - !endif - - !ifndef ADDUSER - #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_DeleteEnvStr # --- 43,46 ---- *************** *** 517,522 **** # # NOTE: ! # The !insertmacro PFI_IsNT "" and !insertmacro PFI_IsNT "un." commands are included in this file so ! # 'installer.nsi' can use 'Call PFI_IsNT' and 'Call un.PFI_IsNT' without additional preparation. # # Inputs: --- 223,228 ---- # # NOTE: ! # The !insertmacro PFI_IsNT "" and !insertmacro PFI_IsNT "un." commands are included in this file ! # so 'installer.nsi' can use 'Call PFI_IsNT' and 'Call un.PFI_IsNT' without additional preparation. # # Inputs: *************** *** 569,572 **** --- 275,633 ---- !insertmacro PFI_IsNT "un." + + #-------------------------------------------------------------------------- + # Macro: PFI_WriteEnvStr + # + # The installation process and the uninstall process both use a function which + # writes an environment variable which is available to the 'current user' on a + # modern OS. On Win9x systems, AUTOEXEC.BAT is updated and the Reboot flag is set + # to request a reboot to make the new variable available for use. This macro makes + # maintenance easier by ensuring that both processes use identical functions, with + # the only difference being their names. + # + # NOTE: + # The !insertmacro PFI_WriteEnvStr "" and !insertmacro PFI_WriteEnvStr "un." commands + # are included in this file so 'installer.nsi' can use 'Call PFI_WriteEnvStr' and + # 'Call un.PFI_WriteEnvStr' without additional preparation. + # + # Inputs: + # (top of stack) - value for the new environment variable + # (top of stack - 1) - name of the new environment variable + # + # Outputs: + # none + # + # Usage (after macro has been 'inserted'): + # + # Push "HOMEDIR" + # Push "C:\New Home Dir" + # Call PFI_WriteEnvStr + # + #-------------------------------------------------------------------------- + + !macro PFI_WriteEnvStr UN + Function ${UN}PFI_WriteEnvStr + + ; Registers common to Win9x and non-Win9x processing + + !define ENV_NAME $R9 ; name of the environment variable + !define ENV_VALUE $R8 ; value of the environment variable + !define TEMP $R7 + + ; Registers used only for Win9x processing + + !define DESTN $R6 ; used to access the revised AUTOEXEC.BAT file + !define ENV_FOUND $R5 ; 0 = variable not found, 1 = variable found in AUTOEXEC.BAT + !define ENV_SETLEN $R4 ; length of the string in ${ENV_SETNAME} + !define ENV_SETNAME $R3 ; left-hand side of SET command for the variable, incl '=' + !define LINE $R2 ; a line from AUTOEXEC.BAT + !define SOURCE $R1 ; used to access original AUTOEXEC.BAT file + !define TEMPFILE $R0 ; name of file used to build the revised AUTOEXEC.BAT file + + Exch ${ENV_VALUE} + Exch + Exch ${ENV_NAME} + Push ${TEMP} + + Call ${UN}PFI_IsNT + Pop ${TEMP} + StrCmp ${TEMP} 1 WriteEnvStr_NT + + ; On Win9x system, so we add the new data to AUTOEXEC.BAT if it is not already there + + Push ${DESTN} + Push ${ENV_FOUND} + Push ${ENV_SETLEN} + Push ${ENV_SETNAME} + Push ${LINE} + Push ${SOURCE} + Push ${TEMPFILE} + + StrCpy ${ENV_SETNAME} "SET ${ENV_NAME}=" + StrLen ${ENV_SETLEN} ${ENV_SETNAME} + + StrCpy ${SOURCE} $WINDIR 2 ; Get the drive used for Windows (usually 'C:') + FileOpen ${SOURCE} "${SOURCE}\autoexec.bat" r + GetTempFileName ${TEMPFILE} + FileOpen ${DESTN} ${TEMPFILE} w + + StrCpy ${ENV_FOUND} 0 + + loop: + FileRead ${SOURCE} ${LINE} ; Read line from AUTOEXEC.BAT + StrCmp ${LINE} "" eof_found + Push ${LINE} + Call ${UN}PFI_TrimNewlines + Pop ${LINE} + StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make + StrCpy ${TEMP} ${LINE} ${ENV_SETLEN} + StrCmp ${TEMP} ${ENV_SETNAME} 0 copy_line + StrCpy ${ENV_FOUND} 1 ; Have found a match. Now check the value it defines. + StrCpy ${TEMP} ${LINE} "" ${ENV_SETLEN} + StrCmp ${TEMP} ${ENV_VALUE} 0 different_value + ReadEnvStr ${TEMP} ${ENV_NAME} ; Identical value found. Now see if it currently exists. + StrCmp ${TEMP} ${ENV_VALUE} copy_line + SetRebootFlag true ; Value does not exist, so we need to reboot + + copy_line: + FileWrite ${DESTN} "${LINE}${MB_NL}" + Goto loop + + different_value: + FileWrite ${DESTN} "REM ${LINE}${MB_NL}" ; 'Comment out' the incorrect value + FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" + SetRebootFlag true + Goto loop + + eof_found: + StrCmp ${ENV_FOUND} 1 autoexec_done + FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" ; Append line for the new variable + SetRebootFlag true + + autoexec_done: + FileClose ${SOURCE} + FileClose ${DESTN} + + IfRebootFlag 0 win9x_done + StrCpy ${SOURCE} $WINDIR 2 + Delete "${SOURCE}\autoexec.bat" + CopyFiles /SILENT ${TEMPFILE} "${SOURCE}\autoexec.bat" + Delete ${TEMPFILE} + + win9x_done: + Pop ${TEMPFILE} + Pop ${SOURCE} + Pop ${LINE} + Pop ${ENV_SETNAME} + Pop ${ENV_SETLEN} + Pop ${ENV_FOUND} + Pop ${DESTN} + Goto WriteEnvStr_done + + ; More modern OS case (AUTOEXEC.BAT not relevant) + + WriteEnvStr_NT: + WriteRegExpandStr HKCU "Environment" ${ENV_NAME} ${ENV_VALUE} + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + + WriteEnvStr_done: + Pop ${TEMP} + Pop ${ENV_NAME} + Pop ${ENV_VALUE} + + !undef ENV_NAME + !undef ENV_VALUE + !undef TEMP + + !undef DESTN + !undef ENV_FOUND + !undef ENV_SETLEN + !undef ENV_SETNAME + !undef LINE + !undef SOURCE + !undef TEMPFILE + + FunctionEnd + !macroend + + !ifndef ADDUSER + + #-------------------------------------------------------------------------- + # Installer Function: PFI_WriteEnvStr + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + !insertmacro PFI_WriteEnvStr "" + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.PFI_WriteEnvStr + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + !insertmacro PFI_WriteEnvStr "un." + + !endif + + + #-------------------------------------------------------------------------- + # Macro: PFI_WriteEnvStrNTAU + # + # The installation process and the uninstall process both use a function which + # writes an environment variable which is available to all users on a modern OS. + # On Win9x systems, AUTOEXEC.BAT is updated and the Reboot flag is set to request + # a reboot to make the new variable available for use. This macro is used to make + # maintenance easier by ensuring that both processes use identical functions, with + # the only difference being their names. + # + # NOTE: + # The !insertmacro PFI_WriteEnvStrNTAU "" and !insertmacro PFI_WriteEnvStrNTAU "un." + # commands are included in this file so 'installer.nsi' can use 'Call PFI_WriteEnvStrNTAU' + # and 'Call un.PFI_WriteEnvStrNTAU' without additional preparation. + # + # Inputs: + # (top of stack) - value for the new environment variable + # (top of stack - 1) - name of the new environment variable + # + # Outputs: + # none + # + # Usage (after macro has been 'inserted'): + # + # Push "HOMEDIR" + # Push "C:\New Home Dir" + # Call PFI_WriteEnvStrNTAU + # + #-------------------------------------------------------------------------- + + !macro PFI_WriteEnvStrNTAU UN + Function ${UN}PFI_WriteEnvStrNTAU + + ; Registers common to Win9x and non-Win9x processing + + !define ENV_NAME $R9 ; name of the environment variable + !define ENV_VALUE $R8 ; value of the environment variable + !define TEMP $R7 + + ; Registers used only for Win9x processing + + !define DESTN $R6 ; used to access the revised AUTOEXEC.BAT file + !define ENV_FOUND $R5 ; 0 = variable not found, 1 = variable found in AUTOEXEC.BAT + !define ENV_SETLEN $R4 ; length of the string in ${ENV_SETNAME} + !define ENV_SETNAME $R3 ; left-hand side of SET command for the variable, incl '=' + !define LINE $R2 ; a line from AUTOEXEC.BAT + !define SOURCE $R1 ; used to access original AUTOEXEC.BAT file + !define TEMPFILE $R0 ; name of file used to build the revised AUTOEXEC.BAT file + + Exch ${ENV_VALUE} + Exch + Exch ${ENV_NAME} + Push ${TEMP} + + Call ${UN}PFI_IsNT + Pop ${TEMP} + StrCmp ${TEMP} 1 WriteEnvStr_NT + + ; On Win9x system, so we add the new data to AUTOEXEC.BAT if it is not already there + + Push ${DESTN} + Push ${ENV_FOUND} + Push ${ENV_SETLEN} + Push ${ENV_SETNAME} + Push ${LINE} + Push ${SOURCE} + Push ${TEMPFILE} + + StrCpy ${ENV_SETNAME} "SET ${ENV_NAME}=" + StrLen ${ENV_SETLEN} ${ENV_SETNAME} + + StrCpy ${SOURCE} $WINDIR 2 ; Get the drive used for Windows (usually 'C:') + FileOpen ${SOURCE} "${SOURCE}\autoexec.bat" r + GetTempFileName ${TEMPFILE} + FileOpen ${DESTN} ${TEMPFILE} w + + StrCpy ${ENV_FOUND} 0 + + loop: + FileRead ${SOURCE} ${LINE} ; Read line from AUTOEXEC.BAT + StrCmp ${LINE} "" eof_found + Push ${LINE} + Call ${UN}PFI_TrimNewlines + Pop ${LINE} + StrCmp ${LINE} "" copy_line ; Blank lines are preserved in the copy we make + StrCpy ${TEMP} ${LINE} ${ENV_SETLEN} + StrCmp ${TEMP} ${ENV_SETNAME} 0 copy_line + StrCpy ${ENV_FOUND} 1 ; Have found a match. Now check the value it defines. + StrCpy ${TEMP} ${LINE} "" ${ENV_SETLEN} + StrCmp ${TEMP} ${ENV_VALUE} 0 different_value + ReadEnvStr ${TEMP} ${ENV_NAME} ; Identical value found. Now see if it currently exists. + StrCmp ${TEMP} ${ENV_VALUE} copy_line + SetRebootFlag true ; Value does not exist, so we need to reboot + + copy_line: + FileWrite ${DESTN} "${LINE}${MB_NL}" + Goto loop + + different_value: + FileWrite ${DESTN} "REM ${LINE}${MB_NL}" ; 'Comment out' the incorrect value + FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" + SetRebootFlag true + Goto loop + + eof_found: + StrCmp ${ENV_FOUND} 1 autoexec_done + FileWrite ${DESTN} "${ENV_SETNAME}${ENV_VALUE}${MB_NL}" ; Append line for the new variable + SetRebootFlag true + + autoexec_done: + FileClose ${SOURCE} + FileClose ${DESTN} + + IfRebootFlag 0 win9x_done + StrCpy ${SOURCE} $WINDIR 2 + Delete "${SOURCE}\autoexec.bat" + CopyFiles /SILENT ${TEMPFILE} "${SOURCE}\autoexec.bat" + Delete ${TEMPFILE} + + win9x_done: + Pop ${TEMPFILE} + Pop ${SOURCE} + Pop ${LINE} + Pop ${ENV_SETNAME} + Pop ${ENV_SETLEN} + Pop ${ENV_FOUND} + Pop ${DESTN} + Goto WriteEnvStr_done + + ; More modern OS case (AUTOEXEC.BAT not relevant) + + WriteEnvStr_NT: + WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" \ + ${ENV_NAME} ${ENV_VALUE} + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + + WriteEnvStr_done: + Pop ${TEMP} + Pop ${ENV_NAME} + Pop ${ENV_VALUE} + + !undef ENV_NAME + !undef ENV_VALUE + !undef TEMP + + !undef DESTN + !undef ENV_FOUND + !undef ENV_SETLEN + !undef ENV_SETNAME + !undef LINE + !undef SOURCE + !undef TEMPFILE + + FunctionEnd + !macroend + + !ifndef ADDUSER + + #-------------------------------------------------------------------------- + # Installer Function: PFI_WriteEnvStrNTAU + # + # This function is used during the installation process + #-------------------------------------------------------------------------- + + !insertmacro PFI_WriteEnvStrNTAU "" + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.PFI_WriteEnvStrNTAU + # + # This function is used during the uninstall process + #-------------------------------------------------------------------------- + + !insertmacro PFI_WriteEnvStrNTAU "un." + + !endif + #-------------------------------------------------------------------------- # End of 'WriteEnvStr.nsh' Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -C2 -d -r1.4.2.10 -r1.4.2.11 *** installer-Uninstall.nsh 5 Oct 2007 18:36:52 -0000 1.4.2.10 --- installer-Uninstall.nsh 14 Oct 2007 17:19:41 -0000 1.4.2.11 *************** *** 50,53 **** --- 50,60 ---- ##################################################################################### + #-------------------------------------------------------------------------- + # User Registers (Global) + #-------------------------------------------------------------------------- + + ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data. + + Var G_UNINST_MODE ; Uninstaller mode ("change" or "uninstall") #-------------------------------------------------------------------------- *************** *** 100,107 **** Call un.SetGlobalUserVariables FunctionEnd #-------------------------------------------------------------------------- ! # Installer Function: un.OnUninstFailed (required by UAC plugin) #-------------------------------------------------------------------------- --- 107,117 ---- Call un.SetGlobalUserVariables + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioP.ini" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioUM.ini" + FunctionEnd #-------------------------------------------------------------------------- ! # Uninstaller Function: un.OnUninstFailed (required by UAC plugin) #-------------------------------------------------------------------------- *************** *** 113,117 **** #-------------------------------------------------------------------------- ! # Installer Function: un.OnUninstSuccess (required by UAC plugin) #-------------------------------------------------------------------------- --- 123,127 ---- #-------------------------------------------------------------------------- ! # Uninstaller Function: un.OnUninstSuccess (required by UAC plugin) #-------------------------------------------------------------------------- *************** *** 123,127 **** #-------------------------------------------------------------------------- ! # Uninstaller Sections (this build uses all of these and executes them in the order shown) # # (1) un.Uninstall Begin - requests confirmation if appropriate --- 133,374 ---- #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFIGUIInit ! # (custom un.onGUIInit function) ! # ! # Used to complete the initialization of the installer. ! # This code was moved from '.onInit' in order to permit the use of language-specific strings ! # (the selected language is not available inside the '.onInit' function) ! #-------------------------------------------------------------------------- ! ! Function un.PFIGUIInit ! ! !define L_RESERVED $1 ; used in the system.dll call ! ! !define L_OPTIONLIST $R9 ! !define L_PARAMETER $R8 ! ! Push ${L_RESERVED} ! Push ${L_OPTIONLIST} ! Push ${L_PARAMETER} ! ! ; Ensure only one copy of this installer is running ! ! System::Call 'kernel32::CreateMutexA(i 0, i 0, t "OnlyOnePFI_mutex") i .r1 ?e' ! Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} 0 mutex_ok ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_INSTALLER_MUTEX)" ! Abort ! ! mutex_ok: ! ! ; If 'Nihongo' (Japanese) language has been selected for the installer, ensure the ! ; 'Nihongo Parser' entry is shown on the COMPONENTS page to confirm that a parser will ! ; be installed. The "Nihongo Parser Selection" page appears immediately before the ! ; COMPONENTS page. ! ! Call un.ShowOrHideNihongoParser ! ! ; If the mode option has been supplied on the command-line ! ; preset the appropriate radiobutton, otherwise deselect both. ! ; ! ; The UAC plugin may modify the command-line so we need to ! ; check for the option anywhere on the command-line (instead ! ; of assuming the command-line is empty or only contains ! ; the /MODIFY or /UNINSTALL option) ! ! Call un.PFI_GetParameters ! Pop ${L_OPTIONLIST} ! ! Push ${L_OPTIONLIST} ! Push "/UNINSTALL" ! Call un.PFI_StrStr ! Pop ${L_PARAMETER} ! StrCmp ${L_PARAMETER} "" try_modify ! StrCpy ${L_PARAMETER} ${L_PARAMETER} 11 ! StrCmp ${L_PARAMETER} "/UNINSTALL" uninstall_mode ! StrCmp ${L_PARAMETER} "/UNINSTALL " uninstall_mode ! ! try_modify: ! Push ${L_OPTIONLIST} ! Push "/MODIFY" ! Call un.PFI_StrStr ! Pop ${L_PARAMETER} ! StrCmp ${L_PARAMETER} "" undefined_mode ! StrCpy ${L_PARAMETER} ${L_PARAMETER} 8 ! StrCmp ${L_PARAMETER} "/MODIFY" modify_mode ! StrCmp ${L_PARAMETER} "/MODIFY " modify_mode ! ! undefined_mode: ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 1" "State" 0 ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 2" "State" 0 ! Goto insert_lang_strings ! ! modify_mode: ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 1" "State" 1 ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 2" "State" 0 ! Goto insert_lang_strings ! ! uninstall_mode: ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 1" "State" 0 ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Field 2" "State" 1 ! ! insert_lang_strings: ! ! ; Insert appropriate language strings into the custom page's INI file ! ! Call un.SelectMode_Init ! ! Pop ${L_PARAMETER} ! Pop ${L_OPTIONLIST} ! ! Pop ${L_RESERVED} ! ! !undef L_OPTIONLIST ! !undef L_PARAMETER ! ! !undef L_RESERVED ! ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.SelectMode_Init ! # ! # This function adds language texts to the INI file for the custom page used ! # to select the uninstaller mode (to make the custom page use the language ! # selected by the user for the installer) ! #-------------------------------------------------------------------------- ! ! Function un.SelectMode_Init ! ! ; Ensure custom page matches the selected language (left-to-right or right-to-left order) ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Settings" "RTL" "$(^RTL)" ! ! ; Identify and describe the two radio buttons used to select the uninstaller mode ! ! !insertmacro PFI_IO_TEXT "ioUM.ini" "1" "$(PFI_LANG_UN_IO_MODE_RADIO)" ! !insertmacro PFI_IO_TEXT "ioUM.ini" "3" "$(PFI_LANG_UN_IO_MODE_LABEL)" ! ! !insertmacro PFI_IO_TEXT "ioUM.ini" "2" "$(PFI_LANG_UN_IO_UNINST_RADIO)" ! !insertmacro PFI_IO_TEXT "ioUM.ini" "4" "$(PFI_LANG_UN_IO_UNINST_LABEL)" ! ! FunctionEnd ! ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.SelectMode ! # ! # Starting with the 1.0.0 release the POPFile uninstaller offers two modes: ! # (1) Change the existing installation (add SSL Support, change the Nihongo parser) ! # (2) Uninstall the POPFile program ! #-------------------------------------------------------------------------- ! ! Function un.SelectMode ! ! !define L_RESULT $R9 ! ! Push ${L_RESULT} ! ! ; Ensure custom page matches the selected language (left-to-right or right-to-left order) ! ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioUM.ini" "Settings" "RTL" "$(^RTL)" ! ! !insertmacro MUI_HEADER_TEXT "$(PFI_LANG_UN_MODE_TITLE)" "$(PFI_LANG_UN_MODE_SUBTITLE)" ! ! loop: ! !insertmacro MUI_INSTALLOPTIONS_DISPLAY_RETURN "ioUM.ini" ! Pop ${L_RESULT} ! StrCmp ${L_RESULT} "success" check_selection ! Abort ! ! check_selection: ! !insertmacro MUI_INSTALLOPTIONS_READ "$G_UNINST_MODE " "ioUM.ini" "Field 1" "State" ! StrCmp $G_UNINST_MODE 0 try_other_button ! StrCpy $G_UNINST_MODE "change" ! Goto exit ! ! try_other_button: ! !insertmacro MUI_INSTALLOPTIONS_READ "$G_UNINST_MODE " "ioUM.ini" "Field 2" "State" ! StrCmp $G_UNINST_MODE 0 loop ! StrCpy $G_UNINST_MODE "uninstall" ! ! exit: ! Pop ${L_RESULT} ! ! !undef L_RESULT ! ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.ComponentsCheckModeFlag ! # ! # The "pre" function for the uninstaller's COMPONENTS page ! # which is only shown when modifying the existing installation ! #-------------------------------------------------------------------------- ! ! Function un.ComponentsCheckModeFlag ! ! StrCmp $G_UNINST_MODE "change" exit ! StrCmp $G_UNINST_MODE "uninstall" skip_page ! MessageBox MB_OK "Internal Error: unexpected mode ($G_UNINST_MODE)" ! ! skip_page: ! Abort ! ! exit: ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.DirectoryCheckModeFlag ! # ! # The "pre" function for the uninstaller's DIRECTORY page ! # which is only shown when modifying the existing installation ! #-------------------------------------------------------------------------- ! ! Function un.DirectoryCheckModeFlag ! ! StrCmp $G_UNINST_MODE "change" exit ! Abort ! ! exit: ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.UninstallCheckModeFlag ! # ! # The "pre" function for the uninstaller's confirmation page ! # which is only shown when uninstalling the POPFile program ! #-------------------------------------------------------------------------- ! ! Function un.UninstallCheckModeFlag ! ! StrCmp $G_UNINST_MODE "uninstall" exit ! StrCmp $G_UNINST_MODE "change" skip_page ! MessageBox MB_OK "Internal Error: unexpected mode ($G_UNINST_MODE)" ! ! skip_page: ! Abort ! ! exit: ! FunctionEnd ! ! #-------------------------------------------------------------------------- ! # Sections used to modify an existing installation (executed in the order shown) ! # ! # (0) Custom Page (SelectMode) offering "Modify" or "Uninstall" options ! # ! # (1) un.Uninstall Begin - requests confirmation if appropriate ! # (2) un.Shutdown POPFile - shutdown POPFile if necessary (to avoid the need to reboot) ! # (3) un.AddSSLSupport - downloads and installs the SSL support files ! # (4) un.Nihongo Parser - offers a choice of 3 parsers (Kakasi, MeCab and internal) ! # (5) un.Kakasi - installs Kakasi package and creates its environment variables ! # (6) un.MeCab - downloads and installs MeCab package and its environment variables ! # (7) un.Internal - installs support for the internal parser ! # ! # Note: Only one of the three Nihongo parsers can be added at a time (re-run to add more) ! #-------------------------------------------------------------------------- ! # Sections used to uninstall POPFile (executed in the order shown) ! # ! # (0) Custom Page (SelectMode) offering "Modify" or "Uninstall" options # # (1) un.Uninstall Begin - requests confirmation if appropriate *************** *** 133,140 **** # (7) un.Languages - uninstall POPFile UI languages # (8) un.QuickStart Guide - uninstall POPFile English QuickStart Guide ! # (9) un.Kakasi - uninstall Kakasi package and remove its environment variables ! # (10) un.Minimal Perl - uninstall minimal Perl, including all of the optional modules ! # (11) un.Registry Entries - remove 'Add/Remove Program' data and other registry entries ! # (12) un.Uninstall End - remove remaining files/folders (if it is safe to do so) # #-------------------------------------------------------------------------- --- 380,388 ---- # (7) un.Languages - uninstall POPFile UI languages # (8) un.QuickStart Guide - uninstall POPFile English QuickStart Guide ! # (9) un.Remove Kakasi - uninstall Kakasi package and remove its environment variables ! # (10) un.Remove MeCab - uninstall MeCab package and remove its environment variables ! # (11) un.Minimal Perl - uninstall minimal Perl, including all of the optional modules ! # (12) un.Registry Entries - remove 'Add/Remove Program' data and other registry entries ! # (13) un.Uninstall End - remove remaining files/folders (if it is safe to do so) # #-------------------------------------------------------------------------- *************** *** 144,148 **** #-------------------------------------------------------------------------- ! Section "un.Uninstall Begin" UnSecBegin !define L_TEMP $R9 --- 392,396 ---- #-------------------------------------------------------------------------- ! Section "-un.Uninstall Begin" UnSecBegin !define L_TEMP $R9 *************** *** 170,174 **** #-------------------------------------------------------------------------- ! Section "un.Local User Data" UnSecUserData !define L_RESULT $R9 --- 418,424 ---- #-------------------------------------------------------------------------- ! Section "-un.Local User Data" UnSecUserData ! ! StrCmp $G_UNINST_MODE "change" skip_section !define L_RESULT $R9 *************** *** 221,224 **** --- 471,475 ---- !undef L_RESULT + skip_section: SectionEnd *************** *** 227,231 **** #-------------------------------------------------------------------------- ! Section "un.Shutdown POPFile" UnSecShutdown !define L_TEMP $R9 --- 478,482 ---- #-------------------------------------------------------------------------- ! Section "-un.Shutdown POPFile" UnSecShutdown !define L_TEMP $R9 *************** *** 278,285 **** #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Start Menu Entries' #-------------------------------------------------------------------------- ! Section "un.Start Menu Entries" UnSecStartMenu !define L_TEMP $R9 --- 529,579 ---- #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.SecSSL' + #-------------------------------------------------------------------------- + + !insertmacro HANDLE_ADDING_SSL_SUPPORT + + #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.Nihongo Parser' + #-------------------------------------------------------------------------- + + !insertmacro SECTION_NIHONGO_PARSER "un." + + #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.Kakasi' + #-------------------------------------------------------------------------- + + !insertmacro SECTION_KAKASI "un." + + #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.MeCab' + #-------------------------------------------------------------------------- + + !insertmacro SECTION_MECAB "un." + + #-------------------------------------------------------------------------- + # Uninstaller Function: un.GetMeCabFile + # + # Inputs: + # (top of stack) - full URL used to download the MeCab file + # Outputs: + # (top of stack) - status returned by the download plugin + #-------------------------------------------------------------------------- + + !insertmacro FUNCTION_GETMECABFILE "un." + + #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.Internal' + #-------------------------------------------------------------------------- + + !insertmacro SECTION_INTERNALPARSER "un." + + #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Start Menu Entries' #-------------------------------------------------------------------------- ! Section "-un.Start Menu Entries" UnSecStartMenu ! ! StrCmp $G_UNINST_MODE "change" skip_section !define L_TEMP $R9 *************** *** 339,342 **** --- 633,637 ---- !undef L_TEMP + skip_section: SectionEnd *************** *** 350,354 **** #-------------------------------------------------------------------------- ! Section "un.POPFile Core" UnSecCore SetDetailsPrint textonly --- 645,651 ---- #-------------------------------------------------------------------------- ! Section "-un.POPFile Core" UnSecCore ! ! StrCmp $G_UNINST_MODE "change" skip_section SetDetailsPrint textonly *************** *** 438,441 **** --- 735,739 ---- SetDetailsPrint listonly + skip_section: SectionEnd *************** *** 444,448 **** #-------------------------------------------------------------------------- ! Section "un.Skins" UnSecSkins SetDetailsPrint textonly --- 742,748 ---- #-------------------------------------------------------------------------- ! Section "-un.Skins" UnSecSkins ! ! StrCmp $G_UNINST_MODE "change" skip_section SetDetailsPrint textonly *************** *** 486,489 **** --- 786,790 ---- SetDetailsPrint listonly + skip_section: SectionEnd *************** *** 492,496 **** #-------------------------------------------------------------------------- ! Section "un.Languages" UnSecLangs SetDetailsPrint textonly --- 793,799 ... [truncated message content] |
|
From: Brian S. <xue...@us...> - 2007-10-05 22:04:03
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21840 Modified Files: Tag: b0_22_2 OnDemand.nsi Log Message: Oops! Forgot to bump the version number last time. Index: OnDemand.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** OnDemand.nsi 5 Oct 2007 18:39:24 -0000 1.1.2.3 --- OnDemand.nsi 5 Oct 2007 22:04:03 -0000 1.1.2.4 *************** *** 143,147 **** OutFile ${C_OUTFILE} ! !define C_VERSION "0.0.7" ; Specify the icon file for the utility --- 143,147 ---- OutFile ${C_OUTFILE} ! !define C_VERSION "0.0.8" ; Specify the icon file for the utility |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:40:16
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12018/test Modified Files: Tag: b0_22_2 pfidiag.nsi Log Message: Add support for the new Nihongo Parser installation and the new MeCab environment variable. Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.9 retrieving revision 1.8.4.10 diff -C2 -d -r1.8.4.9 -r1.8.4.10 *** pfidiag.nsi 4 Aug 2007 12:41:36 -0000 1.8.4.9 --- pfidiag.nsi 5 Oct 2007 18:40:19 -0000 1.8.4.10 *************** *** 104,108 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.7" !define C_OUTFILE "pfidiag.exe" --- 104,108 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.8" !define C_OUTFILE "pfidiag.exe" *************** *** 293,296 **** --- 293,324 ---- !macroend + ;--------------------------------------------------------------------------- + ; Differentiate between a non-existent and an empty MeCab environment variable + ; (this variable is only defined if the MeCab software has been installed) + ;--------------------------------------------------------------------------- + + !macro CHECK_MECAB REGISTER ENV_VARIABLE MESSAGE + + !insertmacro PFI_UNIQUE_ID + + ClearErrors + ReadEnvStr "${REGISTER}" "${ENV_VARIABLE}" + StrCmp "${REGISTER}" "" 0 show_value_${PFI_UNIQUE_ID} + IfErrors 0 show_value_${PFI_UNIQUE_ID} + IfFileExists "$G_EXPECTED_ROOT\mecab\*.*" MeCab_${PFI_UNIQUE_ID} + DetailPrint "${MESSAGE}= >< (this is OK)" + Goto continue_${PFI_UNIQUE_ID} + + MeCab_${PFI_UNIQUE_ID}: + DetailPrint "${MESSAGE}= ><" + Goto continue_${PFI_UNIQUE_ID} + + show_value_${PFI_UNIQUE_ID}: + DetailPrint "${MESSAGE}= < ${REGISTER} >" + + continue_${PFI_UNIQUE_ID}: + !macroend + + #-------------------------------------------------------------------------- # Configure the MUI pages *************** *** 746,751 **** DetailPrint "HKLM: MRI Version = < ${L_REGDATA} >" ! !insertmacro CHECK_MRI_ENTRY "${L_REGDATA}" "HKLM" "InstallPath" "HKLM: InstallPath " ! !insertmacro CHECK_MRI_ENTRY "${L_REGDATA}" "HKLM" "RootDir_LFN" "HKLM: RootDir_LFN " Push ${L_REGDATA} Call CheckForTrailingSlash --- 774,783 ---- DetailPrint "HKLM: MRI Version = < ${L_REGDATA} >" ! DetailPrint "" ! !insertmacro CHECK_MRI_ENTRY "${L_REGDATA}" "HKLM" "NihongoParser" "HKLM: NewParser " ! DetailPrint "" ! ! !insertmacro CHECK_MRI_ENTRY "${L_REGDATA}" "HKLM" "InstallPath" "HKLM: InstallPath " ! !insertmacro CHECK_MRI_ENTRY "${L_REGDATA}" "HKLM" "RootDir_LFN" "HKLM: RootDir_LFN " Push ${L_REGDATA} Call CheckForTrailingSlash *************** *** 1081,1089 **** !define L_ITAIJIDICTPATH $R9 ; current Kakasi environment variable !define L_KANWADICTPATH $R8 ; current Kakasi environment variable ! !define L_POPFILE_ROOT $R7 ; current value of POPFILE_ROOT environment variable ! !define L_TEMP $R6 Push ${L_ITAIJIDICTPATH} Push ${L_KANWADICTPATH} Push ${L_POPFILE_ROOT} Push ${L_TEMP} --- 1113,1123 ---- !define L_ITAIJIDICTPATH $R9 ; current Kakasi environment variable !define L_KANWADICTPATH $R8 ; current Kakasi environment variable ! !define L_MECABRC $R7 ; current MeCab environment variable ! !define L_POPFILE_ROOT $R6 ; current value of POPFILE_ROOT environment variable ! !define L_TEMP $R5 Push ${L_ITAIJIDICTPATH} Push ${L_KANWADICTPATH} + Push ${L_MECABRC} Push ${L_POPFILE_ROOT} Push ${L_TEMP} *************** *** 1176,1180 **** DetailPrint "" ! StrCmp $G_DIAG_MODE "simple" section_end StrCmp ${L_ITAIJIDICTPATH} "" check_other_kakaksi --- 1210,1214 ---- DetailPrint "" ! StrCmp $G_DIAG_MODE "simple" check_mecab StrCmp ${L_ITAIJIDICTPATH} "" check_other_kakaksi *************** *** 1188,1192 **** check_other_kakaksi: StrCmp ${L_KANWADICTPATH} "" 0 check_kanwa ! StrCmp ${L_ITAIJIDICTPATH} "" section_end exit_with_blank_line check_kanwa: --- 1222,1226 ---- check_other_kakaksi: StrCmp ${L_KANWADICTPATH} "" 0 check_kanwa ! StrCmp ${L_ITAIJIDICTPATH} "" check_mecab kakasi_blank_line check_kanwa: *************** *** 1198,1201 **** --- 1232,1252 ---- DetailPrint "'kanwadict' file = ${L_TEMP}found" + kakasi_blank_line: + DetailPrint "" + + check_mecab: + !insertmacro CHECK_MECAB "${L_MECABRC}" "MECABRC" "'MECABRC' " + DetailPrint "" + + StrCmp $G_DIAG_MODE "simple" section_end + + StrCmp ${L_MECABRC} "" exit_with_blank_line + StrCpy ${L_TEMP} "" + IfFileExists "${L_MECABRC}" display_mecab_result + StrCpy ${L_TEMP} "not " + + display_mecab_result: + DetailPrint "'mecabrc' file = ${L_TEMP}found" + exit_with_blank_line: DetailPrint "" *************** *** 1204,1207 **** --- 1255,1259 ---- Pop ${L_TEMP} Pop ${L_POPFILE_ROOT} + Pop ${L_MECABRC} Pop ${L_KANWADICTPATH} Pop ${L_ITAIJIDICTPATH} *************** *** 1209,1212 **** --- 1261,1265 ---- !undef L_ITAIJIDICTPATH !undef L_KANWADICTPATH + !undef L_MECABRC !undef L_POPFILE_ROOT !undef L_TEMP |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:39:23
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11297 Modified Files: Tag: b0_22_2 pfi-library.nsh stop_popfile.nsi Log Message: Where appropriate, make string processing loops more robust by using the string length to test for end-of-string instead of assuming a null character marks the end of the string. Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.7 retrieving revision 1.14.4.8 diff -C2 -d -r1.14.4.7 -r1.14.4.8 *** stop_popfile.nsi 5 May 2007 12:28:07 -0000 1.14.4.7 --- stop_popfile.nsi 5 Oct 2007 18:39:25 -0000 1.14.4.8 *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 259,264 **** --- 259,266 ---- ${MB_NL} ECHO Shutdown succeeded\ ${MB_NL} GOTO DONE\ + ${MB_NL}\ ${MB_NL} :FAILED\ ${MB_NL} ECHO **** Shutdown failed ****\ + ${MB_NL}\ ${MB_NL} :DONE\ ${MB_NL}${MB_NL}\ *************** *** 443,458 **** !define L_CHAR $R9 ; a character from the input list ! !define L_LIST $R8 ; input list of parameters (may be empty) ! !define L_PARAM $R7 ; the first parameter found Exch ${L_LIST} Push ${L_PARAM} Push ${L_CHAR} StrCpy ${L_PARAM} "" loop_L: StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list - StrCmp ${L_CHAR} "" done StrCpy ${L_LIST} ${L_LIST} "" 1 ; remove char from input list StrCmp ${L_CHAR} " " loop_L --- 445,463 ---- !define L_CHAR $R9 ; a character from the input list ! !define L_LENGTH $R8 ; use string length to determine if end-of-string reached ! !define L_LIST $R7 ; input list of parameters (may be empty) ! !define L_PARAM $R6 ; the first parameter found Exch ${L_LIST} Push ${L_PARAM} Push ${L_CHAR} + Push ${L_LENGTH} StrCpy ${L_PARAM} "" loop_L: + StrLen ${L_LENGTH} ${L_LIST} + StrCmp ${L_LENGTH} 0 done StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list StrCpy ${L_LIST} ${L_LIST} "" 1 ; remove char from input list StrCmp ${L_CHAR} " " loop_L *************** *** 460,471 **** loop_P: StrCpy ${L_PARAM} ${L_PARAM}${L_CHAR} StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list - StrCmp ${L_CHAR} "" done StrCpy ${L_LIST} ${L_LIST} "" 1 StrCmp ${L_CHAR} " " 0 loop_P ; loop until a space is found loop_T: StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list - StrCmp ${L_CHAR} "" done StrCmp ${L_CHAR} " " 0 done StrCpy ${L_LIST} ${L_LIST} "" 1 ; remove trailing spaces --- 465,478 ---- loop_P: StrCpy ${L_PARAM} ${L_PARAM}${L_CHAR} + StrLen ${L_LENGTH} ${L_LIST} + StrCmp ${L_LENGTH} 0 done StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list StrCpy ${L_LIST} ${L_LIST} "" 1 StrCmp ${L_CHAR} " " 0 loop_P ; loop until a space is found loop_T: + StrLen ${L_LENGTH} ${L_LIST} + StrCmp ${L_LENGTH} 0 done StrCpy ${L_CHAR} ${L_LIST} 1 ; get next char from input list StrCmp ${L_CHAR} " " 0 done StrCpy ${L_LIST} ${L_LIST} "" 1 ; remove trailing spaces *************** *** 473,476 **** --- 480,484 ---- done: + Pop ${L_LENGTH} Pop ${L_CHAR} Exch ${L_PARAM} ; put parameter on stack (may be "") *************** *** 479,482 **** --- 487,491 ---- !undef L_CHAR + !undef L_LENGTH !undef L_LIST !undef L_PARAM Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.8 retrieving revision 1.53.4.9 diff -C2 -d -r1.53.4.8 -r1.53.4.9 *** pfi-library.nsh 21 Sep 2007 01:11:23 -0000 1.53.4.8 --- pfi-library.nsh 5 Oct 2007 18:39:24 -0000 1.53.4.9 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.0" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.1" #-------------------------------------------------------------------------- *************** *** 926,938 **** Function PFI_StrStripLZS ! !define L_CHAR $R9 ! !define L_STRING $R8 Exch ${L_STRING} Push ${L_CHAR} loop: StrCpy ${L_CHAR} ${L_STRING} 1 - StrCmp ${L_CHAR} "" done StrCmp ${L_CHAR} " " strip_char StrCmp ${L_CHAR} "0" strip_char --- 926,941 ---- Function PFI_StrStripLZS ! !define L_CHAR $R9 ; current character ! !define L_LIMIT $R8 ; use string length (instead of a null) to detect end-of-string ! !define L_STRING $R7 ; the string to be processed Exch ${L_STRING} Push ${L_CHAR} + Push ${L_LIMIT} loop: + StrLen ${L_LIMIT} ${L_STRING} + StrCmp ${L_LIMIT} 0 done StrCpy ${L_CHAR} ${L_STRING} 1 StrCmp ${L_CHAR} " " strip_char StrCmp ${L_CHAR} "0" strip_char *************** *** 944,951 **** --- 947,956 ---- done: + Pop ${L_LIMIT} Pop ${L_CHAR} Exch ${L_STRING} !undef L_CHAR + !undef L_LIMIT !undef L_STRING *************** *** 4266,4311 **** Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string ! Exch $0 ; The input string ! Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! Push $2 ; A character from the input string ! Push $3 ; The offset to a character in the "validity check" string ! Push $4 ; A character from the "validity check" string ! Push $5 ; Holds the current "validity check" string ! StrCpy $1 "" next_input_char: ! StrCpy $2 $0 1 ; Get the next character from the input string ! StrCmp $2 "" done ! StrCpy $5 ${DECIMAL_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match ! StrCpy $0 $0 "" 1 ! StrCpy $3 -1 next_valid_char: ! IntOp $3 $3 + 1 ! StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) ! StrCmp $2 $4 0 next_valid_char ! IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy $1 "" done: ! StrCpy $0 $1 ; Result is either a string of decimal digits or "" ! Pop $5 ! Pop $4 ! Pop $3 ! Pop $2 ! Pop $1 ! Exch $0 ; place result on top of the stack !undef DECIMAL_DIGIT !undef BAD_OFFSET FunctionEnd !macroend --- 4271,4335 ---- Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string ! !define L_STRING $0 ; The input string ! !define L_RESULT $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! !define L_CURRENT $2 ; A character from the input string ! !define L_OFFSET $3 ; The offset to a character in the "validity check" string ! !define L_VALIDCHAR $4 ; A character from the "validity check" string ! !define L_VALIDLIST $5 ; Holds the current "validity check" string ! !define L_CHARSLEFT $6 ; To cater for MBCS input strings, terminate when end of string reached, not when a null byte reached ! Exch ${L_STRING} ! Push ${L_RESULT} ! Push ${L_CURRENT} ! Push ${L_OFFSET} ! Push ${L_VALIDCHAR} ! Push ${L_VALIDLIST} ! Push ${L_CHARSLEFT} ! ! StrCpy ${L_RESULT} "" next_input_char: ! StrLen ${L_CHARSLEFT} ${L_STRING} ! StrCmp ${L_CHARSLEFT} 0 done ! StrCpy ${L_CURRENT} ${L_STRING} 1 ; Get the next character from the input string ! StrCpy ${L_VALIDLIST} ${DECIMAL_DIGIT}${L_CURRENT} ; Add it to end of "validity check" to guarantee a match ! StrCpy ${L_STRING} ${L_STRING} "" 1 ! StrCpy ${L_OFFSET} -1 next_valid_char: ! IntOp ${L_OFFSET} ${L_OFFSET} + 1 ! StrCpy ${L_VALIDCHAR} ${L_VALIDLIST} 1 ${L_OFFSET} ; Extract next "valid" char (from "validity check" string) ! StrCmp ${L_CURRENT} ${L_VALIDCHAR} 0 next_valid_char ! IntCmp ${L_OFFSET} ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy ${L_RESULT} ${L_RESULT}${L_VALIDCHAR} ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy ${L_RESULT} "" done: ! StrCpy ${L_STRING} ${L_RESULT} ; Result is either a string of decimal digits or "" ! Pop ${L_CHARSLEFT} ! Pop ${L_VALIDLIST} ! Pop ${L_VALIDCHAR} ! Pop ${L_OFFSET} ! Pop ${L_CURRENT} ! Pop ${L_RESULT} ! Exch ${L_STRING} ; Place result on top of the stack !undef DECIMAL_DIGIT !undef BAD_OFFSET + !undef L_STRING + !undef L_RESULT + !undef L_CURRENT + !undef L_OFFSET + !undef L_VALIDCHAR + !undef L_VALIDLIST + !undef L_CHARSLEFT + FunctionEnd !macroend *************** *** 4364,4395 **** Function ${UN}PFI_StrStr ! Exch $R1 ; Make $R1 the "needle", Top of stack = old$R1, haystack ! Exch ; Top of stack = haystack, old$R1 ! Exch $R2 ; Make $R2 the "haystack", Top of stack = old$R2, old$R1 ! Push $R3 ; Length of the needle ! Push $R4 ; Counter ! Push $R5 ; Temp ! StrLen $R3 $R1 ! StrCpy $R4 0 loop: ! StrCpy $R5 $R2 $R3 $R4 ! StrCmp $R5 $R1 done ! StrCmp $R5 "" done ! IntOp $R4 $R4 + 1 ! Goto loop ! done: ! StrCpy $R1 $R2 "" $R4 ! Pop $R5 ! Pop $R4 ! Pop $R3 ! Pop $R2 ! Exch $R1 ! FunctionEnd !macroend --- 4388,4452 ---- Function ${UN}PFI_StrStr ! !define L_NEEDLE $R1 ; the string we are trying to match ! !define L_HAYSTACK $R2 ; the string in which we search for a match ! !define L_NEEDLE_LENGTH $R3 ! !define L_HAYSTACK_LIMIT $R4 ! !define L_HAYSTACK_OFFSET $R5 ; the first character has an offset of zero ! !define L_SUBSTRING $R6 ; a string that might match the 'needle' string ! Exch ${L_NEEDLE} ! Exch ! Exch ${L_HAYSTACK} ! Push ${L_NEEDLE_LENGTH} ! Push ${L_HAYSTACK_LIMIT} ! Push ${L_HAYSTACK_OFFSET} ! Push ${L_SUBSTRING} ! StrLen ${L_NEEDLE_LENGTH} ${L_NEEDLE} ! StrLen ${L_HAYSTACK_LIMIT} ${L_HAYSTACK} ! ! ; If 'needle' is longer than 'haystack' then return empty string ! ; (to show 'needle' was not found in 'haystack') ! ! IntCmp ${L_NEEDLE_LENGTH} ${L_HAYSTACK_LIMIT} 0 0 not_found ! ! ; Adjust the search limit as there is no point in testing substrings ! ; which are known to be shorter than the length of the 'needle' string ! ! IntOp ${L_HAYSTACK_LIMIT} ${L_HAYSTACK_LIMIT} - ${L_NEEDLE_LENGTH} ! ! ; The first character is at offset 0 ! ! StrCpy ${L_HAYSTACK_OFFSET} 0 loop: ! StrCpy ${L_SUBSTRING} ${L_HAYSTACK} ${L_NEEDLE_LENGTH} ${L_HAYSTACK_OFFSET} ! StrCmp ${L_SUBSTRING} ${L_NEEDLE} match_found ! IntOp ${L_HAYSTACK_OFFSET} ${L_HAYSTACK_OFFSET} + 1 ! IntCmp ${L_HAYSTACK_OFFSET} ${L_HAYSTACK_LIMIT} loop loop 0 ! not_found: ! StrCpy ${L_NEEDLE} "" ! Goto exit ! match_found: ! StrCpy ${L_NEEDLE} ${L_HAYSTACK} "" ${L_HAYSTACK_OFFSET} ! exit: ! Pop ${L_SUBSTRING} ! Pop ${L_HAYSTACK_OFFSET} ! Pop ${L_HAYSTACK_LIMIT} ! Pop ${L_NEEDLE_LENGTH} ! Pop ${L_HAYSTACK} ! Exch ${L_NEEDLE} ! ! !undef L_NEEDLE ! !undef L_HAYSTACK ! !undef L_NEEDLE_LENGTH ! !undef L_HAYSTACK_LIMIT ! !undef L_HAYSTACK_OFFSET ! !undef L_SUBSTRING ! ! FunctionEnd !macroend |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:39:22
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11297/add-ons Modified Files: Tag: b0_22_2 OnDemand.nsi Log Message: Where appropriate, make string processing loops more robust by using the string length to test for end-of-string instead of assuming a null character marks the end of the string. Index: OnDemand.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** OnDemand.nsi 21 Sep 2007 01:04:10 -0000 1.1.2.2 --- OnDemand.nsi 5 Oct 2007 18:39:24 -0000 1.1.2.3 *************** *** 930,975 **** Function StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string ! Exch $0 ; The input string ! Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! Push $2 ; A character from the input string ! Push $3 ; The offset to a character in the "validity check" string ! Push $4 ; A character from the "validity check" string ! Push $5 ; Holds the current "validity check" string ! StrCpy $1 "" next_input_char: ! StrCpy $2 $0 1 ; Get the next character from the input string ! StrCmp $2 "" done ! StrCpy $5 ${DECIMAL_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match ! StrCpy $0 $0 "" 1 ! StrCpy $3 -1 next_valid_char: ! IntOp $3 $3 + 1 ! StrCpy $4 $5 1 $3 ; Extract next "valid" char (from "validity check" string) ! StrCmp $2 $4 0 next_valid_char ! IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy $1 "" done: ! StrCpy $0 $1 ; Result is either a string of decimal digits or "" ! Pop $5 ! Pop $4 ! Pop $3 ! Pop $2 ! Pop $1 ! Exch $0 ; place result on top of the stack !undef DECIMAL_DIGIT !undef BAD_OFFSET FunctionEnd --- 930,994 ---- Function StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string ! !define L_STRING $0 ; The input string ! !define L_RESULT $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! !define L_CURRENT $2 ; A character from the input string ! !define L_OFFSET $3 ; The offset to a character in the "validity check" string ! !define L_VALIDCHAR $4 ; A character from the "validity check" string ! !define L_VALIDLIST $5 ; Holds the current "validity check" string ! !define L_CHARSLEFT $6 ; To cater for MBCS input strings, terminate when end of string reached, not when a null byte reached ! Exch ${L_STRING} ! Push ${L_RESULT} ! Push ${L_CURRENT} ! Push ${L_OFFSET} ! Push ${L_VALIDCHAR} ! Push ${L_VALIDLIST} ! Push ${L_CHARSLEFT} ! ! StrCpy ${L_RESULT} "" next_input_char: ! StrLen ${L_CHARSLEFT} ${L_STRING} ! StrCmp ${L_CHARSLEFT} 0 done ! StrCpy ${L_CURRENT} ${L_STRING} 1 ; Get the next character from the input string ! StrCpy ${L_VALIDLIST} ${DECIMAL_DIGIT}${L_CURRENT} ; Add it to end of "validity check" to guarantee a match ! StrCpy ${L_STRING} ${L_STRING} "" 1 ! StrCpy ${L_OFFSET} -1 next_valid_char: ! IntOp ${L_OFFSET} ${L_OFFSET} + 1 ! StrCpy ${L_VALIDCHAR} ${L_VALIDLIST} 1 ${L_OFFSET} ; Extract next "valid" char (from "validity check" string) ! StrCmp ${L_CURRENT} ${L_VALIDCHAR} 0 next_valid_char ! IntCmp ${L_OFFSET} ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy ${L_RESULT} ${L_RESULT}${L_VALIDCHAR} ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy ${L_RESULT} "" done: ! StrCpy ${L_STRING} ${L_RESULT} ; Result is either a string of decimal digits or "" ! Pop ${L_CHARSLEFT} ! Pop ${L_VALIDLIST} ! Pop ${L_VALIDCHAR} ! Pop ${L_OFFSET} ! Pop ${L_CURRENT} ! Pop ${L_RESULT} ! Exch ${L_STRING} ; Place result on top of the stack !undef DECIMAL_DIGIT !undef BAD_OFFSET + !undef L_STRING + !undef L_RESULT + !undef L_CURRENT + !undef L_OFFSET + !undef L_VALIDCHAR + !undef L_VALIDLIST + !undef L_CHARSLEFT + FunctionEnd |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:36:50
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10522/languages Added Files: Tag: b0_22_2 English-parser.nsh Japanese-parser.nsh Log Message: Previous releases of POPFile only supported one parser (Kakasi) for Japanese text. Update the installer to offer a choice of 3 parsers (Kakasi, MeCab and Internal) when Nihongo is selected. The MeCab files are too big to include in the installer so they will be downloaded during the installation if the MeCab option is selected. The new Nihongo Parser pages and text are only shown when Nihongo is selected (or if an English-only build is made) so string constants are used instead of LanguageString commands (in order to keep things simple). Removed support for the NO_KAKASI compile-time switch as it is no longer relevant. (May introduce a similar switch affecting all of the Nihongo Parser selection handling later on.) Fix the bug in the NSIS2IO function that truncated MBCS strings. --- NEW FILE: Japanese-parser.nsh --- #-------------------------------------------------------------------------- # Japanese-parser.nsh # # This file contains the "Japanese" text strings used by the Windows installer # when installing the "Nihongo Parser". Normally the multi-language build of # the installer uses language strings for the text but since the "Nihongo Parser" # is only installed when the "Nihongo" (Japanese) language is selected, this # file defines some constants instead of using LanguageString commands. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #-------------------------------------------------------------------------- ;------------------------------------------------------------------------------------------- ; Custom Page - Choose Nihongo Parser ;------------------------------------------------------------------------------------------- ; Page title and sub-title !define C_NPLS_HEADER_ChooseParser "ú{ê̪©¿«Égp·évOðIðµÄ¾³¢B" !define C_NPLS_DESC_ChooseParser "POPFile ðgÁÄú{êÌ[ðªÍ·é½ßÉÍA[Ì{¶ðPê²Æɪ·éiª©¿«jKvª èÜ·B" ; Description shown in the text box when 'Kakasi' has been selected !define C_NPLS_DESC_Kakasi "POPFile 0.22.5 ÜÅÌo[WÅgp³êÄ¢½vOÅ·B$\r$\n$\r$\nª©¿«Ì¸xÍ MeCab Éä×éÆá¢iÐçªÈâJ^JiÅ\¬³êÄ¢éPêÌîñðÁĢȢjÅ·ªAMeCab Éä׫TCYª¬³Ä·ÝÜ·iMeCab 40MB É뵀 2MB öxjB$\r$\n$\r$\nKakasi Æ«t@CÍCXg[Éà ³êĢܷB" ; Description shown in the text box when 'MeCab' has been selected !define C_NPLS_DESC_MeCab "Kakasi æèàæè³mȪ©¿«ðs¤±ÆªÅ«Ü·ªA«TCYªå«ÈèÜ·i40MB öxjB$\r$\n$\r$\nCXg[ÉÍà ³êĢܹñBMeCab IvVðIðµ½êA¨æ» 13MB Ìt@CªC^[lbgæè_E[h³êACXg[³êÜ·B" ; Description shown in the text box when 'Internal' has been selected !define C_NPLS_DESC_Internal "OvOðgí¸ÉA¶ÌíÞi¿AÐçªÈAJ^JiÈÇj¾¯ð½æèɪ©¿«ðs¢Ü·B$\r$\n$\r$\n«ðgpµ½ª©¿«Éäת©¿«Ì¸xÍ¿Ü·ªA«ðKvƹ¸A¬É®ìµÜ·B" ; Flags setting for the text box (allows English version to use a vertical scroll bar even if the Japanese version does not use one) !define C_NPLS_DESC_Flags "READONLY|MULTILINE|VSCROLL" ; Text for the three radio buttons used to select the parser to be installed !define C_NPLS_Option_Kakasi "Kakasi: ¿¨©È([})Ï·vOi§j(&K)" !define C_NPLS_Option_MeCab "MeCab: Yet Another Part-of-Speech and Morphological Analyzer (&M)" !define C_NPLS_Option_Internal "à p[T: ¶íÉæéª (&I)" ; Text and URL used in the area below the description text box !define C_NPLS_Note "¦ ª©¿«Ì¸xÆ POPFile ̪޸xÆÌÔÉͼÚÌöÊÖWÍÈAÇÌvOðgpµÄà POPFile ̪޸xÉÍÙÆñÇá¢ÍȢƢ¤ÊªoĢܷB\r\n\r\n¦ ª©¿«ÌvOðÏX·éÆAêIÉ POPFile ̪޸xªáº·éÂ\«ª èÜ·B\r\n\r\n¦ CXg[ãɪ©¿«ÌvOðÏX·é±ÆàÅ«Ü·BڵͺÌNðNbNB" !define C_NPLS_Link "http://getpopfile.org/wiki/jp:faq:mecab" ;------------------------------------------------------------------------------------------- ; Standard MUI Page - COMPONENTS (text used when the mouse hovers over the "Nihongo Parser" entry) ;------------------------------------------------------------------------------------------- !define C_NPLS_DESC_SecParser "POPFile Íú{êÌeLXgðPê²Æɪ·é½ßÌvOðgpµÜ·B¡ñÍu$G_PARSERvªIð³êĢܷ" ;------------------------------------------------------------------------------------------- ; Custom Page - Setup Summary Page (lists the items which are going to be installed) ;------------------------------------------------------------------------------------------- !define C_NPLS_SUMMARY_KAKASI "ú{êvOiuKakasivªCXg[³êÜ·j" !define C_NPLS_SUMMARY_MECAB "ú{êvOiuMeCabvª_E[hECXg[³êÜ·j" !define C_NPLS_SUMMARY_INTERNAL "ú{êvOiuà p[Tvªgp³êÜ·j" #-------------------------------------------------------------------------- # End of 'Japanese-parser.nsh' #-------------------------------------------------------------------------- --- NEW FILE: English-parser.nsh --- #-------------------------------------------------------------------------- # English-parser.nsh # # This file contains the "English" text strings used by the special # "English only" build of the Windows installer for POPFile. This # special build only uses English text, unlike the normal multi-language # build of the installer. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #-------------------------------------------------------------------------- ;------------------------------------------------------------------------------------------- ; Custom Page - Choose Nihongo Parser ;------------------------------------------------------------------------------------------- ; Page title and sub-title !define C_NPLS_HEADER_ChooseParser "Please choose Japanese wakachi-gaki (split words) parser program:" !define C_NPLS_DESC_ChooseParser "To analyze Japanese e-mails by POPFile we have to split (wakachi-gaki) the e-mail body texts into words." ; Description shown in the text box when 'Kakasi' has been selected !define C_NPLS_DESC_Kakasi "This is the program used by POPFile 0.22.5 (and earlier releases of POPFile).$\r$\n$\r$\nThe wakachi-gaki accuracy is poorer than MeCab (because Kakasi does not have information about words constructed using Hira-gana or Kata-kana), but Kakasi uses smaller dictionaries than MeCab (about 2 MB instead of 40 MB).$\r$\n$\r$\nThe POPFile installer contains Kakasi and its dictionaries." ; Description shown in the text box when 'MeCab' has been selected !define C_NPLS_DESC_MeCab "The wakachi-gaki accuracy is better than Kakasi, but MeCab uses larger dictionaries (about 40 MB).$\r$\n$\r$\nThe POPFile installer does not contain MeCab. About 13 MB will be downloaded from the Internet if MeCab is selected." ; Description shown in the text box when 'Internal' has been selected !define C_NPLS_DESC_Internal "Instead of using external programs, the parser splits texts by the kinds of characters (i.e. Kanji, Hira-gana or Kata-kana).$\r$\n$\r$\nThe wakachi-gaki accuracy is poorer than programs which use dictionaries, but it does not use dictionaries so it is faster." ; Flags setting for the text box (allows English version to use a vertical scroll bar even if the Japanese version does not use one) !define C_NPLS_DESC_Flags "READONLY|MULTILINE|VSCROLL" ; Text for the three radio buttons used to select the parser to be installed !define C_NPLS_Option_Kakasi "&Kakasi: KAnji KAna Simple Inverter (Recommended)" !define C_NPLS_Option_MeCab "&MeCab: Yet Another Part-of-Speech and Morphological Analyzer" !define C_NPLS_Option_Internal "The &Internal parser: splitting by the kinds of characters" ; Text and URL used in the area below the description text box !define C_NPLS_Note "* The wakachi-gaki accuracy does not relate directly to POPFile's classification accuracy.\r\n In an experiment POPFile's accuracy was not significantly affected by the choice of parser.\r\n\r\n* Changing wakachi-gaki program may temporarily reduce POPFile's classification accuracy.\r\n\r\n* You can change the wakachi-gaki program after the installation. For more information, click" !define C_NPLS_Link "http://getpopfile.org/wiki/jp:faq:mecab" ;------------------------------------------------------------------------------------------- ; Standard MUI Page - COMPONENTS (text used when the mouse hovers over the "Nihongo Parser" entry) ; Note: The $G_PARSER variable will contain the lowercase name of the parser to be installed ;------------------------------------------------------------------------------------------- !define C_NPLS_DESC_SecParser "POPFile uses a parser (Kakasi, MeCab or Internal) to split Japanese text into words. The '$G_PARSER' parser has been selected for this installation" ;------------------------------------------------------------------------------------------- ; Custom Page - Setup Summary Page (lists the items which are going to be installed) ;------------------------------------------------------------------------------------------- !define C_NPLS_SUMMARY_KAKASI "Nihongo parser (the 'Kakasi' parser will be installed)" !define C_NPLS_SUMMARY_MECAB "Nihongo parser (the 'MeCab' parser will be downloaded and installed)" !define C_NPLS_SUMMARY_INTERNAL "Nihongo parser (the 'internal' parser will be used)" #-------------------------------------------------------------------------- # End of 'English-parser.nsh' #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:36:50
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10522 Modified Files: Tag: b0_22_2 installer-Uninstall.nsh installer.nsi WriteEnvStr.nsh Added Files: Tag: b0_22_2 ioP.ini Log Message: Previous releases of POPFile only supported one parser (Kakasi) for Japanese text. Update the installer to offer a choice of 3 parsers (Kakasi, MeCab and Internal) when Nihongo is selected. The MeCab files are too big to include in the installer so they will be downloaded during the installation if the MeCab option is selected. The new Nihongo Parser pages and text are only shown when Nihongo is selected (or if an English-only build is made) so string constants are used instead of LanguageString commands (in order to keep things simple). Removed support for the NO_KAKASI compile-time switch as it is no longer relevant. (May introduce a similar switch affecting all of the Nihongo Parser selection handling later on.) Fix the bug in the NSIS2IO function that truncated MBCS strings. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.12 retrieving revision 1.242.4.13 diff -C2 -d -r1.242.4.12 -r1.242.4.13 *** installer.nsi 21 Sep 2007 01:18:53 -0000 1.242.4.12 --- installer.nsi 5 Oct 2007 18:36:52 -0000 1.242.4.13 *************** *** 46,49 **** --- 46,50 ---- # (4) installer-SecMinPerl-body.nsh - body of section used to install the basic minimal Perl # (5) installer-Uninstall.nsh - source for the POPFile uninstaller (uninstall.exe) + # (6) getssl.nsh - section & functions used to download the SSL support files #-------------------------------------------------------------------------- *************** *** 129,139 **** # the installer, it does not affect which files get installed. # [...1155 lines suppressed...] ! IntOp ${L_LENGTH} ${L_LENGTH} + 1 Goto loop ! ; Return "InstallOptions-safe" string ! ! exit: ! Pop ${L_CONVERTED} ! Pop ${L_CURRENT} ! Pop ${L_OFFSET} ! Pop ${L_LENGTH} ! Exch ${L_STRING} ! ! !undef L_STRING ! !undef L_LENGTH ! !undef L_OFFSET ! !undef L_CURRENT ! !undef L_CONVERTED ! FunctionEnd Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.9 retrieving revision 1.4.2.10 diff -C2 -d -r1.4.2.9 -r1.4.2.10 *** installer-Uninstall.nsh 21 Sep 2007 01:19:45 -0000 1.4.2.9 --- installer-Uninstall.nsh 5 Oct 2007 18:36:52 -0000 1.4.2.10 *************** *** 578,581 **** --- 578,626 ---- #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.MeCab' + #-------------------------------------------------------------------------- + + Section "un.MeCab" UnSecMeCab + + !define L_TEMP $R9 + + Push ${L_TEMP} + + IfFileExists "$INSTDIR\mecab\*.*" 0 section_exit + + SetDetailsPrint textonly + DetailPrint " " + SetDetailsPrint listonly + + RMDir /r "$INSTDIR\mecab" + + ;Delete Environment Variables + + Push "MECABRC" + Call un.PFI_DeleteEnvStr + + ; If the 'all users' environment variables refer to this installation, remove them too + + ReadEnvStr ${L_TEMP} "MECABRC" + Push ${L_TEMP} + Push $INSTDIR + Call un.PFI_StrStr + Pop ${L_TEMP} + StrCmp ${L_TEMP} "" section_exit + Push "MECABRC" + Call un.PFI_DeleteEnvStrNTAU + + section_exit: + SetDetailsPrint textonly + DetailPrint " " + SetDetailsPrint listonly + + Pop ${L_TEMP} + + !undef L_TEMP + + SectionEnd + + #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Minimal Perl' #-------------------------------------------------------------------------- Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.12.4.3 retrieving revision 1.12.4.4 diff -C2 -d -r1.12.4.3 -r1.12.4.4 *** WriteEnvStr.nsh 6 Feb 2006 16:59:16 -0000 1.12.4.3 --- WriteEnvStr.nsh 5 Oct 2007 18:36:52 -0000 1.12.4.4 *************** *** 5,9 **** # 'Kakasi' package. # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # 'Kakasi' package. # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 41,45 **** !endif ! !ifndef ADDUSER & NO_KAKASI #-------------------------------------------------------------------------- # Installer Function: PFI_WriteEnv --- 41,45 ---- !endif ! !ifndef ADDUSER #-------------------------------------------------------------------------- # Installer Function: PFI_WriteEnv --- NEW FILE: ioP.ini --- #------------------------------------------------------------------- # # ioP.ini --- This file is used by "installer.nsi", one of the NSIS scripts # used to create the Windows installer for POPFile. This file # defines the layout of the custom page used to select the # parser to be used when processing Japanese text. # # Copyright (c) 2007 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # # POPFile is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with POPFile; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #------------------------------------------------------------------- [Settings] NumFields=6 [Field 1] Type=radiobutton Text= Left=0 Right=-1 Top=0 Bottom=10 State=1 Flags=NOTIFY [Field 2] Type=radiobutton Text= Left=0 Right=-1 Top=11 Bottom=21 State=0 Flags=NOTIFY [Field 3] Type=radiobutton Text= Left=0 Right=-1 Top=22 Bottom=32 State=0 Flags=NOTIFY [Field 4] Type=text State= Left=0 Right=-1 Top=34 Bottom=79 Flags=READONLY|MULTILINE [Field 5] Type=label Text= Left=0 Right=-1 Top=81 Bottom=129 [Field 6] Type=link Text= Left=0 Right=-1 Top=130 Bottom=140 #-------------------- # End of ioP.ini #-------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:30:38
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8313 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Updated to use the latest version of the Inetc plugin (fixes some bugs and improves reliability on some systems). Fix the bug that caused an unexpected internal error when the "/SSL" command-line option was used. Where appropriate, make string processing loops more robust by using the string length to test for end-of-string instead of assuming a null character marks the end of the string. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.15 retrieving revision 1.6.2.16 diff -C2 -d -r1.6.2.15 -r1.6.2.16 *** getssl.nsh 21 Sep 2007 01:12:48 -0000 1.6.2.15 --- getssl.nsh 5 Oct 2007 18:30:39 -0000 1.6.2.16 *************** *** 200,204 **** Var G_SSL_FILEURL ; full URL used to download SSL file ! Var G_PLS_FIELD_2 ; used to customise translated text strings Var G_PATCH_SOURCE ; indicated the source of the SSL patches we are to apply --- 200,206 ---- Var G_SSL_FILEURL ; full URL used to download SSL file ! !ifdef ADDSSL ! Var G_PLS_FIELD_2 ; used to customise translated text strings ! !endif Var G_PATCH_SOURCE ; indicated the source of the SSL patches we are to apply *************** *** 392,396 **** SetDetailsPrint listonly DetailPrint "" ! Call MakeRootDirSafe !endif --- 394,407 ---- SetDetailsPrint listonly DetailPrint "" ! ! ; Use HKLM as a simple workaround for the case where installer is started by a non-admin user ! ; (the MakeRootDirSafe function will use this HKLM data to re-initialise $G_ROOTDIR) ! ! WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" "$G_ROOTDIR" ! ! ; If we are installing over a previous version, ensure that version is not running ! ! GetFunctionAddress ${L_RESULT} MakeRootDirSafe ! UAC::ExecCodeSegment ${L_RESULT} !endif *************** *** 638,642 **** #-------------------------------------------------------------------------- ! !define C_NSISDL_TRANSLATIONS "/TRANSLATE '$(PFI_LANG_NSISDL_DOWNLOADING)' '$(PFI_LANG_NSISDL_CONNECTING)' '$(PFI_LANG_NSISDL_SECOND)' '$(PFI_LANG_NSISDL_MINUTE)' '$(PFI_LANG_NSISDL_HOUR)' '$(PFI_LANG_NSISDL_PLURAL)' '$(PFI_LANG_NSISDL_PROGRESS)' '$(PFI_LANG_NSISDL_REMAINING)'" Function GetSSLFile --- 649,655 ---- #-------------------------------------------------------------------------- ! !ifdef ADDSSL ! !define C_NSISDL_TRANSLATIONS "/TRANSLATE '$(PFI_LANG_NSISDL_DOWNLOADING)' '$(PFI_LANG_NSISDL_CONNECTING)' '$(PFI_LANG_NSISDL_SECOND)' '$(PFI_LANG_NSISDL_MINUTE)' '$(PFI_LANG_NSISDL_HOUR)' '$(PFI_LANG_NSISDL_PLURAL)' '$(PFI_LANG_NSISDL_PROGRESS)' '$(PFI_LANG_NSISDL_REMAINING)'" ! !endif Function GetSSLFile *************** *** 787,829 **** !define BAD_OFFSET 16 ; length of VALID_DIGIT string ! Exch $0 ; The input string ! Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! Push $2 ; A character from the input string ! Push $3 ; The offset to a character in the "validity check" string ! Push $4 ; A character from the "validity check" string ! Push $5 ; Holds the current "validity check" string ! StrCpy $1 "" next_input_char: ! StrCpy $2 $0 1 ; Get the next character from the input string ! StrCmp $2 "" done ! StrCpy $5 ${VALID_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match ! StrCpy $0 $0 "" 1 ! StrCpy $3 -1 next_valid_char: ! IntOp $3 $3 + 1 ! StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) ! StrCmp $2 $4 0 next_valid_char ! IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy $1 "" done: ! StrCpy $0 $1 ; Result is either a string of hexadecimal digits or "" ! Pop $5 ! Pop $4 ! Pop $3 ! Pop $2 ! Pop $1 ! Exch $0 ; Place result on top of the stack !undef VALID_DIGIT !undef BAD_OFFSET FunctionEnd --- 800,861 ---- !define BAD_OFFSET 16 ; length of VALID_DIGIT string ! !define L_STRING $0 ; The input string ! !define L_RESULT $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid) ! !define L_CURRENT $2 ; A character from the input string ! !define L_OFFSET $3 ; The offset to a character in the "validity check" string ! !define L_VALIDCHAR $4 ; A character from the "validity check" string ! !define L_VALIDLIST $5 ; Holds the current "validity check" string ! !define L_CHARSLEFT $6 ; To cater for MBCS input strings, terminate when end of string reached, not when a null byte reached ! Exch ${L_STRING} ! Push ${L_RESULT} ! Push ${L_CURRENT} ! Push ${L_OFFSET} ! Push ${L_VALIDCHAR} ! Push ${L_VALIDLIST} ! Push ${L_CHARSLEFT} ! ! StrCpy ${L_RESULT} "" next_input_char: ! StrLen ${L_CHARSLEFT} ${L_STRING} ! StrCmp ${L_CHARSLEFT} 0 done ! StrCpy ${L_CURRENT} ${L_STRING} 1 ; Get the next character from the input string ! StrCpy ${L_VALIDLIST} ${VALID_DIGIT}${L_CURRENT} ; Add it to end of "validity check" to guarantee a match ! StrCpy ${L_STRING} ${L_STRING} "" 1 ! StrCpy ${L_OFFSET} -1 next_valid_char: ! IntOp ${L_OFFSET} ${L_OFFSET} + 1 ! StrCpy ${L_VALIDCHAR} ${L_VALIDLIST} 1 ${L_OFFSET} ; Extract next "valid" char (from "validity check" string) ! StrCmp ${L_CURRENT} ${L_VALIDCHAR} 0 next_valid_char ! IntCmp ${L_OFFSET} ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad ! StrCpy ${L_RESULT} ${L_RESULT}${L_VALIDCHAR} ; Add "valid" character to the result goto next_input_char invalid: ! StrCpy ${L_RESULT} "" done: ! StrCpy ${L_STRING} ${L_RESULT} ; Result is either a string of hexadecimal digits or "" ! Pop ${L_CHARSLEFT} ! Pop ${L_VALIDLIST} ! Pop ${L_VALIDCHAR} ! Pop ${L_OFFSET} ! Pop ${L_CURRENT} ! Pop ${L_RESULT} ! Exch ${L_STRING} ; Place result on top of the stack !undef VALID_DIGIT !undef BAD_OFFSET + !undef L_STRING + !undef L_RESULT + !undef L_CURRENT + !undef L_OFFSET + !undef L_VALIDCHAR + !undef L_VALIDLIST + !undef L_CHARSLEFT + FunctionEnd |
|
From: Brian S. <xue...@us...> - 2007-10-05 18:28:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7211 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi CBP.nsh Log Message: Previous releases of POPFile only supported one parser (Kakasi) for Japanese text. Update the "Add POPFile User" wizard to handle the new 'bayes_nihongo_parser' configuration parameter which specifies the parser to be used when processing Japanese text. Where appropriate, make string processing loops more robust by using the string length to test for end-of-string instead of assuming a null character marks the end of the string. "Reserve" the new LockedList plugin (forgot to do this last time) Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.16 retrieving revision 1.59.4.17 diff -C2 -d -r1.59.4.16 -r1.59.4.17 *** adduser.nsi 21 Sep 2007 01:22:09 -0000 1.59.4.16 --- adduser.nsi 5 Oct 2007 18:28:45 -0000 1.59.4.17 *************** *** 2237,2240 **** --- 2237,2245 ---- # libraries (POPFile cannot use SQLite3.x libraries yet). If upgrading an installation that # currently uses DBD::SQLite then change the configuration in popfile.cfg to use DBD::SQLite2. + # + # The 0.22.6 release introduced the ability to select the parser used to split Japanese text + # into words. Previous releases only supported the 'Kakasi' parser but 0.22.6 offers a choice + # of 'Kakasi', 'MeCab' or 'Internal', controlled by the new 'bayes_nihongo_parser' parameter. + # Valid values for this new popfile.cfg parameter are kakasi, mecab or internal. #-------------------------------------------------------------------------- *************** *** 2252,2255 **** --- 2257,2261 ---- !define L_TEXTEND $R0 ; used to ensure correct handling of lines longer than 1023 chars !define L_SKIN $9 ; current skin setting + !define L_PARSER $8 ; current Nihongo parser setting (introduced in 0.22.6 release) Push ${L_CFG} *************** *** 2264,2267 **** --- 2270,2274 ---- Push ${L_TEXTEND} Push ${L_SKIN} + Push ${L_PARSER} StrCpy $G_POP3 "" *************** *** 2275,2278 **** --- 2282,2287 ---- StrCpy ${L_LANG_OLD} "" + StrCpy ${L_PARSER} "" + ; See if we can get the current pop3 and gui port from an existing configuration. ; There may be more than one entry for these ports in the file - use the last one found *************** *** 2309,2312 **** --- 2318,2324 ---- StrCmp ${L_CMPRE} "bayes_dbconnect " got_dbconnect + StrCpy ${L_CMPRE} ${L_LNE} 21 + StrCmp ${L_CMPRE} "bayes_nihongo_parser " got_parser + ; do not transfer any UI language settings to the copy of popfile.cfg *************** *** 2350,2353 **** --- 2362,2369 ---- Goto copy_lne + got_parser: + StrCpy ${L_PARSER} ${L_LNE} "" 21 + Goto loop + got_lang_new: StrCpy ${L_LANG_NEW} ${L_LNE} "" 14 *************** *** 2426,2430 **** StrCmp ${L_TRAYICON} "1" found_trayicon !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Inherited" "TrayIcon" "?" ! Goto close_cleancopy found_trayicon: --- 2442,2446 ---- StrCmp ${L_TRAYICON} "1" found_trayicon !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Inherited" "TrayIcon" "?" ! Goto check_parser found_trayicon: *************** *** 2432,2435 **** --- 2448,2468 ---- !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Inherited" "TrayIcon" "${L_TRAYICON}" + check_parser: + StrCmp ${L_PARSER} "" parser_not_previously_defined + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Inherited" "NihongoParser" "${L_PARSER}" + ReadRegStr ${L_CMPRE} HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" + StrCmp ${L_CMPRE} "" retain_setting + StrCpy ${L_PARSER} ${L_CMPRE} + + retain_setting: + FileWrite ${L_CLEANCFG} "bayes_nihongo_parser ${L_PARSER}${MB_NL}" + Goto close_cleancopy + + parser_not_previously_defined: + !insertmacro MUI_INSTALLOPTIONS_WRITE "pfi-cfg.ini" "Inherited" "NihongoParser" "?" + ReadRegStr ${L_CMPRE} HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" + StrCmp ${L_CMPRE} "" close_cleancopy + FileWrite ${L_CLEANCFG} "bayes_nihongo_parser ${L_CMPRE}${MB_NL}" + close_cleancopy: FileClose ${L_CLEANCFG} *************** *** 2521,2524 **** --- 2554,2558 ---- ports_ok: + Pop ${L_PARSER} Pop ${L_SKIN} Pop ${L_TEXTEND} *************** *** 2544,2547 **** --- 2578,2582 ---- !undef L_TEXTEND !undef L_SKIN + !undef L_PARSER FunctionEnd Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.15 retrieving revision 1.6.2.16 diff -C2 -d -r1.6.2.15 -r1.6.2.16 *** adduser-Version.nsh 21 Sep 2007 01:22:09 -0000 1.6.2.15 --- adduser-Version.nsh 5 Oct 2007 18:28:45 -0000 1.6.2.16 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.12" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.13" #-------------------------------------------------------------------------- Index: CBP.nsh =================================================================== RCS file: /cvsroot/popfile/windows/CBP.nsh,v retrieving revision 1.33.4.3 retrieving revision 1.33.4.4 diff -C2 -d -r1.33.4.3 -r1.33.4.4 *** CBP.nsh 6 Feb 2006 16:30:05 -0000 1.33.4.3 --- CBP.nsh 5 Oct 2007 18:28:45 -0000 1.33.4.4 *************** *** 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 --- 6,10 ---- # can be overridden by creating suitable "!define" statements in 'adduser.nsi'. # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 314,321 **** 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 --- 314,321 ---- 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 *************** *** 1115,1119 **** # CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\ #${MB_NL}\ ! # Copyright (c) 2003-2005 John Graham-Cumming${MB_NL}\ #${MB_NL}\ # This file is part of POPFile${MB_NL}\ --- 1115,1119 ---- # CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\ #${MB_NL}\ ! # Copyright (c) 2003-2007 John Graham-Cumming${MB_NL}\ #${MB_NL}\ # This file is part of POPFile${MB_NL}\ *************** *** 1871,1915 **** !define CBP_VALIDCHARS "abcdefghijklmnopqrstuvwxyz_-0123456789" ! Exch $0 ; The input string ! Push $1 ; Number of characters in ${CBP_VALIDCHARS} ! Push $2 ; Holds the result (either "" or a valid bucket name derived from the input string) ! Push $3 ; A character from the input string ! Push $4 ; The offset to a character in the "validity check" string ! Push $5 ; A character from the "validity check" string ! Push $6 ; Holds the current "validity check" string ! StrLen $1 "${CBP_VALIDCHARS}" ! StrCpy $2 "" next_input_char: ! StrCpy $3 $0 1 ; Get next character from the input string ! StrCmp $3 "" done ! StrCpy $6 ${CBP_VALIDCHARS}$3 ; Add character to end of "validity check" to guarantee a match ! StrCpy $0 $0 "" 1 ! StrCpy $4 -1 next_valid_char: ! IntOp $4 $4 + 1 ! StrCpy $5 $6 1 $4 ; Extract next "valid" character (from "validity check" string) ! StrCmp $3 $5 0 next_valid_char ! IntCmp $4 $1 invalid_name 0 invalid_name ; if match is with the char we added, name is bad ! StrCpy $2 $2$5 ; Use "valid" character to ensure we store lowercase letters in the result goto next_input_char ! invalid_name: ! StrCpy $2 "" done: ! StrCpy $0 $2 ; Result is either a valid bucket name or "" ! Pop $6 ! Pop $5 ! Pop $4 ! Pop $3 ! Pop $2 ! Pop $1 ! Exch $0 ; place result on top of the stack !undef CBP_VALIDCHARS FunctionEnd --- 1871,1936 ---- !define CBP_VALIDCHARS "abcdefghijklmnopqrstuvwxyz_-0123456789" ! !define L_STRING $0 ; The input string ! !define L_BAD_OFFSET $1 ; Number of characters in ${CBP_VALIDCHARS} string ! !define L_RESULT $2 ; Holds the result (either "" or a valid bucket name derived from the input string) ! !define L_CURRENT $3 ; A character from the input string ! !define L_OFFSET $4 ; The offset to a character in the "validity check" string ! !define L_VALIDCHAR $5 ; A character from the "validity check" string ! !define L_VALIDLIST $6 ; Holds the current "validity check" string ! !define L_CHARSLEFT $7 ; To cater for MBCS input strings, terminate when end of string reached, not when a null byte reached ! Exch ${L_STRING} ! Push ${L_BAD_OFFSET} ! Push ${L_RESULT} ! Push ${L_CURRENT} ! Push ${L_OFFSET} ! Push ${L_VALIDCHAR} ! Push ${L_VALIDLIST} ! Push ${L_CHARSLEFT} ! ! StrLen ${L_BAD_OFFSET} "${CBP_VALIDCHARS}" ! StrCpy ${L_RESULT} "" next_input_char: ! StrLen ${L_CHARSLEFT} ${L_STRING} ! StrCmp ${L_CHARSLEFT} 0 done ! StrCpy ${L_CURRENT} ${L_STRING} 1 ; Get the next character from the input string ! StrCpy ${L_VALIDLIST} ${CBP_VALIDCHARS}${L_CURRENT} ; Add it to end of "validity check" to guarantee a match ! StrCpy ${L_STRING} ${L_STRING} "" 1 ! StrCpy ${L_OFFSET} -1 next_valid_char: ! IntOp ${L_OFFSET} ${L_OFFSET} + 1 ! StrCpy ${L_VALIDCHAR} ${L_VALIDLIST} 1 ${L_OFFSET} ; Extract next "valid" char (from "validity check" string) ! StrCmp ${L_CURRENT} ${L_VALIDCHAR} 0 next_valid_char ! IntCmp ${L_OFFSET} ${L_BAD_OFFSET} bad_name 0 bad_name ; If match is with the char we added, name is bad ! StrCpy ${L_RESULT} ${L_RESULT}${L_VALIDCHAR} ; Use "valid" character to ensure we store lowercase letters in the result goto next_input_char ! bad_name: ! StrCpy ${L_RESULT} "" done: ! StrCpy ${L_STRING} ${L_RESULT} ; Result is either a valid bucket name or "" ! Pop ${L_CHARSLEFT} ! Pop ${L_VALIDLIST} ! Pop ${L_VALIDCHAR} ! Pop ${L_OFFSET} ! Pop ${L_CURRENT} ! Pop ${L_RESULT} ! Pop ${L_BAD_OFFSET} ! Exch ${L_STRING} ; Place result on top of the stack !undef CBP_VALIDCHARS + !undef L_STRING + !undef L_BAD_OFFSET + !undef L_RESULT + !undef L_CURRENT + !undef L_OFFSET + !undef L_VALIDCHAR + !undef L_VALIDLIST + !undef L_CHARSLEFT + FunctionEnd *************** *** 1931,1934 **** --- 1952,1961 ---- # input: "box|||car|van" output: bucket name = "box", revised list = "||car|van" # input: "||car|van" output: bucket name = "", revised list = "car|van" + # + # Bucket names are assumed to be valid, i.e. they are assumed to only contain characters in + # the ranges 'a' to 'z' and '0' to '9', plus the '-' and '_' characters. + # + # The 'CBP_MakePOPFileBuckets' function uses this function to extract a bucket color from + # a list of default color names (these names only use characters in the range 'a' to 'z'). #---------------------------------------------------------------------------------------------- # Inputs: *************** *** 2243,2279 **** Function CBP_StrStr - Exch $R1 ; $R1 = needle, top of stack = old$R1, haystack - Exch ; Top of stack = haystack, old$R1 - Exch $R2 ; $R2 = haystack, top of stack = old$R2, old$R1 ! Push $R3 ! Push $R4 ! Push $R5 ! StrLen $R3 $R1 ! StrCpy $R4 0 ! ; $R1 = needle ! ; $R2 = haystack ! ; $R3 = len(needle) ! ; $R4 = cnt ! ; $R5 = tmp loop: ! StrCpy $R5 $R2 $R3 $R4 ! StrCmp $R5 $R1 done ! StrCmp $R5 "" done ! IntOp $R4 $R4 + 1 ! Goto loop ! done: ! StrCpy $R1 $R2 "" $R4 ! Pop $R5 ! Pop $R4 ! Pop $R3 - Pop $R2 - Exch $R1 FunctionEnd --- 2270,2334 ---- Function CBP_StrStr ! !define L_NEEDLE $R1 ; the string we are trying to match ! !define L_HAYSTACK $R2 ; the string in which we search for a match ! !define L_NEEDLE_LENGTH $R3 ! !define L_HAYSTACK_LIMIT $R4 ! !define L_HAYSTACK_OFFSET $R5 ; the first character has an offset of zero ! !define L_SUBSTRING $R6 ; a string that might match the 'needle' string ! Exch ${L_NEEDLE} ! Exch ! Exch ${L_HAYSTACK} ! Push ${L_NEEDLE_LENGTH} ! Push ${L_HAYSTACK_LIMIT} ! Push ${L_HAYSTACK_OFFSET} ! Push ${L_SUBSTRING} ! StrLen ${L_NEEDLE_LENGTH} ${L_NEEDLE} ! StrLen ${L_HAYSTACK_LIMIT} ${L_HAYSTACK} ! ! ; If 'needle' is longer than 'haystack' then return empty string ! ; (to show 'needle' was not found in 'haystack') ! ! IntCmp ${L_NEEDLE_LENGTH} ${L_HAYSTACK_LIMIT} 0 0 not_found ! ! ; Adjust the search limit as there is no point in testing substrings ! ; which are known to be shorter than the length of the 'needle' string ! ! IntOp ${L_HAYSTACK_LIMIT} ${L_HAYSTACK_LIMIT} - ${L_NEEDLE_LENGTH} ! ! ; The first character is at offset 0 ! ! StrCpy ${L_HAYSTACK_OFFSET} 0 loop: ! StrCpy ${L_SUBSTRING} ${L_HAYSTACK} ${L_NEEDLE_LENGTH} ${L_HAYSTACK_OFFSET} ! StrCmp ${L_SUBSTRING} ${L_NEEDLE} match_found ! IntOp ${L_HAYSTACK_OFFSET} ${L_HAYSTACK_OFFSET} + 1 ! IntCmp ${L_HAYSTACK_OFFSET} ${L_HAYSTACK_LIMIT} loop loop 0 ! not_found: ! StrCpy ${L_NEEDLE} "" ! Goto exit ! match_found: ! StrCpy ${L_NEEDLE} ${L_HAYSTACK} "" ${L_HAYSTACK_OFFSET} ! ! exit: ! Pop ${L_SUBSTRING} ! Pop ${L_HAYSTACK_OFFSET} ! Pop ${L_HAYSTACK_LIMIT} ! Pop ${L_NEEDLE_LENGTH} ! Pop ${L_HAYSTACK} ! Exch ${L_NEEDLE} ! ! !undef L_NEEDLE ! !undef L_HAYSTACK ! !undef L_NEEDLE_LENGTH ! !undef L_HAYSTACK_LIMIT ! !undef L_HAYSTACK_OFFSET ! !undef L_SUBSTRING FunctionEnd |
|
From: Brian S. <xue...@us...> - 2007-09-21 01:22:07
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25199 Modified Files: Tag: b0_22_2 adduser-Uninstall.nsh adduser-Version.nsh adduser.nsi Log Message: Updated to work with the updated library function which uses the LockedList plugin instead of instead of code which assumes the user has administrator rights. Index: adduser-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -C2 -d -r1.2.2.5 -r1.2.2.6 *** adduser-Uninstall.nsh 28 Sep 2006 18:30:06 -0000 1.2.2.5 --- adduser-Uninstall.nsh 21 Sep 2007 01:22:09 -0000 1.2.2.6 *************** *** 4,8 **** # script (adduser.nsi) used to build the 'Add POPFile User' wizard. # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile --- 4,8 ---- # script (adduser.nsi) used to build the 'Add POPFile User' wizard. # ! # Copyright (c) 2005-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 220,223 **** --- 220,224 ---- Push ${L_EXE} Call un.PFI_WaitUntilUnlocked + Push "${C_EXE_END_MARKER}" Push ${L_EXE} Call un.PFI_CheckIfLocked Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.14 retrieving revision 1.6.2.15 diff -C2 -d -r1.6.2.14 -r1.6.2.15 *** adduser-Version.nsh 29 Jul 2007 17:13:19 -0000 1.6.2.14 --- adduser-Version.nsh 21 Sep 2007 01:22:09 -0000 1.6.2.15 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.10" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.12" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.15 retrieving revision 1.59.4.16 diff -C2 -d -r1.59.4.15 -r1.59.4.16 *** adduser.nsi 29 Jul 2007 17:13:19 -0000 1.59.4.15 --- adduser.nsi 21 Sep 2007 01:22:09 -0000 1.59.4.16 *************** *** 723,726 **** --- 723,727 ---- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ReserveFile "${NSISDIR}\Plugins\Banner.dll" + ReserveFile "${NSISDIR}\Plugins\LockedList.dll" ReserveFile "${NSISDIR}\Plugins\nsExec.dll" ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" |
|
From: Brian S. <xue...@us...> - 2007-09-21 01:19:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24812 Modified Files: Tag: b0_22_2 installer-Uninstall.nsh Log Message: Use the UAC plugin to permit a non-admin user to launch the uninstaller (this should have been done when the installer started using the plugin). If a non-admin user is running POPFile and then launches the uninstaller, use the UAC plugin to access the user's POPFile configuration data to find out how to shut down POPFile. Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -C2 -d -r1.4.2.8 -r1.4.2.9 *** installer-Uninstall.nsh 29 Jul 2007 17:14:08 -0000 1.4.2.8 --- installer-Uninstall.nsh 21 Sep 2007 01:19:45 -0000 1.4.2.9 *************** *** 70,88 **** UAC_Err: ! MessageBox mb_iconstop "Unable to elevate , error $0" Abort UAC_ElevationAborted: ! MessageBox mb_iconstop "This uninstaller requires admin access, aborting!" Abort UAC_Success: - # if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal? - # if $0==0 && $1==3, we can try to elevate again - # if $0==0 && $3==1, we are a member of the admin group (Any OS) StrCmp 1 $3 continue ; Admin? ! StrCmp 3 $1 0 UAC_ElevationAborted ; Try again? ! MessageBox mb_iconstop "This uninstaller requires admin access, try again" ! goto UAC_Elevate continue: --- 70,85 ---- UAC_Err: ! MessageBox MB_OK|MB_ICONSTOP "Unable to elevate , error $0" Abort UAC_ElevationAborted: ! MessageBox MB_OK|MB_ICONSTOP "This uninstaller requires admin access, aborting!" Abort UAC_Success: StrCmp 1 $3 continue ; Admin? ! StrCmp 3 $1 0 UAC_ElevationAborted ; Try again or abort? ! MessageBox MB_OK|MB_ICONSTOP "This uninstaller requires admin access, try again" ; Inform user... ! goto UAC_Elevate ; ... and try again continue: *************** *** 101,151 **** StrCpy $G_MPLIBDIR "$INSTDIR\lib" ! ; Starting with 0.21.0 the registry is used to store the location of the 'User Data' ! ; (if setup.exe or adduser.exe was used to create/update the 'User Data' for this user) ! ! ReadRegStr $G_USERDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" ! StrCmp $G_USERDIR "" 0 got_user_path ! ! ; Pre-release versions of the 0.21.0 installer used a sub-folder for the default user data ! ! StrCpy $G_USERDIR "$INSTDIR\user" ! ! ; If we are uninstalling an upgraded installation, the default user data may be in $INSTDIR ! ; instead of $INSTDIR\user ! ! IfFileExists "$G_USERDIR\popfile.cfg" got_user_path ! StrCpy $G_USERDIR "$INSTDIR" ! ! got_user_path: ! ! ; Email settings are stored on a 'per user' basis therefore we need to know which user is ! ; running the uninstaller (e.g. so we can check ownership of any local 'User Data' we find) ! ! ClearErrors ! UserInfo::GetName ! IfErrors 0 got_name ! ! ; Assume Win9x system, so user has 'Admin' rights ! ; (UserInfo works on Win98SE so perhaps it is only Win95 that fails ?) ! ! StrCpy $G_WINUSERNAME "UnknownUser" ! StrCpy $G_WINUSERTYPE "Admin" ! Goto start_uninstall ! ! got_name: ! Pop $G_WINUSERNAME ! StrCmp $G_WINUSERNAME "" 0 get_usertype ! StrCpy $G_WINUSERNAME "UnknownUser" ! ! get_usertype: ! UserInfo::GetAccountType ! Pop $G_WINUSERTYPE ! StrCmp $G_WINUSERTYPE "Admin" start_uninstall ! StrCmp $G_WINUSERTYPE "Power" start_uninstall ! StrCmp $G_WINUSERTYPE "User" start_uninstall ! StrCmp $G_WINUSERTYPE "Guest" start_uninstall ! StrCpy $G_WINUSERTYPE "Unknown" - start_uninstall: FunctionEnd --- 98,103 ---- StrCpy $G_MPLIBDIR "$INSTDIR\lib" ! Call un.SetGlobalUserVariables FunctionEnd *************** *** 198,212 **** Push ${L_TEMP} ! ReadINIStr ${L_TEMP} "$G_USERDIR\install.ini" "Settings" "Owner" ! StrCmp ${L_TEMP} "" section_exit ! StrCmp ${L_TEMP} $G_WINUSERNAME section_exit ! MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \ ! "$(PFI_LANG_UN_MBDIFFUSER_1) ('${L_TEMP}') !\ ! ${MB_NL}${MB_NL}\ ! $(PFI_LANG_UN_MBNOTFOUND_2)" IDYES section_exit ! Abort "$(PFI_LANG_UN_ABORT_1)" - section_exit: Pop ${L_TEMP} --- 150,159 ---- Push ${L_TEMP} ! ; Access the POPFile User Data for the user who started the uninstaller ! ; (use the UAC plugin in case this was a non-admin user) ! GetFunctionAddress ${L_TEMP} un.Uninstall_Begin ! UAC::ExecCodeSegment ${L_TEMP} Pop ${L_TEMP} *************** *** 282,296 **** Section "un.Shutdown POPFile" UnSecShutdown ! !define L_CFG $R9 ; used as file handle ! !define L_EXE $R8 ; full path of the EXE to be monitored ! !define L_LNE $R7 ; a line from popfile.cfg ! !define L_TEMP $R6 ! !define L_TEXTEND $R5 ; used to ensure correct handling of lines longer than 1023 chars - Push ${L_CFG} - Push ${L_EXE} - Push ${L_LNE} Push ${L_TEMP} - Push ${L_TEXTEND} SetDetailsPrint textonly --- 229,235 ---- Section "un.Shutdown POPFile" UnSecShutdown ! !define L_TEMP $R9 Push ${L_TEMP} SetDetailsPrint textonly *************** *** 310,371 **** Push $G_ROOTDIR Call un.PFI_FindLockedPFE ! Pop ${L_EXE} ! StrCmp ${L_EXE} "" check_pfi_utils ; The program files we are about to remove are in use so we need to shut POPFile down ! IfFileExists "$G_USERDIR\popfile.cfg" 0 manual_shutdown ! ! ; Use the UI port setting in the configuration file to shutdown POPFile ! ! StrCpy $G_GUI "" ! ! FileOpen ${L_CFG} "$G_USERDIR\popfile.cfg" r ! ! found_eol: ! StrCpy ${L_TEXTEND} "<eol>" ! ! loop: ! FileRead ${L_CFG} ${L_LNE} ! StrCmp ${L_LNE} "" ui_port_done ! StrCmp ${L_TEXTEND} "<eol>" 0 check_eol ! StrCmp ${L_LNE} "$\n" loop ! ! StrCpy ${L_TEMP} ${L_LNE} 10 ! StrCmp ${L_TEMP} "html_port " 0 check_eol ! StrCpy $G_GUI ${L_LNE} 5 10 ! ! ; Now read file until we get to end of the current line ! ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) ! ! check_eol: ! StrCpy ${L_TEXTEND} ${L_LNE} 1 -1 ! StrCmp ${L_TEXTEND} "$\n" found_eol ! StrCmp ${L_TEXTEND} "$\r" found_eol loop ! ! ui_port_done: ! FileClose ${L_CFG} ! ! StrCmp $G_GUI "" manual_shutdown ! Push $G_GUI ! Call un.PFI_TrimNewlines ! Call un.PFI_StrCheckDecimal ! Pop $G_GUI ! StrCmp $G_GUI "" manual_shutdown ! DetailPrint "$(PFI_LANG_UN_LOG_SHUTDOWN) $G_GUI" ! DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" ! Push $G_GUI ! Call un.PFI_ShutdownViaUI ! Pop ${L_TEMP} ! StrCmp ${L_TEMP} "success" check_pfi_utils manual_shutdown: ! StrCpy $G_PLS_FIELD_1 "POPFile" ! DetailPrint "Unable to shutdown $G_PLS_FIELD_1 automatically - manual intervention requested" ! MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(PFI_LANG_MBMANSHUT_1)\ ! ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBMANSHUT_2)\ ! ${MB_NL}${MB_NL}\ ! $(PFI_LANG_MBMANSHUT_3)" ; Assume user has managed to shutdown POPFile --- 249,263 ---- Push $G_ROOTDIR Call un.PFI_FindLockedPFE ! Pop ${L_TEMP} ! StrCmp ${L_TEMP} "" check_pfi_utils ; The program files we are about to remove are in use so we need to shut POPFile down ! GetFunctionAddress ${L_TEMP} un.Shutdown_POPFile ! UAC::ExecCodeSegment ${L_TEMP} ! Goto check_pfi_utils manual_shutdown: ! Call un.RequestManualShutdown ; Assume user has managed to shutdown POPFile *************** *** 379,393 **** SetDetailsPrint listonly - Pop ${L_TEXTEND} Pop ${L_TEMP} - Pop ${L_LNE} - Pop ${L_EXE} - Pop ${L_CFG} - !undef L_CFG - !undef L_EXE - !undef L_LNE !undef L_TEMP - !undef L_TEXTEND SectionEnd --- 271,277 ---- *************** *** 846,849 **** --- 730,930 ---- #-------------------------------------------------------------------------- + # Uninstaller Function: 'un.SetGlobalUserVariables' + # + # Used to initialise (or re-initialise) the following global variables: + # + # (1) $G_USERDIR - full path to the folder containing the 'popfile.cfg' file + # (2) $G_WINUSERNAME - current Windows user login name + # (3) $G_WINUSERTYPE - user group ('Admin', 'Power', 'User', 'Guest' or 'Unknown') + # + # (this helps avoid problems when the uninstaller is started by a non-admin user) + #-------------------------------------------------------------------------- + + Function un.SetGlobalUserVariables + + ; Starting with 0.21.0 the registry is used to store the location of the 'User Data' + ; (if setup.exe or adduser.exe was used to create/update the 'User Data' for this user) + + ReadRegStr $G_USERDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UserDir_LFN" + StrCmp $G_USERDIR "" 0 got_user_path + + ; Pre-release versions of the 0.21.0 installer used a sub-folder for the default user data + + StrCpy $G_USERDIR "$INSTDIR\user" + + ; If we are uninstalling an upgraded installation, the default user data may be in $INSTDIR + ; instead of $INSTDIR\user + + IfFileExists "$G_USERDIR\popfile.cfg" got_user_path + StrCpy $G_USERDIR "$INSTDIR" + + got_user_path: + + ; Email settings are stored on a 'per user' basis therefore we need to know which user is + ; running the uninstaller (e.g. so we can check ownership of any local 'User Data' we find) + + ClearErrors + UserInfo::GetName + IfErrors 0 got_name + + ; Assume Win9x system, so user has 'Admin' rights + ; (UserInfo works on Win98SE so perhaps it is only Win95 that fails ?) + + StrCpy $G_WINUSERNAME "UnknownUser" + StrCpy $G_WINUSERTYPE "Admin" + Goto function_exit + + got_name: + Pop $G_WINUSERNAME + StrCmp $G_WINUSERNAME "" 0 get_usertype + StrCpy $G_WINUSERNAME "UnknownUser" + + get_usertype: + UserInfo::GetAccountType + Pop $G_WINUSERTYPE + StrCmp $G_WINUSERTYPE "Admin" function_exit + StrCmp $G_WINUSERTYPE "Power" function_exit + StrCmp $G_WINUSERTYPE "User" function_exit + StrCmp $G_WINUSERTYPE "Guest" function_exit + StrCpy $G_WINUSERTYPE "Unknown" + + function_exit: + FunctionEnd + + #-------------------------------------------------------------------------- + # Uninstaller Function: 'un.Uninstall_Begin' (called by 'un.Uninstall Begin' section) + # + # Used to check ownership before starting the uninstall process + #-------------------------------------------------------------------------- + + Function un.Uninstall_Begin + + !define L_TEMP $R9 + + Push ${L_TEMP} + + ; Ensure we access the data belonging to the user who started the uninstaller + + Call un.SetGlobalUserVariables + + ReadINIStr ${L_TEMP} "$G_USERDIR\install.ini" "Settings" "Owner" + StrCmp ${L_TEMP} "" function_exit + StrCmp ${L_TEMP} $G_WINUSERNAME function_exit + + MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \ + "$(PFI_LANG_UN_MBDIFFUSER_1) ('${L_TEMP}') !\ + ${MB_NL}${MB_NL}\ + $(PFI_LANG_UN_MBNOTFOUND_2)" IDYES function_exit + Abort "$(PFI_LANG_UN_ABORT_1)" + + function_exit: + Pop ${L_TEMP} + + !undef L_TEMP + + FunctionEnd + + #-------------------------------------------------------------------------- + # Uninstaller Function: 'un.Shutdown_POPFile' (called by 'un.Shutdown POPFile' section) + #-------------------------------------------------------------------------- + + Function un.Shutdown_POPFile + + !define L_CFG $R9 ; used as file handle + !define L_LNE $R8 ; a line from popfile.cfg + !define L_TEMP $R7 + !define L_TEXTEND $R6 ; used to ensure correct handling of lines longer than 1023 chars + + Push ${L_CFG} + Push ${L_LNE} + Push ${L_TEMP} + Push ${L_TEXTEND} + + ; Ensure we access the data belonging to the user who started the uninstaller + + Call un.SetGlobalUserVariables + + ; The program files we are about to remove are in use so we need to shut POPFile down + + IfFileExists "$G_USERDIR\popfile.cfg" 0 manual_shutdown + + ; Use the UI port setting in the configuration file to shutdown POPFile + + StrCpy $G_GUI "" + + FileOpen ${L_CFG} "$G_USERDIR\popfile.cfg" r + + found_eol: + StrCpy ${L_TEXTEND} "<eol>" + + loop: + FileRead ${L_CFG} ${L_LNE} + StrCmp ${L_LNE} "" ui_port_done + StrCmp ${L_TEXTEND} "<eol>" 0 check_eol + StrCmp ${L_LNE} "$\n" loop + + StrCpy ${L_TEMP} ${L_LNE} 10 + StrCmp ${L_TEMP} "html_port " 0 check_eol + StrCpy $G_GUI ${L_LNE} 5 10 + + ; Now read file until we get to end of the current line + ; (i.e. until we find text ending in <CR><LF>, <CR> or <LF>) + + check_eol: + StrCpy ${L_TEXTEND} ${L_LNE} 1 -1 + StrCmp ${L_TEXTEND} "$\n" found_eol + StrCmp ${L_TEXTEND} "$\r" found_eol loop + + ui_port_done: + FileClose ${L_CFG} + + StrCmp $G_GUI "" manual_shutdown + Push $G_GUI + Call un.PFI_TrimNewlines + Call un.PFI_StrCheckDecimal + Pop $G_GUI + StrCmp $G_GUI "" manual_shutdown + DetailPrint "$(PFI_LANG_UN_LOG_SHUTDOWN) $G_GUI" + DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)" + Push $G_GUI + Call un.PFI_ShutdownViaUI + Pop ${L_TEMP} + StrCmp ${L_TEMP} "success" function_exit + + manual_shutdown: + Call un.RequestManualShutdown + + ; Assume user has managed to shutdown POPFile + + function_exit: + Pop ${L_TEXTEND} + Pop ${L_TEMP} + Pop ${L_LNE} + Pop ${L_CFG} + + !undef L_CFG + !undef L_LNE + !undef L_TEMP + !undef L_TEXTEND + + FunctionEnd + + #-------------------------------------------------------------------------- + # Uninstaller Function: 'un.RequestManualShutdown' + #-------------------------------------------------------------------------- + + Function un.RequestManualShutdown + + StrCpy $G_PLS_FIELD_1 "POPFile" + DetailPrint "Unable to shutdown $G_PLS_FIELD_1 automatically - manual intervention requested" + MessageBox MB_OK|MB_ICONEXCLAMATION|MB_TOPMOST "$(PFI_LANG_MBMANSHUT_1)\ + ${MB_NL}${MB_NL}\ + $(PFI_LANG_MBMANSHUT_2)\ + ${MB_NL}${MB_NL}\ + $(PFI_LANG_MBMANSHUT_3)" + + FunctionEnd + + #-------------------------------------------------------------------------- # End of 'installer-Uninstall.nsh' #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-09-21 01:18:53
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24335 Modified Files: Tag: b0_22_2 installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer.nsi Log Message: Now using the LockedList plugin to detect when a program is running, instead of code which assumes the user has administrator rights. This, combined with the UAC plugin, makes it easier to cope with the case where the installer is started by a user without administrator rights. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.8 retrieving revision 1.3.2.9 diff -C2 -d -r1.3.2.8 -r1.3.2.9 *** installer-SecPOPFile-body.nsh 10 Feb 2007 12:21:40 -0000 1.3.2.8 --- installer-SecPOPFile-body.nsh 21 Sep 2007 01:18:53 -0000 1.3.2.9 *************** *** 122,128 **** 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 --- 122,134 ---- continue: + ; Use HKLM as a simple workaround for the case where installer is started by a non-admin user + ; (the MakeRootDirSafe function will use this HKLM data to re-initialise $G_ROOTDIR) + + WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" "$G_ROOTDIR" + ; If we are installing over a previous version, ensure that version is not running ! GetFunctionAddress ${L_TEMP} MakeRootDirSafe ! UAC::ExecCodeSegment ${L_TEMP} ; Starting with 0.21.0, a new structure is used for the minimal Perl (to enable POPFile to Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.11 retrieving revision 1.242.4.12 diff -C2 -d -r1.242.4.11 -r1.242.4.12 *** installer.nsi 13 Jul 2007 21:35:51 -0000 1.242.4.11 --- installer.nsi 21 Sep 2007 01:18:53 -0000 1.242.4.12 *************** *** 761,764 **** --- 761,765 ---- ReserveFile "${NSISDIR}\Plugins\DumpLog.dll" ReserveFile "${NSISDIR}\Plugins\inetc.dll" + ReserveFile "${NSISDIR}\Plugins\LockedList.dll" ReserveFile "${NSISDIR}\Plugins\md5dll.dll" ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** installer-SecPOPFile-func.nsh 29 Aug 2006 15:57:38 -0000 1.1.2.5 --- installer-SecPOPFile-func.nsh 21 Sep 2007 01:18:53 -0000 1.1.2.6 *************** *** 4,8 **** # used by the 'installer-SecPOPFile-body.nsh' file. # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile --- 4,8 ---- # used by the 'installer-SecPOPFile-body.nsh' file. # ! # Copyright (c) 2005-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 130,133 **** --- 130,157 ---- Function MakeRootDirSafe + ; Use HKLM as a simple workaround for the case where installer is started by a non-admin user + + Push $G_ROOTDIR + + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + StrCmp $G_ROOTDIR "" 0 check_folder_exists + MessageBox MB_OK|MB_ICONEXCLAMATION "Internal Error: UAC_RootDir not defined\ + ${MB_NL}${MB_NL}\ + Click OK to continue" + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + StrCmp $G_ROOTDIR "" try_other_entries + MessageBox MB_OK|MB_ICONINFORMATION "Good News: UAC_RootDir now defined" + Goto check_folder_exists + + try_other_entries: ; ??? + ReadRegStr $G_ROOTDIR HKCU "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "RootDir_LFN" + StrCmp $G_ROOTDIR "" 0 check_folder_exists + ReadRegStr $G_ROOTDIR HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "InstallPath" + + check_folder_exists: + DeleteRegValue HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "UAC_RootDir" + + ; If we are upgrading an existing installation we need to ensure it is not running + IfFileExists "$G_ROOTDIR\*.exe" 0 nothing_to_check *************** *** 273,276 **** --- 297,301 ---- Call PFI_WaitUntilUnlocked DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..." + Push "${C_EXE_END_MARKER}" Push ${L_EXE} Call PFI_CheckIfLocked *************** *** 314,317 **** --- 339,343 ---- nothing_to_check: + Pop $G_ROOTDIR FunctionEnd |
|
From: Brian S. <xue...@us...> - 2007-09-21 01:13:40
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22611 Modified Files: Tag: b0_22_2 MonitorCC.nsi Log Message: Remove the local copies of library functions and use the real library functions, some of which use the LockedList plugin. Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.7 retrieving revision 1.19.4.8 diff -C2 -d -r1.19.4.7 -r1.19.4.8 *** MonitorCC.nsi 5 May 2007 12:28:07 -0000 1.19.4.7 --- MonitorCC.nsi 21 Sep 2007 01:13:42 -0000 1.19.4.8 *************** *** 111,115 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.6" !define C_OUTFILE "monitorcc.exe" --- 111,115 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.7" !define C_OUTFILE "monitorcc.exe" *************** *** 138,141 **** --- 138,151 ---- #-------------------------------------------------------------------------- + # Include private library functions and macro definitions + #-------------------------------------------------------------------------- + + ; Avoid compiler warnings by disabling the functions and definitions we do not use + + !define MONITORCC + + !include "pfi-library.nsh" + + #-------------------------------------------------------------------------- # Version Information settings (for the utility's EXE file) #-------------------------------------------------------------------------- *************** *** 298,330 **** #-------------------------------------------------------------------------- - ;-------------------------------------------------------------------------- - ; Used in the '*-pfi.nsh' files to define the text strings for the utility - ;-------------------------------------------------------------------------- - - !macro PFI_LANG_STRING NAME VALUE - LangString ${NAME} ${LANG_${PFI_LANG}} "${VALUE}" - !macroend - - ;-------------------------------------------------------------------------- - ; Used in this file to define the languages to be supported - ;-------------------------------------------------------------------------- - - ; Macro used to load the files required for each language: - ; (1) The MUI_LANGUAGE macro loads the standard MUI text strings for a particular language - ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc - ; (3) Normally the MUI's language selection menu uses the name defined in the MUI language - ; file, however it is possible to override this by supplying an alternative string - ; (the MENUNAME parameter in this macro). At present the only alternative string used - ; is "Nihongo" which replaces "Japanese" to make things easier for non-English-speaking - ; users. - - !macro PFI_LANG_LOAD LANG MENUNAME - !if "${MENUNAME}" != "-" - !define MUI_${LANG}_LANGNAME "${MENUNAME}" - !endif - !insertmacro MUI_LANGUAGE "${LANG}" - !include "languages\${LANG}-pfi.nsh" - !macroend - ;----------------------------------------- ; Select the languages to be supported by the utility --- 308,311 ---- *************** *** 360,364 **** !insertmacro MUI_RESERVEFILE_LANGDLL ! #-------------------------------------------------------------------------- --- 341,346 ---- !insertmacro MUI_RESERVEFILE_LANGDLL ! ReserveFile "${NSISDIR}\Plugins\LockedList.dll" ! ReserveFile "${NSISDIR}\Plugins\System.dll" #-------------------------------------------------------------------------- *************** *** 400,404 **** continue: ! Call GetParameters Pop $G_INIFILE_PATH StrCmp $G_INIFILE_PATH "" 0 got_param --- 382,386 ---- continue: ! Call PFI_GetParameters Pop $G_INIFILE_PATH StrCmp $G_INIFILE_PATH "" 0 got_param *************** *** 825,830 **** IntCmp $G_ELAPSED_TIME ${L_NEXT_EXECHECK} 0 delete_last_entry 0 IntOp ${L_NEXT_EXECHECK} ${L_NEXT_EXECHECK} + 1 Push "${L_CONVERTEXE}" ! Call CheckIfLocked Pop ${L_TEMP} StrCmp ${L_TEMP} "" not_running --- 807,813 ---- IntCmp $G_ELAPSED_TIME ${L_NEXT_EXECHECK} 0 delete_last_entry 0 IntOp ${L_NEXT_EXECHECK} ${L_NEXT_EXECHECK} + 1 + Push "${C_EXE_END_MARKER}" Push "${L_CONVERTEXE}" ! Call PFI_CheckIfLocked Pop ${L_TEMP} StrCmp ${L_TEMP} "" not_running *************** *** 897,1009 **** #-------------------------------------------------------------------------- - # Installer Function: GetParameters - # - # Returns the command-line parameters (if any) supplied when the installer was started - # - # Inputs: - # none - # Outputs: - # (top of stack) - all of the parameters supplied on the command line (may be "") - # - # Usage: - # - # Call GetParameters - # Pop $R0 - # - # ($R0 will hold everything found on the command-line after the 'monitorcc.exe' part) - # - #-------------------------------------------------------------------------- - - Function GetParameters - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - StrCpy $R2 1 - StrLen $R3 $CMDLINE - - ; Check for quote or space - - StrCpy $R0 $CMDLINE $R2 - StrCmp $R0 '"' 0 +3 - StrCpy $R1 '"' - Goto loop - - StrCpy $R1 " " - - loop: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 $R1 get - StrCmp $R2 $R3 get - Goto loop - - get: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 " " get - StrCpy $R0 $CMDLINE "" $R2 - - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - - FunctionEnd - - - #-------------------------------------------------------------------------- - # Installer Function: CheckIfLocked - # - # Checks if a particular file (an EXE file, for example) is being used. If the specified file - # is no longer in use, this function returns an empty string (otherwise it returns the input - # parameter unchanged). - # - # Inputs: - # (top of stack) - the full pathname of the file to be checked - # - # Outputs: - # (top of stack) - if file is no longer in use, an empty string ("") is returned - # otherwise the input string is returned - # - # Usage: - # - # Push "C:\Program Files\POPFile\wperl.exe" - # Call CheckIfLocked - # Pop $R0 - # - # (if the file is no longer in use, $R0 will be "") - # (if the file is still being used, $R0 will be "C:\Program Files\POPFile\wperl.exe") - #-------------------------------------------------------------------------- - - Function CheckIfLocked - !define L_EXE $R9 ; full path to the file (normally an EXE file) to be checked - !define L_FILE_HANDLE $R8 - - Exch ${L_EXE} - Push ${L_FILE_HANDLE} - - IfFileExists "${L_EXE}" 0 unlocked_exit - SetFileAttributes "${L_EXE}" NORMAL - - ClearErrors - FileOpen ${L_FILE_HANDLE} "${L_EXE}" a - FileClose ${L_FILE_HANDLE} - IfErrors exit - - unlocked_exit: - StrCpy ${L_EXE} "" - - exit: - Pop ${L_FILE_HANDLE} - Exch ${L_EXE} - - !undef L_EXE - !undef L_FILE_HANDLE - FunctionEnd - - #-------------------------------------------------------------------------- # End of 'MonitorCC.nsi' #-------------------------------------------------------------------------- --- 880,883 ---- |
11 messages has been excluded from this view by a project administrator.
