[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2668: "We should start putting polipo in the win32 bundle instead (in vidalia: . trunk/pkg/win32)
Author: edmanm
Date: 2008-06-04 20:00:16 -0400 (Wed, 04 Jun 2008)
New Revision: 2668
Modified:
vidalia/
vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
vidalia/trunk/pkg/win32/vidalia_cs.nsh
vidalia/trunk/pkg/win32/vidalia_de.nsh
vidalia/trunk/pkg/win32/vidalia_en.nsh
vidalia/trunk/pkg/win32/vidalia_es.nsh
vidalia/trunk/pkg/win32/vidalia_fa.nsh
vidalia/trunk/pkg/win32/vidalia_fi.nsh
vidalia/trunk/pkg/win32/vidalia_fr.nsh
vidalia/trunk/pkg/win32/vidalia_he.nsh
vidalia/trunk/pkg/win32/vidalia_it.nsh
vidalia/trunk/pkg/win32/vidalia_nl.nsh
vidalia/trunk/pkg/win32/vidalia_pl.nsh
vidalia/trunk/pkg/win32/vidalia_pt-br.nsh
vidalia/trunk/pkg/win32/vidalia_ru.nsh
vidalia/trunk/pkg/win32/vidalia_sv.nsh
vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh
vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh
Log:
r469@thebe: edmanm | 2008-06-04 20:00:54 -0400
"We should start putting polipo in the win32 bundle instead of Privoxy."
*polipo goes in bundle*
"ZOMG there's a polipo in the bundle! Revert! Revert!"
Property changes on: vidalia
___________________________________________________________________
svk:merge ticket from /local/vidalia [r469] on 45a62a8a-8088-484c-baad-c7b3e776dd32
Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in 2008-06-05 00:00:16 UTC (rev 2668)
@@ -27,10 +27,10 @@
!define TOR_APPVERSION "0.2.0.23-rc"
!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
-!define POLIPO_NAME "Polipo"
-!define POLIPO_EXEC "polipo.exe"
-!define POLIPO_APPVERSION "1.0.4.0"
-!define POLIPO_DESC "${POLIPO_NAME} ${POLIPO_APPVERSION}"
+!define PRIVOXY_NAME "Privoxy"
+!define PRIVOXY_EXEC "privoxy.exe"
+!define PRIVOXY_APPVERSION "3.0.6"
+!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
!define TORBUTTON_NAME "Torbutton"
!define TORBUTTON_APPVERSION "1.1.17-alpha"
@@ -82,7 +82,7 @@
!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
-!define MUI_FINISHPAGE_LINK_LOCATION "https://www.torproject.org/docs/tor-doc-win32.html";
+!define MUI_FINISHPAGE_LINK_LOCATION "http://tor.eff.org/docs/tor-doc-win32.html";
;--------------------------------
; Pages
@@ -165,7 +165,6 @@
File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-GPLV3"
File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-OPENSSL"
File "Vidalia\${VIDALIA_APPVERSION}\CREDITS"
- WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net/";
; Include a prebuilt GeoIP cache
SetShellVarContext current
@@ -213,6 +212,8 @@
CreateDirectory "${SHORTCUTS}"
CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
CreateShortCut "${SHORTCUTS}\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
+
+ WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net";
CreateShortCut "${SHORTCUTS}\Vidalia Website.lnk" "$INSTDIR\Vidalia\Vidalia Website.url"
SectionEnd
@@ -239,7 +240,7 @@
SetOutPath "$INSTDIR\Tor"
File "tor\${TOR_APPVERSION}\tor.exe"
File "tor\${TOR_APPVERSION}\tor-resolve.exe"
- WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "https://torproject.org/";
+ WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
; If the user is also installing Vidalia, then don't confuse them by
; an extra torrc in %APPDATA%\Tor
@@ -319,64 +320,69 @@
;--------------------------------
-; Polipo
-var bInstallPolipo
-SectionGroup "${POLIPO_DESC}" PolipoGroup
+; Privoxy
+var bInstallPrivoxy
+SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
;--------------------------------
- ; Polipo application binaries
- Section "${POLIPO_NAME}" Polipo
+ ; Privoxy application binaries
+ Section "${PRIVOXY_NAME}" Privoxy
SectionIn 1 2
; add files / whatever that need to be installed here.
- SetOutPath "$INSTDIR\Polipo"
- File Polipo\${POLIPO_APPVERSION}\polipo.exe
- File Polipo\${POLIPO_APPVERSION}\config
- File Polipo\${POLIPO_APPVERSION}\CHANGES
- File Polipo\${POLIPO_APPVERSION}\COPYING
- File Polipo\${POLIPO_APPVERSION}\README.Windows
- WriteINIStr "$SMPROGRAMS\Polipo\Polipo Website.url" "InternetShortcut" "URL" "http://www.pps.jussieu.fr/~jch/software/polipo/";
+ SetOutPath "$INSTDIR\Privoxy"
+ File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
+ 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"
+
; Write the uninstall keys for Windows
- 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
-
- ; If the user is installing Vidalia, then update its torrc to remember where Polipo is installed
- SetShellVarContext current
- SectionGetFlags ${Vidalia} $0
- IntOp $0 $0 & ${SF_SELECTED}
- IntCmp $0 ${SF_SELECTED} write_polipo_location skip skip
- write_polipo_location:
- Push $INSTDIR
- Push "\"
- Push "\\"
- Call StrRep
- Pop $R0 ; contains the modified version of $INSTDIR
- WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable "$R0\\Polipo\\${POLIPO_EXEC}"
- WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments "-c, $R0\\Polipo\\config"
- WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart "true"
- skip:
-
- IntOp $bInstallPolipo 0 + 1
+ 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
+
+ IntOp $bInstallPrivoxy 0 + 1
SectionEnd
;--------------------------------
- ; Polipo Start menu shortcuts
- Section "$(PolipoShortcuts)" PolipoShortcuts
+ ; Privoxy Start menu shortcuts
+ Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
SectionIn 1
SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- RMDir /r "${SHORTCUTS}\Polipo"
- CreateDirectory "${SHORTCUTS}\Polipo"
- CreateShortCut "${SHORTCUTS}\Polipo\Polipo.lnk" "$INSTDIR\Polipo\polipo.exe" "-c config"
- CreateShortCut "${SHORTCUTS}\Polipo\Configuration.lnk" "Notepad.exe" '"$INSTDIR\Polipo\config"'
- CreateShortCut "${SHORTCUTS}\Polipo\Polipo Website.lnk" "$INSTDIR\Polipo\Polipo Website.url"
+ 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/";
+
+ 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}\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/";
+
CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
-
- CreateDirectory "${SHORTCUTS}\Polipo\Documentation"
- CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Changelog.lnk" "Notepad.exe" '"$INSTDIR\Polipo\CHANGES"'
- CreateShortCut "${SHORTCUTS}\Polipo\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Polipo\COPYING"'
- CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Readme.lnk" "Notepad.exe" '"$INSTDIR\Polipo\README.Windows"'
SectionEnd
+
+ ;--------------------------------
+ ; Run Privoxy at startup
+ Section "$(PrivoxyStartup)" PrivoxyStartup
+ SectionIn 1
+ CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
+ SectionEnd
SectionGroupEnd
;--------------------------------
@@ -433,19 +439,18 @@
IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
run_vidalia:
Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- goto done
+ goto check_privoxy
check_tor:
- IntCmp $bInstallTor 1 run_tor check_polipo check_polipo
+ IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
run_tor:
Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
-
- check_polipo:
- IntCmp $bInstallPolipo 1 run_polipo done done
- run_polipo:
+
+ check_privoxy:
+ IntCmp $bInstallPrivoxy 1 run_privoxy done done
+ run_privoxy:
SetOutPath "$INSTDIR\Privoxy"
- Exec '"$INSTDIR\Polipo\${POLIPO_EXEC}" -c config'
-
+ ExecShell "" '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"' "" SW_SHOWMINIMIZED
done:
FunctionEnd
@@ -484,11 +489,16 @@
SectionEnd
SectionGroupEnd
-Section "un.Polipo ${POLIPO_APPVERSION}" UninstallPolipo
+Section "un.Privoxy ${PRIVOXY_APPVERSION}" UninstallPrivoxy
SetShellVarContext all
- RMDir /r "$INSTDIR\Polipo"
- RMDir /r "${SHORTCUTS}\Polipo"
- DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Polipo"
+ 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"
SectionEnd
; XXX: We still need to find a way to actually remove Torbutton from Firefox
@@ -519,16 +529,16 @@
SectionSetFlags ${UninstallVidalia} $0
CheckVidaliaAppData:
- IfFileExists "$APPDATA\Vidalia\*.*" CheckPolipo
+ IfFileExists "$APPDATA\Vidalia\*.*" CheckPrivoxy
SectionGetFlags ${UninstallVidaliaAppData} $0
IntOp $0 $0 & ${SECTION_OFF}
SectionSetFlags ${UninstallVidaliaAppData} $0
- CheckPolipo:
- IfFileExists "$INSTDIR\Polipo\*.*" Done
- SectionGetFlags ${UninstallPolipo} $0
+ CheckPrivoxy:
+ IfFileExists "$INSTDIR\Privoxy\*.*" Done
+ SectionGetFlags ${UninstallPrivoxy} $0
IntOp $0 $0 & ${SECTION_OFF}
- SectionSetFlags ${UninstallPolipo} $0
+ SectionSetFlags ${UninstallPrivoxy} $0
Done:
FunctionEnd
@@ -537,7 +547,7 @@
SetShellVarContext all
IfFileExists "$INSTDIR\Tor\*.*" DontRemoveTheUninstaller
IfFileExists "$INSTDIR\Vidalia\*.*" DontRemoveTheUninstaller
- IfFileExists "$INSTDIR\Polipo\*.*" DontRemoveTheUninstaller
+ IfFileExists "$INSTDIR\Privoxy\*.*" DontRemoveTheUninstaller
RMDir /r "$INSTDIR"
RMDir /r "${SHORTCUTS}"
DontRemoveTheUninstaller:
@@ -554,9 +564,10 @@
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${Polipo} "$(PolipoAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PolipoGroup} "$(PolipoGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PolipoShortcuts} "$(PolipoShortcutsDesc)"
+ !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 ${Torbutton} "$(TorbuttonAppDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
@@ -568,7 +579,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallTorAppData} "$(AppDataUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} "$(AppDataUninstDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPolipo} "$(PolipoUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPrivoxy} "$(PrivoxyUninstDesc)"
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
Modified: vidalia/trunk/pkg/win32/vidalia_cs.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_cs.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_cs.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_CZECH} "${BUNDLE_NAME} nastaveni"
-LangString BundleWelcomeText ${LANG_CZECH} "Tento dialog vas provede instalaci a nastavenim Polipo a Torbutton.\r\n\r\nTor je system pro anonymni pouzivani Internetu, pomaha anonymne serfovat a publikovat na Webu, IM a IRC komunikaci a dalsi. Vidalia je GUI ktere ti pomuze kontrolovat, monitorovat a konfigurovat Tor.\r\n\r\nPolipo je filtrovaci web proxy ktera chrani tvoje soukromi a pomaha odstranovat reklamu, banery a pop up okna.\r\n\r\nTorbutton je rozsireni pro Firefox umoznujici rychle zapinani nebo vypinani anonym serfovani.\r\n\r\nIf Tor, Vidalia, Polipo nebo Firefox bezi, pred zahajenim instalace se ujisti, ze nejsou aktivni.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_CZECH} "Tento dialog vas provede instalaci a nastavenim Privoxy a Torbutton.\r\n\r\nTor je system pro anonymni pouzivani Internetu, pomaha anonymne serfovat a publikovat na Webu, IM a IRC komunikaci a dalsi. Vidalia je GUI ktere ti pomuze kontrolovat, monitorovat a konfigurovat Tor.\r\n\r\nPrivoxy je filtrovaci web proxy ktera chrani tvoje soukromi a pomaha odstranovat reklamu, banery a pop up okna.\r\n\r\nTorbutton je rozsireni pro Firefox umoznujici rychle zapinani nebo vypinani anonym serfovani.\r\n\r\nIf Tor, Vidalia, Privoxy nebo Firefox bezi, pred zahajenim instalace se ujisti, ze nejsou aktivni.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_CZECH} "Vitejte v ${BUNDLE_NAME} Pruvodce nastavenim"
LangString BundleLinkText ${LANG_CZECH} "${TOR_NAME} instalacni dokumentace"
LangString BundleFinishText ${LANG_CZECH} "Instalace je kompletni.\r\nPodivejte se na http://tor.eff.org/docs/tor-doc-win32.html jak konfigurovat aplikace pro pouziti s Tor.\r\n\r\nIf Torbutton isntalovan, je potreba restartovat Firefox."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_CZECH} "Vlozit do menu Start"
LangString TorShortcutsDesc ${LANG_CZECH} "Vlozit ${TOR_NAME} do nabidky Start."
-; Polipo
-LangString PolipoGroupDesc ${LANG_CZECH} "Polipo je filtrovaci web proxy chranici vase soukromi. Pomaha odstranovat reklamu, banery a pop up okna."
-LangString PolipoUninstDesc ${LANG_CZECH} "Odstranit ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_CZECH} "Instalovat ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_CZECH} "Vlozit do nabidky start"
-LangString PolipoShortcutsDesc ${LANG_CZECH} "Vlozit ${POLIPO_NAME} do nabidky Start."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_CZECH} "Privoxy je filtrovaci web proxy chranici vase soukromi. Pomaha odstranovat reklamu, banery a pop up okna."
+LangString PrivoxyUninstDesc ${LANG_CZECH} "Odstranit ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_CZECH} "Instalovat ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_CZECH} "Vlozit do nabidky start"
+LangString PrivoxyShortcutsDesc ${LANG_CZECH} "Vlozit ${PRIVOXY_NAME} do nabidky Start."
+LangString PrivoxyStartup ${LANG_CZECH} "Spust pri startu"
+LangString PrivoxyStartupDesc ${LANG_CZECH} "Automaticky spustit ${PRIVOXY_NAME} pri startu."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_CZECH} "Torbutton je rozsireni pro Firefox umoznujici rychle zapnuti nebo vypnuti anonymniho serfovani."
Modified: vidalia/trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_de.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_de.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -5,7 +5,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_GERMAN} "${BUNDLE_NAME} Setup"
-LangString BundleWelcomeText ${LANG_GERMAN} "Dieser Assistent f�ie durch die Installation von:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPolipo\t${POLIPO_APPVERSION}\r\n\r\nSollten Sie Tor, Vidalia oder Polipo bereits installiert haben, beenden Sie diese Programme bitte bevor Sie fortfahren.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_GERMAN} "Dieser Assistent f�ie durch die Installation von:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nSollten Sie Tor, Vidalia oder Privoxy bereits installiert haben, beenden Sie diese Programme bitte bevor Sie fortfahren.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_GERMAN} "Willkommen beim ${BUNDLE_NAME} Installations-Assistent"
LangString BundleLinkText ${LANG_GERMAN} "${TOR_NAME} Installations-Dokumentation"
LangString BundleFinishText ${LANG_GERMAN} "Die Installation wird abgeschlossen.\r\nBitte besuchen Sie http://tor.eff.org/docs/tor-doc-win32.html um zu erfahren, wie Sie Ihre Anwendungen zur Benutzung mit Tor einrichten k�n.\r\n"
@@ -38,12 +38,14 @@
LangString TorShortcutsDesc ${LANG_GERMAN} "${TOR_NAME} zu Ihrem Startmen�uf�
-; Polipo
-LangString PolipoGroupDesc ${LANG_GERMAN} "Polipo ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatph� zu sch�und Werbung, Banner und Popups entfernt."
-LangString PolipoUninstDesc ${LANG_GERMAN} "Entferne ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_GERMAN} "Installiere ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_GERMAN} "Zum Startmen�uf�-LangString PolipoShortcutsDesc ${LANG_GERMAN} "${POLIPO_NAME} zu Ihrem Startmen�uf�
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_GERMAN} "Privoxy ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatph� zu sch�und Werbung, Banner und Popups entfernt."
+LangString PrivoxyUninstDesc ${LANG_GERMAN} "Entferne ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_GERMAN} "Zum Startmen�uf�+LangString PrivoxyShortcutsDesc ${LANG_GERMAN} "${PRIVOXY_NAME} zu Ihrem Startmen�uf�
+LangString PrivoxyStartup ${LANG_GERMAN} "Beim Systemstart ausf�
+LangString PrivoxyStartupDesc ${LANG_GERMAN} "${PRIVOXY_NAME} beim Systemstart automatisch ausf�"
; Torbutton
LangString TorbuttonGroupDesc ${LANG_GERMAN} "Torbutton ist eine Erweiterung f�efox, die das schnelle An- und Ausschalten des anonymes Webbrowsens erm�cht."
Modified: vidalia/trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_en.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_en.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -26,7 +26,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_ENGLISH} "${BUNDLE_NAME} setup"
-LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\r\n\r\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.\r\n\r\nPolipo is a caching web proxy that helps make web browsing over Tor more responsive.\r\n\r\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\r\n\r\nIf you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\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.\r\n\r\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\r\n\r\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\r\n\r\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard"
LangString BundleLinkText ${LANG_ENGLISH} "${TOR_NAME} installation documentation"
LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n\r\nIf you installed Torbutton, you will need to restart Firefox."
@@ -56,12 +56,14 @@
LangString TorShortcuts ${LANG_ENGLISH} "Add to Start Menu"
LangString TorShortcutsDesc ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu."
-; Polipo
-LangString PolipoGroupDesc ${LANG_ENGLISH} "Polipo is a caching web proxy that helps make web browsing over Tor more responsive."
-LangString PolipoUninstDesc ${LANG_ENGLISH} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_ENGLISH} "Install ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_ENGLISH} "Add to Start Menu"
-LangString PolipoShortcutsDesc ${LANG_ENGLISH} "Add ${POLIPO_NAME} to your Start menu."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_ENGLISH} "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+LangString PrivoxyUninstDesc ${LANG_ENGLISH} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_ENGLISH} "Add to Start Menu"
+LangString PrivoxyShortcutsDesc ${LANG_ENGLISH} "Add ${PRIVOXY_NAME} to your Start menu."
+LangString PrivoxyStartup ${LANG_ENGLISH} "Run At Startup"
+LangString PrivoxyStartupDesc ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_ENGLISH} "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
Modified: vidalia/trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_es.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_es.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_SPANISH} "Instalaci�e ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a trav�de la instalaci�e Tor, Vidalia, Polipo, y Torbutton.\r\n\r\nSi ha instalado previamente Tor, Vidalia, Polipo, o Firefox, por favor aseg� que no se est�ejecutando antes de continuar esta instalaci�r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_SPANISH} "Este procedimiento le guiara a trav�de la instalaci�e Tor, Vidalia, Privoxy, y Torbutton.\r\n\r\nSi ha instalado previamente Tor, Vidalia, Privoxy, o Firefox, por favor aseg� que no se est�ejecutando antes de continuar esta instalaci�r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_SPANISH} "Bienvenido al procedimiento de instalaci�e ${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_SPANISH} "documentaci�e instalaci�e ${TOR_NAME}"
LangString BundleFinishText ${LANG_SPANISH} "La instalaci�a finalizado.\r\nPor favor vea http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar sus aplicaciones para que usen Tor.\r\n\r\nSi instalo Torbutton, necesitara reiniciar Firefox."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
LangString TorShortcutsDesc ${LANG_SPANISH} "Agregar ${TOR_NAME} a su Menu Inicio."
-; Polipo
-LangString PolipoGroupDesc ${LANG_SPANISH} "Instalar ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_SPANISH} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_SPANISH} "Instalar ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_SPANISH} "A�r al Menu Inicio"
-LangString PolipoShortcutsDesc ${LANG_SPANISH} "Agregar ${POLIPO_NAME} a su Menu Inicio."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_SPANISH} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_SPANISH} "A�r al Menu Inicio"
+LangString PrivoxyShortcutsDesc ${LANG_SPANISH} "Agregar ${PRIVOXY_NAME} a su Menu Inicio."
+LangString PrivoxyStartup ${LANG_SPANISH} "Ejecutar al iniciar sesi�
+LangString PrivoxyStartupDesc ${LANG_SPANISH} "Automaticamente ejecutar ${PRIVOXY_NAME} al iniciar sesi�
; Torbutton
LangString TorbuttonGroupDesc ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_fa.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fa.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_fa.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_FARSI} "��� � �� ��"
LangString TorShortcutsDesc ${LANG_FARSI} "��� ${TOR_NAME} � �� ��."
-; Polipo
-LangString PolipoGroupDesc ${LANG_FARSI} "?�?�� ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_FARSI} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_FARSI} "?�?�� ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_FARSI} "��� � �� ��"
-LangString PolipoShortcutsDesc ${LANG_FARSI} "��� ${POLIPO_NAME} � �� ��."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_FARSI} "?�?�� ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_FARSI} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_FARSI} "?�?�� ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_FARSI} "��� � �� ��"
+LangString PrivoxyShortcutsDesc ${LANG_FARSI} "��� ${PRIVOXY_NAME} � �� ��."
+LangString PrivoxyStartup ${LANG_FARSI} "��?�������"
+LangString PrivoxyStartupDesc ${LANG_FARSI} "�� ?��{PRIVOXY_NAME} � ���� �����."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_FARSI} "?�?�� ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fi.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_fi.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -7,9 +7,9 @@
; Bundle
LangString BundleSetupCaption ${LANG_FINNISH} "${BUNDLE_NAME}n asennus"
-LangString BundleWelcomeText ${LANG_FINNISH} "T� velho auttaa asentamaan koneelle Tor-ohjelman, Vidalian, Polipon ja Torbuttonin.\r\n\r\nTor on j�estelm�jolla voi k�t�Internetti�untemattosti tekem��nonyymiseksi sivujen selailun, pikaviestien k��IRCin k��a my�uiden. Vidalia on k�t�ttym�hjaamaan, seuraamaan ja s���Tor-ohjelman toimintaa.\r\n\r\nPolipo suodattava v�tyspalvelin, joka suojaa yksityisyytt�poistaa mainoksia, bannereita ja popup-ikkunoita.\r\n\r\nTorbutton on Mozilla Firefoxille lis�a, jolla voi ottaa k�t�tai poistaa k�� anonyymisen sivujen selailun.\r\n\r\nJos koneelle on jo asennettu Tor, kannattaa tarkistaa ettei ole p�l�idalia tai Polipo ennen kuin jatkaa asennusta.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_FINNISH} "T� velho auttaa asentaakseen koneelle Tor-ohjelman, Vidalian, Privoxyn ja Torbuttonin.\r\n\r\nTor on j�estelm�jolla voi k�t�Internetti�untemattosti tekem��nonyymiseksi sivujen selailun, pikaviestien k��IRCin k�t� muut. Vidalia on k�t�ttym�hjaamaan, seuraamaan ja s��� Tor-ohjelman toimintaa.\r\n\r\nPrivoxy suodattava v�tyspalvelin, joka suojaa yksityisyytt�a auttaa poistamalla mainoksia, bannereita ja popup-ikkunoita.\r\n\r\nTorbutton on Mozilla Firefoxille lis�a, jolla voi ottaa k�t�tai poistaa k�� anonyymisen sivujen selailun.\r\n\r\nJos koneelle on jo asennettu Tor, Vidalia tai Privoxy kannattaa tarkistaa ettei mik� niist�le p�l�nnen kuin asennusta jatkaa.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_FINNISH} "Tervetuloa ${BUNDLE_NAME}n asennukseen"
-LangString BundleLinkText ${LANG_FINNISH} "${TOR_NAME}-asennusohje"
+LangString BundleLinkText ${LANG_FINNISH} "${TOR_NAME}asennusohje"
LangString BundleFinishText ${LANG_FINNISH} "Asennus on valmis.\r\nOle hyv�a tutustu http://tor.eff.org/docs/tor-doc-win32.html -ohjesivuun oppiakseen kuinka voi asettaa ohjelmat k�t��Tor-ohjelmaa.\r\n\r\nJos Torbutton on asennettu, niin Firefox t�yy k�nist�uudelleen."
LangString BundleRunNow ${LANG_FINNISH} "K�nist�sennetut komponentit nyt"
@@ -40,12 +40,14 @@
LangString TorShortcutsDesc ${LANG_FINNISH} "Lis�${TOR_NAME} K�nist�alikkoon."
-; Polipo
-LangString PolipoGroupDesc ${LANG_FINNISH} "Polipo on suodattava v�tyspalvelin, joka suojaa yksityisyytt�a auttaa poistamaan mainoksia, bannereita ja popup-ikkunoita."
-LangString PolipoUninstDesc ${LANG_FINNISH} "Poista ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_FINNISH} "Asenna ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_FINNISH} "Lis�K�nist�alikkoon"
-LangString PolipoShortcutsDesc ${LANG_FINNISH} "Lis�${POLIPO_NAME} K�nist�alikkoon."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_FINNISH} "Privoxy suodattava v�tyspalvelin, joka suojaa yksityisyytt�a auttaa poistamalla mainoksia, bannereita ja popup-ikkunoita."
+LangString PrivoxyUninstDesc ${LANG_FINNISH} "Poista ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_FINNISH} "Asenna ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_FINNISH} "Lis�K�nist�alikkoon"
+LangString PrivoxyShortcutsDesc ${LANG_FINNISH} "Lis�${PRIVOXY_NAME} K�nist�alikkoon."
+LangString PrivoxyStartup ${LANG_FINNISH} "K�nist�indowssin k�nistyess�+LangString PrivoxyStartupDesc ${LANG_FINNISH} "K�nist�utomaattisesti ${PRIVOXY_NAME} Windowssin k�nistyess�
; Torbutton
LangString TorbuttonGroupDesc ${LANG_FINNISH} "Torbutton on Mozilla Firefoxille lis�a, jolla voi ottaa k�t�tai poistaa k�� anonyymisen sivujen selailun."
Modified: vidalia/trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fr.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_fr.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -1,21 +1,20 @@
;; $Id$
-;;
+;;
;; Vidalia installer and bundle French translation
-;;
+;;
; Bundle
LangString BundleSetupCaption ${LANG_FRENCH} "Mise �our de ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Polipo, et de Torbutton.\r\n\r\nSi vous avez d� install�or, Vidalia, Polipo, ou Firefox, assurez-vous qu'ils ne sont pas d�rr�avant de poursuivre l'installation.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Privoxy, et de Torbutton.\r\n\r\nSi vous avez d� install�or, Vidalia, Privoxy, ou Firefox, assurez-vous qu'ils ne sont pas d�rr�avant de poursuivre l'installation.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_FRENCH} "Documentation de l'installation de ${TOR_NAME}"
-LangString BundleFinishText ${LANG_FRENCH} "L'installation est termin�r\nConsultez la page http://tor.eff.org/docs/tor-doc-win32.html pour apprendre comment configurer vos applications avec Tor.\r\n\r\nSi vous venez d'installer Torbutton, vous devrez red�rrer Firefox."
+LangString BundleFinishText ${LANG_FRENCH} "L'installation est termin�\r\nConsultez la page http://tor.eff.org/docs/tor-doc-win32.html pour apprendre comment configurer vos applications avec Tor.\r\n\r\nSi vous venez d'installer Torbutton, vous devrez red�rrer Firefox."
LangString BundleRunNow ${LANG_FRENCH} "D�rrer les composants install�maintenant"
-
; Vidalia
LangString VidaliaGroupDesc ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
-LangString VidaliaUninstDesc ${LANG_FRENCH} "D�nstaller ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc ${LANG_FRENCH} "Remove ${VIDALIA_DESC}."
LangString VidaliaSetupCaption ${LANG_FRENCH} "Mise �our de ${VIDALIA_NAME}"
LangString VidaliaWelcomeText ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
LangString VidaliaWelcomeTitle ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${VIDALIA_NAME}"
@@ -27,10 +26,9 @@
LangString VidaliaShortcutsDesc ${LANG_FRENCH} "Ajouter ${VIDALIA_NAME} �otre Menu D�rrer."
LangString VidaliaRunNow ${LANG_FRENCH} "D�rrer ${VIDALIA_NAME} maintenant"
-
; Tor
LangString TorGroupDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
-LangString TorUninstDesc ${LANG_FRENCH} "D�nstaller ${TOR_DESC}."
+LangString TorUninstDesc ${LANG_FRENCH} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_FRENCH} "Vous avez d� un fichier de configuration de Tor.$\r$\nVoulez-vous le remplacer par le fichier de configuration par d�ut ?"
LangString TorDocumentation ${LANG_FRENCH} "Documentation"
@@ -38,24 +36,23 @@
LangString TorShortcuts ${LANG_FRENCH} "Ajouter au Menu D�rrer"
LangString TorShortcutsDesc ${LANG_FRENCH} "Ajouter ${TOR_NAME} �otre Menu D�rrer."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_FRENCH} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_FRENCH} "Ajouter au Menu D�rrer"
+LangString PrivoxyShortcutsDesc ${LANG_FRENCH} "Ajouter ${PRIVOXY_NAME} �otre Menu D�rrer."
+LangString PrivoxyStartup ${LANG_FRENCH} "Lancer au d�rrage"
+LangString PrivoxyStartupDesc ${LANG_FRENCH} "Lancer automatiquement ${PRIVOXY_NAME} au d�rrage."
-; Polipo
-LangString PolipoGroupDesc ${LANG_FRENCH} "Installer ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_FRENCH} "D�nstaller ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_FRENCH} "Installer ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_FRENCH} "Ajouter au Menu D�rrer"
-LangString PolipoShortcutsDesc ${LANG_FRENCH} "Ajouter ${POLIPO_NAME} �otre Menu D�rrer."
-
-
; Torbutton
LangString TorbuttonGroupDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
-LangString TorbuttonUninstDesc ${LANG_FRENCH} "D�nstaller ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc ${LANG_FRENCH} "Remove ${TORBUTTON_DESC}."
LangString TorbuttonAppDesc ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
LangString TorbuttonAddToFirefox ${LANG_FRENCH} "Ajouter �irefox"
LangString TorbuttonAddToFirefoxDesc ${LANG_FRENCH} "Ajouter l'extension ${TORBUTTON_DESC} �irefox."
LangString TorbuttonFirefoxNotFound ${LANG_FRENCH} "Firefox n'a pas � trouv�ur votre syst�. Torbutton ne sera pas install�
-
; Miscellaneous Strings
-LangString AppData ${LANG_FRENCH} "Donn� de l'application"
-LangString AppDataUninstDesc ${LANG_FRENCH} "D�nstaller les donn� de l'application et les fichiers de configuration."
+LangString AppData ${LANG_FRENCH} "Application Data"
+LangString AppDataUninstDesc ${LANG_FRENCH} "Remove saved application data and configuration files."
Modified: vidalia/trunk/pkg/win32/vidalia_he.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_he.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_he.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -10,7 +10,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_HEBREW} "��{BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_HEBREW} "� ���� � ��or, Vidalia, Polipo �orbutton.\r\n\r\nTor � ���� �� ����� ����������, IRC ��Vidalia � ��� ��, ��� Tor.\r\n\r\nPolipo � �� ��� ���� ���� ����\r\n\r\nTorbutton � ��Firefox �� ���� ���� ���n\r\n���or, Vidalia, Polipo �Firefox �������������r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_HEBREW} "� ���� � ��or, Vidalia, Privoxy �orbutton.\r\n\r\nTor � ���� �� ����� ����������, IRC ��Vidalia � ��� ��, ��� Tor.\r\n\r\nPrivoxy � �� ��� ���� ���� ����\r\n\r\nTorbutton � ��Firefox �� ���� ���� ���n\r\n���or, Vidalia, Privoxy �Firefox �������������r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_HEBREW} "�� �����${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_HEBREW} "�����{TOR_NAME}"
LangString BundleFinishText ${LANG_HEBREW} "�����r\n� �ttp://tor.eff.org/docs/tor-doc-win32.html ����� �� ����� �or.\r\n\r\n ���orbutton �� �� ��Firefox."
@@ -40,12 +40,14 @@
LangString TorShortcuts ${LANG_HEBREW} "��� ��
LangString TorShortcutsDesc ${LANG_HEBREW} "�� ${TOR_NAME} ���"
-; Polipo
-LangString PolipoGroupDesc ${LANG_HEBREW} "Polipo ������������ �������"
-LangString PolipoUninstDesc ${LANG_HEBREW} "� ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_HEBREW} "��{POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_HEBREW} "��� ��
-LangString PolipoShortcutsDesc ${LANG_HEBREW} "�� ${POLIPO_NAME} ���"
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_HEBREW} "Privoxy ������������ �������"
+LangString PrivoxyUninstDesc ${LANG_HEBREW} "� ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_HEBREW} "��{PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_HEBREW} "��� ��
+LangString PrivoxyShortcutsDesc ${LANG_HEBREW} "�� ${PRIVOXY_NAME} ���"
+LangString PrivoxyStartup ${LANG_HEBREW} "� � ��
+LangString PrivoxyStartupDesc ${LANG_HEBREW} "� ${PRIVOXY_NAME} ���� ��"
; Torbutton
LangString TorbuttonGroupDesc ${LANG_HEBREW} "Torbutton ���Firefox �� ���� ������."
Modified: vidalia/trunk/pkg/win32/vidalia_it.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_it.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_it.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -8,7 +8,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_ITALIAN} "Installazione di ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_ITALIAN} "Questo wizard assister�ell'installazione di Tor, Vidalia, Polipo e Torbutton.\r\n\r\nTor �n software che consente di navigare anonimamente Internet, assistendo nell'anonimizzare le pagine visitate e pubblicate, i sistemi di messaggistica istantanea, IRC e altro ancora. Vidalia �na GUI che semplifica il controllo e la configurazione di Tor.\r\n\r\nPolipo �n proxy filtrante che protegge la privacy e rimuove pubblicit�ad, banner e popup).\r\n\r\nTorbutton �n'estensione di Firefox che consente di attivare o disattivare rapidamente la navigazione anonima.\r\n\r\nSe esistono gi�recedenti installazioni di Tor, Vidalia, Polipo o Firefox �onsigliabile assicurarsi che questi programmi siano chiusi prima di continuare con l'installazione.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_ITALIAN} "Questo wizard assister�ell'installazione di Tor, Vidalia, Privoxy e Torbutton.\r\n\r\nTor �n software che consente di navigare anonimamente Internet, assistendo nell'anonimizzare le pagine visitate e pubblicate, i sistemi di messaggistica istantanea, IRC e altro ancora. Vidalia �na GUI che semplifica il controllo e la configurazione di Tor.\r\n\r\nPrivoxy �n proxy filtrante che protegge la privacy e rimuove pubblicit�ad, banner e popup).\r\n\r\nTorbutton �n'estensione di Firefox che consente di attivare o disattivare rapidamente la navigazione anonima.\r\n\r\nSe esistono gi�recedenti installazioni di Tor, Vidalia, Privoxy o Firefox �onsigliabile assicurarsi che questi programmi siano chiusi prima di continuare con l'installazione.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_ITALIAN} "Benvenuti nell'installazione guidata di ${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_ITALIAN} "Documenti sull'installazione di ${TOR_NAME}"
LangString BundleFinishText ${LANG_ITALIAN} "L'installazione �tata completata.\r\nConsultare http://tor.eff.org/docs/tor-doc-win32.html per informazioni sull'uso e sulla configurazione di Tor.\r\n\r\nSe Torbutton �tato installato sar�ecessario riavviare Firefox."
@@ -39,14 +39,14 @@
LangString TorShortcuts ${LANG_ITALIAN} "Aggiungi al menu Start"
LangString TorShortcutsDesc ${LANG_ITALIAN} "Aggiunge ${TOR_NAME} alla cartella Programmi del menu Start."
-; Polipo
-LangString PolipoGroupDesc ${LANG_ITALIAN} "Polipo �n proxy web filtrante che protegge la privacy e aiuta a rimuovere pubblicit�ad, banner e popup)."
-LangString PolipoUninstDesc ${LANG_ITALIAN} "Disinstalla ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_ITALIAN} "Installa ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_ITALIAN} "Aggiungi al menu Start"
-LangString PolipoShortcutsDesc ${LANG_ITALIAN} "Aggiunge ${POLIPO_NAME} alla cartella Programmi del menu Start."
-LangString PolipoStartup ${LANG_ITALIAN} "Attiva all'avvio del pc"
-LangString PolipoStartupDesc ${LANG_ITALIAN} "Avvia ${POLIPO_NAME} all'accensione del pc."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_ITALIAN} "Privoxy �n proxy web filtrante che protegge la privacy e aiuta a rimuovere pubblicit�ad, banner e popup)."
+LangString PrivoxyUninstDesc ${LANG_ITALIAN} "Disinstalla ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_ITALIAN} "Installa ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_ITALIAN} "Aggiungi al menu Start"
+LangString PrivoxyShortcutsDesc ${LANG_ITALIAN} "Aggiunge ${PRIVOXY_NAME} alla cartella Programmi del menu Start."
+LangString PrivoxyStartup ${LANG_ITALIAN} "Attiva all'avvio del pc"
+LangString PrivoxyStartupDesc ${LANG_ITALIAN} "Avvia ${PRIVOXY_NAME} all'accensione del pc."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_ITALIAN} "Torbutton �n'estensione per Firefox che consente di attivare o disattivare rapidamente la navigazione anonima."
Modified: vidalia/trunk/pkg/win32/vidalia_nl.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_nl.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_nl.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -5,7 +5,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_DUTCH} "${BUNDLE_NAME} setup"
-LangString BundleWelcomeText ${LANG_DUTCH} "Deze wizard zal u leiden door de installatie van Tor, Vidalia, Polipo, and Torbutton.\r\n\r\nIndien u eerder Tor, Vidalia, Polipo, of Firefox heeft ge�talleerd, zorg dan dat deze zijn afgesloten voordat u verder gaat met deze installatie.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_DUTCH} "Deze wizard zal u leiden door de installatie van Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\nIndien u eerder Tor, Vidalia, Privoxy, of Firefox heeft ge�talleerd, zorg dan dat deze zijn afgesloten voordat u verder gaat met deze installatie.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_DUTCH} "Welkom bij de ${BUNDLE_NAME} Setup Wizard"
LangString BundleLinkText ${LANG_DUTCH} "${TOR_NAME} installatie documentatie"
LangString BundleFinishText ${LANG_DUTCH} "De installatie is voltooid.\r\nBekijk alstublieft http://tor.eff.org/docs/tor-doc-win32.html voor meer informatie over het configureren van applicaties voor gebruik via Tor.\r\n\r\nIndien u Torbutton heeft ge�talleerd, dient u Firefox te herstarten."
@@ -35,12 +35,14 @@
LangString TorShortcuts ${LANG_DUTCH} "Voeg toe aan Start Menu"
LangString TorShortcutsDesc ${LANG_DUTCH} "Voeg ${TOR_NAME} toe aan uw Start menu."
-; Polipo
-LangString PolipoGroupDesc ${LANG_DUTCH} "Installeer ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_DUTCH} "Verwijder ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_DUTCH} "Installeer ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_DUTCH} "Voeg toe aan Start Menu"
-LangString PolipoShortcutsDesc ${LANG_DUTCH} "Voeg ${POLIPO_NAME} toe aan uw Start menu."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_DUTCH} "Installeer ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_DUTCH} "Verwijder ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_DUTCH} "Installeer ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_DUTCH} "Voeg toe aan Start Menu"
+LangString PrivoxyShortcutsDesc ${LANG_DUTCH} "Voeg ${PRIVOXY_NAME} toe aan uw Start menu."
+LangString PrivoxyStartup ${LANG_DUTCH} "Start automatisch"
+LangString PrivoxyStartupDesc ${LANG_DUTCH} "Start ${PRIVOXY_NAME} automatisch bij het opstarten van Windows."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_DUTCH} "Installeer ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_pl.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_pl.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_POLISH} "Instalator ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ci�rzez proces instalacji aplikacji Tor, Vidalia, Polipo i Torbutton.\r\n\r\nJe�li instalowa�e� wcze�niej Tor, Vidalia, Polipo albo Firefox, upewnij si��e w tej chwili �adne z nich nie jest uruchomione.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_POLISH} "Kreator przeprowadzi Ci�rzez proces instalacji aplikacji Tor, Vidalia, Privoxy i Torbutton.\r\n\r\nJe�li instalowa�e� wcze�niej Tor, Vidalia, Privoxy albo Firefox, upewnij si��e w tej chwili �adne z nich nie jest uruchomione.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_POLISH} "Dokumentacja instalacji ${TOR_NAME}"
LangString BundleFinishText ${LANG_POLISH} "Instalacja zako�na.\r\nZobacz prosz�ttp://tor.eff.org/docs/tor-doc-win32.html aby dowiedzie�i�ak skonfigurowa�woje aplikacje do wsp�acy z Torem.\r\n\r\nJe�li zainstalowa�e� Torbutton, musisz ponownie uruchomi�irefox'a."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
LangString TorShortcutsDesc ${LANG_POLISH} "Dodaj ${TOR_NAME} do Twojego menu Start."
-; Polipo
-LangString PolipoGroupDesc ${LANG_POLISH} "Instalacja ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_POLISH} "Usuni�e ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_POLISH} "Instalacja ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
-LangString PolipoShortcutsDesc ${LANG_POLISH} "Dodaj ${POLIPO_NAME} do Twojego menu Start."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_POLISH} "Usuni�e ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
+LangString PrivoxyShortcutsDesc ${LANG_POLISH} "Dodaj ${PRIVOXY_NAME} do Twojego menu Start."
+LangString PrivoxyStartup ${LANG_POLISH} "Uruchom na starcie"
+LangString PrivoxyStartupDesc ${LANG_POLISH} "Automatycznie uruchamiaj ${PRIVOXY_NAME} na starcie."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_pt-br.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_pt-br.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_PORTUGUESEBR} "Instala� do ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_PORTUGUESEBR} "Este assistente ir�ui�o atrav�da instala� do Tor, Vidalia, Polipo e Torbutton.\r\n\r\nSe voc��nstalou previamente o Tor, Vidalia, Polipo ou Firefox, por favor certifique-se de que eles n�estejam sendo executados antes prosseguir com esta instala�.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_PORTUGUESEBR} "Este assistente ir�ui�o atrav�da instala� do Tor, Vidalia, Privoxy e Torbutton.\r\n\r\nSe voc��nstalou previamente o Tor, Vidalia, Privoxy ou Firefox, por favor certifique-se de que eles n�estejam sendo executados antes prosseguir com esta instala�.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instala� do ${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_PORTUGUESEBR} "Documenta� da instala� ${TOR_NAME}"
LangString BundleFinishText ${LANG_PORTUGUESEBR} "A instala� foi completada.\r\nPor favor visite http://tor.eff.org/docs/tor-doc-win32.html para aprender como configurar os seus aplicativos para usar o Tor.\r\n\r\nSe voc�nstalou o Torbutton, voc�er�ue reiniciar o Firefox."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
LangString TorShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
-; Polipo
-LangString PolipoGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_PORTUGUESEBR} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_PORTUGUESEBR} "Instalar ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
-LangString PolipoShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${POLIPO_NAME} ao seu Menu Iniciar."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_PORTUGUESEBR} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
+LangString PrivoxyShortcutsDesc ${LANG_PORTUGUESEBR} "Adicionar o ${PRIVOXY_NAME} ao seu Menu Iniciar."
+LangString PrivoxyStartup ${LANG_PORTUGUESEBR} "Executar Na Inicializa�"
+LangString PrivoxyStartupDesc ${LANG_PORTUGUESEBR} "Executar o ${PRIVOXY_NAME} automaticamente na inicializa�."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_ru.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_ru.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -7,7 +7,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_RUSSIAN} "��� ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_RUSSIAN} "��������r, Vidalia, Polipo, �orbutton.\r\n\r\nTor ������ ����� � Internet, ��� �������� �-������ ������ ��� IRC, �����. Vidalia ���� ������� ��� ��� ��� Tor.\r\n\r\nPolipo �����-�� �������� ������������, ���������.\r\n\r\nTorbutton ����irefox � ������/���� ������������r\n\r\n���������� Tor, Vidalia, Polipo, � Firefox, ������������������������\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_RUSSIAN} "��������r, Vidalia, Privoxy, �orbutton.\r\n\r\nTor ������ ����� � Internet, ��� �������� �-������ ������ ��� IRC, �����. Vidalia ���� ������� ��� ��� ��� Tor.\r\n\r\nPrivoxy �����-�� �������� ������������, ���������.\r\n\r\nTorbutton ����irefox � ������/���� ������������r\n\r\n���������� Tor, Vidalia, Privoxy, � Firefox, ������������������������\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_RUSSIAN} "����������${BUNDLE_NAME}"
LangString BundleLinkText ${LANG_RUSSIAN} "���� ����${TOR_NAME}"
LangString BundleFinishText ${LANG_RUSSIAN} "��� ���.\r\n�������ttp://tor.eff.org/docs/tor-doc-win32.html ���, � ������������ Tor.\r\n\r\n������ Torbutton, � �������irefox."
@@ -40,12 +40,14 @@
LangString TorShortcutsDesc ${LANG_RUSSIAN} "��� ${TOR_NAME} ��� ��"
-; Polipo
-LangString PolipoGroupDesc ${LANG_RUSSIAN} "Polipo �����-�� �������� ������������, ���������."
-LangString PolipoUninstDesc ${LANG_RUSSIAN} "���{POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_RUSSIAN} "����LIPO_DESC}."
-LangString PolipoShortcuts ${LANG_RUSSIAN} "��� �����
-LangString PolipoShortcutsDesc ${LANG_RUSSIAN} "��� ${POLIPO_NAME} ��� ��"
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_RUSSIAN} "Privoxy �����-�� �������� ������������, ���������."
+LangString PrivoxyUninstDesc ${LANG_RUSSIAN} "���{PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_RUSSIAN} "����IVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_RUSSIAN} "��� �����
+LangString PrivoxyShortcutsDesc ${LANG_RUSSIAN} "��� ${PRIVOXY_NAME} ��� ��"
+LangString PrivoxyStartup ${LANG_RUSSIAN} "����+LangString PrivoxyStartupDesc ${LANG_RUSSIAN} "�������{PRIVOXY_NAME} � �����."
; Torbutton
Modified: vidalia/trunk/pkg/win32/vidalia_sv.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_sv.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_sv.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_SWEDISH} "Installera ${BUNDLE_NAME}"
-LangString BundleWelcomeText ${LANG_SWEDISH} "Denna guide tar dig igenom installationen av Tor, Vidalia, Polipo och Torbutton.\r\n\r\nTor �ett program f�tt vara anonym p�nternet och g�et m�gt att anonymt surfa och publicera information, skicka snabbmeddelanden, anv�a IRC, och mycket annat. Vidalia �ett anv�argr�snitt till Tor som g�et enkelt att hantera, �vaka och konfigurera Tor.\r\n\r\nPolipo �en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups.\r\n\r\nTorbutton �ett till� till Firefox som g�et m�gt att snabbt aktivera eller inaktivera anonym surfning.\r\n\r\nOm du tidigare har installerat Tor, Vidalia, Polipo eller Firefox, v�igen f�kra dig om att de inte �ig� innan du forts�er installationen.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_SWEDISH} "Denna guide tar dig igenom installationen av Tor, Vidalia, Privoxy och Torbutton.\r\n\r\nTor �ett program f�tt vara anonym p�nternet och g�et m�gt att anonymt surfa och publicera information, skicka snabbmeddelanden, anv�a IRC, och mycket annat. Vidalia �ett anv�argr�snitt till Tor som g�et enkelt att hantera, �vaka och konfigurera Tor.\r\n\r\nPrivoxy �en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups.\r\n\r\nTorbutton �ett till� till Firefox som g�et m�gt att snabbt aktivera eller inaktivera anonym surfning.\r\n\r\nOm du tidigare har installerat Tor, Vidalia, Privoxy eller Firefox, v�igen f�kra dig om att de inte �ig� innan du forts�er installationen.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_SWEDISH} "V�ommen till installationsguiden f�{BUNDLE_NAME}"
LangString BundleLinkText ${LANG_SWEDISH} "Installeringsdokumentation f�{TOR_NAME}"
LangString BundleFinishText ${LANG_SWEDISH} "Installationen �klar.\r\nV�igen se http://tor.eff.org/docs/tor-doc-win32.html f�nformation om hur du anv�er Tor med dina existerande program.\r\n\r\nOm du valde att installera Torbutton, m�e du starta om Firefox."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_SWEDISH} "L� till i startmenyn"
LangString TorShortcutsDesc ${LANG_SWEDISH} "L� till ${TOR_NAME} i din startmeny."
-; Polipo
-LangString PolipoGroupDesc ${LANG_SWEDISH} "Polipo �en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups."
-LangString PolipoUninstDesc ${LANG_SWEDISH} "Ta bort ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_SWEDISH} "Installera ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_SWEDISH} "L� till i startmenyn"
-LangString PolipoShortcutsDesc ${LANG_SWEDISH} "L� till ${POLIPO_NAME} i din startmeny."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_SWEDISH} "Privoxy �en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups."
+LangString PrivoxyUninstDesc ${LANG_SWEDISH} "Ta bort ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_SWEDISH} "Installera ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_SWEDISH} "L� till i startmenyn"
+LangString PrivoxyShortcutsDesc ${LANG_SWEDISH} "L� till ${PRIVOXY_NAME} i din startmeny."
+LangString PrivoxyStartup ${LANG_SWEDISH} "K�g� vid uppstart"
+LangString PrivoxyStartupDesc ${LANG_SWEDISH} "K�utomatiskt ig� ${PRIVOXY_NAME} vid uppstart."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_SWEDISH} "Torbutton �ett till� till Firefox som g�et m�gt att snabbt aktivera eller inaktivera anonym surfning."
Modified: vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_SIMPCHINESE} "${BUNDLE_NAME} ��װ���"
-LangString BundleWelcomeText ${LANG_SIMPCHINESE} "����������װ Tor,Vidalia,Polipo ��Torbutton.\r\n\r\n�������װ��Vidalia,Polipo ��refox,�ȷ������˰�װ���ǰ�Щ������\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_SIMPCHINESE} "����������װ Tor,Vidalia,Privoxy ��Torbutton.\r\n\r\n�������װ��Vidalia,Privoxy ��refox,�ȷ������˰�װ���ǰ�Щ������\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_SIMPCHINESE} "��ӭʹ� ${BUNDLE_NAME} ��װ���"
LangString BundleLinkText ${LANG_SIMPCHINESE} "${TOR_NAME} ��װ���"
LangString BundleFinishText ${LANG_SIMPCHINESE} "��װ���\r\n����http://tor.eff.org/docs/tor-doc-win32.html �����Tor ����Ϣ.\r\n\r\n������װ Torbutton,��Ҫ�������Firefox)���@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_SIMPCHINESE} "�����ʼ�˵����
LangString TorShortcutsDesc ${LANG_SIMPCHINESE} "���${TOR_NAME} ���ʼ�˵����"
-; Polipo
-LangString PolipoGroupDesc ${LANG_SIMPCHINESE} "��װ ${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_SIMPCHINESE} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_SIMPCHINESE} "��װ ${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_SIMPCHINESE} "�����ʼ�˵����
-LangString PolipoShortcutsDesc ${LANG_SIMPCHINESE} "���${POLIPO_NAME} ���ʼ�˵����"
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_SIMPCHINESE} "��װ ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_SIMPCHINESE} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_SIMPCHINESE} "��װ ${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_SIMPCHINESE} "�����ʼ�˵����
+LangString PrivoxyShortcutsDesc ${LANG_SIMPCHINESE} "���${PRIVOXY_NAME} ���ʼ�˵����"
+LangString PrivoxyStartup ${LANG_SIMPCHINESE} "�ϵͳ���ʱ��"
+LangString PrivoxyStartupDesc ${LANG_SIMPCHINESE} "����ϵͳ���ʱ�� ${PRIVOXY_NAME}."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_SIMPCHINESE} "��װ ${TORBUTTON_DESC}."
Modified: vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh 2008-06-04 23:47:34 UTC (rev 2667)
+++ vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh 2008-06-05 00:00:16 UTC (rev 2668)
@@ -6,7 +6,7 @@
; Bundle
LangString BundleSetupCaption ${LANG_TRADCHINESE} "${BUNDLE_NAME} �w�˺�"
-LangString BundleWelcomeText ${LANG_TRADCHINESE} "�w�˺��N�|�ɱz�w��Tor,Vidalia,Polipo �M Torbutton.\r\n\r\n�p�G�z���g�w�˹L Tor,Vidalia,Polipo ��Firefox,�нT�O�b����w�˺��e�o�ǵ{�����b���.\r\n\r\n$_CLICK"
+LangString BundleWelcomeText ${LANG_TRADCHINESE} "�w�˺��N�|�ɱz�w��Tor,Vidalia,Privoxy �M Torbutton.\r\n\r\n�p�G�z���g�w�˹L Tor,Vidalia,Privoxy ��Firefox,�нT�O�b����w�˺��e�o�ǵ{�����b���.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_TRADCHINESE} "�����${BUNDLE_NAME} �w�˺�"
LangString BundleLinkText ${LANG_TRADCHINESE} "${TOR_NAME} �w�ˤ�"
LangString BundleFinishText ${LANG_TRADCHINESE} "�w�˧���.\r\n�гX��http://tor.eff.org/docs/tor-doc-win32.html ����Tor ���t�m�T��.\r\n\r\n�p�G���F�w��Torbutton,�z�ݭn���s�Ұʤ�Firefox)����."
@@ -36,12 +36,14 @@
LangString TorShortcuts ${LANG_TRADCHINESE} "�K�[�ܶ}�l���{����"
LangString TorShortcutsDesc ${LANG_TRADCHINESE} "�K�[ ${TOR_NAME} �ܶ}�l���{����."
-; Polipo
-LangString PolipoGroupDesc ${LANG_TRADCHINESE} "�w��${POLIPO_DESC}."
-LangString PolipoUninstDesc ${LANG_TRADCHINESE} "Remove ${POLIPO_DESC}."
-LangString PolipoAppDesc ${LANG_TRADCHINESE} "�w��${POLIPO_DESC}."
-LangString PolipoShortcuts ${LANG_TRADCHINESE} "�K�[�ܶ}�l���{����"
-LangString PolipoShortcutsDesc ${LANG_TRADCHINESE} "�K�[ ${POLIPO_NAME} �ܶ}�l���{����."
+; Privoxy
+LangString PrivoxyGroupDesc ${LANG_TRADCHINESE} "�w��${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc ${LANG_TRADCHINESE} "Remove ${PRIVOXY_DESC}."
+LangString PrivoxyAppDesc ${LANG_TRADCHINESE} "�w��${PRIVOXY_DESC}."
+LangString PrivoxyShortcuts ${LANG_TRADCHINESE} "�K�[�ܶ}�l���{����"
+LangString PrivoxyShortcutsDesc ${LANG_TRADCHINESE} "�K�[ ${PRIVOXY_NAME} �ܶ}�l���{����."
+LangString PrivoxyStartup ${LANG_TRADCHINESE} "�b�t�αҰʮɰ�
+LangString PrivoxyStartupDesc ${LANG_TRADCHINESE} "�۰ʦb�t�αҰʮɰ�${PRIVOXY_NAME}."
; Torbutton
LangString TorbuttonGroupDesc ${LANG_TRADCHINESE} "�w��${TORBUTTON_DESC}."