gaim/gaim

Parents 13282c8edf74
Children 1068e9761861
Apparently automatically placing an icon on the Desktop, and putting a link to the uninstaller on the Start Menu goes against the MS Application guidelines. I suppose it makes sense, so why not give the user an option. Also, some revisionist history to the win32 changelog
--- a/ChangeLog.win32 Sun May 15 14:15:37 2005 -0400
+++ b/ChangeLog.win32 Sun May 15 14:24:07 2005 -0400
@@ -1,5 +1,11 @@
+version 1.3.1 :
+ * Installer allows you to choose whether or not to put shortcuts on the
+ Desktop and Start Menu. Uninstall icon is no longer placed in the
+ Start Menu.
+
version 1.3.0 (5/10/2005):
- * No changes
+ * Updated to GTK+ 2.6.7 (rev a). This restores functionality on Windows
+ 98/ME/N4.
version 1.2.1 (4/3/2005):
* No changes
--- a/gaim-installer.nsi Sun May 15 14:15:37 2005 -0400
+++ b/gaim-installer.nsi Sun May 15 14:24:07 2005 -0400
@@ -1,7 +1,7 @@
; Installer script for win32 Gaim
; Herman Bloggs <hermanator12002@yahoo.com>
-; NOTE: this .NSI script is intended for NSIS 2.0 (finale release).
+; NOTE: this .NSI script is intended for NSIS 2.0 (final release).
;
;--------------------------------
@@ -457,14 +457,10 @@
nt4_done:
- CreateDirectory "$SMPROGRAMS\Gaim"
- CreateShortCut "$SMPROGRAMS\Gaim\Gaim.lnk" "$INSTDIR\gaim.exe"
- CreateShortCut "$DESKTOP\Gaim.lnk" "$INSTDIR\gaim.exe"
SetOutPath "$INSTDIR"
; If we don't have install rights.. we're done
StrCmp $R0 "NONE" done
- CreateShortCut "$SMPROGRAMS\Gaim\Uninstall.lnk" "$INSTDIR\${GAIM_UNINST_EXE}"
SetOverwrite off
; Write out installer language
@@ -485,6 +481,23 @@
SectionEnd ; end of default Gaim section
;--------------------------------
+;Shortcuts
+
+SubSection /e $(GAIM_SHORTCUTS_SECTION_TITLE) SecShortcuts
+ Section /o $(GAIM_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
+ SetOverwrite on
+ CreateShortCut "$DESKTOP\Gaim.lnk" "$INSTDIR\gaim.exe"
+ SetOverwrite off
+ SectionEnd
+ Section $(GAIM_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
+ SetOverwrite on
+ CreateDirectory "$SMPROGRAMS\Gaim"
+ CreateShortCut "$SMPROGRAMS\Gaim\Gaim.lnk" "$INSTDIR\gaim.exe"
+ SetOverwrite off
+ SectionEnd
+SubSectionEnd
+
+;--------------------------------
;GTK+ Themes
SubSection /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
@@ -670,7 +683,7 @@
$(GTK_SECTION_DESCRIPTION)
!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SecGtkThemes} \
- $(GTK_THEMES_SECTION_DESCRIPTION)
+ $(GTK_THEMES_SECTION_DESCRIPTION)
!insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \
$(GTK_NO_THEME_DESC)
!insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \
@@ -679,6 +692,14 @@
$(GTK_BLUECURVE_THEME_DESC)
!insertmacro MUI_DESCRIPTION_TEXT ${SecGtkLighthouseblue} \
$(GTK_LIGHTHOUSEBLUE_THEME_DESC)
+
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \
+ $(GAIM_SHORTCUTS_SECTION_DESCRIPTION)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
+ $(GAIM_DESKTOP_SHORTCUT_DESC)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} \
+ $(GAIM_STARTMENU_SHORTCUT_DESC)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
--- a/src/win32/nsis/langmacros.nsh Sun May 15 14:15:37 2005 -0400
+++ b/src/win32/nsis/langmacros.nsh Sun May 15 14:24:07 2005 -0400
@@ -1,85 +1,91 @@
-;;
-;; Windows Gaim NSIS installer language macros
-;;
-
-!macro GAIM_MACRO_DEFAULT_STRING LABEL VALUE
- !ifndef "${LABEL}"
- !define "${LABEL}" "${VALUE}"
- !ifdef INSERT_DEFAULT
- !warning "${LANG} lang file missing ${LABEL}, using default..."
- !endif
- !endif
-!macroend
-
-!macro GAIM_MACRO_LANGSTRING_INSERT LABEL LANG
- LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
- !undef "${LABEL}"
-!macroend
-
-!macro GAIM_MACRO_LANGUAGEFILE_BEGIN LANG
- !define CUR_LANG "${LANG}"
-!macroend
-
-!macro GAIM_MACRO_LANGUAGEFILE_END
- !define INSERT_DEFAULT
- !include "${GAIM_DEFAULT_LANGFILE}"
- !undef INSERT_DEFAULT
-
- ; GAIM Language file Version 3
- ; 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}
-
- ; License Page
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BUTTON ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BOTTOM_TEXT ${CUR_LANG}
-
- ; Components Page
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NOTHEME_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_SECTION_TITLE ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_DESCRIPTION ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC ${CUR_LANG}
-
- ; GTK+ Directory Page
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT ${CUR_LANG}
-
- ; Installer Finish Page
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_FINISH_VISIT_WEB_SITE ${CUR_LANG}
-
- ; 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}
-
- ; GTK+ Section Prompts
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR ${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}
-
- ; Uninstall Section Prompts
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_1 ${CUR_LANG}
- !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_2 ${CUR_LANG}
-
- !undef CUR_LANG
-!macroend
-
-!macro GAIM_MACRO_INCLUDE_LANGFILE LANG FILE
- !insertmacro GAIM_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
- !include "${FILE}"
- !insertmacro GAIM_MACRO_LANGUAGEFILE_END
-!macroend
+;;
+;; Windows Gaim NSIS installer language macros
+;;
+
+!macro GAIM_MACRO_DEFAULT_STRING LABEL VALUE
+ !ifndef "${LABEL}"
+ !define "${LABEL}" "${VALUE}"
+ !ifdef INSERT_DEFAULT
+ !warning "${LANG} lang file missing ${LABEL}, using default..."
+ !endif
+ !endif
+!macroend
+
+!macro GAIM_MACRO_LANGSTRING_INSERT LABEL LANG
+ LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
+ !undef "${LABEL}"
+!macroend
+
+!macro GAIM_MACRO_LANGUAGEFILE_BEGIN LANG
+ !define CUR_LANG "${LANG}"
+!macroend
+
+!macro GAIM_MACRO_LANGUAGEFILE_END
+ !define INSERT_DEFAULT
+ !include "${GAIM_DEFAULT_LANGFILE}"
+ !undef INSERT_DEFAULT
+
+ ; GAIM Language file Version 3
+ ; 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}
+
+ ; License Page
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BUTTON ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BOTTOM_TEXT ${CUR_LANG}
+
+ ; Components Page
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NOTHEME_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SHORTCUTS_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_STARTMENU_SHORTCUT_SECTION_TITLE ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_DESCRIPTION ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SHORTCUTS_SECTION_DESCRIPTION ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_DESKTOP_SHORTCUT_DESC ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_STARTMENU_SHORTCUT_DESC ${CUR_LANG}
+
+ ; GTK+ Directory Page
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT ${CUR_LANG}
+
+ ; Installer Finish Page
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_FINISH_VISIT_WEB_SITE ${CUR_LANG}
+
+ ; 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}
+
+ ; GTK+ Section Prompts
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR ${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}
+
+ ; Uninstall Section Prompts
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_1 ${CUR_LANG}
+ !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_2 ${CUR_LANG}
+
+ !undef CUR_LANG
+!macroend
+
+!macro GAIM_MACRO_INCLUDE_LANGFILE LANG FILE
+ !insertmacro GAIM_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
+ !include "${FILE}"
+ !insertmacro GAIM_MACRO_LANGUAGEFILE_END
+!macroend
--- a/src/win32/nsis/translations/english.nsh Sun May 15 14:15:37 2005 -0400
+++ b/src/win32/nsis/translations/english.nsh Sun May 15 14:24:07 2005 -0400
@@ -1,59 +1,65 @@
-;;
-;; english.nsh
-;;
-;; Default language strings for the Windows Gaim NSIS installer.
-;; Windows Code page: 1252
-;;
-;; Version 3
-;; Note: If translating this file, replace "!insertmacro GAIM_MACRO_DEFAULT_STRING"
-;; with "!define".
-
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; 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 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"
-
-; 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_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_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."
-
-; 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."
-
-; Installer Finish Page
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_FINISH_VISIT_WEB_SITE "Visit the Windows Gaim Web Page"
-
-; 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?"
-
-; 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."
-
-; 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."
-!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_2 "You do not have permission to uninstall this application."
+;;
+;; english.nsh
+;;
+;; Default language strings for the Windows Gaim NSIS installer.
+;; Windows Code page: 1252
+;;
+;; Version 3
+;; Note: If translating this file, replace "!insertmacro GAIM_MACRO_DEFAULT_STRING"
+;; with "!define".
+
+; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when updating this file
+
+; 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 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"
+
+; 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_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_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"
+
+; 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."
+
+; Installer Finish Page
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_FINISH_VISIT_WEB_SITE "Visit the Windows Gaim Web Page"
+
+; 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?"
+
+; 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."
+
+; 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."
+!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_2 "You do not have permission to uninstall this application."