merge changes for storm-1615

2 files changed, 16 insertions, 6 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index ea09286592..52be805260 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -307,7 +307,7 @@
          name="Ukrainian"
          value="uk" />
         <combo_box.item
-         label="中文 (简体) (Chinese)"
+         label="中文 (正體) (Chinese)"
          name="Chinese"
          value="zh" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 9c718fdb87..0a1c0872e9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -67,11 +67,6 @@
          value="it" />
         <combo_box.item
          enabled="true"
-         label="Nederlands (Dutch) - Beta"
-         name="Dutch"
-         value="nl" />
-        <combo_box.item
-         enabled="true"
          label="Polski (Polish) - Beta"
          name="Polish"
          value="pl" />
@@ -82,9 +77,24 @@
          value="pt" />
         <combo_box.item
          enabled="true"
+         label="Русский (Russian) - Beta"
+         name="Russian"
+         value="ru" />
+        <combo_box.item
+         enabled="true"
+         label="Türkçe (Turkish) - Beta"
+         name="Turkish"
+         value="tr" />
+        <combo_box.item
+         enabled="true"
          label="日本語 (Japanese) - Beta"
          name="(Japanese)"
          value="ja" />
+        <combo_box.item
+         enabled="true"
+         label="正體 (Traditional Chinese) - Beta"
+         name="Traditional Chinese"
+         value="zh" />
     </combo_box>
     <text
  font="SansSerifSmall"