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 (2006-08-30)
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 (nom�s esborrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antic de Gaim ser� esborrat. Vols continuar?$\r$\rNota: Els plugins no est�ndards que tinguis instal.lats seran esborrats.$\rLes prefer�ncies 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 vymaz�n. Chcete pokra�ovat?$\r$\rUpozorn�n�: Jak�koli nestandardn� roz�逖en� (plugin) , kter� m�te nainstalov�na budou ztracena.$\rU�ivatelsk� nastaven� pro Gaim budou zachov�na."
-!define GAIM_PROMPT_DIR_EXISTS		"Adres癢 kter� byl zad�n pro instalaci ji� existuje. Ve�ker� obsah$\rbude smaz�n. Chcete pokra�ovat?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba p�i 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 forts�tte? $\r$\rNB: Alle ikke-standard plugins du m�tte have installeret vil blive slettet.$\rGaim brugerindstillinger vil ikke blive p�virket af dette."
-!define GAIM_PROMPT_DIR_EXISTS		"Den �nskede installationsfolder eksisterer allerede. Ethvert indhold$\ri folderen vil blive slettet. �nsker du at forts�tte?"
 
 ; 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 ge�nstalleerde 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 j�lkeenp�in asennettu lis�osa poistetaan.$\rGaimin k�ytt�j�asetuksissa 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 install�s seront aussi supprim�s.$\rLes configurations et les comptes utilisateurs de Gaim ne sont pas touch�s."
-!define GAIM_PROMPT_DIR_EXISTS			"Le dossier d'installation que vous avez choisi existe d�j�. Son contenu sera effac�.$\rVoulez-vous continuer ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth�ques 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 (s�lo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"O seu directorio antigo de Gaim vai ser borrado. �Desexa continuar?$\r$\rObservaci�n: calquer aplique non est�ndar que puidera haber instalado borrarase.$\rIsto non afectar� �s s�as preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"O directorio de instalaci�n que especificou xa existe. Todos os contidos$\rser�n 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 gel�scht werden. M�chten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgel�scht. Gaim-Benutzereinstellungen sind nicht betroffen."
-!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, das Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gel�scht. M�chten 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 elt�vol�t�s)"
-!define GAIM_PROMPT_WIPEOUT			"Az �n kor�bbi Gaim k�nyvt�ra t�r�lve lesz. Folytatni szeretn�?$\r$\rMegjegyz�s: Minden �n �ltal telep�tett bov�tm�ny t�r�lve lesz.$\rA Gaim felhaszn�l�i be�ll�t�sokra ez nincs hat�ssal."
-!define GAIM_PROMPT_DIR_EXISTS			"A megadott telep�t�si k�nyvt�r m�r l�tezik. A tartalma t�r�lve lesz.$\rFolytatni szeretn�?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat�k�rnyezet telep�t�se k�zben."
--- 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��t�H���_���������B��s�����?$\r$\r����: ������C���X�g�[����������W���v���O�C�����������B$\rGaim�����e��������B"
-!define GAIM_PROMPT_DIR_EXISTS			"������w����C���X�g�[�����t�H���_������������B��e�����$\r��������B��s�����?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+�����^�C����C���X�g�[����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� j�birin. Tu dixwaz� bidom�n�?$\r$\rNot: Plugin y�n nestandart y�n te t�n j�birin. .$\rV�bijerk�n bikarh�ner �n Gaim nay�n guherandin."
-!define GAIM_PROMPT_DIR_EXISTS		"Peldanka sazkirin� ya tu hilbijart� heye. Naveroka w� $\rt� j�birin. Tu dixwaz� bidom�n�?"
 
 ; 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 pa�alinti)"
-!define GAIM_PROMPT_WIPEOUT			"J�s� senasis Gaim katalogas tuoj tur�t� b�ti i�trintas. Ar norite t�sti?$\r$\rPastaba: bet kokie nestandartiniai papildiniai, jeigu toki� �dieg�te, bus pa�alinti.$\rGaim vartotojo nustatymai nebus paliesti."
-!define GAIM_PROMPT_DIR_EXISTS			"Nurodytas diegimo katalogas jau yra. Jo turinys$\rbus pa�alintas. Ar norite t�sti?"
 
 ; 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 ber�rt."
-!define GAIM_PROMPT_DIR_EXISTS			"Installasjonskatalogen du har spesifisert finnes fra f�r. 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� usuni�ty. Czy chcesz kontunuowa�?$\r$\rNote: Wszystkie stare - niestandardowe plugin-y zosta�y usuni�te.$\r Ustawienia u�utkownika Gaim b�d� wy街czone."
-!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			"B街d 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 instala艫o do Gaim est� prestes a ser removida. Voc� gostaria de continuar?$\r$\rNota: Quaisquer plugins n�o-padr�o que voc� pode ter instalado ser�o removidos.$\rAs configura苺es de usu�rio do Gaim n�o ser�o afetadas."
-!define GAIM_PROMPT_DIR_EXISTS		"O diret�rio de instala艫o do que voc� especificou j� existe. Qualquer conte�do$\rser� deletado. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu艫o 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 n�o-padr�o que poder� ter instalado ser�o removidos.$\rAs configura苺es de utilizador do Gaim n�o ser�o afectadas."
-!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instala艫o que especificou j� existe. Qualquer conte�do$\rser� removido. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu艫o 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. Dori�i s� continua�i?$\r$\rNot�: Orice module externe vor fi �terse.$\rSet�rile utilizatorilor Gaim nu vor fi afectate."
-!define GAIM_PROMPT_DIR_EXISTS		"Directorul ales pentru instalare exist� deja.$\rCon�inutul s�u va fi �ters. Dori�i s� continua�i?"
 
 ; 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 ne�e biti promenjene."
-!define GAIM_PROMPT_DIR_EXISTS		"Instalacioni direktorijum koji ste naveli ve� postoji. Sav sadr�aj$\r�e biti obrisan. Da li �elite da nastavite?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
--- 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廣吭: 艇侭芦廾議販採掲炎彈議峨周脅繍瓜評茅。$\r徽頁音氏唹� 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 odstr�ni�)"
-!define GAIM_PROMPT_WIPEOUT			"V� adres�r Gaim bude zmazan�. Chcete pokra�ova�?$\r$\rPozn�mka: V�etky pr�davne pluginy, ktor� ste nain�talovali bud� tie� zmazan�.$\rNastavenia u�ivate�sk�ho 淼tu Gaim-u bud� ponechan�."
-!define GAIM_PROMPT_DIR_EXISTS			"Adres�r, ktor� ste zadali, u� existuje. Jeho obsah bude zmazan�. Chcete pokra�ova�?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii 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 vti�niki, ki ste jih namestili, bodo zbrisani.$\rUporabni�ke 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 (s�lo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"Su directorio antig�o de Gaim va a ser borrado. �Desea continuar?$\r$\rObservaci�n: cualquier aplique no est�ndar que pudiera haber instalado ser� borrado.$\r�sto no afectar� a sus preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"El directorio de instalaci�n 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 f�r avinstallation)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamla Gaim-katalog kommer att raderas, vill du forts�tta?$\r$\rOBS! om du har installerat n�gra extra insticksmoduler kommer de raderas.$\rGaims anv�ndarinst�llningar kommer inte p�verkas."
-!define GAIM_PROMPT_DIR_EXISTS		"Den katalog du vill installera i finns redan. Allt i katalogen$\rkommer att raderas, vill du forts�tta?"
 
 ; 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㎎�{Α��A��w庫�C"
+!define GAIM_IS_RUNNING				"Gaim タ�b印�い�A出�飢��o㎎�{Α��A��w庫�C"
 !define GTK_INSTALLER_NEEDED			"тぃ�嘉�X� GTK+ 印�泉航��O旨�n�Q��s�C$\r出�w庫 v${GTK_VERSION} �H�W�セ� GTK+ 印�泉航�C"
 
 ; License Page
@@ -24,22 +24,22 @@
 !define GTK_SECTION_TITLE			"GTK+ 印�泉航 (ゲ旨)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ �G敢�D�D"
 !define GTK_NOTHEME_SECTION_TITLE		"ぃ�w庫�G敢�D�D"
-!define GTK_WIMP_SECTION_TITLE		"Wimp �G敢�D�D"
+!define GTK_WIMP_SECTION_TITLE			"Wimp �G敢�D�D"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve �G敢�D�D"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue �G敢�D�D"
-!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+ �G敢�D�D�i�Hノ�э怒 GTK+ 棲ノ�{Α��~�[�C"
+!define GTK_SECTION_DESCRIPTION			"Gaim ��ノ�佼キ�x肱�ざ⑰�Α�w"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ �G敢�D�D�i�Hノ�э怒 GTK+ 棲ノ�{Α��~�[�C"
 !define GTK_NO_THEME_DESC			"ぃ�w庫 GTK+ �G敢�D�D"
 !define GTK_WIMP_THEME_DESC			"�uGTK-Wimp�v(Windows impersonator) �D�D�i統 GTK+ 芯�J Windows �⑰泉泉ぇい�C"
 !define GTK_BLUECURVE_THEME_DESC		"�uBluecurve�v�D�D"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"�uLighthouseblue�v�D�D�C"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "�ミ Gaim 蔚�|"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "�b�⑰�ミ蔚�|"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "�b�}�l�\���ミ蔚�|"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"�uLighthouseblue�v�D�D�C"
+!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+ 印�泉航�C�z�n�Nウど�芹�H$\r出�`�N�G�p�G�zぃど��AGaim �i��L�kタ�T��Q印��C"
@@ -49,8 +49,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (�u�仮娃)"
-!define GAIM_PROMPT_WIPEOUT			"�z��e�w庫�ヘ雀い�詑� Gaim �N�|�Q仮娃�C�z�n�~挺芹�H$\r$\r出�`�N�Gヴ��z��w庫��D�xよ笹�@社箇械�N�Q�R娃�C$\rτ Gaim ��ノ��]�w�Nぃ�|���v�T�C"
-!define GAIM_PROMPT_DIR_EXISTS		"�z�随�w��w庫ヘ雀�U��Τ隻�械�N�Q仮娃�C$\r�z�n�~挺芹�H"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"�w庫 GTK+ 印�泉航��oネ杉�~�C"
@@ -60,5 +58,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"�zヘ�e��v⑬�L�k�w庫 GTK+ �G敢�D�D�C"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "仮娃�{Α�L�kт� Gaim ��w庫瑚�T�C$\r�o棲袴�OΤ��L��ノ�⑪�s�w庫�F�o㎎�{Α�C"
-!define un.GAIM_UNINSTALL_ERROR_2         "�zヘ�e��v⑬�L�k仮娃 Gaim�C"
\ No newline at end of file
+!define un.GAIM_UNINSTALL_ERROR_1		"仮娃�{Α�L�kт� Gaim ��w庫瑚�T�C$\r�o棲袴�OΤ��L��ノ�⑪�s�w庫�F�o㎎�{Α�C"
+!define un.GAIM_UNINSTALL_ERROR_2		"�zヘ�e��v⑬�L�k仮娃 Gaim�C"
--- 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."