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
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×¢Òâ: ÄúËù°²×°µÄÈκηDZê×¼µÄ²å¼þ¶¼½«±»É¾³ý¡£$\rµ«ÊDz»»áÓ°Ïì Gaim Óû§ÉèÖá£"
-LangString GAIM_PROMPT_DIR_EXISTS			${LANG_SIMPCHINESE} "ÄúÖ¸¶¨µÄ°²×°Ä¿Â¼ÒѾ­´æÔÚ¡£$\rËùÓÐÄÚÈݶ¼½«±»É¾³ý¡£ÄúÏëÒª¼ÌÐøÂð?"
+!define GAIM_UNINSTALL_DESC			"Gaim (Ö»ÄÜɾ³ý)"
+!define GAIM_PROMPT_WIPEOUT			"¼´½«É¾³ýÄúµÄ¾É Gaim Ŀ¼¡£ÄúÏëÒª¼ÌÐøÂð?$\r$\r×¢Òâ: ÄúËù°²×°µÄÈκηDZê×¼µÄ²å¼þ¶¼½«±»É¾³ý¡£$\rµ«ÊDz»»áÓ°Ïì 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"