# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1181737225 0
# Node ID bfd44bbb5909397c880b286a9c7a0ab17743566b
# Parent  b0a1782b90d2cfdba54f3513d2ce5e736d300e02
Clean up information displayed in the Add/Remove Programs section on Windows. Fixes #1646.

diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/langmacros.nsh
--- a/pidgin/win32/nsis/langmacros.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -57,7 +57,6 @@
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE		${CUR_LANG}
 
   ; Pidgin Section Prompts and Texts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_UNINSTALL_DESC			${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
 
   ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Jun 13 12:20:25 2007 +0000
@@ -431,7 +431,11 @@
     WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
-    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
+    WriteRegDWORD HKLM "${PIDGIN_UNINSTALL_KEY}" "NoModify" 1
+    WriteRegDWORD HKLM "${PIDGIN_UNINSTALL_KEY}" "NoRepair" 1
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
     ; Sets scope of the desktop and Start Menu entries for all users.
     SetShellVarContext "all"
@@ -444,7 +448,11 @@
 
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
-    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
+    WriteRegDWORD HKCU "${PIDGIN_UNINSTALL_KEY}" "NoModify" 1
+    WriteRegDWORD HKCU "${PIDGIN_UNINSTALL_KEY}" "NoRepair" 1
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
     Goto pidgin_install_files
 
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/afrikaans.nsh
--- a/pidgin/win32/nsis/translations/afrikaans.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/afrikaans.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besoek die WinPidgin-webblad"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (slegs verwydering)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Kan nie die tans ge�nstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal ge�nstalleer word sonder om die huidige een te verwyder."
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/albanian.nsh
--- a/pidgin/win32/nsis/translations/albanian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/albanian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Pidgin-it për Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (vetëm hiq)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Shtegu që treguat nuk mund të arrihet ose krijohet."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/bulgarian.nsh
--- a/pidgin/win32/nsis/translations/bulgarian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -21,9 +21,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"����� ������ GTK+ runtime � �������. ������ �� �� ��������?$\rNote: Pidgin ���� �� �� ������� ��� �� �� ���������."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (���� ����������)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"������ ��� ����������� �� GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"���������� ��� �� ���� �� ���� �������� ��� ��������."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/catalan.nsh
--- a/pidgin/win32/nsis/translations/catalan.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/catalan.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Pidgin per Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nom�s esborrar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci� GTK+."
 !define GTK_BAD_INSTALL_PATH			"El directori que has introdu�t no pot �sser accedit o creat."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/czech.nsh
--- a/pidgin/win32/nsis/translations/czech.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/czech.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Pidgin Web Page"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (odinstalovat)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba p�i instalaci GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta je nedostupn�, nebo ji nelze vytvo�it."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/danish.nsh
--- a/pidgin/win32/nsis/translations/danish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/danish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�g Windows Pidgin's hjemmeside"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (fjern)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du har angivet kan ikke findes eller oprettes."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/dutch.nsh
--- a/pidgin/win32/nsis/translations/dutch.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/dutch.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -31,9 +31,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Pidgin webpagina"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (alleen verwijderen)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
 !define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/english.nsh
--- a/pidgin/win32/nsis/translations/english.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -38,10 +38,9 @@
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
 
 ; Installer Finish Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the WinPidgin Web Page"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the Pidgin Web Page"
 
 ; Pidgin Section Prompts and Texts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version."
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/finnish.nsh
--- a/pidgin/win32/nsis/translations/finnish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidinin Windows -sivustolla"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (vain poisto)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Antamasi polku ei toimi tai sit� ei voi luoda."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/french.nsh
--- a/pidgin/win32/nsis/translations/french.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -42,7 +42,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (supprimer uniquement)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossible de d�sinstaller la version de Pidgin en place. La nouvelle version sera install�e sans supprimer la version en place."
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/galician.nsh
--- a/pidgin/win32/nsis/translations/galician.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/galician.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo eliminar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
 !define GTK_BAD_INSTALL_PATH			"Non se puido acceder ou crear a ruta que vd. indicou."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/german.nsh
--- a/pidgin/win32/nsis/translations/german.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -39,7 +39,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Windows Pidgin Webseite"
  
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nur entfernen)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gel�scht wird."
  
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/hebrew.nsh
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -39,7 +39,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� �� "
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�� ����� ����� �� ������ ������� �� ����'��. ������ ����� ����� ��� ���� ����� �������."
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/hungarian.nsh
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal�nak felkeres�se"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (csak elt�vol�t�s)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"A Pidgin jelenleg telep�tett v�ltozata nem t�vol�that� el. Az �j verzi� a jelenleg telep�tett verzi� elt�vol�t�sa n�lk�l ker�l telep�t�sre. "
 
 
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/italian.nsh
--- a/pidgin/win32/nsis/translations/italian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -25,10 +25,7 @@
 !define GTK_UPGRADE_PROMPT			"� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows" 
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (solo rimozione)"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/japanese.nsh
--- a/pidgin/win32/nsis/translations/japanese.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/japanese.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -38,9 +38,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows Pidgin��Web�y�[�W��K����������B"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (�폜�̂�)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+�����^�C���̃C���X�g�[���ŃG���[���������܂����B"
 !define GTK_BAD_INSTALL_PATH			"���Ȃ��̓��͂����p�X�ɃA�N�Z�X�܂��͍쐬�ł��܂���B"
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/korean.nsh
--- a/pidgin/win32/nsis/translations/korean.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/korean.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -19,9 +19,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"���� ���� GTK+ ��Ÿ���� ã�ҽ��ϴ�. ���׷��̵��ұ��?$\rNote: ���׷��̵����� ������ ������ �������� ���� ���� �ֽ��ϴ�."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ ��Ÿ�� ��ġ �� ���� �߻�."
 !define GTK_BAD_INSTALL_PATH			"�Է��Ͻ� ��ο� ������ �� ���ų� ���� �� �������ϴ�."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/kurdish.nsh
--- a/pidgin/win32/nsis/translations/kurdish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/kurdish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -37,9 +37,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Were Malpera Pidgin a Windows�"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (bi ten� rake)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de �ewt� derket."
 !define GTK_BAD_INSTALL_PATH			"r�ya te niv�sand nay� gihi�tin an afirandin."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/lithuanian.nsh
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -34,9 +34,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Windows Pidgin tinklalap�"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (tik pa�alinti)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
 !define GTK_BAD_INSTALL_PATH			"J�s� nurodytas katalogas neprieinamas ar negali b�ti sukurtas."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/norwegian.nsh
--- a/pidgin/win32/nsis/translations/norwegian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/norwegian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Pidgin for Windows' Nettside"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (kun avinstallering)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/polish.nsh
--- a/pidgin/win32/nsis/translations/polish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/polish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Wejd� na stron� Pidgin Web Page"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (usu� program)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"B��d instalacji runtime-a GTK+."
 !define GTK_BAD_INSTALL_PATH			"Nie ma dost�pu do wybranej �cie�ki / �aty."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/portuguese-br.nsh
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -31,9 +31,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu��o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar a menos que voc� o fa�a."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (apenas remover)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu��o do GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que voc� digitou n�o p�de ser acessado ou criado."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/portuguese.nsh
--- a/pidgin/win32/nsis/translations/portuguese.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a P�gina Web do Pidgin para Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remover apenas)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu��o GTK+."
 !define GTK_BAD_INSTALL_PATH			"O caminho que digitou n�o pode ser acedido nem criado."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/romanian.nsh
--- a/pidgin/win32/nsis/translations/romanian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/romanian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -35,9 +35,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizita�i pagina de web Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (doar dezinstalare)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
 !define GTK_BAD_INSTALL_PATH			"Directorul specificat nu poate fi accesat sau creat."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/russian.nsh
--- a/pidgin/win32/nsis/translations/russian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/russian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"�������� ���-�������� Pidgin ��� ������������� Windows."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"Pidgin (������ ��������)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"������ ��� ��������� ��������� GTK+."
 !define GTK_BAD_INSTALL_PATH			"���� ������� �� ����� ���������� ��� �� ����������."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/serbian-latin.nsh
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -19,9 +19,6 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) mo�da ne�e raditi."
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo uklanjanje)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
 !define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/simp-chinese.nsh
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -36,9 +36,6 @@
 ; Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"��� Windows Pidgin ��ҳ"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (ֻ��ɾ��)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"��װ GTK+ ����ʱ��ʧ�ܡ�"
 !define GTK_BAD_INSTALL_PATH			"�޷����ʻ򴴽��������·����"
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/slovak.nsh
--- a/pidgin/win32/nsis/translations/slovak.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovak.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -36,9 +36,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (len odstr�ni�)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Zadan� cesta nie je pr�stupn� alebo ju nie je mo�n� vytvori�."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/slovenian.nsh
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -38,7 +38,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Pidgin"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo odstrani)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Trenutno name��ene razli�ice Pidgina ni mogo�e odstraniti. Nova razli�ica bo name��ena brez odstranitve trenutno name��ene razli�ice."
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/spanish.nsh
--- a/pidgin/win32/nsis/translations/spanish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/spanish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -27,9 +27,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Pidgin Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo eliminar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
 !define GTK_BAD_INSTALL_PATH			"No se pudo acceder o crear la ruta que vd. indic�."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/swedish.nsh
--- a/pidgin/win32/nsis/translations/swedish.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (enbart f�r avinstallation)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/trad-chinese.nsh
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -40,7 +40,6 @@
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"���X Windows Pidgin ����"
 
 ; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (�u�Ѳ���)"
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�L�k�����ثe�w�w�˪� Pidgin�A�s�����N�b���g�����ª��������p�U�i��w�ˡC"
 
 ; GTK+ Section Prompts
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/valencian.nsh
--- a/pidgin/win32/nsis/translations/valencian.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/valencian.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -39,9 +39,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina de Pidgin per a Windows"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nomes borrar)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
 !define GTK_BAD_INSTALL_PATH			"La ruta introduida no pot ser accedida o creada."
diff -r b0a1782b90d2 -r bfd44bbb5909 pidgin/win32/nsis/translations/vietnamese.nsh
--- a/pidgin/win32/nsis/translations/vietnamese.nsh	Wed Jun 13 12:09:58 2007 +0000
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh	Wed Jun 13 12:20:25 2007 +0000
@@ -28,9 +28,6 @@
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Pidgin"
 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (chỉ bỏ cài đặt)"
-
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."
 !define GTK_BAD_INSTALL_PATH			"Đường dẫn mà bạn nhập có thể không truy cập được hay không tạo được."