diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
commit | 7c08ddb3f748d2173948335fd799879e3d58d81c (patch) | |
tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/newview/installers | |
parent | 1f172281453171175dea76fc469a358e1e932b60 (diff) | |
parent | 444bdef6d4949b6381b8706ab056588bc6bd88eb (diff) |
merge
Diffstat (limited to 'indra/newview/installers')
-rwxr-xr-x | indra/newview/installers/windows/installer_template.nsi | 10 | ||||
-rw-r--r-- | indra/newview/installers/windows/lang_ko.nsi | bin | 6200 -> 0 bytes | |||
-rw-r--r-- | indra/newview/installers/windows/lang_nl.nsi | bin | 7414 -> 0 bytes | |||
-rw-r--r-- | indra/newview/installers/windows/lang_ru.nsi | bin | 0 -> 7540 bytes | |||
-rw-r--r-- | indra/newview/installers/windows/lang_tr.nsi | bin | 0 -> 7540 bytes | |||
-rw-r--r-- | indra/newview/installers/windows/lang_zh.nsi | bin | 5554 -> 5554 bytes | |||
-rw-r--r-- | indra/newview/installers/windows/language_menu.nsi | bin | 1444 -> 1452 bytes |
7 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 98cc8fa702..02ca7cbb3a 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -52,10 +52,10 @@ RequestExecutionLevel admin ; on Vista we must be admin because we write to Prog !include "%%SOURCE%%\installers\windows\lang_fr.nsi"
!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
!include "%%SOURCE%%\installers\windows\lang_it.nsi"
-!include "%%SOURCE%%\installers\windows\lang_ko.nsi"
-!include "%%SOURCE%%\installers\windows\lang_nl.nsi"
!include "%%SOURCE%%\installers\windows\lang_pl.nsi"
!include "%%SOURCE%%\installers\windows\lang_pt-br.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ru.nsi"
+!include "%%SOURCE%%\installers\windows\lang_tr.nsi"
!include "%%SOURCE%%\installers\windows\lang_zh.nsi"
# *TODO: Move these into the language files themselves
@@ -66,11 +66,11 @@ LangString LanguageCode ${LANG_SPANISH} "es" LangString LanguageCode ${LANG_FRENCH} "fr"
LangString LanguageCode ${LANG_JAPANESE} "ja"
LangString LanguageCode ${LANG_ITALIAN} "it"
-LangString LanguageCode ${LANG_KOREAN} "ko"
-LangString LanguageCode ${LANG_DUTCH} "nl"
LangString LanguageCode ${LANG_POLISH} "pl"
LangString LanguageCode ${LANG_PORTUGUESEBR} "pt"
-LangString LanguageCode ${LANG_SIMPCHINESE} "zh"
+LangString LanguageCode ${LANG_RUSSIAN} "ru"
+LangString LanguageCode ${LANG_TURKISH} "tr"
+LangString LanguageCode ${LANG_TRADCHINESE} "zh"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)
diff --git a/indra/newview/installers/windows/lang_ko.nsi b/indra/newview/installers/windows/lang_ko.nsi Binary files differdeleted file mode 100644 index 5162b7ddad..0000000000 --- a/indra/newview/installers/windows/lang_ko.nsi +++ /dev/null diff --git a/indra/newview/installers/windows/lang_nl.nsi b/indra/newview/installers/windows/lang_nl.nsi Binary files differdeleted file mode 100644 index 8884b1e858..0000000000 --- a/indra/newview/installers/windows/lang_nl.nsi +++ /dev/null diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi Binary files differnew file mode 100644 index 0000000000..af288c0bfb --- /dev/null +++ b/indra/newview/installers/windows/lang_ru.nsi diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi Binary files differnew file mode 100644 index 0000000000..a4efc95475 --- /dev/null +++ b/indra/newview/installers/windows/lang_tr.nsi diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi Binary files differindex d17e860df9..cb84ceaf77 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi diff --git a/indra/newview/installers/windows/language_menu.nsi b/indra/newview/installers/windows/language_menu.nsi Binary files differindex fef8d40c69..6a0cd43162 100644 --- a/indra/newview/installers/windows/language_menu.nsi +++ b/indra/newview/installers/windows/language_menu.nsi |