changeset 14376:b2d0b4ca2cf3

[gaim-migrate @ 17082] It really isn't smart for us to blow away the previous install directory (we do ask nicely, but it still isn't good) if the uninstaller for the previous version fails, so now we offer the choice between "continue regardless" or "cancel installing". It would really be ideal if we could get these translations done through gettext or something. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 30 Aug 2006 02:40:56 +0000
parents f597127368de
children f5f2c3948b48
files gaim-installer.nsi gtk/win32/nsis/langmacros.nsh gtk/win32/nsis/translations/albanian.nsh gtk/win32/nsis/translations/bulgarian.nsh gtk/win32/nsis/translations/catalan.nsh gtk/win32/nsis/translations/czech.nsh gtk/win32/nsis/translations/danish.nsh gtk/win32/nsis/translations/dutch.nsh gtk/win32/nsis/translations/english.nsh gtk/win32/nsis/translations/finnish.nsh gtk/win32/nsis/translations/french.nsh gtk/win32/nsis/translations/galician.nsh gtk/win32/nsis/translations/german.nsh gtk/win32/nsis/translations/hebrew.nsh gtk/win32/nsis/translations/hungarian.nsh gtk/win32/nsis/translations/italian.nsh gtk/win32/nsis/translations/japanese.nsh gtk/win32/nsis/translations/korean.nsh gtk/win32/nsis/translations/kurdish.nsh gtk/win32/nsis/translations/lithuanian.nsh gtk/win32/nsis/translations/norwegian.nsh gtk/win32/nsis/translations/polish.nsh gtk/win32/nsis/translations/portuguese-br.nsh gtk/win32/nsis/translations/portuguese.nsh gtk/win32/nsis/translations/romanian.nsh gtk/win32/nsis/translations/russian.nsh gtk/win32/nsis/translations/serbian-latin.nsh gtk/win32/nsis/translations/simp-chinese.nsh gtk/win32/nsis/translations/slovak.nsh gtk/win32/nsis/translations/slovenian.nsh gtk/win32/nsis/translations/spanish.nsh gtk/win32/nsis/translations/swedish.nsh gtk/win32/nsis/translations/trad-chinese.nsh gtk/win32/nsis/translations/valencian.nsh gtk/win32/nsis/translations/vietnamese.nsh
diffstat 35 files changed, 53 insertions(+), 148 deletions(-) [+]
line wrap: on
line diff
--- a/gaim-installer.nsi	Tue Aug 29 21:09:43 2006 +0000
+++ b/gaim-installer.nsi	Wed Aug 30 02:40:56 2006 +0000
@@ -224,6 +224,7 @@
   IfErrors +3
   StrCpy $STARTUP_RUN_KEY "HKCU"
   Goto +4
+  ClearErrors
   ReadRegStr $STARTUP_RUN_KEY HKLM "${GAIM_STARTUP_RUN_KEY}" "Gaim"
   IfErrors +2
   StrCpy $STARTUP_RUN_KEY "HKLM"
@@ -269,26 +270,9 @@
               Goto uninstall_problem
 
         uninstall_problem:
-          ; In this case just wipe out previous Gaim install dir..
-          ; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry
-          ; and versions 0.60 and lower did not correctly set the uninstall reg string
-          ; (the string was set in quotes)
-          IfSilent do_wipeout
-          MessageBox MB_YESNO $(GAIM_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
-          cancel_install:
-            Quit
-
-          do_wipeout:
-            StrCmp $R0 "HKLM" gaim_del_lm_reg gaim_del_cu_reg
-            gaim_del_cu_reg:
-              DeleteRegKey HKCU ${GAIM_REG_KEY}
-              Goto uninstall_prob_cont
-            gaim_del_lm_reg:
-              DeleteRegKey HKLM ${GAIM_REG_KEY}
-
-            uninstall_prob_cont:
-              RMDir /r "$R1"
-
+          ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
+          MessageBox MB_OKCANCEL $(GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
+          Quit
   done:
 SectionEnd
 
@@ -327,9 +311,7 @@
 
   upgrade_gtk:
     StrCpy $GTK_FOLDER $R6
-    IfSilent skip_mb
-    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) IDNO done
-    skip_mb:
+    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
     ClearErrors
     ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
     Goto gtk_install_cont
@@ -341,9 +323,7 @@
 
     gtk_install_error:
       Delete "$TEMP\gtk-runtime.exe"
-      IfSilent skip_mb1
-      MessageBox MB_OK $(GTK_INSTALL_ERROR) IDOK
-      skip_mb1:
+      MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
       Quit
 
   have_gtk:
@@ -771,15 +751,11 @@
     Goto done
 
   cant_uninstall:
-    IfSilent skip_mb
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_1) IDOK
-    skip_mb:
+    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_1) /SD IDOK
     Quit
 
   no_rights:
-    IfSilent skip_mb1
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_2) IDOK
-    skip_mb1:
+    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_2) /SD IDOK
     Quit
 
   done:
@@ -901,9 +877,7 @@
       Goto done
 
     no_rights:
-      IfSilent skip_mb
-      MessageBox MB_OK $(GTK_NO_THEME_INSTALL_RIGHTS) IDOK
-      skip_mb:
+      MessageBox MB_OK $(GTK_NO_THEME_INSTALL_RIGHTS) /SD IDOK
       StrCpy $1 ""
 
     done:
@@ -1209,7 +1183,7 @@
   Push $R0
   System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "gaim_is_running") i .R0'
   IntCmp $R0 0 done
-  MessageBox MB_OK|MB_ICONEXCLAMATION $(GAIM_IS_RUNNING) IDOK
+  MessageBox MB_OK|MB_ICONEXCLAMATION $(GAIM_IS_RUNNING) /SD IDOK
     Abort
   done:
   Pop $R0
@@ -1223,7 +1197,7 @@
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gaim_installer_running") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING)
+    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) /SD IDOK
     Abort
   Call RunCheck
   StrCpy $name "Gaim ${GAIM_VERSION}"
@@ -1263,6 +1237,7 @@
   ReadRegStr $INSTDIR HKCU "${GAIM_REG_KEY}" ""
   IfErrors +2
   StrCmp $INSTDIR "" 0 instdir_done
+  ClearErrors
   ReadRegStr $INSTDIR HKLM "${GAIM_REG_KEY}" ""
   IfErrors +2
   StrCmp $INSTDIR "" 0 instdir_done
@@ -1375,9 +1350,7 @@
 
     StrCmp $R0 "0" have_gtk need_gtk
     need_gtk:
-      IfSilent skip_mb
-      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) IDOK
-      skip_mb:
+      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
       Quit
     have_gtk:
     Pop $R0
@@ -1432,9 +1405,7 @@
   Call VerifyDir
   Pop $R0
   StrCmp $R0 "0" 0 done
-    IfSilent skip_mb
-    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) IDOK
-    skip_mb:
+    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK
     Abort
   done:
   Pop $R0
@@ -1768,7 +1739,7 @@
     Pop $R1
     StrCmp $R1 "" +3
     StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" IDRETRY retry IDCANCEL done
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
   retry_dict:
     Push $R0
@@ -1776,7 +1747,7 @@
     Pop $R1
     StrCmp $R1 "" +3
     StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" IDRETRY retry_dict
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" /SD IDCANCEL IDRETRY retry_dict
 
   done:
 
--- a/gtk/win32/nsis/langmacros.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/langmacros.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -29,9 +29,9 @@
   ; String labels should match those from the default language file.
 
   ; Startup checks
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_IS_RUNNING				${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_IS_RUNNING			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED		${CUR_LANG}
 
   ; License Page
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BUTTON			${CUR_LANG}
@@ -67,12 +67,11 @@
 
   ; Gaim Section Prompts and Texts
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_UNINSTALL_DESC			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_WIPEOUT			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_DIR_EXISTS		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
 
   ; GTK+ Section Prompts
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
 
   ; GTK+ Themes section
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_INSTALL_RIGHTS		${CUR_LANG}
--- a/gtk/win32/nsis/translations/albanian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/albanian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (vetëm hiq)"
-!define GAIM_PROMPT_WIPEOUT			"Është gati për t'u fshirë drejtoria juaj e vjetër Gaim. Doni të vazhdohet?$\r$\rShënim: Do të fshihet çfarëdo shtojceë jo standarde që mund të keni instaluar.$\rNuk do të preken rregullime Gaim përdoruesash."
-!define GAIM_PROMPT_DIR_EXISTS		"Drejtoria e instalimit që treguat ekziston tashmë. Çfarëdo përmbajtje$\rdo të fshihet. Do të donit të vazhdohet?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
--- a/gtk/win32/nsis/translations/bulgarian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/bulgarian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -32,8 +32,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim ( )"
-!define GAIM_PROMPT_WIPEOUT			"  Gaim    .    ?$\r$\r:         .$\r  Gaim    ."
-!define GAIM_PROMPT_DIR_EXISTS		"   .     $\r  .    ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"    GTK+ runtime."
--- a/gtk/win32/nsis/translations/catalan.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/catalan.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -49,8 +49,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (noms esborrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antic de Gaim ser esborrat. Vols continuar?$\r$\rNota: Els plugins no estndards que tinguis instal.lats seran esborrats.$\rLes preferncies d'usuari de Gaim no es veruan afectades."
-!define GAIM_PROMPT_DIR_EXISTS			"El directori d'instal.laci que has especificat ja existeix. Tots els continguts$\rseran esborrats. Vols continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci GTK+."
--- a/gtk/win32/nsis/translations/czech.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/czech.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (odinstalovat)"
-!define GAIM_PROMPT_WIPEOUT			"V star adres pro Gaim bude vymazn. Chcete pokraovat?$\r$\rUpozornn: Jakkoli nestandardn rozen (plugin) , kter mte nainstalovna budou ztracena.$\rUivatelsk nastaven pro Gaim budou zachovna."
-!define GAIM_PROMPT_DIR_EXISTS		"Adres kter byl zadn pro instalaci ji existuje. Veker obsah$\rbude smazn. Chcete pokraovat?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pi instalaci GTK+ runtime."
--- a/gtk/win32/nsis/translations/danish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/danish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (fjern)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim folder vil blive slettet. nsker du at fortstte? $\r$\rNB: Alle ikke-standard plugins du mtte have installeret vil blive slettet.$\rGaim brugerindstillinger vil ikke blive pvirket af dette."
-!define GAIM_PROMPT_DIR_EXISTS		"Den nskede installationsfolder eksisterer allerede. Ethvert indhold$\ri folderen vil blive slettet. nsker du at fortstte?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
--- a/gtk/win32/nsis/translations/dutch.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/dutch.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -42,8 +42,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
-!define GAIM_PROMPT_WIPEOUT			"Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf genstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
-!define GAIM_PROMPT_DIR_EXISTS		"De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
--- a/gtk/win32/nsis/translations/english.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/english.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -13,34 +13,34 @@
 
 ; Startup Checks
 !insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING			"An instance of Gaim is currently running. Exit Gaim and then try again."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING				"An instance of Gaim is currently running. Exit Gaim and then try again."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON			"Next >"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT			"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (required)"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE		"GTK+ Themes"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE			"GTK+ Themes"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE		"Wimp Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE	"Bluecurve Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_TITLE "Shortcuts"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menu"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION		"Core Gaim files and dlls"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE			"Wimp Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE		"Light House Blue Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_TITLE		"Shortcuts"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION			"Core Gaim files and dlls"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION			"A multi-platform GUI toolkit, used by Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Themes can change the look and feel of GTK+ applications."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Shortcuts for starting Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_DESC   "Create a shortcut to Gaim on the Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_DESC   "Create a Start Menu entry for Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC			"The Bluecurve theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Gaim on the Desktop"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Gaim"
 
 ; GTK+ Directory Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do."
@@ -50,15 +50,14 @@
 
 ; Gaim Section Prompts and Texts
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_UNINSTALL_DESC			"Gaim (remove only)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_WIPEOUT			"Your old Gaim directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGaim user settings will not be affected."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Gaim. The new version will be installed without removing the currently installed version."
 
 ; GTK+ Section Prompts
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
 
 ; GTK+ Themes section
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS	"You do not have permission to install a GTK+ theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS		"You do not have permission to install a GTK+ theme."
 
 ; Uninstall Section Prompts
 !insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."
--- a/gtk/win32/nsis/translations/finnish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/finnish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (vain poisto)"
-!define GAIM_PROMPT_WIPEOUT			"Vanha Gaim-hakemistosi poistetaan. Tahdotko jatkaa?$\r$\rHuomio: Jokainen jlkeenpin asennettu lisosa poistetaan.$\rGaimin kyttjasetuksissa ei tapahdu muutoksia."
-!define GAIM_PROMPT_DIR_EXISTS		"Antamasti hakemisto on jo olemassa. Kaikki tiedot poistetaan $\r. Tahdotko jatkaa?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
--- a/gtk/win32/nsis/translations/french.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/french.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -51,8 +51,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
-!define GAIM_PROMPT_WIPEOUT			"L'ancien dossier de Gaim va tre supprim. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez installs seront aussi supprims.$\rLes configurations et les comptes utilisateurs de Gaim ne sont pas touchs."
-!define GAIM_PROMPT_DIR_EXISTS			"Le dossier d'installation que vous avez choisi existe dj. Son contenu sera effac.$\rVoulez-vous continuer ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erreur lors de l'installation des bibliothques GTK+"
--- a/gtk/win32/nsis/translations/galician.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/galician.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (slo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"O seu directorio antigo de Gaim vai ser borrado. Desexa continuar?$\r$\rObservacin: calquer aplique non estndar que puidera haber instalado borrarase.$\rIsto non afectar s sas preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"O directorio de instalacin que especificou xa existe. Todos os contidos$\rsern borrados. Desexa continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
--- a/gtk/win32/nsis/translations/german.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/german.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -48,8 +48,6 @@
  
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
-!define GAIM_PROMPT_WIPEOUT			"Ihre altes Gaim-Verzeichnis soll gelscht werden. Mchten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgelscht. Gaim-Benutzereinstellungen sind nicht betroffen."
-!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, das Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelscht. Mchten Sie fortfahren?"
  
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
--- a/gtk/win32/nsis/translations/hebrew.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/hebrew.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"GAIM ( )"
-!define GAIM_PROMPT_WIPEOUT			"?  .  GAIM $\r$\rNote: :    .$\r.   "
-!define GAIM_PROMPT_DIR_EXISTS		"   .   $\r?. "
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			".GTK+   "
--- a/gtk/win32/nsis/translations/hungarian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/hungarian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (csak eltvolts)"
-!define GAIM_PROMPT_WIPEOUT			"Az n korbbi Gaim knyvtra trlve lesz. Folytatni szeretn?$\r$\rMegjegyzs: Minden n ltal teleptett bovtmny trlve lesz.$\rA Gaim felhasznli belltsokra ez nincs hatssal."
-!define GAIM_PROMPT_DIR_EXISTS			"A megadott teleptsi knyvtr mr ltezik. A tartalma trlve lesz.$\rFolytatni szeretn?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtatkrnyezet teleptse kzben."
--- a/gtk/win32/nsis/translations/italian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/italian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (solo rimozione)"
-!define GAIM_PROMPT_WIPEOUT			"La tua vecchia directory di Gaim sta per essere cancellata. Vuoi andare avanti?$\r$\rNota: Tutti i plugin non standard che hai installato saranno cancellati.$\rLe impostazioni di Gaim non saranno rimosse."
-!define GAIM_PROMPT_DIR_EXISTS		"La directory di installazione specificata esiste gi. Tutto il contenuto$\rverr cancellato. Vuoi continuare?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
--- a/gtk/win32/nsis/translations/japanese.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/japanese.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -48,8 +48,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (폜̂)"
-!define GAIM_PROMPT_WIPEOUT			"ÂGaim̃tH_̍폜ɊւāBs܂?$\r$\r: Ȃ̃CXg[ׂĂ̔WȃvOC͍폜܂B$\rGaim̐ݒ͉e󂯂܂B"
-!define GAIM_PROMPT_DIR_EXISTS			"Ȃ̎w肵CXg[̃tH_͂łɑ݂Ă܂Beׂ͂$\r폜܂Bs܂?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+^C̃CXg[ŃG[܂B"
--- a/gtk/win32/nsis/translations/korean.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/korean.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -31,8 +31,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (remove only)"
-!define GAIM_PROMPT_WIPEOUT			" 丮  Դϴ.  ұ?$\r$\rNote: ǥ ÷    ֽϴ.$\r    ġ ʽϴ."
-!define GAIM_PROMPT_DIR_EXISTS		"ԷϽ ġ 丮 ̹ ֽϴ. ȿ     ֽϴ. ұ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ Ÿ ġ   ߻."
--- a/gtk/win32/nsis/translations/kurdish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/kurdish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -48,8 +48,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (bi ten rake)"
-!define GAIM_PROMPT_WIPEOUT			"Peldanka Gaim ya kevn ya te niha t jbirin. Tu dixwaz bidomn?$\r$\rNot: Plugin yn nestandart yn te tn jbirin. .$\rVbijerkn bikarhner n Gaim nayn guherandin."
-!define GAIM_PROMPT_DIR_EXISTS		"Peldanka sazkirin ya tu hilbijart heye. Naveroka w $\rt jbirin. Tu dixwaz bidomn?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de ewt derket."
--- a/gtk/win32/nsis/translations/lithuanian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/lithuanian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -45,8 +45,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (tik paalinti)"
-!define GAIM_PROMPT_WIPEOUT			"Js senasis Gaim katalogas tuoj turt bti itrintas. Ar norite tsti?$\r$\rPastaba: bet kokie nestandartiniai papildiniai, jeigu toki diegte, bus paalinti.$\rGaim vartotojo nustatymai nebus paliesti."
-!define GAIM_PROMPT_DIR_EXISTS			"Nurodytas diegimo katalogas jau yra. Jo turinys$\rbus paalintas. Ar norite tsti?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
--- a/gtk/win32/nsis/translations/norwegian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/norwegian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (kun avinstallering)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim-katalog holder p  slettes. nsker du  fortsette?$\r$\rMerk: Eventuelle ikke-standard plugin'er du har installert vil bli slettet.$\rGaims brukerinstillinger vil ikke bli berrt."
-!define GAIM_PROMPT_DIR_EXISTS			"Installasjonskatalogen du har spesifisert finnes fra fr. Eventuelt innhold$\rvil bli slettet. nsker du  fortsette?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
--- a/gtk/win32/nsis/translations/polish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/polish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (usu program)"
-!define GAIM_PROMPT_WIPEOUT			"Stary katalog Gaim zosta usunity. Czy chcesz kontunuowa?$\r$\rNote: Wszystkie stare - niestandardowe plugin-y zostay usunite.$\r Ustawienia uutkownika Gaim bd wyczone."
-!define GAIM_PROMPT_DIR_EXISTS		"Wybrany katalog instalacyjny ju istnieje. Jego zawarto $\r zostanie skasowana. Czy chcesz kontunuowa?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Bd instalacji runtime-a GTK+."
--- a/gtk/win32/nsis/translations/portuguese-br.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/portuguese-br.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -42,8 +42,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (apenas remover)"
-!define GAIM_PROMPT_WIPEOUT			"Sua antiga instalao do Gaim est prestes a ser removida. Voc gostaria de continuar?$\r$\rNota: Quaisquer plugins no-padro que voc pode ter instalado sero removidos.$\rAs configuraes de usurio do Gaim no sero afetadas."
-!define GAIM_PROMPT_DIR_EXISTS		"O diretrio de instalao do que voc especificou j existe. Qualquer contedo$\rser deletado. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execuo do GTK+."
--- a/gtk/win32/nsis/translations/portuguese.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/portuguese.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
-!define GAIM_PROMPT_WIPEOUT			"A directoria antiga do Gaim est prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins no-padro que poder ter instalado sero removidos.$\rAs configuraes de utilizador do Gaim no sero afectadas."
-!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instalao que especificou j existe. Qualquer contedo$\rser removido. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execuo GTK+."
--- a/gtk/win32/nsis/translations/romanian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/romanian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -46,8 +46,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (doar dezinstalare)"
-!define GAIM_PROMPT_WIPEOUT			"Vechiul director Gaim va fi ters. Dorii s continuai?$\r$\rNot: Orice module externe vor fi terse.$\rSetrile utilizatorilor Gaim nu vor fi afectate."
-!define GAIM_PROMPT_DIR_EXISTS		"Directorul ales pentru instalare exist deja.$\rConinutul su va fi ters. Dorii s continuai?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
--- a/gtk/win32/nsis/translations/russian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/russian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim ( )"
-!define GAIM_PROMPT_WIPEOUT			"   Gaim   .    ?$\r$\r:        ..$\r  Gaim  ."
-!define GAIM_PROMPT_DIR_EXISTS		",       .  $\r .   ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"    GTK+."
--- a/gtk/win32/nsis/translations/serbian-latin.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/serbian-latin.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -31,8 +31,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (samo uklanjanje)"
-!define GAIM_PROMPT_WIPEOUT			"Va stari Gaim direktorijum e biti obrisan. Da li elite da nastavite?$\r$\rPrimedba: Svi nestandardni dodaci koje ste instalirali e biti obrisani.$\rGaim postavke korisnika nee biti promenjene."
-!define GAIM_PROMPT_DIR_EXISTS		"Instalacioni direktorijum koji ste naveli ve postoji. Sav sadraj$\re biti obrisan. Da li elite da nastavite?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Greka prilikom instalacije GTK+ okoline za izvravanje."
--- a/gtk/win32/nsis/translations/simp-chinese.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/simp-chinese.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (ֻɾ)"
-!define GAIM_PROMPT_WIPEOUT			"ɾľ Gaim Ŀ¼Ҫ?$\r$\rע: װκηDZ׼IJɾ$\rDzӰ Gaim ûá"
-!define GAIM_PROMPT_DIR_EXISTS		"ָİװĿ¼Ѿڡ$\rݶɾҪ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"װ GTK+ ʱʧܡ"
--- a/gtk/win32/nsis/translations/slovak.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/slovak.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (len odstrni)"
-!define GAIM_PROMPT_WIPEOUT			"V adresr Gaim bude zmazan. Chcete pokraova?$\r$\rPoznmka: Vetky prdavne pluginy, ktor ste naintalovali bud tie zmazan.$\rNastavenia uivateskho tu Gaim-u bud ponechan."
-!define GAIM_PROMPT_DIR_EXISTS			"Adresr, ktor ste zadali, u existuje. Jeho obsah bude zmazan. Chcete pokraova?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri intalcii GTK+ runtime."
--- a/gtk/win32/nsis/translations/slovenian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/slovenian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (samo odstrani)"
-!define GAIM_PROMPT_WIPEOUT			"Va star imenik Gaim bo zbrisan. elite nadaljevati?$\r$\rOpomba: Vsi nestandardni vtiniki, ki ste jih namestili, bodo zbrisani.$\rUporabnike nastavitve za Gaim se bodo ohranile."
-!define GAIM_PROMPT_DIR_EXISTS			"Namestitveni imenik, ki ste ga navedli, e obstaja. Vsa vsebina$\rbo zbrisana. elite nadaljevati?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
--- a/gtk/win32/nsis/translations/spanish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/spanish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (slo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"Su directorio antigo de Gaim va a ser borrado. Desea continuar?$\r$\rObservacin: cualquier aplique no estndar que pudiera haber instalado ser borrado.$\rsto no afectar a sus preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"El directorio de instalacin que ha especificado ya existe. Todos los contenidos$\rser borrados. Desea continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
--- a/gtk/win32/nsis/translations/swedish.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/swedish.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -50,8 +50,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (enbart fr avinstallation)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamla Gaim-katalog kommer att raderas, vill du fortstta?$\r$\rOBS! om du har installerat ngra extra insticksmoduler kommer de raderas.$\rGaims anvndarinstllningar kommer inte pverkas."
-!define GAIM_PROMPT_DIR_EXISTS		"Den katalog du vill installera i finns redan. Allt i katalogen$\rkommer att raderas, vill du fortstta?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
--- a/gtk/win32/nsis/translations/trad-chinese.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/trad-chinese.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -2,7 +2,7 @@
 ;;  trad-chinese.nsh
 ;;
 ;;  Traditional Chineese language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page:950 
+;;  Windows Code page:950
 ;;
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
 ;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
@@ -12,7 +12,7 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"w˵{b椤C"
-!define GAIM_IS_RUNNING			"Gaim b椤AХoӵ{AwˡC"
+!define GAIM_IS_RUNNING				"Gaim b椤AХoӵ{AwˡC"
 !define GTK_INSTALLER_NEEDED			"䤣ŦX GTK+ ҩάOݭnQsC$\rЦw v${GTK_VERSION} HW GTK+ ҡC"
 
 ; License Page
@@ -24,22 +24,22 @@
 !define GTK_SECTION_TITLE			"GTK+  ()"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ GDD"
 !define GTK_NOTHEME_SECTION_TITLE		"w˧GDD"
-!define GTK_WIMP_SECTION_TITLE		"Wimp GDD"
+!define GTK_WIMP_SECTION_TITLE			"Wimp GDD"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve GDD"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue GDD"
-!define GAIM_SHORTCUTS_SECTION_TITLE "|"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "ୱ|"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"|"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"ୱ|"
 !define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "}l\"
 !define GAIM_SECTION_DESCRIPTION		"Gaim ֤ɮפΰʺA禡w"
-!define GTK_SECTION_DESCRIPTION		"Gaim ҨϥΪ󥭥xϧΤ禡w"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ GDDiHΨӧ GTK+ ε{~[C"
+!define GTK_SECTION_DESCRIPTION			"Gaim ҨϥΪ󥭥xϧΤ禡w"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ GDDiHΨӧ GTK+ ε{~[C"
 !define GTK_NO_THEME_DESC			"w GTK+ GDD"
 !define GTK_WIMP_THEME_DESC			"uGTK-Wimpv(Windows impersonator) DDi GTK+ ĤJ Windows C"
 !define GTK_BLUECURVE_THEME_DESC		"uBluecurvevDD"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"uLighthousebluevDDC"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "إ Gaim |"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "bୱإ߱|"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "b}l\إ߱|"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"uLighthousebluevDDC"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"إ Gaim |"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"bୱإ߱|"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"b}l\إ߱|"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"o{@ª GTK+ ҡCznNɯŶܡH$\rЪ`NGpGzɯšAGaim iLkTQC"
@@ -49,8 +49,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (uѲ)"
-!define GAIM_PROMPT_WIPEOUT			"zew˩ؿª Gaim N|QCzn~ܡH$\r$\rЪ`NGzҦw˪Dx@ҲճNQRC$\r Gaim ϥΪ̳]wN|vTC"
-!define GAIM_PROMPT_DIR_EXISTS		"zҿww˥ؿUҦɮ׳NQC$\rzn~ܡH"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"w GTK+ ҮɵoͿ~C"
@@ -60,5 +58,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"zثevLkw GTK+ GDDC"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "{Lk Gaim w˸TC$\roӬOLϥΪ̭swˤFoӵ{C"
-!define un.GAIM_UNINSTALL_ERROR_2         "zثevLk GaimC"
\ No newline at end of file
+!define un.GAIM_UNINSTALL_ERROR_1		"{Lk Gaim w˸TC$\roӬOLϥΪ̭swˤFoӵ{C"
+!define un.GAIM_UNINSTALL_ERROR_2		"zثevLk GaimC"
--- a/gtk/win32/nsis/translations/valencian.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/valencian.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -50,8 +50,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (nomes borrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antiu de Gaim sera borrat. Vols continuar?$\r$\rNota: Qualsevol plugin no estandar que tingues instalat sera borrat.$\rLes preferencies d'usuari de Gaim no es voran afectades."
-!define GAIM_PROMPT_DIR_EXISTS			"El directori d'instalacio que especificares ya existix. Qualsevol contingut$\rsera borrat. Vols continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
--- a/gtk/win32/nsis/translations/vietnamese.nsh	Tue Aug 29 21:09:43 2006 +0000
+++ b/gtk/win32/nsis/translations/vietnamese.nsh	Wed Aug 30 02:40:56 2006 +0000
@@ -40,8 +40,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (chỉ bỏ cài đặt)"
-!define GAIM_PROMPT_WIPEOUT			"Thư mục Gaim cũ sẽ bị xóa. Bạn muốn tiếp tục không?$\r$\rNote: Mọi plugin không chuẩn mà bạn đã cài sẽ bị xóa.$\rCác thiết lập người dùng Gaim sẽ không còn tác dụng."
-!define GAIM_PROMPT_DIR_EXISTS		"Thư mục cài đặt mà bạn định ra đã tồn tại rồi. Mọi nội dung$\rsẽ bị xóa. Bạn muốn tiếp tục không?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."