changeset 11578:8b955ffe9584

[gaim-migrate @ 13847] Add SIMPLE to default build. Update installer with unmerged changes in oldstatus and to support the SIMPLE prpl. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 29 Sep 2005 15:37:44 +0000
parents 2898c59b49a3
children 576432496863
files Makefile.mingw gaim-installer.nsi src/win32/nsis/gaim-plugin.nsh src/win32/nsis/langmacros.nsh src/win32/nsis/translations/albanian.nsh src/win32/nsis/translations/bulgarian.nsh src/win32/nsis/translations/catalan.nsh src/win32/nsis/translations/czech.nsh src/win32/nsis/translations/danish.nsh src/win32/nsis/translations/dutch.nsh src/win32/nsis/translations/english.nsh src/win32/nsis/translations/finnish.nsh src/win32/nsis/translations/french.nsh src/win32/nsis/translations/german.nsh src/win32/nsis/translations/hungarian.nsh src/win32/nsis/translations/italian.nsh src/win32/nsis/translations/japanese.nsh src/win32/nsis/translations/korean.nsh src/win32/nsis/translations/norwegian.nsh src/win32/nsis/translations/polish.nsh src/win32/nsis/translations/portuguese-br.nsh src/win32/nsis/translations/portuguese.nsh src/win32/nsis/translations/romanian.nsh src/win32/nsis/translations/serbian-latin.nsh src/win32/nsis/translations/simp-chinese.nsh src/win32/nsis/translations/slovak.nsh src/win32/nsis/translations/slovenian.nsh src/win32/nsis/translations/spanish.nsh src/win32/nsis/translations/swedish.nsh src/win32/nsis/translations/trad-chinese.nsh src/win32/nsis/translations/vietnamese.nsh
diffstat 31 files changed, 1417 insertions(+), 314 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Thu Sep 29 13:59:36 2005 +0000
+++ b/Makefile.mingw	Thu Sep 29 15:37:44 2005 +0000
@@ -25,6 +25,7 @@
 GG = $(GAIM_PROTOS)/gg
 NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
+SIMPLE = $(GAIM_PROTOS)/simple
 SAMETIME = $(GAIM_PROTOS)/sametime
 PO = ./po
 
@@ -58,6 +59,7 @@
 NOVELL_TYPE = PLUGIN
 TREPIA_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
+SIMPLE_TYPE = PLUGIN
 SAMETIME_TYPE = PLUGIN
 
 all:
@@ -71,6 +73,7 @@
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
 	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
@@ -92,6 +95,7 @@
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
+	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
 	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
@@ -119,6 +123,7 @@
 	$(MAKE) -C $(GG) -f Makefile.mingw clean
 	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
 	$(MAKE) -C $(SILC) -f Makefile.mingw clean
+	$(MAKE) -C $(SIMPLE) -f Makefile.mingw clean
 	$(MAKE) -C $(SAMETIME) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean
 	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean
--- a/gaim-installer.nsi	Thu Sep 29 13:59:36 2005 +0000
+++ b/gaim-installer.nsi	Thu Sep 29 15:37:44 2005 +0000
@@ -1,7 +1,8 @@
 ; Installer script for win32 Gaim
-; Herman Bloggs <hermanator12002@yahoo.com>
+; Original Author: Herman Bloggs <hermanator12002@yahoo.com>
+; Updated By: Daniel Atallah <daniel_atallah@yahoo.com>
 
-; NOTE: this .NSI script is intended for NSIS 2.0 (final release).
+; NOTE: this .NSI script is intended for NSIS 2.08
 ;
 
 ;--------------------------------
@@ -12,6 +13,7 @@
 Var LANG_IS_SET
 Var ISSILENT
 Var STARTUP_RUN_KEY
+Var SPELLCHECK_SEL
 
 ;--------------------------------
 ;Configuration
@@ -29,7 +31,7 @@
 !endif
 !endif
 
-SetCompressor lzma
+SetCompressor /SOLID lzma
 ShowInstDetails show
 ShowUninstDetails show
 SetDateSave on
@@ -52,7 +54,7 @@
 !define GAIM_UNINST_EXE				"gaim-uninst.exe"
 !define GAIM_REG_LANG				"Installer Language"
 
-!define GTK_VERSION				"2.6.2"
+!define GTK_VERSION				"2.6.10"
 !define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl58.dll"
@@ -62,12 +64,15 @@
 !define GTK_DEFAULT_THEME_GTKRC_DIR		"share\themes\Default\gtk-2.0"
 !define GTK_DEFAULT_THEME_ENGINE_DIR		"lib\gtk-2.0\2.4.0\engines"
 
+!define ASPELL_REG_KEY				"SOFTWARE\Aspell"
+!define DOWNLOADER_URL				"http://gaim.sourceforge.net/win32/download_redir.php"
+
 ;--------------------------------
 ;Modern UI Configuration
 
   !define MUI_ICON				".\pixmaps\gaim-install.ico"
   !define MUI_UNICON				".\pixmaps\gaim-install.ico"
-  !define MUI_WELCOMEFINISHPAGE_BITMAP 		".\src\win32\nsis\gaim-intro.bmp"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP		".\src\win32\nsis\gaim-intro.bmp"
   !define MUI_HEADERIMAGE
   !define MUI_HEADERIMAGE_BITMAP		".\src\win32\nsis\gaim-header.bmp"
 
@@ -86,8 +91,10 @@
 
 ;--------------------------------
 ;Pages
-  
+
+!ifndef WITH_GTK
   !define MUI_PAGE_CUSTOMFUNCTION_PRE		preWelcomePage
+!endif
   !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE			"./COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
@@ -113,7 +120,7 @@
 
 ;--------------------------------
 ;Languages
- 
+
   ;; English goes first because its the default. The rest are
   ;; in alphabetical order (at least the strings actually displayed
   ;; will be).
@@ -189,7 +196,7 @@
   ; Only need this if using bzip2 compression
 
   !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-  !insertmacro MUI_RESERVEFILE_LANGDLL 
+  !insertmacro MUI_RESERVEFILE_LANGDLL
   ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
 
 
@@ -234,7 +241,7 @@
   ; If previous version exists .. remove
   try_uninstall:
     StrCmp $R1 "" done
-      ; Version key started with 0.60a3. Prior versions can't be 
+      ; Version key started with 0.60a3. Prior versions can't be
       ; automaticlly uninstalled.
       StrCmp $R2 "" uninstall_problem
         ; Check if we have uninstall string..
@@ -248,20 +255,20 @@
           IfErrors uninstall_problem
             ; Ready to uninstall..
             ClearErrors
-	    ExecWait '"$TEMP\${GAIM_UNINST_EXE}" /S _?=$R1'
-	    IfErrors exec_error
+            ExecWait '"$TEMP\${GAIM_UNINST_EXE}" /S _?=$R1'
+            IfErrors exec_error
               Delete "$TEMP\${GAIM_UNINST_EXE}"
-	      Goto done
+            Goto done
 
-	    exec_error:
+            exec_error:
               Delete "$TEMP\${GAIM_UNINST_EXE}"
               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)
+          ; 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:
@@ -276,7 +283,7 @@
               DeleteRegKey HKLM ${GAIM_REG_KEY}
 
             uninstall_prob_cont:
-	      RMDir /r "$R1"
+              RMDir /r "$R1"
 
   done:
 SectionEnd
@@ -436,7 +443,7 @@
         Delete "$INSTDIR\plugins\perl.dll"
         RMDir /r "$INSTDIR\perlmod"
         Goto perl_done
- 
+
       perl_exists:
         IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_remove
         StrCmp $R0 "HKLM" 0 perl_done
@@ -450,13 +457,11 @@
     ; See https://lists.silcnet.org/pipermail/silc-devel/2005-January/001588.html
     Call GetWindowsVersion
     Pop $R2
-    StrCmp $R2 "NT 4.0" 0 nt4_done
+    StrCmp $R2 "NT 4.0" +1 +4
     Delete "$INSTDIR\plugins\libsilc.dll"
     Delete "$INSTDIR\silcclient.dll"
     Delete "$INSTDIR\silc.dll"
 
-    nt4_done:
-
     SetOutPath "$INSTDIR"
 
     ; If we don't have install rights.. we're done
@@ -559,6 +564,100 @@
 SubSectionEnd
 
 ;--------------------------------
+;Spell Checking
+
+SubSection /e $(GAIM_SPELLCHECK_SECTION_TITLE) SecSpellCheck
+  Section /o $(GAIM_SPELLCHECK_BRETON) SecSpellCheckBreton
+    Push ${SecSpellCheckBreton}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_CATALAN) SecSpellCheckCatalan
+    Push ${SecSpellCheckCatalan}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_CZECH) SecSpellCheckCzech
+    Push ${SecSpellCheckCzech}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_WELSH) SecSpellCheckWelsh
+    Push ${SecSpellCheckWelsh}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_DANISH) SecSpellCheckDanish
+    Push ${SecSpellCheckDanish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_GERMAN) SecSpellCheckGerman
+    Push ${SecSpellCheckGerman}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_GREEK) SecSpellCheckGreek
+    Push ${SecSpellCheckGreek}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_ENGLISH) SecSpellCheckEnglish
+    Push ${SecSpellCheckEnglish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_ESPERANTO) SecSpellCheckEsperanto
+    Push ${SecSpellCheckEsperanto}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_SPANISH) SecSpellCheckSpanish
+    Push ${SecSpellCheckSpanish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_FAROESE) SecSpellCheckFaroese
+    Push ${SecSpellCheckFaroese}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_FRENCH) SecSpellCheckFrench
+    Push ${SecSpellCheckFrench}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_ITALIAN) SecSpellCheckItalian
+    Push ${SecSpellCheckItalian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_DUTCH) SecSpellCheckDutch
+    Push ${SecSpellCheckDutch}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_NORWEGIAN) SecSpellCheckNorwegian
+    Push ${SecSpellCheckNorwegian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_POLISH) SecSpellCheckPolish
+    Push ${SecSpellCheckPolish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_PORTUGUESE) SecSpellCheckPortuguese
+    Push ${SecSpellCheckPortuguese}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_ROMANIAN) SecSpellCheckRomanian
+    Push ${SecSpellCheckRomanian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_RUSSIAN) SecSpellCheckRussian
+    Push ${SecSpellCheckRussian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_SLOVAK) SecSpellCheckSlovak
+    Push ${SecSpellCheckSlovak}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_SWEDISH) SecSpellCheckSwedish
+    Push ${SecSpellCheckSwedish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(GAIM_SPELLCHECK_UKRAINIAN) SecSpellCheckUkrainian
+    Push ${SecSpellCheckUkrainian}
+    Call InstallAspellAndDict
+  SectionEnd
+SubSectionEnd
+
+;--------------------------------
 ;Uninstaller Section
 
 
@@ -611,6 +710,7 @@
     Delete "$INSTDIR\plugins\liboscar.dll"
     Delete "$INSTDIR\plugins\libsametime.dll"
     Delete "$INSTDIR\plugins\libsilc.dll"
+    Delete "$INSTDIR\plugins\libsimple.dll"
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
     Delete "$INSTDIR\plugins\perl.dll"
@@ -678,29 +778,75 @@
 ;Descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGaim} \
-	$(GAIM_SECTION_DESCRIPTION)
+        $(GAIM_SECTION_DESCRIPTION)
 !ifdef WITH_GTK
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \
-	$(GTK_SECTION_DESCRIPTION)
+        $(GTK_SECTION_DESCRIPTION)
 !endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkThemes} \
         $(GTK_THEMES_SECTION_DESCRIPTION)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \
         $(GTK_NO_THEME_DESC)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \
-	$(GTK_WIMP_THEME_DESC)
+        $(GTK_WIMP_THEME_DESC)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkBluecurve} \
         $(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_DESCRIPTION_TEXT ${SecSpellCheck} \
+        $(GAIM_SPELLCHECK_SECTION_DESCRIPTION)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckBreton} \
+        "$(GAIM_SPELLCHECK_BRETON) (862kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCatalan} \
+        "$(GAIM_SPELLCHECK_CATALAN) (3.9Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCzech} \
+        "$(GAIM_SPELLCHECK_CZECH) (17Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckWelsh} \
+        "$(GAIM_SPELLCHECK_WELSH) (4.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDanish} \
+        "$(GAIM_SPELLCHECK_DANISH) (6.9Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGerman} \
+        "$(GAIM_SPELLCHECK_GERMAN) (5.4Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGreek} \
+        "$(GAIM_SPELLCHECK_GREEK) (7.1Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEnglish} \
+        "$(GAIM_SPELLCHECK_ENGLISH) (2.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEsperanto} \
+        "$(GAIM_SPELLCHECK_ESPERANTO) (5.7Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSpanish} \
+        "$(GAIM_SPELLCHECK_SPANISH) (7.0Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFaroese} \
+        "$(GAIM_SPELLCHECK_FAROESE) (913kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFrench} \
+        "$(GAIM_SPELLCHECK_FRENCH) (9.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckItalian} \
+        "$(GAIM_SPELLCHECK_ITALIAN) (770kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDutch} \
+        "$(GAIM_SPELLCHECK_DUTCH) (3.7Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckNorwegian} \
+        "$(GAIM_SPELLCHECK_NORWEGIAN) (3.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPolish} \
+        "$(GAIM_SPELLCHECK_POLISH) (9.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPortuguese} \
+        "$(GAIM_SPELLCHECK_PORTUGUESE) (5.5Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRomanian} \
+        "$(GAIM_SPELLCHECK_ROMANIAN) (906kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRussian} \
+        "$(GAIM_SPELLCHECK_RUSSIAN) (11Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSlovak} \
+        "$(GAIM_SPELLCHECK_SLOVAK) (8.0Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSwedish} \
+        "$(GAIM_SPELLCHECK_SWEDISH) (2.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckUkrainian} \
+        "$(GAIM_SPELLCHECK_UKRAINIAN) (12Mb)"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -730,7 +876,7 @@
     StrCmp $0 "NONE" 0 themes_cont
       StrCmp $GTK_FOLDER $INSTDIR 0 no_rights
         StrCpy $1 $INSTDIR
-	Goto done
+        Goto done
     themes_cont:
 
     StrCmp $0 "HKCU" hkcu hklm
@@ -756,65 +902,73 @@
 
 
 Function CheckUserInstallRights
-	ClearErrors
-	UserInfo::GetName
-	IfErrors Win9x
-	Pop $0
-	UserInfo::GetAccountType
-	Pop $1
+  Push $0
+  Push $1
+  ClearErrors
+  UserInfo::GetName
+  IfErrors Win9x
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
 
-	StrCmp $1 "Admin" 0 +3
-                StrCpy $1 "HKLM"
-		Goto done
-	StrCmp $1 "Power" 0 +3
-                StrCpy $1 "HKLM"
-		Goto done
-	StrCmp $1 "User" 0 +3
-		StrCpy $1 "HKCU"
-		Goto done
-	StrCmp $1 "Guest" 0 +3
-		StrCpy $1 "NONE"
-		Goto done
-	; Unknown error
-	StrCpy $1 "NONE"
-        Goto done
+  StrCmp $1 "Admin" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "Power" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "User" 0 +3
+    StrCpy $1 "HKCU"
+    Goto done
+  StrCmp $1 "Guest" 0 +3
+    StrCpy $1 "NONE"
+    Goto done
+  ; Unknown error
+  StrCpy $1 "NONE"
+  Goto done
 
-	Win9x:
-		StrCpy $1 "HKLM"
+  Win9x:
+    StrCpy $1 "HKLM"
 
-	done:
-        Push $1
+  done:
+    Exch $1
+    Exch
+    Pop $0
 FunctionEnd
 
 Function un.CheckUserInstallRights
-	ClearErrors
-	UserInfo::GetName
-	IfErrors Win9x
-	Pop $0
-	UserInfo::GetAccountType
-	Pop $1
+  Push $0
+  Push $1
+  ClearErrors
+  UserInfo::GetName
+  IfErrors Win9x
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
 
-	StrCmp $1 "Admin" 0 +3
-                StrCpy $1 "HKLM"
-		Goto done
-	StrCmp $1 "Power" 0 +3
-                StrCpy $1 "HKLM"
-		Goto done
-	StrCmp $1 "User" 0 +3
-		StrCpy $1 "HKCU"
-		Goto done
-	StrCmp $1 "Guest" 0 +3
-		StrCpy $1 "NONE"
-		Goto done
-	; Unknown error
-	StrCpy $1 "NONE"
-        Goto done
+  StrCmp $1 "Admin" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "Power" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "User" 0 +3
+    StrCpy $1 "HKCU"
+    Goto done
+  StrCmp $1 "Guest" 0 +3
+    StrCpy $1 "NONE"
+    Goto done
+  ; Unknown error
+  StrCpy $1 "NONE"
+  Goto done
 
-	Win9x:
-		StrCpy $1 "HKLM"
+  Win9x:
+    StrCpy $1 "HKLM"
 
-	done:
-        Push $1
+  done:
+    Exch $1
+    Exch
+    Pop $0
 FunctionEnd
 
 ;
@@ -824,7 +978,9 @@
 ;   Pop $0 ; 0 - Bad path  1 - Good path
 ;
 Function VerifyDir
-  Pop $0
+  Exch $0
+  Push $1
+  Push $2
   Loop:
     IfFileExists $0 dir_exists
     StrCpy $1 $0 ; save last
@@ -865,7 +1021,7 @@
       PathBad1:
       StrCpy $0 "0"
       Push $0
-      Return
+      Goto done
 
     PathGood:
       FileClose $1
@@ -873,15 +1029,24 @@
       PathGood1:
       StrCpy $0 "1"
       Push $0
+
+  done:
+  Exch 3 ; The top of the stack contains the output variable
+  Pop $0
+  Pop $2
+  Pop $1
 FunctionEnd
 
 Function .onVerifyInstDir
+  Push $0
   Push $INSTDIR
   Call VerifyDir
   Pop $0
   StrCmp $0 "0" 0 dir_good
     Abort
+
   dir_good:
+  Pop $0
 FunctionEnd
 
 ; GetParent
@@ -918,7 +1083,7 @@
 ; be equal and the minor value needs to be greater or equal.
 ;
 ; Usage:
-;   Push "2.1.0"  ; Refrence version
+;   Push "2.1.0"  ; Reference version
 ;   Push "2.2.1"  ; Version to check
 ;   Call CheckGtkVersion
 ;   Pop $R0
@@ -926,33 +1091,39 @@
 ;
 Function CheckGtkVersion
   ; Version we want to check
-  Pop $6 
+  Exch $R0
+  Exch
   ; Reference version
-  Pop $8 
+  Exch $R1
+  Push $R2
+  Push $R3
 
   ; Check that the string to check is at least 5 chars long (i.e. x.x.x)
-  StrLen $7 $6
-  IntCmp $7 5 0 bad_version
+  StrLen $R2 $R0
+  IntCmp $R2 5 0 bad_version
 
   ; Major version check
-  StrCpy $7 $6 1
-  StrCpy $9 $8 1
-  IntCmp $7 $9 check_minor bad_version bad_version
+  StrCpy $R2 $R0 1
+  StrCpy $R3 $R1 1
+  IntCmp $R2 $R3 check_minor bad_version bad_version
 
   check_minor:
-    StrCpy $7 $6 1 2
-    StrCpy $9 $8 1 2
-    IntCmp $7 $9 good_version bad_version good_version
+    StrCpy $R2 $R0 1 2
+    StrCpy $R3 $R1 1 2
+    IntCmp $R2 $R3 good_version bad_version good_version
 
   bad_version:
-    StrCpy $6 "0"
-    Push $6
+    StrCpy $R0 "0"
     Goto done
 
   good_version:
-    StrCpy $6 "1"
-    Push $6
+    StrCpy $R0 "1"
+
   done:
+    Pop $R3
+    Pop $R2
+    Pop $R1
+    Exch $R0
 FunctionEnd
 
 ;
@@ -962,8 +1133,8 @@
 ;   0 - We have the correct version
 ;       Second Pop: Key where Version was found
 ;   1 - We have an old version that needs to be upgraded
-;       Second Pop: HKLM or HKCU depending on where GTK+ was found.
-;   2 - We don't have GTK+ at all
+;       Second Pop: HKLM or HKCU depending on where GTK was found.
+;   2 - We don't have Gtk+ at all
 ;       Second Pop: "NONE, HKLM or HKCU" depending on our rights..
 ;
 Function DoWeNeedGtk
@@ -979,6 +1150,11 @@
   ;       - If HKLM ver exists but old, return as if no ver exits.
   ;   - If no rights
   ;     - Check HKLM
+  Push $0
+  Push $2
+  Push $3
+  Push $4
+  Push $5
 
   Call CheckUserInstallRights
   Pop $3
@@ -997,8 +1173,7 @@
 
   have_gtk:
     ; GTK+ is already installed.. check version.
-    StrCpy $1 ${GTK_VERSION} ; Minimum GTK+ version needed
-    Push $1
+    Push ${GTK_VERSION} ; Minimum GTK+ version needed
     Push $0
     Call CheckGtkVersion
     Pop $2
@@ -1008,7 +1183,7 @@
       StrCmp $3 "NONE" no_gtk  ; if no rights.. can't upgrade
       StrCmp $3 "HKCU" 0 upgrade_gtk ; if HKLM can upgrade..
         StrCmp $5 "HKLM" no_gtk upgrade_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
-  
+
       upgrade_gtk:
         StrCpy $2 "1"
         Push $5
@@ -1039,25 +1214,38 @@
     Goto done
 
   done:
+  ; The top two items on the stack are what we want to return
+  Exch 5
+  Pop $0
+  Exch 5
+  Pop $2
+  Pop $5
+  Pop $4
+  Pop $3
 FunctionEnd
 
 Function RunCheck
+  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
     Abort
   done:
+  Pop $R0
 FunctionEnd
 
 Function un.RunCheck
+  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
     Abort
   done:
+  Pop $R0
 FunctionEnd
 
 Function .onInit
+  Push $R0
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gaim_installer_running") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
@@ -1066,9 +1254,20 @@
   Call RunCheck
   StrCpy $name "Gaim ${GAIM_VERSION}"
   StrCpy $GTK_THEME_SEL ${SecGtkWimp}
+  StrCpy $SPELLCHECK_SEL ""
+
+  !insertmacro SetSectionFlag ${SecGtkThemes} ${SF_RO}
+  !insertmacro UnselectSection ${SecGtkThemes}
+  !insertmacro SelectSection $GTK_THEME_SEL
+  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
+  !insertmacro UnselectSection ${SecSpellCheck}
+
+  ;Mark the dictionaries that are already installed as readonly
+  Call SelectAndDisableInstalledDictionaries
+
   StrCpy $ISSILENT "/NOUI"
 
-  ; GTK+ installer has two silent states.. one with Message boxes, one without
+  ; GTK installer has two silent states.. one with Message boxes, one without
   ; If gaim installer was run silently, we want to supress gtk installer msg boxes.
   IfSilent 0 set_gtk_normal
       StrCpy $ISSILENT "/S"
@@ -1095,21 +1294,20 @@
   StrCmp $INSTDIR "" 0 instdir_done
 
   Call CheckUserInstallRights
-  Pop $0
+  Pop $R0
 
-  StrCmp $0 "HKLM" 0 user_dir
+  StrCmp $R0 "HKLM" 0 user_dir
     StrCpy $INSTDIR "$PROGRAMFILES\Gaim"
     Goto instdir_done
   user_dir:
-    StrCpy $2 "$SMPROGRAMS"
-    Push $2
+    Push $SMPROGRAMS
     Call GetParent
     Call GetParent
-    Pop $2
-    StrCpy $INSTDIR "$2\Gaim"
+    Pop $R2
+    StrCpy $INSTDIR "$R2\Gaim"
 
   instdir_done:
-
+  Pop $R0
 FunctionEnd
 
 Function un.onInit
@@ -1118,89 +1316,111 @@
 
   ; Get stored language prefrence
   ReadRegStr $LANGUAGE HKCU ${GAIM_REG_KEY} "${GAIM_REG_LANG}"
-  
+
 FunctionEnd
 
+; This is a modified StartRadioButtons (from Sections.nsh)
+; The only difference is that it allows for nothing in the group to be selected
+; In that case, the default variable should be set to ""
+!macro StartRadioButtonsUnselectable var
+
+  !define StartRadioButtons_Var "${var}"
+
+  Push $R0
+  Push $R1
+
+   ;If we have no selection, don't try to unselect it
+   StrCmp "${StartRadioButtons_Var}" "" +4
+   SectionGetFlags "${StartRadioButtons_Var}" $R0
+   IntOp $R1 $R0 & ${SF_SELECTED}
+   IntOp $R0 $R0 & ${SECTION_OFF}
+   SectionSetFlags "${StartRadioButtons_Var}" $R0
+
+   ; If the previous value isn't currently selected,
+   ; we don't want to select it at the end
+   IntCmp $R1 ${SF_SELECTED} +2
+   StrCpy "${StartRadioButtons_Var}" ""
+
+   StrCpy $R1 "${StartRadioButtons_Var}"
+
+!macroend
+
 Function .onSelChange
   Push $0
+  Push $1
   Push $2
 
-  StrCpy $2 ${SF_SELECTED}
-  SectionGetFlags ${SecGtkNone} $0
-  IntOp $2 $2 & $0
-  SectionGetFlags ${SecGtkWimp} $0
-  IntOp $2 $2 & $0
-  SectionGetFlags ${SecGtkBluecurve} $0
-  IntOp $2 $2 & $0
-  SectionGetFlags ${SecGtkLighthouseblue} $0
-  IntOp $2 $2 & $0
-  StrCmp $2 0 skip
-    SectionSetFlags ${SecGtkNone} 0
-    SectionSetFlags ${SecGtkWimp} 0
-    SectionSetFlags ${SecGtkBluecurve} 0
-    SectionSetFlags ${SecGtkLighthouseblue} 0
-  skip:
+  !insertmacro StartRadioButtons $GTK_THEME_SEL
+    !insertmacro RadioButton ${SecGtkNone}
+    !insertmacro RadioButton ${SecGtkWimp}
+    !insertmacro RadioButton ${SecGtkBluecurve}
+    !insertmacro RadioButton ${SecGtkLighthouseblue}
+  !insertmacro EndRadioButtons
 
-  !insertmacro UnselectSection $GTK_THEME_SEL
- 
-  ; Remember old selection
-  StrCpy $2 $GTK_THEME_SEL
+  ; Check that at most one of the non-readonly spelling dictionaries are selected
+  ; We can't use $R0 or $R1 in this block since they're used in the macros
+  !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL
+    ; Start with the first language dictionary
+    IntOp $2 ${SecSpellCheck} + 1
+
+    start_spellcheck_radio:
+    SectionGetFlags $2 $0
 
-  ; Now go through and see who is checked..
-  SectionGetFlags ${SecGtkNone} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  IntCmp $0 ${SF_SELECTED} 0 +2 +2
-    StrCpy $GTK_THEME_SEL ${SecGtkNone}
-  SectionGetFlags ${SecGtkWimp} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  IntCmp $0 ${SF_SELECTED} 0 +2 +2
-    StrCpy $GTK_THEME_SEL ${SecGtkWimp}
-  SectionGetFlags ${SecGtkBluecurve} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  IntCmp $0 ${SF_SELECTED} 0 +2 +2
-    StrCpy $GTK_THEME_SEL ${SecGtkBluecurve}
-  SectionGetFlags ${SecGtkLighthouseblue} $0
-  IntOp $0 $0 & ${SF_SELECTED}
-  IntCmp $0 ${SF_SELECTED} 0 +2 +2
-    StrCpy $GTK_THEME_SEL ${SecGtkLighthouseblue}
+    IntOp $1 $0 & ${SF_SECGRPEND}
+    ; If it is the end of the section group, stop
+    IntCmp $1 ${SF_SECGRPEND} end_spellcheck_radio
 
-  StrCmp $2 $GTK_THEME_SEL 0 +2 ; selection hasn't changed
-    !insertmacro SelectSection $GTK_THEME_SEL
+    IntOp $0 $0 & ${SF_RO}
+    IntCmp $0 ${SF_RO} after_button_insert
+    ; If !readonly, then it is part of the radiobutton group
+    !insertmacro RadioButton $2
+    after_button_insert:
+
+    IntOp $2 $2 + 1 ;Advance to the next section
+    Goto start_spellcheck_radio
+
+    end_spellcheck_radio:
+  !insertmacro EndRadioButtons
 
   Pop $2
+  Pop $1
   Pop $0
 FunctionEnd
 
 ; Page enter and exit functions..
 
+!ifndef WITH_GTK
 Function preWelcomePage
   ; If this installer dosn't have GTK, check whether we need it.
   ; We do this here an not in .onInit because language change in
   ; .onInit doesn't take effect until it is finished.
-  !ifndef WITH_GTK
+    Push $R0
     Call DoWeNeedGtk
-    Pop $0
+    Pop $R0
     Pop $GTK_FOLDER
 
-    StrCmp $0 "0" have_gtk need_gtk
+    StrCmp $R0 "0" have_gtk need_gtk
     need_gtk:
       IfSilent skip_mb
       MessageBox MB_OK $(GTK_INSTALLER_NEEDED) IDOK
       skip_mb:
       Quit
     have_gtk:
-  !endif
+    Pop $R0
 FunctionEnd
+!endif
 
 !ifdef WITH_GTK
 Function preGtkDirPage
+  Push $R0
+  Push $R1
   Call DoWeNeedGtk
-  Pop $0
-  Pop $1
+  Pop $R0
+  Pop $R1
 
-  StrCmp $0 "0" have_gtk
-  StrCmp $0 "1" upgrade_gtk
-  StrCmp $0 "2" no_gtk no_gtk
+  StrCmp $R0 "0" have_gtk
+  StrCmp $R0 "1" upgrade_gtk
+  StrCmp $R0 "2" no_gtk no_gtk
 
   ; Don't show dir selector.. Upgrades are done to existing path..
   have_gtk:
@@ -1208,38 +1428,42 @@
     Abort
 
   no_gtk:
-    StrCmp $1 "NONE" 0 no_gtk_cont
+    StrCmp $R1 "NONE" 0 no_gtk_cont
       ; Got no install rights..
       Abort
     no_gtk_cont:
       ; Suggest path..
-      StrCmp $1 "HKCU" 0 hklm1
-        StrCpy $2 "$SMPROGRAMS"
-        Push $2
+      StrCmp $R1 "HKCU" 0 hklm1
+        StrCpy $R0 "$SMPROGRAMS"
+        Push $R0
         Call GetParent
         Call GetParent
-        Pop $2
-        StrCpy $2 "$2\GTK\2.0"
+        Pop $R0
+        StrCpy $R0 "$R0\GTK\2.0"
         Goto got_path
       hklm1:
-        StrCpy $2 "${GTK_DEFAULT_INSTALL_PATH}"
+        StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}"
 
    got_path:
      StrCpy $name "GTK+ ${GTK_VERSION}"
-     StrCpy $GTK_FOLDER $2
+     StrCpy $GTK_FOLDER $R0
+     Pop $R1
+     Pop $R0
 FunctionEnd
 
 Function postGtkDirPage
+  Push $R0
   StrCpy $name "Gaim ${GAIM_VERSION}"
   Push $GTK_FOLDER
   Call VerifyDir
-  Pop $0
-  StrCmp $0 "0" 0 done
+  Pop $R0
+  StrCmp $R0 "0" 0 done
     IfSilent skip_mb
     MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) IDOK
     skip_mb:
     Abort
   done:
+  Pop $R0
 FunctionEnd
 !endif
 
@@ -1247,42 +1471,41 @@
 ; input, none
 ; output, top of stack (replaces, with e.g. whatever)
 ; modifies no other variables.
- 
 Function GetParameters
- 
+
    Push $R0
    Push $R1
    Push $R2
    Push $R3
-   
+
    StrCpy $R2 1
    StrLen $R3 $CMDLINE
-   
+
    ;Check for quote or space
    StrCpy $R0 $CMDLINE $R2
    StrCmp $R0 '"' 0 +3
      StrCpy $R1 '"'
      Goto loop
    StrCpy $R1 " "
-   
+
    loop:
      IntOp $R2 $R2 + 1
      StrCpy $R0 $CMDLINE 1 $R2
      StrCmp $R0 $R1 get
      StrCmp $R2 $R3 get
      Goto loop
-   
+
    get:
      IntOp $R2 $R2 + 1
      StrCpy $R0 $CMDLINE 1 $R2
      StrCmp $R0 " " get
      StrCpy $R0 $CMDLINE "" $R2
-   
+
    Pop $R3
    Pop $R2
    Pop $R1
    Exch $R0
- 
+
 FunctionEnd
 
  ; StrStr
@@ -1334,18 +1557,20 @@
 ; /L=Language e.g.: /L=1033
 ;
 Function ParseParameters
+  Push $R0
   IntOp $LANG_IS_SET 0 + 0
   Call GetParameters
-  Pop $R0
-  Push $R0
+  ;Pop $R0
+  ;Push $R0
   Push "L="
   Call StrStr
-  Pop $R1
-  StrCmp $R1 "" next
-  StrCpy $R1 $R1 4 2 ; Strip first 2 chars of string
-  StrCpy $LANGUAGE $R1
+  Pop $R0
+  StrCmp $R0 "" next
+  StrCpy $R0 $R0 4 2 ; Strip first 2 chars of string
+  StrCpy $LANGUAGE $R0
   IntOp $LANG_IS_SET 0 + 1
   next:
+  Pop $R0
 FunctionEnd
 
 ; GetWindowsVersion
@@ -1429,8 +1654,236 @@
   lbl_error:
     Strcpy $R0 ''
   lbl_done:
- 
+
   Pop $R1
   Exch $R0
 FunctionEnd
 
+; SpellChecker Related Functions
+;-------------------------------
+
+; Convert the a Section index to the language code
+; Push the section index onto the stack and pop off the language code after the call
+; This will set the error code, if no match is found
+Function GetLangCodeForSection
+  ClearErrors
+  Push $R0
+  Exch
+  Pop $R0 ;This is the section index
+
+  IntCmp $R0 ${SecSpellCheckBreton} 0 +3 +3
+  StrCpy $R0 "br"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckCatalan} 0 +3 +3
+  StrCpy $R0 "ca"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckCzech} 0 +3 +3
+  StrCpy $R0 "cs"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckWelsh} 0 +3 +3
+  StrCpy $R0 "cy"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckDanish} 0 +3 +3
+  StrCpy $R0 "da"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckGerman} 0 +3 +3
+  StrCpy $R0 "de"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckGreek} 0 +3 +3
+  StrCpy $R0 "el"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckEnglish} 0 +3 +3
+  StrCpy $R0 "en"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckEsperanto} 0 +3 +3
+  StrCpy $R0 "eo"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSpanish} 0 +3 +3
+  StrCpy $R0 "es"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckFaroese} 0 +3 +3
+  StrCpy $R0 "fo"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckFrench} 0 +3 +3
+  StrCpy $R0 "fr"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckItalian} 0 +3 +3
+  StrCpy $R0 "it"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckDutch} 0 +3 +3
+  StrCpy $R0 "nl"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckNorwegian} 0 +3 +3
+  StrCpy $R0 "no"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckPolish} 0 +3 +3
+  StrCpy $R0 "pl"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckPortuguese} 0 +3 +3
+  StrCpy $R0 "pt"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckRomanian} 0 +3 +3
+  StrCpy $R0 "ro"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckRussian} 0 +3 +3
+  StrCpy $R0 "ru"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSlovak} 0 +3 +3
+  StrCpy $R0 "sk"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSwedish} 0 +3 +3
+  StrCpy $R0 "sv"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckUkrainian} 0 +3 +3
+  StrCpy $R0 "uk"
+  Goto done
+
+  SetErrors
+
+  done:
+  Exch $R0
+FunctionEnd ;GetLangCodeForSection
+
+; Select and Disable any Sections that have currently installed dictionaries
+Function SelectAndDisableInstalledDictionaries
+  Push $R0
+  Push $R1
+  Push $R2
+
+  ; Start with the first language dictionary
+  IntOp $R0 ${SecSpellCheck} + 1
+
+  start:
+  ; If it is the end of the section group, stop
+  SectionGetFlags $R0 $R1
+  IntOp $R2 $R1 & ${SF_SECGRPEND}
+  IntCmp $R2 ${SF_SECGRPEND} done
+
+  Push $R0
+  Call GetLangCodeForSection
+  Pop $R2
+  IfErrors end_loop
+  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R2" "" ; Check that the dictionary is installed
+  StrCmp $R2 "" end_loop ; If it isn't installed, skip to the next item
+  IntOp $R1 $R1 | ${SF_RO} ; Mark Readonly
+  IntOp $R1 $R1 | ${SF_SELECTED} ; Select
+  SectionSetFlags $R0 $R1
+
+  end_loop:
+  IntOp $R0 $R0 + 1 ;Advance to the next section
+  Goto start
+
+  done:
+  Pop $R2
+  Pop $R1
+  Pop $R0
+FunctionEnd
+
+Function InstallAspellAndDict
+  Push $R0
+  Exch
+  Call GetLangCodeForSection
+  Pop $R0 ;This is the language code
+  Push $R1
+
+  IfErrors done ; We weren't able to convert the section to lang code
+
+  retry:
+    Call InstallAspell
+    Pop $R1
+    StrCmp $R1 "" +3
+    StrCmp $R1 "cancel" done
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" IDRETRY retry IDCANCEL done
+
+  retry_dict:
+    Push $R0
+    Call InstallAspellDictionary
+    Pop $R1
+    StrCmp $R1 "" +3
+    StrCmp $R1 "cancel" done
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" IDRETRY retry_dict
+
+  done:
+
+  Pop $R1
+  Pop $R0
+FunctionEnd
+
+Function InstallAspell
+  Push $R0
+  Push $R1
+  Push $R2
+
+  check:
+  ClearErrors
+  ReadRegDWORD $R0 HKLM ${ASPELL_REG_KEY} "AspellVersion"
+  IntCmp $R0 15 installed
+
+  ; If this is the check after installation, don't infinite loop on failure
+  StrCmp $R1 "$TEMP\aspell_installer.exe" 0 +3
+    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
+    Goto done
+
+  ; We need to download and install aspell
+  StrCpy $R1 "$TEMP\aspell_installer.exe"
+  StrCpy $R2 "${DOWNLOADER_URL}?version=${GAIM_VERSION}&dl_pkg=aspell_core"
+  DetailPrint "Downloading Aspell... ($R2)"
+  NSISdl::download $R2 $R1
+  Pop $R0
+  StrCmp $R0 "success" +2
+    Goto done
+  ExecWait '"$R1"'
+  Delete $R1
+  Goto check ; Check that it is now installed correctly
+
+  installed: ;Aspell is currently installed, no error message
+    DetailPrint "Aspell is installed"
+    StrCpy $R0 ''
+
+  done:
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+Function InstallAspellDictionary
+  Push $R0
+  Exch
+  Pop $R0 ;This is the language code
+  Push $R1
+  Push $R2
+  Push $R3
+
+  check:
+  ClearErrors
+  ReadRegStr $R1 HKLM "${ASPELL_REG_KEY}-$R0" ""
+  StrCmp $R1 "" 0 installed
+
+  ; If this is the check after installation, don't infinite loop on failure
+  StrCmp $R1 "$TEMP\aspell_dict-$R0.exe" 0 +3
+    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
+    Goto done
+
+  ; We need to download and install aspell
+  StrCpy $R1 "$TEMP\aspell_dict-$R0.exe"
+  StrCpy $R3 "${DOWNLOADER_URL}?version=${GAIM_VERSION}&dl_pkg=lang_$R0"
+  DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
+  NSISdl::download $R3 $R1
+  Pop $R3
+  StrCmp $R3 "success" +3
+    StrCpy $R0 $R3
+    Goto done
+  ExecWait '"$R1"'
+  Delete $R1
+  Goto check ; Check that it is now installed correctly
+
+  installed: ;The dictionary is currently installed, no error message
+    DetailPrint "Aspell $R0 Dictionary is installed"
+    StrCpy $R0 ''
+
+  done:
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/win32/nsis/gaim-plugin.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -0,0 +1,181 @@
+;;
+;; Windows Gaim NSIS installer plugin helper utilities
+;; Copyright 2005, Daniel Atallah <daniel_atallah@yahoo.com>
+;;
+;; Include in plugin installer scripts using:
+;;   !addincludedir "${PATH_TO_GAIM_SRC}\src\win32\nsis"
+;;   !include "gaim-plugin.nsh"
+;;
+
+!define GAIM_REG_KEY              "SOFTWARE\gaim"
+
+!define GAIM_VERSION_OK           0
+!define GAIM_VERSION_INCOMPATIBLE 1
+!define GAIM_VERSION_UNDEFINED    2
+
+; Extract the Gaim Version from the registry
+; This will set the Error flag if unable to determine the value
+; Pop the value of the stack after calling this to get the value (unless Error Flag is set)
+Function GetGaimVersion
+  Push $R0
+
+  ; Read the gaim version
+  ClearErrors
+  ReadRegStr $R0 HKLM ${GAIM_REG_KEY} "Version"
+  IfErrors +1 GetGaimVersion_found
+  ; fall back to the HKCU registry key
+  ReadRegStr $R0 HKCU ${GAIM_REG_KEY} "Version"
+  IfErrors GetGaimVersion_done ; Keep the error flag set
+
+  GetGaimVersion_found:
+  Push $R0 ; Push the value onto the stack
+  Exch
+
+  GetGaimVersion_done:
+  ; restore $R0
+  Pop $R0
+FunctionEnd
+
+; Check that the currently installed gaim version is compatible
+; with the plugin version we are installing
+; Push the Plugin's Gaim Version onto the Stack before calling
+; After calling, the top of the Stack will contain the result of the check:
+;   GAIM_VERSION_OK - If the installed gaim version is compatible w/ the version specified
+;   GAIM_VERSION_INCOMPATIBLE - If the installed gaim version isn't compatible w/ the ersion specified
+;   GAIM_VERSION_UNDEFINED - If the installed gaim version can't be determined 
+Function CheckGaimVersion
+  ; Save the Variable values that we will use in the stack
+  Push $R4
+  Exch
+  Pop $R4 ; Get the plugin's Gaim Version
+  Push $R0
+  Push $R1
+  Push $R2
+
+  ; Read the gaim version
+  Call GetGaimVersion
+  IfErrors checkGaimVersion_noGaimInstallFound
+  Pop $R0
+
+  ;If they are exactly the same, we don't need to look at anything else
+  StrCmp $R0 $R4 checkGaimVersion_VersionOK 
+
+  ; Versions are in the form of X.Y.Z
+  ; If X is different or plugin's Y > gaim's Y, then we shouldn't install
+
+  ;Check the Major Version
+  Push $R0
+  Push 0
+  Call GetVersionComponent
+  IfErrors checkGaimVersion_noGaimInstallFound ;We couldn't extract 'X' from the installed gaim version
+  Pop $R2
+  Push $R4
+  Push 0
+  Call GetVersionComponent
+  IfErrors checkGaimVersion_BadVersion ; this isn't a valid version, so don't bother even checking
+  Pop $R1
+  ;Check that both versions' X is the same
+  StrCmp $R1 $R2 +1 checkGaimVersion_BadVersion
+
+  ;Check the Minor Version
+  Push $R0
+  Push 1
+  Call GetVersionComponent
+  IfErrors checkGaimVersion_noGaimInstallFound ;We couldn't extract 'Y' from the installed gaim version
+  Pop $R2
+  Push $R4
+  Push 1
+  Call GetVersionComponent
+  IfErrors checkGaimVersion_BadVersion ; this isn't a valid version, so don't bother even checking
+  Pop $R1
+  ;Check that plugin's Y <= gaim's Y
+  IntCmp $R1 $R2 checkGaimVersion_VersionOK checkGaimVersion_VersionOK checkGaimVersion_BadVersion
+
+  checkGaimVersion_BadVersion:
+    Push ${GAIM_VERSION_INCOMPATIBLE}
+    goto checkGaimVersion_done
+  checkGaimVersion_noGaimInstallFound:
+    Push ${GAIM_VERSION_UNDEFINED}
+    goto checkGaimVersion_done
+  checkGaimVersion_VersionOK:
+    Push ${GAIM_VERSION_OK}
+
+  checkGaimVersion_done:
+  ; Restore the Variables that we used
+  Exch
+  Pop $R2
+  Exch
+  Pop $R1
+  Exch
+  Pop $R0
+  Exch
+  Pop $R4
+FunctionEnd
+
+; Extract the part of a string prior to "." (or the whole string if there is no ".")
+; If no "." was found, the ErrorFlag will be set
+; Before this is called, Push ${VERSION_STRING} must be called, and then Push 0 for Major, 1 for Minor, etc
+; Pop should be called after to retrieve the new value
+Function GetVersionComponent
+  ClearErrors
+
+  ; Save the Variable values that we will use in the stack
+  Push $1
+  Exch  
+  Pop $1 ;The version component which we want to extract (0, 1, 2)
+  Exch
+  Push $0
+  Exch
+  Pop $0 ;The string from which to extract the version component
+
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+  Push $7
+
+  StrCpy $2 "0" ;Initialize our string index counter
+  StrCpy $7 "0" ;Index of last "."
+  StrCpy $3 "0" ;Initialize our version index counter
+
+  startGetVersionComponentLoop:
+    ;avoid infinite loop (if we have gotten the whole initial string, exit the loop and set the error flag)
+    StrCmp $6 $0 GetVersionComponentSetErrorFlag
+    IntOp $2 $2 + 1
+    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
+    ;Determine the correct substring (only the current index component)
+    IntOp $5 $2 - $7
+    StrCpy $4 $0 $5 $7 ;Append the current character in $0 to $4
+    StrCpy $5 $0 1 $2 ;store the next character in $5
+
+    ;if the next character is ".", $4 will contain the version component prior to "."
+    StrCmp $5 "." +1 startGetVersionComponentLoop
+    StrCmp $3 $1 doneGetVersionComponent ;If it is the version component we're looking for, stop
+    IntOp $3 $3 + 1 ;Increment the version index counter
+    IntOp $2 $2 + 1 ;Increment the version string index to "." (so it will be skipped)
+    StrCpy $7 $2 ;Keep track of the index of the last "."
+    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
+    goto startGetVersionComponentLoop
+
+  GetVersionComponentSetErrorFlag:
+    SetErrors
+
+  doneGetVersionComponent:
+  ; Restore the Variables that we used
+  Pop $7
+  Pop $6
+  Pop $5
+  Push $4 ;This is the value we're returning
+  Exch
+  Pop $4
+  Exch
+  Pop $3
+  Exch
+  Pop $2
+  Exch
+  Pop $0
+  Exch
+  Pop $1
+FunctionEnd
+
--- a/src/win32/nsis/langmacros.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/langmacros.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -81,6 +81,35 @@
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_1		${CUR_LANG}
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_2		${CUR_LANG}
 
+  ; Spellcheck Section Prompts
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_TITLE	${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ERROR		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DICT_ERROR		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_DESCRIPTION	${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT ASPELL_INSTALL_FAILED		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_BRETON		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CATALAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CZECH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_WELSH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DANISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GERMAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ENGLISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GREEK		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ESPERANTO		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SPANISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FAROESE		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FRENCH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ITALIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DUTCH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_NORWEGIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_POLISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_PORTUGUESE		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ROMANIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_RUSSIAN		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SLOVAK		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SWEDISH		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_UKRAINIAN		${CUR_LANG}
+
   !undef CUR_LANG
 !macroend
 
--- a/src/win32/nsis/translations/albanian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/albanian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Gaim-i"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temat GTK+ mund të ndryshojnë pamjen dhe sjelljen e zbatimeve GTK+."
 !define GTK_NO_THEME_DESC			"Mos instalo temë GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK+ që ndërthuret mirë mjedisin Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK që ndërthuret mirë mjedisin Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 
--- a/src/win32/nsis/translations/bulgarian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/bulgarian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -23,7 +23,7 @@
 !define GTK_SECTION_DESCRIPTION		"Ìóëòèïëàòôîðåí êèò çà ãðàôè÷åí èçãëåä, èçïîëçâàí îò Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ òåìèòå ìîãàò äà ïðîìåíÿò Èçãëåäà íà GTK+ ïðèëîæåíèÿ."
 !define GTK_NO_THEME_DESC			"Íå èíñòàëèðàéòå GTK+ òåìà"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) å GTK+ òåìà êîÿòî ñå ñìåñâà äîáðå ñúñ Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) å GTK òåìà êîÿòî ñå ñìåñâà äîáðå ñúñ Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve òåìàòà."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue òåìàòà."
 
--- a/src/win32/nsis/translations/catalan.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/catalan.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,3 +1,4 @@
+;;  vim:syn=winbatch:encoding=cp1252:
 ;;
 ;;  catalan.nsh
 ;;
@@ -6,30 +7,39 @@
 ;;
 ;;  Author: "Bernat López" <bernatl@adequa.net>
 ;;  Version 2
-;;  
+;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"L'instal.lador encara està executant-se."
+!define GAIM_IS_RUNNING				"Hi ha una instància del Gaim executant-se. Surt del Gaim i torna a intentar-ho."
 !define GTK_INSTALLER_NEEDED			"L'entorn d'execució GTK+ no existeix o necessita ésser actualitzat.$\rSius plau instal.la la versió${GTK_VERSION} o superior de l'entonr GTK+"
 
 ; License Page
 !define GAIM_LICENSE_BUTTON			"Següent >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) és distribuït sota llicència GPLe. Podeu consultar la llicència, només per proposits informatius, aquí. $_CLICK"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) és distribuït sota llicència GPL. Podeu consultar la llicència, només per proposits informatius, aquí.  $_CLICK"
 
 ; Components Page
 !define GAIM_SECTION_TITLE			"Client Gaim de Missatgeria Instantània (necessari)"
 !define GTK_SECTION_TITLE			"Entorn d'Execució GTK+ (necessari)"
 !define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Sense tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema Imwi"
+!define GTK_WIMP_SECTION_TITLE			"Tema Imwi"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Corba Blava"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Enllaços directes"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
 !define GAIM_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Gaim"
-!define GTK_SECTION_DESCRIPTION		"Una eina IGU multiplataforma, utilitzada per Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
+!define GTK_SECTION_DESCRIPTION			"Una eina IGU multiplataforma, utilitzada per Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Els temes GTK+ poden modificar l'aspecte de les aplicacions GTK+."
 !define GTK_NO_THEME_DESC			"No instal.lis un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) és un tema GTK+ que s'integra perfectament en un entorn d'escriptori Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) és un tema GTK que s'integra perfectament en un entorn d'escriptori Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Corba Blava."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Enllaços directes per iniciar el Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Afegir un enllaç directe al Gaim a l'Escriptori"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Crear una entrada Gaim al Menu Inici"
+
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"S'ha trobat una versió antiga de l'entorn d'execució GTK. Vols actualitzar-la?$\rNota: Gaim no funcionarà sino ho fas."
@@ -40,7 +50,7 @@
 ; 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?"
+!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+."
@@ -52,3 +62,33 @@
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Gaim.$\rProbablement un altre usuari ha instal.lat aquesta aplicació."
 !define un.GAIM_UNINSTALL_ERROR_2		"No tens permís per desinstal.lar aquesta aplicació."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Suport a la Verificació de l'Ortografia "
+!define GAIM_SPELLCHECK_ERROR			"Error instal.lant verificació de l'ortografia"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Error Instal.lant Diccionari  per a Verificació de l'Ortografia"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Suport per a Verificació de l'Ortografia.  (és necesaria connexió a internet per dur a terme la instal.lació)"
+!define ASPELL_INSTALL_FAILED			"La instal.lació ha fallat"
+!define GAIM_SPELLCHECK_BRETON			"Bretó"
+!define GAIM_SPELLCHECK_CATALAN			"Català"
+!define GAIM_SPELLCHECK_CZECH			"Txec"
+!define GAIM_SPELLCHECK_WELSH			"Gal·lès"
+!define GAIM_SPELLCHECK_DANISH			"Danès"
+!define GAIM_SPELLCHECK_GERMAN			"Alemany"
+!define GAIM_SPELLCHECK_GREEK			"Grec"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglès"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Espanyol"
+!define GAIM_SPELLCHECK_FAROESE			"Feroès"
+!define GAIM_SPELLCHECK_FRENCH			"Francès"
+!define GAIM_SPELLCHECK_ITALIAN			"Italià"
+!define GAIM_SPELLCHECK_DUTCH			"Holandès"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Noruec"
+!define GAIM_SPELLCHECK_POLISH			"Polonès"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portuguès"
+!define GAIM_SPELLCHECK_ROMANIAN		"Romanès"
+!define GAIM_SPELLCHECK_RUSSIAN			"Rus"
+!define GAIM_SPELLCHECK_SLOVAK			"Eslovac"
+!define GAIM_SPELLCHECK_SWEDISH			"Suec"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ucraïnès"
+
--- a/src/win32/nsis/translations/czech.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/czech.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit používaný Gaimem"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ témata umožòují mìnit vzhled a zpùsob ovládání GTK+ aplikací."
 !define GTK_NO_THEME_DESC			"Neinstalovat GTK+ téma"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ téma které zapadne do Vašeho pracovního prostøedí ve Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK téma které zapadne do Vašeho pracovního prostøedí ve Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve téma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue téma."
 
--- a/src/win32/nsis/translations/danish.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/danish.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsværktøj, bruges af Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Temaer kan ændre GTK+ programmers generelle udseende."
 !define GTK_NO_THEME_DESC			"Installér ikke noget GTK+ tema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK+ tema som falder i med Windows skrivebordsmiljøet."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmiljøet."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue tema."
 
--- a/src/win32/nsis/translations/dutch.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/dutch.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,3 +1,4 @@
+;;  vim:syn=winbatch:encoding=cp1252
 ;;
 ;;  dutch.nsh
 ;;
@@ -7,9 +8,11 @@
 ;;  Author: Vincent van Adrighem <vincent@dirck.mine.nu>
 ;;  Version 2
 ;;
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Er is al een installatie actief."
+!define GAIM_IS_RUNNING			"Gaim wordt op dit moment uitgevoerd. Sluit Gaim af en start de installatie opnieuw."
+!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
 
 ; License Page
 !define GAIM_LICENSE_BUTTON			"Volgende >"
@@ -50,5 +53,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "De uninstaller kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma geïnstalleerd."
+!define un.GAIM_UNINSTALL_ERROR_1         "Het verwijderingsprogramma voor Gaim kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma geïnstalleerd."
 !define un.GAIM_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
+
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Spellingscontrole"
+!define GAIM_SPELLCHECK_ERROR			"Fout bij installatie van spellingscontrole"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Fout bij installatie van woordenboek voor spellingscontrole"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
+!define ASPELL_INSTALL_FAILED			"Installatie mislukt"
+!define GAIM_SPELLCHECK_BRETON			"Bretons"
+!define GAIM_SPELLCHECK_CATALAN			"Catalaans"
+!define GAIM_SPELLCHECK_CZECH			"Tsjechisch"
+!define GAIM_SPELLCHECK_WELSH			"Welsh"
+!define GAIM_SPELLCHECK_DANISH			"Deens"
+!define GAIM_SPELLCHECK_GERMAN			"Duits"
+!define GAIM_SPELLCHECK_GREEK			"Grieks"
+!define GAIM_SPELLCHECK_ENGLISH			"Engels"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Spaans"
+!define GAIM_SPELLCHECK_FAROESE			"Faroese"
+!define GAIM_SPELLCHECK_FRENCH			"Frans"
+!define GAIM_SPELLCHECK_ITALIAN			"Italiaans"
+!define GAIM_SPELLCHECK_DUTCH			"Nederlands"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Noors"
+!define GAIM_SPELLCHECK_POLISH			"Pools"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugees"
+!define GAIM_SPELLCHECK_ROMANIAN			"Roemeens"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
+!define GAIM_SPELLCHECK_SLOVAK			"Slowaaks"
+!define GAIM_SPELLCHECK_SWEDISH			"Zweeds"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Oekraïns"
--- a/src/win32/nsis/translations/english.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/english.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -35,7 +35,7 @@
 !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_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"
@@ -63,3 +63,33 @@
 ; 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."
+
+; Spellcheck Section Prompts
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_TITLE		"Spellchecking Support"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ERROR			"Error Installing Spellchecking"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DICT_ERROR		"Error Installing Spellchecking Dictionary"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
+!insertmacro GAIM_MACRO_DEFAULT_STRING ASPELL_INSTALL_FAILED			"Installation Failed"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_BRETON			"Breton"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CATALAN			"Catalan"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CZECH			"Czech"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_WELSH			"Welsh"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DANISH			"Danish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GERMAN			"German"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GREEK			"Greek"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ENGLISH			"English"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SPANISH			"Spanish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FAROESE			"Faroese"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FRENCH			"French"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ITALIAN			"Italian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DUTCH			"Dutch"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_NORWEGIAN		"Norwegian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_POLISH			"Polish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_PORTUGUESE		"Portuguese"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ROMANIAN			"Romanian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_RUSSIAN			"Russian"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SLOVAK			"Slovak"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SWEDISH			"Swedish"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_UKRAINIAN		"Ukrainian"
+
--- a/src/win32/nsis/translations/finnish.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/finnish.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (käyttäjäulkoasu) työkalupakki, Gaimin käyttämä"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkonäköä ja tuntua."
 !define GTK_NO_THEME_DESC			"Älä asenna GTK+ teemoja"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK+ teema joka sulautuu hyvin Windowsin ympäristöön."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ympäristöön."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve teema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue teema."
 
--- a/src/win32/nsis/translations/french.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/french.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,55 +1,95 @@
+;;  vim:syn=winbatch:encoding=cp1252:
 ;;
 ;;  french.nsh
 ;;
 ;;  French language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Eric Boumaour <zongo@nekeme.net>, 2003.
-;;  Version 2
+;;  Version 3
+;;  Author: Eric Boumaour <zongo_fr@users.sourceforge.net>, 2003-2005.
 ;;
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"Les bibliothèques de l'environnement GTK+ ne sont pas installées ou nécessitent une mise à jour.$\rVeuillez installer les bibliothèques GTK+ v${GTK_VERSION} ou plus récentes."
+; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when updating this file
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Le programme d'installation est déjà en cours d'exécution."
+!define GAIM_IS_RUNNING				"Une instance de Gaim est en cours d'exécution. Veuillez quitter Gaim et réessayer."
+!define GTK_INSTALLER_NEEDED			"Les bibliothèques de l'environnement GTK+ ne sont pas installées ou ont besoin d'une mise à jour.$\rVeuillez installer la version ${GTK_VERSION} ou plus récente des bibliothèques GTK+."
 
 ; License Page
 !define GAIM_LICENSE_BUTTON			"Suivant >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GPL. Le texte de licence suivant est fourni uniquement à titre informatif. $_CLICK" 
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement à titre informatif. $_CLICK" 
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim messagerie instantanée (obligatoire)"
+!define GAIM_SECTION_TITLE			"Gaim client de messagerie instantanée (obligatoire)"
 !define GTK_SECTION_TITLE			"Bibliothèques GTK+ (obligatoire)"
 !define GTK_THEMES_SECTION_TITLE		"Thèmes GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Pas de thème"
-!define GTK_WIMP_SECTION_TITLE		"Thème Wimp"
+!define GTK_WIMP_SECTION_TITLE			"Thème Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Thème Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Thème Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Raccourcis"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Démarrer"
 !define GAIM_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Gaim"
-!define GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Les thèmes GTK+ permettent de changer l'aspect des applications GTK+."
+!define GTK_SECTION_DESCRIPTION			"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé par Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Les thèmes GTK+ permettent de changer l'aspect des applications GTK+."
 !define GTK_NO_THEME_DESC			"Ne pas installer de thème GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitateur de Windows) est un thème de GTK+ qui se fond dans l'environnement graphique de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Thème Bluecurve"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Thème Lighthouseblue"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Thème Lighthouseblue"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Créer un raccourci pour Gaim sur le bureau"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Créer un raccourci pour Gaim dans le menu Démarrer"
 
-; GTK+ Dir Selector Page
-!define GTK_UPGRADE_PROMPT			"Une ancienne version des bibliothèques GTK+ a été trouvée. Voulez-vous la mettre à jour ?$\rNote : Gaim peut ne pas fonctionner sans cela."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Une ancienne version des bibliothèques GTK+ a été trouvée. Voulez-vous la mettre à jour ?$\rNote : Gaim peut ne pas fonctionner si vous ne le faites pas."
 
 ; Installer Finish Page
 !define GAIM_FINISH_VISIT_WEB_SITE		"Visitez la page web de Gaim Windows" 
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
-!define GAIM_PROMPT_WIPEOUT			"L'ancien répertoire 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 des utilisateurs de Gaim ne sont pas touchés."
-!define GAIM_PROMPT_DIR_EXISTS		"Le répertoire d'installation existe déjà. Son contenu sera effacé.$\rVoulez-vous continuer ?"
+!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+"
-!define GTK_BAD_INSTALL_PATH			"Le répertoire d'installation ne peut pas être créé ou n'est pas accessible."
+!define GTK_BAD_INSTALL_PATH			"Le dossier d'installation ne peut pas être créé ou n'est pas accessible."
 
 ; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un thème GTK+"
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un thème GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Les clefs de Gaim n'ont pas été trouvées dans la base de registres.$\rL'application a peut-être été installée par un utilisateur différent."
-!define un.GAIM_UNINSTALL_ERROR_2         "Vous n'avez pas les permissions pour supprimer cette application."
+!define un.GAIM_UNINSTALL_ERROR_1		"Le programme de désinstallation n'a pas retrouvé les entrées de Gaim dans la base de registres.$\rL'application a peut-être été installée par un utilisateur différent."
+!define un.GAIM_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
 
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Correction orthographique"
+!define GAIM_SPELLCHECK_ERROR			"Erreur à l'installation du correcteur orthographique"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Erreur à l'installation du dictionnaire pour le correcteur orthographique"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est nécessaire pour son installation)"
+!define ASPELL_INSTALL_FAILED			"Échec de l'installation"
+!define GAIM_SPELLCHECK_BRETON			"Breton"
+!define GAIM_SPELLCHECK_CATALAN			"Catalan"
+!define GAIM_SPELLCHECK_CZECH			"Tchèque"
+!define GAIM_SPELLCHECK_WELSH			"Gallois"
+!define GAIM_SPELLCHECK_DANISH			"Danois"
+!define GAIM_SPELLCHECK_GERMAN			"Allemand"
+!define GAIM_SPELLCHECK_GREEK			"Grec"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglais"
+!define GAIM_SPELLCHECK_ESPERANTO		"Espéranto"
+!define GAIM_SPELLCHECK_SPANISH			"Espagnol"
+!define GAIM_SPELLCHECK_FAROESE			"Féringien"
+!define GAIM_SPELLCHECK_FRENCH			"Français"
+!define GAIM_SPELLCHECK_ITALIAN			"Italien"
+!define GAIM_SPELLCHECK_DUTCH			"Hollandais"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norvégien"
+!define GAIM_SPELLCHECK_POLISH			"Polonais"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugais"
+!define GAIM_SPELLCHECK_ROMANIAN		"Roumain"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russe"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovaque"
+!define GAIM_SPELLCHECK_SWEDISH			"Suédois"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainien"
--- a/src/win32/nsis/translations/german.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/german.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,3 +1,4 @@
+;; vim:syn=winbatch:encoding=cp1252:
 ;;
 ;;  german.nsh
 ;;
@@ -25,13 +26,19 @@
 !define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
+!define GAIM_SHORTCUTS_SECTION_TITLE	"Verknüpfungen"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmenü"
 !define GAIM_SECTION_DESCRIPTION		"Gaim Basis-Dateien und -DLLs"
 !define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen können Aussehen und Bedienung von GTK+ Anwendungen verändern."
 !define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK+ Theme, daß sich besonders gut in den Windows Desktop integriert."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, das sich besonders gut in den Windows Desktop integriert."
 !define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verknüpfungen zum Start von Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verknüpfung zu Gaim auf dem Desktop"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag für Gaim im Startmenü"
  
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. Möchten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
@@ -42,7 +49,7 @@
 ; 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, daß Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelöscht. Möchten Sie fortfahren?"
+!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/src/win32/nsis/translations/hungarian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/hungarian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -4,43 +4,89 @@
 ;;  Default language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1250
 ;;
-;;  Author: Sutto Zoltan <suttozoltan@chello.hu
+;;  Authors: Sutto Zoltan <suttozoltan@chello.hu>, 2003
+;;           Gabor Kelemen <kelemeng@gnome.hu>, 2005
 ;;
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"A GTK+ futtató környezet hiányzik vagy újabb verzió szükséges.$\rKérem installálja a v${GTK_VERSION} vagy magasabb verziójú GTK+ futtató környezetet."
+; Startup Checks
+!define GTK_INSTALLER_NEEDED			"A GTK+ futtató környezet hiányzik vagy frissítése szükséges.$\rKérem telepítse a v${GTK_VERSION} vagy magasabb verziójú GTK+ futtató környezetet."
+!define INSTALLER_IS_RUNNING			"A telepíto már fut."
+!define GAIM_IS_RUNNING				"Jelenleg fut a Gaim egy példánya. Lépjen ki a Gaimból és azután próbálja újra."
+
+; License Page
+!define GAIM_LICENSE_BUTTON			"Tovább >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim IM kliens (szükséges)"
+!define GAIM_SECTION_TITLE			"Gaim azonnali üzeno kliens (szükséges)"
 !define GTK_SECTION_TITLE			"GTK+ futtató környezet (szükséges)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ témák"
 !define GTK_NOTHEME_SECTION_TITLE		"Nincs téma"
-!define GTK_WIMP_SECTION_TITLE		"Wimp téma"
+!define GTK_WIMP_SECTION_TITLE			"Wimp téma"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve téma"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue téma"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menü"
 !define GAIM_SECTION_DESCRIPTION		"Gaim fájlok és dll-ek"
-!define GTK_SECTION_DESCRIPTION		"Gaim által használt több-platformos grafikus környezet"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ témák megváltoztatják a GTK+ alkalmazások kinézetét."
-!define GTK_NO_THEME_DESC			"Ne installálja a GTK+ témákat"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows utánzat) egy Windows környezettel harmonizáló GTK+ téma."
+!define GTK_SECTION_DESCRIPTION			"A Gaim által használt többplatformos grafikus környezet"
+!define GTK_THEMES_SECTION_DESCRIPTION		"A GTK+ témák megváltoztatják a GTK+ alkalmazások kinézetét."
+!define GTK_NO_THEME_DESC			"Ne telepítse a GTK+ témákat"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows utánzat) egy Windows környezettel harmonizáló GTK téma."
 !define GTK_BLUECURVE_THEME_DESC		"A Bluecurve téma."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"A Lighthouseblue téma."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"A Lighthouseblue téma."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Gaim indításához"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Parancsikon létrehozása a Gaimhoz az asztalon"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Start Menü bejegyzés létrehozása a Gaimhoz"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Egy régi verziójú GTK+ futtató környezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: Gaim valószínüleg nem fog mûködni amig nem frissíti."
+!define GTK_UPGRADE_PROMPT			"Egy régi verziójú GTK+ futtatókörnyezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: a Gaim nem fog muködni, ha nem frissíti."
+
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"A Windows Gaim weboldalának felkeresése"
 
 ; 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örlõdni fog. Folytatni szeretné?$\r$\rMegjegyzés: Minden Ön által telepített plugin törlõdni fog.$\rGaim felhasználói beállításokat ez nem érinti."
-!define GAIM_PROMPT_DIR_EXISTS		"A telepítéskor megadott könyvtár már létezik. Minden állomány törlõdni fog.$\rFolytatni szeretné?"
+!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ó telepítése közben."
-!define GTK_BAD_INSTALL_PATH			"A megadott elérési út nem elérhetõ vagy nem hozható létre."
+!define GTK_INSTALL_ERROR			"Hiba a GTK+ futtatókörnyezet telepítése közben."
+!define GTK_BAD_INSTALL_PATH			"A megadott elérési út nem érheto el, vagy nem hozható létre."
 
 ; GTK+ Themes section
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosultsága a GTK+ témák telepítéséhez."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Az eltávolító nem talált Gaim registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást."
-!define un.GAIM_UNINSTALL_ERROR_2         "Nincs jogosultsága az alkalmazás eltávolításához."
+!define un.GAIM_UNINSTALL_ERROR_1		"Az eltávolító nem találta a Gaim registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást."
+!define un.GAIM_UNINSTALL_ERROR_2		"Nincs jogosultsága az alkalmazás eltávolításához."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Helyesírásellenorzés támogatása"
+!define GAIM_SPELLCHECK_ERROR			"Hiba a helyesírásellenorzés telepítése közben"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Hiba a helyesírásellenorzési szótár telepítése közben"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Helyesírásellenorzés támogatása. (Internetkapcsolat szükséges a telepítéshez)"
+!define ASPELL_INSTALL_FAILED			"A telepítés sikertelen"
+!define GAIM_SPELLCHECK_BRETON			"Breton"
+!define GAIM_SPELLCHECK_CATALAN			"Katalán"
+!define GAIM_SPELLCHECK_CZECH			"Cseh"
+!define GAIM_SPELLCHECK_WELSH			"Walesi"
+!define GAIM_SPELLCHECK_DANISH			"Dán"
+!define GAIM_SPELLCHECK_GERMAN			"Német"
+!define GAIM_SPELLCHECK_GREEK			"Görög"
+!define GAIM_SPELLCHECK_ENGLISH			"Angol"
+!define GAIM_SPELLCHECK_ESPERANTO		"Eszperantó"
+!define GAIM_SPELLCHECK_SPANISH			"Spanyol"
+!define GAIM_SPELLCHECK_FAROESE			"Faröai"
+!define GAIM_SPELLCHECK_FRENCH			"Francia"
+!define GAIM_SPELLCHECK_ITALIAN			"Olasz"
+!define GAIM_SPELLCHECK_DUTCH			"Holland"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norvég"
+!define GAIM_SPELLCHECK_POLISH			"Lengyel"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugál"
+!define GAIM_SPELLCHECK_ROMANIAN		"Román"
+!define GAIM_SPELLCHECK_RUSSIAN			"Orosz"
+!define GAIM_SPELLCHECK_SLOVAK			"Szlovák"
+!define GAIM_SPELLCHECK_SWEDISH			"Svéd"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrán"
+
--- a/src/win32/nsis/translations/italian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/italian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
 !define GTK_NO_THEME_DESC			"Non installare nessun tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) è un tema GTK+ che si adatta bene all'aspetto di Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) è un tema GTK che si adatta bene all'aspetto di Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Il tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Il tema Lighthouseblue."
 
--- a/src/win32/nsis/translations/japanese.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/japanese.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,3 +1,4 @@
+;;  vim:syn=winbatch:encoding=cp932:
 ;;
 ;;  japanese.nsh
 ;;
@@ -8,7 +9,9 @@
 ;;  Version 2
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"ƒCƒ“ƒXƒg[ƒ‰‚ªŠù‚ÉŽÀs‚³‚ê‚Ä‚¢‚Ü‚·"
+!define GAIM_IS_RUNNING				"Gaim ‚ªŽÀs‚³‚ê‚Ä‚¢‚Ü‚·BGaim ‚ðI—¹‚µ‚Ä‚©‚çÄ“xŽÀs‚µ‚Ä‚­‚¾‚³‚¢"
 !define GTK_INSTALLER_NEEDED			"GTK+ƒ‰ƒ“ƒ^ƒCƒ€ŠÂ‹«‚ª–³‚¢‚©‚à‚µ‚­‚̓AƒbƒvƒOƒŒ[ƒh‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B$\rv${GTK_VERSION}‚à‚µ‚­‚Í‚»‚êˆÈã‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢B"
 
 ; License Page
@@ -20,16 +23,22 @@
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (•K{)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+‚̃e[ƒ}"
 !define GTK_NOTHEME_SECTION_TITLE		"ƒe[ƒ}‚È‚µ"
-!define GTK_WIMP_SECTION_TITLE		"Wimpƒe[ƒ}"
+!define GTK_WIMP_SECTION_TITLE			"Wimpƒe[ƒ}"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurveƒe[ƒ}"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blueƒe[ƒ}"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"ƒVƒ‡[ƒgƒJƒbƒg"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"ƒfƒXƒNƒgƒbƒv"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"ƒXƒ^[ƒgƒAƒbƒv"
 !define GAIM_SECTION_DESCRIPTION		"Gaim‚ÌŠj‚Æ‚È‚éƒtƒ@ƒCƒ‹‚Ædll"
-!define GTK_SECTION_DESCRIPTION		"Gaim‚ÌŽg‚Á‚Ä‚¢‚éƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH[ƒ€GUIƒc[ƒ‹ƒLƒbƒg"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+‚̃e[ƒ}‚ÍAGTK+‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚̃‹ƒbƒN•ƒtƒB[ƒ‹‚ð•Ï‚¦‚ç‚ê‚Ü‚·B"
+!define GTK_SECTION_DESCRIPTION			"Gaim‚ÌŽg‚Á‚Ä‚¢‚éƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH[ƒ€GUIƒc[ƒ‹ƒLƒbƒg"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+‚̃e[ƒ}‚ÍAGTK+‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚̃‹ƒbƒN•ƒtƒB[ƒ‹‚ð•Ï‚¦‚ç‚ê‚Ü‚·B"
 !define GTK_NO_THEME_DESC			"GTK+‚̃e[ƒ}‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚È‚¢"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)‚ÍWindows‚̃fƒXƒNƒgƒbƒvŠÂ‹«‚Æ‚æ‚­’²˜a‚µ‚½ƒe[ƒ}‚Å‚·B"
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurveƒe[ƒ}B"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblueƒe[ƒ}B"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblueƒe[ƒ}B"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Gaim ‚ðŽÀs‚·‚邽‚߂̃Vƒ‡[ƒgƒJƒbƒg"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"ƒfƒXƒNƒgƒbƒv‚É Gaim ‚̃Vƒ‡[ƒgƒJƒbƒg‚ð쬂·‚é"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"ƒXƒ^[ƒgƒƒjƒ…[‚É Gaim ‚Ì€–Ú‚ð쬂·‚é"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"ŒÃ‚¢ƒo[ƒWƒ‡ƒ“‚ÌGTK+ƒ‰ƒ“ƒ^ƒCƒ€‚ªŒ©‚‚©‚è‚Ü‚µ‚½BƒAƒbƒvƒOƒŒ[ƒh‚µ‚Ü‚·‚©?$\r’ˆÓ: Gaim‚̓AƒbƒvƒOƒŒ[ƒh‚µ‚È‚¢ŒÀ‚è“®‚©‚È‚¢‚Å‚µ‚傤B"
@@ -40,7 +49,7 @@
 ; 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‚µ‚Ü‚·‚©?"
+!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"
@@ -52,3 +61,33 @@
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1		"ƒAƒ“ƒCƒ“ƒXƒg[ƒ‰‚ÍGaim‚̃ŒƒWƒXƒgƒŠƒGƒ“ƒgƒŠ‚ð”­Œ©‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B$\r‚¨‚»‚ç‚­•Ê‚̃†[ƒU‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ꂽ‚Å‚µ‚傤B"
 !define un.GAIM_UNINSTALL_ERROR_2		"‚ ‚È‚½‚Í‚±‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚錠ŒÀ‚ðŽ‚Á‚Ä‚¢‚Ü‚¹‚ñB"
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Tƒ|[ƒg"
+!define GAIM_SPELLCHECK_ERROR			"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+!define GAIM_SPELLCHECK_DICT_ERROR		"ƒXƒyƒ‹ƒ`ƒFƒbƒNŽ«‘‚̃Cƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"ƒXƒyƒ‹ƒ`ƒFƒbƒN‚̃Tƒ|[ƒg  (ƒCƒ“ƒ^[ƒlƒbƒgÚ‘±‚ªƒCƒ“ƒXƒg[ƒ‹‚É•K—v‚Å‚·)"
+!define ASPELL_INSTALL_FAILED			"ƒCƒ“ƒXƒg[ƒ‹‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+!define GAIM_SPELLCHECK_BRETON			"ƒuƒ‹ƒ^[ƒjƒ…Œê"
+!define GAIM_SPELLCHECK_CATALAN			"ƒJƒ^ƒ‹[ƒjƒƒŒê"
+!define GAIM_SPELLCHECK_CZECH			"ƒ`ƒFƒRŒê"
+!define GAIM_SPELLCHECK_WELSH			"ƒEƒF[ƒ‹ƒYŒê"
+!define GAIM_SPELLCHECK_DANISH			"ƒfƒ“ƒ}[ƒNŒê"
+!define GAIM_SPELLCHECK_GERMAN			"ƒhƒCƒcŒê"
+!define GAIM_SPELLCHECK_GREEK			"ƒMƒŠƒVƒƒŒê"
+!define GAIM_SPELLCHECK_ENGLISH			"‰pŒê"
+!define GAIM_SPELLCHECK_ESPERANTO		"ƒGƒXƒyƒ‰ƒ“ƒgŒê"
+!define GAIM_SPELLCHECK_SPANISH			"ƒXƒyƒCƒ“Œê"
+!define GAIM_SPELLCHECK_FAROESE			"ƒtƒFƒ[Œê"
+!define GAIM_SPELLCHECK_FRENCH			"ƒtƒ‰ƒ“ƒXŒê"
+!define GAIM_SPELLCHECK_ITALIAN			"ƒCƒ^ƒŠƒAŒê"
+!define GAIM_SPELLCHECK_DUTCH			"ƒIƒ‰ƒ“ƒ_Œê"
+!define GAIM_SPELLCHECK_NORWEGIAN		"ƒmƒ‹ƒEƒF[Œã"
+!define GAIM_SPELLCHECK_POLISH			"ƒ|[ƒ‰ƒ“ƒhŒê"
+!define GAIM_SPELLCHECK_PORTUGUESE		"ƒ|ƒ‹ƒgƒKƒ‹Œê"
+!define GAIM_SPELLCHECK_ROMANIAN		"ƒ‹[ƒ}ƒjƒAŒê"
+!define GAIM_SPELLCHECK_RUSSIAN			"ƒƒVƒAŒê"
+!define GAIM_SPELLCHECK_SLOVAK			"ƒXƒƒ”ƒ@ƒLƒAŒê"
+!define GAIM_SPELLCHECK_SWEDISH			"ƒXƒEƒF[ƒfƒ“Œã"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ƒEƒNƒ‰ƒCƒiŒê"
+
--- a/src/win32/nsis/translations/korean.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/korean.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"°¡ÀÓÀÌ »ç¿ëÇÏ´Â ¸ÖƼ Ç÷§Æû GUI ÅøŶ"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Å׸¶´Â GTK+ ÇÁ·Î±×·¥ÀÇ ·è¾ØÇÊÀ» ¹Ù²Ü ¼ö ÀÖ½À´Ï´Ù."
 !define GTK_NO_THEME_DESC			"GTK+ Å׸¶¸¦ ¼³Ä¡ÇÏÁö ¾Ê½À´Ï´Ù."
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)´Â À©µµ¿ì µ¥½ºÅ©Å¾ ȯ°æ¿¡ Àß Á¶È­µÇ´Â GTK+ Å׸¶ÀÔ´Ï´Ù."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)´Â À©µµ¿ì µ¥½ºÅ©Å¾ ȯ°æ¿¡ Àß Á¶È­µÇ´Â GTK Å׸¶ÀÔ´Ï´Ù."
 !define GTK_BLUECURVE_THEME_DESC		"ºí·çÄ¿ºê Å׸¶."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
--- a/src/win32/nsis/translations/norwegian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/norwegian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -8,7 +8,9 @@
 ;;  Version 2
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Installeren kjører allerede."
+!define GAIM_IS_RUNNING				"En instans av Gaim kjører fra før. Avslutt Gaim og prøv igjen."
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst installér GTK+ v${GTK_VERSION} eller høyere"
 
 ; License Page
@@ -20,16 +22,22 @@
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Tema"
 !define GTK_NOTHEME_SECTION_TITLE		"Ingen tema"
-!define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
+!define GTK_WIMP_SECTION_TITLE			"Wimp-tema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Snarveier"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
 !define GAIM_SECTION_DESCRIPTION		"Gaims kjernefiler og dll'er"
-!define GTK_SECTION_DESCRIPTION		"Et GUI-verktøy for flere ulike plattformer, brukes av GAIM."
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Tema kan endre utseendet og følelsen av GTK+ applikasjoner."
+!define GTK_SECTION_DESCRIPTION			"Et GUI-verktøy for flere ulike plattformer, brukes av Gaim."
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Tema kan endre utseendet og følelsen av GTK+ applikasjoner."
 !define GTK_NO_THEME_DESC			"Ikke installér noe GTK+ tema."
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows-imitator) er et GTK-tema som passer godt inn i Windows-miljø."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve-tema."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue-tema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue-tema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Snarveier for å starte Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Lag en snarvei til Gaim på Skrivebordet"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Legg til Gaim i Startmenyen"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. Ønsker du å oppgradere?$\rMerk: Gaim vil kanskje ikke virke hvis du ikke oppgraderer."
@@ -40,7 +48,7 @@
 ; 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?"
+!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."
@@ -50,5 +58,36 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke rettigheter til å installere et GTK+ tema."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppføring for Gaim.$\rTrolig har en annen bruker installert denne applikasjonen."
+!define un.GAIM_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppføring for Gaim.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
 !define un.GAIM_UNINSTALL_ERROR_2		"Du har ikke rettigheter til å avinstallere denne applikasjonen."
+
+
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Støtte for stavekontroll"
+!define GAIM_SPELLCHECK_ERROR			"Det oppstod en feil ved installering av stavekontroll"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Det oppstod en feil ved installering av ordboken for stavekontroll"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Støtte for stavekontroll. (Internettoppkobling påkrevd for installasjon)"
+!define ASPELL_INSTALL_FAILED			"Installasjonen mislyktes."
+!define GAIM_SPELLCHECK_BRETON			"Bretagnsk"
+!define GAIM_SPELLCHECK_CATALAN			"Katalansk"
+!define GAIM_SPELLCHECK_CZECH			"Tsjekkisk"
+!define GAIM_SPELLCHECK_WELSH			"Walisisk"
+!define GAIM_SPELLCHECK_DANISH			"Dansk"
+!define GAIM_SPELLCHECK_GERMAN			"Tysk"
+!define GAIM_SPELLCHECK_GREEK			"Gresk"
+!define GAIM_SPELLCHECK_ENGLISH			"Engelsk"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
+!define GAIM_SPELLCHECK_SPANISH			"Spansk"
+!define GAIM_SPELLCHECK_FAROESE			"Færøysk"
+!define GAIM_SPELLCHECK_FRENCH			"Fransk"
+!define GAIM_SPELLCHECK_ITALIAN			"Italiensk"
+!define GAIM_SPELLCHECK_DUTCH			"Nederlandsk"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Norsk"
+!define GAIM_SPELLCHECK_POLISH			"Polsk"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugisisk"
+!define GAIM_SPELLCHECK_ROMANIAN		"Rumensk"
+!define GAIM_SPELLCHECK_RUSSIAN			"Russisk"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovakisk"
+!define GAIM_SPELLCHECK_SWEDISH			"Svensk"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainsk"
--- a/src/win32/nsis/translations/polish.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/polish.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narzêdzie GUI, u¿ywane w Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Tematy GTK+ mog¹ zmieniæ wygl¹d i dzia³anie aplikacji GTK+ ."
 !define GTK_NO_THEME_DESC			"Nie instaluj tematów GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK+ który doskonale wkomponowuje siê w œrodowisko systemu Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK który doskonale wkomponowuje siê w œrodowisko systemu Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Temat The Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Temat Lighthouseblue."
 
--- a/src/win32/nsis/translations/portuguese-br.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/portuguese-br.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -4,8 +4,8 @@
 ;;  Portuguese (BR) language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Maurício de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>, 2003.
-;;  Version 2
+;;  Author: Maurício de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>, 2003-2005.
+;;  Version 3
 ;;
 
 ; Startup GTK+ check
@@ -23,13 +23,19 @@
 !define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Área de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
 !define GAIM_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Gaim"
 !define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usuário, usado pelo Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a aparência e o funcionamento dos aplicativos GTK+."
 !define GTK_NO_THEME_DESC			"Não instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK+ que combina bem com o ambiente de área de trabalho do Windows."
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK que combina bem com o ambiente de área de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Crie um atalho para o Gaim na Área de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Crie uma entrada no Menu Iniciar para o Gaim"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Uma versão antiga do ambiente de tempo de execução do GTK+ foi encontrada. Você deseja atualizá-lo?$\rNota: O Gaim poderá não funcionar a menos que você o faça."
--- a/src/win32/nsis/translations/portuguese.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/portuguese.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -4,51 +4,59 @@
 ;;  Portuguese (PT) language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Duarte Serrano Gonçalves Henriques <duarte_henriques@myrealbox.com>, 2003.
-;;  Version 2
+;;  Author: Duarte Henriques <duarte.henriques@gmail.com>, 2003-2005.
+;;  Version 3
 ;;
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execução do GTK+ está ausente ou precisa de ser actualizado.$\rPor favor instale a versão v${GTK_VERSION} ou superior do ambiente de tempo de execução do GTK+."
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"O instalador já está a ser executado."
+!define GAIM_IS_RUNNING			"Uma instância do Gaim já está a ser executada. Saia do Gaim e tente de novo."
+!define GTK_INSTALLER_NEEDED			"O ambiente de GTK+ está ausente ou precisa de ser actualizado.$\rPor favor instale a versão v${GTK_VERSION} ou mais recente do ambiente de GTK+."
 
 ; License Page
 !define GAIM_LICENSE_BUTTON			"Seguinte >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) está disponível sob alicença GPL. O texto da licença é fornecido meramente a título informativo. $_CLICK" 
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) está disponível sob a licença GNU General Public License (GPL). O texto da licença é fornecido aqui meramente a título informativo. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de mensagens instantâneas Gaim (obrigatório)"
-!define GTK_SECTION_TITLE			"Ambiente de tempo de execução do GTK+ (obrigatório)"
+!define GAIM_SECTION_TITLE			"Cliente de Mensagens Instantâneas Gaim (obrigatório)"
+!define GTK_SECTION_TITLE			"Ambiente de Execução GTK+ (obrigatório)"
 !define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
-!define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
-!define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
 !define GAIM_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Gaim"
 !define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gráfica multi-plataforma, usado pelo Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a aparência dos programas GTK+."
+!define GTK_THEMES_SECTION_DESCRIPTION	"Os Temas do GTK+ podem mudar a aparência dos programas GTK+."
 !define GTK_NO_THEME_DESC			"Não instalar um tema do GTK+"
-!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
-!define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
+!define GTK_WIMP_THEME_DESC			"O tema GTK-Wimp (Windows impersonator, personificador do Windows) é um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
+!define GTK_BLUECURVE_THEME_DESC		"O tema Bluecurve."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Criar um atalho para o Gaim no Ambiente de Trabalho"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Criar uma entrada para o Gaim na Barra de Iniciar"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Foi encontrada ma versão antiga do ambiente de tempo de execução do GTK+. Deseja actualizá-lo?$\rNota: O Gaim poderá não funcionar se não o fizer."
+!define GTK_UPGRADE_PROMPT			"Foi encontrada uma versão antiga do ambiente de execução GTK+. Deseja actualizá-lo?$\rNota: O Gaim poderá não funcionar se não o fizer."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a página web do Gaim para Windows" 
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a Página Web do Gaim para Windows"
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
-!define GAIM_PROMPT_WIPEOUT			"A sua antiga instalação 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 do que especificou já existe. Qualquer conteúdo$\rserá apagado. Deseja continuar?"
+!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 tempo de execução do GTK+."
-!define GTK_BAD_INSTALL_PATH			"Impossível aceder ou criar o caminho que digitou."
+!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execução GTK+."
+!define GTK_BAD_INSTALL_PATH			"O caminho que digitou não pode ser acedido nem criado."
 
 ; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Não tem permissão para instalar um tema do GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS	"Não tem permissão para instalar um tema do GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "O desinstalador não pôde encontrar entradas de registo do Gaim.$\rÉ provável que outro utilizador tenha instalado este programa."
-!define un.GAIM_UNINSTALL_ERROR_2         "Não tem permissão para desinstalar este programa."
+!define un.GAIM_UNINSTALL_ERROR_1		"O desinstalador não encontrou entradas de registo do Gaim.$\rÉ provável que outro utilizador tenha instalado este programa."
+!define un.GAIM_UNINSTALL_ERROR_2		"Não tem permissão para desinstalar este programa."
--- a/src/win32/nsis/translations/romanian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/romanian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -4,31 +4,46 @@
 ;;  Romanian language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1250
 ;;
-;;  Author: Miºu Moldovan <dumol@go.ro>
+;;  Author: Miºu Moldovan <dumol@gnome.ro>, (c) 2004 - 2005.
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING                     "Instalarea este deja pornitã."
+!define GAIM_IS_RUNNING                  "O instanþã a programului Gaim este deja pornitã. Închideþi-o ºi încercaþi din nou."
 !define GTK_INSTALLER_NEEDED			"Mediul GTK+ nu e prezent sau aveþi o versiune prea veche.$\rInstalaþi cel puþin versiunea v${GTK_VERSION} a mediului GTK+"
 
+; License Page
+!define GAIM_LICENSE_BUTTON                      "Înainte >"
+!define GAIM_LICENSE_BOTTOM_TEXT         "$(^Name) are licenþã GPL (GNU Public License). Licenþa este inclusã aici doar pentru scopuri informative. $_CLICK"
+
 ; Components Page
-!define GAIM_SECTION_TITLE			"Client de mesagerie instantanee (obligatoriu)"
+!define GAIM_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
 !define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Fãrã teme"
 !define GTK_WIMP_SECTION_TITLE		"Temã Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Temã Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temã Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Scurtãturi"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
 !define GAIM_SECTION_DESCRIPTION		"Fiºiere Gaim ºi dll-uri"
 !define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatformã utilizat de Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temele GTK+ schimbã aparenþa aplicaþiilor GTK+."
-!define GTK_NO_THEME_DESC			"Nu instala o temã GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o temã GTK+ în acord cu mediul Windows."
+!define GTK_NO_THEME_DESC			"Fãrã teme GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o temã GTK+ ce imitã mediul grafic Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Scurtãturi pentru pornirea Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Creeazã iconiþe Gaim pe Desktop"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Creeazã o intrare Gaim în meniul Start"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Aveþi o versiune veche a mediului GTK+. Doriþi sã o actualizaþi?$\rNotã: E posibil ca Gaim sã nu funcþioneze cu versiunea veche."
 
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE               "Vizitaþi pagina de web Windows Gaim"
+
 ; 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."
--- a/src/win32/nsis/translations/serbian-latin.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/serbian-latin.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -22,7 +22,7 @@
 !define GTK_SECTION_DESCRIPTION		"Skup oruða za grafièko okruženje, za više platformi, koristi ga Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teme menjaju izgled i naèin rada GTK+ aplikacija."
 !define GTK_NO_THEME_DESC			"Ne instaliraj GTK+ temu"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK+ tema koja se dobro uklapa u Windows radno okruženje."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okruženje."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue tema."
 
--- a/src/win32/nsis/translations/simp-chinese.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/simp-chinese.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,4 +1,4 @@
-;;
+;;  vim:syn=winbatch:encoding=8bit-cp936:fileencoding=8bit-cp936:
 ;;  simp-chinese.nsh
 ;;
 ;;  Simplified Chinese language strings for the Windows Gaim NSIS installer.
@@ -9,6 +9,8 @@
 ;;
 
 ; Startup GTK+ check
+!define INSTALLER_IS_RUNNING			"°²×°³ÌÐòÒѾ­ÔËÐС£"
+!define GAIM_IS_RUNNING			"Gaim µÄʵÀýÕýÔÚÔËÐÐÖС£ÇëÍ˳ö Gaim È»ºóÔÙÊÔÒ»´Î¡£"
 !define GTK_INSTALLER_NEEDED			"¿ÉÄÜȱÉÙ GTK+ ÔËÐÐʱ¿Ì»·¾³£¬»òÕßÐèÒª¸üиû·¾³¡£$\rÇë°²×° v${GTK_VERSION} »ò¸ü¸ß°æ±¾µÄ GTK+ ÔËÐÐʱ¿Ì»·¾³"
 
 ; License Page
@@ -23,13 +25,19 @@
 !define GTK_WIMP_SECTION_TITLE		"Wimp Ö÷Ìâ"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Ö÷Ìâ"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Ö÷Ìâ"
+!define GAIM_SHORTCUTS_SECTION_TITLE "¿ì½Ý·½Ê½"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "×ÀÃæ"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "¿ªÊ¼²Ëµ¥"
 !define GAIM_SECTION_DESCRIPTION		"Gaim ºËÐÄÎļþºÍ DLLs"
 !define GTK_SECTION_DESCRIPTION		"Gaim ËùÓõĶàƽ̨ GUI ¹¤¾ß°ü"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Ö÷Ìâ¿ÉÒÔ¸ü¸Ä GTK+ ³ÌÐòµÄ¹Û¸Ð¡£"
 !define GTK_NO_THEME_DESC			"²»°²×° GTK+ Ö÷Ìâ"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)ÊÇ is a GTK+ theme that blends well into the Windows desktop environment."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp ÊÇÊÊºÏ Windows ×ÀÃæ»·¾³µÄ GTK+ Ö÷Ìâ¡£"
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve Ö÷Ìâ¡£"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue Ö÷Ìâ¡£"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Æô¶¯ Gaim µÄ¿ì½Ý·½Ê½"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "ÔÚ×ÀÃæÉÏ´´½¨ Gaim µÄ¿ì½Ý·½Ê½"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "ÔÚ¿ªÊ¼²Ëµ¥Öд´½¨ Gaim µÄ¿ì½Ý·½Ê½"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"·¢ÏÖÁ˾ɰ汾µÄ GTK+ ÔËÐÐʱ¿Ì¡£ÄúÏëÒªÉý¼¶Âð?$\r×¢Òâ: ³ý·ÇÄú½øÐÐÉý¼¶£¬·ñÔò Gaim ¿ÉÄÜÎÞ·¨¹¤×÷¡£"
@@ -52,3 +60,32 @@
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1         "жÔسÌÐòÕÒ²»µ½ Gaim µÄ×¢²á±íÏîÄ¿¡£$\r¿ÉÄÜÊÇÁíÍâµÄÓû§°²×°Á˴˳ÌÐò¡£"
 !define un.GAIM_UNINSTALL_ERROR_2         "ÄúûÓÐȨÏÞжÔش˳ÌÐò¡£"
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"ƴд¼ì²éÖ§³Ö"
+!define GAIM_SPELLCHECK_ERROR			"°²×°Æ´Ð´¼ì²é³ö´í"
+!define GAIM_SPELLCHECK_DICT_ERROR		"°²×°Æ´Ð´¼ì²é×Öµä³ö´í"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"ƴд¼ì²éÖ§³Ö¡£(°²×°ÐèÒªÁ¬½Óµ½ Internet)"
+!define ASPELL_INSTALL_FAILED			"°²×°Ê§°Ü"
+!define GAIM_SPELLCHECK_BRETON			"²¼Àï¶àÄáÓï"
+!define GAIM_SPELLCHECK_CATALAN			"¼ÓÌ©ÂÞÄáÑÇÓï"
+!define GAIM_SPELLCHECK_CZECH			"½Ý¿ËÓï"
+!define GAIM_SPELLCHECK_WELSH			"Íþ¶ûÊ¿Óï"
+!define GAIM_SPELLCHECK_DANISH			"µ¤ÂóÓï"
+!define GAIM_SPELLCHECK_GERMAN			"µÂÓï"
+!define GAIM_SPELLCHECK_GREEK			"Ï£À°Óï"
+!define GAIM_SPELLCHECK_ENGLISH			"Ó¢Óï"
+!define GAIM_SPELLCHECK_ESPERANTO		"ÊÀ½çÓï"
+!define GAIM_SPELLCHECK_SPANISH			"Î÷°àÑÀÓï"
+!define GAIM_SPELLCHECK_FAROESE			"·¨ÂÞÓï"
+!define GAIM_SPELLCHECK_FRENCH			"·¨Óï"
+!define GAIM_SPELLCHECK_ITALIAN			"Òâ´óÀûÓï"
+!define GAIM_SPELLCHECK_DUTCH			"ºÉÀ¼Óï"
+!define GAIM_SPELLCHECK_NORWEGIAN		"ŲÍþÓï"
+!define GAIM_SPELLCHECK_POLISH			"²¨À¼Óï"
+!define GAIM_SPELLCHECK_PORTUGUESE		"ÆÏÌÑÑÀÓï"
+!define GAIM_SPELLCHECK_ROMANIAN			"ÂÞÂíÄáÑÇÓï"
+!define GAIM_SPELLCHECK_RUSSIAN			"¶íÓï"
+!define GAIM_SPELLCHECK_SLOVAK			"˹Âå·¥¿ËÓï"
+!define GAIM_SPELLCHECK_SWEDISH			"ÈðµäÓï"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ÎÚ¿ËÀ¼Óï"
--- a/src/win32/nsis/translations/slovak.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/slovak.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -1,3 +1,4 @@
+;;  vim:syn=winbatch:encoding=cp1250:
 ;;
 ;;  slovak.nsh
 ;;
@@ -7,7 +8,9 @@
 ;;  Author: dominik@internetkosice.sk
 ;;  Version 2
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Inštalácia je už spustená"
+!define GAIM_IS_RUNNING				"Gaim je práve spustený. Vypnite ho a skúste znova."
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime prostredie chýba alebo musí by upgradované.$\rNainštalujte, prosím, GTK+ runtime verziu v${GTK_VERSION}, alebo novšiu"
 
 ; License Page
@@ -19,16 +22,22 @@
 !define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutné)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ témy"
 !define GTK_NOTHEME_SECTION_TITLE		"Žiadna grafická téma"
-!define GTK_WIMP_SECTION_TITLE		"Wimp grafická téma"
+!define GTK_WIMP_SECTION_TITLE			"Wimp grafická téma"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve grafická téma"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue grafická téma"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Zástupcovia"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Štart Menu"
 !define GAIM_SECTION_DESCRIPTION		"Jadro Gaim-u a nevyhnutné DLL súbory"
-!define GTK_SECTION_DESCRIPTION		"Multiplatformové GUI nástroje, používané Gaim-om"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Pomocou GTK+ grafických tém môžete zmeni vzh¾ad GTK+ aplikácií."
+!define GTK_SECTION_DESCRIPTION			"Multiplatformové GUI nástroje, používané Gaim-om"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Pomocou GTK+ grafických tém môžete zmeni vzh¾ad GTK+ aplikácií."
 !define GTK_NO_THEME_DESC			"Neinštalova GTK+ grafickú tému"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK+ grafická téma, ktorá pekne ladí s prostredím Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK grafická téma, ktorá pekne ladí s prostredím Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve grafická téma."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue grafická téma"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue grafická téma"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Zástupcovia pre Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Vytvori zástupcu pre Gaim na pracovnej ploche"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Vytvori odkaz na Gaim v Štart Menu"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Bola nájdená staršia verzia GTK+ runtime. Prajete si upgradova súèasnú verziu?$\rPoznámka: Gaim nemusí po upgradovaní fungova správne."
@@ -39,7 +48,7 @@
 ; 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?"
+!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."
@@ -51,3 +60,33 @@
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1		"Inštalátoru sa nepodarilo nájs položky v registri pre Gaim.$\rJe možné, že túto aplikáciu nainštaloval iný používate¾."
 !define un.GAIM_UNINSTALL_ERROR_2		"Nemáte oprávnenie na odinštaláciu tejto aplikácie."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora kontroly pravopisu"
+!define GAIM_SPELLCHECK_ERROR			"Chyba pri inštalácii kontroly pravopisu"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Chyba pri inštalácii slovníka kontroly pravopisu"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutné pripojenie k Internetu)"
+!define ASPELL_INSTALL_FAILED			"Inštalácia zlyhala"
+!define GAIM_SPELLCHECK_BRETON			"Bretónsky"
+!define GAIM_SPELLCHECK_CATALAN			"Katalánsky"
+!define GAIM_SPELLCHECK_CZECH			"Èeský"
+!define GAIM_SPELLCHECK_WELSH			"Welshský"
+!define GAIM_SPELLCHECK_DANISH			"Dánsky"
+!define GAIM_SPELLCHECK_GERMAN			"Nemecký"
+!define GAIM_SPELLCHECK_GREEK			"Grécky"
+!define GAIM_SPELLCHECK_ENGLISH			"Anglický"
+!define GAIM_SPELLCHECK_ESPERANTO		"Esperantský"
+!define GAIM_SPELLCHECK_SPANISH			"Španielský"
+!define GAIM_SPELLCHECK_FAROESE			"Faroeský"
+!define GAIM_SPELLCHECK_FRENCH			"Francúzsky"
+!define GAIM_SPELLCHECK_ITALIAN			"Talianský"
+!define GAIM_SPELLCHECK_DUTCH			"Holandský"
+!define GAIM_SPELLCHECK_NORWEGIAN		"Nórsky"
+!define GAIM_SPELLCHECK_POLISH			"Po¾ský"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugalský"
+!define GAIM_SPELLCHECK_ROMANIAN		"Rumunský"
+!define GAIM_SPELLCHECK_RUSSIAN			"Ruský"
+!define GAIM_SPELLCHECK_SLOVAK			"Slovenský"
+!define GAIM_SPELLCHECK_SWEDISH			"Švédsky"
+!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrajinský"
+
--- a/src/win32/nsis/translations/slovenian.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/slovenian.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -5,10 +5,12 @@
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Martin Srebotnjak <miles@filmsi.net>
-;;  Version 2
+;;  Version 3
 ;;
 
 ; Startup GTK+ check
+!define INSTALLER_IS_RUNNING			"Namešèanje že poteka."
+!define GAIM_IS_RUNNING				"Trenutno že teèe razlièica Gaima. Prosimo zaprite Gaim in poskusite znova."
 !define GTK_INSTALLER_NEEDED			"Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_VERSION} ali višjo razlièico izvajalnega okolja GTK+"
 
 ; License Page
@@ -16,23 +18,29 @@
 !define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je na voljo pod licenco GPL. Ta licenca je tu na voljo le v informativne namene. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim - odjemalec za klepet (potrebno)"
+!define GAIM_SECTION_TITLE			"Gaim - odjemalec za klepet (zahtevano)"
 !define GTK_SECTION_TITLE			"GTK+ izvajalno okolje (zahtevano)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Brez teme"
-!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
+!define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"Bližnjice"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Zaèetni meni"
 !define GAIM_SECTION_DESCRIPTION		"Temeljne datoteke Gaima"
-!define GTK_SECTION_DESCRIPTION		"Veèplatformna orodjarna GUI, ki jo uporablja Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"Teme GTK+ lahko spremenijo izgled programov GTK+."
+!define GTK_SECTION_DESCRIPTION			"Veèplatformna orodjarna GUI, ki jo uporablja Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION		"Teme GTK+ lahko spremenijo izgled programov GTK+."
 !define GTK_NO_THEME_DESC			"Brez namestitve teme GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (oponaševalec Oken) je tema GTK, ki se lepo vklaplja v namizno okolje Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Tema Lighthouseblue."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Bližnjice za zagon Gaima"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"Ustvari bližnjico za Gaim na namizju"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"Ustvari vnos Gaim v meniju Start"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Našel sem staro razlièico izvajalnega okolja GTK+. Jo želite nadgraditi?$\rOpomba: Gaim morda ne bo deloval, èe je ne boste nadgradili."
+!define GTK_UPGRADE_PROMPT			"Našel sem starejšo razlièico izvajalnega okolja GTK+. Jo želite nadgraditi?$\rOpomba: èe je ne boste nadgradili, Gaim morda ne bo deloval."
 
 ; Installer Finish Page
 !define GAIM_FINISH_VISIT_WEB_SITE		"Obišèite spletno stran Windows Gaim"
@@ -40,15 +48,45 @@
 ; 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?"
+!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 GTK+ runtime."
+!define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
 !define GTK_BAD_INSTALL_PATH			"Pot, ki ste jo vnesli, ni dosegljiva ali je ni mogoèe ustvariti."
 
 ; GTK+ Themes section
-!define GTK_NO_THEME_INSTALL_RIGHTS		"Nimate pravic za nametitev teme GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Za namestitev teme GTK+ nimate ustreznih pravic."
 
 ; Uninstall Section Prompts
 !define un.GAIM_UNINSTALL_ERROR_1		"Ne morem najti vnosov v registru za Gaim.$\rNajverjetneje je ta program namestil drug uporabnik."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nimate pravic za odstranitev programa."
+!define un.GAIM_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
+
+; Spellcheck Section Prompts
+!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora preverjanja èrkovanja"
+!define GAIM_SPELLCHECK_ERROR			"Napaka pri namešèanju preverjanja èrkovanja"
+!define GAIM_SPELLCHECK_DICT_ERROR		"Napaka pri namešèanju slovarja za preverjanje èrkovanja"
+!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora preverjanja èrkovanja.  (Za namestitev je potrebna spletna povezava)"
+!define ASPELL_INSTALL_FAILED			"Namestitev ni uspela."
+!define GAIM_SPELLCHECK_BRETON			"bretonski"
+!define GAIM_SPELLCHECK_CATALAN			"katalonski"
+!define GAIM_SPELLCHECK_CZECH			"èeški"
+!define GAIM_SPELLCHECK_WELSH			"velški"
+!define GAIM_SPELLCHECK_DANISH			"danski"
+!define GAIM_SPELLCHECK_GERMAN			"nemški"
+!define GAIM_SPELLCHECK_GREEK			"grški"
+!define GAIM_SPELLCHECK_ENGLISH			"angleški"
+!define GAIM_SPELLCHECK_ESPERANTO		"esperantski"
+!define GAIM_SPELLCHECK_SPANISH			"španski"
+!define GAIM_SPELLCHECK_FAROESE			"farojski"
+!define GAIM_SPELLCHECK_FRENCH			"francoski"
+!define GAIM_SPELLCHECK_ITALIAN			"italijanski"
+!define GAIM_SPELLCHECK_DUTCH			"nizozemski"
+!define GAIM_SPELLCHECK_NORWEGIAN		"norveški"
+!define GAIM_SPELLCHECK_POLISH			"poljski"
+!define GAIM_SPELLCHECK_PORTUGUESE		"portugalski"
+!define GAIM_SPELLCHECK_ROMANIAN		"romunski"
+!define GAIM_SPELLCHECK_RUSSIAN			"ruski"
+!define GAIM_SPELLCHECK_SLOVAK			"slovaški"
+!define GAIM_SPELLCHECK_SLOVENIAN		"slovenski"
+!define GAIM_SPELLCHECK_SWEDISH			"švedski"
+!define GAIM_SPELLCHECK_UKRAINIAN		"ukrajinski"
--- a/src/win32/nsis/translations/spanish.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/spanish.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -27,7 +27,7 @@
 !define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Los temas pueden cambiar la apariencia de aplicaciones GTK+."
 !define GTK_NO_THEME_DESC			"No instalar un tema GTK+"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK+ que se fusiona muy bien con el entorno de escritorio de Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK que se fusiona muy bien con el entorno de escritorio de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"El tema Lighthouseblue."
 
--- a/src/win32/nsis/translations/swedish.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/swedish.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -7,7 +7,6 @@
 ;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.
 ;;  Author: Peter Hjalmarsson <xake@telia.com>, 2005.
 ;;  Version 3
-;;
 
 ; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
@@ -29,6 +28,9 @@
 !define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
 !define GTK_BLUECURVE_SECTION_TITLE	"Bluecurve-tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GAIM_SHORTCUTS_SECTION_TITLE "Genvägar"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
+!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
 !define GAIM_SECTION_DESCRIPTION		"Gaims kärnfiler och DLL:er"
 !define GTK_SECTION_DESCRIPTION		"En GUI-verktygsuppsättning för flera olika plattformar som Gaim använder."
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+-teman kan ändra känslan av och utseendet på GTK+-applikationer."
@@ -36,6 +38,9 @@
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) ett GTK-tema som smälter bra in i Windows-miljön."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve-tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue-tema."
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Genvägar för att starta Gaim"
+!define GAIM_DESKTOP_SHORTCUT_DESC   "Skapar en genväg till Gaim på skrivbordet"
+!define GAIM_STARTMENU_SHORTCUT_DESC   "Skapar ett tillägg i startmenyn för Gaim"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"En äldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."
--- a/src/win32/nsis/translations/trad-chinese.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/trad-chinese.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -7,22 +7,29 @@
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
 ;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
 ;;
+;;  Last Updated: July 5, 2005
+;;
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"§ä¤£¨ì²Å¦Xªº GTK+ °õ¦æÀô¹Ò¡C$\r½Ð¦w¸Ë v${GTK_VERSION} ¥H¤Wª©¥»ªº GTK+ °õ¦æÀô¹Ò¡C"
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"¦w¸Ëµ{¦¡¥¿¦b°õ¦æ¤¤¡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
 !define GAIM_LICENSE_BUTTON			"¤U¤@¨B >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) «Y¥H GPL ¤è¦¡±ÂÅvµo§G¡A¦b¦¹¦C¥X±ÂÅv®Ñ¡A¯Âãc«Y§@¬°°Ñ¦Ò¤§¥Î¡C$_CLICK"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) ±Ä¥Î GNU General Public License (GPL) ±ÂÅvµo§G¡C¦b¦¹¦C¥X±ÂÅv®Ñ¡A¶È§@¬°°Ñ¦Ò¤§¥Î¡C$_CLICK"
 
 ; Components Page
 !define GAIM_SECTION_TITLE			"Gaim ¥Dµ{¦¡ (¥²»Ý)"
 !define GTK_SECTION_TITLE			"GTK+ °õ¦æÀô¹Ò (¥²»Ý)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ §G´º¥DÃD"
-!define GTK_NOTHEME_SECTION_TITLE		"¤£¦w¸Ë"
-!define GTK_WIMP_SECTION_TITLE		"Wimp ¥DÃD"
-!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ¥DÃD"
-!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ¥DÃD"
+!define GTK_NOTHEME_SECTION_TITLE		"¤£¦w¸Ë§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_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"
@@ -30,10 +37,16 @@
 !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¥\¯àªí«Ø¥ß±¶®|"
 
 ; 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"
 
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"«ô³X Windows Gaim ºô­¶"
+
 ; 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"
@@ -48,4 +61,4 @@
 
 ; 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"
+!define un.GAIM_UNINSTALL_ERROR_2         "±z¥Ø«eªºÅv­­µLªk²¾°£ Gaim¡C"
\ No newline at end of file
--- a/src/win32/nsis/translations/vietnamese.nsh	Thu Sep 29 13:59:36 2005 +0000
+++ b/src/win32/nsis/translations/vietnamese.nsh	Thu Sep 29 15:37:44 2005 +0000
@@ -28,7 +28,7 @@
 !define GTK_SECTION_DESCRIPTION		"Bá»™ công cụ giao diện đồ há»a Ä‘a ná»n để dùng cho Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes có thể thay đổi diệm mạo và sác thái của các ứng dụng GTK+."
 !define GTK_NO_THEME_DESC			"Không cài đặt GTK+ theme"
-!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là má»™t GTK+ theme tích hợp tốt trong môi trÆ°á»ng desktop của Windows."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là má»™t GTK theme tích hợp tốt trong môi trÆ°á»ng desktop của Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve theme."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue theme."