# HG changeset patch # User Daniel Atallah # Date 1257046472 0 # Node ID 3f33a8fbf871e8605bfa995661b30103c3a4e86b # Parent 3be6a18e0bcbc13f507d4becd2fa079d8fd2a8fe Use a private GTK+ Runtime copy on Windows. We've resisted doing this for a while, but this it has become the norm and is the safest thing to do. There are now two installers; an "offline" installer and an "online" installer. * The "offline" installer will contain the GTK+ runtime (very similar to the current default installer). * The "online" installer will not contain GTK+, but will download it during the installation process if it is selected(mandatory if not already present) * Both installers have an option to download debug symbols during installation (Not selected by default). (Another set of updates to support the external debug symbols will follow) diff -r 3be6a18e0bcb -r 3f33a8fbf871 ChangeLog.win32 --- a/ChangeLog.win32 Sat Oct 31 20:03:26 2009 +0000 +++ b/ChangeLog.win32 Sun Nov 01 03:34:32 2009 +0000 @@ -1,5 +1,6 @@ version 2.7.0 (??/??/????): * Minimum required GTK+ version increased to 2.14.0 + * Private GTK+ Runtime now used (GTK+ Installer no longer supported) * Win9x no longer supported. version 2.6.3 (10/16/2009): diff -r 3be6a18e0bcb -r 3f33a8fbf871 Makefile.mingw --- a/Makefile.mingw Sat Oct 31 20:03:26 2009 +0000 +++ b/Makefile.mingw Sun Nov 01 03:34:32 2009 +0000 @@ -37,6 +37,7 @@ ) STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin +DEBUG_SYMBOLS_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-dbgsym # Any *.dll or *.exe files included in win32-install-dir that we don't compile @@ -71,7 +72,7 @@ #build an expression for `find` to use to ignore the above files EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS)) -.PHONY: all docs install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir +.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) @@ -96,22 +97,27 @@ -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';' installer: create_release_install_dir - $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DWITH_GTK $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi + + $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./ -installer_nogtk: create_release_install_dir - $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi - mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-no-gtk.exe ./ - -installer_debug: install - $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" $(MAKENSISOPT)DDEBUG $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi - mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-debug.exe ./ +installer_offline: create_release_install_dir debug_symbols_zip + $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DOFFLINE_INSTALLER $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi + mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./ installer_zip: create_release_install_dir rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR) -installers: installer installer_nogtk installer_debug installer_zip +debug_symbols_zip: install + rm -rf $(DEBUG_SYMBOLS_DIR) $(DEBUG_SYMBOLS_DIR).zip + mkdir $(DEBUG_SYMBOLS_DIR) + tar -cf - `find $(PIDGIN_INSTALL_DIR) \( -name '*.dll' -o -name '*.exe' \) \ + -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -print` \ + | tar --strip 2 --xform s/$$/.dbgsym/ -xC $(DEBUG_SYMBOLS_DIR) -f - + zip -9 -r $(DEBUG_SYMBOLS_DIR).zip $(DEBUG_SYMBOLS_DIR) + +installers: installer installer_offline debug_symbols_zip installer_zip Doxyfile.mingw: Doxyfile.in sed -e "s/@PACKAGE@/pidgin/" -e "s/@VERSION@/$(PIDGIN_VERSION)/" -e "s/@top_srcdir@/$(PIDGIN_TREE_TOP)/g" -e "s/@enable_dot@/NO/" Doxyfile.in > Doxyfile.mingw @@ -125,13 +131,12 @@ $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean - rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip + rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(DEBUG_SYMBOLS_DIR).zip rm -rf doc/html Doxyfile.mingw uninstall: - rm -rf $(PURPLE_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR) + rm -rf $(PURPLE_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR) $(DEBUG_SYMBOLS_DIR) rm -f ./VERSION include $(PIDGIN_COMMON_TARGETS) -.PHONY: $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/langmacros.nsh --- a/pidgin/win32/nsis/langmacros.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/langmacros.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -31,7 +31,6 @@ ; Startup checks !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_IS_RUNNING ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED ${CUR_LANG} ; License Page !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_LICENSE_BUTTON ${CUR_LANG} @@ -48,9 +47,7 @@ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_DESCRIPTION ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_DESC ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_DESC ${CUR_LANG} - - ; GTK+ Directory Page - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT ${CUR_LANG} + !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT DEBUG_SYMBOLS_SECTION_TITLE ${CUR_LANG} ; Installer Finish Page !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE ${CUR_LANG} @@ -58,10 +55,6 @@ ; Pidgin Section Prompts and Texts !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL ${CUR_LANG} - ; GTK+ Section Prompts - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH ${CUR_LANG} - ; URI Handler section !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT URI_HANDLERS_SECTION_TITLE ${CUR_LANG} @@ -98,6 +91,9 @@ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SWEDISH ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_UKRAINIAN ${CUR_LANG} + !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DEBUGSYMBOLS_ERROR ${CUR_LANG} + !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_GTK_DOWNLOAD_ERROR ${CUR_LANG} + !undef CUR_LANG !macroend diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Sun Nov 01 03:34:32 2009 +0000 @@ -8,7 +8,6 @@ ;-------------------------------- ;Global Variables Var name -Var GTK_FOLDER Var ISSILENT Var STARTUP_RUN_KEY Var SPELLCHECK_SEL @@ -19,14 +18,10 @@ ;The name var is set in .onInit Name $name -!ifdef WITH_GTK -OutFile "pidgin-${PIDGIN_VERSION}.exe" +!ifdef OFFLINE_INSTALLER +OutFile "pidgin-${PIDGIN_VERSION}-offline.exe" !else -!ifdef DEBUG -OutFile "pidgin-${PIDGIN_VERSION}-debug.exe" -!else -OutFile "pidgin-${PIDGIN_VERSION}-no-gtk.exe" -!endif +OutFile "pidgin-${PIDGIN_VERSION}.exe" !endif SetCompressor /SOLID lzma @@ -51,6 +46,8 @@ !insertmacro WordFind !insertmacro un.WordFind +!include "TextFunc.nsh" + ;-------------------------------- ;Defines @@ -70,11 +67,8 @@ !define PIDGIN_UNINST_EXE "pidgin-uninst.exe" !define GTK_MIN_VERSION "2.14.0" -!define GTK_REG_KEY "SOFTWARE\GTK\2.0" !define PERL_REG_KEY "SOFTWARE\Perl" !define PERL_DLL "perl510.dll" -!define GTK_DEFAULT_INSTALL_PATH "$COMMONFILES\GTK\2.0" -!define GTK_RUNTIME_INSTALLER "..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}*.exe" !define ASPELL_REG_KEY "SOFTWARE\Aspell" !define DOWNLOADER_URL "http://pidgin.im/win32/download_redir.php" @@ -86,14 +80,10 @@ VIAddVersionKey "FileVersion" "${PIDGIN_VERSION}" VIAddVersionKey "ProductVersion" "${PIDGIN_VERSION}" VIAddVersionKey "LegalCopyright" "" -!ifdef WITH_GTK -VIAddVersionKey "FileDescription" "Pidgin Installer (w/ GTK+ Installer)" +!ifdef OFFLINE_INSTALLER +VIAddVersionKey "FileDescription" "Pidgin Installer (Offline)" !else -!ifdef DEBUG -VIAddVersionKey "FileDescription" "Pidgin Installer (Debug Version)" -!else -VIAddVersionKey "FileDescription" "Pidgin Installer (w/o GTK+ Installer)" -!endif +VIAddVersionKey "FileDescription" "Pidgin Installer" !endif ;-------------------------------- @@ -138,14 +128,6 @@ !insertmacro MUI_PAGE_LICENSE "../../../COPYING" !insertmacro MUI_PAGE_COMPONENTS -!ifdef WITH_GTK - ; GTK+ install dir page - !define MUI_PAGE_CUSTOMFUNCTION_PRE preGtkDirPage - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE postGtkDirPage - !define MUI_DIRECTORYPAGE_VARIABLE $GTK_FOLDER - !insertmacro MUI_PAGE_DIRECTORY -!endif - ; Pidgin install dir page !insertmacro MUI_PAGE_DIRECTORY @@ -314,7 +296,7 @@ IfErrors uninstall_problem ; Ready to uninstall.. ClearErrors - ExecWait '"$TEMP\$R6" /S _?=$R1' + ExecWait '"$TEMP\$R6" /S /KEEPGTK=1 _?=$R1' IfErrors exec_error Delete "$TEMP\$R6" Goto done @@ -345,77 +327,38 @@ ;-------------------------------- ;GTK+ Runtime Install Section -!ifdef WITH_GTK Section $(GTK_SECTION_TITLE) SecGtk - Call CheckUserInstallRights - Pop $R1 - - SetOutPath $TEMP - SetOverwrite on - File /oname=gtk-runtime.exe ${GTK_RUNTIME_INSTALLER} - SetOverwrite off - - Call DoWeNeedGtk - Pop $R0 - Pop $R6 + InitPluginsDir + StrCpy $R1 "$PLUGINSDIR\gtk.zip" +!ifdef OFFLINE_INSTALLER - StrCmp $R0 "0" have_gtk - StrCmp $R0 "1" upgrade_gtk - StrCmp $R0 "2" upgrade_gtk - ;StrCmp $R0 "3" no_gtk no_gtk + SetOutPath $PLUGINSDIR + File /oname=gtk.zip "..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}.zip" - ;no_gtk: - StrCmp $R1 "NONE" gtk_no_install_rights - ClearErrors - ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER' - IfErrors gtk_install_error done - - upgrade_gtk: - StrCpy $GTK_FOLDER $R6 - StrCmp $R0 "2" +2 ; Upgrade isn't optional - MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done - ClearErrors - ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER' - IfErrors gtk_install_error done +!else - gtk_install_error: - Delete "$TEMP\gtk-runtime.exe" - MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK - Quit - - have_gtk: - StrCpy $GTK_FOLDER $R6 - StrCmp $R1 "NONE" done ; If we have no rights, we can't re-install - ; Even if we have a sufficient version of GTK+, we give user choice to re-install. - ClearErrors - ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT' - IfErrors gtk_install_error - Goto done + ; We need to download the GTK+ runtime + retry: + StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}>k_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk" + DetailPrint "Downloading GTK+ Runtime ... ($R2)" + NSISdl::download /TIMEOUT=10000 $R2 $R1 + Pop $R0 + StrCmp $R0 "cancel" done + StrCmp $R0 "success" +2 + MessageBox MB_RETRYCANCEL "$(PIDGIN_GTK_DOWNLOAD_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done - ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; end got_install rights +!endif + + SetOutPath "$INSTDIR" - gtk_no_install_rights: - ; Install GTK+ to Pidgin install dir - StrCpy $GTK_FOLDER $INSTDIR - ClearErrors - ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER' - IfErrors gtk_install_error - SetOverwrite on - ClearErrors - CopyFiles /FILESONLY "$GTK_FOLDER\bin\*.dll" $GTK_FOLDER - SetOverwrite off - IfErrors gtk_install_error - Delete "$GTK_FOLDER\bin\*.dll" - Goto done - ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; end gtk_no_install_rights + nsisunz::UnzipToLog $R1 "$INSTDIR" + Pop $R0 + StrCmp $R0 "success" +2 + DetailPrint "$R0" ;print error message to log done: - Delete "$TEMP\gtk-runtime.exe" SectionEnd ; end of GTK+ section -!endif ;-------------------------------- ;Pidgin Install Section @@ -427,15 +370,12 @@ Call CheckUserInstallRights Pop $R0 - ; Get GTK+ lib dir if we have it.. - - StrCmp $R0 "NONE" pidgin_none + StrCmp $R0 "NONE" pidgin_install_files StrCmp $R0 "HKLM" pidgin_hklm pidgin_hkcu pidgin_hklm: - ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path" WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\pidgin.exe" - WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin" + WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$INSTDIR\Gtk\bin" WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR" WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}" WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin" @@ -449,10 +389,6 @@ Goto pidgin_install_files pidgin_hkcu: - ReadRegStr $R1 HKCU ${GTK_REG_KEY} "Path" - StrCmp $R1 "" 0 +2 - ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path" - WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR" WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}" WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin" @@ -463,9 +399,6 @@ WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}" Goto pidgin_install_files - pidgin_none: - ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path" - pidgin_install_files: SetOutPath "$INSTDIR" ; Pidgin files @@ -476,9 +409,7 @@ Delete "$INSTDIR\plugins\libjabber.dll" File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.* - !ifdef DEBUG File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll" - !endif ; Check if Perl is installed, if so add it to the AppPaths ReadRegStr $R2 HKLM ${PERL_REG_KEY} "" @@ -656,6 +587,28 @@ SectionEnd SectionGroupEnd +Section /o $(DEBUG_SYMBOLS_SECTION_TITLE) SecDebugSymbols + InitPluginsDir + + ; We need to download and extract the debug symbols + StrCpy $R1 "$PLUGINSDIR\pidgin-${PIDGIN_VERSION}-dbgsym.zip" + retry: + StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym" + DetailPrint "Downloading Debug Symbols... ($R2)" + NSISdl::download /TIMEOUT=10000 $R2 $R1 + Pop $R0 + StrCmp $R0 "cancel" done + StrCmp $R0 "success" +2 + MessageBox MB_RETRYCANCEL "$(PIDGIN_DEBUGSYMBOLS_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done + + nsisunz::UnzipToLog $R1 "$INSTDIR" + Pop $R0 + StrCmp $R0 "success" +2 + DetailPrint "$R0" ;print error message to log + + done: +SectionEnd + ;-------------------------------- ;Uninstaller Section @@ -807,11 +760,20 @@ Delete "$INSTDIR\softokn3.dll" Delete "$INSTDIR\ssl3.dll" Delete "$INSTDIR\${PIDGIN_UNINST_EXE}" - !ifdef DEBUG Delete "$INSTDIR\exchndl.dll" - !endif Delete "$INSTDIR\install.log" + ; Remove the debug symbols + RMDir /r "$INSTDIR\pidgin-${PIDGIN_VERSION}-dbgsym" + + ; Remove the local GTK+ copy (if we're not just upgrading) + ${GetParameters} $R0 + ClearErrors + ${GetOptions} "$R3" "/KEEPGTK=" $R1 + IfErrors +2 + StrCmp $R1 "1" +2 + RMDir /r "$INSTDIR\Gtk" + ;Try to remove Pidgin install dir (only if empty) RMDir "$INSTDIR" @@ -837,10 +799,8 @@ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecPidgin} \ $(PIDGIN_SECTION_DESCRIPTION) -!ifdef WITH_GTK !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \ $(GTK_SECTION_DESCRIPTION) -!endif !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \ $(PIDGIN_SHORTCUTS_SECTION_DESCRIPTION) @@ -1133,93 +1093,42 @@ ; Call DoWeNeedGtk ; First Pop: ; 0 - We have the correct version -; Second Pop: Key where Version was found ; 1 - We have an old version that should work, prompt user for optional upgrade -; Second Pop: HKLM or HKCU depending on where GTK was found. ; 2 - We have an old version that needs to be upgraded -; Second Pop: HKLM or HKCU depending on where GTK was found. ; 3 - We don't have Gtk+ at all -; Second Pop: "NONE, HKLM or HKCU" depending on our rights.. ; Function DoWeNeedGtk - ; Logic should be: - ; - Check what user rights we have (HKLM or HKCU) - ; - If HKLM rights.. - ; - Only check HKLM key for GTK+ - ; - If installed to HKLM, check it and return. - ; - If HKCU rights.. - ; - First check HKCU key for GTK+ - ; - if good or bad exists stop and ret. - ; - If no hkcu gtk+ install, check HKLM - ; - If HKLM ver exists but old, return as if no ver exits. - ; - If no rights - ; - Check HKLM Push $0 Push $1 - Push $2 - Push $3 - Call CheckUserInstallRights - Pop $1 - StrCmp $1 "HKLM" check_hklm - StrCmp $1 "HKCU" check_hkcu check_hklm - check_hkcu: - ReadRegStr $0 HKCU ${GTK_REG_KEY} "Version" - StrCpy $2 "HKCU" - StrCmp $0 "" check_hklm have_gtk + IfFileExists "$INSTDIR\Gtk\CONTENTS" +3 + Push "3" + Goto done - check_hklm: - ReadRegStr $0 HKLM ${GTK_REG_KEY} "Version" - StrCpy $2 "HKLM" - StrCmp $0 "" no_gtk have_gtk - - have_gtk: - ; GTK+ is already installed; check version. - ; Change this to not even run the GTK installer if this version is already installed. - ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3 - IntCmp $3 1 +1 good_version good_version - ${VersionCompare} ${GTK_MIN_VERSION} $0 $3 + ClearErrors + ${ConfigRead} "$INSTDIR\Gtk\CONTENTS" "Bundle Version " $0 + IfErrors 0 +3 + Push "3" + Goto done - ; Bad version. If hklm ver and we have hkcu or no rights.. return no gtk - StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade - StrCmp $1 "HKCU" 0 +2 ; if HKLM can upgrade.. - StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade.. - Push $2 - IntCmp $3 1 +3 - Push "1" ; Optional Upgrade - Goto done - Push "2" ; Mandatory Upgrade - Goto done + ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $1 + IntCmp $1 1 +3 + Push "0" ; Have a good version + Goto done - good_version: - StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk - have_hkcu_gtk: - ; Have HKCU version - ReadRegStr $0 HKCU ${GTK_REG_KEY} "Path" - Goto good_version_cont - - have_hklm_gtk: - ReadRegStr $0 HKLM ${GTK_REG_KEY} "Path" - Goto good_version_cont - - good_version_cont: - Push $0 ; The path to existing GTK+ - Push "0" - Goto done - - no_gtk: - Push $1 ; our rights - Push "3" - Goto done + ${VersionCompare} ${GTK_MIN_VERSION} $0 $1 + IntCmp $1 1 +3 + Push "1" ; Optional Upgrade + Goto done + Push "2" ; Mandatory Upgrade + Goto done done: - ; The top two items on the stack are what we want to return - Exch 4 + ; The item on the stack is what we want to return + Exch Pop $1 - Exch 4 + Exch Pop $0 - Pop $3 - Pop $2 FunctionEnd @@ -1336,7 +1245,7 @@ ClearErrors ${GetOptions} "$R3" "/L=" $R1 - IfErrors +4 + IfErrors +3 StrCpy $LANGUAGE $R1 Goto skip_lang @@ -1402,6 +1311,7 @@ FunctionEnd Function un.onInit + Call un.RunCheck StrCpy $name "Pidgin ${PIDGIN_VERSION}" ;LogSet on @@ -1415,98 +1325,23 @@ Function preWelcomePage Push $R0 - -!ifndef WITH_GTK - ; If this installer dosn't have GTK, check whether we need it. - ; We do this here and not in .onInit because language change in - ; .onInit doesn't take effect until it is finished. - Call DoWeNeedGtk - Pop $R0 - Pop $GTK_FOLDER - - IntCmp $R0 1 done done - MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK - Quit - - done: - -!else Push $R1 - Push $R2 Call DoWeNeedGtk Pop $R0 - Pop $R2 - IntCmp $R0 1 gtk_selection_done gtk_not_mandatory + IntCmp $R0 1 done gtk_not_mandatory ; Make the GTK+ Section RO if it is required. !insertmacro SetSectionFlag ${SecGtk} ${SF_RO} - Goto gtk_selection_done + Goto done gtk_not_mandatory: ; Don't select the GTK+ section if we already have this version or newer installed !insertmacro UnselectSection ${SecGtk} - gtk_selection_done: done: - Pop $R2 - Pop $R1 -!endif - Pop $R0 -FunctionEnd - -!ifdef WITH_GTK -Function preGtkDirPage - Push $R0 - Push $R1 - Call DoWeNeedGtk - Pop $R0 - Pop $R1 - - IntCmp $R0 2 +2 +2 no_gtk - StrCmp $R0 "3" no_gtk no_gtk - - ; Don't show dir selector.. Upgrades are done to existing path.. Pop $R1 Pop $R0 - Abort - - no_gtk: - StrCmp $R1 "NONE" 0 no_gtk_cont - ; Got no install rights.. - Pop $R1 - Pop $R0 - Abort - no_gtk_cont: - ; Suggest path.. - StrCmp $R1 "HKCU" 0 hklm1 - ${GetParent} $SMPROGRAMS $R0 - ${GetParent} $R0 $R0 - StrCpy $R0 "$R0\GTK\2.0" - Goto got_path - hklm1: - StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}" - - got_path: - StrCpy $name "GTK+ ${GTK_INSTALL_VERSION}" - StrCpy $GTK_FOLDER $R0 - Pop $R1 - Pop $R0 FunctionEnd -Function postGtkDirPage - Push $R0 - StrCpy $name "Pidgin ${PIDGIN_VERSION}" - Push $GTK_FOLDER - Call VerifyDir - Pop $R0 - StrCmp $R0 "0" 0 done - MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK - Pop $R0 - Abort - done: - Pop $R0 -FunctionEnd -!endif - ; SpellChecker Related Functions ;------------------------------- @@ -1634,6 +1469,8 @@ Pop $R0 ;This is the language code Push $R1 + InitPluginsDir + IfErrors done ; We weren't able to convert the section to lang code retry: @@ -1668,12 +1505,12 @@ 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 + StrCmp $R1 "$PLUGINSDIR\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 $R1 "$PLUGINSDIR\aspell_installer.exe" StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=aspell_core" DetailPrint "Downloading Aspell... ($R2)" NSISdl::download /TIMEOUT=10000 $R2 $R1 @@ -1709,12 +1546,12 @@ StrCmp $R2 "" 0 installed ; If this is the check after installation, don't infinite loop on failure - StrCmp $R1 "$TEMP\aspell_dict-$R0.exe" 0 +3 + StrCmp $R1 "$PLUGINSDIR\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 $R1 "$PLUGINSDIR\aspell_dict-$R0.exe" StrCpy $R3 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=lang_$R0" DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)" NSISdl::download /TIMEOUT=10000 $R3 $R1 @@ -1724,10 +1561,10 @@ Goto done ; Use a specific temporary $OUTDIR for each dictionary because the installer doesn't clean up after itself StrCpy $R4 "$OUTDIR" - SetOutPath "$TEMP\aspell_dict-$R0" + SetOutPath "$PLUGINSDIR\aspell_dict-$R0" ExecWait '"$R1"' SetOutPath "$R4" - RMDir /r "$TEMP\aspell_dict-$R0" + RMDir /r "$PLUGINSDIR\aspell_dict-$R0" Delete $R1 Goto check ; Check that it is now installed correctly diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/afrikaans.nsh --- a/pidgin/win32/nsis/translations/afrikaans.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/afrikaans.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -12,7 +12,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Die installeerder loop reeds." !define PIDGIN_IS_RUNNING "Pidgin loop reeds rens. Verlaat Pidgin eers en probeer dan weer." -!define GTK_INSTALLER_NEEDED "Die GTK+-looptydomgewing is f soek f moet opgegradeer word.$\rInstalleer asb. v{GTK_MIN_VERSION} of hor van die GTK+-looptyd" ; License Page !define PIDGIN_LICENSE_BUTTON "Volgende >" @@ -31,7 +30,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Skep 'n Begin-kieslysinskrywing vir Pidgin" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "'n Ou weergawe van die GTK+-looptyd is gevind. Wil u opgradeer?$\rLet wel: $(^Name) werk dalk net as u so maak." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Besoek die WinPidgin-webblad" @@ -40,8 +38,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Kan nie die tans genstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal genstalleer word sonder om die huidige een te verwyder." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fout met installering van GTK+-looptyd." -!define GTK_BAD_INSTALL_PATH "Die pad wat u verskaf het, is ontoeganklik of kan nie geskep word nie." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "URI-hanteerders" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/albanian.nsh --- a/pidgin/win32/nsis/translations/albanian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/albanian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,8 +8,6 @@ ;; Author: Besnik Bleta ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_MIN_VERSION} ose më të vonshëm" ; License Page !define PIDGIN_LICENSE_BUTTON "Më tej >" @@ -23,14 +21,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "U gjet një version i vjetër për GTK+ runtime. Doni të përditësohet?$\rShënim: Pidgin-i mund të mos punojë nëse nuk e bëni." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Vizitoni Faqen Web të Pidgin-it për Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "gabim gjatë instalimit të GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Shtegu që treguat nuk mund të arrihet ose krijohet." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Çinstaluesi nuk gjeti dot zëra regjistri për Pidgin-in.$\rKa mundësi që këtë zbatim ta ketë instaluar një tjetër përdorues." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/arabic.nsh --- a/pidgin/win32/nsis/translations/arabic.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/arabic.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -9,7 +9,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING " ." !define PIDGIN_IS_RUNNING " . ." -!define GTK_INSTALLER_NEEDED " + (GTK+) .$\r v${GTK_MIN_VERSION} +" ; License Page !define PIDGIN_LICENSE_BUTTON " >" @@ -29,7 +28,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC " " ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " +. ˿$\r: $(^Name) ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " " @@ -38,8 +36,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL " . ." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR " +." -!define GTK_BAD_INSTALL_PATH " ." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE " " diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/basque.nsh --- a/pidgin/win32/nsis/translations/basque.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/basque.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -1,79 +1,75 @@ -;; -;; basque.nsh -;;Abio-menua - Istanteko Mezularitza -;; Basque language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1252 -;; -;; Author: Mikel Pascual Aldabaldetreku , 2007. - -; Startup Checks -!define INSTALLER_IS_RUNNING "Instalatzailea martxan dago." -!define PIDGIN_IS_RUNNING "Pidgin istantzia bat dago martxan. Pidgin itxi eta berriro saiatu." -!define GTK_INSTALLER_NEEDED "GTK+ exekuzio-ingurunea falta da, edo eguneratu egin beharko litzateke.$\rGTK+ exekuzio-ingurunearen ${GTK_MIN_VERSION} bertsioa edo berriagoa instalatu" - -; License Page -!define PIDGIN_LICENSE_BUTTON "Jarraitu >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "GNU Lizentzia Orokor Publikopean (GPL) argitaratzen da $(^Name). Informatzeko helburu soilarekin aurkezten da hemen lizentzia. $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "Pidgin Istanteko Mezularitza Bezeroa (beharrezkoa)" -!define GTK_SECTION_TITLE "GTK+ exekuzio ingurunea (beharrezkoa)" -!define PIDGIN_SHORTCUTS_SECTION_TITLE "Lasterbideak" -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Mahaigaina" -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Abio-menua" -!define PIDGIN_SECTION_DESCRIPTION "Funtsezko Pidgin fitxategi eta dll-ak" -!define GTK_SECTION_DESCRIPTION "Plataforma anitzeko GUI tresna-sorta, Pidgin-ek erabilia" - -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Pidgin abiarazteko lasterbideak" -!define PIDGIN_DESKTOP_SHORTCUT_DESC "Pidgin-entzako lasterbidea Mahaigainean" -!define PIDGIN_STARTMENU_SHORTCUT_DESC "Pidgin-entzako lasterbidea Abio-Menuan" - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "GTK+ exekuzio-ingurunearen bertsio zahar bat aurkitu da. Eguneratu egin nahi al duzu?$\rOharra: Bestela, posible da $(^Name) ez ibiltzea." - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE "Pidgin Webgunera etorri" - -; Pidgin Section Prompts and Texts -!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Ezin izan da jadanik instalatuta zegoen Pidgin bertsioa kendu. Aurreko bertsioa kendu gabe instalatuko da bertsio berria." - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Errorea GTK+ exekuzio-ingurunea instalatzean." -!define GTK_BAD_INSTALL_PATH "The path you entered can not be accessed or created." - -; URL Handler section -!define URI_HANDLERS_SECTION_TITLE "URI Kudeatzaileak" - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 "Ezin izan dira Pidgin-en erregistro-sarrerak aurkitu.$\rZiurrenik, beste erabiltzaile batek instalatu zuen aplikazio hau." -!define un.PIDGIN_UNINSTALL_ERROR_2 "Ez daukazu aplikazio hau kentzeko baimenik." - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE "Zuzentzaile Ortografikoa" -!define PIDGIN_SPELLCHECK_ERROR "Errorea Zuzentzaile Ortografikoa instalatzean" -!define PIDGIN_SPELLCHECK_DICT_ERROR "Errorea Zuzentzaile Ortografikoarentzako hiztegia instalatzean" -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Zuzentzaile Ortografikoa. (Internet konexioa behar du instalatzeko)" -!define ASPELL_INSTALL_FAILED "Ezin izan da instalatu" -!define PIDGIN_SPELLCHECK_BRETON "Britaniera" -!define PIDGIN_SPELLCHECK_CATALAN "Katalana" -!define PIDGIN_SPELLCHECK_CZECH "Txekiera" -!define PIDGIN_SPELLCHECK_WELSH "Gaelikoa" -!define PIDGIN_SPELLCHECK_DANISH "Daniera" -!define PIDGIN_SPELLCHECK_GERMAN "Alemana" -!define PIDGIN_SPELLCHECK_GREEK "Grekoa" -!define PIDGIN_SPELLCHECK_ENGLISH "Ingelesa" -!define PIDGIN_SPELLCHECK_ESPERANTO "Esperantoa" -!define PIDGIN_SPELLCHECK_SPANISH "Gaztelania" -!define PIDGIN_SPELLCHECK_FAROESE "Faroera" -!define PIDGIN_SPELLCHECK_FRENCH "Frantsesa" -!define PIDGIN_SPELLCHECK_ITALIAN "Italiera" -!define PIDGIN_SPELLCHECK_DUTCH "Nederlandera" -!define PIDGIN_SPELLCHECK_NORWEGIAN "Norvegiera" -!define PIDGIN_SPELLCHECK_POLISH "Poloniera" -!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugesa" -!define PIDGIN_SPELLCHECK_ROMANIAN "Errumaniera" -!define PIDGIN_SPELLCHECK_RUSSIAN "Errusiera" -!define PIDGIN_SPELLCHECK_SLOVAK "Eslovakiera" -!define PIDGIN_SPELLCHECK_SWEDISH "Suediera" -!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukraniera" - +;; +;; basque.nsh +;;Abio-menua - Istanteko Mezularitza +;; Basque language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Mikel Pascual Aldabaldetreku , 2007. + +; Startup Checks +!define INSTALLER_IS_RUNNING "Instalatzailea martxan dago." +!define PIDGIN_IS_RUNNING "Pidgin istantzia bat dago martxan. Pidgin itxi eta berriro saiatu." + +; License Page +!define PIDGIN_LICENSE_BUTTON "Jarraitu >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "GNU Lizentzia Orokor Publikopean (GPL) argitaratzen da $(^Name). Informatzeko helburu soilarekin aurkezten da hemen lizentzia. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin Istanteko Mezularitza Bezeroa (beharrezkoa)" +!define GTK_SECTION_TITLE "GTK+ exekuzio ingurunea (beharrezkoa)" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Lasterbideak" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Mahaigaina" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Abio-menua" +!define PIDGIN_SECTION_DESCRIPTION "Funtsezko Pidgin fitxategi eta dll-ak" +!define GTK_SECTION_DESCRIPTION "Plataforma anitzeko GUI tresna-sorta, Pidgin-ek erabilia" + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Pidgin abiarazteko lasterbideak" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Pidgin-entzako lasterbidea Mahaigainean" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Pidgin-entzako lasterbidea Abio-Menuan" + +; GTK+ Directory Page + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "Pidgin Webgunera etorri" + +; Pidgin Section Prompts and Texts +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Ezin izan da jadanik instalatuta zegoen Pidgin bertsioa kendu. Aurreko bertsioa kendu gabe instalatuko da bertsio berria." + +; GTK+ Section Prompts + +; URL Handler section +!define URI_HANDLERS_SECTION_TITLE "URI Kudeatzaileak" + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Ezin izan dira Pidgin-en erregistro-sarrerak aurkitu.$\rZiurrenik, beste erabiltzaile batek instalatu zuen aplikazio hau." +!define un.PIDGIN_UNINSTALL_ERROR_2 "Ez daukazu aplikazio hau kentzeko baimenik." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Zuzentzaile Ortografikoa" +!define PIDGIN_SPELLCHECK_ERROR "Errorea Zuzentzaile Ortografikoa instalatzean" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Errorea Zuzentzaile Ortografikoarentzako hiztegia instalatzean" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Zuzentzaile Ortografikoa. (Internet konexioa behar du instalatzeko)" +!define ASPELL_INSTALL_FAILED "Ezin izan da instalatu" +!define PIDGIN_SPELLCHECK_BRETON "Britaniera" +!define PIDGIN_SPELLCHECK_CATALAN "Katalana" +!define PIDGIN_SPELLCHECK_CZECH "Txekiera" +!define PIDGIN_SPELLCHECK_WELSH "Gaelikoa" +!define PIDGIN_SPELLCHECK_DANISH "Daniera" +!define PIDGIN_SPELLCHECK_GERMAN "Alemana" +!define PIDGIN_SPELLCHECK_GREEK "Grekoa" +!define PIDGIN_SPELLCHECK_ENGLISH "Ingelesa" +!define PIDGIN_SPELLCHECK_ESPERANTO "Esperantoa" +!define PIDGIN_SPELLCHECK_SPANISH "Gaztelania" +!define PIDGIN_SPELLCHECK_FAROESE "Faroera" +!define PIDGIN_SPELLCHECK_FRENCH "Frantsesa" +!define PIDGIN_SPELLCHECK_ITALIAN "Italiera" +!define PIDGIN_SPELLCHECK_DUTCH "Nederlandera" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Norvegiera" +!define PIDGIN_SPELLCHECK_POLISH "Poloniera" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugesa" +!define PIDGIN_SPELLCHECK_ROMANIAN "Errumaniera" +!define PIDGIN_SPELLCHECK_RUSSIAN "Errusiera" +!define PIDGIN_SPELLCHECK_SLOVAK "Eslovakiera" +!define PIDGIN_SPELLCHECK_SWEDISH "Suediera" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukraniera" + diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/bulgarian.nsh --- a/pidgin/win32/nsis/translations/bulgarian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/bulgarian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,9 +8,6 @@ ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime .$\r v${GTK_MIN_VERSION} -" - ; Components Page !define PIDGIN_SECTION_TITLE "Pidgin ( )" !define GTK_SECTION_TITLE "GTK+ Runtime (required)" @@ -19,11 +16,8 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " GTK+ runtime . ?$\rNote: Pidgin ." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR " GTK+ runtime." -!define GTK_BAD_INSTALL_PATH " ." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 " Pidgin.$\r ." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/catalan.nsh --- a/pidgin/win32/nsis/translations/catalan.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/catalan.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -12,7 +12,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "L'instal.lador encara est executant-se." !define PIDGIN_IS_RUNNING "Hi ha una instncia del Pidgin executant-se. Surt del Pidgin 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_MIN_VERSION} o superior de l'entonr GTK+" ; License Page !define PIDGIN_LICENSE_BUTTON "Segent >" @@ -34,14 +33,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "S'ha trobat una versi antiga de l'entorn d'execuci GTK. Vols actualitzar-la?$\rNota: $(^Name) no funcionar sino ho fas." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visita la pgina web de Pidgin per Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Error installlant l'entorn d'execuci GTK+." -!define GTK_BAD_INSTALL_PATH "El directori que has introdut no pot sser accedit o creat." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "L'instal.lador podria no trobar les entrades del registre de Pidgin.$\rProbablement un altre usuari ha instal.lat aquesta aplicaci." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/czech.nsh --- a/pidgin/win32/nsis/translations/czech.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/czech.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,8 +8,6 @@ ;; Version 2 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime buto chyb, nebo je poteba provst upgrade.$\rProvete instalaci verze${GTK_MIN_VERSION} nebo vy." ; License Page !define PIDGIN_LICENSE_BUTTON "Dal >" @@ -23,14 +21,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Byla nalezena star verze GTK+ runtime. Chcete provst upgrade?$\rUpozornn: Bez upgradu $(^Name) nemus pracovat sprvn." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Navtvit Windows Pidgin Web Page" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Chyba pi instalaci GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Zadan cesta je nedostupn, nebo ji nelze vytvoit." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Odinstaln proces neme najt zznamy pro Pidgin v registrech.$\rPravdpodobn instalaci tto aplikace provedl jin uivatel." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/danish.nsh --- a/pidgin/win32/nsis/translations/danish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/danish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,9 +8,6 @@ ;; Version 2 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstallr venligst GTK+ runtime version v${GTK_MIN_VERSION} eller hjere." - ; License Page !define PIDGIN_LICENSE_BUTTON "Nste >" !define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) er frigivet under GPL licensen. Licensen er kun medtaget her til generel orientering. $_CLICK" @@ -23,14 +20,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Der blev fundet en ldre version af GTK+ runtime. nsker du at opgradere?$\rNB: $(^Name) virker muligvis ikke uden denne opgradering." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Besg Windows Pidgin's hjemmeside" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fejl under installeringen af GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Stien du har angivet kan ikke findes eller oprettes." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Afinstallationen kunne ikke finde Pidgin i registreringsdatabasen.$\rMuligvis har en anden bruger installeret programmet." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/dutch.nsh --- a/pidgin/win32/nsis/translations/dutch.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/dutch.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Er is al een installatie actief." !define PIDGIN_IS_RUNNING "Pidgin wordt op dit moment uitgevoerd. Sluit Pidgin af en start de installatie opnieuw." -!define GTK_INSTALLER_NEEDED "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving" ; License Page @@ -26,14 +25,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: $(^Name) werkt misschien niet als u dit niet doet." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Neem een kijkje op de Windows Pidgin webpagina" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fout bij installatie van GTK+ runtime omgeving." -!define GTK_BAD_INSTALL_PATH "Het door u gegeven pad kan niet benaderd worden." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Het verwijderingsprogramma voor Pidgin kon geen register-ingangen voor Pidgin vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma genstalleerd." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/english.nsh --- a/pidgin/win32/nsis/translations/english.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/english.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -14,7 +14,6 @@ ; Startup Checks !insertmacro PIDGIN_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING "The installer is already running." !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_IS_RUNNING "An instance of Pidgin is currently running. Please exit Pidgin and try again." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime" ; License Page !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_LICENSE_BUTTON "Next >" @@ -32,9 +31,9 @@ !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Shortcuts for starting Pidgin" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_DESC "Create a shortcut to Pidgin on the Desktop" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_DESC "Create a Start Menu entry for Pidgin" +!insertmacro PIDGIN_MACRO_DEFAULT_STRING DEBUG_SYMBOLS_SECTION_TITLE "Debug Symbols (for reporting crashes)" ; GTK+ Directory Page -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT "An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: $(^Name) may not work unless you do." ; Installer Finish Page !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE "Visit the Pidgin Web Page" @@ -43,8 +42,6 @@ !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version." ; GTK+ Section Prompts -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR "Error installing GTK+ runtime." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH "The path you entered can not be accessed or created." ; URL Handler section !insertmacro PIDGIN_MACRO_DEFAULT_STRING URI_HANDLERS_SECTION_TITLE "URI Handlers" @@ -82,3 +79,6 @@ !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SWEDISH "Swedish" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainian" +!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DEBUGSYMBOLS_ERROR "Error Installing Debug Symbols" + +!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_GTK_DOWNLOAD_ERROR "Error Downloading the GTK+ Runtime" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/finnish.nsh --- a/pidgin/win32/nsis/translations/finnish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/finnish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -13,7 +13,6 @@ ; Startup checks !define INSTALLER_IS_RUNNING "Asennusohjelma on jo kynniss." !define PIDGIN_IS_RUNNING "Pidgin on tll hetkell kynniss. Poistu Pidginist ja yrit uudelleen." -!define GTK_INSTALLER_NEEDED "Ajonaikainen GTK+-ymprist joko puuttuu tai tarvitsee pivityst.$\rOle hyv ja asenna v${GTK_MIN_VERSION} tai uudempi ajonaikainen GTK+-ymprist." ; License Page !define PIDGIN_LICENSE_BUTTON "Seuraava >" @@ -33,14 +32,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Tee Pidgin-pikakuvake kynnistysvalikkoon" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Vanha versio ajonaikaisesta GTK+-ympristst lytynyt. Tahdotko pivitt?$\rHuomio: $(^Name) ei vlttmtt toimi mikli jtt pivittmtt." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Vieraile Pidginin WWW-sivustolla" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Virhe asennettaessa ajonaikaista GTK+-ymprist." -!define GTK_BAD_INSTALL_PATH "Antamasi polku ei toimi tai sit ei voi luoda." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "URI-ksittelijt" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/french.nsh --- a/pidgin/win32/nsis/translations/french.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/french.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -1,4 +1,3 @@ -;; vim:syn=winbatch:fileencoding=cp1252: ;; ;; french.nsh ;; @@ -15,7 +14,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Le programme d'installation est dj en cours d'excution." !define PIDGIN_IS_RUNNING "Une instance de Pidgin est en cours d'excution. Veuillez quitter Pidgin 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_MIN_VERSION} ou plus rcente des bibliothques GTK+." ; License Page !define PIDGIN_LICENSE_BUTTON "Suivant >" @@ -35,7 +33,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crer un raccourci pour Pidgin dans le menu Dmarrer" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Une ancienne version des bibliothques GTK+ a t trouve. Voulez-vous la mettre jour ?$\rNote : $(^Name) peut ne pas fonctionner si vous ne le faites pas." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visitez la page web de Pidgin Windows" @@ -44,8 +41,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Impossible de dsinstaller la version de Pidgin en place. La nouvelle version sera installe sans supprimer la version en place." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Erreur lors de l'installation des bibliothques GTK+" -!define GTK_BAD_INSTALL_PATH "Le dossier d'installation ne peut pas tre cr ou n'est pas accessible." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "Gestion des liens (URI)" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/galician.nsh --- a/pidgin/win32/nsis/translations/galician.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/galician.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -9,7 +9,6 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "O entorno de execucin de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versin v${GTK_MIN_VERSION} do executable GTK+ ou algunha posterior." ; License Page !define PIDGIN_LICENSE_BUTTON "Seguinte >" @@ -23,14 +22,11 @@ ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Atopouse unha versin antiga do executable de GTK+. Desexa actualizala?$\rObservacin: $(^Name) non funcionar a menos que o faga." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visite a pxina Web de Pidgin Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Erro ao instalar o executable GTK+." -!define GTK_BAD_INSTALL_PATH "Non se puido acceder ou crear a ruta que vd. indicou." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "O desinstalador non puido atopar as entradas no rexistro de Pidgin.$\r probable que outro usuario instalara a aplicacin." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/german.nsh --- a/pidgin/win32/nsis/translations/german.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/german.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -1,81 +1,77 @@ -;; vim:syn=winbatch:encoding=cp1252: -;; -;; german.nsh -;; -;; German language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1252 -;; -;; Author: Bjoern Voigt , 2008. -;; Version 3 -;; - -; Startup checks -!define INSTALLER_IS_RUNNING "Der Installer luft schon." -!define PIDGIN_IS_RUNNING "Eine Instanz von Pidgin luft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal." -!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder hher der GTK+ Runtime" - -; License Page -!define PIDGIN_LICENSE_BUTTON "Weiter >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) verffentlicht. Die Lizenz dient hier nur der Information. $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "Pidgin Instant Messaging Client (erforderlich)" -!define GTK_SECTION_TITLE "GTK+ Runtime Umgebung (erforderlich)" -!define PIDGIN_SHORTCUTS_SECTION_TITLE "Verknpfungen" -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop" -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmen" -!define PIDGIN_SECTION_DESCRIPTION "Pidgin-Basisdateien und -DLLs" -!define GTK_SECTION_DESCRIPTION "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin" - -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Verknpfungen zum Starten von Pidgin" -!define PIDGIN_DESKTOP_SHORTCUT_DESC "Erstellt eine Verknpfung zu Pidgin auf dem Desktop" -!define PIDGIN_STARTMENU_SHORTCUT_DESC "Erstellt einen Eintrag fr Pidgin im Startmen" - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Eine alte Version der GTK+ Runtime wurde gefunden. Mchten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren." - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE "Besuchen Sie die Pidgin Webseite" - -; Pidgin Section Prompts and Texts -!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gelscht wird." - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fehler beim Installieren der GTK+ Runtime." -!define GTK_BAD_INSTALL_PATH "Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden." - -; URL Handler section -!define URI_HANDLERS_SECTION_TITLE "URI-Behandlung" - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 "Der Deinstaller konnte keine Registrierungsschlssel fr Pidgin finden.$\rEs ist wahrscheinlich, da ein anderer Benutzer diese Anwendung installiert hat." -!define un.PIDGIN_UNINSTALL_ERROR_2 "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE "Untersttzung fr Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_ERROR "Fehler bei der Installation der Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_DICT_ERROR "Fehler bei der Installation des Wrterbuches fr die Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Untersttzung fr Rechtschreibkontrolle. (Fr die Installation ist eine Internet-Verbindung ntig)" -!define ASPELL_INSTALL_FAILED "Installation gescheitert" -!define PIDGIN_SPELLCHECK_BRETON "Bretonisch" -!define PIDGIN_SPELLCHECK_CATALAN "Katalanisch" -!define PIDGIN_SPELLCHECK_CZECH "Tschechisch" -!define PIDGIN_SPELLCHECK_WELSH "Walisisch" -!define PIDGIN_SPELLCHECK_DANISH "Dnisch" -!define PIDGIN_SPELLCHECK_GERMAN "Deutsch" -!define PIDGIN_SPELLCHECK_GREEK "Griechisch" -!define PIDGIN_SPELLCHECK_ENGLISH "Englisch" -!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" -!define PIDGIN_SPELLCHECK_SPANISH "Spanisch" -!define PIDGIN_SPELLCHECK_FAROESE "Farersprache" -!define PIDGIN_SPELLCHECK_FRENCH "Franzsisch" -!define PIDGIN_SPELLCHECK_ITALIAN "Italienisch" -!define PIDGIN_SPELLCHECK_DUTCH "Hollndisch" -!define PIDGIN_SPELLCHECK_NORWEGIAN "Norwegisch" -!define PIDGIN_SPELLCHECK_POLISH "Polnisch" -!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugiesisch" -!define PIDGIN_SPELLCHECK_ROMANIAN "Rumnisch" -!define PIDGIN_SPELLCHECK_RUSSIAN "Russisch" -!define PIDGIN_SPELLCHECK_SLOVAK "Slowakisch" -!define PIDGIN_SPELLCHECK_SWEDISH "Schwedisch" -!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainisch" +;; vim:syn=winbatch:encoding=cp1252: +;; +;; german.nsh +;; +;; German language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Bjoern Voigt , 2008. +;; Version 3 +;; + +; Startup checks +!define INSTALLER_IS_RUNNING "Der Installer luft schon." +!define PIDGIN_IS_RUNNING "Eine Instanz von Pidgin luft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal." + +; License Page +!define PIDGIN_LICENSE_BUTTON "Weiter >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) verffentlicht. Die Lizenz dient hier nur der Information. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin Instant Messaging Client (erforderlich)" +!define GTK_SECTION_TITLE "GTK+ Runtime Umgebung (erforderlich)" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Verknpfungen" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmen" +!define PIDGIN_SECTION_DESCRIPTION "Pidgin-Basisdateien und -DLLs" +!define GTK_SECTION_DESCRIPTION "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin" + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Verknpfungen zum Starten von Pidgin" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Erstellt eine Verknpfung zu Pidgin auf dem Desktop" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Erstellt einen Eintrag fr Pidgin im Startmen" + +; GTK+ Directory Page + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "Besuchen Sie die Pidgin Webseite" + +; Pidgin Section Prompts and Texts +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gelscht wird." + +; GTK+ Section Prompts + +; URL Handler section +!define URI_HANDLERS_SECTION_TITLE "URI-Behandlung" + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Der Deinstaller konnte keine Registrierungsschlssel fr Pidgin finden.$\rEs ist wahrscheinlich, da ein anderer Benutzer diese Anwendung installiert hat." +!define un.PIDGIN_UNINSTALL_ERROR_2 "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Untersttzung fr Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_ERROR "Fehler bei der Installation der Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Fehler bei der Installation des Wrterbuches fr die Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Untersttzung fr Rechtschreibkontrolle. (Fr die Installation ist eine Internet-Verbindung ntig)" +!define ASPELL_INSTALL_FAILED "Installation gescheitert" +!define PIDGIN_SPELLCHECK_BRETON "Bretonisch" +!define PIDGIN_SPELLCHECK_CATALAN "Katalanisch" +!define PIDGIN_SPELLCHECK_CZECH "Tschechisch" +!define PIDGIN_SPELLCHECK_WELSH "Walisisch" +!define PIDGIN_SPELLCHECK_DANISH "Dnisch" +!define PIDGIN_SPELLCHECK_GERMAN "Deutsch" +!define PIDGIN_SPELLCHECK_GREEK "Griechisch" +!define PIDGIN_SPELLCHECK_ENGLISH "Englisch" +!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" +!define PIDGIN_SPELLCHECK_SPANISH "Spanisch" +!define PIDGIN_SPELLCHECK_FAROESE "Farersprache" +!define PIDGIN_SPELLCHECK_FRENCH "Franzsisch" +!define PIDGIN_SPELLCHECK_ITALIAN "Italienisch" +!define PIDGIN_SPELLCHECK_DUTCH "Hollndisch" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Norwegisch" +!define PIDGIN_SPELLCHECK_POLISH "Polnisch" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugiesisch" +!define PIDGIN_SPELLCHECK_ROMANIAN "Rumnisch" +!define PIDGIN_SPELLCHECK_RUSSIAN "Russisch" +!define PIDGIN_SPELLCHECK_SLOVAK "Slowakisch" +!define PIDGIN_SPELLCHECK_SWEDISH "Schwedisch" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainisch" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/hebrew.nsh --- a/pidgin/win32/nsis/translations/hebrew.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/hebrew.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -1,82 +1,78 @@ -;; -;; hebrew.nsh -;; -;; Hebrew language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1255 -;; -;; Updated: Shalom Craimer -;; Origional Author: Eugene Shcherbina -;; Version 3 -;; - -; Startup checks -!define INSTALLER_IS_RUNNING " ." -!define PIDGIN_IS_RUNNING " ' . ' ." -!define GTK_INSTALLER_NEEDED ". GTK+ $\r v${GTK_MIN_VERSION} .GTK+ " - -; License Page -!define PIDGIN_LICENSE_BUTTON " >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) . .GPL $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "() .Pidgin " -!define GTK_SECTION_TITLE "() .GTK+ " -!define PIDGIN_SHORTCUTS_SECTION_TITLE " " -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE " " -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE " " -!define PIDGIN_SECTION_DESCRIPTION ". DLL- Pidgin " -!define GTK_SECTION_DESCRIPTION "-, ' GUI " - -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "- '" -!define PIDGIN_DESKTOP_SHORTCUT_DESC " - ' " -!define PIDGIN_STARTMENU_SHORTCUT_DESC " - ' " - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "A?. GTK+ $\rNote: . $(^Name)" - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE ".Pidgin " - -; Pidgin Section Prompts and Texts -!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL " '. ." - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR ".GTK+ " -!define GTK_BAD_INSTALL_PATH ". " - -; URL Handler section -!define URI_HANDLERS_SECTION_TITLE " URI" - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 ".GTK+ $\r. " -!define un.PIDGIN_UNINSTALL_ERROR_2 ". " - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE " " -!define PIDGIN_SPELLCHECK_ERROR " " -!define PIDGIN_SPELLCHECK_DICT_ERROR " " -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION " ( )" -!define ASPELL_INSTALL_FAILED " " -!define PIDGIN_SPELLCHECK_BRETON "" -!define PIDGIN_SPELLCHECK_CATALAN "" -!define PIDGIN_SPELLCHECK_CZECH "'" -!define PIDGIN_SPELLCHECK_WELSH "" -!define PIDGIN_SPELLCHECK_DANISH "" -!define PIDGIN_SPELLCHECK_GERMAN "" -!define PIDGIN_SPELLCHECK_GREEK "" -!define PIDGIN_SPELLCHECK_ENGLISH "" -!define PIDGIN_SPELLCHECK_ESPERANTO "" -!define PIDGIN_SPELLCHECK_SPANISH "" -!define PIDGIN_SPELLCHECK_FAROESE "" -!define PIDGIN_SPELLCHECK_FRENCH "" -!define PIDGIN_SPELLCHECK_ITALIAN "" -!define PIDGIN_SPELLCHECK_DUTCH "" -!define PIDGIN_SPELLCHECK_NORWEGIAN "" -!define PIDGIN_SPELLCHECK_POLISH "" -!define PIDGIN_SPELLCHECK_PORTUGUESE "" -!define PIDGIN_SPELLCHECK_ROMANIAN "" -!define PIDGIN_SPELLCHECK_RUSSIAN "" -!define PIDGIN_SPELLCHECK_SLOVAK "" -!define PIDGIN_SPELLCHECK_SWEDISH "" -!define PIDGIN_SPELLCHECK_UKRAINIAN "" - +;; +;; hebrew.nsh +;; +;; Hebrew language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1255 +;; +;; Updated: Shalom Craimer +;; Origional Author: Eugene Shcherbina +;; Version 3 +;; + +; Startup checks +!define INSTALLER_IS_RUNNING " ." +!define PIDGIN_IS_RUNNING " ' . ' ." + +; License Page +!define PIDGIN_LICENSE_BUTTON " >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) . .GPL $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "() .Pidgin " +!define GTK_SECTION_TITLE "() .GTK+ " +!define PIDGIN_SHORTCUTS_SECTION_TITLE " " +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE " " +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE " " +!define PIDGIN_SECTION_DESCRIPTION ". DLL- Pidgin " +!define GTK_SECTION_DESCRIPTION "-, ' GUI " + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "- '" +!define PIDGIN_DESKTOP_SHORTCUT_DESC " - ' " +!define PIDGIN_STARTMENU_SHORTCUT_DESC " - ' " + +; GTK+ Directory Page + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE ".Pidgin " + +; Pidgin Section Prompts and Texts +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL " '. ." + +; GTK+ Section Prompts + +; URL Handler section +!define URI_HANDLERS_SECTION_TITLE " URI" + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 ".GTK+ $\r. " +!define un.PIDGIN_UNINSTALL_ERROR_2 ". " + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE " " +!define PIDGIN_SPELLCHECK_ERROR " " +!define PIDGIN_SPELLCHECK_DICT_ERROR " " +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION " ( )" +!define ASPELL_INSTALL_FAILED " " +!define PIDGIN_SPELLCHECK_BRETON "" +!define PIDGIN_SPELLCHECK_CATALAN "" +!define PIDGIN_SPELLCHECK_CZECH "'" +!define PIDGIN_SPELLCHECK_WELSH "" +!define PIDGIN_SPELLCHECK_DANISH "" +!define PIDGIN_SPELLCHECK_GERMAN "" +!define PIDGIN_SPELLCHECK_GREEK "" +!define PIDGIN_SPELLCHECK_ENGLISH "" +!define PIDGIN_SPELLCHECK_ESPERANTO "" +!define PIDGIN_SPELLCHECK_SPANISH "" +!define PIDGIN_SPELLCHECK_FAROESE "" +!define PIDGIN_SPELLCHECK_FRENCH "" +!define PIDGIN_SPELLCHECK_ITALIAN "" +!define PIDGIN_SPELLCHECK_DUTCH "" +!define PIDGIN_SPELLCHECK_NORWEGIAN "" +!define PIDGIN_SPELLCHECK_POLISH "" +!define PIDGIN_SPELLCHECK_PORTUGUESE "" +!define PIDGIN_SPELLCHECK_ROMANIAN "" +!define PIDGIN_SPELLCHECK_RUSSIAN "" +!define PIDGIN_SPELLCHECK_SLOVAK "" +!define PIDGIN_SPELLCHECK_SWEDISH "" +!define PIDGIN_SPELLCHECK_UKRAINIAN "" + diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/hungarian.nsh --- a/pidgin/win32/nsis/translations/hungarian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/hungarian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -9,7 +9,6 @@ ;; ; Startup Checks -!define GTK_INSTALLER_NEEDED "A GTK+ futtat krnyezet hinyzik vagy frisstse szksges.$\rKrem teleptse a v${GTK_MIN_VERSION} vagy magasabb verzij GTK+ futtat krnyezetet." !define INSTALLER_IS_RUNNING "A telept mr fut." !define PIDGIN_IS_RUNNING "Jelenleg fut a Pidgin egy pldnya. Lpjen ki a Pidginbl s azutn prblja jra." @@ -31,7 +30,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Start Men bejegyzs ltrehozsa a Pidginhez" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Egy rgi verzij GTK+ futtatkrnyezet van teleptve. Kvnja frissteni?$\rMegjegyzs: a Pidgin nem fog mkdni, ha nem frissti." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "A Windows Pidgin weboldalnak felkeresse" @@ -41,8 +39,6 @@ ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Hiba a GTK+ futtatkrnyezet teleptse kzben." -!define GTK_BAD_INSTALL_PATH "A megadott elrsi t nem rhet el, vagy nem hozhat ltre." !define URI_HANDLERS_SECTION_TITLE "URI kezelk" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/italian.nsh --- a/pidgin/win32/nsis/translations/italian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/italian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Il programma di installazione gi in esecuzione" !define PIDGIN_IS_RUNNING " attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova." -!define GTK_INSTALLER_NEEDED "L'ambiente di runtime GTK+ non presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore" ; License Page !define PIDGIN_LICENSE_BUTTON "Avanti >" @@ -31,7 +30,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crea una voce per Pidgin nel Menu Avvio" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visita la pagina web di Pidgin" @@ -40,8 +38,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Impossibile rimuovere la versione di Pidgin attualmente presente sul tuo computer. La nuova versione sar installata senza rimuovere la versione precedente." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Error nell'installazione del runtime GTK+." -!define GTK_BAD_INSTALL_PATH "Il percorso scelto non pu essere raggiunto o creato." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "Gestori degli URI" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/japanese.nsh --- a/pidgin/win32/nsis/translations/japanese.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/japanese.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -12,7 +12,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "CXg[ɎsĂ܂" !define PIDGIN_IS_RUNNING "Pidgin sĂ܂BPidgin IĂēxsĂ" -!define GTK_INSTALLER_NEEDED "GTK+^C‹̓AbvO[hKv܂B$\rv${GTK_MIN_VERSION}͂ȏGTK+^CCXg[ĂB" ; License Page !define PIDGIN_LICENSE_BUTTON " >" @@ -33,14 +32,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "X^[gj[ Pidgin ̍ڂ쐬" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Âo[WGTK+^C‚܂BAbvO[h܂?$\r: $(^Name)̓AbvO[hȂ蓮Ȃł傤B" ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Windows PidginWeby[WKĂB" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "GTK+^C̃CXg[ŃG[܂B" -!define GTK_BAD_INSTALL_PATH "Ȃ̓͂pXɃANZX܂͍쐬ł܂B" ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "ACXg[PidgiñWXgGg𔭌ł܂łB$\r炭ʂ̃[UɃCXg[ꂽł傤B" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/korean.nsh --- a/pidgin/win32/nsis/translations/korean.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/korean.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -7,8 +7,6 @@ ;; Author: Kyung-uk Son ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ Ÿ ȯ濡 ְų ׷̵尡 ʿմϴ.$\rGTK+ Ÿ ȯ v${GTK_MIN_VERSION}̳ ̻ ġּ." ; Components Page !define PIDGIN_SECTION_TITLE " ޽ (ʼ)" @@ -17,11 +15,8 @@ !define GTK_SECTION_DESCRIPTION " ϴ Ƽ ÷ GUI Ŷ" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " GTK+ Ÿ ãҽϴ. ׷̵ұ?$\rNote: ׷̵ ֽϴ." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "GTK+ Ÿ ġ ߻." -!define GTK_BAD_INSTALL_PATH "ԷϽ ο ų ϴ." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "ν緯 Ʈ Ʈ ã ϴ.$\r α׷ ٸ ġ ϴ." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/kurdish.nsh --- a/pidgin/win32/nsis/translations/kurdish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/kurdish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -12,7 +12,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Sazker jixwe dimee." !define PIDGIN_IS_RUNNING "Pidgin niha jixwe dimee. Ji Pidgin derkeve careke din biceribne." -!define GTK_INSTALLER_NEEDED "Derdora runtime ya GTK+ an tune an rojanekirina w pwst e. $\rJi kerema xwe v${GTK_MIN_VERSION} an bilindtir a GTK+ saz bike." ; License Page !define PIDGIN_LICENSE_BUTTON "P >" @@ -32,14 +31,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Pidgin binivse menuya destpk" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Guhertoyeke kevn a GTK+ hatiye dtin. Tu dixwaz bilind bik?$\rNot: Heke tu nek, dibe ku $(^Name) naxebite." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Were Malpera Pidgin a Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Di sazkirina GTK+ de ewt derket." -!define GTK_BAD_INSTALL_PATH "rya te nivsand nay gihitin an afirandin." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Raker tketiyn registry yn Pidgin nedt. $\rQey bikarhnereke din v bername saz kir." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/lithuanian.nsh --- a/pidgin/win32/nsis/translations/lithuanian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/lithuanian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -9,7 +9,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Diegimo programa jau paleista." !define PIDGIN_IS_RUNNING "iuo metu Pidgin yra paleistas. Udarykite i program ir pabandykite i naujo." -!define GTK_INSTALLER_NEEDED "GTK+ vykdymo meto aplinkos nra arba ji turi bti atnaujinta.$\rdiekite v${GTK_MIN_VERSION} arba naujesn GTK+ vykdymo meto aplinkos versij" ; License Page !define PIDGIN_LICENSE_BUTTON "Toliau >" @@ -29,7 +28,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Sukurti pradinio meniu ra, skirt Pidgin." ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j atnaujinti?$\rPastaba: $(^Name) gali neveikti, jeigu to nepadarysite." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Aplankyti Pidgin tinklalap" @@ -38,8 +36,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Nepavyko idiegti anksiau diegtos Pidgin versijos. Nauja versija bus diegta neidiegus senosios." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "GTK+ vykdymo meto aplinkos diegimo klaida" -!define GTK_BAD_INSTALL_PATH "Js vestas kelias negali bti pasiektas ar sukurtas." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "URI dorokls" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/norwegian.nsh --- a/pidgin/win32/nsis/translations/norwegian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/norwegian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Installeren kjrer allerede." !define PIDGIN_IS_RUNNING "En instans av Pidgin kjrer fra fr. Avslutt Pidgin og prv igjen." -!define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst installr GTK+ v${GTK_MIN_VERSION} eller hyere" ; License Page !define PIDGIN_LICENSE_BUTTON "Neste >" @@ -31,14 +30,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Legg til Pidgin i Startmenyen" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "En eldre versjon av GTK+ runtime ble funnet. nsker du oppgradere?$\rMerk: $(^Name) vil kanskje ikke virke hvis du ikke oppgraderer." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Besk Pidgin for Windows' Nettside" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "En feil oppstod ved installering av GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Stien du oppga kan ikke aksesseres eller lages." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Avinstalleringsprogrammet kunne ikke finne noen registeroppfring for Pidgin.$\rTrolig har en annen bruker avinstallert denne applikasjonen." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/persian.nsh --- a/pidgin/win32/nsis/translations/persian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/persian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -13,7 +13,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "ȝ ." !define PIDGIN_IS_RUNNING " . ." -!define GTK_INSTALLER_NEEDED " GTK+ .$\r ${GTK_MIN_VERSION} GTK+ " ; License Page !define PIDGIN_LICENSE_BUTTON " >" @@ -33,7 +32,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC " " ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " GTK+ . Ͽ$\r: $(^Name) ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " " @@ -42,8 +40,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL " . ." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR " GTK+." -!define GTK_BAD_INSTALL_PATH " ." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE " " diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/polish.nsh --- a/pidgin/win32/nsis/translations/polish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/polish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,8 +8,6 @@ ;; Version 2 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "Runtime rodowiska GTK+ zosta zagubiony lub wymaga upgrade-u.$\r Prosz zainstaluj v${GTK_MIN_VERSION} albo wysz wersj runtime-u GTK+." ; License Page !define PIDGIN_LICENSE_BUTTON "Dalej >" @@ -22,14 +20,11 @@ !define GTK_SECTION_DESCRIPTION "Wieloplatformowe narzdzie GUI, uywane w Pidgin" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Znaleziono star wersj runtime-u GTK+. Czy chcesz upgrade-owa?$\rNote: $(^Name) moe nie dziaa jeli nie wykonasz procedury." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Wejd na stron Pidgin Web Page" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Bd instalacji runtime-a GTK+." -!define GTK_BAD_INSTALL_PATH "Nie ma dostpu do wybranej cieki / aty." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Deinstalator nie moe znale rejestrw dla Pidgin.$\r Wskazuje to na to, e instalacj przeprowadzi inny uytkownik." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/portuguese-br.nsh --- a/pidgin/win32/nsis/translations/portuguese-br.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/portuguese-br.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,8 +8,6 @@ ;; Version 3 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execuo do GTK+ est ausente ou precisa ser atualizado.$\rFavor instalar a verso v${GTK_MIN_VERSION} ou superior do ambiente de tempo de execuo do GTK+." ; License Page !define PIDGIN_LICENSE_BUTTON "Avanar >" @@ -29,11 +27,8 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crie uma entrada no Menu Iniciar para o Pidgin" ; 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 $(^Name) poder no funcionar a menos que voc o faa." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Erro ao instalar o ambiente de tempo de execuo do GTK+." -!define GTK_BAD_INSTALL_PATH "O caminho que voc digitou no pde ser acessado ou criado." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visite a pgina da web do Pidgin para Windows" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/portuguese.nsh --- a/pidgin/win32/nsis/translations/portuguese.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/portuguese.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "O instalador j est a ser executado." !define PIDGIN_IS_RUNNING "Uma instncia do Pidgin j est a ser executada. Saia do Pidgin 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_MIN_VERSION} ou mais recente do ambiente de GTK+." ; License Page !define PIDGIN_LICENSE_BUTTON "Seguinte >" @@ -31,14 +30,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Criar uma entrada para o Pidgin na Barra de Iniciar" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Foi encontrada uma verso antiga do ambiente de execuo GTK+. Deseja actualiz-lo?$\rNota: O $(^Name) poder no funcionar se no o fizer." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visite a Pgina Web do Pidgin para Windows" ; GTK+ Section Prompts -!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." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "O desinstalador no encontrou entradas de registo do Pidgin.$\r provvel que outro utilizador tenha instalado este programa." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/romanian.nsh --- a/pidgin/win32/nsis/translations/romanian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/romanian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -10,7 +10,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Instalarea este deja pornit." !define PIDGIN_IS_RUNNING "O instan a programului Pidgin 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_MIN_VERSION} a mediului GTK+" ; License Page !define PIDGIN_LICENSE_BUTTON "nainte >" @@ -30,14 +29,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Creeaz o intrare Pidgin 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 $(^Name) s nu funcioneze cu versiunea veche." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Vizitai pagina de web Windows Pidgin" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Eroare la instalarea mediului GTK+." -!define GTK_BAD_INSTALL_PATH "Directorul specificat nu poate fi accesat sau creat." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Programul de dezinstalare nu a gsit intrri Pidgin n regitri.$\rProbabil un alt utilizator a instalat aceast aplicaie." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/russian.nsh --- a/pidgin/win32/nsis/translations/russian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/russian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,9 +8,6 @@ ;; Version 2 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED " GTK+ .$\r v${GTK_MIN_VERSION} GTK+." - ; License Page !define PIDGIN_LICENSE_BUTTON " >" !define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) GPL. . $_CLICK" @@ -22,14 +19,11 @@ !define GTK_SECTION_DESCRIPTION " , Pidgin." ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT " GTK+. ?$\r: Pidgin ." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " - Pidgin Windows." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR " GTK+." -!define GTK_BAD_INSTALL_PATH " ." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 " Pidgin ..$\r ." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/serbian-latin.nsh --- a/pidgin/win32/nsis/translations/serbian-latin.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/serbian-latin.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -7,8 +7,6 @@ ;; Author: Danilo Segan ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ okolina za izvravanje ili nije naena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_MIN_VERSION} ili veu GTK+ okoline za izvravanje" ; Components Page !define PIDGIN_SECTION_TITLE "Pidgin klijent za brze poruke (neophodno)" @@ -17,11 +15,8 @@ !define GTK_SECTION_DESCRIPTION "Skup orua za grafiko okruenje, za vie platformi, koristi ga Pidgin " ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Naena je stara verzija GTK+ izvrne okoline. Da li elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) moda nee raditi." ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Greka prilikom instalacije GTK+ okoline za izvravanje." -!define GTK_BAD_INSTALL_PATH "Putanja koju ste naveli se ne moe ni napraviti niti joj se moe prii." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Program za uklanjanje instalacije ne moe da pronae stavke registra za Pidgin.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/simp-chinese.nsh --- a/pidgin/win32/nsis/translations/simp-chinese.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/simp-chinese.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup GTK+ check !define INSTALLER_IS_RUNNING "װѾС" !define PIDGIN_IS_RUNNING "Pidgin ʵС˳ Pidgin ȻһΡ" -!define GTK_INSTALLER_NEEDED "ȱ GTK+ ʱ̻Ҫ¸û$\r밲װ v${GTK_MIN_VERSION} ߰汾 GTK+ ʱ̻" ; License Page !define PIDGIN_LICENSE_BUTTON "һ >" @@ -31,14 +30,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "ڿʼ˵д Pidgin Ŀݷʽ" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "˾ɰ汾 GTK+ ʱ̡Ҫ?$\rע: $(^Name) ޷" ; Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE " Windows Pidgin ҳ" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "װ GTK+ ʱʧܡ" -!define GTK_BAD_INSTALL_PATH "޷ʻ򴴽·" ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "жسҲ Pidgin עĿ$\rûװ˴˳" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/slovak.nsh --- a/pidgin/win32/nsis/translations/slovak.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/slovak.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Intalcia je u spusten" !define PIDGIN_IS_RUNNING "Pidgin 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_MIN_VERSION}, alebo noviu" ; License Page !define PIDGIN_LICENSE_BUTTON "alej >" @@ -31,14 +30,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Vytvori odkaz na Pidgin v tart Menu" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Bola njden staria verzia GTK+ runtime. Prajete si upgradova sasn verziu?$\rPoznmka: $(^Name) nemus po upgradovan fungova sprvne." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Navtvi webstrnku Windows Pidgin" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Chyba pri intalcii GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Zadan cesta nie je prstupn alebo ju nie je mon vytvori." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Intaltoru sa nepodarilo njs poloky v registri pre Pidgin.$\rJe mon, e tto aplikciu naintaloval in pouvate." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/slovenian.nsh --- a/pidgin/win32/nsis/translations/slovenian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/slovenian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -11,7 +11,6 @@ ; Startup GTK+ check !define INSTALLER_IS_RUNNING "Nameanje e poteka." !define PIDGIN_IS_RUNNING "Trenutno e tee ena razliica Pidgina. Prosimo, zaprite aplikacijo in poskusite znova." -!define GTK_INSTALLER_NEEDED "Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo, namestite v${GTK_MIN_VERSION} ali novejo razliico izvajalnega okolja GTK+" ; License Page !define PIDGIN_LICENSE_BUTTON "Naprej >" @@ -31,7 +30,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Ustvari izbiro Pidgin v meniju Start" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Nameeno imate starejo razliico izvajalnega okolja GTK+. Jo elite nadgraditi?$\rOpomba: e je ne boste nadgradili, $(^Name) morda ne bo deloval." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Obiite spletno stran Windows Pidgin" @@ -40,8 +38,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Trenutno nameene razliice Pidgina ni mogoe odstraniti. Nova razliica bo nameena brez odstranitve trenutno nameene razliice." ; GTK+ Section Prompts -!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." ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "URI Handlers" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/spanish.nsh --- a/pidgin/win32/nsis/translations/spanish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/spanish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -8,9 +8,6 @@ ;; Version 2 ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "El entorno de ejecucin de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versin v${GTK_MIN_VERSION} del ejecutable GTK+ o alguna posterior." - ; License Page !define PIDGIN_LICENSE_BUTTON "Siguiente >" !define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aqu slo con propsito informativo: $_CLICK" @@ -22,14 +19,11 @@ !define GTK_SECTION_DESCRIPTION "Una suite de herramientas GUI multiplataforma, utilizada por Pidgin" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Se ha encontrado una versin antiga del ejecutable de GTK+. Desea actualizarla?$\rObservacin: $(^Name) no funcionar a menos que lo haga." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visite la pgina Web de Pidgin Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Error al instalar el ejecutable GTK+." -!define GTK_BAD_INSTALL_PATH "No se pudo acceder o crear la ruta que vd. indic." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "El desinstalador no pudo encontrar las entradas en el registro de Pidgin.$\rEs probable que otro usuario instalara la aplicacin." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/swedish.nsh --- a/pidgin/win32/nsis/translations/swedish.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/swedish.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -1,80 +1,76 @@ -;; -;; swedish.nsh -;; -;; Swedish language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1252 -;; -;; Author: Tore Lundqvist , 2003. -;; Author: Peter Hjalmarsson , 2005. -;; Version 3 - -; Startup Checks -!define INSTALLER_IS_RUNNING "Installationsprogrammet krs redan." -!define PIDGIN_IS_RUNNING "En instans av Pidgin krs redan. Avsluta Pidgin och frsk igen." -!define GTK_INSTALLER_NEEDED "Krmiljn GTK+ r antingen inte installerat eller behver uppgraderas.$\rVar god installera v${GTK_MIN_VERSION} eller hgre av GTK+-krmiljn." - -; License Page -!define PIDGIN_LICENSE_BUTTON "Nsta >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) r utgivet under GPL. Licensen finns tillgnglig hr fr informationssyften enbart. $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "Pidgin Snabbmeddelandeklient (obligatorisk)" -!define GTK_SECTION_TITLE "GTK+-krmilj (obligatorisk)" -!define PIDGIN_SHORTCUTS_SECTION_TITLE "Genvgar" -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord" -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny" -!define PIDGIN_SECTION_DESCRIPTION "Pidgins krnfiler och DLL:er" -!define GTK_SECTION_DESCRIPTION "En GUI-verktygsuppsttning fr flera olika plattformar som Pidgin anvnder." - -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Genvgar fr att starta Pidgin" -!define PIDGIN_DESKTOP_SHORTCUT_DESC "Skapar en genvg till Pidgin p skrivbordet" -!define PIDGIN_STARTMENU_SHORTCUT_DESC "Skapar ett tillgg i startmenyn fr Pidgin" - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "En ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! $(^Name) kommer kanske inte att fungera om du inte uppgraderar." - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE "Besk Windows-Pidgin hemsida" - -; Pidgin Section Prompts and Texts -!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Kunde inte avinstallera den nuvarande versionen av Pidgin. Den nya versionen kommer att installeras utan att ta bort den fr nrvarande installerade versionen." - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fel vid installation av GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Den skvg du angivit gr inte att komma t eller skapa." - -; URL Handler section -!define URI_HANDLERS_SECTION_TITLE "URI Hanterare" - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 "Avinstalleraren kunde inte hitta registervrden fr Pidgin.$\rAntagligen har en annan anvndare installerat applikationen." -!define un.PIDGIN_UNINSTALL_ERROR_2 "Du har inte rttigheter att avinstallera den hr applikationen." - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE "Std fr rttstavning" -!define PIDGIN_SPELLCHECK_ERROR "Fel vid installation fr rttstavning" -!define PIDGIN_SPELLCHECK_DICT_ERROR "Fel vid installation av rttstavningsordlista" -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Std fr Rttstavning. (Internetanslutning krvs fr installation)" -!define ASPELL_INSTALL_FAILED "Installationen misslyckades" -!define PIDGIN_SPELLCHECK_BRETON "Bretonska" -!define PIDGIN_SPELLCHECK_CATALAN "Katalanska" -!define PIDGIN_SPELLCHECK_CZECH "Tjeckiska" -!define PIDGIN_SPELLCHECK_WELSH "Kymriska" -!define PIDGIN_SPELLCHECK_DANISH "Danska" -!define PIDGIN_SPELLCHECK_GERMAN "Tyska" -!define PIDGIN_SPELLCHECK_GREEK "Grekiska" -!define PIDGIN_SPELLCHECK_ENGLISH "Engelska" -!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" -!define PIDGIN_SPELLCHECK_SPANISH "Spanska" -!define PIDGIN_SPELLCHECK_FAROESE "Friska" -!define PIDGIN_SPELLCHECK_FRENCH "Franska" -!define PIDGIN_SPELLCHECK_ITALIAN "Italienska" -!define PIDGIN_SPELLCHECK_DUTCH "Nederlndska" -!define PIDGIN_SPELLCHECK_NORWEGIAN "Norska" -!define PIDGIN_SPELLCHECK_POLISH "Polska" -!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugisiska" -!define PIDGIN_SPELLCHECK_ROMANIAN "Rumnska" -!define PIDGIN_SPELLCHECK_RUSSIAN "Ryska" -!define PIDGIN_SPELLCHECK_SLOVAK "Slovakiska" -!define PIDGIN_SPELLCHECK_SWEDISH "Svenska" -!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainska" +;; +;; swedish.nsh +;; +;; Swedish language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Tore Lundqvist , 2003. +;; Author: Peter Hjalmarsson , 2005. +;; Version 3 + +; Startup Checks +!define INSTALLER_IS_RUNNING "Installationsprogrammet krs redan." +!define PIDGIN_IS_RUNNING "En instans av Pidgin krs redan. Avsluta Pidgin och frsk igen." + +; License Page +!define PIDGIN_LICENSE_BUTTON "Nsta >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) r utgivet under GPL. Licensen finns tillgnglig hr fr informationssyften enbart. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin Snabbmeddelandeklient (obligatorisk)" +!define GTK_SECTION_TITLE "GTK+-krmilj (obligatorisk)" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Genvgar" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny" +!define PIDGIN_SECTION_DESCRIPTION "Pidgins krnfiler och DLL:er" +!define GTK_SECTION_DESCRIPTION "En GUI-verktygsuppsttning fr flera olika plattformar som Pidgin anvnder." + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Genvgar fr att starta Pidgin" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Skapar en genvg till Pidgin p skrivbordet" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Skapar ett tillgg i startmenyn fr Pidgin" + +; GTK+ Directory Page + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "Besk Windows-Pidgin hemsida" + +; Pidgin Section Prompts and Texts +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Kunde inte avinstallera den nuvarande versionen av Pidgin. Den nya versionen kommer att installeras utan att ta bort den fr nrvarande installerade versionen." + +; GTK+ Section Prompts + +; URL Handler section +!define URI_HANDLERS_SECTION_TITLE "URI Hanterare" + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Avinstalleraren kunde inte hitta registervrden fr Pidgin.$\rAntagligen har en annan anvndare installerat applikationen." +!define un.PIDGIN_UNINSTALL_ERROR_2 "Du har inte rttigheter att avinstallera den hr applikationen." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Std fr rttstavning" +!define PIDGIN_SPELLCHECK_ERROR "Fel vid installation fr rttstavning" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Fel vid installation av rttstavningsordlista" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Std fr Rttstavning. (Internetanslutning krvs fr installation)" +!define ASPELL_INSTALL_FAILED "Installationen misslyckades" +!define PIDGIN_SPELLCHECK_BRETON "Bretonska" +!define PIDGIN_SPELLCHECK_CATALAN "Katalanska" +!define PIDGIN_SPELLCHECK_CZECH "Tjeckiska" +!define PIDGIN_SPELLCHECK_WELSH "Kymriska" +!define PIDGIN_SPELLCHECK_DANISH "Danska" +!define PIDGIN_SPELLCHECK_GERMAN "Tyska" +!define PIDGIN_SPELLCHECK_GREEK "Grekiska" +!define PIDGIN_SPELLCHECK_ENGLISH "Engelska" +!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" +!define PIDGIN_SPELLCHECK_SPANISH "Spanska" +!define PIDGIN_SPELLCHECK_FAROESE "Friska" +!define PIDGIN_SPELLCHECK_FRENCH "Franska" +!define PIDGIN_SPELLCHECK_ITALIAN "Italienska" +!define PIDGIN_SPELLCHECK_DUTCH "Nederlndska" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Norska" +!define PIDGIN_SPELLCHECK_POLISH "Polska" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugisiska" +!define PIDGIN_SPELLCHECK_ROMANIAN "Rumnska" +!define PIDGIN_SPELLCHECK_RUSSIAN "Ryska" +!define PIDGIN_SPELLCHECK_SLOVAK "Slovakiska" +!define PIDGIN_SPELLCHECK_SWEDISH "Svenska" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainska" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/trad-chinese.nsh --- a/pidgin/win32/nsis/translations/trad-chinese.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/trad-chinese.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -13,7 +13,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "w˵{b椤C" !define PIDGIN_IS_RUNNING "Pidgin b椤AХoӵ{AwˡC" -!define GTK_INSTALLER_NEEDED "䤣ŦX GTK+ ҩάOݭnQsC$\rЦw v${GTK_MIN_VERSION} ΥHW GTK+ ҡC" ; License Page !define PIDGIN_LICENSE_BUTTON "U@B >" @@ -33,7 +32,6 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "b}l\إ߱|" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "o{@ª GTK+ ҡCznNɯŶܡH$\rЪ`NGpGzɯšA $(^Name) iLkTQC" ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "X Windows Pidgin " @@ -42,8 +40,6 @@ !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Lkثeww˪ PidginAsNbgªpUiwˡC" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "w GTK+ ҮɵoͿ~C" -!define GTK_BAD_INSTALL_PATH "zҿJw˥ؿLksΫإߡC" ; URL Handler section !define URI_HANDLERS_SECTION_TITLE "URI Bz{" diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/valencian.nsh --- a/pidgin/win32/nsis/translations/valencian.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/valencian.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -14,7 +14,6 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "L'instalador encara est eixecutant-se." !define PIDGIN_IS_RUNNING "Una instancia de Pidgin est eixecutant-se. Ix del Pidgin i torna a intentar-ho." -!define GTK_INSTALLER_NEEDED "L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_MIN_VERSION} o superior de l'entorn GTK+" ; License Page !define PIDGIN_LICENSE_BUTTON "Segent >" @@ -34,14 +33,11 @@ !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crear una entrada per a Pidgin en Menu Inici" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Una versio antiua de l'entorn GTK+ fon trobada. Vols actualisar-la?$\rNota: $(^Name) no funcionar si no ho fas." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Visita la pagina de Pidgin per a Windows" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Erro instalant l'entorn GTK+." -!define GTK_BAD_INSTALL_PATH "La ruta introduida no pot ser accedida o creada." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "El desinstalador podria no trobar les entrades del registre de Pidgin.$\rProbablement un atre usuari instal esta aplicacio." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/nsis/translations/vietnamese.nsh --- a/pidgin/win32/nsis/translations/vietnamese.nsh Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/nsis/translations/vietnamese.nsh Sun Nov 01 03:34:32 2009 +0000 @@ -9,9 +9,6 @@ ;; it does, these translations can not be used. ;; -; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_MIN_VERSION} hoặc mới hơn" - ; License Page !define PIDGIN_LICENSE_BUTTON "Tiếp theo >" !define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) được phát hành theo giấy phép GPL. Giấy phép thấy ở đây chỉ là để cung cấp thông tin mà thôi. $_CLICK" @@ -23,14 +20,11 @@ !define GTK_SECTION_DESCRIPTION "Bộ công cụ giao diện đồ họa đa nền để dùng cho Pidgin" ; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Phát hiện thấy có phiên bản cũ của GTK+ runtime. Bạn muốn nâng cấp không?$\rNote: $(^Name) có thể không chạy nếu không nâng cấp." ; Installer Finish Page !define PIDGIN_FINISH_VISIT_WEB_SITE "Hãy xem trang chủ Windows Pidgin" ; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Lỗi cài đặt GTK+ runtime." -!define GTK_BAD_INSTALL_PATH "Đường dẫn mà bạn nhập có thể không truy cập được hay không tạo được." ; Uninstall Section Prompts !define un.PIDGIN_UNINSTALL_ERROR_1 "Trình gỡ cài đặt không tìm được các registry entry cho Pidgin.$\rCó thể là chương trình được người dùng khác cài đặt." diff -r 3be6a18e0bcb -r 3f33a8fbf871 pidgin/win32/winpidgin.c --- a/pidgin/win32/winpidgin.c Sat Oct 31 20:03:26 2009 +0000 +++ b/pidgin/win32/winpidgin.c Sun Nov 01 03:34:32 2009 +0000 @@ -34,6 +34,8 @@ #include #include #include +#include +#include /* These will hopefully be in the win32api next time it is updated - at which point, we'll remove them */ #ifndef LANG_PERSIAN @@ -110,6 +112,19 @@ static void common_dll_prep(const char *path) { HMODULE hmod; HKEY hkey; + struct _stat stat_buf; + char test_path[MAX_PATH + 1]; + + _snprintf(test_path, sizeof(test_path), "%s\\libgtk-win32-2.0-0.dll", + path); + test_path[sizeof(test_path) - 1] = '\0'; + + if (_stat(test_path, &stat_buf) != 0) { + printf("Unable to determine GTK+ path. \n" + "Assuming GTK+ is in the PATH.\n"); + return; + } + printf("GTK+ path found: %s\n", path); @@ -232,35 +247,16 @@ common_dll_prep(path); } -static void dll_prep() { - char path[MAX_PATH + 1]; - HKEY hkey; - char gtkpath[MAX_PATH + 1]; - DWORD plen; +static void dll_prep(const char *pidgin_dir) { + char gtk_path[MAX_PATH + 1]; + gtk_path[0] = '\0'; - plen = sizeof(gtkpath); - hkey = HKEY_CURRENT_USER; - if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path", - (LPBYTE) >kpath, &plen)) { - hkey = HKEY_LOCAL_MACHINE; - if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path", - (LPBYTE) >kpath, &plen)) { - printf("GTK+ Path Registry Key not found. " - "Assuming GTK+ is in the PATH.\n"); - return; - } + if (*pidgin_dir) { + _snprintf(gtk_path, sizeof(gtk_path), "%s\\Gtk\\bin", pidgin_dir); + gtk_path[sizeof(gtk_path)] = '\0'; } - /* this value is replaced during a successful RegQueryValueEx() */ - plen = sizeof(path); - /* Determine GTK+ dll path .. */ - if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "DllPath", - (LPBYTE) &path, &plen)) { - strcpy(path, gtkpath); - strcat(path, "\\bin"); - } - - common_dll_prep(path); + common_dll_prep(gtk_path); } static char* winpidgin_lcid_to_posix(LCID lcid) { @@ -686,14 +682,16 @@ } if (prev) { + HMODULE hmod; prev[0] = '\0'; /* prev++ will now point to the executable file name */ strcpy(exe_name, prev + 1); strcat(pidgin_dir, "\\exchndl.dll"); - if (LoadLibrary(pidgin_dir)) + if ((hmod = LoadLibrary(pidgin_dir))) { printf("Loaded exchndl.dll\n"); + } prev[0] = '\0'; } @@ -729,7 +727,7 @@ if (portable_mode) portable_mode_dll_prep(pidgin_dir); else if (!getenv("PIDGIN_NO_DLL_CHECK")) - dll_prep(); + dll_prep(pidgin_dir); winpidgin_set_locale();