diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
index bd17224259a7ea66a7e0cb07dbf36b369c2f7575..76bc40edacc6a970802dd918d2bad5a8720f122f 100644
--- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT NÆRVED">
- <check_box label="Oversæt chat (håndteret af Google)" name="translate_chat_checkbox"/>
+ <check_box label="Oversæt chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index f0f6242fffeb3c802cc9321ec79f17fdbb358c7b..890a3038ef7d50caae17d050b938f8b3105f1a70 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Tid før chatvisning forsvinder:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Benyt maskinel oversættelse ved chat (håndteret af Google)
+ Benyt maskinel oversættelse ved chat
</text>
<text name="translate_language_text" width="110">
Oversæt chat til :
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 071aab46f43d8af28477c81998a84729c78610aa..0d89fae986096f5062befcfcf100e7dc61bb3308 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -19,6 +19,10 @@ Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for a
<message name="timeout_tport">
Beklager, systemet kunne ikke fuldføre teleport forbindelse.
Prøv igen om lidt.
+ </message>
+ <message name="NoHelpIslandTP">
+ Du kan ikke teleportere tilbage til Welcome Island.
+Gå til 'Welcome Island Puclic' for at prøve tutorial igen.
</message>
<message name="noaccess_tport">
Beklager, du har ikke adgang til denne teleport destination.
diff --git a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
index bbb4114200d9c3707f5c5d81554cbfde3dd99364..2aabbb18f2a02400131c97a5be3bf0266dc00a2b 100644
--- a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT IN DER NÄHE">
- <check_box label="Chat übersetzen (Service von Google)" name="translate_chat_checkbox"/>
+ <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
index c3ce42efa159ec675f3e1925af52cf772cee5837..2068c39024366cdc6beeb9982bf44def6df939b3 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Chat übersetzen (von Google bereitgestellt)" name="translate_chat_checkbox"/>
+ <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 104f89b80cc01d577bc24351fec32965343fb836..04f6c273301477044b4a47a580e3b4778956a730 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Beim Chatten Maschinenübersetzung verwenden (von Google bereitgestellt)
+ Beim Chatten Maschinenübersetzung verwenden
</text>
<text name="translate_language_text">
Chat übersetzen in:
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 69c952c5325465e6154924ade996ebdb0419fd85..bbfc8306888e619b0eda47e505a9393c7397f1d8 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -19,6 +19,10 @@ Wenn der Teleport dann immer noch nicht funktioniert, melden Sie sich bitte ab u
<message name="timeout_tport">
Das System konnte keine Teleport-Verbindung herstellen.
Versuchen Sie es später noch einmal.
+ </message>
+ <message name="NoHelpIslandTP">
+ Sie können nicht zurück nach Welcome Island teleportieren.
+Gehen Sie zu „Welcome Island Public“ und wiederholen sie das Tutorial.
</message>
<message name="noaccess_tport">
Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index eaffbf5fa61190d420207e7a0cafeacae68a41f6..1c7b354221a36c07f5ab2195b8478282f207dcc9 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -487,7 +487,7 @@
name="DwellText"
top_delta="0"
width="186">
- 0
+ Loading...
</text>
<button
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 2d973e7d9070c5a87aeba6a4c8573337b263c545..6009821f7faeae04877dc23441a16d9786840348 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -16,11 +16,11 @@
save_rect="true"
save_visibility="true"
title="AVATAR PICKER"
- width="635">
+ width="700">
<web_browser
top="25"
height="200"
- width="635"
+ width="700"
follows="all"
name="avatar_picker_contents"
trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index b9c415633f929d2ad7f5254f902a65d7c13fd795..0637eedfb225f208c8a2633cfd91ca198825ccfc 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -23,6 +23,5 @@
right="-1"
top="1"
bottom="-1"
- ignore_ui_scale="false"
name="browser"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 91b4ed6954b615d4ba059924c95043ffa48ddbd0..d7a1510c1c0c8cb5db1b1bf681cca1747f9fda30 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -5,400 +5,308 @@
can_minimize="true"
can_close="true"
follows="left|top"
- height="520"
+ height="600"
layout="topleft"
name="Snapshot"
help_topic="snapshot"
save_rect="true"
save_visibility="true"
title="SNAPSHOT PREVIEW"
- width="245">
+ width="470">
<floater.string
name="unknown">
unknown
</floater.string>
- <radio_group
- height="70"
- label="Snapshot type"
- layout="topleft"
- left="10"
- name="snapshot_type_radio"
- top="20"
- width="205">
-<!--
- <radio_item
- height="16"
- label="Share to Web"
- layout="topleft"
- name="share_to_web"
- top_pad="0" />
--->
- <radio_item
- height="16"
- label="Email"
- layout="topleft"
- name="postcard"
- top_pad="2" />
- <radio_item
- height="16"
- label="My inventory (L$[AMOUNT])"
- layout="topleft"
- name="texture"
- top_pad="2" />
- <radio_item
- height="16"
- label="Save to my computer"
- layout="topleft"
- name="local"
- top_pad="2" />
- </radio_group>
- <ui_ctrl
- height="90"
- width="125"
+ <string
+ name="postcard_progress_str">
+ Sending Email
+ </string>
+ <string
+ name="profile_progress_str">
+ Posting
+ </string>
+ <string
+ name="inventory_progress_str">
+ Saving to Inventory
+ </string>
+ <string
+ name="local_progress_str">
+ Saving to Computer
+ </string>
+ <string
+ name="profile_succeeded_str">
+ Your Profile Feed has been updated!
+ </string>
+ <string
+ name="postcard_succeeded_str">
+ Email Sent!
+ </string>
+ <string
+ name="inventory_succeeded_str">
+ Saved to Inventory!
+ </string>
+ <string
+ name="local_succeeded_str">
+ Saved to Computer!
+ </string>
+ <string
+ name="profile_failed_str">
+ Failed to update your Profile Feed.
+ </string>
+ <string
+ name="postcard_failed_str">
+ Failed to send email.
+ </string>
+ <string
+ name="inventory_failed_str">
+ Failed to save to inventory.
+ </string>
+ <string
+ name="local_failed_str">
+ Failed to save to computer.
+ </string>
+ <view_border
+ bevel_style="in"
+ follows="left|top"
+ height="21"
+ left="10"
layout="topleft"
- name="thumbnail_placeholder"
- top_pad="6"
+ name="img_info_border"
+ top="22"
+ width="50"
+ />
+ <icon
+ follows="top|left"
+ height="18"
+ image_name="Snapshot_Off"
+ layout="topleft"
+ left_delta="-5"
+ mouse_opaque="true"
+ name="refresh_icon"
+ top_delta="3"
+ width="36" />
+ <button
follows="left|top"
- left="10"
- />
- <text
- type="string"
- font="SansSerifSmall"
- length="1"
- follows="left|top"
- height="14"
- layout="topleft"
- right="-5"
- left_delta="0"
- halign="right"
- name="file_size_label"
- top_pad="8"
- width="195">
- [SIZE] KB
- </text>
- <button
- follows="left|top"
- height="22"
- image_overlay="Refresh_Off"
- layout="topleft"
- left="10"
- name="new_snapshot_btn"
- width="23" />
- <button
- follows="left|top"
- height="23"
- label="Send"
- layout="topleft"
- left_pad="5"
- right="-5"
- name="send_btn"
- width="100" />
- <button
- follows="left|top"
- height="23"
- label="Save (L$[AMOUNT])"
- layout="topleft"
- right="-5"
- name="upload_btn"
- top_delta="0"
- width="110" />
- <flyout_button
- follows="left|top"
- height="23"
- label="Save"
- layout="topleft"
- right="-5"
- name="save_btn"
- tool_tip="Save image to a file"
- top_delta="0"
- width="100">
- <flyout_button.item
- label="Save"
- name="save_item"
- value="save" />
- <flyout_button.item
- label="Save As..."
- name="saveas_item"
- value="save as" />
- </flyout_button>
- <button
- follows="left|top"
- height="23"
- label="More"
- layout="topleft"
- left="10"
- name="more_btn"
- tool_tip="Advanced options"
- width="80" />
+ height="22"
+ image_overlay="Refresh_Off"
+ layout="topleft"
+ left_delta="31"
+ name="new_snapshot_btn"
+ top_delta="-3"
+ width="23" />
<button
follows="left|top"
height="23"
- label="Less"
+ image_overlay="TabIcon_Close_Off"
+ is_toggle="true"
layout="topleft"
- left_delta="0"
- name="less_btn"
+ left="240"
+ name="advanced_options_btn"
tool_tip="Advanced options"
top_delta="0"
- width="80" />
- <button
- follows="left|top"
- height="23"
- label="Cancel"
- layout="topleft"
- right="-5"
- left_pad="5"
- name="discard_btn"
- width="110" />
- <text
- type="string"
- length="1"
- follows="top|left"
- height="12"
- layout="topleft"
- left="10"
- name="type_label2"
- top_pad="5"
- width="127">
- Size
- </text>
- <text
- type="string"
- length="1"
- follows="top|left"
- height="12"
- layout="topleft"
- left_pad="5"
- name="format_label"
- top_delta="0"
- width="70">
- Format
- </text>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left="10"
- name="postcard_size_combo"
- width="120">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="640x480"
- name="640x480"
- value="[i640,i480]" />
- <combo_box.item
- label="800x600"
- name="800x600"
- value="[i800,i600]" />
- <combo_box.item
- label="1024x768"
- name="1024x768"
- value="[i1024,i768]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left_delta="0"
- name="texture_size_combo"
- top_delta="0"
- width="127">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="Small (128x128)"
- name="Small(128x128)"
- value="[i128,i128]" />
- <combo_box.item
- label="Medium (256x256)"
- name="Medium(256x256)"
- value="[i256,i256]" />
- <combo_box.item
- label="Large (512x512)"
- name="Large(512x512)"
- value="[i512,i512]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Resolution"
- layout="topleft"
- left_delta="0"
- name="local_size_combo"
- top_delta="0"
- width="127">
- <combo_box.item
- label="Current Window"
- name="CurrentWindow"
- value="[i0,i0]" />
- <combo_box.item
- label="320x240"
- name="320x240"
- value="[i320,i240]" />
- <combo_box.item
- label="640x480"
- name="640x480"
- value="[i640,i480]" />
- <combo_box.item
- label="800x600"
- name="800x600"
- value="[i800,i600]" />
- <combo_box.item
- label="1024x768"
- name="1024x768"
- value="[i1024,i768]" />
- <combo_box.item
- label="1280x1024"
- name="1280x1024"
- value="[i1280,i1024]" />
- <combo_box.item
- label="1600x1200"
- name="1600x1200"
- value="[i1600,i1200]" />
- <combo_box.item
- label="Custom"
- name="Custom"
- value="[i-1,i-1]" />
- </combo_box>
- <combo_box
- height="23"
- label="Format"
- layout="topleft"
- left_pad="5"
- name="local_format_combo"
- width="70">
- <combo_box.item
- label="PNG"
- name="PNG" />
- <combo_box.item
- label="JPEG"
- name="JPEG" />
- <combo_box.item
- label="BMP"
- name="BMP" />
- </combo_box>
- <spinner
- allow_text_entry="false"
- decimal_digits="0"
- follows="left|top"
- height="20"
- increment="32"
- label="Width"
- label_width="40"
- layout="topleft"
- left="10"
- max_val="6016"
- min_val="32"
- name="snapshot_width"
- top_pad="10"
- width="95" />
- <spinner
- allow_text_entry="false"
- decimal_digits="0"
- follows="left|top"
- height="20"
- increment="32"
- label="Height"
- label_width="40"
- layout="topleft"
- left_pad="5"
- max_val="6016"
- min_val="32"
- name="snapshot_height"
- top_delta="0"
- width="95" />
- <check_box
- bottom_delta="20"
- label="Constrain proportions"
- layout="topleft"
- left="10"
- name="keep_aspect_check" />
- <slider
- decimal_digits="0"
- follows="left|top"
- height="15"
- increment="1"
- initial_value="75"
- label="Image quality"
- label_width="124"
- layout="topleft"
- left_delta="0"
- max_val="100"
- name="image_quality_slider"
- top_pad="5"
- width="228" />
- <text
- type="string"
- length="1"
+ width="23" />
+ <ui_ctrl
+ height="160"
+ width="250"
+ layout="topleft"
+ name="thumbnail_placeholder"
+ top="50"
+ follows="left|top"
+ left="10">
+ <loading_indicator
+ follows="left|top"
+ height="48"
+ layout="topleft"
+ name="working_indicator"
+ left="101"
+ top="46"
+ visible="false"
+ width="48" />
+ <text
+ follows="left|top|right"
+ font="SansSerifBold"
+ height="14"
+ layout="topleft"
+ left="5"
+ length="1"
+ halign="center"
+ name="working_lbl"
+ right="-5"
+ top="98"
+ translate="false"
+ type="string"
+ visible="false"
+ width="130">
+ Working
+ </text>
+ </ui_ctrl>
+ <view_border
+ bevel_style="in"
+ height="21"
+ width="250"
+ layout="topleft"
+ name="img_info_border"
+ top_pad="3"
+ follows="left|top"
+ left_delta="0"
+ />
+ <text
+ type="string"
+ font="SansSerifSmall"
+ length="1"
+ follows="left|top"
+ height="14"
+ layout="topleft"
+ left_delta="5"
+ halign="left"
+ name="image_res_text"
+ top_delta="5"
+ width="100">
+ [WIDTH] x [HEIGHT] px
+ </text>
+ <text
+ follows="left|top"
+ font="SansSerifSmall"
+ height="14"
+ layout="topleft"
+ left="200"
+ length="1"
+ halign="right"
+ name="file_size_label"
+ top_delta="0"
+ type="string"
+ width="50">
+ [SIZE] KB
+ </text>
+ <panel_container
follows="left|top"
- height="13"
+ height="360"
layout="topleft"
- left="10"
- name="layer_type_label"
- top_pad="5"
- width="50">
- Capture:
- </text>
- <combo_box
- height="23"
- label="Image Layers"
- layout="topleft"
- left="30"
- name="layer_types"
- width="145">
- <combo_box.item
- label="Colors"
- name="Colors"
- value="colors" />
- <combo_box.item
- label="Depth"
- name="Depth"
- value="depth" />
- </combo_box>
- <check_box
- label="Interface"
- layout="topleft"
- left="30"
+ left="0"
+ name="panel_container"
+ default_panel_name="panel_snapshot_options"
top_pad="10"
- width="180"
- name="ui_check" />
- <check_box
- label="HUDs"
- layout="topleft"
- left="30"
- top_pad="10"
- width="180"
- name="hud_check" />
- <check_box
- label="Keep open after saving"
- layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="keep_open_check" />
- <check_box
- label="Freeze frame (fullscreen)"
+ width="270">
+ <panel
+ class="llpanelsnapshotoptions"
+ filename="panel_snapshot_options.xml"
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="panel_snapshot_options"
+ top="0" />
+ <panel
+ class="llpanelsnapshotprofile"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_profile"
+ filename="panel_snapshot_profile.xml" />
+ <panel
+ class="llpanelsnapshotpostcard"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_postcard"
+ filename="panel_snapshot_postcard.xml" />
+ <panel
+ class="llpanelsnapshotinventory"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_inventory"
+ filename="panel_snapshot_inventory.xml" />
+ <panel
+ class="llpanelsnapshotlocal"
+ follows="all"
+ layout="topleft"
+ name="panel_snapshot_local"
+ filename="panel_snapshot_local.xml" />
+ </panel_container>
+ <panel
+ height="295"
layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="freeze_frame_check" />
- <check_box
- label="Auto-refresh"
- layout="topleft"
- left="10"
- top_pad="8"
- width="180"
- name="auto_snapshot_check" />
+ left="270"
+ name="advanced_options_panel"
+ top="20"
+ width="200">
+ <text
+ type="string"
+ font="SansSerifSmall"
+ length="1"
+ follows="left|top"
+ height="14"
+ layout="topleft"
+ left="10"
+ halign="left"
+ name="advanced_options_label"
+ right="-10"
+ top="10">
+ ADVANCED OPTIONS
+ </text>
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="1"
+ left="10"
+ layout="topleft"
+ name="advanced_options_hr"
+ right="-10"
+ top_pad="5"
+ />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="13"
+ layout="topleft"
+ left="10"
+ name="layer_type_label"
+ top_pad="10"
+ width="50">
+ Capture:
+ </text>
+ <combo_box
+ follows="left|top|right"
+ height="23"
+ label="Image Layers"
+ layout="topleft"
+ left="30"
+ name="layer_types"
+ right="-10">
+ <combo_box.item
+ label="Colors"
+ name="Colors"
+ value="colors" />
+ <combo_box.item
+ label="Depth"
+ name="Depth"
+ value="depth" />
+ </combo_box>
+ <check_box
+ label="Interface"
+ layout="topleft"
+ left="30"
+ top_pad="10"
+ width="180"
+ name="ui_check" />
+ <check_box
+ label="HUDs"
+ layout="topleft"
+ left="30"
+ top_pad="10"
+ width="180"
+ name="hud_check" />
+ <check_box
+ label="Freeze frame (fullscreen)"
+ layout="topleft"
+ left="10"
+ top_pad="8"
+ width="180"
+ name="freeze_frame_check" />
+ <check_box
+ label="Auto-refresh"
+ layout="topleft"
+ left="10"
+ top_pad="8"
+ width="180"
+ name="auto_snapshot_check" />
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index ef3951a1cda3895e9e68a9d1c569bb8a63b26fe1..493d44a9cf85921f44f0ae36d1a3d22a050c974e 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -5,7 +5,7 @@
can_minimize="false"
can_resize="false"
default_tab_group="1"
- height="460"
+ height="330"
help_topic="toybox"
layout="topleft"
legacy_header_height="18"
@@ -46,7 +46,7 @@
Buttons will appear as shown or as icon-only depending on each toolbar's settings.
</text>
<toolbar
- bottom="395"
+ bottom="265"
button_display_mode="icons_with_text"
follows="all"
left="20"
@@ -82,20 +82,32 @@
<panel
bevel_style="none"
border="true"
- bottom="396"
+ bottom="266"
follows="left|bottom|right"
left="20"
right="-20"
- top="396" />
+ top="266" />
+ <button
+ follows="left|bottom|right"
+ height="23"
+ label="Clear all toolbars"
+ label_selected="Clear all toolbars"
+ layout="topleft"
+ left="185"
+ name="btn_clear_all"
+ top="285"
+ width="130">
+ <button.commit_callback function="Toybox.ClearAll" />
+ </button>
<button
follows="left|bottom|right"
height="23"
label="Restore defaults"
label_selected="Restore defaults"
layout="topleft"
- left="260"
+ left="335"
name="btn_restore_defaults"
- top="415"
+ top="285"
width="130">
<button.commit_callback function="Toybox.RestoreDefaults" />
</button>
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index c03f7512656885979c35150b31aca036d92c7c08..a212ce78891f66412ca0a2af19aac111f03dfdac 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -4,7 +4,7 @@
height="310"
layout="topleft"
name="floater_translation_settings"
- help_topic="environment_editor_floater"
+ help_topic="translation_settings"
save_rect="true"
title="CHAT TRANSLATION SETTINGS"
width="485">
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 80e310a8735fa1ea9f301885468fa99d0a38c952..8ac1ac9e093fec25f7f4309cd08fcd4d143f7849 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -167,13 +167,6 @@
function="Floater.Show"
parameter="message_critical" />
</menu_item_call>
- <menu_item_call
- label="Media Browser Test"
- name="Web Browser Test">
- <menu_item_call.on_click
- function="Advanced.WebBrowserTest"
- parameter="http://join.secondlife.com/"/>
- </menu_item_call>
<menu_item_call
label="Web Content Floater Debug Test"
name="Web Content Floater Debug Test">
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index 7384114d7d9036816b4105de14bf7c657f41e0f1..fbe40a7244fcc47d89f297d99be9549b7283198c 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -3,9 +3,15 @@
layout="topleft"
name="Toolbars Popup"
visible="false">
+ <menu_item_call label="Remove this button"
+ layout="topleft"
+ name="Remove button">
+ <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" />
+ </menu_item_call>
+ <menu_item_separator layout="topleft" />
<menu_item_call label="Toolbar buttons..."
layout="topleft"
- name="Chose Buttons">
+ name="Choose Buttons">
<menu_item_call.on_click function="Floater.Show"
parameter="toybox" />
</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9c44d90a6ec7959d47b81955e1bca86b7849663d..263d961be1fff1efe8ea5a909de847989920338c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -538,13 +538,13 @@
<menu
create_jump_keys="true"
- label="Enviroment Editor"
- name="Enviroment Editor"
+ label="Environment Editor"
+ name="Environment Editor"
tear_off="true">
<menu_item_call
- label="Enviroment Settings..."
- name="Enviroment Settings">
+ label="Environment Settings..."
+ name="Environment Settings">
<menu_item_call.on_click
function="World.EnvSettings"
parameter="editor"/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3ed8c30ca82bbbd10cf70e712d7579422758baf0..e4458f33b175f3aaa2aa05e17c52eb905b5d9e00 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4636,7 +4636,21 @@ Are you sure you want to quit?
name="ConfirmRestoreToybox"
type="alertmodal">
<unique/>
-Are you sure you want to restore your default buttons and toolbars?
+This action will restore your default buttons and toolbars.
+
+You cannot undo this action.
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ConfirmClearAllToybox"
+ type="alertmodal">
+ <unique/>
+This action will return all buttons to the toolbox and your toolbars will be empty.
You cannot undo this action.
<usetemplate
@@ -4644,7 +4658,7 @@ You cannot undo this action.
notext="Cancel"
yestext="OK"/>
</notification>
-
+
<notification
icon="alertmodal.tga"
name="DeleteItems"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index 8e8d8e6505e60455425dcb2207c216f4567b3825..0f8c37c691931f992c909d025e95b6377ec01d36 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
@@ -32,7 +32,7 @@
name="Upper Fabric"
tool_tip="Click to choose a picture"
top="10"
- width="74" >
+ width="75" >
<texture_picker.commit_callback
function="TexturePicker.Commit" />
</texture_picker>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3835cd17b68763406b8b03ba46cdc2f457da4a74..6521bf2a4eaf92b1d8515ffd12196a24d2bf76b0 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -22,17 +22,17 @@ top="600"
<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
<web_browser
tab_stop="false"
-trusted_content="true"
-bg_opaque_color="Black"
-border_visible="false"
-bottom="600"
-follows="all"
-left="0"
-name="login_html"
-start_url=""
-top="0"
-height="600"
- width="980" />
+ trusted_content="true"
+ bg_opaque_color="Black"
+ border_visible="false"
+ bottom="600"
+ follows="all"
+ left="0"
+ name="login_html"
+ start_url=""
+ top="0"
+ height="600"
+ width="980"/>
<layout_stack
follows="left|bottom|right"
name="login_widgets"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index f766236b2e9c1f945562ff672212ead91eb9cf6f..d492f9bd68b1f84bc031e80ba3e3ad00389701e5 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -11,7 +11,7 @@
control_name="TranslateChat"
enabled="true"
height="16"
- label="Translate chat (powered by Google)"
+ label="Translate chat"
layout="topleft"
left="5"
name="translate_chat_checkbox"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 5d7334f780f7a05b5df15f4d4136907b55052477..670aa47313d16d6225eb6beba9c0a5485b983f93 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -202,7 +202,7 @@ background_visible="true"
</layout_panel>
<layout_panel
- follows="bottom|left|right"
+ follows="bottom|right"
height="23"
layout="bottomleft"
left_pad="0"
@@ -212,7 +212,7 @@ background_visible="true"
auto_resize="true"
width="24">
<menu_button
- follows="bottom|left|right"
+ follows="bottom|right"
height="23"
image_disabled="ComboButton_UpOff"
image_unselected="ComboButton_UpOff"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ec230773cc5a37074553c504dc32bccbd0892321..befcc5dd87a40cb9b411b4ef8151bb2ce448de79 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3724,4 +3724,12 @@ Try enclosing path to the editor with double quotes.
<string name="Wrap">Wrap</string>
<string name="Preview">Preview</string>
<string name="Normal">Normal</string>
+
+ <!-- Snapshot image quality levels -->
+ <string name="snapshot_quality_very_low">Very Low</string>
+ <string name="snapshot_quality_low">Low</string>
+ <string name="snapshot_quality_medium">Medium</string>
+ <string name="snapshot_quality_high">High</string>
+ <string name="snapshot_quality_very_high">Very High</string>
+
</strings>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index bae821d3b5583282d6d3a7371d3aa524b9b9cc5d..dce6b8dd6d6182fd5244c8778add4b624b63221d 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -19,6 +19,10 @@ If you still cannot teleport, please log out and log back in to resolve the prob
<message name="timeout_tport">
Sorry, but system was unable to complete the teleport connection.
Try again in a moment.
+ </message>
+ <message name="NoHelpIslandTP">
+You cannot teleport back to Welcome Island.
+Go to 'Welcome Island Public' to repeat the tutorial.
</message>
<message name="noaccess_tport">
Sorry, you do not have access to that teleport destination.
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 413ca1d1efe2f7a9e0caa4c403e7073e0b7390b5..0e29ed0d0bf73cb51f670a33cd33c04a32508b81 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25" />
<chiclet_im_adhoc.speaker
- auto_update="true"
- draw_border="false"
- height="23"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_adhoc.avatar_icon
bottom="3"
follows="left|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index 372a89cbc70c9f4a21f6c95e675e23a2442ba7a9..77011139bfe0f9835f4cb1ad200e235ef816729f 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25" />
<chiclet_im_group.speaker
- auto_update="true"
- draw_border="false"
- height="25"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_group.group_icon
bottom="3"
default_icon="Generic_Group"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index d27c14f4e70ba09d532f79b3608bed27a0205a10..8b56a8f0f690cb9183e90afd2849a16c4af9e67e 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -12,13 +12,20 @@
tab_stop="false"
width="25"/>
<chiclet_im_p2p.speaker
- auto_update="true"
- draw_border="false"
- height="23"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
+ image_mute="Parcel_VoiceNo_Light"
+ image_off="VoicePTT_Off_Dark"
+ image_on="VoicePTT_On_Dark"
+ image_level_1="VoicePTT_Lvl1_Dark"
+ image_level_2="VoicePTT_Lvl2_Dark"
+ image_level_3="VoicePTT_Lvl3_Dark"
+ auto_update="true"
+ draw_border="false"
+ height="24"
+ left="25"
+ bottom="1"
+ name="speaker"
+ visible="false"
+ width="20" />
<chiclet_im_p2p.avatar_icon
bottom="3"
color="white"
diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
index 1fee9ab056668d2770445fd8f3a45dbf000cec78..b3b8cdcfffdc5e1e627ee68f3dfb89b3c2463fd8 100644
--- a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT">
- <check_box label="Traducir chat (mediante Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traducir chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
index 95ce14c9a7b9b9b8956e095334013bf6926c3e06..5a852a6711851ed99e161ac8c9cca82b6027e183 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traducir chat (mediante Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traducir chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 4625075aa5772e20df290b46d0c5e8176e12633b..e82258556693bc24a051975804606da170919f59 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Usar en el chat el traductor automático de Google
+ Usar en el chat el traductor automático
</text>
<text name="translate_language_text">
Traducir el chat al:
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index e0e0061729297401af718d7c4a82a4425b100dee..e785a7ac4072c6e89511f56eda8ac5cde40c32f4 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -18,6 +18,10 @@ Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE].
<message name="timeout_tport">
Lo sentimos, pero el sistema no ha podido completar el teleporte.
Vuelva a intentarlo en un momento.
+ </message>
+ <message name="NoHelpIslandTP">
+ No puede teleportarse de vuelta a la Welcome Island ('Isla de Ayuda').
+Vaya a la 'Welcome Island Public' ('Isla Pública de Ayuda') para repetir el tutorial.
</message>
<message name="noaccess_tport">
Lo sentimos, pero no tienes acceso al destino de este teleporte.
diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
index 9b1b21c434b859c0e1de43a0c210605a4dd81fb5..8bbd34baae4242fe2af4fd5ac86febae8816e3b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
- <check_box label="Traduction du chat (fournie par Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduction du chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
index 98eddf196b0e0c80981791668e0dafb2144889c1..31cb3308e3584fee839eeeb6a8c096f45baa5df4 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduction du chat (fournie par Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduction du chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 646f53704c91ec29e72e8e44528a1b9e37795f44..fa026d810679a4372b6f4b95a4fedc3aa1582261 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Utiliser la traduction automatique lors des chats (fournie par Google)
+ Utiliser la traduction automatique lors des chats
</text>
<text name="translate_language_text">
Traduire le chat en :
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index 7c291c0984ca3e63be52100568a9e0ca13e79334..401b272c81360c746e735cc2d741a623a06d0685 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -19,6 +19,10 @@ Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis r
<message name="timeout_tport">
Désolé, la connexion vers votre lieu de téléportation n'a pas abouti.
Veuillez réessayer dans un moment.
+ </message>
+ <message name="NoHelpIslandTP">
+ Vous ne pouvez pas retourner sur Welcome Island.
+Pour répéter le didacticiel, veuillez aller sur Welcome Island Public.
</message>
<message name="noaccess_tport">
Désolé, vous n'avez pas accès à cette destination.
diff --git a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
index 4c41df8a62cc598005647f46c540408441aa9504..9e818998808fff64545d43f16c9045103a604ab5 100644
--- a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CHAT NEI DINTORNI">
- <check_box label="Traduci chat (tecnologia Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduci chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
index 7afc3cd7e76281297bd16a1e1106bc10e42b0d8c..1b529e2737cf403c303ac640efc6d406d1424dbc 100644
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduci chat (tecnologia Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduci chat" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 72e687b6d1d2b1be9feaf26bf4cbae4d39522a3e..1a0a1d8434eacc04950ce1afaab796c7635bfc64 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -29,9 +29,9 @@
<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
- <check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Use machine translation while chatting" name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Usa la traduzione meccanica durante le chat (tecnologia Google)
+ Usa la traduzione meccanica durante le chat
</text>
<text name="translate_language_text" width="110">
Traduci chat in:
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index 7a1046abd36992b698144a0c158a7986319f87ea..a0b324d8fbeebd3c53eb889377d68590be02646a 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -18,6 +18,10 @@ Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE
<message name="timeout_tport">
Spiacenti, il sistema non riesce a completare il teletrasporto. Riprova tra un attimo.
</message>
+ <message name="NoHelpIslandTP">
+ Non è possibile per te ritornare all'Welcome Island.
+Vai alla 'Welcome Island Public' per ripetere il tutorial.
+ </message>
<message name="noaccess_tport">
Spiacenti, ma non hai accesso nel luogo di destinazione richiesto.
</message>
diff --git a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
index a29c6a063041966ad733fabfbe430c488ccdbc4c..bcddcc69076887ddecac9480aed5f2259b9b2b4e 100644
--- a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆ">
- <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳（Google翻訳）" name="translate_chat_checkbox"/>
+ <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 43346595575248341acc4bd84fbea7e0608ba716..aca055bb438fc1614ee41a02c6f7bd55a823b4d1 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳（Google翻訳）" name="translate_chat_checkbox"/>
+ <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index c8584ccaae74fcee234bdaa2366ff5b6927f0e33..1502442a06a37a65ea10256ee39921e5dc914588 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -29,9 +29,9 @@
<check_box label="IM ãƒãƒ£ãƒƒãƒˆ" name="EnableIMChatPopups" tool_tip="ã“れをé¸æŠžã™ã‚‹ã¨ã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ä¿¡ã—ãŸéš›ã«ãƒãƒƒãƒ—アップãŒè¡¨ç¤ºã•ã‚Œã¾ã™"/>
<spinner label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒè¡¨ç¤ºã•ã‚Œã‚‹é•·ã•ï¼š" name="nearby_toasts_lifetime"/>
<spinner label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæ¶ˆãˆã‚‹ã¾ã§ã®é•·ã•ï¼š" name="nearby_toasts_fadingtime"/>
- <check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Use machine translation while chatting" name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- ãƒãƒ£ãƒƒãƒˆä¸ã«å†…容を機械翻訳ã™ã‚‹ï¼ˆGoogle翻訳）
+ ãƒãƒ£ãƒƒãƒˆä¸ã«å†…容を機械翻訳ã™ã‚‹
</text>
<text name="translate_language_text">
翻訳ã™ã‚‹è¨€èªžï¼š
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 2f67d4370769799eb46bc16b41c84c3674a277f7..04ea1c24385e8fc303e18aa99ded5dfaff22e02d 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -19,6 +19,10 @@
<message name="timeout_tport">
申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®æŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="NoHelpIslandTP">
+ Welcome Islandã«ã¯æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。
+「Welcome Island Publicã€ã«è¡Œãã€
</message>
<message name="noaccess_tport">
残念ãªãŒã‚‰ã€ãã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“。
diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
index 7dc3e1f22ef6ae6136fa3e980f0d76abcd7f117e..214d465f1cc1052b63719a5a217cb92d730e252b 100644
--- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="CZAT LOKALNY">
- <check_box label="TÅ‚umaczenie czatu (wspierane przez Google)" name="translate_chat_checkbox"/>
+ <check_box label="TÅ‚umaczenie czatu" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index be730eb73f22ce18ee5b307d6b688746484473ea..7fd1029e6acda23bc7119d231c8514d549583871 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Czas znikania czatu w pobliżu:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Użyj translatora podczas rozmowy (wspierany przez Google)
+ Użyj translatora podczas rozmowy
</text>
<text name="translate_language_text">
Przetłumacz czat na:
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 57fb55bf4ca5d731e649b681b3e9bb417dc163cb..0366c3fdbcf35ebf6c23acf47d67b1a369a407b8 100644
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -19,6 +19,10 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
<message name="timeout_tport">
Przepraszamy, ale nie udało się przeprowadzić teleportacji. Spróbuj jeszcze raz.
</message>
+ <message name="NoHelpIslandTP">
+ Brak możliwości ponownej teleportacji do Welcome Island.
+Odwiedź 'Welcome Island Public' by powtórzyć szkolenie.
+ </message>
<message name="noaccess_tport">
Przepraszamy, ale nie masz dostępu do miejsca docelowego.
</message>
diff --git a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
index 60edfa505fe43df2dc76ab4db7e4daf5e66d526d..653861f7d80e48c63c35bb1c94e5ea633ee3319f 100644
--- a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="Bate-papo local">
- <check_box label="Traduzir bate-papo (via Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
index 9d44c7f62dd5958407b12c55dc4323bd72b86c35..15470dc94a182224a2f71ee6d7a7f192ec54fbc3 100644
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Traduzir bate-papo (via Google)" name="translate_chat_checkbox"/>
+ <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index e5aa42aae0cb4bd00d55a7367a32f4ba146b5dbd..f98659aa738bfd11dc34dd3fbbb2405d7bd07f20 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
<check_box name="translate_chat_checkbox"/>
<text name="translate_chb_label">
- Traduzir bate-papo automaticamente (via Google)
+ Traduzir bate-papo automaticamente
</text>
<text name="translate_language_text">
Traduzir bate-papo para:
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 11ea0f419595623b7a35eb8dd8441d457eb38d72..f8ded1ce690997b791aadfb8953169073d5f8be7 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -18,6 +18,10 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE].
<message name="timeout_tport">
Desculpe, não foi possÃvel para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes.
</message>
+ <message name="NoHelpIslandTP">
+ Você não pode se tele-transportar de volta à Ilha de Welcome.
+Vá para a Ilha de Welcome Pública para repetir este tutorial.
+ </message>
<message name="noaccess_tport">
Desculpe, você não tem acesso ao destino deste teletransporte.
</message>
diff --git a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
index fd3c9f3512c62288f96fb133f299ac58af36852b..184c753e400b0f99c30c5d2a417bacc694416e8e 100644
--- a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="ЛОКÐЛЬÐЫЙ ЧÐТ">
- <check_box label="Перевод чата (иÑпользуетÑÑ Google)" name="translate_chat_checkbox"/>
+ <check_box label="Перевод чата" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
index a371040b74aca7799c5defc49519078d5dd64a29..1d26eecf87fb331ac3be6c797f28f3b75688b432 100644
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Перевод чата (Ñ‚ÐµÑ…Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Google)" name="translate_chat_checkbox"/>
+ <check_box label="Перевод чата" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index fa08c134adb1a4c7498692e5563e0d8add709439..a3ee5b78157d5621ff68c7ec1310ac08abca24dd 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -30,7 +30,7 @@
<spinner label="Ð’Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð²Ñплывающих реплик:" name="nearby_toasts_lifetime"/>
<spinner label="Ð’Ñ€ÐµÐ¼Ñ Ð·Ð°Ñ‚ÑƒÑ…Ð°Ð½Ð¸Ñ Ð²Ñплывающих реплик:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- ИÑпользовать машинный перевод при общении (Ñ‚ÐµÑ…Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Google)
+ ИÑпользовать машинный перевод при общении
</text>
<text name="translate_language_text">
Переводить чат на:
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index 6a7a181046d5e947527724560a296e98fc80210c..296562e6f1c6166d313a352ee6a4446e848141e1 100644
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -19,6 +19,10 @@
<message name="timeout_tport">
СиÑтеме не удалоÑÑŒ выполнить подключение телепорта.
Повторите попытку позже.
+ </message>
+ <message name="NoHelpIslandTP">
+ Ð’Ñ‹ не можете телепортироватьÑÑ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾ на ОÑтров Помощи.
+ТелепортируйтеÑÑŒ на ОбщеÑтвенный ОÑтров Помощи, чтобы повторить обучение
</message>
<message name="noaccess_tport">
У Ð²Ð°Ñ Ð½ÐµÑ‚ доÑтупа к точке Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñтого телепорта.
diff --git a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
index 6570c4379c57f611c86f0d8ab0bbf4478b8c4950..6b12ad0ef52ca4327dddede566ab111c9c8d445c 100644
--- a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="YAKINDAKÄ° SOHBET">
- <check_box label="Sohbeti çevir (Google tarafından desteklenir)" name="translate_chat_checkbox"/>
+ <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
index 73da726cb27294c310ffba5ab01fc82e8c79321f..c405105e007570dacc5541ba2508f88db2bbb676 100644
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="nearby_chat">
- <check_box label="Sohbeti çevir (Google tarafından desteklenir)" name="translate_chat_checkbox"/>
+ <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aeef737420c23558e66a7077bd814d63e7ccba2e..9c9e960715cbdfc12079c4d1600b022e8fbc0894 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -30,7 +30,7 @@
<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- Sohbet ederken makine çevirisi kullanılsın (Google tarafından desteklenir)
+ Sohbet ederken makine çevirisi kullanılsın
</text>
<text name="translate_language_text">
Sohbeti şu dile çevir:
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index c0c4be1393b323f2a3da4cf1d5238174284b2b31..c506bb8a583c9370e91a2bfcc20dfb444d4c61eb 100644
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -19,6 +19,10 @@ Hala ışınlanamıyorsanız, sorunu çözmek için lütfen çıkış yapıp otu
<message name="timeout_tport">
Üzgünüz fakat sistem ışınlama bağlantısını tamamlayamadı.
Bir dakika sonra tekrar deneyin.
+ </message>
+ <message name="NoHelpIslandTP">
+You cannot teleport back to Welcome Island.
+Go to 'Welcome Island Public' to repeat the tutorial.
</message>
<message name="noaccess_tport">
Üzgünüz, bu ışınlanma hedef konumuna erişim hakkına sahip değilsiniz.
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
index f0c34acb0622d0d213d54517edf5a80a73e57c2a..38a5dab523a24de49cd98dfb3f32c6c5025c59de 100644
--- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="nearby_chat" title="附近的èŠå¤©">
- <check_box label="Translate chat (powered by Google)" name="translate_chat_checkbox"/>
+ <check_box label="Translate chat" name="translate_chat_checkbox"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index fc326c2ce26ed644867d96fe70bcd7db2451f0b0..738c77fd089828824980fbfe251073f078351bc3 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -30,7 +30,7 @@
<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
<text name="translate_chb_label">
- èŠå¤©æ™‚使用機器自動進行翻è¯ï¼ˆç”± Google 所æ供）
+ èŠå¤©æ™‚使用機器自動進行翻è¯
</text>
<text name="translate_language_text">
èŠå¤©ç¿»è¯ç‚ºï¼š
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index ffb4c903bb0486be9e09035973756b74d092cdc8..bfdb10781056f80d2abee12f1e210941f3e6054e 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -19,6 +19,10 @@
<message name="timeout_tport">
抱æ‰ï¼Œä¸éŽç³»çµ±ç„¡æ³•å®Œæˆçž¬é–“傳é€çš„è¯æŽ¥ã€‚
è«‹ç¨å¾Œå†è©¦ã€‚
+ </message>
+ <message name="NoHelpIslandTP">
+ 您ä¸èƒ½çž¬é—´è½¬ç§»å›žâ€œæ´åŠ©å²›â€ã€‚
+去“公共æ´åŠ©å²›â€é‡å¤æ‚¨çš„教程。
</message>
<message name="noaccess_tport">
抱æ‰ï¼Œä½ 並沒有權é™é€²å…¥è¦çž¬é–“傳é€çš„目的地。