changeset 7572:6300424eafbf

[gaim-migrate @ 8188] Update installer for gaim language macros committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Wed, 19 Nov 2003 22:43:22 +0000 (2003-11-19)
parents 0ada95df88ec
children 4a5260423505
files gaim-installer.nsi src/win32/nsis/translations/bulgarian.nsh src/win32/nsis/translations/dutch.nsh src/win32/nsis/translations/english.nsh src/win32/nsis/translations/french.nsh src/win32/nsis/translations/german.nsh src/win32/nsis/translations/hungarian.nsh src/win32/nsis/translations/italian.nsh src/win32/nsis/translations/korean.nsh src/win32/nsis/translations/portuguese-br.nsh src/win32/nsis/translations/portuguese.nsh src/win32/nsis/translations/romanian.nsh src/win32/nsis/translations/serbian-latin.nsh src/win32/nsis/translations/simp-chinese.nsh src/win32/nsis/translations/swedish.nsh src/win32/nsis/translations/trad-chinese.nsh
diffstat 16 files changed, 411 insertions(+), 447 deletions(-) [+]
line wrap: on
line diff
--- a/gaim-installer.nsi	Wed Nov 19 22:37:19 2003 +0000
+++ b/gaim-installer.nsi	Wed Nov 19 22:43:22 2003 +0000
@@ -136,21 +136,25 @@
 ;--------------------------------
 ;Translations
 
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\english.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\german.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\dutch.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\french.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\hungarian.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\italian.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\swedish.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\korean.nsh"
-  !include "${GAIM_NSIS_INCLUDE_PATH}\translations\romanian.nsh"
+  !define GAIM_DEFAULT_LANGFILE "${GAIM_NSIS_INCLUDE_PATH}\translations\english.nsh"
+
+  !include "${GAIM_NSIS_INCLUDE_PATH}\langmacros.nsh"
+
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ENGLISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\english.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "GERMAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\german.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "DUTCH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\dutch.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "FRENCH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\french.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SIMPCHINESE"	"${GAIM_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SERBIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "PORTUGUESEBR"	"${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "PORTUGUESE"		"${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "HUNGARIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\hungarian.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ITALIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\italian.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "BULGARIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SWEDISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\swedish.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "TRADCHINESE"	"${GAIM_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "KOREAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\korean.nsh"
+  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ROMANIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\romanian.nsh"
 
 ;--------------------------------
 ;Reserve Files
@@ -1068,6 +1072,7 @@
 
 ; Page enter and exit functions..
 
+!ifdef WITH_GTK
 Function preGtkDirPage
   Call DoWeNeedGtk
   Pop $0
@@ -1116,6 +1121,7 @@
     Abort
   done:
 FunctionEnd
+!endif
 
 ; GetParameters
 ; input, none
--- a/src/win32/nsis/translations/bulgarian.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/bulgarian.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,44 +9,39 @@
 
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_BULGARIAN} "GTK+ runtime 謌闡矗 蓚� 鴃�痰� 籥 癩粤 釶邇矼轢.$\r野� 蓁髓琺蒡珸鱚 矼韵� v${GTK_VERSION} 蓚� 闔-邇矗"
+!define GTK_INSTALLER_NEEDED			"GTK+ runtime 謌闡矗 蓚� 鴃�痰� 籥 癩粤 釶邇矼轢.$\r野� 蓁髓琺蒡珸鱚 矼韵� v${GTK_VERSION} 蓚� 闔-邇矗"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_BULGARIAN} "Gaim 暮蒹迺 艢 霜韃� 劒釶奛辷� (蒟蔡裄� 驟)"
-LangString GTK_SECTION_TITLE				${LANG_BULGARIAN} "GTK+ Runtime 剞繖� (required)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_BULGARIAN} "GTK+ 吶跏"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_BULGARIAN} "槽� 吶赭"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_BULGARIAN} "Wimp 吶赭"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_BULGARIAN} "Bluecurve 吶赭"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_BULGARIAN} "Light House Blue 吶赭"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_BULGARIAN} "壜蜍鈞� 轢 �粽銜� 轢 Gaim � 瘉瘠蓆鱚褂"
-LangString GTK_SECTION_DESCRIPTION			${LANG_BULGARIAN} "約謦蓖諤鶯鉋纃 褂� 艢 竦瑣蔟纃 蒟站繖, 蒟闔諛矗� 銜 Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_BULGARIAN} "GTK+ 鱚跏鱚 跪窶� 籥 關鉤纃�� 泌站繖� 轢 GTK+ 關蓚鈕纃�."
-LangString GTK_NO_THEME_DESC				${LANG_BULGARIAN} "羅 蓁髓琺蒡珸鱚 GTK+ 鱚赭"
-LangString GTK_WIMP_THEME_DESC			${LANG_BULGARIAN} "GTK-Wimp (Windows impersonator) � GTK 鱚赭 褌�鴈 驟 骭繿矗 粮瘰� 髫� Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_BULGARIAN} "Bluecurve 鱚赭鰰."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_BULGARIAN} "Lighthouseblue 鱚赭鰰."
+!define GAIM_SECTION_TITLE			"Gaim 暮蒹迺 艢 霜韃� 劒釶奛辷� (蒟蔡裄� 驟)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime 剞繖� (required)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ 吶跏"
+!define GTK_NOTHEME_SECTION_TITLE		"槽� 吶赭"
+!define GTK_WIMP_SECTION_TITLE		"Wimp 吶赭"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve 吶赭"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue 吶赭"
+!define GAIM_SECTION_DESCRIPTION		"壜蜍鈞� 轢 �粽銜� 轢 Gaim � 瘉瘠蓆鱚褂"
+!define GTK_SECTION_DESCRIPTION		"約謦蓖諤鶯鉋纃 褂� 艢 竦瑣蔟纃 蒟站繖, 蒟闔諛矗� 銜 Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ 鱚跏鱚 跪窶� 籥 關鉤纃�� 泌站繖� 轢 GTK+ 關蓚鈕纃�."
+!define GTK_NO_THEME_DESC			"羅 蓁髓琺蒡珸鱚 GTK+ 鱚赭"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � GTK 鱚赭 褌�鴈 驟 骭繿矗 粮瘰� 髫� Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurve 鱚赭鰰."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue 鱚赭鰰."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_BULGARIAN} "泌痳鞳鱚 �髓� 轢 蓁髓琺瑶�鰰"
-LangString GTK_PAGE_SUBTITLE				${LANG_BULGARIAN} "悲辮纈� 閠闃� 艢 蓁髓琺蒡琿� 轢 GTK+"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_BULGARIAN} "Setup 奛 蓁髓琺蒡� GTK+ � 驪繖迺瑩� 閠闃�"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_BULGARIAN} "楳 籥 蓁髓琺蒡瑩� � 粽黹� 閠闍�, 轢鱶骰纈� Browse � 蒟痳鞳鱚 粽黹� 閠闍�. 沃鱶骰纈� Next 艢 籥 關鈔渧肆鱚."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_BULGARIAN} "Setup 奛 釶邇礦 GTK+ � 驪繖轢鰰 閠闃�"
-LangString GTK_UPGRADE_PROMPT				${LANG_BULGARIAN} "剪瑁� 矼韵� GTK+ runtime � 銜褓蓿�. 費袱鱚 謌 籥 釶邇礦鱚?$\rNote: Gaim 跪聽 籥 辣 髏珀銜� 琲� 辣 竡 轢關珥蓿�."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"剪瑁� 矼韵� GTK+ runtime � 銜褓蓿�. 費袱鱚 謌 籥 釶邇礦鱚?$\rNote: Gaim 跪聽 籥 辣 髏珀銜� 琲� 辣 竡 轢關珥蓿�."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_BULGARIAN} "Gaim (騾跪 關繻瑪矗辣)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_BULGARIAN} "退�鰰 髓瑁� Gaim 粫鞳褞鉋� 奛 癩粤 蒟鴃蓿�. 費袱鱚 謌 籥 關鈔渧肆鱚?$\r$\r楳痳諷肛�: 托蔟褂 辣髓琿籥頏辷 粮痼礪� 褌蓿� 髓� 蓁髓琺蒡琺� 奛 癩籥� 蒟鴃蓿�.$\r沃髓韲蜉蓿� 轢 Gaim �赭 籥 癩籥� 闔硅�辷."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_BULGARIAN} "呈鞳褞鉋�鰰 褌�鴈 蒟瘰瑪鱚 髫奛髓碵矗. 托蔟褌 褌纈� � � 辣�$\r奛 癩粤 蒟鴃蓿�. 薙諤纈� 謌 籥 關鈔渧肆鱚?"
+!define GAIM_UNINSTALL_DESC			"Gaim (騾跪 關繻瑪矗辣)"
+!define GAIM_PROMPT_WIPEOUT			"退�鰰 髓瑁� Gaim 粫鞳褞鉋� 奛 癩粤 蒟鴃蓿�. 費袱鱚 謌 籥 關鈔渧肆鱚?$\r$\r楳痳諷肛�: 托蔟褂 辣髓琿籥頏辷 粮痼礪� 褌蓿� 髓� 蓁髓琺蒡琺� 奛 癩籥� 蒟鴃蓿�.$\r沃髓韲蜉蓿� 轢 Gaim �赭 籥 癩籥� 闔硅�辷."
+!define GAIM_PROMPT_DIR_EXISTS		"呈鞳褞鉋�鰰 褌�鴈 蒟瘰瑪鱚 髫奛髓碵矗. 托蔟褌 褌纈� � � 辣�$\r奛 癩粤 蒟鴃蓿�. 薙諤纈� 謌 籥 關鈔渧肆鱚?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_BULGARIAN} "註纔袱 關� 蓁髓琺蒡琿� 轢 GTK+ runtime."
-LangString GTK_BAD_INSTALL_PATH			${LANG_BULGARIAN} "諾矼粤辷�� 陏� 辣 跪聽 籥 癩粤 粮髓澵纃 蓚� 髫舮珞纃."
+!define GTK_INSTALL_ERROR			"註纔袱 關� 蓁髓琺蒡琿� 轢 GTK+ runtime."
+!define GTK_BAD_INSTALL_PATH			"諾矼粤辷�� 陏� 辣 跪聽 籥 癩粤 粮髓澵纃 蓚� 髫舮珞纃."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_BULGARIAN} "�赭鱚 關珥� 艢 籥 蓁髓琺蒡瑩� GTK+ 鱚赭."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"�赭鱚 關珥� 艢 籥 蓁髓琺蒡瑩� GTK+ 鱚赭."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_BULGARIAN} "偵蔡鰰諤鴈� 辣 跪聽 籥 轢跂韆 艢闊驤 � 鞳竏髓濵� 艢 Gaim.$\r代韲�鴉� � 瘉� 蓁髓琺蒡琿 銜 粽黹 闔鴃縺蓿繼."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_BULGARIAN} "�赭鱚 關珥� 籥 粤蓁髓琺蒡瑩� 鰰艾 關釿鞐赭."
+!define un.GAIM_UNINSTALL_ERROR_1         "偵蔡鰰諤鴈� 辣 跪聽 籥 轢跂韆 艢闊驤 � 鞳竏髓濵� 艢 Gaim.$\r代韲�鴉� � 瘉� 蓁髓琺蒡琿 銜 粽黹 闔鴃縺蓿繼."
+!define un.GAIM_UNINSTALL_ERROR_2         "�赭鱚 關珥� 籥 粤蓁髓琺蒡瑩� 鰰艾 關釿鞐赭."
--- a/src/win32/nsis/translations/dutch.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/dutch.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,46 +9,46 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_DUTCH} "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
+!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving"
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_DUTCH} "Volgende >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_DUTCH} "$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
+!define GAIM_LICENSE_BUTTON			"Volgende >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_DUTCH} "Gaim Instant Messaging Client (vereist)"
-LangString GTK_SECTION_TITLE				${LANG_DUTCH} "GTK+ runtime-omgeving (vereist)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_DUTCH} "GTK+ thema's"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_DUTCH} "Geen thema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_DUTCH} "Wimp thema"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_DUTCH} "Bluecurve thema"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_DUTCH} "Light House Blue thema"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_DUTCH} "Gaim hoofdbestanden en dlls"
-LangString GTK_SECTION_DESCRIPTION			${LANG_DUTCH} "Een multi-platform gebruikersinterface, gebruikt door Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_DUTCH} "GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's."
-LangString GTK_NO_THEME_DESC				${LANG_DUTCH} "Geen GTK+ thema installeren"
-LangString GTK_WIMP_THEME_DESC			${LANG_DUTCH} "GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_DUTCH} "Het Bluecurve thema (standaardthema voor RedHat Linux)."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_DUTCH} "Het Lighthouseblue thema."
+!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (vereist)"
+!define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ thema's"
+!define GTK_NOTHEME_SECTION_TITLE		"Geen thema"
+!define GTK_WIMP_SECTION_TITLE		"Wimp thema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve thema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue thema"
+!define GAIM_SECTION_DESCRIPTION		"Gaim hoofdbestanden en dlls"
+!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's."
+!define GTK_NO_THEME_DESC			"Geen GTK+ thema installeren"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving."
+!define GTK_BLUECURVE_THEME_DESC		"Het Bluecurve thema (standaardthema voor RedHat Linux)."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Het Lighthouseblue thema."
 
 ; GTK+ Directory Page
-LangString GTK_UPGRADE_PROMPT				${LANG_DUTCH} "Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: Gaim werkt misschien niet als u dit niet doet."
+!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: Gaim werkt misschien niet als u dit niet doet."
 
 ; Installer Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_DUTCH} "Neem een kijkje op de Windows Gaim webpagina"
+!define GAIM_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Gaim webpagina"
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_DUTCH} "Gaim (alleen verwijderen)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_DUTCH} "Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf ge�nstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_DUTCH} "De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
+!define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
+!define GAIM_PROMPT_WIPEOUT			"Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf ge�nstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
+!define GAIM_PROMPT_DIR_EXISTS		"De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_DUTCH} "Fout bij installatie van GTK+ runtime omgeving."
-LangString GTK_BAD_INSTALL_PATH			${LANG_DUTCH} "Het door u gegeven pad kan niet benaderd worden."
+!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."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_DUTCH} "U heeft geen toestemming om een GTK+ thema te installeren."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_DUTCH} "De uninstaller kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_DUTCH} "U mag dit programma niet verwijderen."
+!define un.GAIM_UNINSTALL_ERROR_1         "De uninstaller kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
+!define un.GAIM_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
--- a/src/win32/nsis/translations/english.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/english.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -7,47 +7,50 @@
 ;;  Version 2
 ;;
 
+; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when updating this file
+
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_ENGLISH} "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_ENGLISH} "Next >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_ENGLISH} "$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON			"Next >"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GPL license. The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_ENGLISH} "Gaim Instant Messaging Client (required)"
-LangString GTK_SECTION_TITLE				${LANG_ENGLISH} "GTK+ Runtime Environment (required)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_ENGLISH} "GTK+ Themes"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_ENGLISH} "No Theme"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_ENGLISH} "Wimp Theme"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_ENGLISH} "Bluecurve Theme"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_ENGLISH} "Light House Blue Theme"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_ENGLISH} "Core Gaim files and dlls"
-LangString GTK_SECTION_DESCRIPTION			${LANG_ENGLISH} "A multi-platform GUI toolkit, used by Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_ENGLISH} "GTK+ Themes can change the look and feel of GTK+ applications."
-LangString GTK_NO_THEME_DESC				${LANG_ENGLISH} "Don't install a GTK+ theme"
-LangString GTK_WIMP_THEME_DESC			${LANG_ENGLISH} "GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_ENGLISH} "The Bluecurve theme."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_ENGLISH} "The Lighthouseblue theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (required)"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE		"GTK+ Themes"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE		"Wimp Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE	"Bluecurve Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION		"Core Gaim files and dlls"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
 ; GTK+ Directory Page
-LangString GTK_UPGRADE_PROMPT				${LANG_ENGLISH} "An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do."
 
 ; Installer Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_ENGLISH} "Visit the Windows Gaim Web Page"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_FINISH_VISIT_WEB_SITE		"Visit the Windows Gaim Web Page"
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_ENGLISH} "Gaim (remove only)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_ENGLISH} "Your old Gaim directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGaim user settings will not be affected."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_ENGLISH} "The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_UNINSTALL_DESC			"Gaim (remove only)"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_WIPEOUT			"Your old Gaim directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGaim user settings will not be affected."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_ENGLISH} "Error installing GTK+ runtime."
-LangString GTK_BAD_INSTALL_PATH			${LANG_ENGLISH} "The path you entered can not be accessed or created."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_ENGLISH} "You do not have permission to install a GTK+ theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS	"You do not have permission to install a GTK+ theme."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_ENGLISH} "The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_ENGLISH} "You do not have permission to uninstall this application."
+!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_1         "The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."
+!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_2         "You do not have permission to uninstall this application."
--- a/src/win32/nsis/translations/french.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/french.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,47 +9,47 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_FRENCH} "Les biblioth�ques de l'environnement GTK+ ne sont pas install�es ou n�cessitent une mise � jour.$\rVeuillez installer les biblioth�ques GTK+ v${GTK_VERSION} ou plus r�centes."
+!define GTK_INSTALLER_NEEDED			"Les biblioth�ques de l'environnement GTK+ ne sont pas install�es ou n�cessitent une mise � jour.$\rVeuillez installer les biblioth�ques GTK+ v${GTK_VERSION} ou plus r�centes."
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_FRENCH} "Suivant >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_FRENCH} "$(^Name) est disponible sous licence GPL. Le texte de licence suivant est fourni uniquement � titre informatif. $_CLICK" 
+!define GAIM_LICENSE_BUTTON			"Suivant >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GPL. Le texte de licence suivant est fourni uniquement � titre informatif. $_CLICK" 
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_FRENCH} "Gaim messagerie instantan�e (obligatoire)"
-LangString GTK_SECTION_TITLE				${LANG_FRENCH} "Biblioth�ques GTK+ (obligatoire)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_FRENCH} "Th�mes GTK+"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_FRENCH} "Pas de th�me"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_FRENCH} "Th�me Wimp"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_FRENCH} "Th�me Bluecurve"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_FRENCH} "Th�me Light House Blue"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_FRENCH} "Fichiers et DLLs de base de Gaim"
-LangString GTK_SECTION_DESCRIPTION			${LANG_FRENCH} "A multi-platform GUI toolkit, used by Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_FRENCH} "Les th�mes GTK+ permettent de changer l'aspect des applications GTK+."
-LangString GTK_NO_THEME_DESC				${LANG_FRENCH} "Ne pas installer de th�me GTK+"
-LangString GTK_WIMP_THEME_DESC			${LANG_FRENCH} "GTK-Wimp (imitateur de Windows) est un th�me de GTK+ qui se fond dans l'environnement graphique de Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_FRENCH} "Th�me Bluecurve"
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_FRENCH} "Th�me Lighthouseblue"
+!define GAIM_SECTION_TITLE			"Gaim messagerie instantan�e (obligatoire)"
+!define GTK_SECTION_TITLE			"Biblioth�ques GTK+ (obligatoire)"
+!define GTK_THEMES_SECTION_TITLE		"Th�mes GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Pas de th�me"
+!define GTK_WIMP_SECTION_TITLE		"Th�me Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Th�me Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Th�me Light House Blue"
+!define GAIM_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Gaim"
+!define GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"Les th�mes GTK+ permettent de changer l'aspect des applications GTK+."
+!define GTK_NO_THEME_DESC			"Ne pas installer de th�me GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitateur de Windows) est un th�me de GTK+ qui se fond dans l'environnement graphique de Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Th�me Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Th�me Lighthouseblue"
 
 ; GTK+ Dir Selector Page
-LangString GTK_UPGRADE_PROMPT				${LANG_FRENCH} "Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\rNote : Gaim peut ne pas fonctionner sans cela."
+!define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\rNote : Gaim peut ne pas fonctionner sans cela."
 
 ; Installer Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_FRENCH} "Visitez la page web de Gaim Windows" 
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visitez la page web de Gaim Windows" 
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_FRENCH} "Gaim (supprimer uniquement)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_FRENCH} "L'ancien r�pertoire de Gaim va �tre supprim�. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez install�s seront aussi supprim�s.$\rLes configurations des utilisateurs de Gaim ne sont pas touch�s."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_FRENCH} "Le r�pertoire d'installation existe d�j�. Son contenu sera effac�.$\rVoulez-vous continuer ?"
+!define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
+!define GAIM_PROMPT_WIPEOUT			"L'ancien r�pertoire de Gaim va �tre supprim�. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez install�s seront aussi supprim�s.$\rLes configurations des utilisateurs de Gaim ne sont pas touch�s."
+!define GAIM_PROMPT_DIR_EXISTS		"Le r�pertoire d'installation existe d�j�. Son contenu sera effac�.$\rVoulez-vous continuer ?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_FRENCH} "Erreur lors de l'installation des biblioth�ques GTK+"
-LangString GTK_BAD_INSTALL_PATH			${LANG_FRENCH} "Le r�pertoire d'installation ne peut pas �tre cr蜑 ou n'est pas accessible."
+!define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth�ques GTK+"
+!define GTK_BAD_INSTALL_PATH			"Le r�pertoire d'installation ne peut pas �tre cr蜑 ou n'est pas accessible."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_FRENCH} "Vous n'avez pas les permissions pour installer un th�me GTK+"
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un th�me GTK+"
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_FRENCH} "Les clefs de Gaim n'ont pas �t� trouv�es dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_FRENCH} "Vous n'avez pas les permissions pour supprimer cette application."
+!define un.GAIM_UNINSTALL_ERROR_1         "Les clefs de Gaim n'ont pas �t� trouv�es dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
+!define un.GAIM_UNINSTALL_ERROR_2         "Vous n'avez pas les permissions pour supprimer cette application."
 
--- a/src/win32/nsis/translations/german.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/german.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_GERMAN} "Die GTK+ Runtime Umgebung ist entweder nicht vorhanden oder sollte aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder h�her der GTK+ Runtime"
+!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung ist entweder nicht vorhanden oder sollte aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder h�her der GTK+ Runtime"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_GERMAN} "Gaim Instant Messaging Client (erforderlich)"
-LangString GTK_SECTION_TITLE				${LANG_GERMAN} "GTK+ Runtime Umgebung (erforderlich)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_GERMAN} "GTK+ Themen"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_GERMAN} "Kein Thema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_GERMAN} "Wimp Thema"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_GERMAN} "Bluecurve Thema"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_GERMAN} "Light House Blue Thema"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_GERMAN} "Gaim Basis-Dateien und -DLLs"
-LangString GTK_SECTION_DESCRIPTION			${LANG_GERMAN} "Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_GERMAN} "GTK+ Themen k�nnen Aussehen und Bedienung von GTK+ Anwendungen ver�ndern."
-LangString GTK_NO_THEME_DESC				${LANG_GERMAN} "Installiere kein GTK+ Thema"
-LangString GTK_WIMP_THEME_DESC			${LANG_GERMAN} "GTK-Wimp (Windows Imitator) ist ein GTK Theme, da� sich besonders gut in den Windows Desktop integriert."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_GERMAN} "Das Bluecurve Thema."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_GERMAN} "Das Lighthouseblue Thema."
+!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (erforderlich)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ Themen"
+!define GTK_NOTHEME_SECTION_TITLE		"Kein Thema"
+!define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
+!define GAIM_SECTION_DESCRIPTION		"Gaim Basis-Dateien und -DLLs"
+!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen k�nnen Aussehen und Bedienung von GTK+ Anwendungen ver�ndern."
+!define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, da� sich besonders gut in den Windows Desktop integriert."
+!define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_GERMAN} "W�hlen Sie den Installationsort"
-LangString GTK_PAGE_SUBTITLE				${LANG_GERMAN} "W�hlen Sie den Ordner, indem Sie GTK+ installieren"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_GERMAN} "Das Setup wird GTK+ in den folgenden Ordner installieren"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_GERMAN} "Um in einen anderen Ordner zu installieren, klicken Sie auf Durchsuchen und w�hlen Sie einen anderen Ordner. Klicken Sie Weiter zum Fortfahren."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_GERMAN} "Das Setup wird GTK+, gefunden im folgenden Ordner, aktualisieren"
-LangString GTK_UPGRADE_PROMPT				${LANG_GERMAN} "Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_GERMAN} "Gaim (nur entfernen)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_GERMAN} "Ihre altes Gaim-Verzeichnis soll gel�scht werden. M�chten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgel�scht. Gaim-Benutzereinstellungen sind nicht betroffen."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_GERMAN} "Das Installationsverzeichnis, da� Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gel�scht. M�chten Sie fortfahren?"
+!define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
+!define GAIM_PROMPT_WIPEOUT			"Ihre altes Gaim-Verzeichnis soll gel�scht werden. M�chten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgel�scht. Gaim-Benutzereinstellungen sind nicht betroffen."
+!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, da� Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gel�scht. M�chten Sie fortfahren?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_GERMAN} "Fehler beim Installieren der GTK+ Runtime."
-LangString GTK_BAD_INSTALL_PATH			${LANG_GERMAN} "Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
+!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."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_GERMAN} "Sie haben keine Berechtigung, um ein GTK+ Theme zu installieren."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Sie haben keine Berechtigung, um ein GTK+ Theme zu installieren."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_GERMAN} "Der Deinstaller konnte keine Registrierungsshl�ssel f�r Gaim finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendunng installiert hat."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_GERMAN} "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
+!define un.GAIM_UNINSTALL_ERROR_1         "Der Deinstaller konnte keine Registrierungsshl�ssel f�r Gaim finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendunng installiert hat."
+!define un.GAIM_UNINSTALL_ERROR_2         "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
--- a/src/win32/nsis/translations/hungarian.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/hungarian.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_HUNGARIAN} "A GTK+ futtat� k�rnyezet hi�nyzik vagy �jabb verzi� sz�ks�ges.$\rK�rem install�lja a v${GTK_VERSION} vagy magasabb verzi�j� GTK+ futtat� k�rnyezetet."
+!define GTK_INSTALLER_NEEDED			"A GTK+ futtat� k�rnyezet hi�nyzik vagy �jabb verzi� sz�ks�ges.$\rK�rem install�lja a v${GTK_VERSION} vagy magasabb verzi�j� GTK+ futtat� k�rnyezetet."
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_HUNGARIAN} "Gaim IM kliens (sz�ks�ges)"
-LangString GTK_SECTION_TITLE				${LANG_HUNGARIAN} "GTK+ futtat� k�rnyezet (sz�ks�ges)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_HUNGARIAN} "GTK+ t�m�k"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_HUNGARIAN} "Nincs t�ma"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_HUNGARIAN} "Wimp t�ma"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_HUNGARIAN} "Bluecurve t�ma"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_HUNGARIAN} "Light House Blue t�ma"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_HUNGARIAN} "Gaim f�jlok �s dll-ek"
-LangString GTK_SECTION_DESCRIPTION			${LANG_HUNGARIAN} "Gaim �ltal haszn�lt t�bb-platformos grafikus k�rnyezet"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_HUNGARIAN} "GTK+ t�m�k megv�ltoztatj�k a GTK+ alkalmaz�sok kin�zet�t."
-LangString GTK_NO_THEME_DESC				${LANG_HUNGARIAN} "Ne install�lja a GTK+ t�m�kat"
-LangString GTK_WIMP_THEME_DESC			${LANG_HUNGARIAN} "GTK-Wimp (Windows ut�nzat) egy Windows k�rnyezettel harmoniz�l� GTK t�ma."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_HUNGARIAN} "A Bluecurve t�ma."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_HUNGARIAN} "A Lighthouseblue t�ma."
+!define GAIM_SECTION_TITLE			"Gaim IM kliens (sz�ks�ges)"
+!define GTK_SECTION_TITLE			"GTK+ futtat� k�rnyezet (sz�ks�ges)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ t�m�k"
+!define GTK_NOTHEME_SECTION_TITLE		"Nincs t�ma"
+!define GTK_WIMP_SECTION_TITLE		"Wimp t�ma"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve t�ma"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue t�ma"
+!define GAIM_SECTION_DESCRIPTION		"Gaim f�jlok �s dll-ek"
+!define GTK_SECTION_DESCRIPTION		"Gaim �ltal haszn�lt t�bb-platformos grafikus k�rnyezet"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ t�m�k megv�ltoztatj�k a GTK+ alkalmaz�sok kin�zet�t."
+!define GTK_NO_THEME_DESC			"Ne install�lja a GTK+ t�m�kat"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows ut�nzat) egy Windows k�rnyezettel harmoniz�l� GTK t�ma."
+!define GTK_BLUECURVE_THEME_DESC		"A Bluecurve t�ma."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"A Lighthouseblue t�ma."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_HUNGARIAN} "Telep�t�s hely�nek kiv�laszt�sa"
-LangString GTK_PAGE_SUBTITLE				${LANG_HUNGARIAN} "V�lassza ki azt a k�nyvt�rat ahova a GTK+ k�v�nja telep�teni"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_HUNGARIAN} "A telep�t� a k�vetkez� k�nyvt�rba fogja telep�teni a GTK+"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_HUNGARIAN} "M�sik k�nyvt�rba telep�t�shez kattintson a Tall�z gombra �s v�lasszon egy m�sik k�nyvt�rat. Kattintson a Tov�bb gombra."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_HUNGARIAN} "A telep�t� friss�teni fogja a GTK+, melyet a k�vetkez� k�nyvt�rban tal�lt"
-LangString GTK_UPGRADE_PROMPT				${LANG_HUNGARIAN} "Egy r�gi verzi�j� GTK+ futtat� k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: Gaim val�sz�n�leg nem fog m�k�dni amig nem friss�ti."
+; 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: Gaim val�sz�n�leg nem fog m�k�dni amig nem friss�ti."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_HUNGARIAN} "Gaim (csak elt�vol�t�s)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_HUNGARIAN} "Az �n kor�bbi Gaim k�nyvt�ra t�rl�dni fog. Folytatni szeretn�?$\r$\rMegjegyz�s: Minden �n �ltal telep�tett plugin t�rl�dni fog.$\rGaim felhaszn�l�i be�ll�t�sokat ez nem �rinti."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_HUNGARIAN} "A telep�t�skor megadott k�nyvt�r m�r l�tezik. Minden �llom�ny t�rl�dni fog.$\rFolytatni szeretn�?"
+!define GAIM_UNINSTALL_DESC			"Gaim (csak elt�vol�t�s)"
+!define GAIM_PROMPT_WIPEOUT			"Az �n kor�bbi Gaim k�nyvt�ra t�rl�dni fog. Folytatni szeretn�?$\r$\rMegjegyz�s: Minden �n �ltal telep�tett plugin t�rl�dni fog.$\rGaim felhaszn�l�i be�ll�t�sokat ez nem �rinti."
+!define GAIM_PROMPT_DIR_EXISTS		"A telep�t�skor megadott k�nyvt�r m�r l�tezik. Minden �llom�ny t�rl�dni fog.$\rFolytatni szeretn�?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_HUNGARIAN} "Hiba a GTK+ futtat� telep�t�se k�zben."
-LangString GTK_BAD_INSTALL_PATH			${LANG_HUNGARIAN} "A megadott el�r�si �t nem el�rhet� vagy nem hozhat� l�tre."
+!define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat� telep�t�se k�zben."
+!define GTK_BAD_INSTALL_PATH			"A megadott el�r�si �t nem el�rhet� vagy nem hozhat� l�tre."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_HUNGARIAN} "Nincs jogosults�ga a GTK+ t�m�k telep�t�s�hez."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosults�ga a GTK+ t�m�k telep�t�s�hez."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_HUNGARIAN} "Az elt�vol�t� nem tal�lt Gaim registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_HUNGARIAN} "Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
+!define un.GAIM_UNINSTALL_ERROR_1         "Az elt�vol�t� nem tal�lt Gaim registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
+!define un.GAIM_UNINSTALL_ERROR_2         "Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
--- a/src/win32/nsis/translations/italian.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/italian.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,46 +9,46 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_ITALIAN} "L'ambiente di runtime GTK+ non � presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_VERSION} o maggiore"
+!define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non � presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_VERSION} o maggiore"
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_ITALIAN} "Avanti >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_ITALIAN} "$(^Name) � distribuito sotto licenza GPL. La licenza � mostrata qui solamente a scopo informativo. $_CLICK" 
+!define GAIM_LICENSE_BUTTON			"Avanti >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) � distribuito sotto licenza GPL. La licenza � mostrata qui solamente a scopo informativo. $_CLICK" 
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_ITALIAN} "Gaim - Client per Messaggi Immediati (richiesto)"
-LangString GTK_SECTION_TITLE				${LANG_ITALIAN} "Ambiente di Runtime GTK+ (richiesto)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_ITALIAN} "Temi GTK+"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_ITALIAN} "Nessun Tema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_ITALIAN} "Tema Wimp"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_ITALIAN} "Tema Bluecurve"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_ITALIAN} "Tema Light House Blue"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_ITALIAN} "File principali di Gaim e dll"
-LangString GTK_SECTION_DESCRIPTION			${LANG_ITALIAN} "Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_ITALIAN} "I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
-LangString GTK_NO_THEME_DESC				${LANG_ITALIAN} "Non installare nessun tema GTK+"
-LangString GTK_WIMP_THEME_DESC			${LANG_ITALIAN} "GTK-Wimp (Windows impersonator) � un tema GTK che si adatta bene all'aspetto di Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_ITALIAN} "Il tema Bluecurve."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_ITALIAN} "Il tema Lighthouseblue."
+!define GAIM_SECTION_TITLE			"Gaim - Client per Messaggi Immediati (richiesto)"
+!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
+!define GTK_THEMES_SECTION_TITLE		"Temi GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Nessun Tema"
+!define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
+!define GAIM_SECTION_DESCRIPTION		"File principali di Gaim e dll"
+!define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
+!define GTK_NO_THEME_DESC			"Non installare nessun tema GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � un tema GTK che si adatta bene all'aspetto di Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Il tema Bluecurve."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Il tema Lighthouseblue."
 
 ; GTK+ Directory Page
-LangString GTK_UPGRADE_PROMPT				${LANG_ITALIAN} "� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: Gaim potrebbe non funzionare senza l'aggiornamento."
+!define GTK_UPGRADE_PROMPT			"� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: Gaim potrebbe non funzionare senza l'aggiornamento."
 
 ; Installer Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_ITALIAN} "Visita la pagina web di Gaim per Windows" 
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Gaim per Windows" 
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_ITALIAN} "Gaim (solo rimozione)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_ITALIAN} "La tua vecchia directory di Gaim sta per essere cancellata. Vuoi andare avanti?$\r$\rNota: Tutti i plugin non standard che hai installato saranno cancellati.$\rLe impostazioni di Gaim non saranno rimosse."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_ITALIAN} "La directory di installazione specificata esiste gi�. Tutto il contenuto$\rverr� cancellato. Vuoi continuare?"
+!define GAIM_UNINSTALL_DESC			"Gaim (solo rimozione)"
+!define GAIM_PROMPT_WIPEOUT			"La tua vecchia directory di Gaim sta per essere cancellata. Vuoi andare avanti?$\r$\rNota: Tutti i plugin non standard che hai installato saranno cancellati.$\rLe impostazioni di Gaim non saranno rimosse."
+!define GAIM_PROMPT_DIR_EXISTS		"La directory di installazione specificata esiste gi�. Tutto il contenuto$\rverr� cancellato. Vuoi continuare?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_ITALIAN} "Errore di installazione di GTK+."
-LangString GTK_BAD_INSTALL_PATH			${LANG_ITALIAN} "Il percorso scelto non pu� essere raggiunto o creato."
+!define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
+!define GTK_BAD_INSTALL_PATH			"Il percorso scelto non pu� essere raggiunto o creato."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_ITALIAN} "Non hai il permesso per installare un tema GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Non hai il permesso per installare un tema GTK+."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_ITALIAN} "Il programma di rimozione non � in grado di trovare le voci di registro per Gaim.$\rProbabilmente un altro utente ha installato questa applicazione."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_ITALIAN} "Non hai il permesso per rimuovere questa applicazione."
+!define un.GAIM_UNINSTALL_ERROR_1         "Il programma di rimozione non � in grado di trovare le voci di registro per Gaim.$\rProbabilmente un altro utente ha installato questa applicazione."
+!define un.GAIM_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
--- a/src/win32/nsis/translations/korean.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/korean.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_KOREAN} "GTK+ 訓展績 発井拭 庚薦亜 赤暗蟹 穣益傾戚球亜 琶推杯艦陥.$\rGTK+ 訓展績 発井聖 v${GTK_VERSION}戚蟹 益 戚雌 獄穿生稽 竺帖背爽室推."
+!define GTK_INSTALLER_NEEDED			"GTK+ 訓展績 発井拭 庚薦亜 赤暗蟹 穣益傾戚球亜 琶推杯艦陥.$\rGTK+ 訓展績 発井聖 v${GTK_VERSION}戚蟹 益 戚雌 獄穿生稽 竺帖背爽室推."
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_KOREAN} "亜績 五重煽 (琶呪)"
-LangString GTK_SECTION_TITLE				${LANG_KOREAN} "GTK+ 訓展績 発井 (琶呪)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_KOREAN} "GTK+ 砺原"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_KOREAN} "砺原 蒸製"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_KOREAN} "姓覗 砺原"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_KOREAN} "鷺欠朕崎 砺原"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_KOREAN} "Light House Blue 砺原"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_KOREAN} "亜績税 坪嬢 督析引 dll"
-LangString GTK_SECTION_DESCRIPTION			${LANG_KOREAN} "亜績戚 紫遂馬澗 菰銅 巴熊廿 GUI 祷填"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_KOREAN} "GTK+ 砺原澗 GTK+ 覗稽益轡税 決裳琶聖 郊蝦 呪 赤柔艦陥."
-LangString GTK_NO_THEME_DESC				${LANG_KOREAN} "GTK+ 砺原研 竺帖馬走 省柔艦陥."
-LangString GTK_WIMP_THEME_DESC			${LANG_KOREAN} "GTK-Wimp (Windows impersonator)澗 制亀酔 汽什滴転 発井拭 設 繕鉢鞠澗 GTK 砺原脊艦陥."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_KOREAN} "鷺欠朕崎 砺原."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_KOREAN} "The Lighthouseblue theme."
+!define GAIM_SECTION_TITLE			"亜績 五重煽 (琶呪)"
+!define GTK_SECTION_TITLE			"GTK+ 訓展績 発井 (琶呪)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ 砺原"
+!define GTK_NOTHEME_SECTION_TITLE		"砺原 蒸製"
+!define GTK_WIMP_SECTION_TITLE		"姓覗 砺原"
+!define GTK_BLUECURVE_SECTION_TITLE		"鷺欠朕崎 砺原"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue 砺原"
+!define GAIM_SECTION_DESCRIPTION		"亜績税 坪嬢 督析引 dll"
+!define GTK_SECTION_DESCRIPTION		"亜績戚 紫遂馬澗 菰銅 巴熊廿 GUI 祷填"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ 砺原澗 GTK+ 覗稽益轡税 決裳琶聖 郊蝦 呪 赤柔艦陥."
+!define GTK_NO_THEME_DESC			"GTK+ 砺原研 竺帖馬走 省柔艦陥."
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)澗 制亀酔 汽什滴転 発井拭 設 繕鉢鞠澗 GTK 砺原脊艦陥."
+!define GTK_BLUECURVE_THEME_DESC		"鷺欠朕崎 砺原."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_KOREAN} "竺帖 是帖 識澱"
-LangString GTK_PAGE_SUBTITLE				${LANG_KOREAN} "GTK+研 竺帖拝 虹希研 識澱"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_KOREAN} "竺帖 覗稽益轡戚 焼掘 虹希拭 亜績聖 竺帖杯艦陥"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_KOREAN} "陥献 虹希拭 竺帖馬獣形檎 貼事聖 適遣馬壱 陥献 虹希研 識澱馬室推. 竺帖研 適遣馬檎 竺帖研 叔楳杯艦陥."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_KOREAN} "竺帖 覗稽益轡戚 焼掘 虹希拭 GTK+研 穣益傾戚球杯艦陥"
-LangString GTK_UPGRADE_PROMPT				${LANG_KOREAN} "疹劾 獄穿 GTK+ 訓展績聖 達紹柔艦陥. 穣益傾戚球拝猿推?$\rNote: 穣益傾戚球馬走 省生檎 亜績戚 疑拙馬走 省聖 呪亀 赤柔艦陥."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"疹劾 獄穿 GTK+ 訓展績聖 達紹柔艦陥. 穣益傾戚球拝猿推?$\rNote: 穣益傾戚球馬走 省生檎 亜績戚 疑拙馬走 省聖 呪亀 赤柔艦陥."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_KOREAN} "Gaim (remove only)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_KOREAN} "亜績 巨刑塘軒亜 走趨霜 依脊艦陥. 域紗 拝猿推?$\r$\rNote: 搾妊層 巴君益昔精 走趨走走 省聖 呪亀 赤柔艦陥.$\r亜績 紫遂切 竺舛拭澗 慎狽聖 耕帖走 省柔艦陥."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_KOREAN} "脊径馬重 竺帖 巨刑塘軒亜 戚耕 赤柔艦陥. 照拭 級精 鎧遂戚 走趨霜 呪亀 赤柔艦陥. 域紗拝猿推?"
+!define GAIM_UNINSTALL_DESC			"Gaim (remove only)"
+!define GAIM_PROMPT_WIPEOUT			"亜績 巨刑塘軒亜 走趨霜 依脊艦陥. 域紗 拝猿推?$\r$\rNote: 搾妊層 巴君益昔精 走趨走走 省聖 呪亀 赤柔艦陥.$\r亜績 紫遂切 竺舛拭澗 慎狽聖 耕帖走 省柔艦陥."
+!define GAIM_PROMPT_DIR_EXISTS		"脊径馬重 竺帖 巨刑塘軒亜 戚耕 赤柔艦陥. 照拭 級精 鎧遂戚 走趨霜 呪亀 赤柔艦陥. 域紗拝猿推?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_KOREAN} "GTK+ 訓展績 竺帖 掻 神嫌 降持."
-LangString GTK_BAD_INSTALL_PATH			${LANG_KOREAN} "脊径馬重 井稽拭 羨悦拝 呪 蒸暗蟹 幻級 呪 蒸醸柔艦陥."
+!define GTK_INSTALL_ERROR			"GTK+ 訓展績 竺帖 掻 神嫌 降持."
+!define GTK_BAD_INSTALL_PATH			"脊径馬重 井稽拭 羨悦拝 呪 蒸暗蟹 幻級 呪 蒸醸柔艦陥."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_KOREAN} "GTK+ 砺原研 竺帖拝 映廃戚 蒸柔艦陥."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"GTK+ 砺原研 竺帖拝 映廃戚 蒸柔艦陥."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_KOREAN} "情昔什島君亜 亜績税 傾走什闘軒 殖闘軒研 達聖 呪 蒸柔艦陥.$\r戚 覗稽益轡聖 陥献 政煽 映廃生稽 竺帖廃 依 旭柔艦陥."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_KOREAN} "戚 覗稽益轡聖 薦暗拝 呪 赤澗 映廃戚 蒸柔艦陥."
+!define un.GAIM_UNINSTALL_ERROR_1         "情昔什島君亜 亜績税 傾走什闘軒 殖闘軒研 達聖 呪 蒸柔艦陥.$\r戚 覗稽益轡聖 陥献 政煽 映廃生稽 竺帖廃 依 旭柔艦陥."
+!define un.GAIM_UNINSTALL_ERROR_2         "戚 覗稽益轡聖 薦暗拝 呪 赤澗 映廃戚 蒸柔艦陥."
--- a/src/win32/nsis/translations/portuguese-br.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/portuguese-br.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_PORTUGUESEBR} "O ambiente de tempo de execu艫o do GTK+ est� ausente ou precisa ser atualizado.$\rFavor instalar a vers�o v${GTK_VERSION} ou superior do ambiente de tempo de execu艫o do GTK+."
+!define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execu艫o do GTK+ est� ausente ou precisa ser atualizado.$\rFavor instalar a vers�o v${GTK_VERSION} ou superior do ambiente de tempo de execu艫o do GTK+."
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_PORTUGUESEBR} "Cliente de mensagens instant�neas Gaim (requerido)"
-LangString GTK_SECTION_TITLE				${LANG_PORTUGUESEBR} "Ambiente de tempo de execu艫o do GTK+ (requerido)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_PORTUGUESEBR} "Temas do GTK+"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_PORTUGUESEBR} "Nenhum tema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_PORTUGUESEBR} "Tema 'Wimp'"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_PORTUGUESEBR} "Tema 'Bluecurve'"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_PORTUGUESEBR} "Tema 'Light House Blue'"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_PORTUGUESEBR} "Arquivos e bibliotecas principais do Gaim"
-LangString GTK_SECTION_DESCRIPTION			${LANG_PORTUGUESEBR} "Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_PORTUGUESEBR} "Os temas do GTK+ podem mudar a apar�ncia e o funcionamento dos aplicativos GTK+."
-LangString GTK_NO_THEME_DESC				${LANG_PORTUGUESEBR} "N�o instalar um tema do GTK+"
-LangString GTK_WIMP_THEME_DESC			${LANG_PORTUGUESEBR} "O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de �rea de trabalho do Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_PORTUGUESEBR} "O tema 'Bluecurve'."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_PORTUGUESEBR} "O tema 'Lighthouseblue'."
+!define GAIM_SECTION_TITLE			"Cliente de mensagens instant�neas Gaim (requerido)"
+!define GTK_SECTION_TITLE			"Ambiente de tempo de execu艫o do GTK+ (requerido)"
+!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
+!define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GAIM_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Gaim"
+!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a apar�ncia e o funcionamento dos aplicativos GTK+."
+!define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de �rea de trabalho do Windows."
+!define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_PORTUGUESEBR} "Escolha o local da instala艫o"
-LangString GTK_PAGE_SUBTITLE				${LANG_PORTUGUESEBR} "Escolha a pasta em que o GTK+ ser� instalado"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_PORTUGUESEBR} "O instalador ir� instalar o GTK+ na seguinte pasta"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_PORTUGUESEBR} "Para instalar numa pasta diferente, clique em Procurar e selecione outra pasta. Aperte Pr�ximo para continuar."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_PORTUGUESEBR} "O instalador ir� atualizar o GTK+ encontrado na seguinte pasta"
-LangString GTK_UPGRADE_PROMPT				${LANG_PORTUGUESEBR} "Uma vers�o antiga do ambiente de tempo de execu艫o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O Gaim poder� n�o funcionar a menos que voc� o fa�a."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu艫o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O Gaim poder� n�o funcionar a menos que voc� o fa�a."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_PORTUGUESEBR} "Gaim (apenas remover)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_PORTUGUESEBR} "Sua antiga instala艫o do Gaim est� prestes a ser removida. Voc� gostaria de continuar?$\r$\rNota: Quaisquer plugins n�o-padr�o que voc� pode ter instalado ser�o removidos.$\rAs configura苺es de usu�rio do Gaim n�o ser�o afetadas."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_PORTUGUESEBR} "O diret�rio de instala艫o do que voc� especificou j� existe. Qualquer conte�do$\rser� deletado. Deseja continuar?"
+!define GAIM_UNINSTALL_DESC			"Gaim (apenas remover)"
+!define GAIM_PROMPT_WIPEOUT			"Sua antiga instala艫o do Gaim est� prestes a ser removida. Voc� gostaria de continuar?$\r$\rNota: Quaisquer plugins n�o-padr�o que voc� pode ter instalado ser�o removidos.$\rAs configura苺es de usu�rio do Gaim n�o ser�o afetadas."
+!define GAIM_PROMPT_DIR_EXISTS		"O diret�rio de instala艫o do que voc� especificou j� existe. Qualquer conte�do$\rser� deletado. Deseja continuar?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_PORTUGUESEBR} "Erro ao instalar o ambiente de tempo de execu艫o do GTK+."
-LangString GTK_BAD_INSTALL_PATH			${LANG_PORTUGUESEBR} "O caminho que voc� digitou n�o p�de ser acessado ou criado."
+!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu艫o do GTK+."
+!define GTK_BAD_INSTALL_PATH			"O caminho que voc� digitou n�o p�de ser acessado ou criado."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_PORTUGUESEBR} "Voc� n�o tem permiss�o para instalar um tema do GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Voc� n�o tem permiss�o para instalar um tema do GTK+."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_PORTUGUESEBR} "O desinstalador n�o p�de encontrar entradas de registro do Gaim.$\r� prov�vel que outro usu�rio tenha instalado esta aplica艫o."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_PORTUGUESEBR} "Voc� n�o tem permiss�o para desinstalar essa aplica艫o."
+!define un.GAIM_UNINSTALL_ERROR_1         "O desinstalador n�o p�de encontrar entradas de registro do Gaim.$\r� prov�vel que outro usu�rio tenha instalado esta aplica艫o."
+!define un.GAIM_UNINSTALL_ERROR_2         "Voc� n�o tem permiss�o para desinstalar essa aplica艫o."
--- a/src/win32/nsis/translations/portuguese.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/portuguese.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,46 +9,46 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_PORTUGUESE} "O ambiente de tempo de execu艫o do GTK+ est� ausente ou precisa de ser actualizado.$\rPor favor instale a vers�o v${GTK_VERSION} ou superior do ambiente de tempo de execu艫o do GTK+."
+!define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execu艫o do GTK+ est� ausente ou precisa de ser actualizado.$\rPor favor instale a vers�o v${GTK_VERSION} ou superior do ambiente de tempo de execu艫o do GTK+."
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_PORTUGUESE} "Seguinte >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_PORTUGUESE} "$(^Name) est� dispon�vel sob alicen�a GPL. O texto da licen�a � fornecido meramente a t�tulo informativo. $_CLICK" 
+!define GAIM_LICENSE_BUTTON			"Seguinte >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est� dispon�vel sob alicen�a GPL. O texto da licen�a � fornecido meramente a t�tulo informativo. $_CLICK" 
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_PORTUGUESE} "Cliente de mensagens instant�neas Gaim (obrigat�rio)"
-LangString GTK_SECTION_TITLE				${LANG_PORTUGUESE} "Ambiente de tempo de execu艫o do GTK+ (obrigat�rio)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_PORTUGUESE} "Temas do GTK+"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_PORTUGUESE} "Nenhum tema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_PORTUGUESE} "Tema 'Wimp'"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_PORTUGUESE} "Tema 'Bluecurve'"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_PORTUGUESE} "Tema 'Light House Blue'"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_PORTUGUESE} "Ficheiros e bibliotecas principais do Gaim"
-LangString GTK_SECTION_DESCRIPTION			${LANG_PORTUGUESE} "Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_PORTUGUESE} "Os temas do GTK+ podem mudar a apar�ncia dos programas GTK+."
-LangString GTK_NO_THEME_DESC				${LANG_PORTUGUESE} "N�o instalar um tema do GTK+"
-LangString GTK_WIMP_THEME_DESC			${LANG_PORTUGUESE} "O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de trabalho do Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_PORTUGUESE} "O tema 'Bluecurve'."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_PORTUGUESE} "O tema 'Lighthouseblue'."
+!define GAIM_SECTION_TITLE			"Cliente de mensagens instant�neas Gaim (obrigat�rio)"
+!define GTK_SECTION_TITLE			"Ambiente de tempo de execu艫o do GTK+ (obrigat�rio)"
+!define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
+!define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
+!define GAIM_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Gaim"
+!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a apar�ncia dos programas GTK+."
+!define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
+!define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de trabalho do Windows."
+!define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
 
 ; GTK+ Directory Page
-LangString GTK_UPGRADE_PROMPT				${LANG_PORTUGUESE} "Foi encontrada ma vers�o antiga do ambiente de tempo de execu艫o do GTK+. Deseja actualiz�-lo?$\rNota: O Gaim poder� n�o funcionar se n�o o fizer."
+!define GTK_UPGRADE_PROMPT			"Foi encontrada ma vers�o antiga do ambiente de tempo de execu艫o do GTK+. Deseja actualiz�-lo?$\rNota: O Gaim poder� n�o funcionar se n�o o fizer."
 
 ; Installer Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_PORTUGUESE} "Visite a p�gina web do Gaim para Windows" 
+!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a p�gina web do Gaim para Windows" 
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_PORTUGUESE} "Gaim (remover apenas)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_PORTUGUESE} "A sua antiga instala艫o do Gaim est� prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins n�o-padr�o que poder� ter instalado ser�o removidos.$\rAs configura苺es de utilizador do Gaim n�o ser�o afectadas."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_PORTUGUESE} "A directoria de instala艫o do que especificou j� existe. Qualquer conte�do$\rser� apagado. Deseja continuar?"
+!define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
+!define GAIM_PROMPT_WIPEOUT			"A sua antiga instala艫o do Gaim est� prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins n�o-padr�o que poder� ter instalado ser�o removidos.$\rAs configura苺es de utilizador do Gaim n�o ser�o afectadas."
+!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instala艫o do que especificou j� existe. Qualquer conte�do$\rser� apagado. Deseja continuar?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_PORTUGUESE} "Erro ao instalar o ambiente de tempo de execu艫o do GTK+."
-LangString GTK_BAD_INSTALL_PATH			${LANG_PORTUGUESE} "Imposs�vel aceder ou criar o caminho que digitou."
+!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu艫o do GTK+."
+!define GTK_BAD_INSTALL_PATH			"Imposs�vel aceder ou criar o caminho que digitou."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_PORTUGUESE} "N�o tem permiss�o para instalar um tema do GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"N�o tem permiss�o para instalar um tema do GTK+."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_PORTUGUESE} "O desinstalador n�o p�de encontrar entradas de registo do Gaim.$\r� prov�vel que outro utilizador tenha instalado este programa."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_PORTUGUESE} "N�o tem permiss�o para desinstalar este programa."
+!define un.GAIM_UNINSTALL_ERROR_1         "O desinstalador n�o p�de encontrar entradas de registo do Gaim.$\r� prov�vel que outro utilizador tenha instalado este programa."
+!define un.GAIM_UNINSTALL_ERROR_2         "N�o tem permiss�o para desinstalar este programa."
--- a/src/win32/nsis/translations/romanian.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/romanian.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_ROMANIAN} "Mediul GTK+ nu e prezent sau ave�i o versiune prea veche.$\rInstala�i cel pu�in versiunea v${GTK_VERSION} a mediului GTK+"
+!define GTK_INSTALLER_NEEDED			"Mediul GTK+ nu e prezent sau ave�i o versiune prea veche.$\rInstala�i cel pu�in versiunea v${GTK_VERSION} a mediului GTK+"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_ROMANIAN} "Client de mesagerie instantanee (obligatoriu)"
-LangString GTK_SECTION_TITLE				${LANG_ROMANIAN} "Mediu GTK+ (obligatoriu)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_ROMANIAN} "Teme GTK+"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_ROMANIAN} "F�r� teme"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_ROMANIAN} "Tem� Wimp"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_ROMANIAN} "Tem� Bluecurve"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_ROMANIAN} "Tem� Light House Blue"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_ROMANIAN} "Fi�iere Gaim �i dll-uri"
-LangString GTK_SECTION_DESCRIPTION			${LANG_ROMANIAN} "Un mediu de dezvoltare multiplatform� utilizat de Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_ROMANIAN} "Temele GTK+ schimb� aparen�a aplica�iilor GTK+."
-LangString GTK_NO_THEME_DESC				${LANG_ROMANIAN} "Nu instala o tem� GTK+"
-LangString GTK_WIMP_THEME_DESC			${LANG_ROMANIAN} "GTK-Wimp este o tem� GTK �n acord cu mediul Windows."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_ROMANIAN} "Tema Bluecurve."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_ROMANIAN} "Tema Lighthouseblue."
+!define GAIM_SECTION_TITLE			"Client de mesagerie instantanee (obligatoriu)"
+!define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
+!define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
+!define GTK_NOTHEME_SECTION_TITLE		"F�r� teme"
+!define GTK_WIMP_SECTION_TITLE		"Tem� Wimp"
+!define GTK_BLUECURVE_SECTION_TITLE		"Tem� Bluecurve"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tem� Light House Blue"
+!define GAIM_SECTION_DESCRIPTION		"Fi�iere Gaim �i dll-uri"
+!define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatform� utilizat de Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"Temele GTK+ schimb� aparen�a aplica�iilor GTK+."
+!define GTK_NO_THEME_DESC			"Nu instala o tem� GTK+"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp este o tem� GTK �n acord cu mediul Windows."
+!define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_ROMANIAN} "Alege�i loca�ia instal�rii"
-LangString GTK_PAGE_SUBTITLE				${LANG_ROMANIAN} "Alege�i directorul �n care dori�i s� instala�i GTK+"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_ROMANIAN} "Instalarea va copia GTK+ �n acest director"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_ROMANIAN} "Pentru a instala �ntr-un alt director, ap�sa�i Browse �i alege�i un alt director. Ap�sa�i Next pentru a continua"
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_ROMANIAN} "Instalarea va actualiza mediul GTK+ prezent �n directorul"
-LangString GTK_UPGRADE_PROMPT				${LANG_ROMANIAN} "Ave�i o versiune veche a mediului GTK+. Dori�i s� o actualiza�i?$\rNot�: E posibil ca Gaim s� nu func�ioneze cu versiunea veche."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Ave�i o versiune veche a mediului GTK+. Dori�i s� o actualiza�i?$\rNot�: E posibil ca Gaim s� nu func�ioneze cu versiunea veche."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_ROMANIAN} "Gaim (doar dezinstalare)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_ROMANIAN} "Vechiul director Gaim va fi �ters. Dori�i s� continua�i?$\r$\rNot�: Orice module externe vor fi �terse.$\rSet�rile utilizatorilor Gaim nu vor fi afectate."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_ROMANIAN} "Directorul ales pentru instalare exist� deja.$\rCon�inutul s�u va fi �ters. Dori�i s� continua�i?"
+!define GAIM_UNINSTALL_DESC			"Gaim (doar dezinstalare)"
+!define GAIM_PROMPT_WIPEOUT			"Vechiul director Gaim va fi �ters. Dori�i s� continua�i?$\r$\rNot�: Orice module externe vor fi �terse.$\rSet�rile utilizatorilor Gaim nu vor fi afectate."
+!define GAIM_PROMPT_DIR_EXISTS		"Directorul ales pentru instalare exist� deja.$\rCon�inutul s�u va fi �ters. Dori�i s� continua�i?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_ROMANIAN} "Eroare la instalarea mediului GTK+."
-LangString GTK_BAD_INSTALL_PATH			${LANG_ROMANIAN} "Directorul specificat nu poate fi accesat sau creat."
+!define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
+!define GTK_BAD_INSTALL_PATH			"Directorul specificat nu poate fi accesat sau creat."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_ROMANIAN} "Nu ave�i drepturile de acces necesare instal�rii unei teme GTK+."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Nu ave�i drepturile de acces necesare instal�rii unei teme GTK+."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_ROMANIAN} "Programul de dezinstalare nu a g�sit intr�ri Gaim �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_ROMANIAN} "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
+!define un.GAIM_UNINSTALL_ERROR_1         "Programul de dezinstalare nu a g�sit intr�ri Gaim �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
+!define un.GAIM_UNINSTALL_ERROR_2         "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
--- a/src/win32/nsis/translations/serbian-latin.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/serbian-latin.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_SERBIAN} "GTK+ okolina za izvr�avanje ili nije na�ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_VERSION} ili ve�u GTK+ okoline za izvr�avanje"
+!define GTK_INSTALLER_NEEDED			"GTK+ okolina za izvr�avanje ili nije na�ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_VERSION} ili ve�u GTK+ okoline za izvr�avanje"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_SERBIAN} "Gaim klijent za brze poruke (neophodno)"
-LangString GTK_SECTION_TITLE				${LANG_SERBIAN} "GTK+ okolina za izvr�avanje (neophodno)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_SERBIAN} "GTK+ teme"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_SERBIAN} "Bez teme"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_SERBIAN} "Wimp tema"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_SERBIAN} "Bluecurve tema"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_SERBIAN} "Light House Blue tema"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_SERBIAN} "Osnovne Gaim datoteke i dinami�ke biblioteke"
-LangString GTK_SECTION_DESCRIPTION			${LANG_SERBIAN} "Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Gaim"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_SERBIAN} "GTK+ teme menjaju izgled i na�in rada GTK+ aplikacija."
-LangString GTK_NO_THEME_DESC				${LANG_SERBIAN} "Ne instaliraj GTK+ temu"
-LangString GTK_WIMP_THEME_DESC			${LANG_SERBIAN} "GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okru�enje."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_SERBIAN} "Bluecurve tema."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_SERBIAN} "Lighthouseblue tema."
+!define GAIM_SECTION_TITLE			"Gaim klijent za brze poruke (neophodno)"
+!define GTK_SECTION_TITLE			"GTK+ okolina za izvr�avanje (neophodno)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ teme"
+!define GTK_NOTHEME_SECTION_TITLE		"Bez teme"
+!define GTK_WIMP_SECTION_TITLE		"Wimp tema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve tema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue tema"
+!define GAIM_SECTION_DESCRIPTION		"Osnovne Gaim datoteke i dinami�ke biblioteke"
+!define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Gaim"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teme menjaju izgled i na�in rada GTK+ aplikacija."
+!define GTK_NO_THEME_DESC			"Ne instaliraj GTK+ temu"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okru�enje."
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurve tema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue tema."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_SERBIAN} "Izaberite mesto gde �e se instalirati program"
-LangString GTK_PAGE_SUBTITLE				${LANG_SERBIAN} "Izaberite folder u koji �elite da se GTK+ instalira"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_SERBIAN} "Program �e instalirati GTK+ u ovaj folder"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_SERBIAN} "Da biste instalirali u neki drugi folder, kliknite na Pregled i izaberite neki drugi folder. Kliknite na Nastavak da bi produ�ili dalje."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_SERBIAN} "Program �e unaprediti GTK+ koji je na�en u ovom folderu"
-LangString GTK_UPGRADE_PROMPT				${LANG_SERBIAN} "Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, Gaim mo�da ne�e raditi."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, Gaim mo�da ne�e raditi."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_SERBIAN} "Gaim (samo uklanjanje)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_SERBIAN} "Va� stari Gaim direktorijum �e biti obrisan. Da li �elite da nastavite?$\r$\rPrimedba: Svi nestandardni dodaci koje ste instalirali �e biti obrisani.$\rGaim postavke korisnika ne�e biti promenjene."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_SERBIAN} "Instalacioni direktorijum koji ste naveli ve� postoji. Sav sadr�aj$\r�e biti obrisan. Da li �elite da nastavite?"
+!define GAIM_UNINSTALL_DESC			"Gaim (samo uklanjanje)"
+!define GAIM_PROMPT_WIPEOUT			"Va� stari Gaim direktorijum �e biti obrisan. Da li �elite da nastavite?$\r$\rPrimedba: Svi nestandardni dodaci koje ste instalirali �e biti obrisani.$\rGaim postavke korisnika ne�e biti promenjene."
+!define GAIM_PROMPT_DIR_EXISTS		"Instalacioni direktorijum koji ste naveli ve� postoji. Sav sadr�aj$\r�e biti obrisan. Da li �elite da nastavite?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_SERBIAN} "Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
-LangString GTK_BAD_INSTALL_PATH			${LANG_SERBIAN} "Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
+!define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
+!define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_SERBIAN} "Nemate ovla��enja za instalaciju GTK+ teme."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Nemate ovla��enja za instalaciju GTK+ teme."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_SERBIAN} "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Gaim.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_SERBIAN} "Nemate ovla��enja za deinstalaciju ove aplikacije."
+!define un.GAIM_UNINSTALL_ERROR_1         "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Gaim.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
+!define un.GAIM_UNINSTALL_ERROR_2         "Nemate ovla��enja za deinstalaciju ove aplikacije."
--- a/src/win32/nsis/translations/simp-chinese.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/simp-chinese.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -9,46 +9,46 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_SIMPCHINESE} "辛嬬髪富 GTK+ 塰佩扮震桟廠�賜宀俶勣厚仟乎桟廠。$\r萩芦廾 v${GTK_VERSION} 賜厚互井云議 GTK+ 塰佩扮震桟廠"
+!define GTK_INSTALLER_NEEDED			"辛嬬髪富 GTK+ 塰佩扮震桟廠�賜宀俶勣厚仟乎桟廠。$\r萩芦廾 v${GTK_VERSION} 賜厚互井云議 GTK+ 塰佩扮震桟廠"
 
 ; License Page
-LangString GAIM_LICENSE_BUTTON			${LANG_SIMPCHINESE} "和匯化 >"
-LangString GAIM_LICENSE_BOTTOM_TEXT			${LANG_SIMPCHINESE} "$(^Name) 參 GPL 俯辛窟下。壓緩戻工緩俯辛叙葎歌深。$_CLICK"
+!define GAIM_LICENSE_BUTTON			"和匯化 >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) 參 GPL 俯辛窟下。壓緩戻工緩俯辛叙葎歌深。$_CLICK"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_SIMPCHINESE} "Gaim 軸扮宥儷殻會(駅俶)"
-LangString GTK_SECTION_TITLE				${LANG_SIMPCHINESE} "GTK+ 塰佩扮震桟廠(駅俶)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_SIMPCHINESE} "GTK+ 麼籾"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_SIMPCHINESE} "涙麼籾"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_SIMPCHINESE} "Wimp 麼籾"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_SIMPCHINESE} "Bluecurve 麼籾"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_SIMPCHINESE} "Light House Blue 麼籾"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_SIMPCHINESE} "Gaim 宰伉猟周才 DLLs"
-LangString GTK_SECTION_DESCRIPTION			${LANG_SIMPCHINESE} "Gaim 侭喘議謹峠岬 GUI 垢醤淫"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_SIMPCHINESE} "GTK+ 麼籾辛參厚個 GTK+ 殻會議鉱湖。"
-LangString GTK_NO_THEME_DESC				${LANG_SIMPCHINESE} "音芦廾 GTK+ 麼籾"
-LangString GTK_WIMP_THEME_DESC			${LANG_SIMPCHINESE} "GTK-Wimp (Windows impersonator)頁 is a GTK theme that blends well into the Windows desktop environment."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_SIMPCHINESE} "Bluecurve 麼籾。"
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_SIMPCHINESE} "Lighthouseblue 麼籾。"
+!define GAIM_SECTION_TITLE			"Gaim 軸扮宥儷殻會(駅俶)"
+!define GTK_SECTION_TITLE			"GTK+ 塰佩扮震桟廠(駅俶)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ 麼籾"
+!define GTK_NOTHEME_SECTION_TITLE		"涙麼籾"
+!define GTK_WIMP_SECTION_TITLE		"Wimp 麼籾"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve 麼籾"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue 麼籾"
+!define GAIM_SECTION_DESCRIPTION		"Gaim 宰伉猟周才 DLLs"
+!define GTK_SECTION_DESCRIPTION		"Gaim 侭喘議謹峠岬 GUI 垢醤淫"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ 麼籾辛參厚個 GTK+ 殻會議鉱湖。"
+!define GTK_NO_THEME_DESC			"音芦廾 GTK+ 麼籾"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)頁 is a GTK theme that blends well into the Windows desktop environment."
+!define GTK_BLUECURVE_THEME_DESC		"Bluecurve 麼籾。"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue 麼籾。"
 
 ; GTK+ Directory Page
-LangString GTK_UPGRADE_PROMPT				${LANG_SIMPCHINESE} "窟�阻症井云議 GTK+ 塰佩扮震。艇�勣幅雫宅?$\r廣吭: 茅掲艇序佩幅雫�倦夸 Gaim 辛嬬涙隈垢恬。"
+!define GTK_UPGRADE_PROMPT			"窟�阻症井云議 GTK+ 塰佩扮震。艇�勣幅雫宅?$\r廣吭: 茅掲艇序佩幅雫�倦夸 Gaim 辛嬬涙隈垢恬。"
 
 ; Finish Page
-LangString GAIM_FINISH_VISIT_WEB_SITE		${LANG_SIMPCHINESE} "箝誓 Windows Gaim 利匈"
+!define GAIM_FINISH_VISIT_WEB_SITE		"箝誓 Windows Gaim 利匈"
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_SIMPCHINESE} "Gaim (峪嬬評茅)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_SIMPCHINESE} "軸繍評茅艇議症 Gaim 朕村。艇�勣写偬宅?$\r$\r廣吭: 艇侭芦廾議販採掲炎彈議峨周脅繍瓜評茅。$\r徽頁音氏唹� Gaim 喘薩譜崔。"
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_SIMPCHINESE} "艇峺協議芦廾朕村厮将贋壓。$\r侭嗤坪否脅繍瓜評茅。艇�勣写偬宅?"
+!define GAIM_UNINSTALL_DESC			"Gaim (峪嬬評茅)"
+!define GAIM_PROMPT_WIPEOUT			"軸繍評茅艇議症 Gaim 朕村。艇�勣写偬宅?$\r$\r廣吭: 艇侭芦廾議販採掲炎彈議峨周脅繍瓜評茅。$\r徽頁音氏唹� Gaim 喘薩譜崔。"
+!define GAIM_PROMPT_DIR_EXISTS		"艇峺協議芦廾朕村厮将贋壓。$\r侭嗤坪否脅繍瓜評茅。艇�勣写偬宅?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_SIMPCHINESE} "芦廾 GTK+ 塰佩扮震払移。"
-LangString GTK_BAD_INSTALL_PATH			${LANG_SIMPCHINESE} "涙隈恵諒賜幹秀艇補秘議揃抄。"
+!define GTK_INSTALL_ERROR			"芦廾 GTK+ 塰佩扮震払移。"
+!define GTK_BAD_INSTALL_PATH			"涙隈恵諒賜幹秀艇補秘議揃抄。"
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_SIMPCHINESE} "艇短嗤幡�芦廾 GTK+ 麼籾。"
+!define GTK_NO_THEME_INSTALL_RIGHTS		"艇短嗤幡�芦廾 GTK+ 麼籾。"
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_SIMPCHINESE} "亢墮殻會孀音欺 Gaim 議廣過燕�朕。$\r辛嬬頁総翌議喘薩芦廾阻緩殻會。"
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_SIMPCHINESE} "艇短嗤幡�亢墮緩殻會。"
+!define un.GAIM_UNINSTALL_ERROR_1         "亢墮殻會孀音欺 Gaim 議廣過燕�朕。$\r辛嬬頁総翌議喘薩芦廾阻緩殻會。"
+!define un.GAIM_UNINSTALL_ERROR_2         "艇短嗤幡�亢墮緩殻會。"
--- a/src/win32/nsis/translations/swedish.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/swedish.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_SWEDISH} "$\"GTK+ runtime environment$\" saknas eller beh�ver uppgraderas$\rInstallera v${GTK_VERSION} eller h�gre av GTK+."
+!define GTK_INSTALLER_NEEDED			"$\"GTK+ runtime environment$\" saknas eller beh�ver uppgraderas$\rInstallera v${GTK_VERSION} eller h�gre av GTK+."
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_SWEDISH} "Gaim-snabbmeddelandeklient (obligatorisk)"
-LangString GTK_SECTION_TITLE				${LANG_SWEDISH} "GTK+ Runtime Environment (obligatorisk)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_SWEDISH} "GTK+teman"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_SWEDISH} "Inget tema"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_SWEDISH} "Wimp-tema"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_SWEDISH} "Bluecurve-tema"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_SWEDISH} "Light House Blue-tema"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_SWEDISH} "Gaims k�nrfiler och DLL:er"
-LangString GTK_SECTION_DESCRIPTION			${LANG_SWEDISH} "En GUI-verktygsupps�ttning f�r flera olika plattformar som Gaim beh�ver."
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_SWEDISH} "GTK+teman kan �ndra k�nslan av och utseendet p� GTK+applikationer."
-LangString GTK_NO_THEME_DESC				${LANG_SWEDISH} "Installera inte n�got GTK+tema"
-LangString GTK_WIMP_THEME_DESC			${LANG_SWEDISH} "GTK-Wimp (Windows impersonator) ett GTK-tema som sm�lter bra in i Windows-milj�n."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_SWEDISH} "The Bluecurve-tema."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_SWEDISH} "The Lighthouseblue-tema."
+!define GAIM_SECTION_TITLE			"Gaim-snabbmeddelandeklient (obligatorisk)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+teman"
+!define GTK_NOTHEME_SECTION_TITLE		"Inget tema"
+!define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
+!define GAIM_SECTION_DESCRIPTION		"Gaims k�nrfiler och DLL:er"
+!define GTK_SECTION_DESCRIPTION		"En GUI-verktygsupps�ttning f�r flera olika plattformar som Gaim beh�ver."
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+teman kan �ndra k�nslan av och utseendet p� GTK+applikationer."
+!define GTK_NO_THEME_DESC			"Installera inte n�got GTK+tema"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) ett GTK-tema som sm�lter bra in i Windows-milj�n."
+!define GTK_BLUECURVE_THEME_DESC		"The Bluecurve-tema."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue-tema."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_SWEDISH} "Plats f�r installation"
-LangString GTK_PAGE_SUBTITLE				${LANG_SWEDISH} "V�lj vilken katalog GTK+ ska installeras i"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_SWEDISH} "GTK+ kommer att installeras i f�ljande katalog"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_SWEDISH} "F�r att installera i en annan katalog klicka p� Bl�ddra, klicka p� N�sta f�r att forts�tta."
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_SWEDISH} "GTK+ i f�ljande katalog kommer att uppgraderas"
-LangString GTK_UPGRADE_PROMPT				${LANG_SWEDISH} "En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_SWEDISH} "Gaim (enbart f�r avinstallation)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_SWEDISH} "Din gamla Gaim-katalog kommer att raderas, vill du forts�tta?$\r$\rOBS! om du har installerat n�gra extra insticksmoduler kommer de raderas.$\rGaims anv�ndarinst�llningar kommer inte p�verkas."
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_SWEDISH} "Den katalog du vill installera i finns redan. Allt i katalogen$\rkommer att raderas, vill du forts�tta?"
+!define GAIM_UNINSTALL_DESC			"Gaim (enbart f�r avinstallation)"
+!define GAIM_PROMPT_WIPEOUT			"Din gamla Gaim-katalog kommer att raderas, vill du forts�tta?$\r$\rOBS! om du har installerat n�gra extra insticksmoduler kommer de raderas.$\rGaims anv�ndarinst�llningar kommer inte p�verkas."
+!define GAIM_PROMPT_DIR_EXISTS		"Den katalog du vill installera i finns redan. Allt i katalogen$\rkommer att raderas, vill du forts�tta?"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_SWEDISH} "Fel vid installation av GTK+ runtime."
-LangString GTK_BAD_INSTALL_PATH			${LANG_SWEDISH} "Den s�kv�g du angivit g�r inte att komma �t eller skapa."
+!define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
+!define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_SWEDISH} "Du har inte r�ttigheter att installera ett GTK+tema."
+!define GTK_NO_THEME_INSTALL_RIGHTS		"Du har inte r�ttigheter att installera ett GTK+tema."
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_SWEDISH} "Avinstalleraren kunde inte hitta registerv�rden f�r Gaim.$\rAntagligen har en annan anv�ndare installerat applikationen."
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_SWEDISH} "Du har inte r�ttigheter att avinstallera den h�r applikationen."
+!define un.GAIM_UNINSTALL_ERROR_1         "Avinstalleraren kunde inte hitta registerv�rden f�r Gaim.$\rAntagligen har en annan anv�ndare installerat applikationen."
+!define un.GAIM_UNINSTALL_ERROR_2         "Du har inte r�ttigheter att avinstallera den h�r applikationen."
--- a/src/win32/nsis/translations/trad-chinese.nsh	Wed Nov 19 22:37:19 2003 +0000
+++ b/src/win32/nsis/translations/trad-chinese.nsh	Wed Nov 19 22:43:22 2003 +0000
@@ -8,44 +8,39 @@
 ;;
 
 ; Startup GTK+ check
-LangString GTK_INSTALLER_NEEDED			${LANG_TRADCHINESE} "тぃ�嘉�X� GTK+ 印�泉航�C$\r出�w庫 v${GTK_VERSION} �H�W�セ� GTK+ 印�泉航�C"
+!define GTK_INSTALLER_NEEDED			"тぃ�嘉�X� GTK+ 印�泉航�C$\r出�w庫 v${GTK_VERSION} �H�W�セ� GTK+ 印�泉航�C"
 
 ; Components Page
-LangString GAIM_SECTION_TITLE				${LANG_TRADCHINESE} "Gaim �D�{Α (ゲ旨)"
-LangString GTK_SECTION_TITLE				${LANG_TRADCHINESE} "GTK+ 印�泉航 (ゲ旨)"
-LangString GTK_THEMES_SECTION_TITLE			${LANG_TRADCHINESE} "GTK+ �G敢�D�D"
-LangString GTK_NOTHEME_SECTION_TITLE		${LANG_TRADCHINESE} "ぃ�w庫"
-LangString GTK_WIMP_SECTION_TITLE			${LANG_TRADCHINESE} "Wimp Theme"
-LangString GTK_BLUECURVE_SECTION_TITLE		${LANG_TRADCHINESE} "Bluecurve Theme"
-LangString GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${LANG_TRADCHINESE} "Light House Blue Theme"
-LangString GAIM_SECTION_DESCRIPTION			${LANG_TRADCHINESE} "Gaim �み隻�の以�A�Α�w"
-LangString GTK_SECTION_DESCRIPTION			${LANG_TRADCHINESE} "Gaim ��ノ�佼キ�x肱�ざ⑰�Α�w"
-LangString GTK_THEMES_SECTION_DESCRIPTION		${LANG_TRADCHINESE} "GTK+ �G敢�D�D�i�Hノ�э怒 GTK+ 棲ノ�{Α��~�[�C"
-LangString GTK_NO_THEME_DESC				${LANG_TRADCHINESE} "ぃ�w庫 GTK+ �G敢�D�D"
-LangString GTK_WIMP_THEME_DESC			${LANG_TRADCHINESE} "GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
-LangString GTK_BLUECURVE_THEME_DESC			${LANG_TRADCHINESE} "The Bluecurve theme."
-LangString GTK_LIGHTHOUSEBLUE_THEME_DESC		${LANG_TRADCHINESE} "The Lighthouseblue theme."
+!define GAIM_SECTION_TITLE			"Gaim �D�{Α (ゲ旨)"
+!define GTK_SECTION_TITLE			"GTK+ 印�泉航 (ゲ旨)"
+!define GTK_THEMES_SECTION_TITLE		"GTK+ �G敢�D�D"
+!define GTK_NOTHEME_SECTION_TITLE		"ぃ�w庫"
+!define GTK_WIMP_SECTION_TITLE		"Wimp Theme"
+!define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
+!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
+!define GAIM_SECTION_DESCRIPTION		"Gaim �み隻�の以�A�Α�w"
+!define GTK_SECTION_DESCRIPTION		"Gaim ��ノ�佼キ�x肱�ざ⑰�Α�w"
+!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ �G敢�D�D�i�Hノ�э怒 GTK+ 棲ノ�{Α��~�[�C"
+!define GTK_NO_THEME_DESC			"ぃ�w庫 GTK+ �G敢�D�D"
+!define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
+!define GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
 
-; Extra GTK+ Dir Selector Page
-LangString GTK_PAGE_TITLE				${LANG_TRADCHINESE} "随詳�w庫ヘ雀"
-LangString GTK_PAGE_SUBTITLE				${LANG_TRADCHINESE} "随詳�@㎎ヘ雀�H�w庫 GTK+ �Α�w"
-LangString GTK_PAGE_INSTALL_MSG1			${LANG_TRADCHINESE} "�w庫�{Α�N�|р GTK+ �w庫�b�U�C�ヘ雀い"
-LangString GTK_PAGE_INSTALL_MSG2			${LANG_TRADCHINESE} "�n�w庫���L�ヘ雀�A出� [�s蹄 (...)] ��B随���Lヘ雀��i��w庫�C� [�U�@�B(N)] �~挺�C"
-LangString GTK_PAGE_UPGRADE_MSG1			${LANG_TRADCHINESE} "�w庫�{Α�N�|��U�Cヘ雀い� GTK+ �i�ど�"
-LangString GTK_UPGRADE_PROMPT				${LANG_TRADCHINESE} "�o�{�@㎎詑�� GTK+ 印�泉航�C�z�n�Nウど�芹�H$\r出�`�N�G�p�G�zぃど��AGaim �i��L�kタ�T��Q印��C"
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"�o�{�@㎎詑�� GTK+ 印�泉航�C�z�n�Nウど�芹�H$\r出�`�N�G�p�G�zぃど��AGaim �i��L�kタ�T��Q印��C"
 
 ; Gaim Section Prompts and Texts
-LangString GAIM_UNINSTALL_DESC			${LANG_TRADCHINESE} "Gaim v${GAIM_VERSION} (�u�仮娃)"
-LangString GAIM_PROMPT_WIPEOUT			${LANG_TRADCHINESE} "�z��e�w庫�ヘ雀い�詑� Gaim �N�|�Q仮娃�C�z�n�~挺芹�H$\r$\r出�`�N�Gヴ��z��w庫��D�xよ笹�@社箇械�N�Q�R娃�C$\rτ Gaim ��ノ��]�w�Nぃ�|���v�T�C"
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_TRADCHINESE} "�z�随�w��w庫ヘ雀�U��Τ隻�械�N�Q仮娃�C$\r�z�n�~挺芹�H"
+!define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (�u�仮娃)"
+!define GAIM_PROMPT_WIPEOUT			"�z��e�w庫�ヘ雀い�詑� Gaim �N�|�Q仮娃�C�z�n�~挺芹�H$\r$\r出�`�N�Gヴ��z��w庫��D�xよ笹�@社箇械�N�Q�R娃�C$\rτ Gaim ��ノ��]�w�Nぃ�|���v�T�C"
+!define GAIM_PROMPT_DIR_EXISTS		"�z�随�w��w庫ヘ雀�U��Τ隻�械�N�Q仮娃�C$\r�z�n�~挺芹�H"
 
 ; GTK+ Section Prompts
-LangString GTK_INSTALL_ERROR				${LANG_TRADCHINESE} "�w庫 GTK+ 印�泉航��oネ杉�~�C"
-LangString GTK_BAD_INSTALL_PATH			${LANG_TRADCHINESE} "�z�翠�J��w庫ヘ雀�L�k�s���ミ�C"
+!define GTK_INSTALL_ERROR			"�w庫 GTK+ 印�泉航��oネ杉�~�C"
+!define GTK_BAD_INSTALL_PATH			"�z�翠�J��w庫ヘ雀�L�k�s���ミ�C"
 
 ; GTK+ Themes section
-LangString GTK_NO_THEME_INSTALL_RIGHTS		${LANG_TRADCHINESE} "�zヘ�e��v⑬�L�k�w庫 GTK+ �G敢�D�D�C"
+!define GTK_NO_THEME_INSTALL_RIGHTS		"�zヘ�e��v⑬�L�k�w庫 GTK+ �G敢�D�D�C"
 
 ; Uninstall Section Prompts
-LangString un.GAIM_UNINSTALL_ERROR_1         	${LANG_TRADCHINESE} "仮娃�{Α�L�kт� Gaim ��w庫瑚�T�C$\r�o棲袴�OΤ��L��ノ�⑪�s�w庫�F�o㎎�{Α�C"
-LangString un.GAIM_UNINSTALL_ERROR_2         	${LANG_TRADCHINESE} "�zヘ�e��v⑬�L�k仮娃 Gaim�C"
+!define un.GAIM_UNINSTALL_ERROR_1         "仮娃�{Α�L�kт� Gaim ��w庫瑚�T�C$\r�o棲袴�OΤ��L��ノ�⑪�s�w庫�F�o㎎�{Α�C"
+!define un.GAIM_UNINSTALL_ERROR_2         "�zヘ�e��v⑬�L�k仮娃 Gaim�C"