[prev in list] [next in list] [prev in thread] [next in thread]
List: pidgin-commits
Subject: pidgin: d0bcb2f6: Various win32 installer fixes
From: datallah () pidgin ! im
Date: 2010-02-25 0:20:36
Message-ID: 20100225002036.A5B4CAFD22DE () rock ! pidgin ! im
[Download RAW message or body]
-----------------------------------------------------------------
Revision: d0bcb2f60a6d96f1c8c9fbabfa888607158f4e5e
Ancestor: c12f585374ee631039d4e0e6f8fac345be1148ad
Author: datallah@pidgin.im
Date: 2010-02-25T00:17:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d0bcb2f60a6d96f1c8c9fbabfa888607158f4e5e
Modified files:
pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/nsis/translations/english.nsh
pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
pidgin/win32/nsis/translations/polish.nsh
ChangeLog:
Various win32 installer fixes
============================================================
--- pidgin/win32/nsis/langmacros.nsh 489736194a0350834cde27ef8cc301a0d30b0e33
+++ pidgin/win32/nsis/langmacros.nsh 0156b097c45f9bf08365e1e5b0fa88e0028bb90d
@@ -91,9 +91,11 @@
!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}
+ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DEBUGSYMBOLS_ERROR ${CUR_LANG}
+ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_GTK_DOWNLOAD_ERROR ${CUR_LANG}
+ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT TRANSLATIONS_SECTION_TITLE ${CUR_LANG}
+
!undef CUR_LANG
!macroend
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi 15360456d2b0602d62d18fb97ef023e4926a04d1
+++ pidgin/win32/nsis/pidgin-installer.nsi d6a05cc0f884db841a8e696510ff5677c99b0846
@@ -779,7 +779,7 @@ Section Uninstall
Delete "$INSTDIR\libsasl.dll"
Delete "$INSTDIR\libsilc-1-1-2.dll"
Delete "$INSTDIR\libsilcclient-1-1-2.dll"
- Delete "$INSTDIR\libxml2.dll"
+ Delete "$INSTDIR\libxml2-2.dll"
Delete "$INSTDIR\libymsg.dll"
Delete "$INSTDIR\nspr4.dll"
Delete "$INSTDIR\nss3.dll"
============================================================
--- pidgin/win32/nsis/translations/english.nsh 2842813546b2ed8c25c2b844674876614c28c72c
+++ pidgin/win32/nsis/translations/english.nsh 4a12d2dd7662ec19a7a267950e0182f5b14eed62
@@ -25,13 +25,14 @@
!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_TITLE "Shortcuts"
!insertmacro PIDGIN_MACRO_DEFAULT_STRING \
PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
!insertmacro PIDGIN_MACRO_DEFAULT_STRING \
PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menu" +!insertmacro \
PIDGIN_MACRO_DEFAULT_STRING \
TRANSLATIONS_SECTION_TITLE "Localizations"
!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_DESCRIPTION "Core Pidgin \
files and dlls"
!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION "A multi-platform \
GUI toolkit, used by Pidgin"
!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)" +!insertmacro PIDGIN_MACRO_DEFAULT_STRING \
DEBUG_SYMBOLS_SECTION_TITLE "Debug Symbols (for reporting crashes)"
; GTK+ Directory Page
@@ -79,6 +80,7 @@
!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_DEBUGSYMBOLS_ERROR "Error Installing Debug Symbols"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_GTK_DOWNLOAD_ERROR "Error \
Downloading the GTK+ Runtime" +!insertmacro PIDGIN_MACRO_DEFAULT_STRING \
PIDGIN_GTK_DOWNLOAD_ERROR "Error Downloading the GTK+ Runtime" +
============================================================
--- pidgin/win32/nsis/translations/norwegian_nynorsk.nsh 06ed2402c5efa77a7c04b418be446b114375f884
+++ pidgin/win32/nsis/translations/norwegian_nynorsk.nsh 653d27e7faac28c953e013a7a3b9749e13899976
@@ -9,7 +9,6 @@
; Startup Checks
!define INSTALLER_IS_RUNNING "Installasjonsprogrammet kj?allereie."
!define PIDGIN_IS_RUNNING "Pidgin kj?no. Lukk programmet og pr?jen."
-!define GTK_INSTALLER_NEEDED "GTK+-kj?lj?anglar eller treng ?li \
oppdatert.$\rInstaller v${GTK_MIN_VERSION} eller nyare av GTK+-kj?lj? ; License \
Page
!define PIDGIN_LICENSE_BUTTON "Neste >"
@@ -28,20 +27,12 @@
!define PIDGIN_DESKTOP_SHORTCUT_DESC "Lag ein snarveg til Pidgin p?krivebordet"
!define PIDGIN_STARTMENU_SHORTCUT_DESC "Lag ein snarveg til Pidgin p?tartmenyen"
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT "Fann ei gammal utg? av GTK+-kj?lj?Vil du oppdatera \
ho?$\rMerk: $(^Name) vil kanskje ikkje fungera om du ikkje \
oppdaterer."
-!define GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me er ikkje kompatibelt med GTK+ \
2.8.0 eller nyare. GTK+ ${GTK_INSTALL_VERSION} kjem ikkje til ?li \
installert.$\rInstallasjonen vil bli abvroten om ikkje GTK+ ${GTK_MIN_VERSION} eller \
nyare allereie er installert."
-
; Installer Finish Page
!define PIDGIN_FINISH_VISIT_WEB_SITE "Bes?dgin si nettside"
; Pidgin Section Prompts and Texts
!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "Klarte ikkje ?vinstallera \
Pidgin-utg? som er i bruk. Den nye utg? kjem til ?li installert utan ?a vekk den \
gjeldande."
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR "Klarte ikkje ?nstallera GTK+-kj?lj?
-!define GTK_BAD_INSTALL_PATH "Klarer ikkje ?aga eller f?ilgang til bana du \
skreiv."
-
; URL Handler section
!define URI_HANDLERS_SECTION_TITLE "URI-referanse"
============================================================
--- pidgin/win32/nsis/translations/polish.nsh 40ffd2d2c5a21aab3265f271cde438dc1a49ffaa
+++ pidgin/win32/nsis/translations/polish.nsh 5024bc5a9adae2b4454dd0885e5cb075e946a20c
@@ -25,17 +25,9 @@
!define PIDGIN_DESKTOP_SHORTCUT_DESC "Utworzenie skr?do programu Pidgin na \
pulpicie"
!define PIDGIN_STARTMENU_SHORTCUT_DESC "Utworzenie wpisu w menu Start dla programu \
Pidgin"
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT "Odnaleziono star? wersj?iblioteki GTK+. \
Zaktualizowa???$\rUwaga: program $(^Name) mo?e bez tego nie dzia?a?
-!define GTK_WINDOWS_INCOMPATIBLE "Systemy Windows 95/98/Me s? niezgodne z \
bibliotek? GTK+ 2.8.0 lub nowsz?. Biblioteka GTK+ ${GTK_INSTALL_VERSION} nie zostanie \
zainstalowana.$\rJe?li brak zainstalowanej biblioteki GTK+ ${GTK_MIN_VERSION} lub \
nowszej, instalacja zostanie przerwana."
-
; Installer Finish Page
!define PIDGIN_FINISH_VISIT_WEB_SITE "Odwied? stron?WW programu Pidgin"
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR "B??d podczas instalowania biblioteki GTK+."
-!define GTK_BAD_INSTALL_PATH "Nie mo?na uzyska?ost? do podanej ?cie?ki lub jej \
utworzy?
-
; Uninstall Section Prompts
!define un.PIDGIN_UNINSTALL_ERROR_1 "Instalator nie mo?e odnale??pis? rejestrze dla \
programu Pidgin.$\rMo?liwe, ?e inny u?ytkownik zainstalowa? ten \
program."
-!define un.PIDGIN_UNINSTALL_ERROR_2 "Brak uprawnie? odinstalowania tego programu."
\ No newline at end of file
+!define un.PIDGIN_UNINSTALL_ERROR_2 "Brak uprawnie? odinstalowania tego programu."
_______________________________________________
Commits mailing list
Commits@pidgin.im
http://pidgin.im/cgi-bin/mailman/listinfo/commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic