summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_media_browser.xml4
-rw-r--r--indra/newview/skins/default/xui/de/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/de/notifications.xml17
-rw-r--r--indra/newview/skins/default/xui/de/panel_login.xml2
-rw-r--r--indra/newview/skins/default/xui/de/panel_profile.xml6
-rw-r--r--indra/newview/skins/default/xui/de/strings.xml11
-rw-r--r--indra/newview/skins/default/xui/en/alert_button.xml14
-rw-r--r--indra/newview/skins/default/xui/en/alert_check_box.xml7
-rw-r--r--indra/newview/skins/default/xui/en/alert_icon.xml8
-rw-r--r--indra/newview/skins/default/xui/en/alert_line_editor.xml11
-rw-r--r--indra/newview/skins/default/xui/en/floater_avatar_picker.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_contents.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_gesture.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml36
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_info.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_report_abuse.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_script.xml19
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml12
-rw-r--r--indra/newview/skins/default/xui/en/menu_gesture_gear.xml75
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml11
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml47
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_general.xml22
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml76
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_land_money.xml136
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_notices.xml54
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_notify.xml18
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_roles.xml261
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml56
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_estate.xml104
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml35
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml248
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_script.xml9
-rw-r--r--indra/newview/skins/default/xui/en/widgets/talk_button.xml3
-rw-r--r--indra/newview/skins/default/xui/es/floater_media_browser.xml6
-rw-r--r--indra/newview/skins/default/xui/es/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/es/notifications.xml27
-rw-r--r--indra/newview/skins/default/xui/es/panel_login.xml14
-rw-r--r--indra/newview/skins/default/xui/es/panel_profile.xml14
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml1
-rw-r--r--indra/newview/skins/default/xui/fr/floater_media_browser.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/notifications.xml21
-rw-r--r--indra/newview/skins/default/xui/fr/panel_login.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/panel_pick_info.xml16
-rw-r--r--indra/newview/skins/default/xui/fr/panel_profile.xml10
-rw-r--r--indra/newview/skins/default/xui/fr/strings.xml11
-rw-r--r--indra/newview/skins/default/xui/it/floater_media_browser.xml6
-rw-r--r--indra/newview/skins/default/xui/it/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/it/notifications.xml29
-rw-r--r--indra/newview/skins/default/xui/it/panel_login.xml14
-rw-r--r--indra/newview/skins/default/xui/it/panel_profile.xml14
-rw-r--r--indra/newview/skins/default/xui/it/strings.xml1
-rw-r--r--indra/newview/skins/default/xui/ja/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/notifications.xml12
-rw-r--r--indra/newview/skins/default/xui/ja/panel_login.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_profile.xml10
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml11
-rw-r--r--indra/newview/skins/default/xui/nl/notifications.xml5
-rw-r--r--indra/newview/skins/default/xui/nl/panel_login.xml14
-rw-r--r--indra/newview/skins/default/xui/nl/strings.xml1
-rw-r--r--indra/newview/skins/default/xui/pt/floater_media_browser.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/notifications.xml29
-rw-r--r--indra/newview/skins/default/xui/pt/panel_login.xml8
-rw-r--r--indra/newview/skins/default/xui/pt/panel_profile.xml14
-rw-r--r--indra/newview/skins/default/xui/pt/strings.xml1
72 files changed, 1066 insertions, 641 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f4a239be62..6678918db8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -161,7 +161,7 @@ with the same filename but different name
<texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" />
<texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" />
<texture name="Generic_Object_Medium" file_name="icons/Generic_Object_Medium.png" preload="false" />
- <texture name="Generic_Object_Small" file_name="icons/ Generic_Object_Small.png" preload="false" />
+ <texture name="Generic_Object_Small" file_name="icons/Generic_Object_Small.png" preload="false" />
<texture name="Generic_Object_Large" file_name="icons/Generic_Object_Large.png" preload="false" />
<texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
<texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 1c580aa916..89cce0f6dc 100644
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="MEDIENBROWSER">
<floater.string name="home_page_url">
- http://www.secondlife.com
+ http://de.secondlife.com
</floater.string>
<floater.string name="support_page_url">
- http://support.secondlife.com
+ http://de.secondlife.com/support
</floater.string>
<layout_stack name="stack1">
<layout_panel name="nav_controls">
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 62cd982875..317b525062 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="Einstellungen" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de" />
+ </menu_item_call>
+ </menu>
<menu label="Datei" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="Hochladen" name="upload">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 7e3a6aaa93..8b8a0afa89 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -317,7 +317,7 @@ Gebühren werden nicht rückerstattet.
<notification name="PromptGoToEventsPage">
Zur [SECOND_LIFE] Events-Webseite?
<url name="url">
- http://de.secondlife.com/events/
+ http://secondlife.com/events/?lang=de-DE
</url>
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
@@ -498,7 +498,7 @@ Verschieben Sie alle betreffenden Objekte in dieselbe Region.
[_URL] für Informationen zum Kauf von L$ öffnen?
<url name="url">
- http://de.secondlife.com/app/currency/
+ http://secondlife.com/app/currency/?lang=de-DE
</url>
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
@@ -1055,7 +1055,7 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
Die Installation von [APP_NAME] ist abgeschlossen.
Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen, bevor Sie sich anmelden können.
-Möchten Sie auf www.secondlife.com ein Konto erstellen?
+Möchten Sie auf [https://join.secondlife.com/index.php?lang=de-DE secondlife.com] ein Konto erstellen?
<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/>
</notification>
<notification name="LoginPacketNeverReceived">
@@ -1452,7 +1452,7 @@ Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben u
Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
<url name="url">
- http://wiki.secondlife.com/wiki/Alterseinstufung:_Ein_%C3%9Cberblick_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
</url>
<usetemplate ignoretext="Ich kann diese Region aufgrund der Alterseinstufung nicht betreten" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
</notification>
@@ -1480,7 +1480,7 @@ Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben u
Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
<url name="url">
- http://wiki.secondlife.com/wiki/Alterseinstufung:_Ein_%C3%9Cberblick_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
</url>
<usetemplate ignoretext="Ich habe aufgrund der Alterseinstufung keinen Anspruch auf dieses Land" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
</notification>
@@ -1504,7 +1504,7 @@ Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben u
Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
<url name="url">
- http://wiki.secondlife.com/wiki/Alterseinstufung:_Ein_%C3%9Cberblick_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
</url>
<usetemplate ignoretext="Ich kann aufgrund der Alterseinstufung dieses Land nicht kaufen" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
</notification>
@@ -1690,10 +1690,7 @@ Inventarobjekt(e) verschieben?
<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Verwenden Sie dieses Tool, um Verletzungen der Servicebedingungen und Community-Standards zu melden. Siehe:
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
+ Verwenden Sie dieses Tool, um Verletzungen der [http://secondlife.com/corporate/tos.php?lang=de-DE Servicebedingungen] und [http://secondlife.com/corporate/cs.php?lang=de-DE Community-Standards] zu melden.
Alle gemeldeten Verletzungen der Servicebedingungen und Community-Standards werden geprüft und geklärt Sie können den Prozess im Incident Report (Vorfallsbericht) verfolgen:
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 9a15795cbe..534bcfc82b 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -4,7 +4,7 @@
http://de.secondlife.com/registration/
</panel.string>
<panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
+ http://secondlife.com/account/request.php?lang=de
</panel.string>
<panel name="login_widgets">
<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/>
diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml
index b5fb2329c5..c3274acaae 100644
--- a/indra/newview/skins/default/xui/de/panel_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Profil" name="panel_profile">
<string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
</string>
<string name="payment_update_link_url">
http://www.secondlife.com/account/billing.php?lang=de-DE
</string>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=de
+ </string>
<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=de-DE"/>
<string name="no_partner_text" value="Keiner"/>
<scroll_container name="profile_scroll">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 9a0f5021d8..86eb8b1479 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=de-DE</string>
<string name="SECOND_LIFE">
Second Life
</string>
@@ -158,7 +159,7 @@
Anklicken, um Befehl secondlife:// auszuführen
</string>
<string name="BUTTON_CLOSE_DARWIN">
- Schließen (⌘-W)
+ Schließen (&#8984;W)
</string>
<string name="BUTTON_CLOSE_WIN">
Schließen (Strg+W)
@@ -1311,16 +1312,16 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
Landmarke bearbeiten...
</string>
<string name="accel-mac-control">
- ⌃
+ &#8963;
</string>
<string name="accel-mac-command">
- ⌘
+ &#8984;
</string>
<string name="accel-mac-option">
- ⌥
+ &#8997;
</string>
<string name="accel-mac-shift">
- ⇧
+ &#8679;
</string>
<string name="accel-win-control">
Strg+
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
new file mode 100644
index 0000000000..48c67a3770
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<button
+ label_shadow="true"
+ auto_resize="false"
+ image_overlay_alignment="center"
+ use_ellipses="flse"
+ pad_right="10"
+ pad_left="10"
+ is_toggle="false"
+ scale_image="true"
+ commit_on_return="true"
+ font="SansSerifSmall"
+ follows="bottom"/>
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
new file mode 100644
index 0000000000..9f1bdb5193
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_check_box.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<check_box
+ text_enabled_color="LabelTextColor"
+ text_disabled_color="LabelDisabledColor"
+ font="SansSerif"
+ follows="left|top"
+ name="check"/> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
new file mode 100644
index 0000000000..b0886fce06
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_icon.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<icon color="1.0 1.0 1.0 1.0"
+ tab_stop="false"
+ mouse_opaque="false"
+ name="icon"
+ image_name="notify_caution_icon.tga"
+ follows="left|top">
+</icon>
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
new file mode 100644
index 0000000000..ab708adb06
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<line_editor
+ select_on_focus="false"
+ handle_edit_keys_directly="false"
+ revert_on_esc="true"
+ commit_on_focus_lost="true"
+ ignore_tab="true"
+ max_length="254"
+ text_pad_right="0"
+ text_pad_left="0"
+ mouse_opaque="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 3a1499eaaa..953bd08dd4 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -26,6 +26,12 @@
name="searching">
Searching...
</floater.string>
+ <!-- For multiple person selection, use "Select" and "Close"
+ instead of "OK" and "Cancel" because "Cancel" still keeps the ones
+ you have already selected. The code will show the appropriate
+ set of buttons. -->
+ <string name="Select">Select</string>
+ <string name="Close">Close</string>
<tab_container
follows="all"
height="300"
@@ -205,7 +211,7 @@
height="23"
label="OK"
label_selected="OK"
- name="Select"
+ name="ok_btn"
top_pad="3"
left="46"
width="100" />
@@ -214,7 +220,7 @@
height="23"
label="Cancel"
label_selected="Cancel"
- name="Cancel"
+ name="cancel_btn"
width="100"
left_pad="5" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 833e8beb8d..77a0e9b91b 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -56,7 +56,7 @@
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|bottom"
font="SansSerif"
height="16"
layout="topleft"
@@ -68,7 +68,7 @@
Buy for L$[AMOUNT] from [NAME]?
</text>
<check_box
- follows="left|top"
+ follows="left|bottom"
height="16"
label="Wear clothing now"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 21d292847a..9f5e6828d2 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -21,12 +21,16 @@
name="playing">
(Playing)
</floater.string>
+ <!-- It's used to build new name for gesture created by "Copy" menu item -->
+ <floater.string
+ name="copy_name">Copy of [COPY_NAME]</floater.string>
<scroll_list
bottom_delta="400"
draw_heading="true"
follows="all"
layout="topleft"
left="0"
+ multi_select="true"
top="20"
name="gesture_list">
<scroll_list.columns
@@ -57,18 +61,18 @@
left="0"
name="bottom_panel"
width="313">
- <button
+ <menu_button
follows="bottom|left"
- font="SansSerifBigBold"
- tool_tip="Change sort and view of recent residents list"
height="18"
image_disabled="OptionsMenu_Disabled"
image_selected="OptionsMenu_Press"
image_unselected="OptionsMenu_Off"
layout="topleft"
left="10"
- name="recent_viewsort_btn"
+ menu_filename="menu_gesture_gear.xml"
+ name="gear_btn"
top="5"
+ tool_tip="More options"
width="18" />
<button
follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
new file mode 100644
index 0000000000..cf6a4e45bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+background_visible="true"
+bg_color="yellow"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="Instant Messages"
+ width="392">
+ <tab_container
+ follows="left|right|top|bottom"
+ height="390"
+ layout="topleft"
+ left="1"
+ name="im_box_tab_container"
+ tab_position="bottom"
+ tab_width="80"
+ top="0"
+ width="390" />
+ <icon
+ color="DefaultShadowLight"
+ enabled="false"
+ follows="left|right|bottom"
+ height="17"
+ image_name="tabarea.tga"
+ layout="bottomleft"
+ left="1"
+ name="im_box_tab_container_icon"
+ bottom="10"
+ width="390" />
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index c20aaea2aa..7f2f37409c 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,7 +9,7 @@
name="panel_im"
top="0"
can_close="true"
- can_dock="true"
+ can_dock="false"
can_minimize="false"
visible="true"
width="300"
@@ -35,6 +35,7 @@
<layout_panel
left="0"
top="0"
+ width="180"
user_resize="false">
<button
height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 9bb30f8e86..262bcd07a0 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- height="512"
+ height="555"
help_topic="regioninfo"
layout="topleft"
name="regioninfo"
@@ -9,7 +9,7 @@
title="REGION/ESTATE"
width="480">
<tab_container
- bottom="512"
+ bottom="555"
follows="left|right|top|bottom"
layout="topleft"
left="1"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 696233676c..91ca3ef27a 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -18,7 +18,7 @@
height="150"
layout="topleft"
left="60"
- name=""
+ name="screenshot"
top="15"
width="220" />
<check_box
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
new file mode 100644
index 0000000000..f44ba6d873
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="369"
+ layout="topleft"
+ left="0"
+ name="script_floater"
+ help_topic="script_floater"
+ top="0"
+ can_dock="true"
+ can_minimize="true"
+ visible="true"
+ width="520"
+ can_resize="true"
+ min_width="350"
+ min_height="369">
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a626e1b353..8b6f0f03fe 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -968,23 +968,27 @@
<combo_box.item
label="Touch (default)"
name="Touch/grab(default)"
- value="Touch/grab (default)" />
+ value="Touch" />
<combo_box.item
label="Sit on object"
name="Sitonobject"
- value="Sit on object" />
+ value="Sit" />
<combo_box.item
label="Buy object"
name="Buyobject"
- value="Buy object" />
+ value="Buy" />
<combo_box.item
label="Pay object"
name="Payobject"
- value="Pay object" />
+ value="Pay" />
<combo_box.item
label="Open"
name="Open"
value="Open" />
+ <combo_box.item
+ label="Zoom"
+ name="Zoom"
+ value="Zoom" />
</combo_box>
<check_box
height="16"
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
new file mode 100644
index 0000000000..4642e82c0b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ mouse_opaque="false"
+ name="menu_gesture_gear"
+ visible="false">
+ <menu_item_call
+ font="SansSerifBold"
+ label="Add/Remove from Favorites"
+ layout="topleft"
+ name="activate">
+ <on_click
+ function="Gesture.Action.ToogleActiveState" />
+ </menu_item_call>
+ <menu_item_call
+ label="Copy"
+ layout="topleft"
+ name="copy_gesture">
+ <on_click
+ function="Gesture.Action.CopyPast"
+ parameter="copy_gesture" />
+ <on_enable
+ function="Gesture.EnableAction"
+ parameter="copy_gesture" />
+ </menu_item_call>
+ <menu_item_call
+ label="Paste"
+ layout="topleft"
+ name="paste">
+ <on_click
+ function="Gesture.Action.CopyPast"
+ parameter="paste" />
+ <on_enable
+ function="Gesture.EnableAction"
+ parameter="paste" />
+ </menu_item_call>
+ <menu_item_call
+ label="Copy UUID"
+ layout="topleft"
+ name="copy_uuid">
+ <on_click
+ function="Gesture.Action.CopyPast"
+ parameter="copy_uuid" />
+ <on_enable
+ function="Gesture.EnableAction"
+ parameter="copy_uuid" />
+ </menu_item_call>
+ <menu_item_call
+ label="Save to current outfit"
+ layout="topleft"
+ name="save_to_outfit">
+ <on_click
+ function="Gesture.Action.SaveToCOF" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit"
+ layout="topleft"
+ name="edit_gesture">
+ <on_click
+ function="Gesture.Action.ShowPreview" />
+ <on_enable
+ function="Gesture.EnableAction"
+ parameter="edit_gesture" />
+ </menu_item_call>
+ <menu_item_call
+ label="Inspect"
+ layout="topleft"
+ name="inspect">
+ <on_click
+ function="Gesture.Action.ShowPreview" />
+ <on_enable
+ function="Gesture.EnableAction"
+ parameter="inspect" />
+ </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2b101e9058..9722849690 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -59,7 +59,7 @@
label="My Inventory"
layout="topleft"
name="Inventory"
- shortcut="control|I">
+ shortcut="control|shift|I">
<menu_item_check.on_check
function="Floater.Visible"
parameter="inventory" />
@@ -68,6 +68,15 @@
parameter="inventory" />
</menu_item_check>
<menu_item_call
+ label="Show Sidetray Inventory"
+ name="ShowSidetrayInventory"
+ shortcut="control|I"
+ visible="false">
+ <menu_item_call.on_click
+ function="ShowSidetrayPanel"
+ parameter="sidepanel_inventory" />
+ </menu_item_call>
+ <menu_item_call
label="My Gestures"
layout="topleft"
name="Gestures"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cdf62340b2..c104f74dd1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -722,7 +722,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
icon="alertmodal.tga"
name="AddClassified"
type="alertmodal">
-Classified ads appear in the &apos;Classified&apos; section of the Search directory and on [http://www.secondlife.com secondlife.com] for one week.
+Classified ads appear in the &apos;Classified&apos; section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week.
Fill out your ad, then click &apos;Publish...&apos; to add it to the directory.
You&apos;ll be asked for a price to pay when clicking Publish.
Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords.
@@ -1436,6 +1436,13 @@ Select objects with scripts that you have permission to modify.
<notification
icon="alertmodal.tga"
+ name="CannotOpenScriptObjectNoMod"
+ type="alertmodal">
+ Unable to open script in object without modify permissions.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="CannotSetRunningSelectObjectsNoScripts"
type="alertmodal">
Not able to set any scripts to &apos;running&apos;.
@@ -3261,7 +3268,7 @@ You are not allowed in that region due to your maturity Rating.
Go to the Knowledge Base for more information about maturity Ratings?
<url option="0" name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
</url>
<usetemplate
name="okcancelignore"
@@ -3318,7 +3325,7 @@ You cannot claim this land due to your maturity Rating.
Go to the Knowledge Base for more information about maturity Ratings?
<url option="0" name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
</url>
<usetemplate
name="okcancelignore"
@@ -3368,7 +3375,7 @@ You cannot buy this land due to your maturity Rating.
Go to the Knowledge Base for more information about maturity Ratings?
<url option="0" name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
</url>
<usetemplate
name="okcancelignore"
@@ -3765,7 +3772,7 @@ There are no items in this object that you are allowed to copy.
icon="alertmodal.tga"
name="WebLaunchAccountHistory"
type="alertmodal">
-Go to your [http://secondlife.com/account/ Dashboard] to see your account history?
+Go to your [http://secondlife.com/account/ Dashboard] to see your account history?
<usetemplate
ignoretext="Launch my browser to see my account history"
name="okcancelignore"
@@ -4971,7 +4978,7 @@ No valid parcel could be found.
icon="notify.tga"
name="ObjectGiveItem"
type="offer">
-An object named [OBJECTFROMNAME] owned by [NAME] has offered you [OBJECTTYPE]:
+An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has offered you [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
@@ -4992,8 +4999,9 @@ An object named [OBJECTFROMNAME] owned by [NAME] has offered you [OBJECTTYPE]:
<notification
icon="notify.tga"
name="ObjectGiveItemUnknownUser"
- type="notify">
-An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a [OBJECTTYPE] named [OBJECTNAME].
+ type="offer">
+An object named [OBJECTFROMNAME] owned by (an unknown Resident) has offered you [OBJECTTYPE]:
+[ITEM_SLURL]
<form name="form">
<button
index="0"
@@ -5014,7 +5022,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
icon="notify.tga"
name="UserGiveItem"
type="offer">
-[NAME] has offered you [OBJECTTYPE]:
+[NAME_SLURL] has offered you [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
@@ -5311,6 +5319,27 @@ Grant this request?
<notification
icon="notify.tga"
+ name="ScriptToast"
+ type="notify">
+ [FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting user input.
+ <form name="form">
+ <button
+ index="0"
+ name="Open"
+ text="Open Dialog"/>
+ <button
+ index="1"
+ name="Ignore"
+ text="Ignore"/>
+ <button
+ index="2"
+ name="Block"
+ text="Block"/>
+ </form>
+ </notification>
+
+ <notification
+ icon="notify.tga"
name="FirstBalanceIncrease"
type="notify">
You just received L$[AMOUNT].
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 00711a29e0..6480469f43 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -60,11 +60,11 @@
min_height="28"
width="104"
top_delta="0"
- min_width="104"
+ min_width="54"
name="speak_panel"
user_resize="false">
<talk_button
- follows="right"
+ follows="left|right"
height="23"
speak_button.tab_stop="true"
show_button.tab_stop="true"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 58a78a0ab8..4c30db4034 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
- height="380"
+ height="378"
label="General"
class="panel_group_general"
layout="topleft"
@@ -40,13 +40,13 @@ Hover your mouse over the options for more help.
column_padding="0"
draw_heading="true"
follows="left|top"
- heading_height="16"
+ heading_height="20"
height="130"
layout="topleft"
- left="5"
+ left="0"
name="visible_members"
top_pad="2"
- width="305">
+ width="310">
<name_list.columns
label="Member"
name="name"
@@ -59,9 +59,9 @@ Hover your mouse over the options for more help.
<text
follows="left|top"
type="string"
- height="14"
+ height="12"
layout="topleft"
- left_delta="0"
+ left="5"
name="active_title_label"
top_pad="5"
width="300">
@@ -75,7 +75,7 @@ Hover your mouse over the options for more help.
name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
top_pad="2"
- width="305" />
+ width="300" />
<check_box
height="16"
font="SansSerifSmall"
@@ -101,12 +101,12 @@ Hover your mouse over the options for more help.
border="true"
bg_alpha_color="FloaterUnfocusBorderColor"
follows="left|top"
- height="93"
+ height="90"
layout="topleft"
left="5"
name="preferences_container"
top_pad="5"
- width="305">
+ width="300">
<check_box
follows="right|top"
height="16"
@@ -140,7 +140,7 @@ Hover your mouse over the options for more help.
left_pad="2"
name="spin_enrollment_fee"
tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
- width="105" />
+ width="100" />
<check_box
height="16"
initial_value="true"
@@ -157,7 +157,7 @@ Hover your mouse over the options for more help.
left_delta="0"
name="group_mature_check"
tool_tip="Sets whether your group information is considered mature"
- top_pad="5"
+ top_pad="2"
width="190">
<combo_box.item
label="PG Content"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 0082128ca4..c0db734f8c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -2,10 +2,10 @@
<panel
background_visible="true"
follows="all"
- height="570"
+ height="635"
label="Group Info"
layout="topleft"
- min_height="425"
+ min_height="460"
left="0"
top="20"
name="GroupInfo"
@@ -116,44 +116,43 @@ background_visible="true"
visible="true"
width="120" />
<accordion
+ single_expansion="true"
follows="all"
- height="405"
+ height="478"
layout="topleft"
left="0"
name="groups_accordion"
- top_pad="15"
+ top_pad="10"
width="323">
<accordion_tab
- expanded="true"
- layout="topleft"
- name="group_general_tab"
- title="General">
+ expanded="false"
+ layout="topleft"
+ name="group_general_tab"
+ title="General">
<panel
- border="false"
- class="panel_group_general"
+ border="false"
+ class="panel_group_general"
filename="panel_group_general.xml"
layout="topleft"
left="0"
help_topic="group_general_tab"
name="group_general_tab_panel"
- top="0"
- width="300" />
+ top="0" />
</accordion_tab>
<accordion_tab
- expanded="false"
- layout="topleft"
- name="group_roles_tab"
- title="Roles">
- <panel
- border="false"
- class="panel_group_roles"
- filename="panel_group_roles.xml"
- layout="topleft"
- left="0"
- help_topic="group_roles_tab"
- name="group_roles_tab_panel"
- top="0"
- width="303" />
+ expanded="true"
+ layout="topleft"
+ name="group_roles_tab"
+ title="Roles">
+ <panel
+ border="false"
+ class="panel_group_roles"
+ filename="panel_group_roles.xml"
+ layout="topleft"
+ left="0"
+ help_topic="group_roles_tab"
+ name="group_roles_tab_panel"
+ top="0" />
</accordion_tab>
<accordion_tab
expanded="false"
@@ -168,8 +167,7 @@ background_visible="true"
left="0"
help_topic="group_notices_tab"
name="group_notices_tab_panel"
- top="0"
- width="303" />
+ top="0" />
</accordion_tab>
<accordion_tab
expanded="false"
@@ -184,21 +182,25 @@ background_visible="true"
left="0"
help_topic="group_land_money_tab"
name="group_land_tab_panel"
- top="0"
- width="300" />
+ top="0" />
</accordion_tab>
</accordion>
+ <panel
+ name="button_row"
+ height="23"
+ follows="bottom|left"
+ top_pad="-1"
+ width="323">
<button
follows="top|left"
height="22"
image_overlay="Refresh_Off"
layout="topleft"
- left="5"
+ left="10"
name="btn_refresh"
- top_pad="-15"
width="23" />
- <button
- height="20"
+ <button
+ height="22"
label="Create"
label_selected="New group"
name="btn_create"
@@ -214,12 +216,12 @@ background_visible="true"
visible="false"
width="65" />-->
<button
- height="20"
- font="SansSerifSmall"
+ height="22"
label="Save"
label_selected="Save"
name="btn_apply"
left_pad="10"
right="-10"
- width="65" />
+ width="100" />
+ </panel>
</panel> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 2c649642c3..2075d7e05b 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,7 +2,7 @@
<panel
border="false"
follows="all"
- height="510"
+ height="380"
label="Land &amp; L$"
layout="topleft"
left="0"
@@ -11,7 +11,7 @@
width="310">
<panel.string
name="help_text">
- Parcels owned by a group are listed along with contribution details. A warning appears until the Total Land in Use is less than or = to the Total Contribution.
+ A warning appears until the Total Land in Use is less than or = to the Total Contribution.
</panel.string>
<panel.string
name="cant_view_group_land_text">
@@ -43,14 +43,14 @@
</text> -->
<scroll_list
draw_heading="true"
- follows="top"
+ follows="top|left|right"
heading_height="20"
- height="150"
+ height="130"
layout="topleft"
- left="2"
+ left="0"
+ top="0"
name="group_parcel_list"
- top_pad="0"
- width="305">
+ width="310">
<scroll_list.columns
label="Parcel"
name="name"
@@ -72,34 +72,22 @@
name="hidden"
width="-1" />
</scroll_list>
- <button
- follows="top"
- height="23"
- label="Map"
- label_selected="Map"
- layout="topleft"
- name="map_button"
- right="-5"
- top_pad="5"
- width="95"
- enabled="false" />
<text
type="string"
follows="left|top"
halign="right"
- height="16"
+ height="15"
layout="topleft"
- left="5"
+ left="0"
name="total_contributed_land_label"
- top_pad="0"
width="130">
- Total Contribution:
+ Total contribution:
</text>
<text
text_color="EmphasisColor"
type="string"
follows="left|top"
- height="16"
+ height="15"
layout="topleft"
left_pad="5"
name="total_contributed_land_value"
@@ -107,23 +95,34 @@
width="120">
[AREA] m²
</text>
+ <button
+ follows="top"
+ height="20"
+ label="Map"
+ label_selected="Map"
+ layout="topleft"
+ name="map_button"
+ right="-5"
+ left_pad="0"
+ width="95"
+ enabled="false" />
<text
type="string"
follows="left|top"
halign="right"
- height="16"
+ height="15"
layout="topleft"
- left="5"
+ left="0"
name="total_land_in_use_label"
top_pad="0"
width="130">
- Total Land In Use:
+ Total land in use:
</text>
<text
text_color="EmphasisColor"
type="string"
follows="left|top"
- height="16"
+ height="15"
layout="topleft"
left_pad="5"
name="total_land_in_use_value"
@@ -135,19 +134,19 @@
type="string"
follows="left|top"
halign="right"
- height="16"
+ height="15"
layout="topleft"
- left="5"
+ left="0"
name="land_available_label"
top_pad="0"
width="130">
- Land Available:
+ Land available:
</text>
<text
text_color="EmphasisColor"
type="string"
follows="left|top"
- height="16"
+ height="15"
layout="topleft"
left_pad="5"
name="land_available_value"
@@ -159,17 +158,15 @@
type="string"
follows="left|top"
halign="right"
- height="16"
+ height="15"
layout="topleft"
- left="5"
+ left="0"
name="your_contribution_label"
top_pad="0"
width="130">
- Your Contribution:
+ Your contribution:
</text>
<line_editor
- border_style="line"
- border_thickness="1"
follows="left|top"
height="19"
layout="topleft"
@@ -177,7 +174,7 @@
max_length="10"
name="your_contribution_line_editor"
top_delta="0"
- width="95" />
+ width="80" />
<text
type="string"
follows="left|top"
@@ -194,7 +191,7 @@
type="string"
follows="left|top"
halign="right"
- height="16"
+ height="12"
layout="topleft"
left="140"
name="your_contribution_max_value"
@@ -203,27 +200,27 @@
([AMOUNT] max)
</text>
<icon
- height="16"
- image_name="notify_next"
+ height="18"
+ image_name="BuyArrow_Over"
layout="topleft"
- left="9"
+ left="75"
name="group_over_limit_icon"
top_pad="0"
- visible="false"
- width="16" />
+ visible="true"
+ width="18" />
<text
follows="left|top"
type="string"
word_wrap="true"
font="SansSerifSmall"
- height="35"
+ height="20"
layout="topleft"
- left_pad="5"
+ left_pad="2"
name="group_over_limit_text"
text_color="EmphasisColor"
top_delta="0"
- width="260">
- Group members must contribute more land credits to support land in use
+ width="213">
+ More land credits are needed to support land in use
</text>
<text
type="string"
@@ -231,29 +228,29 @@
font="SansSerifBig"
height="16"
layout="topleft"
- left="10"
+ left="0"
name="group_money_heading"
text_color="EmphasisColor"
- top_pad="0"
- width="150">
+ top_pad="-15"
+ width="100">
Group L$
</text>
<tab_container
follows="all"
- height="200"
+ height="173"
halign="center"
layout="topleft"
- left="5"
+ left="0"
name="group_money_tab_container"
tab_position="top"
tab_height="20"
top_pad="2"
- tab_min_width="70"
- width="300">
+ tab_min_width="75"
+ width="310">
<panel
border="false"
follows="all"
- height="180"
+ height="173"
label="PLANNING"
layout="topleft"
left="0"
@@ -264,7 +261,6 @@
<text_editor
type="string"
follows="all"
- font="SansSerif"
height="140"
layout="topleft"
left="0"
@@ -279,13 +275,13 @@
<panel
border="false"
follows="all"
- height="180"
+ height="173"
label="DETAILS"
layout="topleft"
left="0"
help_topic="group_money_details_tab"
name="group_money_details_tab"
- top="5"
+ top="0"
width="300">
<text_editor
type="string"
@@ -302,34 +298,34 @@
</text_editor>
<button
follows="left|top"
- height="23"
+ height="18"
image_overlay="Arrow_Left_Off"
layout="topleft"
name="earlier_details_button"
tool_tip="Back"
- top_pad="5"
right="-45"
- width="31" />
+ bottom="0"
+ width="25" />
<button
follows="left|top"
- height="23"
+ height="18"
image_overlay="Arrow_Right_Off"
layout="topleft"
left_pad="10"
name="later_details_button"
tool_tip="Next"
- width="31" />
+ width="25" />
</panel>
<panel
border="false"
follows="all"
- height="180"
+ height="173"
label="SALES"
layout="topleft"
left_delta="0"
help_topic="group_money_sales_tab"
name="group_money_sales_tab"
- top="5"
+ top="0"
width="300">
<text_editor
type="string"
@@ -345,24 +341,24 @@
Loading...
</text_editor>
<button
+ bottom="0"
follows="left|top"
- height="23"
+ height="18"
image_overlay="Arrow_Left_Off"
layout="topleft"
name="earlier_sales_button"
tool_tip="Back"
- top_pad="5"
right="-45"
- width="31" />
+ width="25" />
<button
follows="left|top"
- height="23"
+ height="18"
image_overlay="Arrow_Right_Off"
layout="topleft"
left_pad="10"
name="later_sales_button"
tool_tip="Next"
- width="31" />
+ width="25" />
</panel>
</tab_container>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index e56db6414f..0dea81eefe 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
- height="485"
+ height="463"
label="Notices"
layout="topleft"
left="0"
@@ -10,11 +10,10 @@
width="310">
<panel.string
name="help_text">
- Notices are a quick way to communicate across a
-group by broadcasting a message and delivering
+ Notices let you send a message and
an optionally attached item. Notices only go to
-group members in Roles granted the ability to
-receive Notices. You can turn off Notices on
+group members in Roles with the ability to
+receive Notices. You can turn off Notices on
the General tab.
</panel.string>
<panel.string
@@ -25,14 +24,15 @@ the General tab.
follows="left|top"
type="string"
word_wrap="true"
- height="30"
+ height="24"
+ halign="right"
layout="topleft"
left="5"
name="lbl2"
top="5"
width="300">
Notices are kept for 14 days
-Groups are limited to 200 notices/group daily
+Maximum 200 per group daily
</text>
<scroll_list
follows="left|top"
@@ -44,7 +44,7 @@ Groups are limited to 200 notices/group daily
left="2"
name="notice_list"
top_pad="0"
- width="305">
+ width="300">
<scroll_list.columns
label=""
name="icon"
@@ -52,15 +52,15 @@ Groups are limited to 200 notices/group daily
<scroll_list.columns
label="Subject"
name="subject"
- width="125" />
+ width="110" />
<scroll_list.columns
label="From"
name="from"
- width="90" />
+ width="100" />
<scroll_list.columns
label="Date"
name="date"
- width="30" />
+ width="60" />
<scroll_list.columns
name="sort"
width="-1" />
@@ -84,7 +84,7 @@ Groups are limited to 200 notices/group daily
left="5"
name="create_new_notice"
tool_tip="Create a new notice"
- top_delta="0"
+ top_delta="-3"
width="18" />
<button
follows="top|left"
@@ -97,14 +97,14 @@ Groups are limited to 200 notices/group daily
width="23" />
<panel
follows="left|top"
- height="300"
+ height="280"
label="Create New Notice"
layout="topleft"
left="0"
- top_pad="10"
- visible="false"
+ top_pad="0"
+ visible="true"
name="panel_create_new_notice"
- width="303">
+ width="300">
<text
follows="left|top"
type="string"
@@ -216,31 +216,31 @@ Groups are limited to 200 notices/group daily
follows="left|top"
height="23"
label="Send"
- label_selected="Send Notice"
+ label_selected="Send"
layout="topleft"
right="-10"
top_pad="10"
name="send_notice"
width="100" />
<group_drop_target
- height="466"
- top="0"
- left="0"
+ height="95"
+ top="160"
+ left="10"
layout="topleft"
name="drop_target"
tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."
- width="295" />
- </panel>
+ width="280" />
+ </panel>
<panel
follows="left|top"
- height="300"
+ height="280"
label="View Past Notice"
layout="topleft"
left="0"
- visible="true"
+ visible="false"
name="panel_view_past_notice"
top="180"
- width="303">
+ width="300">
<text
type="string"
font="SansSerifBig"
@@ -303,7 +303,7 @@ Groups are limited to 200 notices/group daily
</text>
<text_editor
enabled="false"
- height="205"
+ height="160"
layout="topleft"
left="10"
max_length="511"
@@ -319,7 +319,7 @@ Groups are limited to 200 notices/group daily
max_length="63"
mouse_opaque="false"
name="view_inventory_name"
- top_pad="10"
+ top_pad="8"
width="285" />
<icon
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 2e4df92da4..9b0b81cd0a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
- bevel_style="in"
- bg_alpha_color="0 0 0 0"
height="90"
label="instant_message"
layout="topleft"
@@ -21,8 +19,6 @@
value="SANSSERIF" />
<panel
background_visible="true"
- bevel_style="in"
- bg_alpha_color="black"
follows="top"
height="30"
label="header"
@@ -32,7 +28,7 @@
top="0"
width="305">
<icon
- follows="left|top|right|bottom"
+ follows="all"
height="20"
layout="topleft"
left="5"
@@ -41,8 +37,8 @@
top="5"
width="20" />
<text
- follows="left|top|right|bottom"
- font="SansSerifBigBold"
+ follows="all"
+ font="SansSerifBig"
height="20"
layout="topleft"
left_pad="10"
@@ -56,7 +52,7 @@
<text_editor
allow_html="true"
enabled="true"
- follows="left|top|bottom|right"
+ follows="all"
height="0"
layout="topleft"
left="25"
@@ -69,7 +65,7 @@
type="string"
use_ellipses="true"
value="message"
- width="270"
+ width="270"
word_wrap="true" >
</text_editor>
<icon
@@ -97,9 +93,9 @@
bottom="85"
follows="bottom"
height="20"
- label="OK"
+ label="Ok"
layout="topleft"
- left="25"
+ right="-10"
name="btn_ok"
width="70" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 604fb81c8e..5bae5c2711 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- border="false"
+ follows="all"
height="552"
label="Members &amp; Roles"
layout="topleft"
@@ -14,26 +14,27 @@
</panel.string>
<panel.string
name="want_apply_text">
- Do you want to save these changes?
+ Do you want to save your changes?
</panel.string>
<panel.string
name="help_text" />
<tab_container
border="false"
follows="left|top"
- height="245"
+ height="552"
halign="center"
layout="topleft"
- left="5"
+ left="0"
name="roles_tab_container"
tab_position="top"
tab_height="20"
tab_min_width="75"
- top="3"
- width="300">
+ top="0"
+ width="310">
<panel
border="false"
- height="220"
+ follows="all"
+ height="303"
label="MEMBERS"
layout="topleft"
left="0"
@@ -41,7 +42,7 @@
name="members_sub_tab"
tool_tip="Members"
class="panel_group_members_subtab"
- width="300">
+ width="310">
<panel.string
name="help_text">
You can add or remove Roles assigned to Members.
@@ -50,11 +51,11 @@ clicking on their names.
</panel.string>
<filter_editor
layout="topleft"
- top="10"
+ top="5"
left="5"
width="280"
height="20"
- follows="left|top|right"
+ follows="top"
max_length="250"
label="Filter Members"
name="filter_input" />
@@ -62,7 +63,7 @@ clicking on their names.
column_padding="0"
draw_heading="true"
heading_height="20"
- height="160"
+ height="240"
follows="left|top"
layout="topleft"
left="0"
@@ -73,30 +74,26 @@ clicking on their names.
<name_list.columns
label="Member"
name="name"
- relative_width="0.45" />
+ relative_width="0.44" />
<name_list.columns
- label="Donations"
+ label="Donation"
name="donated"
- relative_width="0.3" />
+ relative_width="0.25" />
<name_list.columns
- label="Online"
+ label="Status"
name="online"
- relative_width="0.2" />
+ relative_width="0.15" />
</name_list>
<button
height="20"
- font="SansSerifSmall"
+ follows="bottom|left"
label="Invite"
- layout="topleft"
left="5"
name="member_invite"
- top_pad="3"
width="100" />
<button
height="20"
- font="SansSerifSmall"
label="Eject"
- layout="topleft"
left_pad="5"
right="-5"
name="member_eject"
@@ -104,14 +101,23 @@ clicking on their names.
</panel>
<panel
border="false"
- height="220"
+ height="230"
label="ROLES"
layout="topleft"
left="0"
help_topic="roles_roles_tab"
name="roles_sub_tab"
class="panel_group_roles_subtab"
- width="300">
+ width="310">
+ <!-- <button
+ enabled="false"
+ height="20"
+ label="Show All"
+ layout="topleft"
+ top="-65"
+ right="-5"
+ name="show_all_button"
+ width="100" />-->
<panel.string
name="help_text">
Roles have a title and an allowed list of Abilities
@@ -121,7 +127,7 @@ including the Everyone and Owner Roles.
</panel.string>
<panel.string
name="cant_delete_role">
- The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and cannot be deleted.
+ The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
</panel.string>
<panel.string
name="power_folder_icon">
@@ -129,15 +135,15 @@ including the Everyone and Owner Roles.
</panel.string>
<panel.string
name="power_all_have_icon">
- checkbox_enabled_true.tga
+ Checkbox_On
</panel.string>
<panel.string
name="power_partial_icon">
- checkbox_enabled_false.tga
+ Checkbox_Off
</panel.string>
<filter_editor
layout="topleft"
- top="10"
+ top="5"
left="5"
width="280"
height="20"
@@ -145,61 +151,48 @@ including the Everyone and Owner Roles.
max_length="250"
label="Filter Roles"
name="filter_input" />
- <!--
- <button
- enabled="false"
- height="20"
- label="Show All"
- layout="topleft"
- left_pad="0"
- name="show_all_button"
- top_delta="0"
- width="80" /> -->
<scroll_list
column_padding="0"
draw_heading="true"
draw_stripes="false"
follows="left|top"
heading_height="20"
- height="160"
+ height="170"
layout="topleft"
search_column="1"
left="0"
name="role_list"
top_pad="2"
- width="300">
+ width="310">
<scroll_list.columns
label="Role"
name="name"
- width="80" />
+ relative_width="0.45" />
<scroll_list.columns
label="Title"
name="title"
- width="90" />
+ relative_width="0.45" />
<scroll_list.columns
- label="Members"
+ label="#"
name="members"
- width="95" />
+ relative_width="0.15" />
</scroll_list>
<button
+ follows="bottom|left"
height="20"
- font="SansSerifSmall"
- label="Add Role"
+ label="New Role"
layout="topleft"
left="5"
name="role_create"
- top_pad="6"
- width="125" />
+ width="100" />
<button
height="20"
- font="SansSerifSmall"
label="Delete Role"
layout="topleft"
left_pad="5"
right="-5"
name="role_delete"
- top_delta="0"
- width="125" />
+ width="100" />
</panel>
<panel
border="false"
@@ -211,7 +204,7 @@ including the Everyone and Owner Roles.
name="actions_sub_tab"
class="panel_group_actions_subtab"
tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
- width="300">
+ width="310">
<panel.string
name="help_text">
Abilities allow Members in Roles to do specific
@@ -219,7 +212,7 @@ things in this group. There&apos;s a broad variety of Abilities.
</panel.string>
<filter_editor
layout="topleft"
- top="10"
+ top="5"
left="5"
width="280"
height="20"
@@ -231,74 +224,63 @@ things in this group. There&apos;s a broad variety of Abilities.
column_padding="0"
draw_stripes="false"
follows="left|top"
- height="160"
+ height="200"
layout="topleft"
left="0"
multi_select="true"
name="action_list"
search_column="1"
tool_tip="Select an Ability to view more details"
- top_pad="2"
+ top_pad="5"
width="300">
<scroll_list.columns
- label=""
- name="icon"
- width="16" />
- <scroll_list.columns
- label="Action"
name="action"
- width="247" />
+ width="300" />
</scroll_list>
- <icon
- height="16"
- image_name="Inv_FolderClosed"
- layout="topleft"
- name="power_folder_icon"
- visible="false"
- width="16" />
</panel>
</tab_container>
<panel
height="252"
layout="topleft"
follows="left|top"
- left="10"
+ left="0"
+ mouse_opaque="false"
name="members_footer"
- top="245"
- top_delta="0"
- width="290">
+ top="300"
+ visible="false"
+ width="310">
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
follows="left|top"
left="0"
name="static"
top_pad="5"
- width="285">
+ width="300">
Assigned Roles
</text>
<scroll_list
- draw_stripes="false"
+ draw_stripes="true"
follows="left|top"
- height="80"
+ height="90"
layout="topleft"
left="0"
name="member_assigned_roles"
top_pad="0"
- width="285">
+ width="300">
<scroll_list.columns
label=""
name="checkbox"
- width="30" />
+ width="20" />
<scroll_list.columns
label=""
name="role"
- width="255" />
+ width="270" />
</scroll_list>
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
follows="left|top"
left="0"
@@ -308,48 +290,42 @@ things in this group. There&apos;s a broad variety of Abilities.
Allowed Abilities
</text>
<scroll_list
- draw_stripes="false"
- height="80"
+ draw_stripes="true"
+ height="90"
layout="topleft"
left="0"
name="member_allowed_actions"
search_column="2"
tool_tip="For details of each allowed ability see the abilities tab"
top_pad="0"
- width="285">
- <scroll_list.columns
- label=""
- name="icon"
- width="20" />
+ width="300">
<scroll_list.columns
label=""
name="action"
- width="265" />
+ width="300" />
</scroll_list>
</panel>
<panel
height="297"
layout="topleft"
- left="10"
+ left="0"
name="roles_footer"
top_delta="0"
- top="245"
+ top="220"
visible="false"
- width="290">
+ width="310">
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
left="0"
name="static"
top="0"
- width="140">
- Name
+ width="300">
+ Role Name
</text>
<line_editor
type="string"
- border_style="line"
- border_thickness="1"
follows="left|top"
height="20"
layout="topleft"
@@ -357,106 +333,97 @@ things in this group. There&apos;s a broad variety of Abilities.
max_length="295"
name="role_name"
top_pad="0"
- width="290">
- Employees
+ width="300">
</line_editor>
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
name="static3"
top_pad="5"
- width="290">
- Title
+ width="300">
+ Role Title
</text>
<line_editor
type="string"
- border_style="line"
- border_thickness="1"
follows="left|top"
height="20"
layout="topleft"
max_length="295"
name="role_title"
top_pad="0"
- width="290">
- (waiting)
+ width="300">
</line_editor>
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
left="0"
name="static2"
top_pad="5"
- width="100">
+ width="200">
Description
</text>
<text_editor
type="string"
halign="left"
- height="35"
+ height="50"
layout="topleft"
left="0"
max_length="295"
name="role_description"
top_pad="0"
- width="295"
+ width="300"
word_wrap="true">
- (waiting)
</text_editor>
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
follows="left|top"
left="0"
name="static4"
top_pad="5"
- width="290">
- Assigned Roles
+ width="300">
+ Assigned Members
</text>
<name_list
- draw_stripes="false"
- height="50"
+ draw_stripes="true"
+ height="60"
layout="topleft"
left="0"
name="role_assigned_members"
top_pad="0"
- width="290" />
+ width="300" />
<check_box
height="15"
label="Reveal members"
layout="topleft"
name="role_visible_in_list"
tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
- top_pad="3"
- width="290" />
+ top_pad="4"
+ width="300" />
<text
type="string"
- height="16"
+ height="13"
layout="topleft"
follows="left|top"
left="0"
name="static5"
top_pad="5"
- width="290">
+ width="300">
Allowed Abilities
</text>
<scroll_list
- draw_stripes="false"
- height="50"
+ draw_stripes="true"
+ height="60"
layout="topleft"
left="0"
name="role_allowed_actions"
search_column="2"
tool_tip="For details of each allowed ability see the abilities tab"
top_pad="0"
- width="295">
- <scroll_list.columns
- label=""
- name="icon"
- width="20" />
+ width="300">
<scroll_list.columns
label=""
name="checkbox"
@@ -464,33 +431,27 @@ things in this group. There&apos;s a broad variety of Abilities.
<scroll_list.columns
label=""
name="action"
- width="250" />
+ width="270" />
</scroll_list>
</panel>
<panel
height="303"
layout="topleft"
- left="10"
+ left="0"
name="actions_footer"
top_delta="0"
- top="245"
+ top="255"
visible="false"
- width="290">
- <text
- type="string"
- height="16"
- layout="topleft"
- name="static"
- width="200">
- Ability description
- </text>
+ width="310">
<text_editor
+ bg_readonly_color="Transparent"
+ text_readonly_color="EmphasisColor"
+ font="SansSerifSmall"
type="string"
enabled="false"
halign="left"
- height="80"
+ height="90"
layout="topleft"
- left_delta="0"
max_length="512"
name="action_description"
top_pad="0"
@@ -500,28 +461,28 @@ things in this group. There&apos;s a broad variety of Abilities.
</text_editor>
<text
type="string"
- height="16"
+ height="14"
layout="topleft"
- left_delta="0"
+ left="5"
name="static2"
top_pad="5"
- width="295">
+ width="300">
Roles with this ability
</text>
<scroll_list
- height="60"
+ height="65"
layout="topleft"
- left="0"
+ left="5"
name="action_roles"
top_pad="0"
- width="295" />
- <text
+ width="300" />
+ <text
type="string"
- height="16"
+ height="14"
layout="topleft"
name="static3"
top_pad="5"
- width="290">
+ width="300">
Members with this ability
</text>
<name_list
@@ -529,6 +490,6 @@ things in this group. There&apos;s a broad variety of Abilities.
layout="topleft"
name="action_members"
top_pad="0"
- width="290" />
+ width="300" />
</panel>
</panel>
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 5a4b0a3892..fac0d5c60f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -309,4 +309,13 @@
name="send_im_to_email"
top_pad="5"
width="400" />
+ <check_box
+ enabled="false"
+ height="16"
+ label="Enable plain text chat history"
+ layout="topleft"
+ left_delta="0"
+ name="plain_text_chat_history"
+ top_pad="5"
+ width="400" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 1b9a99f90b..23832ba120 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -86,7 +86,16 @@
name="autoplay_enabled"
top_pad="10"
width="350" />
- <text
+ <check_box
+ control_name="ParcelMediaAutoPlayEnable"
+ height="16"
+ label="Automatically Play Parcel Media"
+ layout="topleft"
+ left="30"
+ name="parcel_autoplay_enabled"
+ top_pad="10"
+ width="350" />
+ <text
type="string"
length="1"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 98025e28db..88049fe7d1 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -8,6 +8,7 @@
mouse_opaque="false"
width="800">
<string name="control_background_image_name">Inspector_Background</string>
+ <string name="skip_step">0.2</string>
<panel
name="media_region"
bottom="125"
@@ -86,7 +87,7 @@
auto_resize="false"
height="22"
layout="topleft"
- tool_tip="Step back"
+ tool_tip="Navigate back"
width="22"
left="0"
top_delta="4">
@@ -111,7 +112,7 @@
hover_glow_amount="0.15"
height="22"
layout="topleft"
- tool_tip="Step forward"
+ tool_tip="Navigate forward"
top_delta="0"
min_width="22"
width="22">
@@ -165,7 +166,7 @@
min_width="22"
width="22">
<button.commit_callback
- function="MediaCtrl.Stop" />
+ function="MediaCtrl.MediaStop" />
</button>
</layout_panel>
<layout_panel
@@ -360,6 +361,55 @@ function="MediaCtrl.CommitURL" />
</slider_bar>
</layout_panel>
<layout_panel
+ name="skip_back"
+ auto_resize="false"
+ user_resize="false"
+ layout="topleft"
+ min_width="22"
+ width="22">
+ <button
+ image_overlay="SkipBackward_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ auto_resize="false"
+ height="22"
+ layout="topleft"
+ tool_tip="Step back"
+ top="-14"
+ width="22"
+ left="0">
+ <button.commit_callback
+ function="MediaCtrl.SkipBack" />
+ </button>
+ </layout_panel>
+ <layout_panel
+ name="skip_forward"
+ auto_resize="false"
+ user_resize="false"
+ layout="topleft"
+ min_width="22"
+ width="22">
+ <button
+ image_overlay="SkipForward_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ height="22"
+ layout="topleft"
+ tool_tip="Step forward"
+ top="-14"
+ min_width="22"
+ width="22">
+ <button.commit_callback
+ function="MediaCtrl.SkipForward" />
+ </button>
+ </layout_panel>
+ <layout_panel
name="media_volume"
auto_resize="false"
user_resize="false"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 5110b6b2ef..bf1d46451b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,7 +27,8 @@
<string
name="no_partner_text"
value="None" />
- <scroll_container
+ <string name="RegisterDateFormat">[REG_DATE] ([AGE])</string>
+ <scroll_container
color="DkGray2"
follows="all"
height="485"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index add1476179..e25ff0d548 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -81,7 +81,7 @@ regions in the estate.
<view_border
bevel_style="in"
follows="top|left"
- height="290"
+ height="310"
layout="topleft"
left_delta="-4"
top_pad="5"
@@ -185,48 +185,48 @@ regions in the estate.
follows="left|top"
height="20"
layout="topleft"
- left="10"
+ left="15"
name="abuse_email_text"
- top_pad="5"
+ top_pad="10"
width="180">
Abuse email address:
</text>
<line_editor
follows="top|left"
- height="19"
+ height="23"
layout="topleft"
left="15"
name="abuse_email_address"
- top_pad="5"
- width="205" />
+ top_pad="-5"
+ width="230" />
<button
enabled="false"
follows="left|top"
- height="20"
+ height="23"
label="Apply"
layout="topleft"
name="apply_btn"
- right="250"
- top_pad="4"
- width="90" />
+ top_pad="10"
+ left="78"
+ width="97" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Send Message To Estate..."
layout="topleft"
- left="8"
+ left="50"
name="message_estate_btn"
- top_pad="5"
- width="250" />
+ top_pad="20"
+ width="160" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Kick User from Estate..."
layout="topleft"
- left="8"
+ left="50"
name="kick_user_from_estate_btn"
top_pad="5"
- width="250" />
+ width="160" />
<text
type="string"
@@ -243,14 +243,14 @@ regions in the estate.
<view_border
bevel_style="none"
follows="top|left"
- height="60"
+ height="71"
layout="topleft"
right="470"
- top_pad="5"
+ top_pad="-5"
width="200" />
<name_list
follows="left|top"
- height="60"
+ height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@@ -259,22 +259,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
right="470"
top_pad="5"
- width="90" />
+ width="97" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Add..."
layout="topleft"
- left_delta="-110"
+ left_delta="-103"
name="add_estate_manager_btn"
top_delta="0"
- width="90" />
+ width="97" />
<text
type="string"
length="1"
@@ -283,21 +283,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="allow_resident_label"
- top_pad="5"
+ top_pad="10"
width="200">
Allowed Residents:
</text>
<view_border
bevel_style="none"
follows="top|left"
- height="60"
+ height="71"
layout="topleft"
right="470"
- top_pad="5"
+ top_pad="-5"
width="200" />
<name_list
follows="left|top"
- height="60"
+ height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@@ -306,22 +306,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
right="470"
top_pad="5"
- width="90" />
+ width="97" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Add..."
layout="topleft"
- left_delta="-110"
+ left_delta="-103"
name="add_allowed_avatar_btn"
top_delta="0"
- width="90" />
+ width="97" />
<text
type="string"
length="1"
@@ -330,21 +330,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="allow_group_label"
- top_pad="5"
+ top_pad="10"
width="200">
Allowed Groups:
</text>
<view_border
bevel_style="none"
follows="top|left"
- height="60"
+ height="71"
layout="topleft"
right="470"
- top_pad="5"
+ top_pad="-5"
width="200" />
<name_list
follows="left|top"
- height="60"
+ height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@@ -353,22 +353,22 @@ regions in the estate.
width="200" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
right="470"
top_pad="5"
- width="90" />
+ width="97" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Add..."
layout="topleft"
- left_delta="-110"
+ left_delta="-103"
name="add_allowed_group_btn"
top_delta="0"
- width="90" />
+ width="97" />
<text
type="string"
length="1"
@@ -377,21 +377,21 @@ regions in the estate.
layout="topleft"
left_delta="0"
name="ban_resident_label"
- top_pad="5"
+ top_pad="10"
width="200">
Banned Residents:
</text>
<view_border
bevel_style="none"
follows="top|left"
- height="60"
+ height="71"
layout="topleft"
right="470"
- top_pad="5"
+ top_pad="-5"
width="200" />
<name_list
follows="left|top"
- height="60"
+ height="71"
layout="topleft"
left_delta="0"
multi_select="true"
@@ -400,20 +400,20 @@ regions in the estate.
width="200" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
right="470"
top_pad="5"
- width="90" />
+ width="97" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Add..."
layout="topleft"
- left_delta="-110"
+ left_delta="-103"
name="add_banned_avatar_btn"
top_delta="0"
- width="90" />
+ width="97" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 041297a542..b9a89a2ebc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -9,9 +9,9 @@
min_width="240"
name="appearance panel"
width="333">
- <string
- name="looks_tab_title"
- value="Outfits" />
+ <string
+ name="No Outfit"
+ value="No Outfit" />
<panel
left="5" width="320" height="55"
background_visible="true"
@@ -19,25 +19,34 @@
bg_alpha_color="0.2 0.2 0.2 1.0"
name="panel_currentlook"
follows="left|top|right">
+ <button
+ follows="left|right|top"
+ font="SansSerif"
+ top="28" right="-10" width="60" height="20"
+ layout="topleft"
+ label="Edit"
+ name="editappearance_btn"/>
+ <button
+ follows="left|right|top"
+ top="28" left="5" width="25" height="22"
+ image_overlay="Inv_LookFolderOpen"
+ layout="topleft"
+ name="openoutfit_btn"
+ picture_style="true" />
<text
- top="-5" width="200" left="5" height="10" follows="left|right|top"
+ top="10" width="150" left="5" height="15" follows="left|right|top"
+ layout="topleft"
font="SansSerif" text_color="LtGray" word_wrap="true"
mouse_opaque="false" name="currentlook_title">
- Current Outfit
+ Current Outfit:
</text>
<text
- top="-30" left="8" height="10" follows="left|right|top"
+ top="32" width="150" left="32" height="15" follows="left|right|top"
+ layout="topleft"
font="SansSerifBold" text_color="white" word_wrap="true"
mouse_opaque="false" name="currentlook_name" >
MyOutfit
</text>
- <button
- follows="left|right|top"
- font="SansSerif"
- top="28" right="-105" width="60" height="20"
- layout="topleft"
- label="Edit"
- name="editappearance_btn"/>
</panel>
<filter_editor
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e76763d7eb..90fb3a6bf9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
+ For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
@@ -44,8 +44,8 @@
<!-- Disconnection -->
<string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string>
-
-
+
+
<!-- Tooltip, lltooltipview.cpp -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
@@ -80,11 +80,11 @@
<!-- text for SLURL labels -->
<string name="SLurlLabelTeleport">Teleport to</string>
<string name="SLurlLabelShowOnMap">Show Map for</string>
-
+
<!-- ButtonToolTips, llfloater.cpp -->
<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
<string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string>
- <string name="BUTTON_RESTORE">Restore</string>
+ <string name="BUTTON_RESTORE">Restore</string>
<string name="BUTTON_MINIMIZE">Minimize</string>
<string name="BUTTON_TEAR_OFF">Tear Off</string>
<string name="BUTTON_DOCK">Dock</string>
@@ -103,24 +103,24 @@
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>
-
-
+
+
<!-- namecache -->
<!-- Avatar name: text shown for LLUUID::null -->
<string name="AvatarNameNobody">(nobody)</string>
-
+
<!-- Avatar name: text shown while fetching name -->
<string name="AvatarNameWaiting">(waiting)</string>
<!-- Avatar name: More than one avatar is selected/used here -->
<string name="AvatarNameMultiple">(multiple)</string>
-
+
<!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
<string name="AvatarNameHippos">(hippos)</string>
-
+
<!-- Group name: text shown for LLUUID::null -->
<string name="GroupNameNone">(none)</string>
-
+
<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
<string name="AssetErrorNone">No error</string>
<string name="AssetErrorRequestFailed">Asset request: failed</string>
@@ -133,7 +133,7 @@
<string name="AssetErrorCircuitGone">Circuit gone</string>
<string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string>
<string name="AssetErrorUnknownStatus">Unknown status</string>
-
+
<!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* -->
<string name="texture">texture</string>
<string name="sound">sound</string>
@@ -159,7 +159,7 @@
<string name="simstate">simstate</string>
<string name="favorite">favorite</string>
<string name="symbolic link">link</string>
-
+
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
<string name="AvatarAway">Away</string>
@@ -236,17 +236,17 @@
<string name="anim_express_worry">Worry</string>
<string name="anim_yes_happy">Yes (Happy)</string>
<string name="anim_yes_head">Yes</string>
-
+
<!-- world map -->
<string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</string>
<string name="worldmap_results_none_found">None found.</string>
-
+
<!-- animations uploading status codes -->
<string name="Ok">OK</string>
<string name="Premature end of file">Premature end of file</string>
<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
-
+
<!-- Chat -->
<string name="whisper">whispers:</string>
<string name="shout">shouts:</string>
@@ -274,7 +274,7 @@
<string name="SIM_ACCESS_ADULT">Adult</string>
<string name="SIM_ACCESS_DOWN">Offline</string>
<string name="SIM_ACCESS_MIN">Unknown</string>
-
+
<!-- For use when we do not have land type back from the server -->
<string name="land_type_unknown">(unknown)</string>
@@ -294,14 +294,14 @@
<string name="compressed_image_files">Compressed Images</string>
<string name="load_files">Load Files</string>
<string name="choose_the_directory">Choose Directory</string>
-
+
<!-- LSL Usage Hover Tips -->
<!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings. -->
<string name="LSLTipSleepTime" translate="false">
Sleeps script for [SLEEP_TIME] seconds.
</string>
-
+
<string name="LSLTipText_llSin" translate="false">
float llSin(float theta)
Returns the sine of theta (theta in radians)
@@ -1732,7 +1732,7 @@ Returns the value for header for request_id
</string>
<string name="LSLTipText_llSetPrimMediaParams" translate="false">
llSetPrimMediaParams(integer face, list params)
-Sets the media params for a particular face on an object. If media is not already on this object, add it.
+Sets the media params for a particular face on an object. If media is not already on this object, add it.
List is a set of name/value pairs in no particular order. Params not specified are unchanged, or if new media is added then set to the default specified.
The possible names are below, along with the types of values and what they mean.
</string>
@@ -1751,7 +1751,7 @@ Clears (deletes) the media and all params from the given face.
<string name="AvatarSetAway">Away</string>
<string name="AvatarSetNotBusy">Not Busy</string>
<string name="AvatarSetBusy">Busy</string>
-
+
<!-- Wearable Types -->
<string name="shape">Shape</string>
<string name="skin">Skin</string>
@@ -1769,7 +1769,7 @@ Clears (deletes) the media and all params from the given face.
<string name="alpha">Alpha</string>
<string name="tattoo">Tattoo</string>
<string name="invalid">invalid</string>
-
+
<!-- notify -->
<string name="next">Next</string>
<string name="ok">OK</string>
@@ -1782,12 +1782,11 @@ Clears (deletes) the media and all params from the given face.
<string name="GroupNotifySaveAttachment">Save Attachment</string>
<string name="TeleportOffer">Teleport offering</string>
<!-- start-up toast's string-->
- <string name="StartUpNotification">%d new notification arrived while you were away...</string>
- <string name="StartUpNotifications">%d new notifications arrived while you were away...</string>
+ <string name="StartUpNotifications">New notifications arrived while you were away.</string>
<!-- overflow toast's string-->
<string name="OverflowInfoChannelString">You have %d more notification</string>
-
-
+
+
<!-- body parts -->
<string name="BodyPartsRightArm">Right Arm</string>
<string name="BodyPartsHead">Head</string>
@@ -1800,10 +1799,10 @@ Clears (deletes) the media and all params from the given face.
<string name="GraphicsQualityLow">Low</string>
<string name="GraphicsQualityMid">Mid</string>
<string name="GraphicsQualityHigh">High</string>
-
+
<!-- mouselook -->
<string name="LeaveMouselook">Press ESC to return to World View</string>
-
+
<!-- inventory -->
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
<string name="InventoryNoTexture">
@@ -1831,7 +1830,7 @@ this texture in your inventory
<string name="Wave" value=" Wave " />
<string name="HelloAvatar" value=" Hello, avatar! " />
<string name="ViewAllGestures" value=" View All &gt;&gt;" />
-
+
<!-- inventory filter -->
<!-- use value="" because they have preceding spaces -->
<string name="Animations" value=" Animations," />
@@ -1881,21 +1880,21 @@ this texture in your inventory
<!-- inventory FVBridge -->
<string name="Buy">Buy</string>
<string name="BuyforL$">Buy for L$</string>
-
+
<string name="Stone">Stone</string>
<string name="Metal">Metal</string>
<string name="Glass">Glass</string>
<string name="Wood">Wood</string>
<string name="Flesh">Flesh</string>
<string name="Plastic">Plastic</string>
- <string name="Rubber">Rubber</string>
+ <string name="Rubber">Rubber</string>
<string name="Light">Light</string>
-
+
<!-- keyboard -->
<string name="KBShift">Shift</string>
<string name="KBCtrl">Ctrl</string>
- <!-- Avatar Skeleton -->
+ <!-- Avatar Skeleton -->
<string name="Chest">Chest</string>
<string name="Skull">Skull</string>
<string name="Left Shoulder">Left Shoulder</string>
@@ -1925,7 +1924,7 @@ this texture in your inventory
<string name="L Lower Leg">L Lower Leg</string>
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
- <string name="Right Pec">Right Pec</string>
+ <string name="Right Pec">Right Pec</string>
<!-- Avatar age computation, see LLDateUtil::ageFromDate -->
<string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string>
@@ -1934,7 +1933,7 @@ this texture in your inventory
<string name="WeeksOld">[AGEWEEKS] old</string>
<string name="DaysOld">[AGEDAYS] old</string>
<string name="TodayOld">Joined today</string>
-
+
<!-- AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian
@@ -1967,16 +1966,16 @@ this texture in your inventory
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
<string name="AgeVerified">Age-verified</string>
<string name="NotAgeVerified">Not Age-verified</string>
-
- <!-- HUD Position -->
- <string name="Center 2">Center 2</string>
- <string name="Top Right">Top Right</string>
- <string name="Top">Top</string>
- <string name="Top Left">Top Left</string>
- <string name="Center">Center</string>
- <string name="Bottom Left">Bottom Left</string>
- <string name="Bottom">Bottom</string>
- <string name="Bottom Right">Bottom Right</string>
+
+ <!-- HUD Position -->
+ <string name="Center 2">Center 2</string>
+ <string name="Top Right">Top Right</string>
+ <string name="Top">Top</string>
+ <string name="Top Left">Top Left</string>
+ <string name="Center">Center</string>
+ <string name="Bottom Left">Bottom Left</string>
+ <string name="Bottom">Bottom</string>
+ <string name="Bottom Right">Bottom Right</string>
<!-- compile queue-->
<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
@@ -1998,11 +1997,11 @@ this texture in your inventory
<string name="CompileSuccessful">Compile successful!</string>
<string name="CompileSuccessfulSaving">Compile successful, saving...</string>
<string name="SaveComplete">Save complete.</string>
- <string name="ObjectOutOfRange">Script (object out of range)</string>
-
+ <string name="ObjectOutOfRange">Script (object out of range)</string>
+
<!-- god tools -->
<string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string>
-
+
<!-- groups -->
<string name="GroupsNone">none</string>
<string name="Group" value=" (group)" />
@@ -2013,14 +2012,14 @@ this texture in your inventory
<string name="Balance">Balance</string>
<string name="Credits">Credits</string>
<string name="Debits">Debits</string>
- <string name="Total">Total</string>
- <string name="NoGroupDataFound">No group data found for group </string>
-
+ <string name="Total">Total</string>
+ <string name="NoGroupDataFound">No group data found for group </string>
+
<!-- floater IM -->
<string name="IMParentEstate">parent estate</string>
<string name="IMMainland">mainland</string>
<string name="IMTeen">teen</string>
-
+
<!-- floater region info -->
<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
<string name="RegionInfoError">error</string>
@@ -2036,45 +2035,37 @@ this texture in your inventory
<!-- script editor -->
<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
-
+
<!-- panel dir browser -->
<string name="PanelDirCountFound">[COUNT] found</string>
<string name="PanelDirTimeStr">[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]</string>
<!-- panel dir events -->
<string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string>
-
+
<!-- panel contents -->
<string name="PanelContentsNewScript">New Script</string>
-
+
<!-- Mute -->
<string name="MuteByName">(by name)</string>
<string name="MuteAgent">(resident)</string>
<string name="MuteObject">(object)</string>
<string name="MuteGroup">(group)</string>
-
+
<!-- Region/Estate Covenant -->
<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>
<string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string>
<string name="covenant_last_modified">Last Modified:</string>
<string name="none_text" value=" (none) " />
<string name="never_text" value=" (never) " />
-
+
<!--Region Details-->
<string name="GroupOwned">Group Owned</string>
<string name="Public">Public</string>
-
+
<!-- panel classified -->
<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
-
- <!-- group voting dialog -->
- <string name="GroupVoteYes">Yes</string>
- <string name="GroupVoteNo">No</string>
- <string name="GroupVoteNoActiveProposals">There are currently no active proposals</string>
- <string name="GroupVoteNoArchivedProposals">There are currently no archived proposals</string>
- <string name="GroupVoteRetrievingArchivedProposals">Retrieving archived proposals</string>
- <string name="GroupVoteRetrievingActiveProposals">Retrieving active proposals</string>
<!-- Multi Preview Floater -->
<string name="MultiPreviewTitle">Preview</string>
@@ -2089,7 +2080,7 @@ this texture in your inventory
<string name="InvOfferGaveYou">gave you</string>
<string name="InvOfferYouDecline">You decline</string>
<string name="InvOfferFrom">from</string>
-
+
<!-- group money -->
<string name="GroupMoneyTotal">Total</string>
<string name="GroupMoneyBought">bought</string>
@@ -2101,21 +2092,21 @@ this texture in your inventory
<string name="GroupMoneyBalance">Balance</string>
<string name="GroupMoneyCredits">Credits</string>
<string name="GroupMoneyDebits">Debits</string>
-
+
<!-- viewer object -->
<string name="ViewerObjectContents">Contents</string>
-
+
<!-- Viewer menu -->
<string name="AcquiredItems">Acquired Items</string>
- <string name="Cancel">Cancel</string>
- <string name="UploadingCosts">Uploading %s costs</string>
+ <string name="Cancel">Cancel</string>
+ <string name="UploadingCosts">Uploading %s costs</string>
<string name="UnknownFileExtension">
Unknown file extension .%s
Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
- </string>
- <string name="AddLandmarkNavBarMenu">Add Landmark...</string>
+ </string>
+ <string name="AddLandmarkNavBarMenu">Add Landmark...</string>
<string name="EditLandmarkNavBarMenu">Edit Landmark...</string>
-
+
<!-- menu accelerators -->
<string name="accel-mac-control">&#8963;</string>
<string name="accel-mac-command">&#8984;</string>
@@ -2126,72 +2117,72 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="accel-win-shift">Shift+</string>
<!-- Previews -->
- <string name="FileSaved">File Saved</string>
- <string name="Receiving">Receiving</string>
-
+ <string name="FileSaved">File Saved</string>
+ <string name="Receiving">Receiving</string>
+
<!-- status bar , Time -->
- <string name="AM">AM</string>
- <string name="PM">PM</string>
- <string name="PST">PST</string>
- <string name="PDT">PDT</string>
+ <string name="AM">AM</string>
+ <string name="PM">PM</string>
+ <string name="PST">PST</string>
+ <string name="PDT">PDT</string>
<!-- Directions, HUD -->
- <string name="Forward">Forward</string>
- <string name="Left">Left</string>
- <string name="Right">Right</string>
- <string name="Back">Back</string>
- <string name="North">North</string>
- <string name="South">South</string>
- <string name="West">West</string>
- <string name="East">East</string>
- <string name="Up">Up</string>
- <string name="Down">Down</string>
+ <string name="Forward">Forward</string>
+ <string name="Left">Left</string>
+ <string name="Right">Right</string>
+ <string name="Back">Back</string>
+ <string name="North">North</string>
+ <string name="South">South</string>
+ <string name="West">West</string>
+ <string name="East">East</string>
+ <string name="Up">Up</string>
+ <string name="Down">Down</string>
<!-- Search Category Strings -->
- <string name="Any Category">Any Category</string>
- <string name="Shopping">Shopping</string>
- <string name="Land Rental">Land Rental</string>
- <string name="Property Rental">Property Rental</string>
- <string name="Special Attraction">Special Attraction</string>
- <string name="New Products">New Products</string>
- <string name="Employment">Employment</string>
- <string name="Wanted">Wanted</string>
- <string name="Service">Service</string>
- <string name="Personal">Personal</string>
+ <string name="Any Category">Any Category</string>
+ <string name="Shopping">Shopping</string>
+ <string name="Land Rental">Land Rental</string>
+ <string name="Property Rental">Property Rental</string>
+ <string name="Special Attraction">Special Attraction</string>
+ <string name="New Products">New Products</string>
+ <string name="Employment">Employment</string>
+ <string name="Wanted">Wanted</string>
+ <string name="Service">Service</string>
+ <string name="Personal">Personal</string>
<!-- PARCEL_CATEGORY_UI_STRING -->
- <string name="None">None</string>
- <string name="Linden Location">Linden Location</string>
- <string name="Adult">Adult</string>
- <string name="Arts&amp;Culture">Arts &amp; Culture</string>
- <string name="Business">Business</string>
- <string name="Educational">Educational</string>
- <string name="Gaming">Gaming</string>
- <string name="Hangout">Hangout</string>
- <string name="Newcomer Friendly">Newcomer Friendly</string>
+ <string name="None">None</string>
+ <string name="Linden Location">Linden Location</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Arts &amp; Culture</string>
+ <string name="Business">Business</string>
+ <string name="Educational">Educational</string>
+ <string name="Gaming">Gaming</string>
+ <string name="Hangout">Hangout</string>
+ <string name="Newcomer Friendly">Newcomer Friendly</string>
<string name="Parks&amp;Nature">Parks &amp; Nature</string>
- <string name="Residential">Residential</string>
+ <string name="Residential">Residential</string>
<!--<string name="Shopping">Shopping</string> -->
- <string name="Stage">Stage</string>
- <string name="Other">Other</string>
- <string name="Any">Any</string>
- <string name="You">You</string>
-
+ <string name="Stage">Stage</string>
+ <string name="Other">Other</string>
+ <string name="Any">Any</string>
+ <string name="You">You</string>
+
<!-- punctuations -->
- <string name=":">:</string>
- <string name=",">,</string>
- <string name="...">...</string>
- <string name="***">***</string>
- <string name="(">(</string>
+ <string name=":">:</string>
+ <string name=",">,</string>
+ <string name="...">...</string>
+ <string name="***">***</string>
+ <string name="(">(</string>
<string name=")">)</string>
- <string name=".">.</string>
- <string name="'">'</string>
- <string name="---">---</string>
+ <string name=".">.</string>
+ <string name="'">'</string>
+ <string name="---">---</string>
<!-- media -->
<string name="Multiple Media">Multiple Media</string>
<string name="Play Media">Play/Pause Media</string>
-
+
<!-- OSMessageBox messages -->
<string name="MBCmdLineError">
An error was found parsing the command line.
@@ -2800,13 +2791,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Wide Lips">Wide Lips</string>
<string name="Wild">Wild</string>
<string name="Wrinkles">Wrinkles</string>
-
+
<!-- Favorites Bar -->
<string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string>
<string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string>
<string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string>
<string name="LocationCtrlComboBtnTooltip">My location history</string>
-
+
<!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">
[APP_NAME] Update
@@ -2868,9 +2859,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="inventory_item_offered-im">
Inventory item offered
</string>
- <string name="share_alert">
- Drag items from inventory here
- </string>
<string name="only_user_message">
You are the only user in this session.
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
new file mode 100644
index 0000000000..5011bf6a61
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chiclet_script
+ name="script_chiclet">
+ <icon
+ name="chiclet_icon"
+ follows="all"
+ mouse_opaque="false"
+ image_name="Generic_Object_Small" />
+</expandable_text> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 1d8257fbc8..64c2e65a6e 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -6,6 +6,7 @@
image_unselected="SegmentedBtn_Left_Off"
-->
<speak_button
+ follows="left|right"
name="left"
label="Speak"
label_selected="Speak"
@@ -13,6 +14,7 @@
tab_stop="false"
/>
<show_button
+ follows="right"
name="right"
label=""
left="0"
@@ -25,6 +27,7 @@
image_unselected="ComboButton_UpOff"
/>
<monitor
+ follows="right"
name="monitor"
left="0"
top="18"
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index ff50b56a32..cdc7ae49ff 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="NAVEGADOR">
+ <floater.string name="home_page_url">
+ http://es.secondlife.com
+ </floater.string>
+ <floater.string name="support_page_url">
+ http://es.secondlife.com/support
+ </floater.string>
<layout_stack name="stack1">
<layout_panel name="nav_controls">
<button label="Atrás" name="back" width="75"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 33754f3935..fdb6a92084 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="Preferencias" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es" />
+ </menu_item_call>
+ </menu>
<menu label="Archivo" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="Subir" name="upload">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 86f3f1f125..6b58bbea47 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -374,10 +374,13 @@ La carpeta del vestuario contiene partes del cuerpo, u objetos a anexar o que no
Debe escribir tanto el nombre como el apellido de su avatar, los dos.
Necesita una cuenta para entrar en [SECOND_LIFE]. ¿Quiere crear una ahora?
+ <url name="url">
+ https://join.secondlife.com/index.php?lang=es-ES
+ </url>
<usetemplate name="okcancelbuttons" notext="Volver a intentarlo" yestext="Crear una cuenta nueva"/>
</notification>
<notification name="AddClassified">
- Los anuncios clasificados aparecen durante una semana en la sección &apos;Clasificados&apos; del directorio Buscar y en www.secondlife.com.
+ Los anuncios clasificados aparecen durante una semana en la sección &apos;Clasificados&apos; del directorio Buscar y en [http://secondlife.com/community/classifieds/?lang=es-ES secondlife.com].
Rellene su anuncio y pulse &apos;Publicar...&apos; para añadirlo al directorio.
Cuando pulse Publicar, se le preguntará por un precio a pagar.
El pagar más hará que su anuncio aparezca más arriba en la lista, y que también aparezca más arriba cuando la gente busque por palabras clave.
@@ -398,6 +401,9 @@ No se reembolsan las cuotas pagadas.
</notification>
<notification name="PromptGoToEventsPage">
¿Ir a la web de eventos de [SECOND_LIFE]?
+ <url name="url">
+ http://secondlife.com/events/?lang=es-ES
+ </url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="SelectProposalToView">
@@ -575,6 +581,9 @@ misma región.
[EXTRA]
¿Ir a [_URL] para informarse sobre la compra de L$?
+ <url name="url">
+ http://secondlife.com/app/currency/?lang=es-ES
+ </url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -1140,13 +1149,16 @@ Puede usar normalmente [SECOND_LIFE], los demás residentes le verán correctame
Se ha completado la instalación de [APP_NAME].
Si esta es la primera vez que usa [SECOND_LIFE], deberá crear una cuenta antes de que pueda iniciar una sesión.
-¿Volver a www.secondlife.com para crear una cuenta nueva?
+¿Volver a [https://join.secondlife.com/index.php?lang=es-ES secondlife.com] para crear una cuenta nueva?
<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
</notification>
<notification name="LoginPacketNeverReceived">
Tenemos problemas de conexión. Puede deberse a un problema de su conexión a internet o de los servidores de [SECOND_LIFE].
Puede revisar su conexión a internet y volver a intentarlo en unos minutos. Pulse Ayuda para conectarse a nuestro sitio de Sporte, o pulse Teleportar para intentar teleportarse a su Base.
+ <url name="url">
+ http://es.secondlife.com/support/
+ </url>
<form name="form">
<button name="OK" text="OK"/>
<button name="Help" text="Ayuda"/>
@@ -1520,7 +1532,7 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C
¿Quiere ir a la Base de Conocimientos para aprender más sobre el nivel de calificación?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
</url>
<usetemplate
name="okcancelignore"
@@ -1559,7 +1571,7 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C
¿Quiere ir a la Base de Conocimientos para más información sobre el nivel de calificación?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
</url>
<usetemplate
name="okcancelignore"
@@ -1593,7 +1605,7 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C
¿Quiere ir a la Base de Conocimientos para más información sobre el nivel de calificación?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
</url>
<usetemplate
name="okcancelignore"
@@ -2014,10 +2026,7 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u
<usetemplate ignoretext="Cuando esté saliendo de [APP_NAME]." name="okcancelignore" notext="Continuar" yestext="Salir"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Use esta herramienta para denunciar violaciones de las Normas de la Comunidad y las Condiciones del Servicio. Vea:
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
+ Use esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php?lang=es-ES Condiciones del Servicio] y las [http://secondlife.com/corporate/cs.php?lang=es-ES Normas de la Comunidad].
Se investigan y resuelven todas las infracciones denunciadas de las Normas de la Comunidad y las Condiciones del Servicio. Puede ver la resolución tomada en el Informe de Incidentes, en:
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 6505424b35..52c3855d6a 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
- <string name="real_url">
- http://secondlife.com/app/login/
- </string>
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
+ <panel.string name="create_account_url">
+ http://join.secondlife.com/index.php?lang=es-ES
+ </panel.string>
+ <panel.string name="forgot_password_url">
+ http://secondlife.com/account/request.php?lang=es
+ </panel.string>
+<panel name="login_widgets">
<text name="first_name_text">
Nombre:
</text>
@@ -35,3 +36,4 @@
[VERSION]
</text>
</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml
new file mode 100644
index 0000000000..218e03dcce
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_profile.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="payment_update_link_url">
+ http://www.secondlife.com/account/billing.php?lang=es-ES
+ </string>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=es
+ </string>
+ <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=es-ES"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 294e407278..dc508f7c37 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=es-ES</string>
<string name="LoginInProgress">
Iniciando la sesión. [APP_NAME] debe de aparecer congelado. Por favor, espere.
</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 44ab075271..986deaabc9 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="NAVIGATEUR">
<floater.string name="home_page_url">
- http://www.secondlife.com
+ http://fr.secondlife.com
</floater.string>
<floater.string name="support_page_url">
- http://support.secondlife.com
+ http://fr.secondlife.com/support
</floater.string>
<layout_stack name="stack1">
<layout_panel name="nav_controls">
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index ea28b82d7e..532714531b 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="Préférences" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr" />
+ </menu_item_call>
+ </menu>
<menu label="Fichier" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="Importer" name="upload">
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 7f6960c8fb..558b04d68e 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -285,7 +285,7 @@ Vous devez saisir le nom et le prénom de votre avatar.
Pour entrer dans [SECOND_LIFE], vous devez avoir un compte. Voulez-vous en créer un maintenant ?
<url name="url">
- http://join.secondlife.com/
+ https://join.secondlife.com/index.php?lang=fr-FR
</url>
<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
</notification>
@@ -312,7 +312,7 @@ Une fois payés, les frais ne sont pas remboursables.
<notification name="PromptGoToEventsPage">
Aller à la page web de [SECOND_LIFE] réservée aux événements ?
<url name="url">
- http://secondlife.com/events/
+ http://secondlife.com/events/?lang=fr-FR
</url>
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
@@ -493,7 +493,7 @@ Veuillez mettre tous les objets que vous souhaitez acquérir dans la même régi
Aller sur [_URL] pour obtenir des informations sur l&apos;achat de L$ ?
<url name="url">
- http://secondlife.com/app/currency/
+ http://secondlife.com/app/currency/?lang=fr-FR
</url>
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
@@ -1038,7 +1038,7 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
L&apos;installation de [APP_NAME] est terminée.
S&apos;il s&apos;agit de la première fois que vous utilisez [SECOND_LIFE], vous devrez créer un compte avant de pouvoir vous connecter.
-Retourner sur www.secondlife.com pour créer un nouveau compte ?
+Retourner sur [https://join.secondlife.com/index.php?lang=fr-FR secondlife.com] pour créer un nouveau compte ?
<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
</notification>
<notification name="LoginPacketNeverReceived">
@@ -1046,7 +1046,7 @@ Retourner sur www.secondlife.com pour créer un nouveau compte ?
Vérifiez votre connextion Internet et réessayez dans quelques minutes, cliquez sur Aide pour consulter la page [SUPPORT_SITE] ou bien sur Téléporter pour essayer d&apos;aller chez vous.
<url name="url">
- http://secondlife.com/support/
+ http://fr.secondlife.com/support/
</url>
<form name="form">
<button name="OK" text="OK"/>
@@ -1436,7 +1436,7 @@ Vérifiez que vous avez la toute dernière version du client et consultez les pa
Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
<url name="url">
- http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
</url>
<usetemplate ignoretext="Je ne peux pas pénétrer dans cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
</notification>
@@ -1464,7 +1464,7 @@ Vérifiez que vous avez la toute dernière version du client et consultez les pa
Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
<url name="url">
- http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
</url>
<usetemplate ignoretext="Je ne peux pas réclamer cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
</notification>
@@ -1488,7 +1488,7 @@ Vérifiez que vous avez la toute dernière version du client et consultez les pa
Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
<url name="url">
- http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
</url>
<usetemplate ignoretext="Je ne peux pas acheter ce terrain car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
</notification>
@@ -1672,10 +1672,7 @@ Déplacer les objets de l&apos;inventaire ?
<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Utilisez cet outil pour signaler des infractions aux Conditions d&apos;utilisation et aux Règles de la communauté. Voir :
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
+ Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php?lang=fr-FR Conditions d&apos;utilisation] et aux [http://secondlife.com/corporate/cs.php?lang=fr-FR Règles de la communauté].
Lorsqu&apos;elles sont signalées, toutes les infractions aux Conditions d&apos;utilisation et aux Règles de la communauté font l&apos;objet d&apos;une enquête et sont résolues. Pour accéder aux détails de la résolution d&apos;un incident, allez sur :
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 284590cd5d..f7ab2891e8 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="create_account_url">
- http://secondlife.com/registration/
+ http://fr.secondlife.com/registration/
</panel.string>
<panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
+ http://secondlife.com/account/request.php?lang=fr
</panel.string>
<panel name="login_widgets">
<line_editor name="first_name_edit" tool_tip="Prénom sur [SECOND_LIFE]"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
new file mode 100644
index 0000000000..642e31a2c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+ <text name="title" value="Infos"/>
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <text name="pick_name" value="[name]"/>
+ <text name="pick_location" value="[chargement...]"/>
+ <text name="pick_desc" value="[description]"/>
+ </panel>
+ </scroll_container>
+ <panel name="buttons">
+ <button label="Téléporter" name="teleport_btn"/>
+ <button label="Carte" name="show_on_map_btn"/>
+ <button label="Éditer" name="edit_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index e13de7a5d1..dc28547cb4 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Profil" name="panel_profile">
<string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
</string>
<string name="payment_update_link_url">
- http://www.secondlife.com/account/billing.php?lang=en
+ http://www.secondlife.com/account/billing.php?lang=fr-FR
</string>
- <string name="my_account_link_url" value="http://secondlife.com/account"/>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=fr
+ </string>
+ <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=fr-FR"/>
<string name="no_partner_text" value="Aucun"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 2d0df66f18..c59e359d6e 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=fr-FR</string>
<string name="SECOND_LIFE">
Second Life
</string>
@@ -158,7 +159,7 @@
Cliquez pour exécuter la commande secondlife:// command
</string>
<string name="BUTTON_CLOSE_DARWIN">
- Fermer (⌘-W)
+ Fermer (&#8984;W)
</string>
<string name="BUTTON_CLOSE_WIN">
Fermer (Ctrl+W)
@@ -1311,16 +1312,16 @@
Modifier le repère...
</string>
<string name="accel-mac-control">
- ⌃
+ &#8963;
</string>
<string name="accel-mac-command">
- ⌘
+ &#8984;
</string>
<string name="accel-mac-option">
- ⌥
+ &#8997;
</string>
<string name="accel-mac-shift">
- ⇧
+ &#8679;
</string>
<string name="accel-win-control">
Ctrl+
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
index 7a5f9c9fcb..0e25cef60b 100644
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="BROWSER MULTIMEDIALE">
+ <floater.string name="home_page_url">
+ http://it.secondlife.com
+ </floater.string>
+ <floater.string name="support_page_url">
+ http://it.secondlife.com/support
+ </floater.string>
<layout_stack name="stack1">
<layout_panel name="nav_controls">
<button label="Indietro" name="back" width="75"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 0010f42a12..b1eb80149e 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="Preferenze" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=it" />
+ </menu_item_call>
+ </menu>
<menu label="File" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="Carica" name="upload">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 8f8a969ace..26a64a49d3 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -379,10 +379,13 @@ La cartella equipaggiamento non contiene abbigliamento, parti del corpo o attach
Devi inserire sia il nome che il cognome del tuo avatar.
Hai bisogno di un account per entrare in [SECOND_LIFE]. Ne vuoi creare uno adesso?
+ <url name="url">
+ https://join.secondlife.com/index.php?lang=it-IT
+ </url>
<usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/>
</notification>
<notification name="AddClassified">
- Gli annunci appaiono nella sezione &apos;Annunci&apos; della ricerca nel database e su www.secondlife.com per una settimana.
+ Gli annunci appaiono nella sezione &apos;Annunci&apos; della ricerca nel database e su [http://secondlife.com/community/classifieds/?lang=it-IT secondlife.com] per una settimana.
Compila il tuo annuncio e clicca &apos;Pubblica...&apos; per aggiungerlo al database.
Ti verrà chiesto un prezzo da pagare quando clicchi su Pubblica.
Pagare un prezzo più alto fa sì che il tuo annuncio compaia più in alto nella lista, e che sia più facile da trovare quando la gente ricerca per parole chiavi.
@@ -403,6 +406,9 @@ Non ci sono rimborsi per la tariffa pagata.
</notification>
<notification name="PromptGoToEventsPage">
Vai alla pagina degli eventi di [SECOND_LIFE]?
+ <url name="url">
+ http://secondlife.com/events/?lang=it-IT
+ </url>
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="SelectProposalToView">
@@ -575,6 +581,9 @@ Sposta tutti gli oggetti che vuoi acquisire su una sola regione.
[EXTRA]
Vuoi andare su [_URL] per maggiori informazioni su come acquistare L$?
+ <url name="url">
+ http://secondlife.com/app/currency/?lang=it-IT
+ </url>
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -1128,13 +1137,16 @@ Puoi usare [SECOND_LIFE] normalmente e gli altri utenti ti vedranno correttament
L&apos;installazione di [APP_NAME] è completata.
Se questa è la prima volta che usi [SECOND_LIFE], avari bisogno di creare un account prima di poterti collegare.
-Vai su www.secondlife.com per creare un nuovo account?
+Vai su [https://join.secondlife.com/index.php?lang=it-IT secondlife.com] per creare un nuovo account?
<usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/>
</notification>
<notification name="LoginPacketNeverReceived">
Ci sono stati problemi durante la connessione. Potrebbero esserci problemi con la tua connessione ad internet oppure con i server di [SECOND_LIFE].
Puoi controllare la tua connessione internet e riprovare fra qualche minuto, oppure cliccare su Aiuto per collegarti al nostro sito di supporto, oppure cliccare teleporta per cercare di teleportarti a casa.
+ <url name="url">
+ http://it.secondlife.com/support/
+ </url>
<form name="form">
<button name="OK" text="OK"/>
<button name="Help" text="Aiuto"/>
@@ -1510,7 +1522,7 @@ Verifica di avere installato l&apos;ultima versione del programma e vai alla Kno
Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di accesso?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
</url>
<usetemplate
name="okcancelignore"
@@ -1549,7 +1561,7 @@ Verifica di avere installato l&apos;ultima versione del programma e vai alla Kno
Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
</url>
<usetemplate
name="okcancelignore"
@@ -1583,7 +1595,7 @@ Verifica di avere installato l&apos;ultima versione del programma e vai alla Kno
Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
</url>
<usetemplate
name="okcancelignore"
@@ -2008,10 +2020,7 @@ Trasferisci gli elementi nell&apos;inventario?
<usetemplate ignoretext="Quando esci da [APP_NAME]." name="okcancelignore" notext="Continua" yestext="Esci"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Usa questo strumento per segnalare violazioni ai Termini di Servizio e agli standard della Comunità. Vedi:
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
+ Usa questo strumento per segnalare violazioni ai [http://secondlife.com/corporate/tos.php?lang=it-IT Termini di Servizio] e agli [http://secondlife.com/corporate/cs.php?lang=it-IT standard della Comunità].
Tutte gli abusi ai Termini di Servizio e agli Standard della Comunità segnalati, sono indagati e risolti. Puoi controllare la risoluzione degli abusi visitando la pagina delle Risoluzioni degli Incidenti:
@@ -2366,7 +2375,7 @@ Vuoi visitare il sito di [SECOND_LIFE] per verificare la tua eta?
[_URL]
<url name="url" option="0">
- https://secondlife.com/account/verification.php
+ https://secondlife.com/account/verification.php?lang=it
</url>
<usetemplate ignoretext="Quando hai un avviso per mancanza della verifica dell&apos;età." name="okcancelignore" notext="No" yestext="Si"/>
</notification>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 1782089039..e3cb7473fc 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
- <string name="real_url">
- http://secondlife.com/app/login/
- </string>
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
+ <panel.string name="create_account_url">
+ http://join.secondlife.com/index.php?lang=it-IT
+ </panel.string>
+ <panel.string name="forgot_password_url">
+ http://secondlife.com/account/request.php?lang=it
+ </panel.string>
+<panel name="login_widgets">
<text name="first_name_text" left="20">
Nome:
</text>
@@ -37,3 +38,4 @@
[VERSION]
</text>
</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile.xml b/indra/newview/skins/default/xui/it/panel_profile.xml
new file mode 100644
index 0000000000..2aa8b7d0e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_profile.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="payment_update_link_url">
+ http://www.secondlife.com/account/billing.php?lang=it-IT
+ </string>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=it
+ </string>
+ <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=it-IT"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index bc3cc38a40..6e3301fdd9 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=it-IT</string>
<string name="LoginInProgress">
In connessione. [APP_NAME] può sembrare rallentata. Attendi.
</string>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index bb33a14be4..77aeeefe02 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="環境設定" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja" />
+ </menu_item_call>
+ </menu>
<menu label="ファイル" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="アップロード" name="upload">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 9962bedaf2..fca7c89183 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -340,7 +340,7 @@ L$が不足しているのでこのグループに参加することができま
<notification name="PromptGoToEventsPage">
[SECOND_LIFE]イベント・ウェブ・ページに移動しますか?
<url name="url">
- http://jp.secondlife.com/events/
+ http://secondlife.com/events/?lang=ja-JP
</url>
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
@@ -530,7 +530,7 @@ L$が不足しているのでこのグループに参加することができま
[_URL] でリンデンドル購入に関する情報を確認しますか?
<url name="url">
- http://jp.secondlife.com/currency/
+ http://secondlife.com/app/currency/?lang=ja-JP
</url>
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
@@ -1113,7 +1113,7 @@ L$は返金されません。
[SECOND_LIFE] の使用が初めての方は、
ログイン前にアカウントの作成が必要です。
-www.secondlife.comに移動し、新規アカウントの作成を行いますか?
+[https://join.secondlife.com/index.php?lang=ja-JP secondlife.com]に移動し、新規アカウントの作成を行いますか?
<usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/>
</notification>
<notification name="LoginPacketNeverReceived">
@@ -1524,7 +1524,7 @@ F1キーを押してください。
ナレッジベースを開きレーティング区分について学びますか?
<url name="url">
- http://wiki.secondlife.com/wiki/レーティング区分概要_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
</url>
<usetemplate ignoretext="レーティング区分の制限のため、このリージョンに入ることができません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
</notification>
@@ -1553,7 +1553,7 @@ F1キーを押してください。
ナレッジベースを開きレーティング区分について学びますか?
<url name="url">
- http://wiki.secondlife.com/wiki/レーティング区分概要_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
</url>
<usetemplate ignoretext="レーティング区分の制限のため、この土地を取得できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
</notification>
@@ -1578,7 +1578,7 @@ F1キーを押してください。
ナレッジベースを開きレーティング区分について学びますか?
<url name="url">
- http://wiki.secondlife.com/wiki/レーティング区分概要_(KB)
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
</url>
<usetemplate ignoretext="レーティング区分の制限のため、この土地を購入できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
</notification>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 00b9d5aa47..27eed48d82 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -4,7 +4,7 @@
http://jp.secondlife.com/registration/
</panel.string>
<panel.string name="forgot_password_url">
- http://secondlife.com/account/request.php
+ http://secondlife.com/account/request.php?lang=ja
</panel.string>
<panel name="login_widgets">
<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] ファーストネーム"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml
index 8c94833a54..a449c10e10 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="プロフィール" name="panel_profile">
<string name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
</string>
<string name="payment_update_link_url">
- http://www.secondlife.com/account/billing.php?lang=ja
+ http://www.secondlife.com/account/billing.php?lang=ja-JP
</string>
- <string name="my_account_link_url" value="http://secondlife.com/account"/>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=ja
+ </string>
+ <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=ja-JP"/>
<string name="no_partner_text" value="なし"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index d6d41aecc0..fc9e4b67b7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=ja-JP</string>
<string name="SECOND_LIFE">
Second Life
</string>
@@ -158,7 +159,7 @@
クリックして secondlife:// コマンドを出す
</string>
<string name="BUTTON_CLOSE_DARWIN">
- 閉じる (⌘-W)
+ 閉じる (&#8984;W)
</string>
<string name="BUTTON_CLOSE_WIN">
閉じる (Ctrl+W)
@@ -1311,16 +1312,16 @@
ランドマークを編集...
</string>
<string name="accel-mac-control">
- ⌃
+ &#8963;
</string>
<string name="accel-mac-command">
- ⌘
+ &#8984;
</string>
<string name="accel-mac-option">
- ⌥
+ &#8997;
</string>
<string name="accel-mac-shift">
- ⇧
+ &#8679;
</string>
<string name="accel-win-control">
Ctrl+
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index 9a83eaea61..a282c267a1 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -380,6 +380,9 @@ De outfit folder bevat geen kleding, lichaamsdelen of externe bevestigingen.
U moet zowel de voornaam als de achternaam van uw avatar opgeven.
U heeft een account nodig om [SECOND_LIFE] binnen te gaan. Wilt u er nu een maken?
+ <url name="url">
+ https://join.secondlife.com/index.php?lang=nl-NL
+ </url>
<usetemplate name="okcancelbuttons" notext="Probeer het opnieuw" yestext="Maak een nieuw account"/>
</notification>
<notification name="AddClassified">
@@ -1131,7 +1134,7 @@ U kunt [SECOND_LIFE] normaal gebruiken en anderen zullen u correct zien.
[APP_NAME] installatie compleet.
Als dit de eerste keer is dat u [SECOND_LIFE] gebruikt, zult u een account aan moeten maken voordat u in kan loggen.
-Terugkeren naar www.secondlife.com om een nieuw account aan te maken?
+Terugkeren naar [https://join.secondlife.com/index.php?lang=nl-NL secondlife.com] om een nieuw account aan te maken?
<usetemplate name="okcancelbuttons" notext="Doorgaan" yestext="Nieuw Account..."/>
</notification>
<notification name="LoginPacketNeverReceived">
diff --git a/indra/newview/skins/default/xui/nl/panel_login.xml b/indra/newview/skins/default/xui/nl/panel_login.xml
index 5bfb9dd235..235e15e7fb 100644
--- a/indra/newview/skins/default/xui/nl/panel_login.xml
+++ b/indra/newview/skins/default/xui/nl/panel_login.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
- <string name="real_url">
- http://secondlife.com/app/login/
- </string>
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
+ <panel.string name="create_account_url">
+ http://join.secondlife.com/index.php?lang=nl-NL
+ </panel.string>
+ <panel.string name="forgot_password_url">
+ http://secondlife.com/account/request.php?lang=nl-NL
+ </panel.string>
+<panel name="login_widgets">
<text name="first_name_text">
Voornaam:
</text>
@@ -35,3 +36,4 @@
[VERSION]
</text>
</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index 49ebcd319c..0be5ec9e86 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=nl-NL</string>
<string name="LoginInProgress">
Inloggen. Het kan lijken dat [APP_NAME] is vastgelopen. Wacht u alstublieft... .
</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index 3437dfcdba..1cd6d5662c 100644
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater min_width="477" name="floater_about" title="NAVEGADOR DE MÍDIA" width="570">
+ <floater.string name="home_page_url">
+ http://br.secondlife.com
+ </floater.string>
+ <floater.string name="support_page_url">
+ http://br.secondlife.com/support
+ </floater.string>
<layout_stack name="stack1" width="550">
<layout_panel name="nav_controls">
<button label="Para trás" name="back" width="75"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index c476ef0bbc..2c887fa50c 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
+ <menu name="Me">
+ <menu_item_call label="Preferências" name="Preferences"/>
+ <menu_item_call name="Manage My Account">
+ <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt" />
+ </menu_item_call>
+ </menu>
<menu label="Arquivo" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
<menu label="Upload" name="upload">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 0ee2c5cb84..c3ce53861f 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -377,10 +377,13 @@ Scripts devem ser permitidos para fazer as armas funcionarem.
Você precisa entrar com ambos os Nome e Sobrenome do seu avatar.
Você precisa de uma conta para entrar no [SECOND_LIFE]. Você gostaria de criar uma conta agora?
+ <url name="url">
+ https://join.secondlife.com/index.php?lang=pt-BR
+ </url>
<usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Criar uma nova conta"/>
</notification>
<notification name="AddClassified">
- Anúncios classificados aparecem na seção &apos;Classificados&apos; do diretório de Busca e no www.secondlife.com por uma semana.
+ Anúncios classificados aparecem na seção &apos;Classificados&apos; do diretório de Busca e no [http://secondlife.com/community/classifieds/?lang=pt-BR secondlife.com] por uma semana.
Preencha seu anúncio e então clique &apos;Publicar...&apos; para adicioná-lo ao diretório.
Será solicitado a você um preço a ser pago, quando você clicar Publicar.
Pagando mais, faz com que seu anúncio apareça em posição mais alta na lista e também em posição mais alta, quando as pessoas buscarem por palavras-chave.
@@ -401,6 +404,9 @@ Não há reembolso por taxas já pagas.
</notification>
<notification name="PromptGoToEventsPage">
Ir até a página web de enventos [SECOND_LIFE] ?
+ <url name="url">
+ http://secondlife.com/events/?lang=pt-BR
+ </url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir à página"/>
</notification>
<notification name="SelectProposalToView">
@@ -492,7 +498,7 @@ O objeto pode estar fora de alcance ou ter sido deletado.
MINSPECS
Você deseja visitar [_URL] para maiores informações?
<url name="url" option="0">
- http://www.secondlife.com/corporate/sysreqs.php
+ http://secondlife.com/support/sysreqs.php?lang=pt
</url>
<usetemplate ignoretext="Ao detectar hardware não suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
</notification>
@@ -571,6 +577,9 @@ Por favor, mova todos os objetos a serem adquiridos para uma mesma região.
[EXTRA]
Vá para [_URL] para informação sobre compra de L$.
+ <url name="url">
+ http://secondlife.com/app/currency/?lang=pt-BR
+ </url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir até a página"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -1115,13 +1124,16 @@ Você pode usar o [SECOND_LIFE] normalmente e os outros o visualizarão corretam
A instalação do [APP_NAME] está completa.
Se esta é a primeira vez usando o[SECOND_LIFE], será necessário que você crie uma conta antes de poder se logar.
-Retornar a www.secondlife.com para criar uma nova conta?
+Retornar a [https://join.secondlife.com/index.php?lang=pt-BR secondlife.com] para criar uma nova conta?
<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/>
</notification>
<notification name="LoginPacketNeverReceived">
Estamos com problemas de conexão. Pode ser problema com a conexão de sua internet ou com os servidores do [SECOND_LIFE].
Voce tanto pode checar a conexão de sua internet e tentar novamente em alguns minutos, ou clicar em Teletransporte para tentar teletransportar-se para sua casa.
+ <url name="url">
+ http://br.secondlife.com/support/
+ </url>
<form name="form">
<button name="OK" text="OK"/>
<button name="Help" text="Ajuda"/>
@@ -1492,7 +1504,7 @@ Por favor, verifique se você está com o último Visualizador instalado e vá a
Ir para o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
</url>
<usetemplate
name="okcancelignore"
@@ -1531,7 +1543,7 @@ Por favor, verifique se você tem o último Visualizador instalado e vá para o
Ir para a o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
</url>
<usetemplate
name="okcancelignore"
@@ -1565,7 +1577,7 @@ Por favor, verifique se você tem o último Visualizador instalado e vá para o
Ir para o Banco de Conhecimento para maiores informações sobre Classificações de Maturidade?
<url name="url">
- https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+ http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
</url>
<usetemplate
name="okcancelignore"
@@ -1975,10 +1987,7 @@ Mover para o inventário o(s) item(s)?
<usetemplate ignoretext="Quando Saindo do [APP_NAME]." name="okcancelignore" notext="Continuar" yestext="Sair"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Use esta ferramenta para reportar violações aos Termos de Serviço e aos Padrões da Comunidade. Veja:
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
+ Use esta ferramenta para reportar violações aos [http://secondlife.com/corporate/tos.php?lang=pt-BR Termos de Serviço] e aos [http://secondlife.com/corporate/cs.php?lang=pt-BR Padrões da Comunidade].
Todos os abusos aos Termos de Serviço e aos Padrões da Comunidade reportados, são investigados e resolvidos. Você pode ver a resolução do incidente na Reportagem de Incidentes em:
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index c6f1433440..d7ff3f29df 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
+ <panel.string name="create_account_url">
+ http://join.secondlife.com/index.php?lang=pt-BR
+ </panel.string>
+ <panel.string name="forgot_password_url">
+ http://secondlife.com/account/request.php?lang=pt
+ </panel.string>
+<panel name="login_widgets">
<text name="first_name_text">
Primeiro nome:
</text>
@@ -29,3 +36,4 @@
[VERSION]
</text>
</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile.xml b/indra/newview/skins/default/xui/pt/panel_profile.xml
new file mode 100644
index 0000000000..ff53aa6a41
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_profile.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_profile">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="payment_update_link_url">
+ http://www.secondlife.com/account/billing.php?lang=pt-BR
+ </string>
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=pt
+ </string>
+ <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=pt-BR"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 2d3514e5fe..9acfce99dd 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -4,6 +4,7 @@
For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="create_account_url">http://join.secondlife.com/index.php?lang=pt-BR</string>
<string name="LoginInProgress">
Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
</string>