changeset 29097:78b17bb6da24

Remove win9x related stuff from the win32 installer
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 26 Aug 2009 03:20:05 +0000 (2009-08-26)
parents 33e36de9f83a
children 4e13885b1a6a
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
diffstat 17 files changed, 2 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.win32	Wed Aug 26 01:46:46 2009 +0000
+++ b/ChangeLog.win32	Wed Aug 26 03:20:05 2009 +0000
@@ -1,4 +1,6 @@
 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
--- a/pidgin/win32/nsis/langmacros.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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}
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 26 03:20:05 2009 +0000
@@ -1452,15 +1452,6 @@
     !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
--- a/pidgin/win32/nsis/translations/afrikaans.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/afrikaans.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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�nstalleer het nie, sal die installasie nou staak."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Besoek die WinPidgin-webblad"
--- a/pidgin/win32/nsis/translations/arabic.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/arabic.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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		"溂 頒軫冑 斈揺 範問 旻� 煤胖�"
--- a/pidgin/win32/nsis/translations/basque.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/basque.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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"
--- a/pidgin/win32/nsis/translations/english.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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"
--- a/pidgin/win32/nsis/translations/french.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -36,7 +36,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\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�centes.  GTK+ ${GTK_INSTALL_VERSION} ne sera pas install�.$\rSi vous n'avez pas install� GTK+ version ${GTK_MIN_VERSION} ou pkus r�cente, l'installation s'arr�tera."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
--- a/pidgin/win32/nsis/translations/german.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -33,7 +33,6 @@
  
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten 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"
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -33,7 +33,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"A?韲��. 踟笘� GTK+ 驕蛛� 蝎鞣 甯$\rNote: .蜍繻 赭 跼痳� 琿 赭 $(^Name)"
-!define GTK_WINDOWS_INCOMPATIBLE		"芟辮纎 95/98/鉗跟蜈� 珸齏 淏瑟蜊 �-GTK+ 2.8.0 緕鳰�. GTK+ ${GTK_INSTALL_VERSION} 赭 蜈焄�.$\r琿 珸� 跖 GTK+ ${GTK_MIN_VERSION} 緕鳰� 鈬焄�, 粐焄鞣 謦� 瀇��."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin癡� 痼煜 甯 "
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -32,7 +32,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Egy r�gi verzi�j� GTK+ futtat�k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: a Pidgin nem fog m�k�dni, ha nem friss�ti."
-!define GTK_WINDOWS_INCOMPATIBLE		"A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy �jabb v�ltozatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem ker�l telep�t�sre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy �jabb m�g nincs telep�tve, akkor a telep�t�s most megszakad."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal�nak felkeres�se"
--- a/pidgin/win32/nsis/translations/italian.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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 � incompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sar� installato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo gi� installato sul tuo computer, questa installazione sar� interrotta."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin"
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -30,7 +30,6 @@
 
 ; 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."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me yra nesuderinami su GTK+ 2.8.0 ir naujesn�mis versijomis.  GTK+ ${GTK_INSTALL_VERSION} nebus �diegta.$\rJeigu neturite �sidieg� GTK+ ${GTK_MIN_VERSION} ar naujesn�s versijos, diegimas dabar bus nutrauktas."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Pidgin tinklalap�"
--- a/pidgin/win32/nsis/translations/persian.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/persian.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -34,7 +34,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"簷励� 渭辜� 稷轂 吼売 婆冉� GTK+ �輜� 塹. 瀧� 稠轣輜 鯛 冉 廃舗覗 �輜�$\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		"斈羅 翦� �輒辟 冉 犯辟輜"
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -44,7 +44,6 @@
 
 !define INSTALLER_IS_RUNNING                   "O instalador j� est� em execu艫o."
 !define PIDGIN_IS_RUNNING                      "Uma inst�ncia do Pidgin est� em execu艫o. Feche o Pidgin e tente novamente."
-!define GTK_WINDOWS_INCOMPATIBLE               "O Windows 95/98/Me � incompat�vel com o GTK+ 2.8.0 ou superior. O GTK+ ${GTK_INSTALL_VERSION} n�o ser� instalado.$\rSe voc� n�o possuir o GTK+ vers�o ${GTK_MIN_VERSION} ou superior j� instalado, o instalador ir� fechar agora."
 !define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL       "N�o foi poss�vel desinstalar a vers�o do Pidgin que est� instalada atualmente. A nova vers�o ser� instalada sem que a vers�o antiga seja removida."
 !define URI_HANDLERS_SECTION_TITLE             "Handlers para endere�os"
 !define PIDGIN_SPELLCHECK_SECTION_TITLE        "Suporte a verifica艫o ortogr�fica"
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -32,7 +32,6 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Name��eno imate starej�o razli�ico izvajalnega okolja GTK+. Jo �elite nadgraditi?$\rOpomba: �e 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��en, zato se bo namestitev zdaj prekinila."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Pidgin"
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed Aug 26 01:46:46 2009 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed Aug 26 03:20:05 2009 +0000
@@ -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��L�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} ���s��セ�A�w庫�{Α�N�H�Y飢��C"
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"��X Windows Pidgin 柵Ⅱ"