[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r4092: replace privoxy with polipo in the vidalia-bundles (in vidalia/trunk/pkg/win32: . templates)
Author: phobos
Date: 2009-08-30 21:45:12 -0400 (Sun, 30 Aug 2009)
New Revision: 4092
Modified:
vidalia/trunk/pkg/win32/CMakeLists.txt
vidalia/trunk/pkg/win32/build-bundle-installer.txt
vidalia/trunk/pkg/win32/templates/vidalia.pot
vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
replace privoxy with polipo in the vidalia-bundles
Modified: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt 2009-08-30 03:10:07 UTC (rev 4091)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt 2009-08-31 01:45:12 UTC (rev 4092)
@@ -22,15 +22,15 @@
endif(NOT OPENSSL_BINARY_DIR)
endif(USE_QSSLSOCKET)
-## Only configure the bundle installer if paths to Tor, Privoxy, and
+## Only configure the bundle installer if paths to Tor, Polipo, and
## Torbutton are specified
set(CONFIGURE_BUNDLE_NSI TRUE)
if (NOT TOR_PACKAGE_DIR)
set(CONFIGURE_BUNDLE_NSI FALSE)
endif(NOT TOR_PACKAGE_DIR)
-if (NOT PRIVOXY_PACKAGE_DIR)
+if (NOT POLIPO_PACKAGE_DIR)
set(CONFIGURE_BUNDLE_NSI FALSE)
-endif(NOT PRIVOXY_PACKAGE_DIR)
+endif(NOT POLIPO_PACKAGE_DIR)
if (NOT TORBUTTON_PACKAGE_DIR)
set(CONFIGURE_BUNDLE_NSI FALSE)
endif(NOT TORBUTTON_PACKAGE_DIR)
Modified: vidalia/trunk/pkg/win32/build-bundle-installer.txt
===================================================================
--- vidalia/trunk/pkg/win32/build-bundle-installer.txt 2009-08-30 03:10:07 UTC (rev 4091)
+++ vidalia/trunk/pkg/win32/build-bundle-installer.txt 2009-08-31 01:45:12 UTC (rev 4092)
@@ -1,4 +1,4 @@
- Building the Vidalia/Tor/Privoxy/Torbutton Bundle
+ Building the Vidalia/Tor/Polipo/Torbutton Bundle
1. Create a base directory under which the necessary sources will be extracted
@@ -13,22 +13,22 @@
2. Create directories for each component in the bundle.
- C:\bundle\privoxy\
+ C:\bundle\polipo\
C:\bundle\tor\
C:\bundle\vidalia\
C:\bundle\torbutton\
3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION,
-PRIVOXY_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
+POLIPO_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
4. Create directories for the appropriate versions of each component.
- C:\bundle\privoxy\3.0.6\
- C:\bundle\tor\0.2.0.29-rc\
- C:\bundle\vidalia\0.1.6\
- C:\bundle\torbutton\1.2.0rc6\
+ C:\bundle\polipo\1.0.4\
+ C:\bundle\tor\0.2.1.19\
+ C:\bundle\vidalia\0.2.3\
+ C:\bundle\torbutton\1.2.2\
-5. Install Vidalia, Tor, and Privoxy to the directories you created for them
+5. Install Vidalia, Tor, and Polipo to the directories you created for them
in Step 4. Remember that you may need to grab the torrc.sample file from
%APPDATA%\Tor that was created by Tor's installer and place it in the directory
for the bundle's version of Tor. You may also need to grab
@@ -39,26 +39,8 @@
6. Place the Torbutton Firefox extension (.xpi) and license file (LICENSE) in
the directory you created for it in Step 4.
-7. Modify Privoxy's config.txt file as follows:
+7. Place the polipo.conf into the polipo directory you created in Step 4.
- * Add "forward-socks4a / localhost:9050 ." (without quotes) to the top
- * Comment out "logfile privoxy.log" in Section 1.5
- * Comment out "jarfile jar.log" in Section 1.6
- * Uncomment "log-messages 1" in Section 6 and change the '1' to a '0'
- * Modify the values of enable-remote-toggle, enable-remote-http-toggle,
- and enable-edit-actions to be '0'. (Sections 4.3, 4.4, and 4.5)
-
- Also modify Privoxy's default.action as follows:
-
- * Replace the line that says "-limit-connect \" with "+limit-connect{1-} \"
-
- A privoxy.config and default.action with the necessary changes are included
- in Vidalia's pkg/win32/ directory. If you use the privoxy.config from
- Vidalia's pkg/win32/ directory, you will need to rename the file to
- config.txt after copying it to Privoxy's directory. Vidalia's default.action
- file only needs to be copied to Privoxy's directory; you do not need to
- rename it.
-
8. Run the vidalia-bundle.nsi script. The bundle will be named according the
the versions you specified in Step 4 and placed in the base directory created
in Step 1.
@@ -67,5 +49,5 @@
For each additional release of some component of the bundle, follow Steps 4-8.
If the version of some component didn't change, you can skip its step. For
-example, if the version of Privoxy didn't change then you can skip Step 7.
+example, if the version of polipo didn't change then you can skip Step 7.
Modified: vidalia/trunk/pkg/win32/templates/vidalia.pot
===================================================================
--- vidalia/trunk/pkg/win32/templates/vidalia.pot 2009-08-30 03:10:07 UTC (rev 4091)
+++ vidalia/trunk/pkg/win32/templates/vidalia.pot 2009-08-31 01:45:12 UTC (rev 4092)
@@ -16,7 +16,16 @@
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid "This wizard will guide you through the installation of Tor,
+Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the
+Internet anonymously, helping you anonymize Web browsing and publishing,
+instant messaging, IRC, and more. Vidalia is a GUI that helps you
+control, monitor, and configure Tor.\n\nPolipo is a caching web proxy
+that helps increase performance of browsing the web through
+Tor.\n\nTorbutton is a Firefox extension that allows you to quickly
+enable or disable anonymous web browsing.\n\nIf you have previously
+installed Tor, Vidalia, Polipo, or Firefox, please make sure they are
+not running before continuing this installation.\n\n$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -115,32 +124,32 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
@@ -203,4 +212,4 @@
"\n\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
-msgstr ""
\ No newline at end of file
+msgstr ""
Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2009-08-30 03:10:07 UTC (rev 4091)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2009-08-31 01:45:12 UTC (rev 4092)
@@ -27,13 +27,13 @@
!define TOR_APPVERSION "0.2.1.19"
!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
-!define PRIVOXY_NAME "Privoxy"
-!define PRIVOXY_EXEC "privoxy.exe"
-!define PRIVOXY_APPVERSION "3.0.6"
-!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
+!define POLIPO_NAME "Polipo"
+!define POLIPO_EXEC "polipo.exe"
+!define POLIPO_APPVERSION "1.0.4"
+!define POLIPO_DESC "${POLIPO_NAME} ${POLIPO_APPVERSION}"
!define TORBUTTON_NAME "Torbutton"
-!define TORBUTTON_APPVERSION "1.2.1-fx"
+!define TORBUTTON_APPVERSION "1.2.2-fx"
!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
!define BUNDLE_NAME "Vidalia Bundle"
@@ -201,7 +201,11 @@
Pop $R0 ; contains the modified version of $INSTDIR
WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable "$R0\\Polipo\\${POLIPO_EXEC}"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments "$R0\\Polipo\\polipo.conf"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart "true"
+
; Write the uninstall keys for Windows
SetShellVarContext all
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
@@ -330,71 +334,49 @@
;--------------------------------
-; Privoxy
-var bInstallPrivoxy
-SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
+; Polipo
+var bInstallPolipo
+SectionGroup "${POLIPO_DESC}" PolipoGroup
;--------------------------------
- ; Privoxy application binaries
- Section "${PRIVOXY_NAME}" Privoxy
+ ; Polipo application binaries
+ Section "${POLIPO_NAME}" Polipo
SectionIn 1 2
; add files / whatever that need to be installed here.
- SetOutPath "$INSTDIR\Privoxy"
- File /r /x @PRIVOXY_PACKAGE_DIR@\config.txt @PRIVOXY_PACKAGE_DIR@\*.*
- File /nonfatal /oname=config.original @PRIVOXY_PACKAGE_DIR@\config.txt
- File /oname=config.txt @Vidalia_SOURCE_DIR@\pkg\win32\privoxy.config
+ SetOutPath "$INSTDIR\Polipo"
+ File /r /x @POLIPO_PACKAGE_DIR@\polipo.conf @POLIPO_PACKAGE_DIR@\*.*
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
-
; Write the installation path into the registry
- WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
+ WriteRegStr HKCU SOFTWARE\Polipo "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "DisplayName" "${POLIPO_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoRepair" 1
- IntOp $bInstallPrivoxy 0 + 1
+ IntOp $bInstallPolipo 0 + 1
SectionEnd
;--------------------------------
- ; Privoxy Start menu shortcuts
- Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
+ ; Polipo Start menu shortcuts
+ Section "$(PolipoShortcuts)" PolipoShortcuts
SectionIn 1
SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- RMDir /r "${SHORTCUTS}\Privoxy"
- CreateDirectory "${SHORTCUTS}\Privoxy"
- CreateShortCut "${SHORTCUTS}\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
- CreateShortCut "${SHORTCUTS}\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
- WriteINIStr "${SHORTCUTS}\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
+ RMDir /r "${SHORTCUTS}\Polipo"
+ CreateDirectory "${SHORTCUTS}\Polipo"
+ CreateShortCut "${SHORTCUTS}\Polipo\Polipo.lnk" "$INSTDIR\Polipo\polipo.exe"
+ CreateShortCut "${SHORTCUTS}\Polipo\Web-based Feedback.lnk" "$INSTDIR\Polipo\doc\user-manual\contact.html"
- CreateDirectory "${SHORTCUTS}\Privoxy\Edit Config"
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
+ CreateDirectory "${SHORTCUTS}\Polipo\Edit Config"
+ CreateShortCut "${SHORTCUTS}\Polipo\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Polipo\polipo.conf"'
- CreateDirectory "${SHORTCUTS}\Privoxy\Documentation"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
- CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
- WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
+ CreateDirectory "${SHORTCUTS}\Polipo\Documentation"
+ CreateShortCut "${SHORTCUTS}\Polipo\Documentation\User Manual.lnk" "$INSTDIR\Polipo\doc\user-manual\index.html"
+ WriteINIStr "$SMPROGRAMS\Polipo\Documentation\Web Site.url" "InternetShortcut" "URL" "http://www.pps.jussieu.fr/~jch/software/polipo/";
CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
SectionEnd
- ;--------------------------------
- ; Run Privoxy at startup
- Section "$(PrivoxyStartup)" PrivoxyStartup
- SectionIn 1
- CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
- SectionEnd
SectionGroupEnd
;--------------------------------
@@ -481,18 +463,18 @@
IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
run_vidalia:
Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- goto check_privoxy
+ goto check_polipo
check_tor:
- IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
+ IntCmp $bInstallTor 1 run_tor check_polipo check_polipo
run_tor:
Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
- check_privoxy:
- IntCmp $bInstallPrivoxy 1 run_privoxy done done
- run_privoxy:
- SetOutPath "$INSTDIR\Privoxy"
- ExecShell "" '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"' "" SW_SHOWMINIMIZED
+ check_polipo:
+ IntCmp $bInstallPolipo 1 run_polipo done done
+ run_polipo:
+ SetOutPath "$INSTDIR\Polipo"
+ ExecShell "" '"$INSTDIR\Polipo\${POLIPO_EXEC}"' "" SW_SHOWMINIMIZED
done:
FunctionEnd
@@ -531,16 +513,11 @@
SectionEnd
SectionGroupEnd
-Section "un.Privoxy ${PRIVOXY_APPVERSION}" UninstallPrivoxy
+Section "un.Polipo ${POLIPO_APPVERSION}" UninstallPolipo
SetShellVarContext all
- RMDir /r "$INSTDIR\Privoxy"
- RMDir /r "${SHORTCUTS}\Privoxy"
- Delete "$SMSTARTUP\Privoxy.lnk"
- DeleteRegKey HKEY_CLASSES_ROOT ".action"
- DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyActionFile"
- DeleteRegKey HKEY_CLASSES_ROOT ".filter"
- DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyFilterFile"
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy"
+ RMDir /r "$INSTDIR\Polipo"
+ RMDir /r "${SHORTCUTS}\Polipo"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Polipo"
SectionEnd
; XXX: We still need to find a way to actually remove Torbutton from Firefox
@@ -571,16 +548,16 @@
SectionSetFlags ${UninstallVidalia} $0
CheckVidaliaAppData:
- IfFileExists "$APPDATA\Vidalia\*.*" CheckPrivoxy
+ IfFileExists "$APPDATA\Vidalia\*.*" CheckPolipo
SectionGetFlags ${UninstallVidaliaAppData} $0
IntOp $0 $0 & ${SECTION_OFF}
SectionSetFlags ${UninstallVidaliaAppData} $0
- CheckPrivoxy:
- IfFileExists "$INSTDIR\Privoxy\*.*" Done
- SectionGetFlags ${UninstallPrivoxy} $0
+ CheckPolipo:
+ IfFileExists "$INSTDIR\Polipo\*.*" Done
+ SectionGetFlags ${UninstallPolipo} $0
IntOp $0 $0 & ${SECTION_OFF}
- SectionSetFlags ${UninstallPrivoxy} $0
+ SectionSetFlags ${UninstallPolipo} $0
Done:
FunctionEnd
@@ -589,7 +566,7 @@
SetShellVarContext all
IfFileExists "$INSTDIR\Tor\*.*" DontRemoveTheUninstaller
IfFileExists "$INSTDIR\Vidalia\*.*" DontRemoveTheUninstaller
- IfFileExists "$INSTDIR\Privoxy\*.*" DontRemoveTheUninstaller
+ IfFileExists "$INSTDIR\Polipo\*.*" DontRemoveTheUninstaller
RMDir /r "$INSTDIR"
RMDir /r "${SHORTCUTS}"
DontRemoveTheUninstaller:
@@ -606,10 +583,10 @@
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${Polipo} "$(PolipoAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoGroup} "$(PolipoGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoStartup} "$(PolipoStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoShortcuts} "$(PolipoShortcutsDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
@@ -621,7 +598,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallTorAppData} "$(AppDataUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} "$(AppDataUninstDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPrivoxy} "$(PrivoxyUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPolipo} "$(PolipoUninstDesc)"
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END