summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-03-04 16:59:57 +0000
committerJosh Bell <josh@lindenlab.com>2008-03-04 16:59:57 +0000
commita10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch)
tree051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/installers/windows
parent62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff)
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/installers/windows')
-rw-r--r--indra/newview/installers/windows/installer_template.nsi8
-rw-r--r--indra/newview/installers/windows/lang_de.nsi114
-rw-r--r--indra/newview/installers/windows/lang_en-us.nsi109
-rw-r--r--indra/newview/installers/windows/lang_ja.nsi114
-rw-r--r--indra/newview/installers/windows/lang_ko.nsi114
5 files changed, 223 insertions, 236 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index fa94a09a50..420f0811ff 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -61,14 +61,6 @@ ShowInstDetails nevershow ; no details, no "show" button
SetOverwrite on ; stomp files by default
AutoCloseWindow true ; after all files install, close window
-!ifdef UPDATE
-LicenseText $(LicenseDescUpdate) $(LicenseDescNext)
-!else
-LicenseText $(LicenseDescSetup) $(LicenseDescNext)
-!endif
-
-LicenseData "releasenotes.txt"
-
InstallDir "$PROGRAMFILES\${INSTNAME}"
InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
!ifdef UPDATE
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index abb0c63782..c41012861f 100644
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-
-; subtitle on license text caption (setup new version or update current one
-LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
-LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
-LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
-LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
-LangString DirectoryChooseUpdate ${LANG_GERMAN} "Whlen Sie den Second Life Ordner fr dieses Update:"
-LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_GERMAN} "berprfe alte Version ..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_GERMAN} "berprfung der Windows Version ..."
-LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life untersttzt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, knnte zu unvorhersehbaren Abstrzen und Datenverlust fhren.$\n$\nTrotzdem installieren?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_GERMAN} "berprfung der Installations-Berechtigungen ..."
-LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungengende Berechtigungen.$\nSie mssen ein "administrator" sein, um Second Life installieren zu knnen.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "berprfung der Entfernungs-Berechtigungen ..."
-LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungengende Berechtigungen.$\nSie mssen ein "administrator" sein, um Second Life entfernen zu knnen..'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nWrden Sie es gerne erneut installieren?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits luft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits luft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_GERMAN} "Lschung aller Cache Dateien in Dokumente und Einstellungen."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind mglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMchten Sie diese ebenfalls lschen?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
+
+; subtitle on license text caption (setup new version or update current one
+LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
+LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
+
+; description on license page
+LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
+LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
+LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
+LangString DirectoryChooseUpdate ${LANG_GERMAN} "Whlen Sie den Second Life Ordner fr dieses Update:"
+LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_GERMAN} "berprfe alte Version ..."
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_GERMAN} "berprfung der Windows Version ..."
+LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life untersttzt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, knnte zu unvorhersehbaren Abstrzen und Datenverlust fhren.$\n$\nTrotzdem installieren?'
+
+; checkifadministrator function (install)
+LangString CheckAdministratorInstDP ${LANG_GERMAN} "berprfung der Installations-Berechtigungen ..."
+LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungengende Berechtigungen.$\nSie mssen ein "administrator" sein, um Second Life installieren zu knnen.'
+
+; checkifadministrator function (uninstall)
+LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "berprfung der Entfernungs-Berechtigungen ..."
+LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungengende Berechtigungen.$\nSie mssen ein "administrator" sein, um Second Life entfernen zu knnen..'
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nWrden Sie es gerne erneut installieren?"
+
+; closesecondlife function (install)
+LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
+LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits luft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
+
+; closesecondlife function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
+LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits luft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_GERMAN} "Lschung aller Cache Dateien in Dokumente und Einstellungen."
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind mglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMchten Sie diese ebenfalls lschen?"
+
+; uninstall text
+LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index c26af12a9c..218f1c60fc 100644
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
@@ -1,57 +1,52 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
-LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_ENGLISH} "This package will update Second Life to version ${VERSION_LONG}.(XXX)"
-LangString LicenseDescSetup ${LANG_ENGLISH} "This package will install Second Life on your computer."
-LangString LicenseDescNext ${LANG_ENGLISH} "Next"
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory"
-LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update:"
-LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
-LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
-LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
-LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel."
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
+LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory"
+LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update to version ${VERSION_LONG}.(XXX):"
+LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
+LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'
+
+; checkifadministrator function (install)
+LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
+LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
+
+; checkifadministrator function (uninstall)
+LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
+LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
+
+; closesecondlife function (install)
+LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation."
+
+; closesecondlife function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel."
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"
+
+; uninstall text
+LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index 43cb492780..5e0496ee6f 100644
--- a/indra/newview/installers/windows/lang_ja.nsi
+++ b/indra/newview/installers/windows/lang_ja.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " Abvf[g"
-LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ZbgAbv"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_JAPANESE} "̃pbP[W̓ZJhCto[W${VERSION_LONG}.ɃAbvf[g܂B"
-LangString LicenseDescSetup ${LANG_JAPANESE} "̃pbP[W͂Ȃ̃Rs[^ɃZJhCtCXg[܂B"
-LangString LicenseDescNext ${LANG_JAPANESE} ""
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_JAPANESE} "CXg[EfBNg"
-LangString DirectoryChooseUpdate ${LANG_JAPANESE} "Abvf[gZJhCt̃fBNgIĂB:"
-LangString DirectoryChooseSetup ${LANG_JAPANESE} "ZJhCtCXg[fBNgIĂB: "
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_JAPANESE} "vO'$INSTPROG'‚܂BTCgEAbvf[gɎs܂B"
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_JAPANESE} "ɃZJhCtJn܂H "
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_JAPANESE} "Âo[W`FbNłc"
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_JAPANESE} "EBhEỸo[W`FbNł..."
-LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ZJhCtWindows XPAWindows 2000AMac OS X݂̂T|[gĂ܂BWindows $R0CXg[鎖́Af[^̏NbV̌ɂȂ”\܂BCXg[𑱂܂H"
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_JAPANESE} "CXg[̂߂̌`FbNł..."
-LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ZJhCtCXg[ɂ͊ǗҌKvłB"
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ACXg[̂߂̌`FbNł..."
-LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ZJhCtACXg[ɂ͊ǗҌKvłB"
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_JAPANESE} "ZJhCt${VERSION_LONG} ̓CXg[ς݂łBēxCXg[܂H "
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ZJhCtIł..."
-LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ZJhCt̋NɃCXg[͏o܂BɃZJhCtIăCXg[JnꍇOK{^ĂBCANCELƒ~܂B"
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ZJhCtIł..."
-LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ZJhCt̋NɃACXg[͏o܂BɃZJhCtIăACXg[JnꍇOK{^ĂBCANCELƒ~܂B"
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings tH_̃LbVt@Cf[głB"
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ZJhCt̃fBNgɂ́A܂t@CcĂ܂B$\n$INSTDIR$\nɂȂ쐬A܂͈ړt@C”\܂BSč폜܂H "
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_JAPANESE} "ZJhCt${VERSION_LONG}ACXg[܂B"
+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " Abvf[g"
+LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ZbgAbv"
+
+; description on license page
+LangString LicenseDescUpdate ${LANG_JAPANESE} "̃pbP[W̓ZJhCto[W${VERSION_LONG}.ɃAbvf[g܂B"
+LangString LicenseDescSetup ${LANG_JAPANESE} "̃pbP[W͂Ȃ̃Rs[^ɃZJhCtCXg[܂B"
+LangString LicenseDescNext ${LANG_JAPANESE} ""
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_JAPANESE} "CXg[EfBNg"
+LangString DirectoryChooseUpdate ${LANG_JAPANESE} "Abvf[gZJhCt̃fBNgIĂB:"
+LangString DirectoryChooseSetup ${LANG_JAPANESE} "ZJhCtCXg[fBNgIĂB: "
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_JAPANESE} "vO'$INSTPROG'‚܂BTCgEAbvf[gɎs܂B"
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_JAPANESE} "ɃZJhCtJn܂H "
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_JAPANESE} "Âo[W`FbNłc"
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_JAPANESE} "EBhEỸo[W`FbNł..."
+LangString CheckWindowsVersionMB ${LANG_JAPANESE} "ZJhCtWindows XPAWindows 2000AMac OS X݂̂T|[gĂ܂BWindows $R0CXg[鎖́Af[^̏NbV̌ɂȂ”\܂BCXg[𑱂܂H"
+
+; checkifadministrator function (install)
+LangString CheckAdministratorInstDP ${LANG_JAPANESE} "CXg[̂߂̌`FbNł..."
+LangString CheckAdministratorInstMB ${LANG_JAPANESE} "ZJhCtCXg[ɂ͊ǗҌKvłB"
+
+; checkifadministrator function (uninstall)
+LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "ACXg[̂߂̌`FbNł..."
+LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "ZJhCtACXg[ɂ͊ǗҌKvłB"
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_JAPANESE} "ZJhCt${VERSION_LONG} ̓CXg[ς݂łBēxCXg[܂H "
+
+; closesecondlife function (install)
+LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "ZJhCtIł..."
+LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "ZJhCt̋NɃCXg[͏o܂BɃZJhCtIăCXg[JnꍇOK{^ĂBCANCELƒ~܂B"
+
+; closesecondlife function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "ZJhCtIł..."
+LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "ZJhCt̋NɃACXg[͏o܂BɃZJhCtIăACXg[JnꍇOK{^ĂBCANCELƒ~܂B"
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings tH_̃LbVt@Cf[głB"
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_JAPANESE} "ZJhCt̃fBNgɂ́A܂t@CcĂ܂B$\n$INSTDIR$\nɂȂ쐬A܂͈ړt@C”\܂BSč폜܂H "
+
+; uninstall text
+LangString UninstallTextMsg ${LANG_JAPANESE} "ZJhCt${VERSION_LONG}ACXg[܂B"
diff --git a/indra/newview/installers/windows/lang_ko.nsi b/indra/newview/installers/windows/lang_ko.nsi
index 4e6b5ec0cd..b570315f03 100644
--- a/indra/newview/installers/windows/lang_ko.nsi
+++ b/indra/newview/installers/windows/lang_ko.nsi
@@ -1,57 +1,57 @@
-; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
-
-; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_KOREAN} "Ʈ"
-LangString LicenseSubTitleSetup ${LANG_KOREAN} " ġϱ"
-
-; description on license page
-LangString LicenseDescUpdate ${LANG_KOREAN} " Ű ${VERSION_LONG}. Ʈ մϴ. "
-LangString LicenseDescSetup ${LANG_KOREAN} " Ű ǻͿ ġմϴ."
-LangString LicenseDescNext ${LANG_KOREAN} ""
-
-; installation directory text
-LangString DirectoryChooseTitle ${LANG_KOREAN} "ġ 丮"
-LangString DirectoryChooseUpdate ${LANG_KOREAN} " Ʈ 丮 ϼ. "
-LangString DirectoryChooseSetup ${LANG_KOREAN} " ġ 丮 ϼ:"
-
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_KOREAN} " $INSTPROG α׷ ã ߽ϴ. ڵ Ʈ ߽ϴ."
-
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_KOREAN} " ϰڽϱ?"
-
-; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_KOREAN} " ã ֽϴ١ "
-
-; check windows version
-LangString CheckWindowsVersionDP ${LANG_KOREAN} " Ȯϰ ֽϴ."
-LangString CheckWindowsVersionMB ${LANG_KOREAN} " XP, 2000, ׸ OS X մϴ. $R0 ġ õϸ ۵ н Ͼ ֽϴ. ġϰڽϱ? "
-
-; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_KOREAN} "ġ Ȯ Դϴ... "
-LangString CheckAdministratorInstMB ${LANG_KOREAN} " մԡ Դϴ. ġϱ ؼ ڡ ؾ մϴ."
-
-; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_KOREAN} " Ȯ Դϴ. "
-LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " մԡ Դϴ. ϱ ؼ ڡ ؾ մϴ. "
-
-; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_KOREAN} " ${VERSION_LONG} ̹ ġǾ ֽϴ. ٽ ġϽðڽϱ? "
-
-; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_KOREAN} " ߡ "
-LangString CloseSecondLifeInstMB ${LANG_KOREAN} " ̹ ۵ ġ ϴ. ۾ ߰ ȮΡ ϱ ٶϴ. ġ Ϸ ҡ ."
-
-; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} " ߡ"
-LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ̹ ۵ Ÿ ϴ. ۾ ߰ ȮΡ ϱ ٶϴ. ġ Ϸ ҡ . "
-
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings ij ϵ ϴ."
-
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_KOREAN} " α׷ 丮 ϵ ֽϴ. ϵ ڰ ͵̰ų$\n$INSTDIR$\n$\n ̵ ϵ ֽϴ. ϵ ϰڽϱ?"
-
-; uninstall text
-LangString UninstallTextMsg ${LANG_KOREAN} "${VERSION_LONG} ýۿ մϴ."
+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_KOREAN} "Ʈ"
+LangString LicenseSubTitleSetup ${LANG_KOREAN} " ġϱ"
+
+; description on license page
+LangString LicenseDescUpdate ${LANG_KOREAN} " Ű ${VERSION_LONG}. Ʈ մϴ. "
+LangString LicenseDescSetup ${LANG_KOREAN} " Ű ǻͿ ġմϴ."
+LangString LicenseDescNext ${LANG_KOREAN} ""
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_KOREAN} "ġ 丮"
+LangString DirectoryChooseUpdate ${LANG_KOREAN} " Ʈ 丮 ϼ. "
+LangString DirectoryChooseSetup ${LANG_KOREAN} " ġ 丮 ϼ:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_KOREAN} " $INSTPROG α׷ ã ߽ϴ. ڵ Ʈ ߽ϴ."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_KOREAN} " ϰڽϱ?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_KOREAN} " ã ֽϴ١ "
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_KOREAN} " Ȯϰ ֽϴ."
+LangString CheckWindowsVersionMB ${LANG_KOREAN} " XP, 2000, ׸ OS X մϴ. $R0 ġ õϸ ۵ н Ͼ ֽϴ. ġϰڽϱ? "
+
+; checkifadministrator function (install)
+LangString CheckAdministratorInstDP ${LANG_KOREAN} "ġ Ȯ Դϴ... "
+LangString CheckAdministratorInstMB ${LANG_KOREAN} " մԡ Դϴ. ġϱ ؼ ڡ ؾ մϴ."
+
+; checkifadministrator function (uninstall)
+LangString CheckAdministratorUnInstDP ${LANG_KOREAN} " Ȯ Դϴ. "
+LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " մԡ Դϴ. ϱ ؼ ڡ ؾ մϴ. "
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_KOREAN} " ${VERSION_LONG} ̹ ġǾ ֽϴ. ٽ ġϽðڽϱ? "
+
+; closesecondlife function (install)
+LangString CloseSecondLifeInstDP ${LANG_KOREAN} " ߡ "
+LangString CloseSecondLifeInstMB ${LANG_KOREAN} " ̹ ۵ ġ ϴ. ۾ ߰ ȮΡ ϱ ٶϴ. ġ Ϸ ҡ ."
+
+; closesecondlife function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} " ߡ"
+LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ̹ ۵ Ÿ ϴ. ۾ ߰ ȮΡ ϱ ٶϴ. ġ Ϸ ҡ . "
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings ij ϵ ϴ."
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_KOREAN} " α׷ 丮 ϵ ֽϴ. ϵ ڰ ͵̰ų$\n$INSTDIR$\n$\n ̵ ϵ ֽϴ. ϵ ϰڽϱ?"
+
+; uninstall text
+LangString UninstallTextMsg ${LANG_KOREAN} "${VERSION_LONG} ýۿ մϴ."