# HG changeset patch # User Daniel Atallah # Date 1128008264 0 # Node ID 8b955ffe958481fcdbf333a415834adc0433fd3b # Parent 2898c59b49a30db016f8cbaf26290d30b96199d1 [gaim-migrate @ 13847] Add SIMPLE to default build. Update installer with unmerged changes in oldstatus and to support the SIMPLE prpl. committer: Tailor Script diff -r 2898c59b49a3 -r 8b955ffe9584 Makefile.mingw --- 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 diff -r 2898c59b49a3 -r 8b955ffe9584 gaim-installer.nsi --- 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 +; Original Author: Herman Bloggs +; Updated By: Daniel Atallah -; 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 diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/gaim-plugin.nsh --- /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 +;; +;; 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 + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/langmacros.nsh --- 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 diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/albanian.nsh --- 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." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/bulgarian.nsh --- 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 ." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/catalan.nsh --- 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 Lpez" ;; 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 instncia 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 "Segent >" -!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) s distribut sota llicncia GPLe. Podeu consultar la llicncia, noms per proposits informatius, aqu. $_CLICK" +!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) s distribut sota llicncia GPL. Podeu consultar la llicncia, noms per proposits informatius, aqu. $_CLICK" ; Components Page !define GAIM_SECTION_TITLE "Client Gaim de Missatgeria Instantnia (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 "Enllaos 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 "Enllaos 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 (noms esborrar)" !define GAIM_PROMPT_WIPEOUT "El teu directori antic de Gaim ser esborrat. Vols continuar?$\r$\rNota: Els plugins no estndards que tinguis instal.lats seran esborrats.$\rLes preferncies d'usuari de Gaim no es veruan afectades." -!define GAIM_PROMPT_DIR_EXISTS "El directori d'instal.laci que has especificat ja existeix. Tots els continguts$\rseran esborrats. Vols continuar?" +!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 perms 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 "Galls" +!define GAIM_SPELLCHECK_DANISH "Dans" +!define GAIM_SPELLCHECK_GERMAN "Alemany" +!define GAIM_SPELLCHECK_GREEK "Grec" +!define GAIM_SPELLCHECK_ENGLISH "Angls" +!define GAIM_SPELLCHECK_ESPERANTO "Esperanto" +!define GAIM_SPELLCHECK_SPANISH "Espanyol" +!define GAIM_SPELLCHECK_FAROESE "Feros" +!define GAIM_SPELLCHECK_FRENCH "Francs" +!define GAIM_SPELLCHECK_ITALIAN "Itali" +!define GAIM_SPELLCHECK_DUTCH "Holands" +!define GAIM_SPELLCHECK_NORWEGIAN "Noruec" +!define GAIM_SPELLCHECK_POLISH "Polons" +!define GAIM_SPELLCHECK_PORTUGUESE "Portugus" +!define GAIM_SPELLCHECK_ROMANIAN "Romans" +!define GAIM_SPELLCHECK_RUSSIAN "Rus" +!define GAIM_SPELLCHECK_SLOVAK "Eslovac" +!define GAIM_SPELLCHECK_SWEDISH "Suec" +!define GAIM_SPELLCHECK_UKRAINIAN "Ucrans" + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/czech.nsh --- 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 pouvan Gaimem" !define GTK_THEMES_SECTION_DESCRIPTION "GTK+ tmata umouj mnit vzhled a zpsob ovldn GTK+ aplikac." !define GTK_NO_THEME_DESC "Neinstalovat GTK+ tma" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK+ tma kter zapadne do Vaeho pracovnho prosted ve Windows." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK tma kter zapadne do Vaeho pracovnho prosted ve Windows." !define GTK_BLUECURVE_THEME_DESC "Bluecurve tma." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue tma." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/danish.nsh --- 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 udviklingsvrktj, bruges af Gaim" !define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Temaer kan ndre GTK+ programmers generelle udseende." !define GTK_NO_THEME_DESC "Installr ikke noget GTK+ tema" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows efterligner) er et GTK+ tema som falder i med Windows skrivebordsmiljet." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmiljet." !define GTK_BLUECURVE_THEME_DESC "The Bluecurve tema." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue tema." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/dutch.nsh --- 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 ;; 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 genstalleerd." +!define un.GAIM_UNINSTALL_ERROR_1 "Het verwijderingsprogramma voor Gaim kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma genstalleerd." !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 "Oekrans" diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/english.nsh --- 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" + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/finnish.nsh --- 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 (kyttjulkoasu) tykalupakki, Gaimin kyttm" !define GTK_THEMES_SECTION_DESCRIPTION "GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkonk 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 ympristn." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ympristn." !define GTK_BLUECURVE_THEME_DESC "Bluecurve teema." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue teema." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/french.nsh --- 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 , 2003. -;; Version 2 +;; Version 3 +;; Author: Eric Boumaour , 2003-2005. ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "Les bibliothques de l'environnement GTK+ ne sont pas installes ou ncessitent une mise jour.$\rVeuillez installer les bibliothques GTK+ v${GTK_VERSION} ou plus rcentes." +; 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 dj en cours d'excution." +!define GAIM_IS_RUNNING "Une instance de Gaim est en cours d'excution. Veuillez quitter Gaim et ressayer." +!define GTK_INSTALLER_NEEDED "Les bibliothques de l'environnement GTK+ ne sont pas installes ou ont besoin d'une mise jour.$\rVeuillez installer la version ${GTK_VERSION} ou plus rcente des bibliothques 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 instantane (obligatoire)" +!define GAIM_SECTION_TITLE "Gaim client de messagerie instantane (obligatoire)" !define GTK_SECTION_TITLE "Bibliothques GTK+ (obligatoire)" !define GTK_THEMES_SECTION_TITLE "Thmes GTK+" !define GTK_NOTHEME_SECTION_TITLE "Pas de thme" -!define GTK_WIMP_SECTION_TITLE "Thme Wimp" +!define GTK_WIMP_SECTION_TITLE "Thme Wimp" !define GTK_BLUECURVE_SECTION_TITLE "Thme Bluecurve" !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Thme Light House Blue" +!define GAIM_SHORTCUTS_SECTION_TITLE "Raccourcis" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Bureau" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Dmarrer" !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 thmes 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 thmes GTK+ permettent de changer l'aspect des applications GTK+." !define GTK_NO_THEME_DESC "Ne pas installer de thme GTK+" !define GTK_WIMP_THEME_DESC "GTK-Wimp (imitateur de Windows) est un thme de GTK+ qui se fond dans l'environnement graphique de Windows." !define GTK_BLUECURVE_THEME_DESC "Thme Bluecurve" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Thme Lighthouseblue" +!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Thme Lighthouseblue" +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "Raccourcis pour lancer Gaim" +!define GAIM_DESKTOP_SHORTCUT_DESC "Crer un raccourci pour Gaim sur le bureau" +!define GAIM_STARTMENU_SHORTCUT_DESC "Crer un raccourci pour Gaim dans le menu Dmarrer" -; GTK+ Dir Selector Page -!define GTK_UPGRADE_PROMPT "Une ancienne version des bibliothques GTK+ a t trouve. Voulez-vous la mettre jour ?$\rNote : Gaim peut ne pas fonctionner sans cela." +; GTK+ Directory Page +!define GTK_UPGRADE_PROMPT "Une ancienne version des bibliothques GTK+ a t trouve. 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 rpertoire de Gaim va tre supprim. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez installs seront aussi supprims.$\rLes configurations des utilisateurs de Gaim ne sont pas touchs." -!define GAIM_PROMPT_DIR_EXISTS "Le rpertoire d'installation existe dj. 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 installs seront aussi supprims.$\rLes configurations et les comptes utilisateurs de Gaim ne sont pas touchs." +!define GAIM_PROMPT_DIR_EXISTS "Le dossier d'installation que vous avez choisi existe dj. Son contenu sera effac.$\rVoulez-vous continuer ?" ; GTK+ Section Prompts !define GTK_INSTALL_ERROR "Erreur lors de l'installation des bibliothques GTK+" -!define GTK_BAD_INSTALL_PATH "Le rpertoire 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 thme GTK+" +!define GTK_NO_THEME_INSTALL_RIGHTS "Vous n'avez pas les permissions pour installer un thme GTK+." ; Uninstall Section Prompts -!define un.GAIM_UNINSTALL_ERROR_1 "Les clefs de Gaim n'ont pas t trouves dans la base de registres.$\rL'application a peut-tre t installe par un utilisateur diffrent." -!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 dsinstallation n'a pas retrouv les entres de Gaim dans la base de registres.$\rL'application a peut-tre t installe par un utilisateur diffrent." +!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 ncessaire 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 "Tchque" +!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 "Espranto" +!define GAIM_SPELLCHECK_SPANISH "Espagnol" +!define GAIM_SPELLCHECK_FAROESE "Fringien" +!define GAIM_SPELLCHECK_FRENCH "Franais" +!define GAIM_SPELLCHECK_ITALIAN "Italien" +!define GAIM_SPELLCHECK_DUTCH "Hollandais" +!define GAIM_SPELLCHECK_NORWEGIAN "Norvgien" +!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 "Sudois" +!define GAIM_SPELLCHECK_UKRAINIAN "Ukrainien" diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/german.nsh --- 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 "Verknpfungen" +!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 knnen Aussehen und Bedienung von GTK+ Anwendungen verndern." !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 "Verknpfungen zum Start von Gaim" +!define GAIM_DESKTOP_SHORTCUT_DESC "Erstellt eine Verknpfung zu Gaim auf dem Desktop" +!define GAIM_STARTMENU_SHORTCUT_DESC "Erstellt einen Eintrag fr Gaim im Startmen" ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Eine alte Version der GTK+ Runtime wurde gefunden. Mchten 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 gelscht werden. Mchten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgelscht. Gaim-Benutzereinstellungen sind nicht betroffen." -!define GAIM_PROMPT_DIR_EXISTS "Das Installationsverzeichnis, da Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelscht. Mchten Sie fortfahren?" +!define GAIM_PROMPT_DIR_EXISTS "Das Installationsverzeichnis, das Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gelscht. Mchten Sie fortfahren?" ; GTK+ Section Prompts !define GTK_INSTALL_ERROR "Fehler beim Installieren der GTK+ Runtime." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/hungarian.nsh --- 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 , 2003 +;; Gabor Kelemen , 2005 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "A GTK+ futtat krnyezet hinyzik vagy jabb verzi szksges.$\rKrem installlja a v${GTK_VERSION} vagy magasabb verzij GTK+ futtat krnyezetet." +; Startup Checks +!define GTK_INSTALLER_NEEDED "A GTK+ futtat krnyezet hinyzik vagy frisstse szksges.$\rKrem teleptse a v${GTK_VERSION} vagy magasabb verzij GTK+ futtat krnyezetet." +!define INSTALLER_IS_RUNNING "A telepto mr fut." +!define GAIM_IS_RUNNING "Jelenleg fut a Gaim egy pldnya. Lpjen ki a Gaimbl s azutn prblja jra." + +; License Page +!define GAIM_LICENSE_BUTTON "Tovbb >" +!define GAIM_LICENSE_BOTTOM_TEXT "A $(^Name) a GNU General Public License (GPL) alatt kerl terjesztsre. Az itt olvashat licenc csak tjkoztatsi clt szolgl. $_CLICK" ; Components Page -!define GAIM_SECTION_TITLE "Gaim IM kliens (szksges)" +!define GAIM_SECTION_TITLE "Gaim azonnali zeno kliens (szksges)" !define GTK_SECTION_TITLE "GTK+ futtat krnyezet (szksges)" !define GTK_THEMES_SECTION_TITLE "GTK+ tmk" !define GTK_NOTHEME_SECTION_TITLE "Nincs tma" -!define GTK_WIMP_SECTION_TITLE "Wimp tma" +!define GTK_WIMP_SECTION_TITLE "Wimp tma" !define GTK_BLUECURVE_SECTION_TITLE "Bluecurve tma" !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue tma" +!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 fjlok s dll-ek" -!define GTK_SECTION_DESCRIPTION "Gaim ltal hasznlt tbb-platformos grafikus krnyezet" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ tmk megvltoztatjk a GTK+ alkalmazsok kinzett." -!define GTK_NO_THEME_DESC "Ne installlja a GTK+ tmkat" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows utnzat) egy Windows krnyezettel harmonizl GTK+ tma." +!define GTK_SECTION_DESCRIPTION "A Gaim ltal hasznlt tbbplatformos grafikus krnyezet" +!define GTK_THEMES_SECTION_DESCRIPTION "A GTK+ tmk megvltoztatjk a GTK+ alkalmazsok kinzett." +!define GTK_NO_THEME_DESC "Ne teleptse a GTK+ tmkat" +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows utnzat) egy Windows krnyezettel harmonizl GTK tma." !define GTK_BLUECURVE_THEME_DESC "A Bluecurve tma." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "A Lighthouseblue tma." +!define GTK_LIGHTHOUSEBLUE_THEME_DESC "A Lighthouseblue tma." +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "Parancsikonok a Gaim indtshoz" +!define GAIM_DESKTOP_SHORTCUT_DESC "Parancsikon ltrehozsa a Gaimhoz az asztalon" +!define GAIM_STARTMENU_SHORTCUT_DESC "Start Men bejegyzs ltrehozsa a Gaimhoz" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Egy rgi verzij GTK+ futtat krnyezet van teleptve. Kvnja frissteni?$\rMegjegyzs: Gaim valsznleg nem fog mkdni amig nem frissti." +!define GTK_UPGRADE_PROMPT "Egy rgi verzij GTK+ futtatkrnyezet van teleptve. Kvnja frissteni?$\rMegjegyzs: a Gaim nem fog mukdni, ha nem frissti." + +; Installer Finish Page +!define GAIM_FINISH_VISIT_WEB_SITE "A Windows Gaim weboldalnak felkeresse" ; Gaim Section Prompts and Texts !define GAIM_UNINSTALL_DESC "Gaim (csak eltvolts)" -!define GAIM_PROMPT_WIPEOUT "Az n korbbi Gaim knyvtra trldni fog. Folytatni szeretn?$\r$\rMegjegyzs: Minden n ltal teleptett plugin trldni fog.$\rGaim felhasznli belltsokat ez nem rinti." -!define GAIM_PROMPT_DIR_EXISTS "A teleptskor megadott knyvtr mr ltezik. Minden llomny trldni fog.$\rFolytatni szeretn?" +!define GAIM_PROMPT_WIPEOUT "Az n korbbi Gaim knyvtra trlve lesz. Folytatni szeretn?$\r$\rMegjegyzs: Minden n ltal teleptett bovtmny trlve lesz.$\rA Gaim felhasznli belltsokra ez nincs hatssal." +!define GAIM_PROMPT_DIR_EXISTS "A megadott teleptsi knyvtr mr ltezik. A tartalma trlve lesz.$\rFolytatni szeretn?" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Hiba a GTK+ futtat teleptse kzben." -!define GTK_BAD_INSTALL_PATH "A megadott elrsi t nem elrhet vagy nem hozhat ltre." +!define GTK_INSTALL_ERROR "Hiba a GTK+ futtatkrnyezet teleptse kzben." +!define GTK_BAD_INSTALL_PATH "A megadott elrsi t nem rheto el, vagy nem hozhat ltre." ; GTK+ Themes section !define GTK_NO_THEME_INSTALL_RIGHTS "Nincs jogosultsga a GTK+ tmk teleptshez." ; Uninstall Section Prompts -!define un.GAIM_UNINSTALL_ERROR_1 "Az eltvolt nem tallt Gaim registry bejegyzseket.$\rValsznleg egy msik felhasznl teleptette az alkalmazst." -!define un.GAIM_UNINSTALL_ERROR_2 "Nincs jogosultsga az alkalmazs eltvoltshoz." +!define un.GAIM_UNINSTALL_ERROR_1 "Az eltvolt nem tallta a Gaim registry bejegyzseket.$\rValsznleg egy msik felhasznl teleptette az alkalmazst." +!define un.GAIM_UNINSTALL_ERROR_2 "Nincs jogosultsga az alkalmazs eltvoltshoz." + +; Spellcheck Section Prompts +!define GAIM_SPELLCHECK_SECTION_TITLE "Helyesrsellenorzs tmogatsa" +!define GAIM_SPELLCHECK_ERROR "Hiba a helyesrsellenorzs teleptse kzben" +!define GAIM_SPELLCHECK_DICT_ERROR "Hiba a helyesrsellenorzsi sztr teleptse kzben" +!define GAIM_SPELLCHECK_SECTION_DESCRIPTION "Helyesrsellenorzs tmogatsa. (Internetkapcsolat szksges a teleptshez)" +!define ASPELL_INSTALL_FAILED "A telepts sikertelen" +!define GAIM_SPELLCHECK_BRETON "Breton" +!define GAIM_SPELLCHECK_CATALAN "Kataln" +!define GAIM_SPELLCHECK_CZECH "Cseh" +!define GAIM_SPELLCHECK_WELSH "Walesi" +!define GAIM_SPELLCHECK_DANISH "Dn" +!define GAIM_SPELLCHECK_GERMAN "Nmet" +!define GAIM_SPELLCHECK_GREEK "Grg" +!define GAIM_SPELLCHECK_ENGLISH "Angol" +!define GAIM_SPELLCHECK_ESPERANTO "Eszperant" +!define GAIM_SPELLCHECK_SPANISH "Spanyol" +!define GAIM_SPELLCHECK_FAROESE "Farai" +!define GAIM_SPELLCHECK_FRENCH "Francia" +!define GAIM_SPELLCHECK_ITALIAN "Olasz" +!define GAIM_SPELLCHECK_DUTCH "Holland" +!define GAIM_SPELLCHECK_NORWEGIAN "Norvg" +!define GAIM_SPELLCHECK_POLISH "Lengyel" +!define GAIM_SPELLCHECK_PORTUGUESE "Portugl" +!define GAIM_SPELLCHECK_ROMANIAN "Romn" +!define GAIM_SPELLCHECK_RUSSIAN "Orosz" +!define GAIM_SPELLCHECK_SLOVAK "Szlovk" +!define GAIM_SPELLCHECK_SWEDISH "Svd" +!define GAIM_SPELLCHECK_UKRAINIAN "Ukrn" + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/italian.nsh --- 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." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/japanese.nsh --- 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 "CXg[ɎsĂ܂" +!define GAIM_IS_RUNNING "Gaim sĂ܂BGaim IĂēxsĂ" !define GTK_INSTALLER_NEEDED "GTK+^C‹̓AbvO[hKv܂B$\rv${GTK_VERSION}͂ȏGTK+^CCXg[Ă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 "Wimpe[}" +!define GTK_WIMP_SECTION_TITLE "Wimpe[}" !define GTK_BLUECURVE_SECTION_TITLE "Bluecurvee[}" !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Bluee[}" +!define GAIM_SHORTCUTS_SECTION_TITLE "V[gJbg" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "fXNgbv" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "X^[gAbv" !define GAIM_SECTION_DESCRIPTION "Gaim̊jƂȂt@Cdll" -!define GTK_SECTION_DESCRIPTION "Gaim̎gĂ}`vbgtH[GUIc[Lbg" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+̃e[}́AGTK+̃AvP[ṼbNtB[ς܂B" +!define GTK_SECTION_DESCRIPTION "Gaim̎gĂ}`vbgtH[GUIc[Lbg" +!define GTK_THEMES_SECTION_DESCRIPTION "GTK+̃e[}́AGTK+̃AvP[ṼbNtB[ς܂B" !define GTK_NO_THEME_DESC "GTK+̃e[}CXg[Ȃ" !define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator)Windows̃fXNgbv‹Ƃ悭ae[}łB" !define GTK_BLUECURVE_THEME_DESC "Bluecurvee[}B" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthousebluee[}B" +!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthousebluee[}B" +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "Gaim s邽߂̃V[gJbg" +!define GAIM_DESKTOP_SHORTCUT_DESC "fXNgbv Gaim ̃V[gJbg쐬" +!define GAIM_STARTMENU_SHORTCUT_DESC "X^[gj[ Gaim ̍ڂ쐬" ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Âo[WGTK+^C‚܂BAbvO[h܂?$\r: Gaim̓AbvO[hȂ蓮Ȃł傤B" @@ -40,7 +49,7 @@ ; Gaim Section Prompts and Texts !define GAIM_UNINSTALL_DESC "Gaim (폜̂)" !define GAIM_PROMPT_WIPEOUT "ÂGaim̃tH_̍폜ɊւāBs܂?$\r$\r: Ȃ̃CXg[ׂĂ̔WȃvOC͍폜܂B$\rGaim̐ݒ͉e󂯂܂B" -!define GAIM_PROMPT_DIR_EXISTS "Ȃ̎w肵CXg[̃tH_͂łɑ݂Ă܂Beׂ͂$\r폜܂Bs܂?" +!define GAIM_PROMPT_DIR_EXISTS "Ȃ̎w肵CXg[̃tH_͂łɑ݂Ă܂Beׂ͂$\r폜܂Bs܂?" ; GTK+ Section Prompts !define GTK_INSTALL_ERROR "GTK+^C̃CXg[ŃG[܂B" @@ -52,3 +61,33 @@ ; Uninstall Section Prompts !define un.GAIM_UNINSTALL_ERROR_1 "ACXg[Gaim̃WXgGg𔭌ł܂łB$\r炭ʂ̃[UɃCXg[ꂽł傤B" !define un.GAIM_UNINSTALL_ERROR_2 "Ȃ͂̃AvP[VACXg[錠Ă܂B" + +; Spellcheck Section Prompts +!define GAIM_SPELLCHECK_SECTION_TITLE "Xy`FbÑT|[g" +!define GAIM_SPELLCHECK_ERROR "Xy`FbÑCXg[Ɏs܂" +!define GAIM_SPELLCHECK_DICT_ERROR "Xy`FbÑCXg[Ɏs܂B" +!define GAIM_SPELLCHECK_SECTION_DESCRIPTION "Xy`FbÑT|[g (C^[lbgڑCXg[ɕKvł)" +!define ASPELL_INSTALL_FAILED "CXg[Ɏs܂" +!define GAIM_SPELLCHECK_BRETON "u^[j" +!define GAIM_SPELLCHECK_CATALAN "J^[j" +!define GAIM_SPELLCHECK_CZECH "`FR" +!define GAIM_SPELLCHECK_WELSH "EF[Y" +!define GAIM_SPELLCHECK_DANISH "f}[N" +!define GAIM_SPELLCHECK_GERMAN "hCc" +!define GAIM_SPELLCHECK_GREEK "MV" +!define GAIM_SPELLCHECK_ENGLISH "p" +!define GAIM_SPELLCHECK_ESPERANTO "GXyg" +!define GAIM_SPELLCHECK_SPANISH "XyC" +!define GAIM_SPELLCHECK_FAROESE "tF[" +!define GAIM_SPELLCHECK_FRENCH "tX" +!define GAIM_SPELLCHECK_ITALIAN "C^A" +!define GAIM_SPELLCHECK_DUTCH "I_" +!define GAIM_SPELLCHECK_NORWEGIAN "mEF[" +!define GAIM_SPELLCHECK_POLISH "|[h" +!define GAIM_SPELLCHECK_PORTUGUESE "|gK" +!define GAIM_SPELLCHECK_ROMANIAN "[}jA" +!define GAIM_SPELLCHECK_RUSSIAN "VA" +!define GAIM_SPELLCHECK_SLOVAK "X@LA" +!define GAIM_SPELLCHECK_SWEDISH "XEF[f" +!define GAIM_SPELLCHECK_UKRAINIAN "ENCi" + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/korean.nsh --- 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." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/norwegian.nsh --- 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 kjrer allerede." +!define GAIM_IS_RUNNING "En instans av Gaim kjrer fra fr. Avslutt Gaim og prv igjen." !define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst installr GTK+ v${GTK_VERSION} eller hyere" ; 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-verkty for flere ulike plattformer, brukes av GAIM." -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Tema kan endre utseendet og flelsen av GTK+ applikasjoner." +!define GTK_SECTION_DESCRIPTION "Et GUI-verkty for flere ulike plattformer, brukes av Gaim." +!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Tema kan endre utseendet og flelsen av GTK+ applikasjoner." !define GTK_NO_THEME_DESC "Ikke installr 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 berrt." -!define GAIM_PROMPT_DIR_EXISTS "Installasjonskatalogen du har spesifisert finnes fra fr. Eventuelt innhold$\rvil bli slettet. nsker du fortsette?" +!define GAIM_PROMPT_DIR_EXISTS "Installasjonskatalogen du har spesifisert finnes fra fr. Eventuelt innhold$\rvil bli slettet. nsker du fortsette?" ; GTK+ Section Prompts !define GTK_INSTALL_ERROR "En feil oppstod ved installering av GTK+ runtime." @@ -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 registeroppfring for Gaim.$\rTrolig har en annen bruker installert denne applikasjonen." +!define un.GAIM_UNINSTALL_ERROR_1 "Avinstalleringsprogrammet kunne ikke finne noen registeroppfring 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 "Sttte 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 "Sttte for stavekontroll. (Internettoppkobling pkrevd 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 "Frysk" +!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" diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/polish.nsh --- 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 narzdzie GUI, uywane w Gaim" !define GTK_THEMES_SECTION_DESCRIPTION "Tematy GTK+ mog zmieni wygld i dziaanie aplikacji GTK+ ." !define GTK_NO_THEME_DESC "Nie instaluj tematw GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) to temat GTK+ ktry doskonale wkomponowuje si w rodowisko systemu Windows." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) to temat GTK ktry doskonale wkomponowuje si w rodowisko systemu Windows." !define GTK_BLUECURVE_THEME_DESC "Temat The Bluecurve." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "Temat Lighthouseblue." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/portuguese-br.nsh --- 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: Maurcio de Lemos Rodrigues Collares Neto , 2003. -;; Version 2 +;; Author: Maurcio de Lemos Rodrigues Collares Neto , 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 usurio, usado pelo Gaim" !define GTK_THEMES_SECTION_DESCRIPTION "Os temas do GTK+ podem mudar a aparncia e o funcionamento dos aplicativos GTK+." !define GTK_NO_THEME_DESC "No 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 verso antiga do ambiente de tempo de execuo do GTK+ foi encontrada. Voc deseja atualiz-lo?$\rNota: O Gaim poder no funcionar a menos que voc o faa." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/portuguese.nsh --- 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 Gonalves Henriques , 2003. -;; Version 2 +;; Author: Duarte Henriques , 2003-2005. +;; Version 3 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execuo do GTK+ est ausente ou precisa de ser actualizado.$\rPor favor instale a verso v${GTK_VERSION} ou superior do ambiente de tempo de execuo do GTK+." +; Startup Checks +!define INSTALLER_IS_RUNNING "O instalador j est a ser executado." +!define GAIM_IS_RUNNING "Uma instncia 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 verso v${GTK_VERSION} ou mais recente do ambiente de GTK+." ; License Page !define GAIM_LICENSE_BUTTON "Seguinte >" -!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) est disponvel sob alicena GPL. O texto da licena fornecido meramente a ttulo informativo. $_CLICK" +!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) est disponvel sob a licena GNU General Public License (GPL). O texto da licena fornecido aqui meramente a ttulo informativo. $_CLICK" ; Components Page -!define GAIM_SECTION_TITLE "Cliente de mensagens instantneas Gaim (obrigatrio)" -!define GTK_SECTION_TITLE "Ambiente de tempo de execuo do GTK+ (obrigatrio)" +!define GAIM_SECTION_TITLE "Cliente de Mensagens Instantneas Gaim (obrigatrio)" +!define GTK_SECTION_TITLE "Ambiente de Execuo GTK+ (obrigatrio)" !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 grfica multi-plataforma, usado pelo Gaim" -!define GTK_THEMES_SECTION_DESCRIPTION "Os temas do GTK+ podem mudar a aparncia dos programas GTK+." +!define GTK_THEMES_SECTION_DESCRIPTION "Os Temas do GTK+ podem mudar a aparncia dos programas GTK+." !define GTK_NO_THEME_DESC "No 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 verso antiga do ambiente de tempo de execuo do GTK+. Deseja actualiz-lo?$\rNota: O Gaim poder no funcionar se no o fizer." +!define GTK_UPGRADE_PROMPT "Foi encontrada uma verso antiga do ambiente de execuo GTK+. Deseja actualiz-lo?$\rNota: O Gaim poder no funcionar se no o fizer." ; Installer Finish Page -!define GAIM_FINISH_VISIT_WEB_SITE "Visite a pgina web do Gaim para Windows" +!define GAIM_FINISH_VISIT_WEB_SITE "Visite a Pgina Web do Gaim para Windows" ; Gaim Section Prompts and Texts !define GAIM_UNINSTALL_DESC "Gaim (remover apenas)" -!define GAIM_PROMPT_WIPEOUT "A sua antiga instalao do Gaim est prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins no-padro que poder ter instalado sero removidos.$\rAs configuraes de utilizador do Gaim no sero afectadas." -!define GAIM_PROMPT_DIR_EXISTS "A directoria de instalao do que especificou j existe. Qualquer contedo$\rser apagado. Deseja continuar?" +!define GAIM_PROMPT_WIPEOUT "A directoria antiga do Gaim est prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins no-padro que poder ter instalado sero removidos.$\rAs configuraes de utilizador do Gaim no sero afectadas." +!define GAIM_PROMPT_DIR_EXISTS "A directoria de instalao que especificou j existe. Qualquer contedo$\rser removido. Deseja continuar?" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Erro ao instalar o ambiente de tempo de execuo do GTK+." -!define GTK_BAD_INSTALL_PATH "Impossvel aceder ou criar o caminho que digitou." +!define GTK_INSTALL_ERROR "Erro ao instalar o ambiente de execuo GTK+." +!define GTK_BAD_INSTALL_PATH "O caminho que digitou no pode ser acedido nem criado." ; GTK+ Themes section -!define GTK_NO_THEME_INSTALL_RIGHTS "No tem permisso para instalar um tema do GTK+." +!define GTK_NO_THEME_INSTALL_RIGHTS "No tem permisso para instalar um tema do GTK+." ; Uninstall Section Prompts -!define un.GAIM_UNINSTALL_ERROR_1 "O desinstalador no pde encontrar entradas de registo do Gaim.$\r provvel que outro utilizador tenha instalado este programa." -!define un.GAIM_UNINSTALL_ERROR_2 "No tem permisso para desinstalar este programa." +!define un.GAIM_UNINSTALL_ERROR_1 "O desinstalador no encontrou entradas de registo do Gaim.$\r provvel que outro utilizador tenha instalado este programa." +!define un.GAIM_UNINSTALL_ERROR_2 "No tem permisso para desinstalar este programa." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/romanian.nsh --- 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: Miu Moldovan +;; Author: Miu Moldovan , (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. nchidei-o i ncercai din nou." !define GTK_INSTALLER_NEEDED "Mediul GTK+ nu e prezent sau avei o versiune prea veche.$\rInstalai cel puin 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). Licena 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 "Fr 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 "Scurtturi" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start" !define GAIM_SECTION_DESCRIPTION "Fiiere Gaim i dll-uri" !define GTK_SECTION_DESCRIPTION "Un mediu de dezvoltare multiplatform utilizat de Gaim" !define GTK_THEMES_SECTION_DESCRIPTION "Temele GTK+ schimb aparena aplicaiilor 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 "Fr 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 "Scurtturi pentru pornirea Gaim" +!define GAIM_DESKTOP_SHORTCUT_DESC "Creeaz iconie Gaim pe Desktop" +!define GAIM_STARTMENU_SHORTCUT_DESC "Creeaz o intrare Gaim n meniul Start" ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Avei o versiune veche a mediului GTK+. Dorii s o actualizai?$\rNot: E posibil ca Gaim s nu funcioneze cu versiunea veche." +; Installer Finish Page +!define GAIM_FINISH_VISIT_WEB_SITE "Vizitai 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. Dorii s continuai?$\r$\rNot: Orice module externe vor fi terse.$\rSetrile utilizatorilor Gaim nu vor fi afectate." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/serbian-latin.nsh --- 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 orua za grafiko okruenje, za vie platformi, koristi ga Gaim" !define GTK_THEMES_SECTION_DESCRIPTION "GTK+ teme menjaju izgled i nain 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 okruenje." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okruenje." !define GTK_BLUECURVE_THEME_DESC "Bluecurve tema." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue tema." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/simp-chinese.nsh --- 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 "ڿ" diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/slovak.nsh --- 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 "Intalcia je u spusten" +!define GAIM_IS_RUNNING "Gaim je prve spusten. Vypnite ho a skste znova." !define GTK_INSTALLER_NEEDED "GTK+ runtime prostredie chba alebo mus by upgradovan.$\rNaintalujte, prosm, GTK+ runtime verziu v${GTK_VERSION}, alebo noviu" ; License Page @@ -19,16 +22,22 @@ !define GTK_SECTION_TITLE "GTK+ Runtime prostredie (nevyhnutn)" !define GTK_THEMES_SECTION_TITLE "GTK+ tmy" !define GTK_NOTHEME_SECTION_TITLE "iadna grafick tma" -!define GTK_WIMP_SECTION_TITLE "Wimp grafick tma" +!define GTK_WIMP_SECTION_TITLE "Wimp grafick tma" !define GTK_BLUECURVE_SECTION_TITLE "Bluecurve grafick tma" !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue grafick tma" +!define GAIM_SHORTCUTS_SECTION_TITLE "Zstupcovia" +!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 sbory" -!define GTK_SECTION_DESCRIPTION "Multiplatformov GUI nstroje, pouvan Gaim-om" -!define GTK_THEMES_SECTION_DESCRIPTION "Pomocou GTK+ grafickch tm mete zmeni vzhad GTK+ aplikci." +!define GTK_SECTION_DESCRIPTION "Multiplatformov GUI nstroje, pouvan Gaim-om" +!define GTK_THEMES_SECTION_DESCRIPTION "Pomocou GTK+ grafickch tm mete zmeni vzhad GTK+ aplikci." !define GTK_NO_THEME_DESC "Neintalova GTK+ grafick tmu" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK+ grafick tma, ktor pekne lad s prostredm Windows." +!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK grafick tma, ktor pekne lad s prostredm Windows." !define GTK_BLUECURVE_THEME_DESC "Bluecurve grafick tma." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue grafick tma" +!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue grafick tma" +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "Zstupcovia pre Gaim" +!define GAIM_DESKTOP_SHORTCUT_DESC "Vytvori zstupcu 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 njden staria verzia GTK+ runtime. Prajete si upgradova sasn verziu?$\rPoznmka: Gaim nemus po upgradovan fungova sprvne." @@ -39,7 +48,7 @@ ; Gaim Section Prompts and Texts !define GAIM_UNINSTALL_DESC "Gaim (len odstrni)" !define GAIM_PROMPT_WIPEOUT "V adresr Gaim bude zmazan. Chcete pokraova?$\r$\rPoznmka: Vetky prdavne pluginy, ktor ste naintalovali bud tie zmazan.$\rNastavenia uivateskho tu Gaim-u bud ponechan." -!define GAIM_PROMPT_DIR_EXISTS "Adresr, ktor ste zadali, u existuje. Jeho obsah bude zmazan. Chcete pokraova?" +!define GAIM_PROMPT_DIR_EXISTS "Adresr, ktor ste zadali, u existuje. Jeho obsah bude zmazan. Chcete pokraova?" ; GTK+ Section Prompts !define GTK_INSTALL_ERROR "Chyba pri intalcii GTK+ runtime." @@ -51,3 +60,33 @@ ; Uninstall Section Prompts !define un.GAIM_UNINSTALL_ERROR_1 "Intaltoru sa nepodarilo njs poloky v registri pre Gaim.$\rJe mon, e tto aplikciu naintaloval in pouvate." !define un.GAIM_UNINSTALL_ERROR_2 "Nemte oprvnenie na odintalciu tejto aplikcie." + +; Spellcheck Section Prompts +!define GAIM_SPELLCHECK_SECTION_TITLE "Podpora kontroly pravopisu" +!define GAIM_SPELLCHECK_ERROR "Chyba pri intalcii kontroly pravopisu" +!define GAIM_SPELLCHECK_DICT_ERROR "Chyba pri intalcii slovnka kontroly pravopisu" +!define GAIM_SPELLCHECK_SECTION_DESCRIPTION "Podpora kontroly pravopisu (Nutn pripojenie k Internetu)" +!define ASPELL_INSTALL_FAILED "Intalcia zlyhala" +!define GAIM_SPELLCHECK_BRETON "Bretnsky" +!define GAIM_SPELLCHECK_CATALAN "Katalnsky" +!define GAIM_SPELLCHECK_CZECH "esk" +!define GAIM_SPELLCHECK_WELSH "Welshsk" +!define GAIM_SPELLCHECK_DANISH "Dnsky" +!define GAIM_SPELLCHECK_GERMAN "Nemeck" +!define GAIM_SPELLCHECK_GREEK "Grcky" +!define GAIM_SPELLCHECK_ENGLISH "Anglick" +!define GAIM_SPELLCHECK_ESPERANTO "Esperantsk" +!define GAIM_SPELLCHECK_SPANISH "panielsk" +!define GAIM_SPELLCHECK_FAROESE "Faroesk" +!define GAIM_SPELLCHECK_FRENCH "Franczsky" +!define GAIM_SPELLCHECK_ITALIAN "Taliansk" +!define GAIM_SPELLCHECK_DUTCH "Holandsk" +!define GAIM_SPELLCHECK_NORWEGIAN "Nrsky" +!define GAIM_SPELLCHECK_POLISH "Posk" +!define GAIM_SPELLCHECK_PORTUGUESE "Portugalsk" +!define GAIM_SPELLCHECK_ROMANIAN "Rumunsk" +!define GAIM_SPELLCHECK_RUSSIAN "Rusk" +!define GAIM_SPELLCHECK_SLOVAK "Slovensk" +!define GAIM_SPELLCHECK_SWEDISH "vdsky" +!define GAIM_SPELLCHECK_UKRAINIAN "Ukrajinsk" + diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/slovenian.nsh --- 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 -;; Version 2 +;; Version 3 ;; ; Startup GTK+ check +!define INSTALLER_IS_RUNNING "Nameanje e poteka." +!define GAIM_IS_RUNNING "Trenutno e tee razliica 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 vijo razliico 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 "Blinjice" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Namizje" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Zaetni meni" !define GAIM_SECTION_DESCRIPTION "Temeljne datoteke Gaima" -!define GTK_SECTION_DESCRIPTION "Veplatformna orodjarna GUI, ki jo uporablja Gaim" -!define GTK_THEMES_SECTION_DESCRIPTION "Teme GTK+ lahko spremenijo izgled programov GTK+." +!define GTK_SECTION_DESCRIPTION "Veplatformna 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 (oponaevalec 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 "Blinjice za zagon Gaima" +!define GAIM_DESKTOP_SHORTCUT_DESC "Ustvari blinjico za Gaim na namizju" +!define GAIM_STARTMENU_SHORTCUT_DESC "Ustvari vnos Gaim v meniju Start" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Nael sem staro razliico izvajalnega okolja GTK+. Jo elite nadgraditi?$\rOpomba: Gaim morda ne bo deloval, e je ne boste nadgradili." +!define GTK_UPGRADE_PROMPT "Nael sem starejo razliico 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 "Obiite 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 vtiniki, ki ste jih namestili, bodo zbrisani.$\rUporabnike nastavitve za Gaim se bodo ohranile." -!define GAIM_PROMPT_DIR_EXISTS "Namestitveni imenik, ki ste ga navedli, e obstaja. Vsa vsebina$\rbo zbrisana. elite nadaljevati?" +!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 mogoe 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 nameanju preverjanja rkovanja" +!define GAIM_SPELLCHECK_DICT_ERROR "Napaka pri nameanju 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 "eki" +!define GAIM_SPELLCHECK_WELSH "velki" +!define GAIM_SPELLCHECK_DANISH "danski" +!define GAIM_SPELLCHECK_GERMAN "nemki" +!define GAIM_SPELLCHECK_GREEK "grki" +!define GAIM_SPELLCHECK_ENGLISH "angleki" +!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 "norveki" +!define GAIM_SPELLCHECK_POLISH "poljski" +!define GAIM_SPELLCHECK_PORTUGUESE "portugalski" +!define GAIM_SPELLCHECK_ROMANIAN "romunski" +!define GAIM_SPELLCHECK_RUSSIAN "ruski" +!define GAIM_SPELLCHECK_SLOVAK "slovaki" +!define GAIM_SPELLCHECK_SLOVENIAN "slovenski" +!define GAIM_SPELLCHECK_SWEDISH "vedski" +!define GAIM_SPELLCHECK_UKRAINIAN "ukrajinski" diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/spanish.nsh --- 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." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/swedish.nsh --- 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 , 2003. ;; Author: Peter Hjalmarsson , 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 "Genvgar" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny" !define GAIM_SECTION_DESCRIPTION "Gaims krnfiler och DLL:er" !define GTK_SECTION_DESCRIPTION "En GUI-verktygsuppsttning fr flera olika plattformar som Gaim anvnder." !define GTK_THEMES_SECTION_DESCRIPTION "GTK+-teman kan ndra knslan av och utseendet p GTK+-applikationer." @@ -36,6 +38,9 @@ !define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) ett GTK-tema som smlter bra in i Windows-miljn." !define GTK_BLUECURVE_THEME_DESC "The Bluecurve-tema." !define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue-tema." +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "Genvgar fr att starta Gaim" +!define GAIM_DESKTOP_SHORTCUT_DESC "Skapar en genvg till Gaim p skrivbordet" +!define GAIM_STARTMENU_SHORTCUT_DESC "Skapar ett tillgg i startmenyn fr 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." diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/trad-chinese.nsh --- 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 ;; Minor updates: Ambrose C. Li ;; +;; Last Updated: July 5, 2005 +;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "䤣ŦX GTK+ ҡC$\rЦw v${GTK_VERSION} HW GTK+ ҡC" +; Startup Checks +!define INSTALLER_IS_RUNNING "w˵{b椤C" +!define GAIM_IS_RUNNING "Gaim b椤AХoӵ{AwˡC" +!define GTK_INSTALLER_NEEDED "䤣ŦX GTK+ ҩάOݭnQsC$\rЦw v${GTK_VERSION} HW GTK+ ҡC" ; License Page !define GAIM_LICENSE_BUTTON "U@B >" -!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) YH GPL 覡voGAbCXvѡAcY@ѦҤΡC$_CLICK" +!define GAIM_LICENSE_BOTTOM_TEXT "$(^Name) ĥ GNU General Public License (GPL) voGCbCXvѡAȧ@ѦҤΡC$_CLICK" ; Components Page !define GAIM_SECTION_TITLE "Gaim D{ ()" !define GTK_SECTION_TITLE "GTK+ ()" !define GTK_THEMES_SECTION_TITLE "GTK+ GDD" -!define GTK_NOTHEME_SECTION_TITLE "w" -!define GTK_WIMP_SECTION_TITLE "Wimp DD" -!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve DD" -!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue DD" +!define GTK_NOTHEME_SECTION_TITLE "w˧GDD" +!define GTK_WIMP_SECTION_TITLE "Wimp GDD" +!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve GDD" +!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue GDD" +!define GAIM_SHORTCUTS_SECTION_TITLE "|" +!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "ୱ|" +!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "}l\" !define GAIM_SECTION_DESCRIPTION "Gaim ֤ɮפΰʺA禡w" !define GTK_SECTION_DESCRIPTION "Gaim ҨϥΪ󥭥xϧΤ禡w" !define GTK_THEMES_SECTION_DESCRIPTION "GTK+ GDDiHΨӧ GTK+ ε{~[C" @@ -30,10 +37,16 @@ !define GTK_WIMP_THEME_DESC "uGTK-Wimpv(Windows impersonator) DDi GTK+ ĤJ Windows C" !define GTK_BLUECURVE_THEME_DESC "uBluecurvevDD" !define GTK_LIGHTHOUSEBLUE_THEME_DESC "uLighthousebluevDDC" +!define GAIM_SHORTCUTS_SECTION_DESCRIPTION "إ Gaim |" +!define GAIM_DESKTOP_SHORTCUT_DESC "bୱإ߱|" +!define GAIM_STARTMENU_SHORTCUT_DESC "b}l\إ߱|" ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "o{@ª GTK+ ҡCznNɯŶܡH$\rЪ`NGpGzɯšAGaim iLkTQC" +; 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 "zew˩ؿª Gaim N|QCzn~ܡH$\r$\rЪ`NGzҦw˪Dx@ҲճNQRC$\r Gaim ϥΪ̳]wN|vTC" @@ -48,4 +61,4 @@ ; Uninstall Section Prompts !define un.GAIM_UNINSTALL_ERROR_1 "{Lk Gaim w˸TC$\roӬOLϥΪ̭swˤFoӵ{C" -!define un.GAIM_UNINSTALL_ERROR_2 "zثevLk GaimC" +!define un.GAIM_UNINSTALL_ERROR_2 "zثevLk GaimC" \ No newline at end of file diff -r 2898c59b49a3 -r 8b955ffe9584 src/win32/nsis/translations/vietnamese.nsh --- 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."