Changeset 2668

Show
Ignore:
Timestamp:
06/04/08 20:00:16 (7 months ago)
Author:
edmanm
Message:

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!"

Location:
vidalia/trunk/pkg/win32
Files:
17 modified

Legend:

Unmodified
Added
Removed

  • vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in

    r2492 r2668  
    2828!define TOR_DESC            "${TOR_NAME} ${TOR_APPVERSION}" 
    2929 
    30 !define POLIPO_NAME         "Polipo" 
    31 !define POLIPO_EXEC         "polipo.exe" 
    32 !define POLIPO_APPVERSION   "1.0.4.0" 
    33 !define POLIPO_DESC         "${POLIPO_NAME} ${POLIPO_APPVERSION}" 
     30!define PRIVOXY_NAME        "Privoxy" 
     31!define PRIVOXY_EXEC        "privoxy.exe" 
     32!define PRIVOXY_APPVERSION  "3.0.6" 
     33!define PRIVOXY_DESC        "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}" 
    3434 
    3535!define TORBUTTON_NAME      "Torbutton" 
    … …  
    8383!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)" 
    8484!define MUI_FINISHPAGE_LINK "$(BundleLinkText)" 
    85 !define MUI_FINISHPAGE_LINK_LOCATION  "https://www.torproject.org/docs/tor-doc-win32.html" 
     85!define MUI_FINISHPAGE_LINK_LOCATION  "http://tor.eff.org/docs/tor-doc-win32.html" 
    8686 
    8787;-------------------------------- 
    … …  
    166166      File "Vidalia\${VIDALIA_APPVERSION}\LICENSE-OPENSSL" 
    167167      File "Vidalia\${VIDALIA_APPVERSION}\CREDITS" 
    168       WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net/" 
    169168       
    170169      ; Include a prebuilt GeoIP cache 
    … …  
    214213      CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0 
    215214      CreateShortCut "${SHORTCUTS}\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0 
     215       
     216      WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net" 
    216217      CreateShortCut "${SHORTCUTS}\Vidalia Website.lnk" "$INSTDIR\Vidalia\Vidalia Website.url" 
    217218    SectionEnd 
    … …  
    240241       File "tor\${TOR_APPVERSION}\tor.exe" 
    241242       File "tor\${TOR_APPVERSION}\tor-resolve.exe" 
    242        WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "https://torproject.org/" 
     243       WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org" 
    243244 
    244245       ; If the user is also installing Vidalia, then don't confuse them by 
    … …  
    320321 
    321322;-------------------------------- 
    322 ; Polipo 
    323 var bInstallPolipo 
    324 SectionGroup "${POLIPO_DESC}" PolipoGroup 
    325     ;-------------------------------- 
    326     ; Polipo application binaries 
    327     Section "${POLIPO_NAME}" Polipo 
     323; Privoxy 
     324var bInstallPrivoxy 
     325SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup 
     326    ;-------------------------------- 
     327    ; Privoxy application binaries 
     328    Section "${PRIVOXY_NAME}" Privoxy 
    328329        SectionIn 1 2 
    329330        ; add files / whatever that need to be installed here. 
    330         SetOutPath "$INSTDIR\Polipo" 
    331         File Polipo\${POLIPO_APPVERSION}\polipo.exe 
    332         File Polipo\${POLIPO_APPVERSION}\config 
    333         File Polipo\${POLIPO_APPVERSION}\CHANGES 
    334         File Polipo\${POLIPO_APPVERSION}\COPYING 
    335         File Polipo\${POLIPO_APPVERSION}\README.Windows 
    336         WriteINIStr "$SMPROGRAMS\Polipo\Polipo Website.url" "InternetShortcut" "URL" "http://www.pps.jussieu.fr/~jch/software/polipo/" 
     331        SetOutPath "$INSTDIR\Privoxy" 
     332        File /r Privoxy\${PRIVOXY_APPVERSION}\*.* 
     333 
     334        WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"' 
     335        WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile" 
     336        WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"' 
     337        WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile" 
     338        
     339        ; Write the installation path into the registry 
     340        WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR" 
    337341 
    338342        ; Write the uninstall keys for Windows 
    339         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "DisplayName" "${POLIPO_DESC}" 
    340         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "UninstallString" '"$INSTDIR\${UNINSTALLER}"' 
    341         WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoModify" 1 
    342         WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoRepair" 1 
    343        
    344         ; If the user is installing Vidalia, then update its torrc to remember where Polipo is installed 
    345         SetShellVarContext current 
    346         SectionGetFlags ${Vidalia} $0 
    347         IntOp $0 $0 & ${SF_SELECTED} 
    348         IntCmp $0 ${SF_SELECTED} write_polipo_location skip skip 
    349         write_polipo_location: 
    350             Push $INSTDIR 
    351             Push "\" 
    352             Push "\\" 
    353             Call StrRep 
    354             Pop $R0 ; contains the modified version of $INSTDIR 
    355             WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable  "$R0\\Polipo\\${POLIPO_EXEC}" 
    356             WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments "-c, $R0\\Polipo\\config" 
    357             WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart  "true" 
    358         skip: 
    359  
    360         IntOp $bInstallPolipo 0 + 1 
     343        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}" 
     344        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\${UNINSTALLER}"' 
     345        WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1 
     346        WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1 
     347        
     348        IntOp $bInstallPrivoxy 0 + 1 
    361349    SectionEnd 
    362350 
    363351    ;-------------------------------- 
    364     ; Polipo Start menu shortcuts 
    365     Section "$(PolipoShortcuts)" PolipoShortcuts 
     352    ; Privoxy Start menu shortcuts 
     353    Section "$(PrivoxyShortcuts)" PrivoxyShortcuts 
    366354        SectionIn 1 
    367355        SetShellVarContext all ; (Add to "All Users" Start Menu if possible) 
    368         RMDir /r "${SHORTCUTS}\Polipo" 
    369         CreateDirectory "${SHORTCUTS}\Polipo" 
    370         CreateShortCut "${SHORTCUTS}\Polipo\Polipo.lnk" "$INSTDIR\Polipo\polipo.exe" "-c config" 
    371         CreateShortCut "${SHORTCUTS}\Polipo\Configuration.lnk" "Notepad.exe" '"$INSTDIR\Polipo\config"' 
    372         CreateShortCut "${SHORTCUTS}\Polipo\Polipo Website.lnk" "$INSTDIR\Polipo\Polipo Website.url" 
     356        RMDir /r "${SHORTCUTS}\Privoxy" 
     357        CreateDirectory "${SHORTCUTS}\Privoxy" 
     358        CreateShortCut "${SHORTCUTS}\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" 
     359        CreateShortCut "${SHORTCUTS}\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html" 
     360        WriteINIStr "${SHORTCUTS}\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/" 
     361         
     362        CreateDirectory "${SHORTCUTS}\Privoxy\Edit Config" 
     363        CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"' 
     364        CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"' 
     365        CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"' 
     366        CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"' 
     367        CreateShortCut "${SHORTCUTS}\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"' 
     368         
     369        CreateDirectory "${SHORTCUTS}\Privoxy\Documentation" 
     370        CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html" 
     371        CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html" 
     372        CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"' 
     373        CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"' 
     374        CreateShortCut "${SHORTCUTS}\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"' 
     375        WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/" 
     376         
    373377        CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0 
    374  
    375         CreateDirectory "${SHORTCUTS}\Polipo\Documentation" 
    376         CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Changelog.lnk" "Notepad.exe" '"$INSTDIR\Polipo\CHANGES"' 
    377         CreateShortCut "${SHORTCUTS}\Polipo\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Polipo\COPYING"' 
    378         CreateShortCut "${SHORTCUTS}\Polipo\Documentation\Readme.lnk" "Notepad.exe" '"$INSTDIR\Polipo\README.Windows"' 
    379378    SectionEnd 
     379  
     380    ;-------------------------------- 
     381    ; Run Privoxy at startup 
     382    Section "$(PrivoxyStartup)" PrivoxyStartup 
     383      SectionIn 1 
     384      CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED 
     385    SectionEnd      
    380386SectionGroupEnd 
    381387 
    … …  
    434440    run_vidalia: 
    435441        Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"' 
    436         goto done 
     442        goto check_privoxy 
    437443     
    438444    check_tor: 
    439     IntCmp $bInstallTor 1 run_tor check_polipo check_polipo 
     445    IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy 
    440446    run_tor: 
    441447        Exec '"$INSTDIR\Tor\${TOR_EXEC}"' 
    442          
    443     check_polipo: 
    444     IntCmp $bInstallPolipo 1 run_polipo done done 
    445     run_polipo: 
     448     
     449    check_privoxy: 
     450    IntCmp $bInstallPrivoxy 1 run_privoxy done done 
     451    run_privoxy: 
    446452        SetOutPath "$INSTDIR\Privoxy" 
    447         Exec '"$INSTDIR\Polipo\${POLIPO_EXEC}" -c config' 
    448   
     453        ExecShell "" '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"' "" SW_SHOWMINIMIZED 
    449454    done: 
    450455FunctionEnd 
    … …  
    485490SectionGroupEnd 
    486491 
    487 Section "un.Polipo ${POLIPO_APPVERSION}" UninstallPolipo 
     492Section "un.Privoxy ${PRIVOXY_APPVERSION}" UninstallPrivoxy 
    488493  SetShellVarContext all 
    489   RMDir /r "$INSTDIR\Polipo" 
    490   RMDir /r "${SHORTCUTS}\Polipo" 
    491   DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" 
     494  RMDir /r "$INSTDIR\Privoxy" 
     495  RMDir /r "${SHORTCUTS}\Privoxy" 
     496  Delete "$SMSTARTUP\Privoxy.lnk" 
     497  DeleteRegKey HKEY_CLASSES_ROOT ".action" 
     498  DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyActionFile" 
     499  DeleteRegKey HKEY_CLASSES_ROOT ".filter" 
     500  DeleteRegKey HKEY_CLASSES_ROOT "PrivoxyFilterFile" 
     501  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" 
    492502SectionEnd 
    493503 
    … …  
    520530 
    521531  CheckVidaliaAppData: 
    522   IfFileExists "$APPDATA\Vidalia\*.*" CheckPolipo 
     532  IfFileExists "$APPDATA\Vidalia\*.*" CheckPrivoxy 
    523533    SectionGetFlags ${UninstallVidaliaAppData} $0 
    524534    IntOp $0 $0 & ${SECTION_OFF} 
    525535    SectionSetFlags ${UninstallVidaliaAppData} $0 
    526536 
    527   CheckPolipo: 
    528   IfFileExists "$INSTDIR\Polipo\*.*" Done 
    529     SectionGetFlags ${UninstallPolipo} $0 
     537  CheckPrivoxy: 
     538  IfFileExists "$INSTDIR\Privoxy\*.*" Done 
     539    SectionGetFlags ${UninstallPrivoxy} $0 
    530540    IntOp $0 $0 & ${SECTION_OFF} 
    531     SectionSetFlags ${UninstallPolipo} $0 
     541    SectionSetFlags ${UninstallPrivoxy} $0 
    532542 
    533543  Done: 
    … …  
    538548  IfFileExists "$INSTDIR\Tor\*.*" DontRemoveTheUninstaller 
    539549  IfFileExists "$INSTDIR\Vidalia\*.*" DontRemoveTheUninstaller 
    540   IfFileExists "$INSTDIR\Polipo\*.*" DontRemoveTheUninstaller 
     550  IfFileExists "$INSTDIR\Privoxy\*.*" DontRemoveTheUninstaller 
    541551  RMDir /r "$INSTDIR" 
    542552  RMDir /r "${SHORTCUTS}" 
    … …  
    555565  !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)" 
    556566 
    557   !insertmacro MUI_DESCRIPTION_TEXT ${Polipo} "$(PolipoAppDesc)" 
    558   !insertmacro MUI_DESCRIPTION_TEXT ${PolipoGroup} "$(PolipoGroupDesc)" 
    559   !insertmacro MUI_DESCRIPTION_TEXT ${PolipoShortcuts} "$(PolipoShortcutsDesc)" 
     567  !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)" 
     568  !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)" 
     569  !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)" 
     570  !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)" 
    560571 
    561572  !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)" 
    … …  
    569580  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)" 
    570581  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} "$(AppDataUninstDesc)" 
    571   !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPolipo} "$(PolipoUninstDesc)" 
     582  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPrivoxy} "$(PrivoxyUninstDesc)" 
    572583!insertmacro MUI_UNFUNCTION_DESCRIPTION_END 
    573584 

  • vidalia/trunk/pkg/win32/vidalia_cs.nsh

    r2493 r2668  
    77; Bundle 
    88LangString BundleSetupCaption         ${LANG_CZECH} "${BUNDLE_NAME} nastaveni" 
    9 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" 
     9LangString 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" 
    1010LangString BundleWelcomeTitle         ${LANG_CZECH} "Vitejte v  ${BUNDLE_NAME} Pruvodce nastavenim" 
    1111LangString BundleLinkText             ${LANG_CZECH} "${TOR_NAME} instalacni dokumentace" 
    … …  
    3737LangString TorShortcutsDesc           ${LANG_CZECH} "Vlozit ${TOR_NAME} do nabidky Start." 
    3838 
    39 ; Polipo 
    40 LangString PolipoGroupDesc           ${LANG_CZECH} "Polipo je filtrovaci web proxy chranici vase soukromi. Pomaha odstranovat reklamu, banery a  pop up okna." 
    41 LangString PolipoUninstDesc          ${LANG_CZECH} "Odstranit ${POLIPO_DESC}." 
    42 LangString PolipoAppDesc             ${LANG_CZECH} "Instalovat ${POLIPO_DESC}." 
    43 LangString PolipoShortcuts           ${LANG_CZECH} "Vlozit do nabidky start" 
    44 LangString PolipoShortcutsDesc       ${LANG_CZECH} "Vlozit ${POLIPO_NAME} do nabidky Start." 
     39; Privoxy 
     40LangString PrivoxyGroupDesc           ${LANG_CZECH} "Privoxy je filtrovaci web proxy chranici vase soukromi. Pomaha odstranovat reklamu, banery a  pop up okna." 
     41LangString PrivoxyUninstDesc          ${LANG_CZECH} "Odstranit ${PRIVOXY_DESC}." 
     42LangString PrivoxyAppDesc             ${LANG_CZECH} "Instalovat ${PRIVOXY_DESC}." 
     43LangString PrivoxyShortcuts           ${LANG_CZECH} "Vlozit do nabidky start" 
     44LangString PrivoxyShortcutsDesc       ${LANG_CZECH} "Vlozit ${PRIVOXY_NAME} do nabidky Start." 
     45LangString PrivoxyStartup             ${LANG_CZECH} "Spust pri startu" 
     46LangString PrivoxyStartupDesc         ${LANG_CZECH} "Automaticky spustit ${PRIVOXY_NAME} pri startu." 
    4547 
    4648; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_de.nsh

    r2493 r2668  
    66; Bundle 
    77LangString BundleSetupCaption         ${LANG_GERMAN} "${BUNDLE_NAME} Setup" 
    8 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" 
     8LangString 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" 
    99LangString BundleWelcomeTitle         ${LANG_GERMAN} "Willkommen beim ${BUNDLE_NAME} Installations-Assistent" 
    1010LangString BundleLinkText             ${LANG_GERMAN} "${TOR_NAME} Installations-Dokumentation" 
    … …  
    3737 
    3838 
    39 ; Polipo 
    40 LangString PolipoGroupDesc           ${LANG_GERMAN} "Polipo ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatph� zu sch�und Werbung, Banner und Popups entfernt." 
    41 LangString PolipoUninstDesc          ${LANG_GERMAN} "Entferne ${POLIPO_DESC}." 
    42 LangString PolipoAppDesc             ${LANG_GERMAN} "Installiere ${POLIPO_DESC}." 
    43 LangString PolipoShortcuts           ${LANG_GERMAN} "Zum Startmen�uf�LangString PolipoShortcutsDesc       ${LANG_GERMAN} "${POLIPO_NAME} zu Ihrem Startmen�uf� 
     39; Privoxy 
     40LangString PrivoxyGroupDesc           ${LANG_GERMAN} "Privoxy ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatph� zu sch�und Werbung, Banner und Popups entfernt." 
     41LangString PrivoxyUninstDesc          ${LANG_GERMAN} "Entferne ${PRIVOXY_DESC}." 
     42LangString PrivoxyAppDesc             ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}." 
     43LangString PrivoxyShortcuts           ${LANG_GERMAN} "Zum Startmen�uf�LangString PrivoxyShortcutsDesc       ${LANG_GERMAN} "${PRIVOXY_NAME} zu Ihrem Startmen�uf� 
     44LangString PrivoxyStartup             ${LANG_GERMAN} "Beim Systemstart ausf� 
     45LangString PrivoxyStartupDesc         ${LANG_GERMAN} "${PRIVOXY_NAME} beim Systemstart automatisch ausf�" 
    4446 
    4547; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_en.nsh

    r2491 r2668  
    2727; Bundle 
    2828LangString BundleSetupCaption         ${LANG_ENGLISH} "${BUNDLE_NAME} setup" 
    29 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" 
     29LangString 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" 
    3030LangString BundleWelcomeTitle         ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard" 
    3131LangString BundleLinkText             ${LANG_ENGLISH} "${TOR_NAME} installation documentation" 
    … …  
    5757LangString TorShortcutsDesc           ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu." 
    5858 
    59 ; Polipo 
    60 LangString PolipoGroupDesc           ${LANG_ENGLISH} "Polipo is a caching web proxy that helps make web browsing over Tor more responsive." 
    61 LangString PolipoUninstDesc          ${LANG_ENGLISH} "Remove ${POLIPO_DESC}." 
    62 LangString PolipoAppDesc             ${LANG_ENGLISH} "Install ${POLIPO_DESC}." 
    63 LangString PolipoShortcuts           ${LANG_ENGLISH} "Add to Start Menu" 
    64 LangString PolipoShortcutsDesc       ${LANG_ENGLISH} "Add ${POLIPO_NAME} to your Start menu." 
     59; Privoxy 
     60LangString PrivoxyGroupDesc           ${LANG_ENGLISH} "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups." 
     61LangString PrivoxyUninstDesc          ${LANG_ENGLISH} "Remove ${PRIVOXY_DESC}." 
     62LangString PrivoxyAppDesc             ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}." 
     63LangString PrivoxyShortcuts           ${LANG_ENGLISH} "Add to Start Menu" 
     64LangString PrivoxyShortcutsDesc       ${LANG_ENGLISH} "Add ${PRIVOXY_NAME} to your Start menu." 
     65LangString PrivoxyStartup             ${LANG_ENGLISH} "Run At Startup" 
     66LangString PrivoxyStartupDesc         ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup." 
    6567 
    6668; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_es.nsh

    r2493 r2668  
    77; Bundle 
    88LangString BundleSetupCaption         ${LANG_SPANISH} "Instalaci�e ${BUNDLE_NAME}" 
    9 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" 
     9LangString 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" 
    1010LangString BundleWelcomeTitle         ${LANG_SPANISH} "Bienvenido al procedimiento de instalaci�e ${BUNDLE_NAME}" 
    1111LangString BundleLinkText             ${LANG_SPANISH} "documentaci�e instalaci�e ${TOR_NAME}" 
    … …  
    3535LangString TorShortcutsDesc           ${LANG_SPANISH} "Agregar ${TOR_NAME} a su Menu Inicio." 
    3636 
    37 ; Polipo 
    38 LangString PolipoGroupDesc           ${LANG_SPANISH} "Instalar ${POLIPO_DESC}." 
    39 LangString PolipoUninstDesc          ${LANG_SPANISH} "Remove ${POLIPO_DESC}." 
    40 LangString PolipoAppDesc             ${LANG_SPANISH} "Instalar ${POLIPO_DESC}." 
    41 LangString PolipoShortcuts           ${LANG_SPANISH} "A�r al Menu Inicio" 
    42 LangString PolipoShortcutsDesc       ${LANG_SPANISH} "Agregar ${POLIPO_NAME} a su Menu Inicio." 
     37; Privoxy 
     38LangString PrivoxyGroupDesc           ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}." 
     39LangString PrivoxyUninstDesc          ${LANG_SPANISH} "Remove ${PRIVOXY_DESC}." 
     40LangString PrivoxyAppDesc             ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}." 
     41LangString PrivoxyShortcuts           ${LANG_SPANISH} "A�r al Menu Inicio" 
     42LangString PrivoxyShortcutsDesc       ${LANG_SPANISH} "Agregar ${PRIVOXY_NAME} a su Menu Inicio." 
     43LangString PrivoxyStartup             ${LANG_SPANISH} "Ejecutar al iniciar sesi� 
     44LangString PrivoxyStartupDesc         ${LANG_SPANISH} "Automaticamente ejecutar ${PRIVOXY_NAME} al iniciar sesi� 
    4345 
    4446; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_fa.nsh

    r2493 r2668  
    3636LangString TorShortcutsDesc           ${LANG_FARSI} "��� ${TOR_NAME} � �� ��." 
    3737 
    38 ; Polipo 
    39 LangString PolipoGroupDesc           ${LANG_FARSI} "?�?�� ${POLIPO_DESC}." 
    40 LangString PolipoUninstDesc          ${LANG_FARSI} "Remove ${POLIPO_DESC}." 
    41 LangString PolipoAppDesc             ${LANG_FARSI} "?�?�� ${POLIPO_DESC}." 
    42 LangString PolipoShortcuts           ${LANG_FARSI} "��� � �� ��" 
    43 LangString PolipoShortcutsDesc       ${LANG_FARSI} "��� ${POLIPO_NAME} � �� ��." 
     38; Privoxy 
     39LangString PrivoxyGroupDesc           ${LANG_FARSI} "?�?�� ${PRIVOXY_DESC}." 
     40LangString PrivoxyUninstDesc          ${LANG_FARSI} "Remove ${PRIVOXY_DESC}." 
     41LangString PrivoxyAppDesc             ${LANG_FARSI} "?�?�� ${PRIVOXY_DESC}." 
     42LangString PrivoxyShortcuts           ${LANG_FARSI} "��� � �� ��" 
     43LangString PrivoxyShortcutsDesc       ${LANG_FARSI} "��� ${PRIVOXY_NAME} � �� ��." 
     44LangString PrivoxyStartup             ${LANG_FARSI} "��?�������" 
     45LangString PrivoxyStartupDesc         ${LANG_FARSI} "�� ?��{PRIVOXY_NAME} � ���� �����." 
    4446 
    4547; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_fi.nsh

    r2494 r2668  
    88; Bundle 
    99LangString BundleSetupCaption         ${LANG_FINNISH} "${BUNDLE_NAME}n asennus" 
    10 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" 
     10LangString 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" 
    1111LangString BundleWelcomeTitle         ${LANG_FINNISH} "Tervetuloa ${BUNDLE_NAME}n asennukseen" 
    12 LangString BundleLinkText             ${LANG_FINNISH} "${TOR_NAME}-asennusohje" 
     12LangString BundleLinkText             ${LANG_FINNISH} "${TOR_NAME}asennusohje" 
    1313LangString 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." 
    1414LangString BundleRunNow               ${LANG_FINNISH} "K�nist�sennetut komponentit nyt" 
    … …  
    4040 
    4141 
    42 ; Polipo 
    43 LangString PolipoGroupDesc           ${LANG_FINNISH} "Polipo on suodattava v�tyspalvelin, joka suojaa yksityisyytt�a auttaa poistamaan mainoksia, bannereita ja popup-ikkunoita." 
    44 LangString PolipoUninstDesc          ${LANG_FINNISH} "Poista ${POLIPO_DESC}." 
    45 LangString PolipoAppDesc             ${LANG_FINNISH} "Asenna ${POLIPO_DESC}." 
    46 LangString PolipoShortcuts           ${LANG_FINNISH} "Lis�K�nist�alikkoon" 
    47 LangString PolipoShortcutsDesc       ${LANG_FINNISH} "Lis�${POLIPO_NAME} K�nist�alikkoon." 
     42; Privoxy 
     43LangString PrivoxyGroupDesc           ${LANG_FINNISH} "Privoxy suodattava v�tyspalvelin, joka suojaa yksityisyytt�a auttaa poistamalla mainoksia, bannereita ja popup-ikkunoita." 
     44LangString PrivoxyUninstDesc          ${LANG_FINNISH} "Poista ${PRIVOXY_DESC}." 
     45LangString PrivoxyAppDesc             ${LANG_FINNISH} "Asenna ${PRIVOXY_DESC}." 
     46LangString PrivoxyShortcuts           ${LANG_FINNISH} "Lis�K�nist�alikkoon" 
     47LangString PrivoxyShortcutsDesc       ${LANG_FINNISH} "Lis�${PRIVOXY_NAME} K�nist�alikkoon." 
     48LangString PrivoxyStartup             ${LANG_FINNISH} "K�nist�indowssin k�nistyess�LangString PrivoxyStartupDesc         ${LANG_FINNISH} "K�nist�utomaattisesti ${PRIVOXY_NAME} Windowssin k�nistyess� 
    4849 
    4950; Torbutton 

  • vidalia/trunk/pkg/win32/vidalia_fr.nsh

    r2521 r2668  
    11;; $Id$ 
    2 ;; 
     2;;  
    33;; Vidalia installer and bundle French translation 
    4 ;; 
     4;;  
    55 
    66 
    77; Bundle 
    88LangString BundleSetupCaption         ${LANG_FRENCH} "Mise �our de ${BUNDLE_NAME}" 
    9 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" 
     9LangString 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" 
    1010LangString BundleWelcomeTitle         ${LANG_FRENCH} "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}" 
    1111LangString BundleLinkText             ${LANG_FRENCH} "Documentation de l'installation de ${TOR_NAME}" 
    12 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." 
     12LangString 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." 
    1313LangString BundleRunNow               ${LANG_FRENCH} "D�rrer les composants install�maintenant" 
    14  
    1514 
    1615; Vidalia 
    1716LangString VidaliaGroupDesc           ${LANG_FRENCH} "Installer ${VIDALIA_DESC}." 
    18 LangString VidaliaUninstDesc          ${LANG_FRENCH} "D�nstaller ${VIDALIA_DESC}." 
     17LangString VidaliaUninstDesc          ${LANG_FRENCH} "Remove ${VIDALIA_DESC}." 
    1918LangString VidaliaSetupCaption        ${LANG_FRENCH} "Mise �our de ${VIDALIA_NAME}" 
    2019LangString VidaliaWelcomeText         ${LANG_FRENCH} "Cet assistant vous guidera pendant l'installation de ${VIDALIA_DESC}.\r\n\r\n$_CLICK" 
    … …  
    2827LangString VidaliaRunNow              ${LANG_FRENCH} "D�rrer ${VIDALIA_NAME} maintenant" 
    2928 
    30  
    3129; Tor 
    3230LangString TorGroupDesc               ${LANG_FRENCH} "Installer ${TOR_DESC}." 
    33 LangString TorUninstDesc              ${LANG_FRENCH} "D�nstaller ${TOR_DESC}." 
     31LangString TorUninstDesc              ${LANG_FRENCH} "Remove ${TOR_DESC}." 
    3432LangString TorAppDesc                 ${LANG_FRENCH} "Installer ${TOR_DESC}." 
    3533LangString 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 ?" 
    … …  
    3937LangString TorShortcutsDesc           ${LANG_FRENCH} "Ajouter ${TOR_NAME} �otre Menu D�rrer." 
    4038 
    41  
    42 ; Polipo 
    43 LangString PolipoGroupDesc            ${LANG_FRENCH} "Installer ${POLIPO_DESC}." 
    44 LangString PolipoUninstDesc           ${LANG_FRENCH} "D�nstaller ${POLIPO_DESC}." 
    45 LangString PolipoAppDesc              ${LANG_FRENCH} "Installer ${POLIPO_DESC}." 
    46 LangString PolipoShortcuts            ${LANG_FRENCH} "Ajouter au Menu D�rrer" 
    47 LangString PolipoShortcutsDesc        ${LANG_FRENCH} "Ajouter ${POLIPO_NAME} �otre Menu D�rrer." 
    48  
     39; Privoxy 
     40LangString PrivoxyGroupDesc           ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}." 
     41LangString PrivoxyUninstDesc          ${LANG_FRENCH} "Remove ${PRIVOXY_DESC}." 
     42LangString PrivoxyAppDesc             ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}." 
     43LangString PrivoxyShortcuts           ${LANG_FRENCH} "Ajouter au Menu D�rrer" 
     44LangString PrivoxyShortcutsDesc       ${LANG_FRENCH} "Ajouter ${PRIVOXY_NAME} �otre Menu D�rrer." 
     45LangString PrivoxyStartup             ${LANG_FRENCH} "Lancer au d�rrage" 
     46LangString PrivoxyStartupDesc         ${LANG_FRENCH} "Lancer automatiquement ${PRIVOXY_NAME} au d�rrage." 
    4947 
    5048; Torbutton 
    5149LangString TorbuttonGroupDesc         ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}." 
    52 LangString TorbuttonUninstDesc        ${LANG_FRENCH} "D�nstaller ${TORBUTTON_DESC}." 
     50LangString TorbuttonUninstDesc        ${LANG_FRENCH} "Remove ${TORBUTTON_DESC}." 
    5351LangString TorbuttonAppDesc           ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}." 
    5452LangString TorbuttonAddToFirefox      ${LANG_FRENCH} "Ajouter �irefox" 
    … …  
    5654LangString TorbuttonFirefoxNotFound   ${LANG_FRENCH} "Firefox n'a pas � trouv�ur votre syst�. Torbutton ne sera pas install� 
    5755 
    58  
    5956; Miscellaneous Strings 
    60 LangString AppData                    ${LANG_FRENCH} "Donn� de l'application" 
    61 LangString AppDataUninstDesc          ${LANG_FRENCH} "D�nstaller les donn� de l'application et les fichiers de configuration." 
     57LangString AppData                    ${LANG_FRENCH} "Application Data" 
     58LangString AppDataUninstDesc          ${LANG_FRENCH} "Remove saved application data and configuration files." 

  • vidalia/trunk/pkg/win32/vidalia_he.nsh

    r2493 r2668  
    1111; Bundle 
    1212LangString BundleSetupCaption         ${LANG_HEBREW} "��{BUNDLE_NAME}" 
    13 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" 
     13LangString 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" 
    1414LangString BundleWelcomeTitle         ${LANG_HEBREW} "�� �����${BUNDLE_NAME}" 
    1515LangString BundleLinkText             ${LANG_HEBREW} "�����{TOR_NAME}" 
    … …