[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1732: Give each component in the uninstaller its own description a (trunk/pkg/win32)



Author: edmanm
Date: 2007-05-11 03:01:14 -0400 (Fri, 11 May 2007)
New Revision: 1732

Modified:
   trunk/pkg/win32/vidalia-bundle.nsi
   trunk/pkg/win32/vidalia_de.nsh
   trunk/pkg/win32/vidalia_en.nsh
   trunk/pkg/win32/vidalia_es.nsh
   trunk/pkg/win32/vidalia_fa.nsh
   trunk/pkg/win32/vidalia_fi.nsh
   trunk/pkg/win32/vidalia_fr.nsh
   trunk/pkg/win32/vidalia_pl.nsh
   trunk/pkg/win32/vidalia_pt-br.nsh
   trunk/pkg/win32/vidalia_ru.nsh
   trunk/pkg/win32/vidalia_zh-cn.nsh
   trunk/pkg/win32/vidalia_zh-tw.nsh
Log:
Give each component in the uninstaller its own description and add those
descriptions to the installer translations.


Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia-bundle.nsi	2007-05-11 07:01:14 UTC (rev 1732)
@@ -520,6 +520,13 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallTor} "$(TorUninstDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPrivoxy} "$(PrivoxyUninstDesc)"
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
+
 Function StrRep
  
   ;Written by dirtydingus 2003-02-20 04:30:09 

Modified: trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- trunk/pkg/win32/vidalia_de.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_de.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_GERMAN} "Installiere ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_GERMAN} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_GERMAN} "${VIDALIA_NAME} Setup"
 LangString VidaliaWelcomeText         ${LANG_GERMAN} "Dieser Assistent führt Sie durch die Installation von ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_GERMAN} "Willkommen beim ${VIDALIA_NAME} Installations-Assistent"
@@ -28,6 +29,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_GERMAN} "Installiere ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_GERMAN} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_GERMAN} "Installiere ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_GERMAN} "Sie haben bereits eine Tor Konfigurationsdatei.$\r$\nSoll diese mit der allgemeinen Beispiel-Konfigurationsdatei überschrieben werden?"
 LangString TorOpenSSL                 ${LANG_GERMAN} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -39,7 +41,8 @@
 
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}"
+LangString PrivoxyGroupDesc           ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc          ${LANG_GERMAN} "Remove ${PRIVOXY_DESC}."
 LangString PrivoxyAppDesc             ${LANG_GERMAN} "Installiere ${PRIVOXY_DESC}."
 LangString PrivoxyShortcuts           ${LANG_GERMAN} "Zum Startmenü hinzufügen"
 LangString PrivoxyShortcutsDesc       ${LANG_GERMAN} "${PRIVOXY_NAME} zu Ihrem Startmenü hinzufügen."
@@ -48,6 +51,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_GERMAN} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_GERMAN} "Installiere ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_GERMAN} "Zu Firefox hinzufügen"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_GERMAN} "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufügen."

Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_en.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -34,6 +34,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_ENGLISH} "Install ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_ENGLISH} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_ENGLISH} "${VIDALIA_NAME} setup"
 LangString VidaliaWelcomeText         ${LANG_ENGLISH} "This wizard will guide you through the installation of ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_ENGLISH} "Welcome to the ${VIDALIA_NAME} Setup Wizard"
@@ -47,6 +48,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_ENGLISH} "Install ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_ENGLISH} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_ENGLISH} "Install ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_ENGLISH} "You already have a Tor configuration file.$\r$\nDo you want to overwrite it with the default sample configuration file?"
 LangString TorOpenSSL                 ${LANG_ENGLISH} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -57,7 +59,8 @@
 LangString TorShortcutsDesc           ${LANG_ENGLISH} "Add ${TOR_NAME} to your Start menu."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}"
+LangString PrivoxyGroupDesc           ${LANG_ENGLISH} "Install ${PRIVOXY_DESC}."
+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."
@@ -66,6 +69,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_ENGLISH} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_ENGLISH} "Add to Firefox"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_ENGLISH} "Add the ${TORBUTTON_DESC} extension to Firefox."

Modified: trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- trunk/pkg/win32/vidalia_es.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_es.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_SPANISH} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_SPANISH} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_SPANISH} "Instalación de ${VIDALIA_NAME}"
 LangString VidaliaWelcomeText         ${LANG_SPANISH} "Este procedimiento le guiara a través de la instalación de ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_SPANISH} "Bienvenido al procedimiento de instalación de ${VIDALIA_NAME}"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_SPANISH} "Instalar ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_SPANISH} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_SPANISH} "Instalar ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_SPANISH} "Ya tiene un archivo de configuración de Tor.$\r$\n¿Desea sobreescribirlo con el archivo de configuración de muestra predeterminado?"
 LangString TorOpenSSL                 ${LANG_SPANISH} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_SPANISH} "Agregar ${TOR_NAME} a su Menu Inicio."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_SPANISH} "Instalar ${PRIVOXY_DESC}"
+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ñadir al Menu Inicio"
 LangString PrivoxyShortcutsDesc       ${LANG_SPANISH} "Agregar ${PRIVOXY_NAME} a su Menu Inicio."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_SPANISH} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_SPANISH} "Instalar ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_SPANISH} "Adgregar a Firefox"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_SPANISH} "Agregar la extensión ${TORBUTTON_DESC} a Firefox."

Modified: trunk/pkg/win32/vidalia_fa.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fa.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_fa.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_FARSI} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_FARSI} "ÈÑ?Ç?? ${VIDALIA_NAME}"
 LangString VidaliaWelcomeText         ${LANG_FARSI} "Ç?æ ÏÓÊ?ÇÑ ÔåÇ ÑÇ ÏÑ ÓÑÊÇÓÑ ?ÇÑ?ÐÇÑ? ${VIDALIA_DESC} çÏÇ?Ê å? ?æÏ.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_FARSI} "Èç ÏÓÊ?ÇÑ ÈÑ?Ç?? ${VIDALIA_NAME} ÎèÔ ÂåÏ?Ï"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_FARSI} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_FARSI} "ÔåÇ ??ÔÊÑ ÏÇÑÇ? ?? ?ÑèæÏç ???ÑÈæÏ? ÊèÑ å? ÈÇÔ?Ï.$\r$\nÂ?Ç å? ÎèÇç?Ï Âæ ÑÇ ÈÇ ?ÑèæÏç ???ÑÈæÏ? æåèæç ??Ô ?Ò?Ïç ÌÇ? æèÔÊ ?æ?Ï"
 LangString TorOpenSSL                 ${LANG_FARSI} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_FARSI} "ÇáÒèÏæ ${TOR_NAME} Èç áçÑÓÊ ÂÚÇÒ."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${PRIVOXY_DESC}"
+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} Èç áçÑÓÊ ÂÚÇÒ."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_FARSI} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_FARSI} "?ÇÑ?ÐÇÑ? ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_FARSI} "ÇáÒèÏæ Èç áÇ?ÑáÇ?Ó"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_FARSI} "ÇáÒèÏæ ?ÓèæÏ ${TORBUTTON_DESC} Èç áÇ?ÑáÇ?Ó."

Modified: trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fi.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_fi.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -16,6 +16,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_FINNISH} "Asenna ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_FINNISH} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_FINNISH} "${VIDALIA_NAME} asennus"
 LangString VidaliaWelcomeText         ${LANG_FINNISH} "Tämä velho auttaa asentaakseen koneelle ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_FINNISH} "Tervetuloa ${VIDALIA_NAME}asennukseen"
@@ -30,6 +31,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_FINNISH} "Asenna ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_FINNISH} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_FINNISH} "Asenna ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_FINNISH} "Sinulla on jo ennestään Tor-asetustiedosto.$\r$\nHaluatko, että se korvataan oletusesimerkillä?"
 LangString TorOpenSSL                 ${LANG_FINNISH} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -41,7 +43,8 @@
 
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_FINNISH} "Install ${PRIVOXY_DESC}"
+LangString PrivoxyGroupDesc           ${LANG_FINNISH} "Install ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc          ${LANG_FINNISH} "Remove ${PRIVOXY_DESC}."
 LangString PrivoxyAppDesc             ${LANG_FINNISH} "Install ${PRIVOXY_DESC}."
 LangString PrivoxyShortcuts           ${LANG_FINNISH} "Lisää Käynnistä-valikkoon"
 LangString PrivoxyShortcutsDesc       ${LANG_FINNISH} "Lisää ${PRIVOXY_NAME} Käynnistä-valikkoon."
@@ -50,6 +53,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_FINNISH} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_FINNISH} "Asenna ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_FINNISH} "Lisää Firefoxiin"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_FINNISH} "Lisää ${TORBUTTON_DESC}-lisäosa Firefoxiin."

Modified: trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fr.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_fr.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_FRENCH} "Installer ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_FRENCH} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_FRENCH} "Mise à jour 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,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_FRENCH} "Installer ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_FRENCH} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_FRENCH} "Installer ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_FRENCH} "Vous avez déjà un fichier de configuration de Tor.$\r$\nVoulez-vous le remplacer par le fichier de configuration par défaut ?"
 LangString TorOpenSSL                 ${LANG_FRENCH} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_FRENCH} "Ajouter ${TOR_NAME} à votre Menu Démarrer."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_FRENCH} "Installer ${PRIVOXY_DESC}"
+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émarrer"
 LangString PrivoxyShortcutsDesc       ${LANG_FRENCH} "Ajouter ${PRIVOXY_NAME} à votre Menu Démarrer."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_FRENCH} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_FRENCH} "Installer ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_FRENCH} "Ajouter à Firefox"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_FRENCH} "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."

Modified: trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pl.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_pl.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_POLISH} "Instalacja ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_POLISH} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_POLISH} "Instalator ${VIDALIA_NAME}"
 LangString VidaliaWelcomeText         ${LANG_POLISH} "Kreator przeprowadzi Ciê przez proces instalacji ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_POLISH} "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_POLISH} "Instalacja ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_POLISH} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_POLISH} "Instalacja ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_POLISH} "Plik konfiguracji Tora ju¿ istnieje.$\r$\nCzy chcesz go nadpisaæ konfiguracj¹ domyœln¹ ?"
 LangString TorOpenSSL                 ${LANG_POLISH} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_POLISH} "Dodaj ${TOR_NAME} do Twojego menu Start."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}"
+LangString PrivoxyGroupDesc           ${LANG_POLISH} "Instalacja ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc          ${LANG_POLISH} "Remove ${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."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_POLISH} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_POLISH} "Instalacja ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_POLISH} "Dodaj do Firefox'a"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_POLISH} "Dodaj rozszerzenie ${TORBUTTON_DESC} do Firefox'a."

Modified: trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pt-br.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_pt-br.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_PORTUGUESEBR} "Instalar ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_PORTUGUESEBR} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_PORTUGUESEBR} "Instalação do ${VIDALIA_NAME}"
 LangString VidaliaWelcomeText         ${LANG_PORTUGUESEBR} "Este assistente irá guiá-lo através da instalação do ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_PORTUGUESEBR} "Bem vindo ao Assistente de Instalação do ${VIDALIA_NAME}"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_PORTUGUESEBR} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_PORTUGUESEBR} "Você já tem um arquivo de configuração do Tor.$\r$\nVocê deseja substituí-lo com o arquivo de exemplo de configuração padrão?"
 LangString TorOpenSSL                 ${LANG_PORTUGUESEBR} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_PORTUGUESEBR} "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_PORTUGUESEBR} "Instalar ${PRIVOXY_DESC}"
+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."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_PORTUGUESEBR} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_PORTUGUESEBR} "Instalar ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_PORTUGUESEBR} "Adicionar ao Firefox"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_PORTUGUESEBR} "Adicionar a extensão ${TORBUTTON_DESC} no Firefox."

Modified: trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- trunk/pkg/win32/vidalia_ru.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_ru.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_RUSSIAN} "Óñòàíîâèòü ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_RUSSIAN} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_RUSSIAN} "Óñòàíîâêà ${VIDALIA_NAME}"
 LangString VidaliaWelcomeText         ${LANG_RUSSIAN} "Ýòà ïðîãðàììà óñòàíîâèò ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_RUSSIAN} "Âàñ ïðèâåòñòâóåò ìàñòåð óñòàíîâêè ${VIDALIA_NAME}"
@@ -28,6 +29,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_RUSSIAN} "Óñòàíîâèòü ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_RUSSIAN} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_RUSSIAN} "Óñòàíîâèòü ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_RUSSIAN} "Ó âàñ óæå åñòü ôàéë íàñòðîåê Tor.$\r$\nÕîòèòå ëè âû ïåðåçàïèñàòü åãî ôàéëîì èç äèñòðèáóòèâà?"
 LangString TorOpenSSL                 ${LANG_RUSSIAN} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -40,6 +42,7 @@
 
 ; Privoxy
 LangString PrivoxyGroupDesc           ${LANG_RUSSIAN} "Óñòàíîâèòü ${PRIVOXY_DESC}."
+LangString PrivoxyUninstDesc          ${LANG_RUSSIAN} "Remove ${PRIVOXY_DESC}."
 LangString PrivoxyAppDesc             ${LANG_RUSSIAN} "Óñòàíîâèòü ${PRIVOXY_DESC}."
 LangString PrivoxyShortcuts           ${LANG_RUSSIAN} "ßðëûêè â Ãëàâíîå Ìåíþ"
 LangString PrivoxyShortcutsDesc       ${LANG_RUSSIAN} "Äîáàâèòü ${PRIVOXY_NAME} â Ãëàâíîå Ìåíþ."
@@ -49,6 +52,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_RUSSIAN} "Óñòàíîâèòü ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_RUSSIAN} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_RUSSIAN} "Óñòàíîâèòü ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_RUSSIAN} "Äîáàâèòü â Firefox"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_RUSSIAN} "Äîáàâèòü ðàñøèðåíèå ${TORBUTTON_DESC} â Firefox."

Modified: trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-cn.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_zh-cn.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_SIMPCHINESE} "°²× ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_SIMPCHINESE} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_SIMPCHINESE} "${VIDALIA_NAME} °²×Ïòµ¼"
 LangString VidaliaWelcomeText         ${LANG_SIMPCHINESE} "¸ÃÏò«»áÒýµ¼Äú°²× ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_SIMPCHINESE} "»¶ÓÊÓà ${VIDALIA_NAME} °²×Ïòµ¼"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_SIMPCHINESE} "°²× ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_SIMPCHINESE} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_SIMPCHINESE} "°²× ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_SIMPCHINESE} "°²×³ÌÐò¼ì²âÒÑæÔÚÄ Tor ÅäÖÃÎÄþ.$\r$\nÊÇñÒÊÓÃÄÈÏÄÅäÖÃÎÄþ¸²¸ÇËü?"
 LangString TorOpenSSL                 ${LANG_SIMPCHINESE} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_SIMPCHINESE} "Ìí¼Ó ${TOR_NAME} ÖÁªÊ²Ë¥³ÌÐò×é."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_SIMPCHINESE} "°²× ${PRIVOXY_DESC}"
+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} ÖÁªÊ²Ë¥³ÌÐò×é."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_SIMPCHINESE} "°²× ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_SIMPCHINESE} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_SIMPCHINESE} "°²× ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_SIMPCHINESE} "Ìí¼ÓÖÁðºü(Firefox)ä¯ÀÀÆ÷"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_SIMPCHINESE} "Ìí¼Ó ${TORBUTTON_DESC} ÀÕÖÁðºü(Firefox)ä¯ÀÀÆ÷."

Modified: trunk/pkg/win32/vidalia_zh-tw.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-tw.nsh	2007-05-11 06:17:51 UTC (rev 1731)
+++ trunk/pkg/win32/vidalia_zh-tw.nsh	2007-05-11 07:01:14 UTC (rev 1732)
@@ -14,6 +14,7 @@
 
 ; Vidalia
 LangString VidaliaGroupDesc           ${LANG_TRADCHINESE} "¦w¸Ë ${VIDALIA_DESC}."
+LangString VidaliaUninstDesc          ${LANG_TRADCHINESE} "Remove ${VIDALIA_DESC}."
 LangString VidaliaSetupCaption        ${LANG_TRADCHINESE} "${VIDALIA_NAME} ¦w¸ËÂQ¾É"
 LangString VidaliaWelcomeText         ${LANG_TRADCHINESE} "¦w¸ËëÆF±N·|¤ÞÉz¦w¸Ë ${VIDALIA_DESC}.\r\n\r\n$_CLICK"
 LangString VidaliaWelcomeTitle        ${LANG_TRADCHINESE} "Åwªï¨ÏÎ ${VIDALIA_NAME} ¦w¸ËëÆF"
@@ -27,6 +28,7 @@
 
 ; Tor
 LangString TorGroupDesc               ${LANG_TRADCHINESE} "¦w¸Ë ${TOR_DESC}."
+LangString TorUninstDesc              ${LANG_TRADCHINESE} "Remove ${TOR_DESC}."
 LangString TorAppDesc                 ${LANG_TRADCHINESE} "¦w¸Ë ${TOR_DESC}."
 LangString TorAskOverwriteTorrc       ${LANG_TRADCHINESE} "¦w¸Ë{¦¡ÀËú¨ì¤w¦s¦bªº Tor °t¸mÀÉ×.$\r$\n¬O§_­n¨ÏÎÀq»{ªº°t¸mÀÉ×ÂÐ\¥¦?"
 LangString TorOpenSSL                 ${LANG_TRADCHINESE} "OpenSSL ${OPENSSL_APPVERSION}"
@@ -37,7 +39,8 @@
 LangString TorShortcutsDesc           ${LANG_TRADCHINESE} "²K¥[ ${TOR_NAME} ¦Ü}©lµæ³æµ{¦¡¶°."
 
 ; Privoxy
-LangString PrivoxyGroupDesc           ${LANG_TRADCHINESE} "¦w¸Ë ${PRIVOXY_DESC}"
+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µæ³æµ{¦¡¶°."
@@ -46,6 +49,7 @@
 
 ; Torbutton
 LangString TorbuttonGroupDesc         ${LANG_TRADCHINESE} "¦w¸Ë ${TORBUTTON_DESC}."
+LangString TorbuttonUninstDesc        ${LANG_TRADCHINESE} "Remove ${TORBUTTON_DESC}."
 LangString TorbuttonAppDesc           ${LANG_TRADCHINESE} "¦w¸Ë ${TORBUTTON_DESC}."
 LangString TorbuttonAddToFirefox      ${LANG_TRADCHINESE} "²K¥[¦Üõª°(Firefox)ÂsÄý¾¹"
 LangString TorbuttonAddToFirefoxDesc  ${LANG_TRADCHINESE} "²K¥[ ${TORBUTTON_DESC} ÂX®i¦Üõª°(Firefox)ÂsÄý¾¹."