11 files changed, 59 insertions, 37 deletions

diff --git a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
index 88c3e15..9ec58c1 100644
--- a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="active_speakers" title="Aktive Lautsprecher">

+<floater name="active_speakers" title="Aktive Sprecher">

         <panel name="active_speakers_panel">

                 <scroll_list name="speakers_list">

                         <column label="Name" name="speaker_name" />

diff --git a/linden/indra/newview/skins/xui/de/menu_viewer.xml b/linden/indra/newview/skins/xui/de/menu_viewer.xml
index d72e7b7..d4a569c 100644
--- a/linden/indra/newview/skins/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/de/menu_viewer.xml
@@ -77,7 +77,7 @@
                 <menu_item_check label="Lokaler Chat" name="Chat History" />
                 <menu_item_check label="Unterhalten" name="Instant Message" />
                 <menu_item_call label="Inventar" name="Inventory" />
-                <menu_item_check label="Aktive Lautsprecher" name="Active Speakers" />
+                <menu_item_check label="Aktive Sprecher" name="Active Speakers" />
                 <menu_item_check label="Stummschalten-Liste" name="Mute List" />
                 <menu_item_separator label="-----------" name="separator2" />
                 <menu_item_check label="Kamerasteuerung" name="Camera Controls" />
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
index 635f43e..b7779b6 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -86,22 +86,22 @@
                         汉语/漢語 (Chinesisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch
+                        Deutsch - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        Français (Französisch)
+                        Français (Französisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanisch)
+                        日本語 (Japanisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Koreanisch)
+                        한국어 (Koreanisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
                         Português (Portugiesisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        Español (Spanisch)
+                        Español (Spanisch) - Beta
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index d0ee7f0..b36a4ea 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1032,6 +1032,9 @@ If you continue to have problems, please visit: http://www.secondlife.com/suppor
 MINSPECS
 Do you wish to visit [_URL] for more information?
                 </message>
+                <ignore message="ignore">
+                        Ignore unsupported hardware
+                </ignore>
                 <option name="Yes">
                         Yes
                 </option>
@@ -1067,6 +1070,20 @@ Do you wish to visit [_URL] for more information?
                         510
                 </message>
         </alert>
+
+        <alert modal="true" name="UnknownGPU">
+                <message name="message">
+Your system contains a graphics card that is unknown to us at this time.  
+This is often the case with new hardware we haven't had a chance to 
+test.  Second Life will most likely run properly, but you may need to 
+adjust your graphics settings to something more appropriate.
+(Edit->Preferences->Graphics).
+                </message>
+                <ignore name="ignore">
+                        Ignore unknown graphics card
+                </ignore>
+        </alert>
+
         <alert modal="true" name="DisplaySettingsRecommended">
                 <message name="message">
                         Display settings have been set to recommended levels
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index b8341f2..4e26986 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -149,20 +149,20 @@
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="avatar_icon" width="16" />
         <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="My Friends" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
              name="friend combo" tool_tip="Friend to Show on Map" width="202">
                 <combo_item name="none_selected" value="None">
-                        My Friends
+                        Online Friends
                 </combo_item>
         </combo_box>
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="landmark_icon" width="16" />
         <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="My Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
              name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
                 <combo_item name="none_selected" value="None">
-                        My Landmarks
+                        Landmarks
                 </combo_item>
         </combo_box>
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_general.xml b/linden/indra/newview/skins/xui/es/panel_preferences_general.xml
index 7703e0b..66fb9bd 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/es/panel_preferences_general.xml
@@ -69,16 +69,22 @@
                         Inglés

                 </combo_item>

                 <combo_item type="string" length="1" name="Deutsch(German)">

-                        Deutsch (German)

+                        Deutsch (Alemán) - Beta

+                </combo_item>

+                <combo_item type="string" length="1" name="French">

+                        Français (Francés) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="(Japanese)">

-                        日本語 (Japanese)

+                        日本語 (Japonés) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="(Korean)">

-                        한국어 (Korean)

+                        한국어 (Coreano) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="Chinese">

-                        Chino

+                        汉语/漢語 (Chino) - Beta

+                </combo_item>

+                <combo_item type="string" name="Spanish">

+                        Español - Beta

                 </combo_item>

         </combo_box>

 </panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml b/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml
index c17fd3b..acf89cd 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml
@@ -70,16 +70,16 @@
                         Anglais

                 </combo_item>

                 <combo_item type="string" length="1" name="Deutsch(German)">

-                        Deutsch (German)

+                        Deutsch (German) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="(Japanese)">

-                        日本語 (Japanese)

+                        日本語 (Japanese) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="(Korean)">

-                        한국어 (Korean)

+                        한국어 (Korean) - Beta

                 </combo_item>

                 <combo_item type="string" length="1" name="Chinese">

-                        Chinois

+                        Chinois - Beta

                 </combo_item>

         </combo_box>

 </panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
index e5deeb3..5017f37 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -92,22 +92,22 @@
                         汉语/漢語(中国語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch (ドイツ語)
+                        Deutsch (ドイツ語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        Français (フランス語)
+                        Français (フランス語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語
+                        日本語 – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (韓国語)
+                        한국어 (韓国語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
                         Português (ポルトガル語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        Español (スペイン語)
+                        Español (スペイン語) – ベータ
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
index 15e1e31..9c02484 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
@@ -87,22 +87,22 @@
                         汉语/漢語(중국어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch (독일어)
+                        Deutsch (독일어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="French">
-                        Français (불어)
+                        Français (불어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (일본어)
+                        日本語 (일본어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어
+                        한국어 - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
                         Português(포르투갈어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        Español (스페인어)
+                        Español (스페인어) - 베타
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
index 1a61390..1c92f88 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
-        <button label="메신저" name="im_btn" tool_tip="친구들과 메신저 하기." />
-        <string name="Redock Windows">
-                창 합치기
-        </string>
+        <string name="Redock Windows">창 합치기</string>
+        <layout_stack name="toolbar_stack">
         <button label="통신" name="communicate_btn"
              tool_tip="친구 및 그룹과 통신합니다." />
         <button label="" name="chat_btn" tool_tip="채팅 표시줄 표시 (입력)" />
@@ -20,4 +18,5 @@
              tool_tip="내 주변 영역의 지도 (Ctrl-Shift-M)" />
         <button label="지도" name="map_btn" tool_tip="월드 지도 (Ctrl-M)" />
         <button label="인벤토리" name="inventory_btn" tool_tip="아이템. (Ctrl-I)" />
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml
index 3eccaab..77460f2 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml
@@ -68,16 +68,16 @@
                         英语
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch (German)
+                        Deutsch (German) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanese)
+                        日本語 (Japanese) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Korean)
+                        한국어 (Korean) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        中文
+                        中文 - Beta
                 </combo_item>
         </combo_box>
 </panel>