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: Manni H. <man...@us...> - 2007-11-05 13:11:24
|
Update of /cvsroot/popfile/engine/Services/IMAP In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9838/Services/IMAP Log Message: Directory /cvsroot/popfile/engine/Services/IMAP added to the repository --> Using per-directory sticky tag `b0_22_2' |
|
From: naoki i. <am...@us...> - 2007-11-05 12:10:57
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20339 Modified Files: Tag: b0_22_2 Nihongo.msg Log Message: Update Japanese translation Index: Nihongo.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Nihongo.msg,v retrieving revision 1.11.6.10 retrieving revision 1.11.6.11 diff -C2 -d -r1.11.6.10 -r1.11.6.11 *** Nihongo.msg 12 Aug 2007 13:26:02 -0000 1.11.6.10 --- Nihongo.msg 5 Nov 2007 12:11:00 -0000 1.11.6.11 *************** *** 372,375 **** --- 372,376 ---- Imap_WatchMore ´Æ»ë¥Õ¥©¥ë¥À¥ê¥¹¥È¤Ë¥Õ¥©¥ë¥À¤òÄɲà Imap_WatchedFolder ´Æ»ë¥Õ¥©¥ë¥À + Imap_Use_SSL SSL ¤ò»ÈÍѤ¹¤ë Shutdown_Message POPFile ¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ |
|
From: Manni H. <man...@us...> - 2007-11-05 09:36:27
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27940/languages Modified Files: Tag: b0_22_2 Deutsch.msg Log Message: Updated German translation Index: Deutsch.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v retrieving revision 1.33.6.8 retrieving revision 1.33.6.9 diff -C2 -d -r1.33.6.8 -r1.33.6.9 *** Deutsch.msg 5 Nov 2007 09:34:25 -0000 1.33.6.8 --- Deutsch.msg 5 Nov 2007 09:36:30 -0000 1.33.6.9 *************** *** 25,28 **** --- 25,31 ---- ManualLanguage de + # This is where to find the FAQ on the Wiki + FAQLink FAQ + # Common words that are used on their own all over the interface Apply Anwenden |
|
From: Manni H. <man...@us...> - 2007-11-05 09:34:25
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27195/Services Modified Files: Tag: b0_22_2 IMAP.pm Log Message: Added a little widget to configure ssl usage for the IMAP module. Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** IMAP.pm 31 Aug 2007 12:52:52 -0000 1.9.4.4 --- IMAP.pm 5 Nov 2007 09:34:25 -0000 1.9.4.5 *************** *** 1955,1958 **** --- 1955,1959 ---- $templ->param( 'IMAP_login', $self->config_( 'login' ) ); $templ->param( 'IMAP_password', $self->config_( 'password' ) ); + $templ->param( 'IMAP_ssl_checked', $self->config_( 'use_ssl' ) ? 'checked="checked"' : '' ); } *************** *** 2147,2150 **** --- 2148,2158 ---- $templ->param( IMAP_connection_if_password_error => 1 ); } + + if ( defined $form->{imap_use_ssl} ) { + $self->config_( 'use_ssl', 1 ); + } + else { + $self->config_( 'use_ssl', 0 ); + } } return; |
|
From: Manni H. <man...@us...> - 2007-11-05 09:34:24
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27195/languages Modified Files: Tag: b0_22_2 English.msg Deutsch.msg English-UK.msg Log Message: Added a little widget to configure ssl usage for the IMAP module. Index: English-UK.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v retrieving revision 1.7.6.7 retrieving revision 1.7.6.8 diff -C2 -d -r1.7.6.7 -r1.7.6.8 *** English-UK.msg 31 Jan 2007 13:32:26 -0000 1.7.6.7 --- English-UK.msg 5 Nov 2007 09:34:25 -0000 1.7.6.8 *************** *** 371,374 **** --- 371,375 ---- Imap_WatchMore a folder to list of watched folders Imap_WatchedFolder Watched folder no + Imap_Use_SSL Use SSL Shutdown_Message POPFile has shut down Index: Deutsch.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v retrieving revision 1.33.6.7 retrieving revision 1.33.6.8 diff -C2 -d -r1.33.6.7 -r1.33.6.8 *** Deutsch.msg 31 Jan 2007 13:32:26 -0000 1.33.6.7 --- Deutsch.msg 5 Nov 2007 09:34:25 -0000 1.33.6.8 *************** *** 368,371 **** --- 368,372 ---- Imap_WatchMore : einen weiteren zu überwachenden Ordner Imap_WatchedFolder Überwachter Ordner Nr. + Imap_Use_SSL SSL-gesicherte Verbindung Shutdown_Message POPFile wurde beendet Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.75.6.8 retrieving revision 1.75.6.9 diff -C2 -d -r1.75.6.8 -r1.75.6.9 *** English.msg 31 Jan 2007 13:32:26 -0000 1.75.6.8 --- English.msg 5 Nov 2007 09:34:25 -0000 1.75.6.9 *************** *** 371,374 **** --- 371,375 ---- Imap_WatchMore a folder to list of watched folders Imap_WatchedFolder Watched folder no + Imap_Use_SSL Use SSL Shutdown_Message POPFile has shut down |
|
From: Manni H. <man...@us...> - 2007-11-05 09:34:24
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27195/skins/default Modified Files: Tag: b0_22_2 imap-connection-details.thtml Log Message: Added a little widget to configure ssl usage for the IMAP module. Index: imap-connection-details.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/imap-connection-details.thtml,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** imap-connection-details.thtml 10 Aug 2004 01:53:24 -0000 1.3 --- imap-connection-details.thtml 5 Nov 2007 09:34:25 -0000 1.3.6.1 *************** *** 30,33 **** --- 30,39 ---- </TMPL_IF> + <label for="imap_use_ssl" class="configurationLabel"> + <TMPL_VAR NAME="Localize_Imap_Use_SSL"> + </label> + <input id="imap_use_ssl" name="imap_use_ssl" type="checkbox" <TMPL_VAR NAME="IMAP_ssl_checked"> /> + <br /> + <label class="configurationLabel"> <TMPL_VAR NAME="Localize_Imap_Login"> |
|
From: Brian S. <xue...@us...> - 2007-11-03 11:07:23
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28438/add-ons Modified Files: Tag: b0_22_2 OnDemand.nsi Log Message: Version number bumped to reflect the use of the new, more robust Vista-compatible library functions. Index: OnDemand.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** OnDemand.nsi 21 Oct 2007 22:15:50 -0000 1.1.2.5 --- OnDemand.nsi 3 Nov 2007 11:07:25 -0000 1.1.2.6 *************** *** 137,141 **** OutFile ${C_OUTFILE} ! !define C_VERSION "0.0.9" ; Specify the icon file for the utility --- 137,141 ---- OutFile ${C_OUTFILE} ! !define C_VERSION "0.1.0" ; Specify the icon file for the utility |
|
From: Brian S. <xue...@us...> - 2007-11-03 11:06:43
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27738 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: Conditional compilation controls updated to support the "User Data BRU" package. PFI_CheckIfLocked improved by allowing it to check ordinary files in addition to *.exe and *.dll files. The plugin's "AddFile" mode was far too slow for the BRU so it was replaced by Win9x-compatible code which is good enough for the database tests used by the BRU. Also made this function more robust (i.e. made it avoid an infinite loop!) by checking for stack exhaustion when accessing the input list of files. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.13 retrieving revision 1.53.4.14 diff -C2 -d -r1.53.4.13 -r1.53.4.14 *** pfi-library.nsh 21 Oct 2007 22:15:50 -0000 1.53.4.13 --- pfi-library.nsh 3 Nov 2007 11:06:44 -0000 1.53.4.14 *************** *** 60,64 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.7" #-------------------------------------------------------------------------- --- 60,64 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.11" #-------------------------------------------------------------------------- *************** *** 844,848 **** ! !ifdef ADDUSER | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_StrStripLZS --- 844,848 ---- ! !ifdef ADDUSER | BACKUP | RESTORE | TRANSLATOR_AUW #-------------------------------------------------------------------------- # Installer Function: PFI_StrStripLZS *************** *** 1115,1120 **** # # The installation process and the uninstall process may both require a function ! # which checks if a particular executable file (an EXE file) is being used. This ! # macro makes maintenance easier by ensuring that both processes use identical # functions, with the only difference being their names. # --- 1115,1120 ---- # # The installation process and the uninstall process may both require a function ! # which checks if a particular executable file (usually an EXE file) is being used. ! # This macro makes maintenance easier by ensuring that both processes use identical # functions, with the only difference being their names. # *************** *** 1125,1129 **** # # Normally the LockedList plugin will be used to check if any of the specified ! # executable files is use. This plugin returns its results on the stack, # sandwiched between "/start" and "/end" markers ("/start" appears at the top # of the stack). If no files are locked, the plugin simply returns both of these --- 1125,1129 ---- # # Normally the LockedList plugin will be used to check if any of the specified ! # executable files is in use. This plugin returns its results on the stack, # sandwiched between "/start" and "/end" markers ("/start" appears at the top # of the stack). If no files are locked, the plugin simply returns both of these *************** *** 1144,1147 **** --- 1144,1152 ---- # through the results looking for a match. # + # This function is normally used to check if a particular executable (.exe) file is + # locked. However to make the function more general purpose it checks if a DLL has + # been specified and treats that as an executable. All other filenames are assumed + # to be ordinary files. + # #------------------------------------------------------------------------------------ # *************** *** 1186,1190 **** # Usage (after macro has been 'inserted'): # ! # Push "/EndOfExeList" # Push "$INSTDIR\wperl.exe" # Call PFI_CheckIfLocked --- 1191,1195 ---- # Usage (after macro has been 'inserted'): # ! # Push "${C_EXE_END_MARKER}" # Push "$INSTDIR\wperl.exe" # Call PFI_CheckIfLocked *************** *** 1217,1221 **** --- 1222,1228 ---- get_exe_path: + ClearErrors Pop $G_CIL_PATH + IfErrors panic StrCmp $G_CIL_PATH "${C_EXE_END_MARKER}" list_exhausted StrCmp $G_CIL_FLAG "" 0 get_exe_path *************** *** 1243,1254 **** IntOp $G_CIL_TEMP $G_CIL_TEMP + 1 StrCpy $G_CIL_FILE $G_CIL_FILE "" $G_CIL_TEMP LockedList::AddModule /NOUNLOAD "\$G_CIL_FILE" LockedList::SilentSearch Pop $G_CIL_TEMP StrCmp $G_CIL_TEMP "/start" get_search_result ! MessageBox MB_OK|MB_ICONEXCLAMATION "Unexpected result from LockedList plugin\ ${MB_NL}${MB_NL}\ ($G_CIL_TEMP)" ! Abort get_search_result: --- 1250,1277 ---- IntOp $G_CIL_TEMP $G_CIL_TEMP + 1 StrCpy $G_CIL_FILE $G_CIL_FILE "" $G_CIL_TEMP + StrCpy $G_CIL_TEMP $G_CIL_FILE "" -4 + StrCmp $G_CIL_TEMP ".exe" check_module + StrCmp $G_CIL_TEMP ".dll" check_module + + ; Assume the file is "our" POPFile database so there is no need to use + ; the LockedList plugin's "AddFile" mode to check if the file is locked + + SetFileAttributes "$G_CIL_PATH\$G_CIL_FILE" NORMAL + ClearErrors + FileOpen $G_CIL_TEMP "$G_CIL_PATH\$G_CIL_FILE" a + FileClose $G_CIL_TEMP + IfErrors 0 get_exe_path + StrCpy $G_CIL_FLAG "$G_CIL_PATH\$G_CIL_FILE" + Goto get_exe_path + + check_module: LockedList::AddModule /NOUNLOAD "\$G_CIL_FILE" LockedList::SilentSearch Pop $G_CIL_TEMP StrCmp $G_CIL_TEMP "/start" get_search_result ! MessageBox MB_OK|MB_ICONSTOP "Unexpected result from LockedList plugin\ ${MB_NL}${MB_NL}\ ($G_CIL_TEMP)" ! Abort "Unexpected result from LockedList plugin ($G_CIL_TEMP)" get_search_result: *************** *** 1276,1279 **** --- 1299,1312 ---- Goto exit + panic: + MessageBox MB_OK|MB_ICONSTOP "Internal Error:\ + ${MB_NL}${MB_NL}\ + '${UN}PFI_CheckIfLocked' function did not find\ + ${MB_NL}\ + the '${C_EXE_END_MARKER}' marker on the stack!" + Abort "Internal Error: \ + '${UN}PFI_CheckIfLocked' function did not find the \ + '${C_EXE_END_MARKER}' marker on the stack!" + ; Windows 95, 98, ME and NT3.x are treated as special cases ; (because they do not support the LockedList plugin) *************** *** 1283,1287 **** --- 1316,1322 ---- loop: + ClearErrors Pop $G_CIL_PATH + IfErrors panic StrCmp $G_CIL_PATH "${C_EXE_END_MARKER}" allread StrCmp $G_CIL_FLAG "" 0 loop *************** *** 1666,1670 **** !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | MONITORCC | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1701,1705 ---- !macroend ! !ifdef ADDUSER | BACKUP | DBSTATUS | INSTALLER | MONITORCC | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 2836,2840 **** !macroend ! !ifndef BACKUP & ONDEMAND #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters --- 2871,2875 ---- !macroend ! !ifndef ONDEMAND #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters |
|
From: Brian S. <xue...@us...> - 2007-10-21 22:18:02
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22385 Added Files: Tag: b0_22_2 1.0.0.pcf Log Message: At present no SSL patches are required for the next release. --- NEW FILE: 1.0.0.pcf --- ; POPFILE PATCH CONTROL FILE [PCF] Format=1 [Settings] POPFileVersion=1.0.0 PatchIssue=0 NumberOfPatches=0 Comment=The current SSL Support files are compatible (21 Oct 2007 @ 10:00 GMT) |
|
From: Brian S. <xue...@us...> - 2007-10-21 22:15:48
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20511 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: To make future maintenance easier make the OnDemand utility use library functions instead of local ones. Make the notes on the LockedList plugin agree with what the code now does. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.12 retrieving revision 1.53.4.13 diff -C2 -d -r1.53.4.12 -r1.53.4.13 *** pfi-library.nsh 20 Oct 2007 13:02:07 -0000 1.53.4.12 --- pfi-library.nsh 21 Oct 2007 22:15:50 -0000 1.53.4.13 *************** *** 39,49 **** # (7) MONITORCC defined in MonitorCC.nsi (the corpus conversion monitor) # (8) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (9) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (10) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (11) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (12) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (13) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (14) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (15) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- --- 39,50 ---- # (7) MONITORCC defined in MonitorCC.nsi (the corpus conversion monitor) # (8) MSGCAPTURE defined in msgcapture.nsi (used to capture POPFile's console messages) ! # (9) ONDEMAND defined in add-ons\OnDemand.nsi (starts POPFile & email client together) ! # (10) PFIDIAG defined in test\pfidiag.nsi (helps diagnose installer-related problems) ! # (11) RESTORE defined in restore.nsi (POPFile 'User Data' Restore utility) ! # (12) RUNPOPFILE defined in runpopfile.nsi (simple front-end for popfile.exe) ! # (13) RUNSQLITE defined in runsqlite.nsi (simple front-end for sqlite.exe/sqlite3.exe) ! # (14) STOP_POPFILE defined in stop_popfile.nsi (the 'POPFile Silent Shutdown' utility) ! # (15) TRANSLATOR defined in test\translator.nsi (main installer translations testbed) ! # (16) TRANSLATOR_AUW defined in test\transAUW.nsi ('Add POPFile User' translations testbed) #-------------------------------------------------------------------------- *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.6" #-------------------------------------------------------------------------- --- 60,64 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.7" #-------------------------------------------------------------------------- *************** *** 1089,1093 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MONITORCC | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_AtLeastWinNT4 --- 1090,1094 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MONITORCC | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_AtLeastWinNT4 *************** *** 1113,1140 **** # Macro: PFI_CheckIfLocked # ! # The installation process and the uninstall process may both use a function which checks if ! # a particular executable file (an EXE file) is being used. This macro makes maintenance easier ! # by ensuring that both processes use identical functions, with the only difference being their ! # names. # ! # There are several different ways to run POPFile so the PFI_CheckIfLocked function accepts a list ! # of full pathnames to the executable files which are to be checked (to make it easier to check ! # the various ways in which POPFile can be run). This list is passed via the stack, with a marker ! # string being used to mark the end of the list. # ! # Normally the LockedList plugin will be used to check if any of the specified executable files is ! # is use. This plugin returns its results on the stack, sandwiched between "/start" and "/end" markers ! # ("/start" appears at the top of the stack). If no files are locked, the plugin simply returns both ! # markers on the stack: # ! # (top of stack) /start ! # (top of stack - 1) /end # ! # Note that if an executable was started using an SFN path then the plugin must also ! # be given the SFN path (if the plugin is only supplied with the equivalent LFN path ! # then it will fail to detect if the executable is locked). # ! # As a further complication, if a locked file is found the plugin returns the LFN format ! # even if the input list of executable files used the SFN format. # # Unfortunately the 'LockedList' plugin relies upon OS features only found in --- 1114,1162 ---- # Macro: PFI_CheckIfLocked # ! # The installation process and the uninstall process may both require a function ! # which checks if a particular executable file (an EXE file) is being used. This ! # macro makes maintenance easier by ensuring that both processes use identical ! # functions, with the only difference being their names. # ! # There are several different ways to run POPFile so this function accepts a list ! # of full pathnames to the executable files which are to be checked (to make it ! # easier to check the various ways in which POPFile can be run). This list is ! # passed via the stack, with a marker string being used to mark the list's end. # ! # Normally the LockedList plugin will be used to check if any of the specified ! # executable files is use. This plugin returns its results on the stack, ! # sandwiched between "/start" and "/end" markers ("/start" appears at the top ! # of the stack). If no files are locked, the plugin simply returns both of these ! # markers on the stack, like this: # ! # (top of stack) /start ! # (top of stack - 1) /end # ! # Note that the format of the path supplied to the plugin is important. If a program ! # was started from a 'hybrid' path using a mixture of SFN and LFN names, such as ! # "C:\PROGRA~1\POPFILE\popfileib.exe", and the plugin is given the equivalent LFN ! # path ("C:\Program Files\POPFile\popfileib.exe") then the plugin will fail to detect ! # if this particular executable is locked. # ! # To avoid these LFN/SFN problems we use the plugin's special "filename only" mode by ! # supplying the file name without the path. In this mode the plugin returns a list of ! # paths to any running processes that match the filename so all we have to do is loop ! # through the results looking for a match. ! # ! #------------------------------------------------------------------------------------ ! # ! # The 'NSIS Wiki' page for the 'LockedList' plugin (description and download links) is ! # http://nsis.sourceforge.net/LockedList_plug-in ! # ! # To compile this script, copy the 'LockedList.dll' file to the standard NSIS plugins ! # folder (${NSISDIR}\Plugins\). The 'LockedList' source and example files can be ! # unzipped to the appropriate ${NSISDIR} sub-folders if you wish, but this step is ! # entirely optional. ! # ! # Tested using LockedList plugin v0.4 (RC2) timestamped 27 September 2007 19:42 ! # (this is the first version to support the new "filename only" mode which we use) ! # ! # The plugin's history can be found at http://nsis.sourceforge.net/File:LockedList.zip ! #------------------------------------------------------------------------------------ # # Unfortunately the 'LockedList' plugin relies upon OS features only found in *************** *** 1146,1158 **** # # NOTE: ! # The !insertmacro PFI_CheckIfLocked "" and !insertmacro PFI_CheckIfLocked "un." commands are included ! # in this file so the NSIS script can use 'Call PFI_CheckIfLocked' and 'Call un.PFI_CheckIfLocked' ! # without additional preparation. # # Inputs: ! # (top of stack) - full path of EXE file to be checked ! # (top of stack - 1) - full path of EXE file to be checked # ... ! # (top of stack - n) - full path of EXE file to be checked # (top of stack - (n + 1)) - end-of-data marker (see C_EXE_END_MARKER definition) # --- 1168,1180 ---- # # NOTE: ! # The !insertmacro PFI_CheckIfLocked "" & !insertmacro PFI_CheckIfLocked "un." commands ! # are included in this file so the NSIS script can use 'Call PFI_CheckIfLocked' and ! # 'Call un.PFI_CheckIfLocked' without additional preparation. # # Inputs: ! # (top of stack) - full path of an EXE file to be checked ! # (top of stack - 1) - full path of an EXE file to be checked # ... ! # (top of stack - n) - full path of an EXE file to be checked # (top of stack - (n + 1)) - end-of-data marker (see C_EXE_END_MARKER definition) # *************** *** 1280,1284 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MONITORCC | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_CheckIfLocked --- 1302,1306 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | MONITORCC | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_CheckIfLocked *************** *** 1644,1648 **** !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | MONITORCC | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1666,1670 ---- !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | MONITORCC | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 2376,2380 **** !macroend ! !ifndef MONITORCC & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp --- 2398,2402 ---- !macroend ! !ifndef MONITORCC & ONDEMAND & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetDateTimeStamp *************** *** 2464,2468 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE | STOP_POPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetFileSize --- 2486,2490 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | ONDEMAND | RESTORE | STOP_POPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetFileSize *************** *** 2573,2577 **** !macroend ! !ifndef MONITORCC & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime --- 2595,2599 ---- !macroend ! !ifndef MONITORCC & ONDEMAND & RUNPOPFILE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_GetLocalTime *************** *** 2814,2818 **** !macroend ! !ifndef BACKUP #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters --- 2836,2840 ---- !macroend ! !ifndef BACKUP & ONDEMAND #-------------------------------------------------------------------------- # Installer Function: PFI_GetParameters *************** *** 2892,2896 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | MONITORCC | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent --- 2914,2918 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | DBSTATUS | INSTALLER | MONITORCC | ONDEMAND | RESTORE | RUNPOPFILE #-------------------------------------------------------------------------- # Installer Function: PFI_GetParent *************** *** 4178,4182 **** !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_ShutdownViaUI --- 4200,4204 ---- !macroend ! !ifdef ADDSSL | ADDUSER | BACKUP | INSTALLER | ONDEMAND | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_ShutdownViaUI *************** *** 4491,4495 **** !macroend ! !ifndef DBSTATUS & IMAPUPDATER & MONITORCC & MSGCAPTURE & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr --- 4513,4517 ---- !macroend ! !ifndef DBSTATUS & IMAPUPDATER & MONITORCC & MSGCAPTURE & ONDEMAND & RUNSQLITE & STOP_POPFILE & TRANSLATOR #-------------------------------------------------------------------------- # Installer Function: PFI_StrStr *************** *** 4661,4665 **** !macroend ! !ifdef ADDSSL | ADDUSER | INSTALLER #-------------------------------------------------------------------------- # Installer Function: PFI_WaitUntilUnlocked --- 4683,4687 ---- !macroend ! !ifdef ADDSSL | ADDUSER | INSTALLER | ONDEMAND #-------------------------------------------------------------------------- # Installer Function: PFI_WaitUntilUnlocked |
|
From: Brian S. <xue...@us...> - 2007-10-21 22:15:48
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20511/add-ons Modified Files: Tag: b0_22_2 OnDemand.nsi Log Message: To make future maintenance easier make the OnDemand utility use library functions instead of local ones. Make the notes on the LockedList plugin agree with what the code now does. Index: OnDemand.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/Attic/OnDemand.nsi,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** OnDemand.nsi 5 Oct 2007 22:04:03 -0000 1.1.2.4 --- OnDemand.nsi 21 Oct 2007 22:15:50 -0000 1.1.2.5 *************** *** 65,69 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with version v0.3 RC2 (15:36, 13 July 2007) of the 'LockedList' plugin. #------------------------------------------------------------------------------------------- --- 65,69 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested using LockedList plugin v0.4 (RC2) timestamped 27 September 2007 19:42 #------------------------------------------------------------------------------------------- *************** *** 124,133 **** ;-------------------------------------------------------------------------- - ; The URL used to access the POPFile User Interface (UI) - ;-------------------------------------------------------------------------- - - !define C_UI_URL "127.0.0.1" - - ;-------------------------------------------------------------------------- ; Specify filename for the EXE and INI files ;-------------------------------------------------------------------------- --- 124,127 ---- *************** *** 143,147 **** OutFile ${C_OUTFILE} ! !define C_VERSION "0.0.8" ; Specify the icon file for the utility --- 137,141 ---- OutFile ${C_OUTFILE} ! !define C_VERSION "0.0.9" ; Specify the icon file for the utility *************** *** 171,186 **** Var G_TEMP ; general purpose global variable ! ;-------------------------------------------------------------------------- ! ; Used in the 'CheckIfExeLocked' function to simply stack handling ! ;-------------------------------------------------------------------------- ! Var G_EXETOCHECK ; fullpath to an executable file to be checked by the LockedList plugin ! Var G_FILE_HANDLE ; used when target system is not Windows NT4 or later ! ;-------------------------------------------------------------------------- ! ; Marker used by the 'CheckIfExeLocked' function to detect the end of the input data ! ;-------------------------------------------------------------------------- ! !define C_EXE_END_MARKER "/EndOfExeList" #-------------------------------------------------------------------------- --- 165,177 ---- Var G_TEMP ; general purpose global variable ! #-------------------------------------------------------------------------- ! # Include private library functions and macro definitions ! #-------------------------------------------------------------------------- ! ; Avoid compiler warnings by disabling the functions and definitions we do not use ! !define ONDEMAND ! !include "..\pfi-library.nsh" #-------------------------------------------------------------------------- *************** *** 314,318 **** Push "$INSTDIR\perl.exe" Push "$INSTDIR\wperl.exe" ! Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit --- 305,309 ---- Push "$INSTDIR\perl.exe" Push "$INSTDIR\wperl.exe" ! Call PFI_CheckIfLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" 0 exit *************** *** 361,365 **** StrCmp ${L_STARTUP_DELAY} "" start_client Push ${L_STARTUP_DELAY} ! Call StrCheckDecimal Pop ${L_RESULT} StrCmp ${L_RESULT} "" invalid_delay_supplied --- 352,356 ---- StrCmp ${L_STARTUP_DELAY} "" start_client Push ${L_STARTUP_DELAY} ! Call PFI_StrCheckDecimal Pop ${L_RESULT} StrCmp ${L_RESULT} "" invalid_delay_supplied *************** *** 499,508 **** Push ${L_NEW_GUI} ! Call TrimNewlines Pop ${L_NEW_GUI} StrCmp ${L_NEW_GUI} "" manual_shutdown Push ${L_NEW_GUI} ! Call ShutdownSilently Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe --- 490,499 ---- Push ${L_NEW_GUI} ! Call PFI_TrimNewlines Pop ${L_NEW_GUI} StrCmp ${L_NEW_GUI} "" manual_shutdown Push ${L_NEW_GUI} ! Call PFI_ShutdownViaUI Pop ${L_RESULT} StrCmp ${L_RESULT} "success" check_exe *************** *** 517,521 **** Push "$INSTDIR\perl.exe" Push "$INSTDIR\wperl.exe" ! Call CheckIfExeLocked Pop ${L_EXE} StrCmp ${L_EXE} "" exit --- 508,512 ---- Push "$INSTDIR\perl.exe" Push "$INSTDIR\wperl.exe" ! Call PFI_CheckIfLocked Pop ${L_EXE} StrCmp ${L_EXE} "" exit *************** *** 534,541 **** gotname: Push "$INSTDIR\${L_EXE}" ! Call WaitUntilExeUnlocked Push "${C_EXE_END_MARKER}" Push "$INSTDIR\${L_EXE}" ! Call CheckIfExeLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" exit --- 525,532 ---- gotname: Push "$INSTDIR\${L_EXE}" ! Call PFI_WaitUntilUnlocked Push "${C_EXE_END_MARKER}" Push "$INSTDIR\${L_EXE}" ! Call PFI_CheckIfLocked Pop ${L_RESULT} StrCmp ${L_RESULT} "" exit *************** *** 593,1150 **** #-------------------------------------------------------------------------- - # General Purpose Function: CheckIfExeLocked - #-------------------------------------------------------------------------- - # - # There are several different ways to run POPFile so this function accepts a list - # of full pathnames to the executable files which are to be checked. The list is - # passed via the stack with a marker string being used to mark the end of the list. - # - # The LockedList plugin returns the results on the stack, sandwiched between "/start" - # and "/end" markers ("/start" appears at the top of the stack). If no files are locked, - # the plugin simply returns both markers on the stack: - # (top of stack) /start - # (top of stack - 1) /end - # - # Note that if an executable was started using an SFN path then the plugin must also - # be given the SFN path (if the plugin is supplied with the equivalent LFN path then - # it will fail to detect if the executable is locked). As a further complication, if - # a locked file is found the plugin returns the LFN format even if the input list of - # executable files used the SFN format. - # - # Unfortunately the 'LockedList' plugin relies upon OS features only found in - # Windows NT4 or later so older systems such as Win9x must be treated as special - # cases. - # - # If none of the specified files is locked then an empty string is returned, - # otherwise the function returns the first locked file it detects. - # - # Inputs: - # (top of stack) - full path of EXE file to be checked - # (top of stack - 1) - full path of EXE file to be checked - # ... - # (top of stack - n) - full path of EXE file to be checked - # (top of stack - (n + 1)) - end-of-data marker (see C_EXE_END_MARKER definition) - # - # Outputs: - # (top of stack) - if none of the files is in use, an empty string ("") - # is returned, otherwise the path to the first locked - # file found is returned - # - # Usage: - # - # Push "/EndOfExeList" - # Push "$INSTDIR\wperl.exe" - # Call CheckIfExeLocked - # Pop $R0 - # - # (if the file is no longer in use, $R0 will be "") - #-------------------------------------------------------------------------- - - Function CheckIfExeLocked - - Call AtLeastWinNT4 - Pop $G_TEMP - StrCmp $G_TEMP "0" specialcase - - ; The target system provides the features required by the LockedList plugin - - StrCpy $G_TEMP "emptylist" - - get_exe_path: - Pop $G_EXETOCHECK - StrCmp $G_EXETOCHECK "${C_EXE_END_MARKER}" start_search - IfFileExists "$G_EXETOCHECK" 0 get_exe_path - StrCpy $G_TEMP "gotlist" - LockedList::AddModule /NOUNLOAD "$G_EXETOCHECK" - Goto get_exe_path - - start_search: - StrCmp $G_TEMP "emptylist" nothing_to_report - LockedList::SilentSearch - - StrCpy $G_EXETOCHECK "" - Pop $G_TEMP - StrCmp $G_TEMP "/start" get_search_result - MessageBox MB_OK|MB_ICONEXCLAMATION "Unexpected result from LockedList plugin\ - ${MB_NL}${MB_NL}\ - ($G_TEMP)" - Abort - - get_search_result: - Pop $G_TEMP ; get "process ID" (or "/end" marker, if no more data) - StrCmp $G_TEMP "/end" end_of_locked_list - StrCmp $G_EXETOCHECK "" 0 skip_result - Pop $G_EXETOCHECK ; get the "path to executable" result - Goto skip_window_caption - - skip_result: - Pop $G_TEMP ; ignore the "path to executable" result - - skip_window_caption: - Pop $G_TEMP ; ignore the "window caption" result - goto get_search_result - - nothing_to_report: - StrCpy $G_EXETOCHECK "" - - end_of_locked_list: - Push $G_EXETOCHECK - Goto exit - - ; Windows 95, 98, ME and NT3.x are treated as special cases - ; (because they do not support the LockedList plugin) - - specialcase: - StrCpy $G_TEMP "" - - loop: - Pop $G_EXETOCHECK - StrCmp $G_EXETOCHECK "${C_EXE_END_MARKER}" allread - StrCmp $G_TEMP "" 0 loop - IfFileExists "$G_EXETOCHECK" 0 loop - SetFileAttributes "$G_EXETOCHECK" NORMAL - ClearErrors - FileOpen $G_FILE_HANDLE "$G_EXETOCHECK" a - FileClose $G_FILE_HANDLE - IfErrors 0 loop - StrCpy $G_TEMP "$G_EXETOCHECK" - Goto loop - - allread: - StrCpy $G_EXETOCHECK $G_TEMP - Push $G_EXETOCHECK - - exit: - FunctionEnd - - - #-------------------------------------------------------------------------- - # General Purpose Function: WaitUntilExeUnlocked - #-------------------------------------------------------------------------- - # - # This function waits until a particular executable file (an EXE file) is no longer in use. - # - # It may take a little while for POPFile to shutdown so this function waits in a loop until - # the specified EXE file is no longer in use. A timeout is used to avoid an infinite loop. - # - # Note: If the CheckIfExeLocked function is run on NT4 or higher it will use the LockedList - # plugin which means the function's return value may not match any of the input data supplied - # to the function (e.g. if a SFN path is supplied the return value will use LFN format). - # - # Inputs: - # (top of stack) - the full path of the EXE file to be checked - # - # Outputs: - # (none) - # - # Usage: - # - # Push "$INSTDIR\wperl.exe" - # Call WaitUntilExeUnlocked - # - #-------------------------------------------------------------------------- - - Function WaitUntilExeUnlocked - - !define L_EXE $R9 ; full path to the EXE file which is to be monitored - !define L_RESULT $R8 - !define L_TIMEOUT $R7 ; used to avoid an infinite loop - - ;----------------------------------------------------------- - ; Timeout loop counter start value (counts down to 0) - - !ifndef C_SHUTDOWN_LIMIT - !define C_SHUTDOWN_LIMIT 20 - !endif - - ; Delay (in milliseconds) used inside the timeout loop - - !ifndef C_SHUTDOWN_DELAY - !define C_SHUTDOWN_DELAY 1000 - !endif - ;----------------------------------------------------------- - - Exch ${L_EXE} - Push ${L_RESULT} - Push ${L_TIMEOUT} - - IfFileExists "${L_EXE}" 0 exit_now - StrCpy ${L_TIMEOUT} ${C_SHUTDOWN_LIMIT} - - check_if_unlocked: - Sleep ${C_SHUTDOWN_DELAY} - Push "${C_EXE_END_MARKER}" - Push ${L_EXE} - Call CheckIfExeLocked - Pop ${L_RESULT} - StrCmp ${L_RESULT} "" exit_now - IntOp ${L_TIMEOUT} ${L_TIMEOUT} - 1 - IntCmp ${L_TIMEOUT} 0 exit_now exit_now check_if_unlocked - - exit_now: - Pop ${L_TIMEOUT} - Pop ${L_RESULT} - Pop ${L_EXE} - - !undef L_EXE - !undef L_RESULT - !undef L_TIMEOUT - - FunctionEnd - - - #-------------------------------------------------------------------------- - # General Purpose Function: ShutdownSilently - #-------------------------------------------------------------------------- - # - # This function attempts to shutdown POPFile using the User Interface (UI) invisibly - # (i.e. no browser window is used). - # - # We use NSISdl to shutdown POPFile by "downloading" the POPFile Shutdown page. Normally one - # successful download attempt is enough to shutdown POPFile and the page which NSISdl receives - # will be the "POPFile has shut down" one. However if the UI is password protected then NSISdl - # will receive a page requesting the UI password instead of the "POPFile has shut down" page. - # - # The layout and content of the HTML page depends upon the UI language and UI skin selection. - # To avoid the need to parse the HTML page downloaded by NSISdl, we make a second attempt to - # download the POPFile Shutdown page. If POPFile has shutdown then this second call will fail - # or it will download an empty page (i.e. one which is 0 bytes long). If the second NSISdl call - # downloads a page which is not empty then we assume it is a page requesting the UI password. - # - # To help debug problems, the first HTML file is _not_ overwritten with the second HTML file. - # - # Inputs: - # (top of stack) - UI port to be used when issuing the shutdown request - # - # Outputs: - # (top of stack) - string containing one of the following result codes: - # - # "success" (i.e. UI shutdown request appeared to work) - # - # "failure" (i.e. UI shutdown request failed) - # - # "password?" (i.e. failure - UI may be password protected) - # - # "badport" (i.e. failure - invalid UI port supplied) - # - # Usage: - # - # Push "8080" - # Call ShutdownSilently - # Pop $R0 - # - # (if $R0 at this point is "password?" then POPFile is still running) - # - #-------------------------------------------------------------------------- - - Function ShutdownSilently - - ;-------------------------------------------------------------------------- - ; Override the default timeout for NSISdl requests (specifies timeout in milliseconds) - - !define C_SVU_DLTIMEOUT /TIMEOUT=10000 - - ; Delay between the two shutdown requests (in milliseconds) - - !define C_SVU_DLGAP 2000 - ;-------------------------------------------------------------------------- - - !define L_RESULT $R9 - !define L_UIPORT $R8 - - Exch ${L_UIPORT} - Push ${L_RESULT} - Exch - - StrCmp ${L_UIPORT} "" badport - Push ${L_UIPORT} - Call StrCheckDecimal - Pop ${L_UIPORT} - StrCmp ${L_UIPORT} "" badport - IntCmp ${L_UIPORT} 1 port_ok badport - IntCmp ${L_UIPORT} 65535 port_ok port_ok - - badport: - StrCpy ${L_RESULT} "badport" - Goto exit - - port_ok: - NSISdl::download_quiet \ - ${C_SVU_DLTIMEOUT} http://${C_UI_URL}:${L_UIPORT}/shutdown "$PLUGINSDIR\shutdown_1.htm" - Pop ${L_RESULT} - StrCmp ${L_RESULT} "success" try_again - StrCpy ${L_RESULT} "failure" - Goto exit - - try_again: - Sleep ${C_SVU_DLGAP} - NSISdl::download_quiet \ - ${C_SVU_DLTIMEOUT} http://${C_UI_URL}:${L_UIPORT}/shutdown "$PLUGINSDIR\shutdown_2.htm" - Pop ${L_RESULT} - StrCmp ${L_RESULT} "success" 0 shutdown_ok - Push "$PLUGINSDIR\shutdown_2.htm" - Call GetFileSize - Pop ${L_RESULT} - StrCmp ${L_RESULT} 0 shutdown_ok - StrCpy ${L_RESULT} "password?" - Goto exit - - shutdown_ok: - StrCpy ${L_RESULT} "success" - - exit: - Pop ${L_UIPORT} - Exch ${L_RESULT} - - !undef C_SVU_DLTIMEOUT - !undef C_SVU_DLGAP - - !undef L_RESULT - !undef L_UIPORT - - FunctionEnd - - - #-------------------------------------------------------------------------- - # General Purpose Function: StrCheckDecimal - #-------------------------------------------------------------------------- - # - # This function checks if a given string contains only the digits 0 to 9 - # (if the string contains any invalid characters, "" is returned) - # - # Inputs: - # (top of stack) - string which may contain a decimal number - # - # Outputs: - # (top of stack) - the input string (if valid) or "" (if invalid) - # - # Usage: - # - # Push "12345" - # Call StrCheckDecimal - # Pop $R0 - # ($R0 at this point is "12345") - # - #-------------------------------------------------------------------------- - - 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 - - - #-------------------------------------------------------------------------- - # General Purpose Function: GetFileSize - #-------------------------------------------------------------------------- - # - # This function gets the size (in bytes) of a particular file. - # - # If the specified file is not found, the function returns -1 - # - # Inputs: - # (top of stack) - filename of file to be checked - # Outputs: - # (top of stack) - length of the file (in bytes) - # or '-1' if file not found - # or '-2' if error occurred - # - # Usage: - # - # Push "corpus\spam\table" - # Call GetFileSize - # Pop $R0 - # - # ($R0 now holds the size (in bytes) of the 'spam' bucket's 'table' file) - # - #-------------------------------------------------------------------------- - - Function GetFileSize - - !define L_FILENAME $R9 - !define L_RESULT $R8 - - Exch ${L_FILENAME} - Push ${L_RESULT} - Exch - - IfFileExists ${L_FILENAME} find_size - StrCpy ${L_RESULT} "-1" - Goto exit - - find_size: - ClearErrors - FileOpen ${L_RESULT} ${L_FILENAME} r - FileSeek ${L_RESULT} 0 END ${L_FILENAME} - FileClose ${L_RESULT} - IfErrors 0 return_size - StrCpy ${L_RESULT} "-2" - Goto exit - - return_size: - StrCpy ${L_RESULT} ${L_FILENAME} - - exit: - Pop ${L_FILENAME} - Exch ${L_RESULT} - - !undef L_FILENAME - !undef L_RESULT - - FunctionEnd - - - #-------------------------------------------------------------------------- - # General Purpose Function: TrimNewlines - #-------------------------------------------------------------------------- - # - # This function trims newlines from lines of text. - # - # Inputs: - # (top of stack) - string which may end with one or more newlines - # - # Outputs: - # (top of stack) - the input string with the trailing newlines (if any) removed - # - # Usage: - # - # Push "whatever$\r$\n" - # Call TrimNewlines - # Pop $R0 - # ($R0 at this point is "whatever") - # - #-------------------------------------------------------------------------- - - Function TrimNewlines - Exch $R0 - Push $R1 - Push $R2 - StrCpy $R1 0 - - loop: - IntOp $R1 $R1 - 1 - StrCpy $R2 $R0 1 $R1 - StrCmp $R2 "$\r" loop - StrCmp $R2 "$\n" loop - IntOp $R1 $R1 + 1 - IntCmp $R1 0 no_trim_needed - StrCpy $R0 $R0 $R1 - - no_trim_needed: - Pop $R2 - Pop $R1 - Exch $R0 - FunctionEnd - - - #-------------------------------------------------------------------------- - # General Purpose Function: AtLeastWinNT4 - #-------------------------------------------------------------------------- - # - # This function is used to detect if we are running on Windows NT4 or later - # - # Inputs: - # (none) - # - # Outputs: - # (top of stack) - 0 if Win9x or WinME, 1 if Win NT4 or higher - # - # Usage: - # - # Call AtLeastWinNT4 - # Pop $R0 - # - # ($R0 at this point is "0" if running on Win95, Win98, WinME or NT3.x) - # - #-------------------------------------------------------------------------- - - Function AtLeastWinNT4 - - !define L_RESULT $R9 - !define L_TEMP $R8 - - Push ${L_RESULT} - Push ${L_TEMP} - - ClearErrors - ReadRegStr ${L_RESULT} HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion - IfErrors preNT4system - StrCpy ${L_TEMP} ${L_RESULT} 1 - StrCmp ${L_TEMP} '3' preNT4system - StrCpy ${L_RESULT} "1" - Goto exit - - preNT4system: - StrCpy ${L_RESULT} "0" - - exit: - Pop ${L_TEMP} - Exch ${L_RESULT} - - !undef L_RESULT - !undef L_TEMP - - FunctionEnd - - #-------------------------------------------------------------------------- # End of OnDemand.nsi #-------------------------------------------------------------------------- --- 584,587 ---- |
|
From: Brian S. <xue...@us...> - 2007-10-20 13:02:05
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13451 Modified Files: Tag: b0_22_2 installer-SecPOPFile-func.nsh installer-Uninstall.nsh pfi-library.nsh Log Message: Changed the PFI_CheckIfLocked macro-based function to use the new filename-only mode of the LockedList plugin in an attempt to solve the problems found by standard users on Windows XP. Provided more detail in the shutdown log entries. Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** installer-SecPOPFile-func.nsh 18 Oct 2007 01:38:07 -0000 1.1.2.8 --- installer-SecPOPFile-func.nsh 20 Oct 2007 13:02:07 -0000 1.1.2.9 *************** *** 380,384 **** ; The program files we are about to update are in use so we need to shut POPFile down ! DetailPrint "... one of them is locked." ; Attempt to discover which POPFile UI port is used by the current user, so we can issue --- 380,384 ---- ; The program files we are about to update are in use so we need to shut POPFile down ! DetailPrint "'${L_EXE}' appears to be locked." ; Attempt to discover which POPFile UI port is used by the current user, so we can issue Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.11 retrieving revision 1.53.4.12 diff -C2 -d -r1.53.4.11 -r1.53.4.12 *** pfi-library.nsh 18 Oct 2007 01:41:58 -0000 1.53.4.11 --- pfi-library.nsh 20 Oct 2007 13:02:07 -0000 1.53.4.12 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.5" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.6" #-------------------------------------------------------------------------- *************** *** 1179,1185 **** !define PFI_CheckIfLocked - var /GLOBAL G_CIL_EXE var /GLOBAL G_CIL_FILE var /GLOBAL G_CIL_FLAG var /GLOBAL G_CIL_TEMP --- 1179,1185 ---- !define PFI_CheckIfLocked var /GLOBAL G_CIL_FILE var /GLOBAL G_CIL_FLAG + var /GLOBAL G_CIL_PATH var /GLOBAL G_CIL_TEMP *************** *** 1192,1224 **** ; The target system provides the features required by the LockedList plugin ! StrCpy $G_CIL_FLAG "emptylist" get_exe_path: ! Pop $G_CIL_EXE ! StrCmp $G_CIL_EXE "${C_EXE_END_MARKER}" start_search ! IfFileExists "$G_CIL_EXE" 0 get_exe_path ! StrCpy $G_CIL_FLAG "gotlist" ! ; LockedList plugin searches for _exact_ path match so we need to supply LFN and SFN paths ! ; (note that when the SFN path is supplied, the filename part of the path is NOT given in ! ; the SFN format, so "popfileif.exe" is NOT replaced by something like "POPFIL~2.EXE") ! GetFullPathName $G_CIL_FILE "$G_CIL_EXE" ! LockedList::AddModule /NOUNLOAD "$G_CIL_FILE" Push $G_CIL_FILE Call ${UN}PFI_GetParent ! Pop $G_CIL_EXE ! StrLen $G_CIL_TEMP $G_CIL_EXE IntOp $G_CIL_TEMP $G_CIL_TEMP + 1 StrCpy $G_CIL_FILE $G_CIL_FILE "" $G_CIL_TEMP ! GetFullPathName /SHORT $G_CIL_EXE "$G_CIL_EXE" ! LockedList::AddModule /NOUNLOAD "$G_CIL_EXE\$G_CIL_FILE" ! Goto get_exe_path ! ! start_search: ! StrCmp $G_CIL_FLAG "emptylist" nothing_to_report LockedList::SilentSearch - - StrCpy $G_CIL_EXE "" Pop $G_CIL_TEMP StrCmp $G_CIL_TEMP "/start" get_search_result --- 1192,1226 ---- ; The target system provides the features required by the LockedList plugin ! StrCpy $G_CIL_FLAG "" get_exe_path: ! Pop $G_CIL_PATH ! StrCmp $G_CIL_PATH "${C_EXE_END_MARKER}" list_exhausted ! StrCmp $G_CIL_FLAG "" 0 get_exe_path ! IfFileExists "$G_CIL_PATH" 0 get_exe_path ! ; Normally the POPFile programs are started using a hybrid path, where the filename ! ; is given in LFN rather than SFN form but the remainder of the path is in SFN form. ! ; ! ; For example instead of using the pathname "C:\Program Files\POPFile\popfileif.exe" ! ; or the pathname "C:\PROGRA~1\POPFILE\POPFIL~2.EXE" to start the program, the hybrid ! ; pathname "C:\PROGRA~1\POPFILE\popfileif.exe" is used. ! ; ! ; These hybrid pathnames cause problems because the LockedList plugin searches for ! ; an exact match with the specified pathame. As a workaround we use the plugin's ! ; special "filename only" mode to find, for example, "popfileif.exe" and then ! ; analyse the results to see if any match the path in which we are interested. ! Push $G_CIL_PATH ! Call ${UN}PFI_GetCompleteFPN ! Pop $G_CIL_FILE Push $G_CIL_FILE Call ${UN}PFI_GetParent ! Pop $G_CIL_PATH ! StrLen $G_CIL_TEMP $G_CIL_PATH IntOp $G_CIL_TEMP $G_CIL_TEMP + 1 StrCpy $G_CIL_FILE $G_CIL_FILE "" $G_CIL_TEMP ! LockedList::AddModule /NOUNLOAD "\$G_CIL_FILE" LockedList::SilentSearch Pop $G_CIL_TEMP StrCmp $G_CIL_TEMP "/start" get_search_result *************** *** 1231,1236 **** Pop $G_CIL_TEMP ; get "process ID" (or "/end" marker, if no more data) StrCmp $G_CIL_TEMP "/end" end_of_locked_list ! StrCmp $G_CIL_EXE "" 0 skip_result ! Pop $G_CIL_EXE ; get the "path to executable" result Goto skip_window_caption --- 1233,1241 ---- Pop $G_CIL_TEMP ; get "process ID" (or "/end" marker, if no more data) StrCmp $G_CIL_TEMP "/end" end_of_locked_list ! StrCmp $G_CIL_FLAG "" 0 skip_result ! Call ${UN}PFI_GetCompleteFPN ! Pop $G_CIL_TEMP ; get the full "path to executable" ! StrCmp $G_CIL_TEMP "$G_CIL_PATH\$G_CIL_FILE" 0 skip_window_caption ! StrCpy $G_CIL_FLAG $G_CIL_TEMP Goto skip_window_caption *************** *** 1240,1250 **** skip_window_caption: Pop $G_CIL_TEMP ; ignore the "window caption" result ! goto get_search_result ! ! nothing_to_report: ! StrCpy $G_CIL_EXE "" end_of_locked_list: ! Push $G_CIL_EXE Goto exit --- 1245,1255 ---- skip_window_caption: Pop $G_CIL_TEMP ; ignore the "window caption" result ! Goto get_search_result end_of_locked_list: ! Goto get_exe_path ! ! list_exhausted: ! Push $G_CIL_FLAG Goto exit *************** *** 1256,1274 **** loop: ! Pop $G_CIL_EXE ! StrCmp $G_CIL_EXE "${C_EXE_END_MARKER}" allread StrCmp $G_CIL_FLAG "" 0 loop ! IfFileExists "$G_CIL_EXE" 0 loop ! SetFileAttributes "$G_CIL_EXE" NORMAL ClearErrors ! FileOpen $G_CIL_FILE "$G_CIL_EXE" a FileClose $G_CIL_FILE IfErrors 0 loop ! StrCpy $G_CIL_FLAG "$G_CIL_EXE" Goto loop allread: ! StrCpy $G_CIL_EXE $G_CIL_FLAG ! Push $G_CIL_EXE exit: --- 1261,1278 ---- loop: ! Pop $G_CIL_PATH ! StrCmp $G_CIL_PATH "${C_EXE_END_MARKER}" allread StrCmp $G_CIL_FLAG "" 0 loop ! IfFileExists "$G_CIL_PATH" 0 loop ! SetFileAttributes "$G_CIL_PATH" NORMAL ClearErrors ! FileOpen $G_CIL_FILE "$G_CIL_PATH" a FileClose $G_CIL_FILE IfErrors 0 loop ! StrCpy $G_CIL_FLAG "$G_CIL_PATH" Goto loop allread: ! Push $G_CIL_FLAG exit: *************** *** 1508,1511 **** --- 1512,1516 ---- Call ${UN}PFI_CheckIfLocked Pop ${L_RESULT} + DetailPrint "${UN}PFI_CheckIfLocked returned '${L_RESULT}'" Pop ${L_PATH} *************** *** 1639,1643 **** !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN --- 1644,1648 ---- !macroend ! !ifdef ADDUSER | DBSTATUS | INSTALLER | MONITORCC | RESTORE #-------------------------------------------------------------------------- # Installer Function: PFI_GetCompleteFPN *************** *** 1649,1660 **** !endif ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_GetCompleteFPN ! # ! # This function is used during the uninstall process ! #-------------------------------------------------------------------------- ! ! ;!insertmacro PFI_GetCompleteFPN "un." #-------------------------------------------------------------------------- --- 1654,1666 ---- !endif ! !ifdef ADDUSER | INSTALLER ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_GetCompleteFPN ! # ! # This function is used during the uninstall process ! #-------------------------------------------------------------------------- + !insertmacro PFI_GetCompleteFPN "un." + !endif #-------------------------------------------------------------------------- Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -C2 -d -r1.4.2.12 -r1.4.2.13 *** installer-Uninstall.nsh 18 Oct 2007 01:39:05 -0000 1.4.2.12 --- installer-Uninstall.nsh 20 Oct 2007 13:02:07 -0000 1.4.2.13 *************** *** 599,603 **** ; The program files we are about to remove are in use so we need to shut POPFile down ! DetailPrint "Use UAC plugin to call 'un.Shutdown_POPFile' function" GetFunctionAddress ${L_TEMP} un.Shutdown_POPFile --- 599,603 ---- ; The program files we are about to remove are in use so we need to shut POPFile down ! DetailPrint "Use UAC plugin to call 'un.Shutdown_POPFile' function (${L_TEMP})" GetFunctionAddress ${L_TEMP} un.Shutdown_POPFile |
|
From: naoki i. <am...@us...> - 2007-10-20 06:51:24
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11318/languages Modified Files: Tag: b0_22_2 Japanese-pfi.nsh Log Message: Minor fix for Japanese translation Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.9 retrieving revision 1.54.4.10 diff -C2 -d -r1.54.4.9 -r1.54.4.10 *** Japanese-pfi.nsh 19 Oct 2007 16:00:22 -0000 1.54.4.9 --- Japanese-pfi.nsh 20 Oct 2007 06:51:25 -0000 1.54.4.10 *************** *** 368,372 **** ; 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µ½èµÜ·)" --- 368,372 ---- ; 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µ½èµÜ·)" *************** *** 382,391 **** ; 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ͱÌtH_ÉCXg[³êÄ¢é POPFile ÉR|[lgðÇÁµÜ·BR|[lgðIðµÈ¨·êÍAßé{^ðNbNµÄ¾³¢B $_CLICK" ; Text shown above the box showing the folder where the extra components will be installed --- 382,391 ---- ; 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ÍȺÌtH_ÉCXg[³êÄ¢é POPFile ÉR|[lgðÇÁµÜ·BR|[lgðIðµÈ¨·êÍAßé{^ðNbNµÄ¾³¢B $_CLICK" ; Text shown above the box showing the folder where the extra components will be installed |
|
From: naoki i. <am...@us...> - 2007-10-19 16:00:19
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13099/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.8 retrieving revision 1.54.4.9 diff -C2 -d -r1.54.4.8 -r1.54.4.9 *** Japanese-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.54.4.8 --- Japanese-pfi.nsh 19 Oct 2007 16:00:22 -0000 1.54.4.9 *************** *** 387,391 **** ; 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 --- 387,391 ---- ; Text explaining what this page shows ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_DIR_EXPLANATION "ZbgAbvͱÌtH_ÉCXg[³êÄ¢é POPFile ÉR|[lgðÇÁµÜ·BR|[lgðIðµÈ¨·êÍAßé{^ðNbNµÄ¾³¢B $_CLICK" ; Text shown above the box showing the folder where the extra components will be installed *************** *** 431,436 **** ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### --- 431,436 ---- ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "$(^NameDA) R|[lgÌÇÁ^íEBU[hÌI¹" ! !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "®¹ ðNbNµÄ±ÌEBU[hð¶ľ³¢B" ########################################################################### *************** *** 538,542 **** !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,542 ---- !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[ðÝéÉÍAuvOÌÇÁÆívÌ${MB_NL}${MB_NL}POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC} ÌÚðgpµÄ¾³¢" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Japanese-parser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Attic/Japanese-parser.nsh,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** Japanese-parser.nsh 16 Oct 2007 15:56:42 -0000 1.1.2.3 --- Japanese-parser.nsh 19 Oct 2007 16:00:22 -0000 1.1.2.4 *************** *** 87,91 **** ; 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µÄ¾³¢" #-------------------------------------------------------------------------- --- 87,91 ---- ; Message shown if unable to download and install the MeCab files) ! !define C_NPLS_REPEATMECAB "MeCab Ìt@CðCXg[ūܹñŵ½!${MB_NL}${MB_NL}ÄxCXg[ðÝéÉÍAuvOÌÇÁÆívÌ${MB_NL}${MB_NL}POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC} ÌÚðgpµÄ¾³¢" #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-18 02:03:02
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23027 Modified Files: Tag: b0_22_2 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 support for the uninstaller's new FINISH page. If the SSL download fails we no longer try to quote the program's name. Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Swedish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 --- Swedish-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.59.4.5 retrieving revision 1.59.4.6 diff -C2 -d -r1.59.4.5 -r1.59.4.6 *** PortugueseBR-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.59.4.5 --- PortugueseBR-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.59.4.6 *************** *** 427,430 **** --- 427,437 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Você quer remover todos os arquivos da sua pasta do POPFile ?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(Se você tiver qualquer coisa que você criou e quer manter, clique Não)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." + ########################################################################### ########################################################################### Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.44.4.5 retrieving revision 1.44.4.6 diff -C2 -d -r1.44.4.5 -r1.44.4.6 *** TradChinese-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.44.4.5 --- TradChinese-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.44.4.6 *************** *** 421,424 **** --- 421,430 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 526,530 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 532,536 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.48.4.5 retrieving revision 1.48.4.6 diff -C2 -d -r1.48.4.5 -r1.48.4.6 *** Spanish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.48.4.5 --- Spanish-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.48.4.6 *************** *** 427,430 **** --- 427,437 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "¿Quiere eliminar todos los archivos en su carpeta de POPFile?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(Si quiere guardar algo que usted haya creado, haga clic en No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." + ########################################################################### ########################################################################### *************** *** 531,535 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 538,542 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** SimpChinese-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 --- SimpChinese-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.43.4.6 *************** *** 421,424 **** --- 421,430 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 526,530 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 532,536 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Slovak-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 --- Slovak-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Russian-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.43.4.5 --- Russian-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Ukrainian-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.43.4.5 --- Ukrainian-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Turkish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Turkish-pfi.nsh,v retrieving revision 1.32.4.5 retrieving revision 1.32.4.6 diff -C2 -d -r1.32.4.5 -r1.32.4.6 *** Turkish-pfi.nsh 14 Oct 2007 17:42:57 -0000 1.32.4.5 --- Turkish-pfi.nsh 18 Oct 2007 02:03:02 -0000 1.32.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:53:39
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21011 Modified Files: Tag: b0_22_2 German-pfi.nsh Greek-pfi.nsh Hungarian-pfi.nsh Italian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Norwegian-pfi.nsh Polish-pfi.nsh Portuguese-pfi.nsh Log Message: Add support for the uninstaller's new FINISH page. If the SSL download fails we no longer try to quote the program's name. Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.54.4.7 retrieving revision 1.54.4.8 diff -C2 -d -r1.54.4.7 -r1.54.4.8 *** Japanese-pfi.nsh 16 Oct 2007 15:56:42 -0000 1.54.4.7 --- Japanese-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.54.4.8 *************** *** 427,430 **** --- 427,436 ---- !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)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.48.4.5 retrieving revision 1.48.4.6 diff -C2 -d -r1.48.4.5 -r1.48.4.6 *** German-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.48.4.5 --- German-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.48.4.6 *************** *** 429,432 **** --- 429,438 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Wollen Sie alle Dateien im POPFile-Verzeichnis löschen?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(Wenn Sie irgendetwas erstellt haben, was sie behalten möchten, wählen Sie Nein)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 534,538 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 540,544 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Norwegian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Norwegian-pfi.nsh,v retrieving revision 1.29.4.5 retrieving revision 1.29.4.6 diff -C2 -d -r1.29.4.5 -r1.29.4.6 *** Norwegian-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.29.4.5 --- Norwegian-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.29.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.44.4.5 retrieving revision 1.44.4.6 diff -C2 -d -r1.44.4.5 -r1.44.4.6 *** Korean-pfi.nsh 14 Oct 2007 17:34:25 -0000 1.44.4.5 --- Korean-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.44.4.6 *************** *** 427,430 **** --- 427,436 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "POPFile µð·ºÅ丮ÀÇ ¸ðµç ÆÄÀÏÀ» Á¦°ÅÇϽðڽÀ´Ï±î?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(Á÷Á¢ »ý¼ºÇϽŠÆÄÀÏÀÌ ÀÖ°í, º¸Á¸ÇÏ°í ½ÍÀ¸½Ã¸é '¾Æ´Ï¿À'¸¦ Ŭ¸¯ÇϽʽÿÀ" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 532,536 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 538,542 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Portuguese-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.43.4.5 --- Portuguese-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Italian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Italian-pfi.nsh,v retrieving revision 1.33.4.5 retrieving revision 1.33.4.6 diff -C2 -d -r1.33.4.5 -r1.33.4.6 *** Italian-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.33.4.5 --- Italian-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.33.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Hungarian-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.43.4.5 --- Hungarian-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Polish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Polish-pfi.nsh,v retrieving revision 1.36.4.5 retrieving revision 1.36.4.6 diff -C2 -d -r1.36.4.5 -r1.36.4.6 *** Polish-pfi.nsh 14 Oct 2007 17:42:56 -0000 1.36.4.5 --- Polish-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.36.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Greek-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Greek-pfi.nsh,v retrieving revision 1.35.4.5 retrieving revision 1.35.4.6 diff -C2 -d -r1.35.4.5 -r1.35.4.6 *** Greek-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.35.4.5 --- Greek-pfi.nsh 18 Oct 2007 01:53:40 -0000 1.35.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:47:34
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18997 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 Finnish-pfi.nsh French-pfi.nsh Log Message: Add support for the uninstaller's new FINISH page. If the SSL download fails we no longer try to quote the program's name. Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Danish-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 --- Danish-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Czech-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Czech-pfi.nsh,v retrieving revision 1.38.4.5 retrieving revision 1.38.4.6 diff -C2 -d -r1.38.4.5 -r1.38.4.6 *** Czech-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.38.4.5 --- Czech-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.38.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.45.4.5 retrieving revision 1.45.4.6 diff -C2 -d -r1.45.4.5 -r1.45.4.6 *** French-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.45.4.5 --- French-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.45.4.6 *************** *** 427,430 **** --- 427,436 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Voulez-vous supprimer tous les fichiers de votre répertoire de POPFile ?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(S'il contient quoi que ce soit que vous avez créé et désirez conserver, cliquez 'Non')" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 532,536 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 538,542 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.45.4.5 retrieving revision 1.45.4.6 diff -C2 -d -r1.45.4.5 -r1.45.4.6 *** English-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.45.4.5 --- English-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.45.4.6 *************** *** 412,415 **** --- 412,421 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 517,521 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 523,527 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Catalan-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Catalan-pfi.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 *** Catalan-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.1.2.6 --- Catalan-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.1.2.7 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Finnish-pfi.nsh 14 Oct 2007 17:34:24 -0000 1.43.4.5 --- Finnish-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Dutch-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 --- Dutch-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.43.4.5 retrieving revision 1.43.4.6 diff -C2 -d -r1.43.4.5 -r1.43.4.6 *** Bulgarian-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.43.4.5 --- Bulgarian-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.43.4.6 *************** *** 417,420 **** --- 417,426 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "Do you want to remove all files in your POPFile directory?${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(If you have anything you created that you want to keep, click No)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." ########################################################################### *************** *** 522,526 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 528,532 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: Arabic-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Arabic-pfi.nsh,v retrieving revision 1.16.4.5 retrieving revision 1.16.4.6 diff -C2 -d -r1.16.4.5 -r1.16.4.6 *** Arabic-pfi.nsh 14 Oct 2007 17:29:42 -0000 1.16.4.5 --- Arabic-pfi.nsh 18 Oct 2007 01:47:36 -0000 1.16.4.6 *************** *** 427,430 **** --- 427,437 ---- !insertmacro PFI_LANG_STRING PFI_LANG_UN_MBREMDIR_1 "åá ÊÑíÏ ÍÐÝ ßá ÇáãáÝÇÊ Ýí ãÌáÏ POPFile¿${MB_NL}${MB_NL}$G_ROOTDIR${MB_NL}${MB_NL}(ÅÐÇ ßÇä åäÇß ÃÔíÇÁ ÊÍÊÇÌåÇ¡ ÅÖÛØ áÇ)" + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ; POPFile Installer: Standard MUI Page - UNPAGE_FINISH [installer.nsi] + ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TITLE "Completing the $(^NameDA) Component Add/Remove Wizard" + !insertmacro PFI_LANG_STRING PFI_LANG_UN_FINISH_TEXT "Click Finish to close this wizard." + ########################################################################### ########################################################################### *************** *** 531,535 **** !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later, run the command${MB_NL}${MB_NL}$G_PLS_FIELD_1 /SSL" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 538,542 ---- !insertmacro PFI_LANG_STRING PFI_LANG_MB_UNPACKFAIL "Error detected while installing files in $G_PLS_FIELD_1 folder" ! !insertmacro PFI_LANG_STRING PFI_LANG_MB_REPEATSSL "Unable to install the optional SSL files!${MB_NL}${MB_NL}To try again later use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:42:50
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18644 Modified Files: Tag: b0_22_2 English-parser.nsh Log Message: If the MeCab download fails we no longer try to quote the program's name. Index: English-parser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Attic/English-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 *** English-parser.nsh 14 Oct 2007 17:26:07 -0000 1.1.2.2 --- English-parser.nsh 18 Oct 2007 01:42:50 -0000 1.1.2.3 *************** *** 87,91 **** ; 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" #-------------------------------------------------------------------------- --- 87,91 ---- ; 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 use the 'Add/Remove Programs' entry${MB_NL}${MB_NL}for POPFile ${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}${C_POPFILE_RC}" #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:41:56
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17851 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: Updated to cope with the uninstaller's /MODIFY option which now saves a log file. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.10 retrieving revision 1.53.4.11 diff -C2 -d -r1.53.4.10 -r1.53.4.11 *** pfi-library.nsh 14 Oct 2007 17:24:20 -0000 1.53.4.10 --- pfi-library.nsh 18 Oct 2007 01:41:58 -0000 1.53.4.11 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.4" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.5" #-------------------------------------------------------------------------- *************** *** 1432,1442 **** !endif ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_DumpLog ! # ! # This function is used during the uninstall process ! #-------------------------------------------------------------------------- ! ;!insertmacro PFI_DumpLog "un." --- 1432,1444 ---- !endif ! !ifdef INSTALLER ! #-------------------------------------------------------------------------- ! # Uninstaller Function: un.PFI_DumpLog ! # ! # This function is used during the uninstall process ! #-------------------------------------------------------------------------- ! !insertmacro PFI_DumpLog "un." ! !endif *************** *** 2378,2382 **** !endif ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_GetDateTimeStamp --- 2380,2384 ---- !endif ! !ifdef ADDUSER | INSTALLER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_GetDateTimeStamp *************** *** 2575,2579 **** !endif ! !ifdef ADDUSER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_GetLocalTime --- 2577,2581 ---- !endif ! !ifdef ADDUSER | INSTALLER #-------------------------------------------------------------------------- # Uninstaller Function: un.PFI_GetLocalTime |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:40:23
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17420 Modified Files: Tag: b0_22_2 installer.nsi Log Message: The uninstaller now has a FINISH page. Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.14 retrieving revision 1.242.4.15 diff -C2 -d -r1.242.4.14 -r1.242.4.15 *** installer.nsi 14 Oct 2007 17:19:41 -0000 1.242.4.14 --- installer.nsi 18 Oct 2007 01:40:24 -0000 1.242.4.15 *************** *** 531,536 **** !define MUI_WELCOMEFINISHPAGE_BITMAP "special.bmp" ;---------------------------------------------------------------- ! ; Interface Settings - Installer FINISH Page Interface Settings ;---------------------------------------------------------------- --- 531,538 ---- !define MUI_WELCOMEFINISHPAGE_BITMAP "special.bmp" + !define MUI_UNWELCOMEFINISHPAGE_BITMAP "special.bmp" + ;---------------------------------------------------------------- ! ; Interface Settings - Installer/Uninstaller FINISH Page Interface Settings ;---------------------------------------------------------------- *************** *** 539,542 **** --- 541,546 ---- !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_UNFINISHPAGE_NOAUTOCLOSE + ;---------------------------------------------------------------- ; Interface Settings - Abort Warning Settings *************** *** 777,780 **** --- 781,802 ---- !insertmacro MUI_UNPAGE_INSTFILES + ;--------------------------------------------------- + ; Uninstaller Page - FINISH + ;--------------------------------------------------- + + ; Override the standard "Uninstall complete" text + + !define MUI_FINISHPAGE_TITLE "$(PFI_LANG_UN_FINISH_TITLE)" + !define MUI_FINISHPAGE_TEXT "$(PFI_LANG_UN_FINISH_TEXT)" + !define MUI_FINISHPAGE_TITLE_3LINES + + ; If we need a reboot then we might have been modifying the installation + ; so override the standard "reboot to complete the uninstall" text + ; (Quick fix: this is less confusing than having the wrong text on an uninstall) + + !define MUI_FINISHPAGE_TEXT_REBOOT "$(MUI_TEXT_FINISH_INFO_REBOOT)" + + !insertmacro MUI_UNPAGE_FINISH + #-------------------------------------------------------------------------- # Language Support for the installer and uninstaller *************** *** 810,814 **** !else !include "languages\Japanese-parser.nsh" - # !include "languages\English-parser.nsh" !endif --- 832,835 ---- *************** *** 867,870 **** --- 888,892 ---- ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" ReserveFile "${NSISDIR}\Plugins\System.dll" + ReserveFile "${NSISDIR}\Plugins\UAC.dll" ReserveFile "${NSISDIR}\Plugins\untgz.dll" ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" *************** *** 873,876 **** --- 895,899 ---- ReserveFile "ioG.ini" ReserveFile "ioP.ini" + ReserveFile "ioUM.ini" ReserveFile "${C_RELEASE_NOTES}" ReserveFile "${C_POPFILE_MAJOR_VERSION}.${C_POPFILE_MINOR_VERSION}.${C_POPFILE_REVISION}.pcf" |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:39:07
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17064 Modified Files: Tag: b0_22_2 installer-Uninstall.nsh Log Message: Rearrange the code to get rid of the annoying "verifying" banner seen every time the uninstaller starts up. Save a log file when the /MODIFY option is used. Correct the bug in the code that removes the Uninstall data from the registry. Display component descriptions when /MODIFY option is used. Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.11 retrieving revision 1.4.2.12 diff -C2 -d -r1.4.2.11 -r1.4.2.12 *** installer-Uninstall.nsh 14 Oct 2007 17:19:41 -0000 1.4.2.11 --- installer-Uninstall.nsh 18 Oct 2007 01:39:05 -0000 1.4.2.12 *************** *** 113,116 **** --- 113,179 ---- #-------------------------------------------------------------------------- + # 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.OnUninstFailed (required by UAC plugin) #-------------------------------------------------------------------------- *************** *** 359,368 **** # # (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) --- 422,433 ---- # # (1) un.Uninstall Begin - requests confirmation if appropriate ! # (2) un.StartLog - generates a log showing the actions performed ! # (3) un.Shutdown POPFile - shutdown POPFile if necessary (to avoid the need to reboot) ! # (4) un.AddSSLSupport - downloads and installs the SSL support files ! # (5) un.Nihongo Parser - offers a choice of 3 parsers (Kakasi, MeCab and internal) ! # (6) un.Kakasi - installs Kakasi package and creates its environment variables ! # (7) un.MeCab - downloads and installs MeCab package and its environment variables ! # (8) un.Internal - installs support for the internal parser ! # (9) un.StopLog - saves the log file (up to 3 previous versions retained) # # Note: Only one of the three Nihongo parsers can be added at a time (re-run to add more) *************** *** 373,388 **** # # (1) un.Uninstall Begin - requests confirmation if appropriate ! # (2) un.Local User Data - looks for and removes 'User Data' from the PROGRAM folder ! # (3) un.Shutdown POPFile - shutdown POPFile if necessary (to avoid the need to reboot) ! # (4) un.Start Menu Entries - remove StartUp shortcuts and Start Menu entries ! # (5) un.POPFile Core - uninstall POPFile PROGRAM files ! # (6) un.Skins - uninstall POPFile skins ! # (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) # #-------------------------------------------------------------------------- --- 438,454 ---- # # (1) un.Uninstall Begin - requests confirmation if appropriate ! # (2) un.StartLog - generates a log showing the actions performed ! # (3) un.Local User Data - looks for and removes 'User Data' from the PROGRAM folder ! # (4) un.Shutdown POPFile - shutdown POPFile if necessary (to avoid the need to reboot) ! # (5) un.Start Menu Entries - remove StartUp shortcuts and Start Menu entries ! # (6) un.POPFile Core - uninstall POPFile PROGRAM files ! # (7) un.Skins - uninstall POPFile skins ! # (8) un.Languages - uninstall POPFile UI languages ! # (9) un.QuickStart Guide - uninstall POPFile English QuickStart Guide ! # (10) un.Remove Kakasi - uninstall Kakasi package and remove its environment variables ! # (11) un.Remove MeCab - uninstall MeCab package and remove its environment variables ! # (12) un.Minimal Perl - uninstall minimal Perl, including all of the optional modules ! # (13) un.Registry Entries - remove 'Add/Remove Program' data and other registry entries ! # (14) un.Uninstall End - remove remaining files/folders (if it is safe to do so) # #-------------------------------------------------------------------------- *************** *** 401,404 **** --- 467,472 ---- ; (use the UAC plugin in case this was a non-admin user) + DetailPrint "Use UAC plugin to get the 'real' user data" + GetFunctionAddress ${L_TEMP} un.Uninstall_Begin UAC::ExecCodeSegment ${L_TEMP} *************** *** 411,414 **** --- 479,508 ---- #-------------------------------------------------------------------------- + # Uninstaller Section: 'un.StartLog' (this must be the second section) + # + # Creates the log header with information about this run of the uninstaller + #-------------------------------------------------------------------------- + + Section "-un.StartLog" + + SetDetailsPrint listonly + + DetailPrint "------------------------------------------------------------" + DetailPrint "$(^Name) v${C_PFI_VERSION} Uninstaller Log" + DetailPrint "------------------------------------------------------------" + DetailPrint "Command-line: $CMDLINE" + DetailPrint "$$INSTDIR : $INSTDIR" + DetailPrint "User Details: $G_WINUSERNAME ($G_WINUSERTYPE)" + DetailPrint "PFI Language: $LANGUAGE" + DetailPrint "------------------------------------------------------------" + Call un.PFI_GetDateTimeStamp + Pop $G_PLS_FIELD_1 + DetailPrint "Uninstaller started $G_PLS_FIELD_1" + DetailPrint "------------------------------------------------------------" + DetailPrint "" + + SectionEnd + + #-------------------------------------------------------------------------- # Uninstaller Section: 'un.Local User Data' # *************** *** 505,508 **** --- 599,604 ---- ; The program files we are about to remove are in use so we need to shut POPFile down + DetailPrint "Use UAC plugin to call 'un.Shutdown_POPFile' function" + GetFunctionAddress ${L_TEMP} un.Shutdown_POPFile UAC::ExecCodeSegment ${L_TEMP} *************** *** 521,524 **** --- 617,621 ---- DetailPrint " " SetDetailsPrint listonly + DetailPrint "" Pop ${L_TEMP} *************** *** 1026,1030 **** ReadRegStr ${L_REGDATA} HKCU \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString" ! StrCmp ${L_REGDATA} "$G_ROOTDIR\uninstall.exe" 0 section_exit DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" Goto section_exit --- 1123,1127 ---- ReadRegStr ${L_REGDATA} HKCU \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString" ! StrCmp ${L_REGDATA} '"$G_ROOTDIR\uninstall.exe" /UNINSTALL' 0 section_exit DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" Goto section_exit *************** *** 1033,1037 **** ReadRegStr ${L_REGDATA} HKLM \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString" ! StrCmp ${L_REGDATA} "$G_ROOTDIR\uninstall.exe" 0 other_reg_data DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" --- 1130,1134 ---- ReadRegStr ${L_REGDATA} HKLM \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString" ! StrCmp ${L_REGDATA} '"$G_ROOTDIR\uninstall.exe" /UNINSTALL' 0 other_reg_data DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" *************** *** 1057,1061 **** #-------------------------------------------------------------------------- ! # Uninstaller Section: 'un.Uninstall End' (this is the final section in the uninstaller) # # Used to terminate the uninstaller - offers to remove any files/folders left behind. --- 1154,1158 ---- #-------------------------------------------------------------------------- ! # Uninstaller Section: 'un.Uninstall End' (this is the penultimate section in the uninstaller) # # Used to terminate the uninstaller - offers to remove any files/folders left behind. *************** *** 1068,1071 **** --- 1165,1170 ---- StrCmp $G_UNINST_MODE "change" skip_section + Delete "$G_ROOTDIR\modify.log.*" + Delete "$G_ROOTDIR\modify.log" Delete "$G_ROOTDIR\install.log.*" Delete "$G_ROOTDIR\install.log" *************** *** 1099,1164 **** #-------------------------------------------------------------------------- ! # 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 #-------------------------------------------------------------------------- --- 1198,1240 ---- #-------------------------------------------------------------------------- ! # Uninstaller Section: StopLog (this must be the very last section) # ! # Finishes the log file and saves it (making backups of up to 3 previous logs) #-------------------------------------------------------------------------- ! Section "-un.StopLog" ! StrCmp $G_UNINST_MODE "uninstall" skip_section ! SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_PROG_SAVELOG)" ! SetDetailsPrint listonly ! Call un.PFI_GetDateTimeStamp ! Pop $G_PLS_FIELD_1 ! DetailPrint "------------------------------------------------------------" ! DetailPrint "Uninstaller (/MODIFY mode) finished $G_PLS_FIELD_1" ! DetailPrint "------------------------------------------------------------" ! ; Save a log showing what was installed ! !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR" "modify.log" ! Push "$G_ROOTDIR\modify.log" ! Call un.PFI_DumpLog ! DetailPrint "Log report saved in '$G_ROOTDIR\modify.log'" ! SetDetailsPrint textonly ! DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" ! SetDetailsPrint listonly ! skip_Section: ! SectionEnd ! #-------------------------------------------------------------------------- ! # Component-selection page descriptions ! #-------------------------------------------------------------------------- + !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecSSL} $(DESC_SecSSL) + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecParser} "${C_NPLS_DESC_SecParser}" + !insertmacro MUI_UNFUNCTION_DESCRIPTION_END #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:38:04
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16709 Modified Files: Tag: b0_22_2 installer-SecPOPFile-func.nsh Log Message: Correct a minor typo. Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** installer-SecPOPFile-func.nsh 14 Oct 2007 17:19:41 -0000 1.1.2.7 --- installer-SecPOPFile-func.nsh 18 Oct 2007 01:38:07 -0000 1.1.2.8 *************** *** 380,384 **** ; 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 --- 380,384 ---- ; The program files we are about to update are in use so we need to shut POPFile down ! DetailPrint "... one of them is locked." ; Attempt to discover which POPFile UI port is used by the current user, so we can issue |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:37:35
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16686 Modified Files: Tag: b0_22_2 installer-SecPOPFile-body.nsh Log Message: Add some extra logging information. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.10 retrieving revision 1.3.2.11 diff -C2 -d -r1.3.2.10 -r1.3.2.11 *** installer-SecPOPFile-body.nsh 14 Oct 2007 17:20:33 -0000 1.3.2.10 --- installer-SecPOPFile-body.nsh 18 Oct 2007 01:37:38 -0000 1.3.2.11 *************** *** 129,132 **** --- 129,134 ---- ; If we are installing over a previous version, ensure that version is not running + DetailPrint "Use UAC plugin to call 'MakeRootDirSafe' function" + GetFunctionAddress ${L_TEMP} MakeRootDirSafe UAC::ExecCodeSegment ${L_TEMP} |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:36:40
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16332 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Use the new URL for the Patch Control File. If the download fails do not try to quote the program's name, just refer to the "Add/Remove Programs" list. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.17 retrieving revision 1.6.2.18 diff -C2 -d -r1.6.2.17 -r1.6.2.18 *** getssl.nsh 14 Oct 2007 17:22:52 -0000 1.6.2.17 --- getssl.nsh 18 Oct 2007 01:36:42 -0000 1.6.2.18 *************** *** 157,164 **** #-------------------------------------------------------------------------- ! ; Temporarily use the "downloads" directory on the project's "new" server: ! ! !define C_PATCH_WEBSITE "http://h1212143.stratoserver.net/downloads" ! ;; !define C_PATCH_WEBSITE "http://getpopfile.org/ssl-patch" --- 157,164 ---- #-------------------------------------------------------------------------- ! ; Temporarily use the "anonymous" URL for the project's new server: ! ! !define C_PATCH_WEBSITE "http://h1212143.stratoserver.net/installer/ssl-patch" ! ;; !define C_PATCH_WEBSITE "http://getpopfile.org/ssl-patch" *************** *** 493,507 **** !ifdef INSTALLER 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 "$(PFI_LANG_MB_REPEATSSL)" - - Pop $R1 Goto exit !else --- 493,498 ---- !ifdef INSTALLER installer_error_exit: ! StrCpy $G_PLS_FIELD_1 "(undefined)" MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)" Goto exit !else *************** *** 1296,1300 **** #-------------------------------------------------------------------------- ! # Code block to be used when installing POPFile (i.e. used in setup.exe) #-------------------------------------------------------------------------- --- 1287,1291 ---- #-------------------------------------------------------------------------- ! # Code block to be used when modifying POPFile (i.e. used in uninstaller.exe) #-------------------------------------------------------------------------- |
|
From: Brian S. <xue...@us...> - 2007-10-18 01:35:52
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15973 Modified Files: Tag: b0_22_2 getparser.nsh Log Message: Use the new URL for the MeCab parser files. Stop installing minimal Perl packages when using the uninstaller's /MODIFY option (this reduces the size of the installer by around 800 KB). Install minimal Perl packages even if the MeCab download fails (oops!). If registry has the previous Nihongo parser setting, use it as the default setting for the "Choose Nihongo Parser" page. When uninstalling stop asking the user to select a parser (oops!). If the download fails do not try to quote the program's name, just refer to the "Add/Remove Programs" list. Index: getparser.nsh =================================================================== RCS file: /cvsroot/popfile/windows/Attic/getparser.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 *** getparser.nsh 14 Oct 2007 17:21:48 -0000 1.1.2.1 --- getparser.nsh 18 Oct 2007 01:35:50 -0000 1.1.2.2 *************** *** 98,108 **** #-------------------------------------------------------------------------- ! ; 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" #-------------------------------------------------------------------------- --- 98,108 ---- #-------------------------------------------------------------------------- ! ; Temporarily use the "anonymous" URL of the project's new server: ! !define C_NPD_MECAB_PERL "http://h1212143.stratoserver.net/installer/nihongo/mecab/MeCab.tar.gz" ! !define C_NPD_MECAB_DICT "http://h1212143.stratoserver.net/installer/nihongo/mecab/mecab-ipadic.zip" ! ! ;; !define C_NPD_MECAB_PERL "http://getpopfile.org/installer/nihongo/mecab/MeCab.tar.gz" ! ;; !define C_NPD_MECAB_DICT "http://getpopfile.org/installer/nihongo/mecab/mecab-ipadic.zip" #-------------------------------------------------------------------------- *************** *** 179,182 **** --- 179,233 ---- #-------------------------------------------------------------------------- + # Macro: NIHONGO_PERL_SUPPORT + # + # When processing 'Nihongo' (i.e. Japanese) text POPFile needs some Perl + # packages which are not part of the basic minimal Perl. All three parsers + # are assumed to have similar Perl requirements so we install more or less + # the same extra Perl packages for each parser (hence this macro). + # + # In order to keep the size of the uninstaller down (and thus reduce the + # overall size of the installer) we only install these extra Perl packages + # when _installing_ POPFile. When the uninstaller is used to _change_ the + # selected Nihongo parser an error message asking the user to re-run the + # installer is shown if it looks like these extra Perl packages are missing + # from the existing installation. + #-------------------------------------------------------------------------- + + !macro NIHONGO_PERL_SUPPORT PARSER + + !if '${UN}' != 'un.' + + ;-------------------------------------------------------------------------- + ; Install Perl modules: base.pm, bytes.pm, the Encode collection and, + ; if relevant, Text::Kakasi (the requirement for bytes_heavy.pl was + ; added when the minimal Perl was updated to use ActivePerl 5.8.7) + ;-------------------------------------------------------------------------- + + 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\*" + + !endif + + !if '${PARSER}' == 'kakasi' + 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\*" + !endif + + !macroend + + + #-------------------------------------------------------------------------- # Macro: SECTION_KAKASI # *************** *** 244,248 **** 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 --- 295,299 ---- Call ${UN}PFI_IsNT Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} "0" update_minPerl ; Running on a non-Win9x system so we ensure the Kakasi environment variables *************** *** 258,291 **** 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} --- 309,326 ---- System::Call 'Kernel32::SetEnvironmentVariableA(t, t) \ i("KANWADICTPATH", "$G_ROOTDIR\kakasi\share\kakasi\kanwadict").r0' ! StrCmp ${L_RESERVED} 0 0 update_minPerl MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_CONVERT_ENVNOTSET) (KANWADICTPATH)" ! update_minPerl: ! !insertmacro NIHONGO_PERL_SUPPORT "kakasi" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" + DetailPrint "" + DetailPrint "'NihongoParser' setting in registry (HKLM) updated to '$G_PARSER'" + + SetDetailsPrint textonly + DetailPrint "" + DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" + SetDetailsPrint listonly Pop ${L_RESERVED} *************** *** 345,348 **** --- 380,390 ---- Push ${L_LISTSIZE} + ; Install the necessary extra Perl packages required by the MeCab parser. If there is a + ; problem downloading or installing the MeCab parser then POPFile will automatically + ; use the internal parser instead. Since the internal parser requires the same set of + ; extra Perl packages, we install them now in order to keep the MeCab install code simple. + + !insertmacro NIHONGO_PERL_SUPPORT "mecab" + ; 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 *************** *** 405,420 **** 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 --- 447,452 ---- installer_error_exit: ! StrCpy $G_PLS_FIELD_1 "(undefined)" MessageBox MB_OK|MB_ICONEXCLAMATION "${C_NPLS_REPEATMECAB}" Goto exit *************** *** 454,458 **** 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 --- 486,490 ---- Call ${UN}PFI_IsNT Pop ${L_RESERVED} ! StrCmp ${L_RESERVED} "0" set_parser_in_registry ; Running on a non-Win9x system so we ensure the MeCab environment variable *************** *** 462,490 **** 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 --- 494,508 ---- System::Call 'Kernel32::SetEnvironmentVariableA(t, t) \ i("MECABRC", "$G_ROOTDIR\mecab\etc\mecabrc").r0' ! StrCmp ${L_RESERVED} 0 0 set_parser_in_registry MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_CONVERT_ENVNOTSET) (MECABRC)" ! set_parser_in_registry: WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" + DetailPrint "" + DetailPrint "'NihongoParser' setting in registry (HKLM) updated to '$G_PARSER'" exit: SetDetailsPrint textonly + DetailPrint "" DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly *************** *** 533,562 **** !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 --- 551,568 ---- !insertmacro SECTIONLOG_ENTER "Internal Parser" StrCmp $G_PARSER "internal" 0 do_nothing SetDetailsPrint textonly ! DetailPrint "Internal parser selected" SetDetailsPrint listonly ! !insertmacro NIHONGO_PERL_SUPPORT "internal" WriteRegStr HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" "$G_PARSER" + DetailPrint "" + DetailPrint "'NihongoParser' setting in registry (HKLM) updated to '$G_PARSER'" SetDetailsPrint textonly + DetailPrint "" DetailPrint "$(PFI_LANG_INST_PROG_ENDSEC)" SetDetailsPrint listonly *************** *** 670,676 **** # 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 --- 676,683 ---- # three parser sections are disabled (i.e. unselected so nothing gets installed). # ! # For a clean installation the default parser is 'Kakasi', as used by POPFile ! # 0.22.5 and earlier releases. If, however, a previous Nihongo parser selection ! # is found in the registry it will be used as the default when initialising the ! # "Choose Nihongo Parser" page's radiobuttons. # # Note that the 'Nihongo Parser' section is _always_ executed, even if the user *************** *** 678,682 **** # # 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 --- 685,690 ---- # # Note also that when an English-only build of the installer or uninstaller is ! # used then 'Nihongo Parser' must appear in the COMPONENTS page otherwise there ! # would be no way to install a Nihongo parser. # # This macro makes maintenance easier by ensuring that both processes use identical *************** *** 687,721 **** 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 --- 695,741 ---- Function ${UN}ShowOrHideNihongoParser ! ; Reset (clear) all parser selection data ! !insertmacro UnselectSection ${${UN}SecKakasi} ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 1" "State" "0" ! !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" ! !ifndef ENGLISH_MODE ! StrCmp $LANGUAGE ${LANG_JAPANESE} select_default_parser ! StrCpy $G_PARSER "" ; Do not install a Nihongo parser ! SectionSetText ${${UN}SecParser} "" ; This makes the component invisible ! Goto exit + select_default_parser: !endif + ; Use the most recently installed Nihongo parser as the default selection (if possible) + + ReadRegStr $G_PARSER HKLM "Software\POPFile Project\${C_PFI_PRODUCT}\MRI" "NihongoParser" + StrCmp $G_PARSER "mecab" mecab + StrCmp $G_PARSER "internal" internal + + ; Use 'Kakasi' as the default selection + StrCpy $G_PARSER "kakasi" !insertmacro SelectSection ${${UN}SecKakasi} !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 1" "State" "1" + Goto exit ! mecab: ! !insertmacro SelectSection ${${UN}SecMeCab} ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 2" "State" "1" ! Goto exit ! internal: ! !insertmacro SelectSection ${${UN}SecInternalParser} ! !insertmacro MUI_INSTALLOPTIONS_WRITE "ioP.ini" "Field 3" "State" "1" + exit: FunctionEnd !macroend *************** *** 740,743 **** --- 760,766 ---- !macro FUNCTION_CHOOSEPARSER UN Function ${UN}ChooseParser + !if '${UN}' == 'un.' + StrCmp $G_UNINST_MODE "uninstall" exit + !endif !ifndef ENGLISH_MODE |
11 messages has been excluded from this view by a project administrator.
