pidgin.next.minor: f94a8394: Remove win9x related stuff from the win3...

datallah at pidgin.im datallah at pidgin.im
Tue Aug 25 23:26:01 EDT 2009


-----------------------------------------------------------------
Revision: f94a8394fdc4dfeca3487fdd7650fb5ec67919db
Ancestor: d0c0632c8f1ba48379c9e0263ea985393716ad5a
Author: datallah at pidgin.im
Date: 2009-08-26T03:20:05
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/f94a8394fdc4dfeca3487fdd7650fb5ec67919db

Modified files:
        ChangeLog.win32 pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/afrikaans.nsh
        pidgin/win32/nsis/translations/arabic.nsh
        pidgin/win32/nsis/translations/basque.nsh
        pidgin/win32/nsis/translations/english.nsh
        pidgin/win32/nsis/translations/french.nsh
        pidgin/win32/nsis/translations/german.nsh
        pidgin/win32/nsis/translations/hebrew.nsh
        pidgin/win32/nsis/translations/hungarian.nsh
        pidgin/win32/nsis/translations/italian.nsh
        pidgin/win32/nsis/translations/lithuanian.nsh
        pidgin/win32/nsis/translations/persian.nsh
        pidgin/win32/nsis/translations/portuguese-br.nsh
        pidgin/win32/nsis/translations/slovenian.nsh
        pidgin/win32/nsis/translations/trad-chinese.nsh

ChangeLog: 

Remove win9x related stuff from the win32 installer

-------------- next part --------------
============================================================
--- ChangeLog.win32	9f41fee6c9c93f13769823552cc85037486a9d0a
+++ ChangeLog.win32	9069032240002c7c8003dfb34f0b7e7d832c975a
@@ -1,4 +1,6 @@ version 2.7.0 (??/??/????):
 version 2.7.0 (??/??/????):
+	* Minimum required GTK+ version increased to 2.14.0
+	* Win9x no longer supported.
 
 version 2.6.1 (08/18/2009):
 	* No changes
============================================================
--- pidgin/win32/nsis/langmacros.nsh	18c351680e93ed1837c6e6c188bd169660133fd6
+++ pidgin/win32/nsis/langmacros.nsh	0128fb949c018d0ce618921a61ac7e3ca8b122cf
@@ -51,7 +51,6 @@
 
   ; GTK+ Directory Page
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE		${CUR_LANG}
 
   ; Installer Finish Page
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE		${CUR_LANG}
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	d878f4809ee415ca231b6241c0ba0fdea82a2128
+++ pidgin/win32/nsis/pidgin-installer.nsi	0fed1c492737279bf79c79c31d82b54279f165dc
@@ -1452,15 +1452,6 @@ Function preWelcomePage
     !insertmacro UnselectSection ${SecGtk}
   gtk_selection_done:
 
-  ; If on Win95/98/ME warn them that the GTK+ version wont work
-  ${Unless} ${IsNT}
-    !insertmacro UnselectSection ${SecGtk}
-    !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
-    MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK
-    IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version
-    Quit
-  ${EndIf}
-
   done:
   Pop $R2
   Pop $R1
============================================================
--- pidgin/win32/nsis/translations/afrikaans.nsh	a7940482f3bdf04c010e7fef5a23ef634d162267
+++ pidgin/win32/nsis/translations/afrikaans.nsh	1188713c0bc9c6e6dbb16d4051de5c7d7e357c9d
@@ -32,7 +32,6 @@
 
 ; 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."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me is onversoenbaar met GTK+ 2.8.0 en nuwer.  GTK+ ${GTK_INSTALL_VERSION} sal nie installeer nie.$\rIndien u nie GTK+ ${GTK_MIN_VERSION} of nuwer reeds ge?talleer het nie, sal die installasie nou staak."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besoek die WinPidgin-webblad"
============================================================
--- pidgin/win32/nsis/translations/arabic.nsh	8af1be4475ad15a8674a8e0cbac479004120b619
+++ pidgin/win32/nsis/translations/arabic.nsh	88c7dd6610a6985f7537bdfd0a2b87eac238cbfc
@@ -30,7 +30,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"?????? ??? ??. ???????$\r?? ? ???(^Name) ?????."
-!define GTK_WINDOWS_INCOMPATIBLE		"???????95/98/Me ??? 2.8.0 ? ??.  ?? ${GTK_INSTALL_VERSION} ????r???? ???? ${GTK_MIN_VERSION} ? ?? ?? ????? ????"
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"? ????? ?? ????
============================================================
--- pidgin/win32/nsis/translations/basque.nsh	a630351af357748cef272e787686697841d22885
+++ pidgin/win32/nsis/translations/basque.nsh	1bccf37bdd79db6e139007a2754692e10edb3828
@@ -30,7 +30,6 @@
 
 ; 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."
-!define GTK_WINDOWS_INCOMPATIBLE		"GTK+ 2.8.0 eta berriagoekin bateraezinak dira Windows 95/98/Me.  Ez da GTK+ ${GTK_INSTALL_VERSION} instalatuko.$\rJadanik ez badaukazu GTK+ ${GTK_MIN_VERSION} edo berriagorik instalatuta, bertan behera utziko da instalazioa."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Pidgin Webgunera etorri"
============================================================
--- pidgin/win32/nsis/translations/english.nsh	3bd924006689194e41d01db3e110d8104dc6afa1
+++ pidgin/win32/nsis/translations/english.nsh	ed77d02805f9a1b33cf1e4a7d1e91870182fa3c4
@@ -35,7 +35,6 @@
 
 ; 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."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
 
 ; Installer Finish Page
 !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the Pidgin Web Page"
============================================================
--- pidgin/win32/nsis/translations/french.nsh	40a67798801ef59ff2795a373ca06fcab97699a8
+++ pidgin/win32/nsis/translations/french.nsh	97e670a4e2d5860c59c8e8f4ed5c9fac87782da2
@@ -36,7 +36,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth?es GTK+ a ? trouv? Voulez-vous la mettre ?our ?$\rNote : $(^Name) peut ne pas fonctionner si vous ne le faites pas."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me est incompatible avec GTK+ version 2.8.0 ou plus r?ntes.  GTK+ ${GTK_INSTALL_VERSION} ne sera pas install?\rSi vous n'avez pas install?TK+ version ${GTK_MIN_VERSION} ou pkus r?nte, l'installation s'arr?ra."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
============================================================
--- pidgin/win32/nsis/translations/german.nsh	6684a1175bec98459689be786c0985db5325fe50
+++ pidgin/win32/nsis/translations/german.nsh	375a7ab045df66ce449b2d1bde80611fae352c87
@@ -33,7 +33,6 @@
  
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M?en Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me sind inkompatibel zu GTK+ 2.8.0 oder neuer.  GTK+ ${GTK_INSTALL_VERSION} wird nicht installiert.$\rWenn Sie nicht GTK+ ${GTK_MIN_VERSION} oder neuer installiert haben, wird die Installation jetzt abgebrochen."
  
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Pidgin Webseite"
============================================================
--- pidgin/win32/nsis/translations/hebrew.nsh	f819584815e191bc43866602530b16b8822b6d62
+++ pidgin/win32/nsis/translations/hebrew.nsh	5736f805f1290737c6e9171673dbd50af855d53b
@@ -33,7 +33,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"A?????K+ ????rNote: .???? ??$(^Name)"
-!define GTK_WINDOWS_INCOMPATIBLE		"??95/98/?? ?????TK+ 2.8.0 ?? GTK+ ${GTK_INSTALL_VERSION} ???\r?? ?GTK+ ${GTK_MIN_VERSION} ??????? ?."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin??? ?============================================================
--- pidgin/win32/nsis/translations/hungarian.nsh	5d00f20b24df6a9b23e59eb070a4c56f9a4bc352
+++ pidgin/win32/nsis/translations/hungarian.nsh	ecb7148f472c47f47401e0c7d0aafa8be3abc1fb
@@ -32,7 +32,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Egy r? verzi?GTK+ futtat?nyezet van telep?e. K?nja friss?ni?$\rMegjegyz? a Pidgin nem fog m?i, ha nem friss?."
-!define GTK_WINDOWS_INCOMPATIBLE		"A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy ? v?ozatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem ker?ep?sre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy ? m?nincs telep?e, akkor a telep?s most megszakad."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal?k felkeres?"
============================================================
--- pidgin/win32/nsis/translations/italian.nsh	953d736a9f6f486b75021020d636ee304ef5f308
+++ pidgin/win32/nsis/translations/italian.nsh	dd2b1126edbd7072e97fdbb15f460d65374e8827
@@ -32,7 +32,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"?stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me non ?ncompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sar?nstallato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo gi?nstallato sul tuo computer, questa installazione sar?nterrotta."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin"
============================================================
--- pidgin/win32/nsis/translations/lithuanian.nsh	33c09a000fc12ab1bae1b29bc844927d21f2189f
+++ pidgin/win32/nsis/translations/lithuanian.nsh	3512e6242b19a052e47ea6b1ce549c6d577714c2
@@ -30,7 +30,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j?tnaujinti?$\rPastaba: $(^Name) gali neveikti, jeigu to nepadarysite."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me yra nesuderinami su GTK+ 2.8.0 ir naujesn?s versijomis.  GTK+ ${GTK_INSTALL_VERSION} nebus ?egta.$\rJeigu neturite ?dieg?TK+ ${GTK_MIN_VERSION} ar naujesn?versijos, diegimas dabar bus nutrauktas."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Pidgin tinklalap?============================================================
--- pidgin/win32/nsis/translations/persian.nsh	8051eee8c284d4b3dfbaf94de6d2947e6fc4f8de
+++ pidgin/win32/nsis/translations/persian.nsh	608762416f80a3a63de6a0f32e40cba2b69bf3f5
@@ -34,7 +34,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"???? ???? ???TK+ ?? ?. ???? ? ? ??? ??$\r??: $(^Name) ??? ?????? ?? ??"
-!define GTK_WINDOWS_INCOMPATIBLE		"???95/98?/Me ? GTK?? 2.8.0 ??????? ?? GTK+ ${GTK_INSTALL_VERSION} ? ????.$\r ?? GTK+ ${GTK_MIN_VERSION} ????? ?? ? ????? ? ??????."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"?? ? ???????
============================================================
--- pidgin/win32/nsis/translations/portuguese-br.nsh	7e56ea489b12feef847764dff40e32eb86955f23
+++ pidgin/win32/nsis/translations/portuguese-br.nsh	e236385c6c255d3f43f939769079f24f03464424
@@ -44,7 +44,6 @@
 
 !define INSTALLER_IS_RUNNING                   "O instalador j?st?m execu?."
 !define PIDGIN_IS_RUNNING                      "Uma inst?ia do Pidgin est?m execu?. Feche o Pidgin e tente novamente."
-!define GTK_WINDOWS_INCOMPATIBLE               "O Windows 95/98/Me ?ncompat?l com o GTK+ 2.8.0 ou superior. O GTK+ ${GTK_INSTALL_VERSION} n?ser?nstalado.$\rSe voc??possuir o GTK+ vers?${GTK_MIN_VERSION} ou superior j?nstalado, o instalador ir?echar agora."
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL       "N?foi poss?l desinstalar a vers?do Pidgin que est?nstalada atualmente. A nova vers?ser?nstalada sem que a vers?antiga seja removida."
 !define URI_HANDLERS_SECTION_TITLE             "Handlers para endere?"
 !define PIDGIN_SPELLCHECK_SECTION_TITLE        "Suporte a verifica? ortogr?ca"
============================================================
--- pidgin/win32/nsis/translations/slovenian.nsh	ba0c012b72ced7d95e958a76243203c607448931
+++ pidgin/win32/nsis/translations/slovenian.nsh	853ae6451d3c34c5c2c5df8630c31a5e25683964
@@ -32,7 +32,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Name??o imate starej?o razli?o izvajalnega okolja GTK+. Jo ?elite nadgraditi?$\rOpomba: ?je ne boste nadgradili, $(^Name) morda ne bo deloval."
-!define GTK_WINDOWS_INCOMPATIBLE		"Okolja Windows 95/98/Me z GTK+ 2.8.0 ali novej?imi niso zdru?ljiva.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} ali novej?i je ?e name??, zato se bo namestitev zdaj prekinila."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi??e spletno stran Windows Pidgin"
============================================================
--- pidgin/win32/nsis/translations/trad-chinese.nsh	bd064fdad6c959279d3b1c964dd0e693ecfb4e3e
+++ pidgin/win32/nsis/translations/trad-chinese.nsh	f8146b8a16e4c83a2ff480691a2449d8e30d1b0d
@@ -34,7 +34,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"?o?{?@?????? GTK+ ???C?z?n?N??????H$\r??`?N?G?p?G?z?????A $(^Name) ?i???k???T???Q??C"
-!define GTK_WINDOWS_INCOMPATIBLE		"????? 2.8.0 ?}?l?AGTK???P Windows 95/98/Me ?w???A??e?AGTK+ ${GTK_INSTALL_VERSION} ?]???N???|?Q?w??C$\r?p?G?t????????w?g?w??? GTK+ ${GTK_MIN_VERSION} ?????????A?w??{???N??Y????
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"??Windows Pidgin ??


More information about the Commits mailing list