merge changes for storm-1615

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 a874ce1245..4811f1fcd5 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -36,10 +36,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

@@ -50,11 +50,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
deleted 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
deleted 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
new 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
new 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
index 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
index fef8d40c69..6a0cd43162 100644
--- a/indra/newview/installers/windows/language_menu.nsi
+++ b/indra/newview/installers/windows/language_menu.nsi