21 files changed, 39 insertions, 58 deletions
diff --git a/linden/indra/newview/skins/html/loading/loading.html b/linden/indra/newview/skins/html/loading/loading.html
deleted file mode 100644
index 1c62d2f..0000000
--- a/linden/indra/newview/skins/html/loading/loading.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
-        <tr>
-                <td align="center" valign="middle" style="font-size:0.8em;">
-                        <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
-                </td>
-        </tr>
-</table>
-</body>
diff --git a/linden/indra/newview/skins/html/loading/sl_logo_rotate_black.gif b/linden/indra/newview/skins/html/loading/sl_logo_rotate_black.gif
deleted file mode 100644
index e3ccc7c..0000000
--- a/linden/indra/newview/skins/html/loading/sl_logo_rotate_black.gif
+++ /dev/null
Binary files differ
diff --git a/linden/indra/newview/skins/xui/de/panel_login.xml b/linden/indra/newview/skins/xui/de/panel_login.xml
index ef63078..46525cc 100644
--- a/linden/indra/newview/skins/xui/de/panel_login.xml
+++ b/linden/indra/newview/skins/xui/de/panel_login.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-                https://sdfsfsfds.com/app/login/en/?show_login_form=True
+                https://secondlife.com/app/login/?show_login_form=True
-        </text>
-        <text name="forgot_password_url">
-                http://secondlife.com/account/request.php
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
index 394baa7..650edaf 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
@@ -5,8 +5,8 @@
        <button label="Beschäftigt"
             label_selected="Beschäftigt" name="Set Not Busy"
             tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
-        <button label="Versionsschlüssel see above"
+        <button label="Freigeben"
-             label_selected="Versionsschlüssel see above" name="Release Keys"
+             label_selected="Freigeben" name="Release Keys"
             tool_tip="Ein Skript hat die Steuerung übernommen. Klicken Sie hier, um die Steuerung wieder freizugeben." />
        <button label="Mouselook" label_selected="Mouselook" name="Mouselook"
             tool_tip="Mit der Maus steuern Sie die Anzeige. Wenn Sie eine Waffe haben, klicken Sie, um zu schießen." />
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 d6ec39e..35bae44 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -74,10 +74,10 @@
                        Systemfehler
                </combo_item>
                <combo_item type="string" length="1" name="English">
-                        Englisch
+                        English (Englisch)
                </combo_item>
                <combo_item type="string" length="1" name="Chinese">
-                        Chinesisch
+                        汉语/漢語 (Chinesisch)
                </combo_item>
                <combo_item type="string" length="1" name="Deutsch(German)">
                        Deutsch
@@ -92,7 +92,7 @@
                        한국어 (Koreanisch)
                </combo_item>
                <combo_item type="string" length="1" name="Portugese">
-                        Portugiesisch
+                        Português (Portugiesisch)
                </combo_item>
                <combo_item type="string" length="1" name="Spanish">
                        Español (Spanisch)
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 187afff..0bd618b 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -2398,6 +2398,9 @@ for advice and a link to the system status web page.
                </message>
        </alert>
        <alert modal="true" name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        When QuickTime is disabled because it is out of date
+                </ignore>
                <message name="message">
                        Streaming video has been disabled because the version of 
 QuickTime installed on your system is out of date. 
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 0d2063d..af865f4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -51,9 +51,6 @@
                                <combo_item name="AnyCategory" value="All">
                                        Any Category
                                </combo_item>
-                                <combo_item name="Classifieds" value="Classifieds">
-                                        Classifieds
-                                </combo_item>
                                <combo_item name="Events" value="Events">
                                        Events
                                </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 366f50d..50c69c6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="500" name="floater_my_friends"
+<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="365" name="floater_my_friends"
     title="Contacts" 
     width="395">
        <tab_container bottom="10" height="360" tab_width="80" follows="left|right|top|bottom" left="0" name="friends_and_groups" tab_position="left" width="388">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
index cae2714..84aacad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
@@ -95,4 +95,6 @@ unless you add wait steps.
        <text hidden="true" name="none_text">
                -- None --
        </text>
+        <text hidden="true" name="stop_txt">Stop</text>
+        <text hidden="true" name="preview_txt">Preview</text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 062eba1..18a60af 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="0" follows="left|top|right|bottom" height="600" hidden="false" left="0"
     mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
+        <web_browser border_visible="false" bottom="0" caret_color="1 1 1 1" follows="top|left|bottom|right" left="0"
             name="login_html" right="-1"
             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
             top="-1" />
        <text hidden="true" name="real_url">
-             https://secondlife.com/app/login/en/?show_login_form=True
+             https://secondlife.com/app/login/?show_login_form=True
-        </text>
-        <text hidden="true" name="forgot_password_url">
-                http://secondlife.com/account/request.php
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index 79ebb7e..c560788 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -149,7 +149,7 @@
                        English
                </combo_item>
                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        Chinese - Beta
+                        汉语/漢語 (Chinese) - Beta
                </combo_item>
                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
                        Deutsch (German) - Beta
@@ -164,7 +164,7 @@
                        한국어 (Korean) - Beta
                </combo_item>
                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Portuguese - Beta
+                        Português (Portuguese) - Beta
                </combo_item>
                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
                        Español (Spanish) - Beta
diff --git a/linden/indra/newview/skins/xui/es/panel_login.xml b/linden/indra/newview/skins/xui/es/panel_login.xml
index d1d949b..b8aa1b6 100644
--- a/linden/indra/newview/skins/xui/es/panel_login.xml
+++ b/linden/indra/newview/skins/xui/es/panel_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-             https://secondlife.com/app/login/es/?show_login_form=True
+             https://secondlife.com/app/login/?show_login_form=True
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_login.xml b/linden/indra/newview/skins/xui/fr/panel_login.xml
index 40d9268..b8aa1b6 100644
--- a/linden/indra/newview/skins/xui/fr/panel_login.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-             https://secondlife.com/app/login/fr/?show_login_form=True
+             https://secondlife.com/app/login/?show_login_form=True
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/floater_my_friends.xml b/linden/indra/newview/skins/xui/ja/floater_my_friends.xml
index 4e02083..e28029b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_my_friends.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="連絡先">
+<floater name="floater_my_friends" title="連絡先" min_width="500">
        <tab_container name="friends_and_groups">
                <panel label="フレンド" name="friends_panel" />
                <panel label="グループ" name="groups_panel" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/xui/ja/panel_login.xml
index dda65a7..46525cc 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_login.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-                https://secondlife.com/app/login/en/?show_login_form=True
+                https://secondlife.com/app/login/?show_login_form=True
-        </text>
-        <text name="forgot_password_url">
-                http://secondlife.com/account/request.php
        </text>
 </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 c4e3889..dfa5edf 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -79,28 +79,28 @@
                        システム・デフォルト
                </combo_item>
                <combo_item type="string" length="1" name="English">
-                        英語
+                        English (英語)
                </combo_item>
                <combo_item type="string" length="1" name="Chinese">
-                        中国語
+                        汉语/漢語 (中国語) 
                </combo_item>
                <combo_item type="string" length="1" name="Deutsch(German)">
-                        ドイツ語
+                        Deutsch (ドイツ語)
                </combo_item>
                <combo_item type="string" length="1" name="French">
-                        フランス語
+                        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 (スペイン語)
                </combo_item>
        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_my_friends.xml b/linden/indra/newview/skins/xui/ko/floater_my_friends.xml
index b143e49..7326e73 100644
--- a/linden/indra/newview/skins/xui/ko/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_my_friends.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="연락하기">
+<floater name="floater_my_friends" title="연락하기" min_width="500">
        <tab_container name="friends_and_groups">
                <panel label="친구" name="friends_panel" />
                <panel label="그룹" name="groups_panel" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/xui/ko/panel_login.xml
index dda65a7..46525cc 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_login.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-                https://secondlife.com/app/login/en/?show_login_form=True
+                https://secondlife.com/app/login/?show_login_form=True
-        </text>
-        <text name="forgot_password_url">
-                http://secondlife.com/account/request.php
        </text>
 </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 9955686..e833130 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
@@ -74,28 +74,28 @@
                        시스템 기본값
                </combo_item>
                <combo_item type="string" length="1" name="English">
-                        영어(English)
+                        English (영어)
                </combo_item>
                <combo_item type="string" length="1" name="Chinese">
-                        중국어(Chinese)
+                        汉语/漢語 (중국어)
                </combo_item>
                <combo_item type="string" length="1" name="Deutsch(German)">
-                        독일어(German)
+                        Deutsch (독일어)
                </combo_item>
                <combo_item type="string" length="1" name="French">
-                        불어(French)
+                        Français (불어)
                </combo_item>
                <combo_item type="string" length="1" name="(Japanese)">
-                        일본어 (Japanese)
+                        日本語 (일본어)
                </combo_item>
                <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Korean)
+                        한국어
                </combo_item>
                <combo_item type="string" length="1" name="Portugese">
-                        포르투갈어(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/pt/panel_login.xml b/linden/indra/newview/skins/xui/pt/panel_login.xml
index 9cee6c9..b8aa1b6 100644
--- a/linden/indra/newview/skins/xui/pt/panel_login.xml
+++ b/linden/indra/newview/skins/xui/pt/panel_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-             https://secondlife.com/app/login/pt/?show_login_form=True
+             https://secondlife.com/app/login/?show_login_form=True
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_login.xml b/linden/indra/newview/skins/xui/zh/panel_login.xml
index a4652ac..056f2d6 100644
--- a/linden/indra/newview/skins/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
        <text name="real_url">
-             https://secondlife.com/app/login/zh/?show_login_form=True
+             https://secondlife.com/app/login/?show_login_form=True
        </text>
 </panel>