Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into UICleanup

Browse Source 
Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp
This commit is contained in:
Shyotl
2013-05-03 21:41:51 -05:00
parent 525f3c6a1d 532fc68657
commit e8ce35ebf8
210 changed files with 10451 additions and 6643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/inv_reset.tga Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

77
indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml Normal file
View File

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="190"
layout="topleft"
name="Anim Preview"
help_topic="animation_anim_preview"
title="ANIMATION.ANIM"
width="300">
<text
type="string"
length="1"
follows="left|top"
height="15"
layout="topleft"
left="10"
mouse_opaque="false"
name="name_label"
top="20"
width="275">
Name:
</text>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top|right"
height="19"
layout="topleft"
left_delta="0"
max_length_bytes="63"
name="name_form"
top_pad="0"
width="280" />
<text
type="string"
length="1"
follows="left|top"
height="15"
layout="topleft"
left_delta="0"
mouse_opaque="false"
name="description_label"
top_pad="10"
width="270">
Description:
</text>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top|right"
height="19"
layout="topleft"
left_delta="0"
max_length_bytes="127"
name="description_form"
top_pad="0"
width="280" />
<button
follows="left|bottom"
height="22"
label="Upload ([AMOUNT])"
layout="topleft"
left="45"
name="ok_btn"
top_pad="60"
width="150" />
<button
follows="right|bottom"
height="22"
label="Cancel"
label_selected="Cancel"
layout="topleft"
name="cancel_btn"
left_pad="5"
width="90" />
</floater>

0
indra/newview/skins/default/xui/en-us/floater_animation_preview.xml → indra/newview/skins/default/xui/en-us/floater_animation_bvh_preview.xml
View File

17
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatRect" title="Local Chat" width="435">
<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="175" left="15"
min_height="100" min_width="425" name="chat floater" rect_control="FloaterChatRect" title="Local Chat" width="435">
<string name="ringing">Connecting to in-world Voice Chat...</string>
<string name="connected">Connected</string>
<string name="unavailable">Voice not available at your current location</string>
@@ -22,10 +22,11 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" height="260" left="0" min_width="275" name="im_contents_panel" width="305">
<layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="260" left="0" orientation="vertical" name="im_contents_stack" width="305">
<layout_panel border="false" bottom="10" follows="all" height="235" left="0" name="history_panel" width="305">
<string name="OverrideAnimations">Override your default animations</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="160" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" height="160" left="0" min_width="275" name="im_contents_panel" width="305">
<layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="160" left="0" orientation="vertical" name="im_contents_stack" width="305">
<layout_panel border="false" bottom="10" follows="all" height="135" left="0" name="history_panel" width="305">
<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
<combo_item name="Gestures">Gestures</combo_item>
</combo_box>
@@ -33,8 +34,8 @@
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="207" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="207" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
</layout_panel>
<layout_panel user_resize="false" auto_resize="false" bottom_delta="-25" follows="left|right|bottom" left="5" name="chat_layout_panel" right="-5" tab_group="1" height="25">
<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" top="25">

4
indra/newview/skins/default/xui/en-us/floater_instant_message.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="155" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="answering">Connecting...</string>
<string name="ringing">Calling...</string>
<string name="connected">Connected, click End Call to hang up</string>
@@ -21,7 +21,7 @@
<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
</panel>
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="228" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="128" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
<button bottom="5" follows="right|bottom" height="20" label="Send" left="433" name="send_btn" scale_image="true" width="60"/>
<string name="live_help_dialog">*** Welcome to Help Request ***

8
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="225" min_width="265" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="265" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="ringing">Joining Voice Chat...</string>
<string name="connected">Connected, click End Call to hang up</string>
<string name="hang_up">Left Voice Chat</string>
@@ -8,13 +8,13 @@
<string name="typing_start_string">[NAME] is typing...</string>
<string name="session_start_string">Starting session with [NAME], please wait.</string>
<string name="default_text_label">Click here to instant message.</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
<button bottom="-20" follows="left|top" height="20" label="History" left="5" name="history_btn" width="80"/>
<button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="left|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="243" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
</layout_panel>

8
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="100" min_width="300" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="300" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="ringing">Joining Voice Chat...</string>
<string name="connected">Connected, click End Call to hang up</string>
<string name="hang_up">Left Voice Chat</string>
@@ -12,9 +12,9 @@
<button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
</layout_panel>

4
indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="105" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="answering">Connecting...</string>
<string name="ringing">Calling...</string>
<string name="connected">Connected, click End Call to hang up</string>
@@ -21,7 +21,7 @@
<volume_slider bottom="0" follows="bottom" height="20" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="48"/>
<button bottom="0" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="true" label="" left_delta="42" name="mute_btn" tool_tip="Mute voice" width="25"/>
</panel>
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="245" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="145" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
<button bottom="5" follows="right|bottom" height="20" label="Send" left="433" name="send_btn" scale_image="true" width="60"/>
<string name="live_help_dialog">*** Welcome to Help Request ***

8
indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="200" min_width="360" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="360" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="ringing">Joining Voice Chat...</string>
<string name="connected">Connected, click End Call to hang up</string>
<string name="hang_up">Left Voice Chat</string>
@@ -10,14 +10,14 @@
<string name="default_text_label">Click here to instant message.</string>
<string name="moderated_chat_label">(Moderated: Voices off by default)</string>
<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="210" name="im_contents_panel" width="495">
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="210" name="im_contents_panel" width="495">
<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5" name="group_info_btn" tab_group="0" width="80"/>
<button bottom_delta="0" follows="left|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="243" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
</layout_panel>

8
indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="100" min_width="330" name="im_floater" rect_control="" title="(unknown)" width="501">
<floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="197" label="(unknown)" left="1" min_height="100" min_width="330" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="ringing">Joining Voice Chat...</string>
<string name="connected">Connected, click End Call to hang up</string>
<string name="hang_up">Left Voice Chat</string>
@@ -15,9 +15,9 @@
<button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
</layout_panel>

2
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -12,7 +12,7 @@
label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
tool_tip="Expand All"/>
<button left="50" bottom_delta="0" height="22" width="22" follows="left|top" label="" scale_image="true"
image_selected="UIImgBtnClosePressedUUID" image_unselected="UIImgBtnCloseActiveUUID" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
image_overlay="inv_reset.tga" name="Inventory.ResetAll" tool_tip="Reset inventory: clear filters and collapse all folders."/>
<text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
height="16" left="43" bottom_delta="2" right="108">Type:</text>
<!-- Inventory Type Filter Labels -->

6
indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
View File

@@ -80,9 +80,10 @@
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckOwnerCopy" radio_style="false" width="88" />
<check_box bottom="-155" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Resell/Give away" left_delta="88"
initial_value="false" label="Transfer" left_delta="88"
mouse_opaque="true" name="CheckOwnerTransfer" radio_style="false"
width="106" />
<check_box name="CheckOwnerExport" label="Export" bottom_delta="0" follows="left|top" left_delta="88" enabled="false"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-165" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -140,6 +141,7 @@
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
name="CheckEveryoneMove" radio_style="false" width="88" />
<check_box name="CheckExport" label="Export" bottom_delta="0" follows="left|top" left_delta="88"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-13" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -153,7 +155,7 @@
initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
name="CheckNextOwnerCopy" radio_style="false" width="88" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Resell/Give away" left_delta="88"
initial_value="false" label="Transfer" left_delta="88"
mouse_opaque="true" name="CheckNextOwnerTransfer" radio_style="false"
width="106" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

2
indra/newview/skins/default/xui/en-us/floater_my_friends.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="false" can_drag_on_left="false" can_minimize="true"
can_resize="true" can_tear_off="true" height="390" min_height="240"
can_resize="true" can_tear_off="true" height="390" min_height="100"
min_width="365" name="floater_my_friends"
rect_control="FloaterContactsRect" title="Contacts" width="395">
<tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"

2
indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="false" can_drag_on_left="false" can_minimize="true"
can_resize="true" can_tear_off="true" height="390" min_height="205"
can_resize="true" can_tear_off="true" height="390" min_height="100"
min_width="275" name="floater_my_friends"
rect_control="FloaterContactsHorizRect" title="Contacts" width="395">
<tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"

5
indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
View File

@@ -3,8 +3,9 @@
<panel label="Permissions" name="permissions" width="292" height="120" left="10" border="true" bottom="-140">
<button name="help" label="?" label_selected="?" bottom_delta="-25" height="18" width="22" left="260"/>
<check_box bottom_delta="0" width="106" height="16" left="10" initial_value="false" label="Share with group" name="share_with_group" control_name="ShareWithGroup"/>
<check_box bottom_delta="-32" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
<text bottom_delta="-26" name="NextOwnerLabel" height="10">Next owner can:</text>
<check_box bottom_delta="-20" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
<check_box bottom_delta="-20" label="Allow exportation" name="everyone_export" control_name="EveryoneExport"/>
<text bottom_delta="-18" name="NextOwnerLabel" height="10">Next owner can:</text>
<check_box bottom_delta="-30" width="78" height="16" initial_value="false" label="Modify" name="next_owner_modify" control_name="NextOwnerModify"/>
<check_box bottom_delta="0" width="88" height="16" left_delta="78" initial_value="false" label="Copy" name="next_owner_copy" control_name="NextOwnerCopy"/>
<check_box bottom_delta="0" width="106" height="16" left_delta="88" initial_value="true" label="Resell/Give away" name="next_owner_transfer" control_name="NextOwnerTransfer"/>

21
indra/newview/skins/default/xui/en-us/floater_snapshot.xml
View File

@@ -59,14 +59,23 @@
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
<combo_item name="640x480" value="[i640,i480]">
640x480
<combo_item name="500x500" value="[i630,i-2]">
500x500 (1:1)
</combo_item>
<combo_item name="800x600" value="[i800,i600]">
800x600
<combo_item name="500x375" value="[i840,i-2]">
500x375 (4:3)
</combo_item>
<combo_item name="1024x768" value="[i1024,i768]">
1024x768
<combo_item name="500x350" value="[i900,i-2]">
500x350 (10:7)
</combo_item>
<combo_item name="500x313" value="[i1008,i-2]">
500x313 (16:10)
</combo_item>
<combo_item name="500x281" value="[i1120,i-2]">
500x281 (16:9)
</combo_item>
<combo_item name="500x250" value="[i1260,i-2]">
500x250 (2:1)
</combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom

10
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -429,12 +429,14 @@
mouse_opaque="true" name="button deed" scale_image="TRUE"
tool_tip="Group shared objects can be deeded by a group officer."
width="78" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to move" left="10"
<text name="text anyone can" bottom_delta="-12" left="10" follows="left|top">Anyone can:</text>
<check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Move"
mouse_opaque="true" name="checkbox allow everyone move" width="142" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Allow anyone to copy" left="10"
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Copy" left_delta="60"
mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
<check_box name="checkbox allow export" label="Export" bottom_delta="0" left_delta="60" follows="left|top"/>
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show in search" left="10" name="search_check"
tool_tip="Let people see this object in search results" width="78" />

4
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -177,10 +177,6 @@
mouse_opaque="true" name="Copy Asset UUID" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Reupload..." left="0" mouse_opaque="true"
name="Reupload..." width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="reupload" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Acquire Asset ID" left="0" mouse_opaque="true"
name="Acquire Asset ID" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="acquire_asset_id" />

38
indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
View File

@@ -12,18 +12,44 @@
<on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
</menu_item_call>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up">
<on_click function="Self.StandUp" userdata="" />
<on_enable function="Self.EnableStandUp" />
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
<on_click function="Attachment.Detach" />
<on_enable function="Attachment.EnableDetach" />
</menu_item_call>
<pie_menu label="Tools &gt;" name="Tools &gt;">
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" />
<on_visible function="Object.VisibleScriptCount" />
</menu_item_call>
<pie_menu label="Scripts &gt;" name="ScriptsMenu">
<menu_item_call mouse_opaque="true" label="Make Mono" name="CompileMono">
<on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
<on_enable function="EditableSelectedMono" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Make LSL" name="CompileLSL">
<on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Reset" name="Reset Scripts">
<on_click function="Tools.SelectedScriptAction" userdata="reset" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Start" name="Object Set Scripts to Running">
<on_click function="Tools.SelectedScriptAction" userdata="start" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Stop" name="Object Set Scripts to Not Running">
<on_click function="Tools.SelectedScriptAction" userdata="stop" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Remove" name="Remove Scripts From Selection">
<on_click function="Tools.ScriptDelete" />
<on_enable function="Tools.EnableScriptDelete" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
<on_click function="Object.ScriptCount" />
<on_visible function="Object.VisibleScriptCount" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
<on_click function="Object.Inspect" />
<on_enable function="Object.EnableInspect"/>

39
indra/newview/skins/default/xui/en-us/menu_pie_object.xml
View File

@@ -60,15 +60,6 @@
<menu_item_call enabled="true" hidden="false" label="Data" mouse_opaque="true" name="Data">
<on_click function="Object.Data" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" />
<on_visible function="Object.VisibleScriptCount" />
</menu_item_call>
<menu_item_call bottom="-487" enabled="false" height="19" label="Reset Scripts"
left="0" mouse_opaque="true" name="Reset Scripts" width="250">
<on_click function="Tools.SelectedScriptAction" userdata="reset" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="Export" mouse_opaque="true" name="Export">
<on_click function="Object.Export" />
<on_enable function="Object.EnableExport" />
@@ -102,6 +93,36 @@
<on_click function="Pathfinding.Characters.Select" />
<on_enable function="EnableSelectInPathfindingCharacters"/>
</menu_item_call>
</pie_menu>
<pie_menu label="Scripts &gt;" name="ScriptsMenu">
<menu_item_call mouse_opaque="true" label="Make Mono" name="CompileMono">
<on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
<on_enable function="EditableSelectedMono" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Make LSL" name="CompileLSL">
<on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Reset" name="Reset Scripts">
<on_click function="Tools.SelectedScriptAction" userdata="reset" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Start" name="Object Set Scripts to Running">
<on_click function="Tools.SelectedScriptAction" userdata="start" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Stop" name="Object Set Scripts to Not Running">
<on_click function="Tools.SelectedScriptAction" userdata="stop" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Remove" name="Remove Scripts From Selection">
<on_click function="Tools.ScriptDelete" />
<on_enable function="Tools.EnableScriptDelete" />
</menu_item_call>
<menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
<on_click function="Object.ScriptCount" />
<on_visible function="Object.VisibleScriptCount" />
</menu_item_call>
</pie_menu>
</pie_menu>
<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">

5
indra/newview/skins/default/xui/en-us/menu_pie_self.xml
View File

@@ -108,7 +108,10 @@
<on_click function="Avatar.CopyUUID" />
</menu_item_call>
</pie_menu>
<menu_item_separator />
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
<on_click function="ShowFloater" userdata="gestures" />
</menu_item_call>

77
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -37,6 +37,9 @@
<on_click function="Object.ImportUpload" />
<on_enable function="Object.EnableImport" />
</menu_item_call>
<menu_item_call label="Change Local Textures" mouse_opaque="true" name="Change Local Textures">
<on_click function="File.LocalAssetBrowser"/>
</menu_item_call>
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
<menu_item_call enabled="true" label="Set Default Permissions..."
mouse_opaque="true" name="perm prefs" >
@@ -44,6 +47,9 @@
</menu_item_call>
<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator" width="243" />
<menu_item_call label="Minimize All Windows" mouse_opaque="true" name="Minimize All Windows">
<on_click function="File.MinimizeAllWindows"/>
</menu_item_call>
<menu_item_call bottom="-113" enabled="true" height="19" label="Close Window" left="0"
mouse_opaque="true" name="Close Window" shortcut="control|W" width="243">
<on_click function="File.CloseWindow" userdata="" />
@@ -973,4 +979,75 @@
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>
</menu>
<menu create_jump_keys="true" drop_shadow="true" enabled="true"
label="Singularity" mouse_opaque="false" name="Singularity"
opaque="true" tear_off="true">
<menu_item_call enabled="true" label="Close All Dialogs"
mouse_opaque="true" name="Close All Dialogs"
shortcut="control|alt|shift|D">
<on_click function="CloseAllDialogs" userdata="" />
</menu_item_call>
<menu_item_separator enabled="true" label="-----------"
mouse_opaque="true" name="separators1" />
<menu_item_call enabled="true" label="Fake Away Status"
mouse_opaque="true" name="Fake Away Status">
<on_click function="World.FakeAway" userdata="" />
</menu_item_call>
<menu_item_call enabled="true" label="Force Ground Sit"
mouse_opaque="true" name="Force Ground Sit">
<on_click function="ForceGroundSit" userdata="" />
</menu_item_call>
<menu_item_separator enabled="true" label="-----------"
mouse_opaque="true" name="separators2" />
<menu_item_call enabled="true" label="Animation Override ..."
mouse_opaque="true" name="Animation Override ...">
<on_click function="AnimationOverride" userdata="" />
</menu_item_call>
<menu_item_check enabled="true" label="Nimble"
mouse_opaque="true" name="Nimble">
<on_click function="Nimble" userdata="" />
<on_check function="CheckNimble" userdata="" />
</menu_item_check>
<menu_item_separator enabled="true" label="-----------"
mouse_opaque="true" name="separators3" />
<menu_item_check enabled="true" label="Object Area Search"
mouse_opaque="true" name="Object Area Search">
<on_click function="ObjectAreaSearch" userdata="" />
<on_check function="FloaterVisible" userdata="object_area_search" />
</menu_item_check>
<menu_item_check enabled="true" label="Sound Explorer"
mouse_opaque="true" name="Sound Explorer">
<on_click function="SoundExplorer" userdata="" />
<on_check function="FloaterVisible" userdata="sound_explorer" />
</menu_item_check>
<menu_item_check enabled="true" label="Asset Blacklist"
mouse_opaque="true" name="Asset Blacklist">
<on_click function="AssetBlacklist" userdata="" />
<on_check function="FloaterVisible" userdata="asset_blacklist" />
</menu_item_check>
<menu_item_check enabled="true" label="Streaming Audio Display"
mouse_opaque="true" name="Streaming Audio Display">
<on_click function="StreamingAudioDisplay" userdata="" />
<on_check function="CheckStreamingAudioDisplay" userdata="" />
<on_enable function="EnableStreamingAudioDisplay" />
</menu_item_check>
<menu_item_check enabled="true" label="Pose Stand"
mouse_opaque="true" name="Pose Stand">
<on_click function="PoseStand" userdata="" />
<on_check function="CheckPoseStand" userdata="" />
</menu_item_check>
<menu_item_check enabled="true" label="Region Debug Console"
mouse_opaque="true" name="Region Debug Console">
<on_click function="RegionDebugConsole" userdata="" />
<on_check function="CheckRegionDebugConsole" userdata="" />
<on_visible function="VisibleRegionDebugConsole" userdata="" />
</menu_item_check>
<menu_item_separator enabled="true" label="-----------"
mouse_opaque="true" name="separators3" />
<menu_item_call enabled="true" label="Rebake"
mouse_opaque="true" name="Pose Stand"
shortcut="control|alt|R">
<on_click function="Rebake" userdata="" />
</menu_item_call>
</menu>
</menu_bar>

1734
indra/newview/skins/default/xui/en-us/notifications.xml
View File

File diff suppressed because it is too large Load Diff

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -24,6 +24,7 @@
<check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="ShowDisplayNameChanges" label="Show display name changes" tool_tip="When checked, a notification will come up in chat whenever someone's display name changes." name="display_name_change"/>
<check_box bottom_delta="-20" follows="left|top" control_name="UseTypingBubbles" label="Use overhead typing indicator bubbles" name="use_typing_bubbles"/>
<text bottom="-150" left="10" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
follows="top" height="20" left="20" name="objects_link" width="350">

6
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -88,9 +88,11 @@
<check_box bottom_delta="-20" control_name="SGDetachBridge" follows="top" initial_value="false" label="Auto detach LSL Bridge" tool_tip="Automatically detach LSL Bridge of Phoenix or Firestorm viewer." name="detach_bridge"/>
<check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" follows="top" initial_value="false" label="Quiet Snapshots to Disk" tool_tip="Doesn't make a camera sound nor alert everyone when you take a snapshot to your computer." name="quiet_snapshots_check"/>
<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" follows="top" initial_value="false" label="On standing up, revoke perms for the object your avatar was sitting on" tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately." name="revoke_perms_on_stand_up_check"/>
<check_box bottom_delta="-20" control_name="DisableClickSit" follows="top" initial_value="false" label="Disable click-to-sit objects" tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture." name="disable_click_sit_check"/>
<check_box bottom_delta="-20" follows="top" initial_value="false" label="Display Total Script Count changes:" name="totalscriptjumps" control_name="AscentDisplayTotalScriptJumps" tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
<check_box bottom_delta="-20" control_name="DisableClickSit" follows="top" initial_value="false" label="Disable click-to-sit on objects" tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture." name="disable_click_sit_check"/>
<check_box bottom_delta="0" left_delta="170" control_name="DisableClickSitOtherOwner" follows="top" label="you don't own" tool_tip="Disables click to sit on objects you don't own (If used with the group check, only one is needed)" name="disable_click_sit_own_check"/>
<check_box bottom_delta="-20" left="10" follows="top" initial_value="false" label="Display Total Script Count changes:" name="totalscriptjumps" control_name="AscentDisplayTotalScriptJumps" tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
<spinner bottom_delta="0" decimal_digits="0" follows="top" height="16" increment="1" left_delta="210" max_val="9999" min_val="1" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff" tool_tip="Threshold for the script jump message [Default: 100]"/>
<check_box bottom_delta="-20" left="10" follows="top" initial_value="false" label="Restrained Love Suport (RLV)" name="RestrainedLove" control_name="RestrainedLove" tool_tip="Enable support for lockable toys and much more."/>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Building" name="Building">

14
indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml
View File

@@ -30,17 +30,17 @@
<!-- Buttons -->
<button label="Delete" label_selected="Delete" enabled="true" name="btn_delete"
height="18" width="75" left="120" bottom_delta="-27"
halign="center"
halign="center" tool_type="Delete the selected grid from the list"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<button label="Add" label_selected="Add" enabled="true" name="btn_add"
<button label="Create" label_selected="Add" enabled="true" name="btn_add"
height="18" width="75" left_delta="78" bottom_delta="0"
halign="center"
halign="center" tool_tip="Add a new grid to the list"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<button label="Copy" label_selected="Copy" enabled="true" name="btn_copy"
height="18" width="75" left_delta="78" bottom_delta="0"
halign="center"
halign="center" tool_tip="Create a new entry using the selected entry as template"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<!-- Advanced -->
@@ -65,11 +65,11 @@
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
<button label="Refresh Grid URLs" enabled="true" name="btn_gridinfo"
height="18" width="100" left="120" bottom_delta="-22"
halign="center"
halign="center" tool_tip="Retrieve all grid info from the given Login URI (overwriting the current URLs, see Advanced)"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />-->
font="SansSerifSmall" mouse_opaque="true" />
<!-- Platform -->
<text type="string" length="1" enabled="true" name="platform_label"
height="10" width="100" left="12" bottom_delta="-32"

1
indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
View File

@@ -17,5 +17,6 @@
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Automatic Appearance Camera Movement" left="148" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Unsit Avatar on Camera Reset" left="148" name="unsit_on_camera_reset" tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode"/>
<check_box bottom_delta="-18" follows="top" height="16" label="Disable Camera Constraints" left="148" control_name="DisableCameraConstraints" name="DisableCameraConstraints" tool_tip="Prevent the camera from automatically zooming when you approach walls, objects, etc., too closely."/>
<check_box bottom_delta="-18" follows="top" height="16" label="Limit Select Distance" left="148" control_name="LimitSelectDistance" name="Limit Select Distance" tool_tip="Limit the distance at which an object can be selected."/>
<button bottom_delta="-30" follows="top" font="SansSerif" height="20" label="Joystick Setup" name="joystick_setup_button" width="155"/>
</panel>

2
indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
View File

@@ -5,7 +5,7 @@
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box2">kbps (kilobits per second)</text>
<text bottom_delta="-20" follows="top" height="10" left="12" name="text_box3">Texture Bandwidth:</text>
<slider bottom_delta="-4" left_delta="110" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="10" initial_val="50" max_val="5000" min_val="50" name="tex_bandwidth" show_text="true" value="500" width="180"/>
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box2">kbps (kilobits per second)</text>
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box4">kbps (kilobits per second)</text>
<text bottom_delta="-25" follows="top" height="10" left="12" name="use_http_for">Use HTTP for:</text>
<check_box bottom_delta="-5" follows="top" left_delta="90" label="Textures" name="http_textures"/>
<check_box bottom_delta="0" follows="top" left_delta="90" label="Inventory" name="http_inventory"/>

24
indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups" title="Popups" width="400">
<text bottom="-20" follows="top" left="15" name="dont_show_label">Do not show these popups:</text>
<scroll_list follows="top" height="88" name="disabled_popups" width="480"/>
<button follows="top" height="20" label="Enable this popup" name="enable_popup" width="175"/>
<button follows="top" height="20" label="Enable all popups..." left="200" name="reset_dialogs_btn" tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications." width="175" bottom_delta="0"/>
<text follows="top" left="15" name="show_label" bottom_delta="-24">Show these popups:</text>
<scroll_list follows="top" height="88" left="15" name="enabled_popups" width="480"/>
<button follows="top" height="20" label="Disable first time popups..." name="skip_frst_btn" tool_tip="Disable all of the first time use notifications." width="175"/>
<button bottom_delta="0" follows="top" height="20" label="Disable all these popups..." left="200" name="skip_dialogs_btn" tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications." width="175"/>
<text bottom_delta="-24" follows="top" height="10" left="15" name="text_box2">Offers of notecards, textures and landmarks:</text>
<check_box bottom_delta="-25" follows="top" height="16" initial_value="false" label="Automatically accept" left="40" name="accept_new_inventory"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="true" label="Automatically view after accepting" name="show_new_inventory"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="true" label="Automatically show newly accepted objects in inventory" left="18" name="show_in_inventory"/>
<check_box bottom="-22" left="16" follows="top" height="16" label="Automatically accept item offers" name="accept_new_inventory"/>
<check_box bottom_delta="0" left_delta="250" follows="top" height="16" label="View previewable items after accepting" name="show_new_inventory"/>
<check_box bottom_delta="-20" left="16" follows="top" height="16" label="Show newly accepted objects in inventory" name="show_in_inventory"/>
<text bottom_delta="-12" follows="top" left="15" name="show_label">Always show:</text>
<scroll_list follows="top" multi_select="true" height="169" name="enabled_popups" width="480"/>
<button follows="top" height="20" label="Enable all" left="25" name="reset_dialogs_btn" tool_tip="Enable all of the optional popups and 'first time use' notifications." width="100"/>
<button follows="top" height="20" label="" image_overlay="arrow_up.tga" left_delta="105" name="enable_popup" width="30" bottom_delta="0"/>
<button follows="top" height="20" label="Disable first time popups..." left_delta="35" name="skip_frst_btn" tool_tip="Disable all of the first time use notifications." width="175" bottom_delta="0"/>
<button follows="top" height="20" label="" image_overlay="arrow_down.tga" left_delta="180" name="disable_popup" width="30" bottom_delta="0"/>
<button bottom_delta="0" follows="top" height="20" label="Disable all" left_delta="35" name="skip_dialogs_btn" tool_tip="Disable all of the optional popups and 'first time use' notifications." width="100"/>
<text follows="top" left="15" name="dont_show_label" bottom_delta="-12">Never show:</text>
<scroll_list follows="top" multi_select="true" height="169" left="15" name="disabled_popups" width="480"/>
</panel>

45
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -82,10 +82,10 @@
<view_border
bevel_style="none"
follows="top|left"
height="95"
height="110"
layout="topleft"
left="10"
bottom_delta="-100"
bottom_delta="-115"
width="460" />
<check_box
@@ -95,7 +95,7 @@
layout="topleft"
left="20"
name="externally_visible_check"
bottom_delta="70"
bottom_delta="90"
width="200" />
<button
bottom_delta="0"
@@ -112,9 +112,9 @@
height="20"
label="Allow Voice Chat"
layout="topleft"
left="250"
left_delta="-200"
name="voice_chat_check"
bottom_delta="0"
bottom_delta="-18"
width="200" />
<button
bottom_delta="0"
@@ -133,7 +133,7 @@
layout="topleft"
left_delta="-200"
name="allow_direct_teleport"
bottom_delta="-20"
bottom_delta="-18"
width="80" />
<button
bottom_delta="0"
@@ -144,6 +144,13 @@
name="allow_direct_teleport_help"
left_delta="200"
width="18" />
<check_box bottom_delta="36" follows="left|top" height="20" label="Use Global Time" left="250" name="use_global_time_check" width="200" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_global_time_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-27" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-16" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button
enabled="false"
follows="left|top"
@@ -151,9 +158,9 @@
label="Apply"
layout="topleft"
name="apply_btn"
bottom_delta="-38"
left_delta="-200"
width="97" />
bottom_delta="-23"
left_delta="90"
width="120" />
<text
type="string"
@@ -164,7 +171,7 @@
layout="topleft"
left="20"
name="Only Allow"
bottom_delta="38"
bottom_delta="28"
width="278">
Allow access only to Residents who:
</text>
@@ -177,7 +184,7 @@
left_delta="0"
name="limit_payment"
tool_tip="Residents must have payment information on file to access this estate."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<check_box
follows="top|left"
@@ -188,7 +195,7 @@
left_delta="0"
name="limit_age_verified"
tool_tip="Residents must be age 18 or older to access this estate. See support.secondlife.com for more information."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<text
@@ -198,7 +205,7 @@
height="20"
layout="topleft"
name="estate_manager_label"
bottom_delta="-40"
bottom_delta="-28"
left="10"
width="200">
Estate Managers:
@@ -220,7 +227,7 @@
layout="topleft"
left="250"
name="allow_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Allowed Residents:
</text>
@@ -241,7 +248,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -320,7 +327,7 @@
layout="topleft"
left="10"
name="allow_group_label"
bottom_delta="-30"
bottom_delta="-28"
width="200">
Allowed Groups:
</text>
@@ -341,7 +348,7 @@
layout="topleft"
left="250"
name="ban_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Banned Residents:
</text>
@@ -362,7 +369,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -440,7 +447,7 @@
layout="topleft"
left="10"
name="message_estate_btn"
bottom_delta="-43"
bottom_delta="-28"
width="220" />
<button
follows="left|top"

9
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -85,7 +85,14 @@
</combo_box>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="access_help" width="18" />
<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
<check_box bottom_delta="52" follows="left|top" height="20" label="Use Estate Sun" left="250" name="use_estate_sun_check" width="200" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_estate_sun_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-23" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-15" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button bottom_delta="-20" enabled="false" follows="left|top" height="20" label="Apply"
left="108" name="apply_btn" width="100" />
<button bottom_delta="-60" follows="left|top" height="20"
label="Teleport Home One User..." left="10" name="kick_btn" width="250" />

14
indra/newview/skins/default/xui/en-us/panel_status_bar.xml
View File

@@ -15,21 +15,29 @@
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-230" mouse_opaque="true"
halign="right" height="18" left="-280" mouse_opaque="true"
name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
v_pad="2" width="86">
Loading...
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-350" mouse_opaque="true"
name="UPCText" text_color="BalanceTextColor" tool_tip="Upload credits"
v_pad="2" width="106">
UPC - N/A -
</text>
<button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
halign="center" height="16"
image_selected="status_buy_currency_pressed.tga"
image_unselected="status_buy_currency.tga" label=""
left="-220" mouse_opaque="true" name="buycurrency" scale_image="true"
left="-340" mouse_opaque="true" name="buycurrency" scale_image="true"
tool_tip="Buy currency" width="16" />
<text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-310" mouse_opaque="true" name="TimeText"
halign="right" height="18" left="-430" mouse_opaque="true" name="TimeText"
text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
12:00 AM
</text>

148
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -69,6 +69,7 @@
<string name="ShuttingDown">Shutting down...</string>
<string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
<string name="TestingDisconnect">Testing viewer disconnect</string>
<!-- Tooltip, llhoverview.cpp -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
@@ -299,6 +300,7 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="ControlYourCamera">Control your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="OverrideAnimations">Override your default animations</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>
@@ -1828,15 +1830,15 @@ Returns a list consisting of the following three values for each hit: UUID, Link
</string>
<string name="LSLTipText_llRegionSayTo">
llRegionSayTo(key target, integer channel, string msg)
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
</string>
<string name="LSLTipText_llGetSPMaxMemory">
integer llGetSPMaxMemory()
Returns the integer of the most bytes used while llScriptProfiler was last active.
Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llGetUsedMemory">
integer llGetUsedMemory()
Returns the integer of the number of bytes of memory currently in use by the script.
Returns the current used memory for the current script. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llScriptProfiler">
llScriptProfiler(integer flags)
@@ -1844,11 +1846,15 @@ Enables or disables script profiling options. Currently only supports PROFILE_SC
MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
</string>
<string name="LSLTipText_llSetMemoryLimit">
integer llSetMemoryLimit(integer mem)
Request ''limit'' bytes to be reserved for this script.
integer llSetMemoryLimit(integer limit)
Request limit bytes to be reserved for this script.
Returns a success/failure flag (STATUS_OK when sucessful, another of the STATUS_* flags on failure) for whether the memory limit was set.
Only relevant for Mono-compiled scripts.
</string>
<string name="LSLTipText_llGetMemoryLimit">
integer llGetMemoryLimit()
Get the maximum memory a script can use.
Returns the integer amount of memory the script can use in bytes.
</string>
<string name="LSLTipText_llSetLinkMedia">
llSetLinkMedia(integer link, integer face, list params)
@@ -1863,11 +1869,12 @@ integer llClearLinkMedia(integer link, integer face)
Clears (deletes) the media and all params from the given face on linked prim(s).
</string>
<string name="LSLTipText_llSetContentType">
llSetContentType(key request_id, integer content_type)
llSetContentType(key id, integer content_type)
Set the Internet media type of an LSL HTTP server response.
content_type may be one of CONTENT_TYPE_TEXT (default) "text/plain", or CONTENT_TYPE_HTML "text/html", only valid for embedded browsers on content owned by the person viewing. Falls back to "text/plain" otherwise.
</string>
<string name="LSLTipText_llLinkSitTarget">
llLinkSitTarget(integer link, vector offset, rotation rot );
llLinkSitTarget(integer link, vector offset, rotation rot)
Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
</string>
<string name="LSLTipText_llAvatarOnLinkSitTarget">
@@ -1876,7 +1883,8 @@ If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KE
</string>
<string name="LSLTipText_llSetLinkCamera">
llSetLinkCamera(integer link, vector eye, vector at)
Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
Sets the camera eye offset, and the offset that camera is looking at, for avatars that sit on the linked prim.
The two vector parameters are offsets relative to the object's center and expressed in local coordinates.
</string>
<string name="LSLTipText_llSetVelocity">
llSetVelocity(vector velocity, integer local)
@@ -1897,8 +1905,8 @@ llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, an
llGetMassMKS() returns the mass of the linkset in kilograms.
</string>
<string name="LSLTipText_llGenerateKey">
llGenerateKey()
Retun a unique generated key
key llGenerateKey()
Return a unique generated key
</string>
<string name="LSLTipText_llSetKeyframedMotion">
llSetKeyframedMotion(list keyframes, list options)
@@ -1924,13 +1932,6 @@ For AI Character: Navigate to destination.
llCreateCharacter(list options)
Convert linkset to AI Character which can navigate the world.
</string>
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>
<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
<string name="LSLTipText_llPursue">
llPursue(key target, list options)
For AI Character: Chase after a target.
@@ -2000,6 +2001,18 @@ A region's global coordinates can be retrieved using llRequestSimulatorData(regi
float llGetSimStats(integer stat_type)
Returns the value of a particular simulator statistic.
</string>
<string name="LSLTipText_llSetAnimationOverride">
llSetAnimationOverride(string anim_state, string anim)
Set the animation (anim) that will play for the given animation state (anim_state).
</string>
<string name="LSLTipText_llGetAnimationOverride">
string llGetAnimationOverride(string anim_state)
Returns a string that is the name of the animation that is being used for the specified animation state (anim_state).
</string>
<string name="LSLTipText_llResetAnimationOverride">
llResetAnimationOverride(string anim_state)
Resets the animation override of the specified animation state (anim_state) to the corresponding default value.
</string>
<!-- GOD FUNCTIONS -->
<string name="LSLTipText_llGodLikeRezObject">
llGodLikeRezObject( key inventory, vector pos )
@@ -2997,13 +3010,29 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="InventoryOutboxNotMerchant">
If you'd like to become a merchant, you'll need to
</string>
<string name="InventoryOutboxNotMerchantSubs">create a Marketplace store.</string>
<string name="InventoryOutboxNotMerchantSubs">create a Marketplace store</string>
<string name="InventoryOutboxNotMerchant2">.</string>
<string name="InventoryOutboxNoItemsTitle">Your outbox is empty.</string>
<string name="InventoryOutboxNoItemsTooltip"></string>
<string name="InventoryOutboxNoItems">
Drag folders to this area and click "Send to Marketplace" to list them for sale on the
</string>
<string name="InventoryOutboxNoItemsSubs">Marketplace.</string>
<string name="InventoryOutboxNoItemsSubs">Marketplace</string>
<string name="InventoryOutboxNoItems2">.</string>
<string name="InventoryOutboxInitializingTitle">Initializing Marketplace.</string>
<string name="InventoryOutboxInitializingTooltip"></string>
<string name="InventoryOutboxInitializing">
We are accessing your account on the
</string>
<string name="InventoryOutboxInitializingSubs">Marketplace store</string>
<string name="InventoryOutboxInitializing2">.</string>
<string name="InventoryOutboxErrorTitle">Marketplace Errors.</string>
<string name="InventoryOutboxErrorTooltip"></string>
<string name="InventoryOutboxError">
The
</string>
<string name="InventoryOutboxErrorSubs">Marketplace store</string>
<string name="InventoryOutboxError2">is returning errors.</string>
<!-- use value="" because they have preceding spaces -->
<string name="no_transfer" value=" (no transfer)" />
@@ -3101,7 +3130,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="unsupported point">unsupported point</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- HUD Position -->
@@ -3266,6 +3294,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
<string name="AcquiredItems">Acquired Items</string>
<string name="Cancel">Cancel</string>
<string name="UploadingCosts">Uploading [NAME] costs [CURRENCY] [AMOUNT]</string>
<string name="BuyingCosts">Buying this costs</string>
<string name="UnknownFileExtension">
Unknown file extension .%s
Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
@@ -3956,6 +3985,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Unnamed">(Unnamed)</string>
<string name="inventory_item_offered_to">Inventory item offered to</string>
<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
<string name="StartPointSet">Start point set</string>
<string name="EndPointSet">End point set</string>
<string name="MeasuredDistance">Distance: [DIST]</string>
<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
<string name="PowerUser2">Use your newfound abilities wisely.</string>
<string name="Unlocked:">Unlocked:</string>
@@ -4088,6 +4120,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="giving">Giving [CURRENCY]</string>
<string name="this_costs">This costs [CURRENCY]</string>
<string name="this_object_costs">This object costs</string>
<string name="group_role_everyone">Everyone</string>
<string name="group_role_officers">Officers</string>
@@ -4120,6 +4153,72 @@ Abuse Report</string>
<string name="New Script">New Script</string>
<string name="New Note">New Note</string>
<string name="New Folder">New Folder</string>
<string name="Contents">Contents</string>
<string name="Gesture">Gesture</string>
<string name="Male Gestures">Male Gestures</string>
<string name="Female Gestures">Female Gestures</string>
<string name="Other Gestures">Other Gestures</string>
<string name="Speech Gestures">Speech Gestures</string>
<string name="Common Gestures">Common Gestures</string>
<!-- gestures -->
<string name="Male - Excuse me">Male - Excuse me</string>
<string name="Male - Get lost">Male - Get lost</string>
<string name="Male - Blow kiss">Male - Blow kiss</string>
<string name="Male - Boo">Male - Boo</string>
<string name="Male - Bored">Male - Bored</string>
<string name="Male - Hey">Male - Hey</string>
<string name="Male - Laugh">Male - Laugh</string>
<string name="Male - Repulsed">Male - Repulsed</string>
<string name="Male - Shrug">Male - Shrug</string>
<string name="Male - Stick tougue out">Male - Stick tongue out</string>
<string name="Male - Wow">Male - Wow</string>
<string name="Female - Chuckle">Female - Chuckle</string>
<string name="Female - Cry">Female - Cry</string>
<string name="Female - Embarrassed">Female - Embarrassed</string>
<string name="Female - Excuse me">Female - Excuse me</string>
<string name="Female - Get lost">Female - Get lost</string>
<string name="Female - Blow kiss">Female - Blow kiss</string>
<string name="Female - Boo">Female - Boo</string>
<string name="Female - Bored">Female - Bored</string>
<string name="Female - Hey">Female - Hey</string>
<string name="Female - Hey baby">Female - Hey baby</string>
<string name="Female - Laugh">Female - Laugh</string>
<string name="Female - Looking good">Female - Looking good</string>
<string name="Female - Over here">Female - Over here</string>
<string name="Female - Please">Female - Please</string>
<string name="Female - Repulsed">Female - Repulsed</string>
<string name="Female - Shrug">Female - Shrug</string>
<string name="Female - Stick tougue out">Female - Stick tongue out</string>
<string name="Female - Wow">Female - Wow</string>
<string name="/bow">/bow</string>
<string name="/clap">/clap</string>
<string name="/count">/count</string>
<string name="/extinguish">/extinguish</string>
<string name="/kmb">/kmb</string>
<string name="/muscle">/muscle</string>
<string name="/no">/no</string>
<string name="/no!">/no!</string>
<string name="/paper">/paper</string>
<string name="/pointme">/pointme</string>
<string name="/pointyou">/pointyou</string>
<string name="/rock">/rock</string>
<string name="/scissor">/scissor</string>
<string name="/smoke">/smoke</string>
<string name="/stretch">/stretch</string>
<string name="/whistle">/whistle</string>
<string name="/yes">/yes</string>
<string name="/yes!">/yes!</string>
<string name="afk">afk</string>
<string name="dance1">dance1</string>
<string name="dance2">dance2</string>
<string name="dance3">dance3</string>
<string name="dance4">dance4</string>
<string name="dance5">dance5</string>
<string name="dance6">dance6</string>
<string name="dance7">dance7</string>
<string name="dance8">dance8</string>
<string name="DefaultMimeType">none/none</string>
<string name="Chat">Chat</string>
@@ -4134,6 +4233,15 @@ Try enclosing path to the editor with double quotes.
<string name="Left">Left</string>
<string name="Right">Right</string>
<!-- llviewerwindow -->
<string name="BeaconParticle">Viewing particle beacons (blue)</string>
<string name="BeaconPhysical">Viewing physical object beacons (green)</string>
<string name="BeaconScripted">Viewing scripted object beacons (red)</string>
<string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string>
<string name="BeaconSound">Viewing sound beacons (yellow)</string>
<string name="BeaconMedia">Viewing media beacons (white)</string>
<string name="ParticleHiding">Hiding Particles</string>
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>

6
indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bg_visible="false" border="false" border_visible="false" height="200" name="Adv_Settings" use_bounding_rect="true" width="220">
<panel bottom="1" filename="panel_bg_tab.xml" height="197" width="197"/>
<slider bottom="177" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
<panel bg_visible="false" border="false" border_visible="false" height="180" name="Adv_Settings" use_bounding_rect="true" width="220">
<panel bottom="1" filename="panel_bg_tab.xml" height="177" width="197"/>
<slider bottom="157" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="189" tool_tip="Amount of particles to render"/>
<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60" max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="189" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>

0
indra/newview/skins/default/xui/es/floater_animation_preview.xml → indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
View File

2
indra/newview/skins/default/xui/es/floater_directory2.xml
View File

@@ -326,7 +326,7 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column abel="Nombre" name="name" />
<column label="Nombre" name="name" />
<column label="Tráfico" name="dwell"/>
</scroll_list>
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>

2
indra/newview/skins/default/xui/es/floater_directory3.xml
View File

@@ -405,7 +405,7 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
<scroll_list name="results">
<column label="" name="icon"/>
<column label="" name="type"/>
<column abel="Nombre" name="name" />
<column label="Nombre" name="name" />
<column label="Tráfico" name="dwell"/>
</scroll_list>
<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>

2
indra/newview/skins/default/xui/es/floater_image_preview.xml
View File

@@ -47,7 +47,7 @@
Intenta guardándola como Targa de 24 bits (.tga).
</text>
<check_box label="Usar Compresión sin pérdid" name="lossless_check"/>
<check_box label="Temporaria (Gratis)" name="temp_check" tooltip="Fija el item como temporario, lo cual significa que es gratis pero por un período de tiempo luego del cual, desaparece"/>
<check_box label="Temporaria (Gratis)" name="temp_check" tool_tip="Fija el item como temporario, lo cual significa que es gratis pero por un período de tiempo luego del cual, desaparece"/>
<button label="Cancelar" name="cancel_btn"/>
<button label="Subir ([UPLOADFEE])" name="ok_btn"/>
</floater>

1
indra/newview/skins/default/xui/es/menu_inventory.xml
View File

@@ -47,7 +47,6 @@
<menu_item_call name="Properties" label="Propiedades"/>
<menu_item_call name="Rename" label="Renombrar"/>
<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID"/>
<menu_item_call name="Reupload..." label="Resubir..."/>
<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID"/>
<menu_item_call name="Cut" label="Cortar"/>
<menu_item_call name="Copy" label="Copiar"/>

4
indra/newview/skins/default/xui/es/notifications.xml
View File

@@ -968,8 +968,8 @@ Podría ser [VALIDS]
No se ha podido crear el archivo de salida: [FILE]
</notification>
<notification name="DoNotSupportBulkAnimationUpload">
Actualmente, no ofrecemos la posibilidad de subida masiva de archivos de animación.
<notification name="DoNotSupportBulkBVHAnimationUpload">
Actualmente, no ofrecemos la posibilidad de subida masiva de archivos de BVH animación.
</notification>
<notification name="CannotUploadReason">

1
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -2967,7 +2967,6 @@ Arrastra carpetas a esta zona y pulsa "Enviar al Mercado" para listarlos y poner
<string name="Right Pec">Pectoral Derecho</string>
<string name="Neck">Cuello</string>
<string name="Root">Base</string>
<string name="unsupported point">Punto no soportado</string>
<string name="Invalid Attachment">Punto de anexión inválido</string>
<!-- HUD Position -->

54
indra/newview/skins/default/xui/fr/floater_about_land.xml
View File

@@ -27,21 +27,6 @@
Leyla Linden
</text>
<button label="Profil..." label_selected="Profil..." name="Profile..."/>
<string name="group_owned_text">
(Propriété du Groupe)
</string>
<string name="profile_text">
Profil...
</string>
<string name="info_text">
Infos...
</string>
<string name="public_text">
(public)
</string>
<string name="none_text">
(aucun)
</string>
<text name="Group:">
Groupe:
</text>
@@ -91,6 +76,7 @@
</text>
<button label="Acheter le terrain" label_selected="Achat du terrain" left="130" name="Buy Land..." width="125"/>
<button label="Acheter pour le groupe" label_selected="Achat du terrain pour le groupe" name="Buy For Group..."/>
<button name="Scripts..." width="110"/>
<button label="Acheter un pass" label_selected="Achat d&#x27;un pass" left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
<button label="Abandonner le terrain" label_selected="Abandon du terrain" name="Abandon Land..."/>
<button label="Redemander le terrain" label_selected="Redemande le terrain" name="Reclaim Land..."/>
@@ -113,6 +99,21 @@
<string name="need_tier_to_modify">
Pour modifier ce terrain, vous devez approuver votre achat.
</string>
<string name="group_owned_text">
(Propriété du Groupe)
</string>
<string name="profile_text">
Profil...
</string>
<string name="info_text">
Infos...
</string>
<string name="public_text">
(public)
</string>
<string name="none_text">
(aucun)
</string>
<string name="sale_pending_text">
(vente en cours)
</string>
@@ -290,12 +291,6 @@ Allez dans le menu Monde &gt; A propos du terrain ou sélectionnez une autre par
Options du terrain:
</text>
<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
<string name="push_restrict_text">
Pas de bousculades
</string>
<string name="push_restrict_region_text">
Pas de bousculades (les règles de la région priment)
</string>
<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain." bottom="-140" left="14"/>
<check_box label="Afficher dans la recherche ([DIRECTORYFEE]) sous" name="ShowDirectoryCheck" tool_tip="Affiche la parcelle dans les résultats de recherche" bottom="-160"/>
<string name="search_enabled_tooltip">
@@ -444,6 +439,12 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
Lieu d'arrivée libre
</combo_item>
</combo_box>
<string name="push_restrict_text">
Pas de bousculades
</string>
<string name="push_restrict_region_text">
Pas de bousculades (les règles de la région priment)
</string>
</panel>
<panel label="Médias" name="land_media_panel">
<text name="with media:" width="70">
@@ -495,17 +496,6 @@ Select the thumbnail to choose a different texture.
<text name="pixels">
Pixels
</text>
<text name="Interaction:">
Interaction:
</text>
<radio_group name="radio_navigate_allow">
<radio_item name="Anyone" tool_tip="Chaque résident peut intervenir sur le média.">
Tous
</radio_item>
<radio_item name="Group" tool_tip="Les permissions du groupe contrôlent qui peux intervenir sur le média.">
Groupe
</radio_item>
</radio_group>
</panel>
<panel name="land_audio_panel">
<text name="MusicURL:">

0
indra/newview/skins/default/xui/fr/floater_animation_preview.xml → indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
View File

95
indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
View File

@@ -1,85 +1,32 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="Propriétés de l'objet de l'inventaire">
<text name="LabelItemNameTitle">
Nom:
</text>
<text name="LabelItemDescTitle">
Description:
</text>
<text name="LabelCreatorTitle">
Créateur:
</text>
<text name="LabelCreatorName">
Nicole Linden
</text>
<button label="Profil..." label_selected="" name="BtnCreator"/>
<text name="LabelOwnerTitle">
Propriétaire:
</text>
<text name="LabelOwnerName">
Thrax Linden
</text>
<button label="Profil..." label_selected="" name="BtnOwner"/>
<text name="LabelAcquiredTitle">
Acquis:
</text>
<text name="LabelAcquiredDate">
Wed May 24 12:50:46 2006
</text>
<text name="OwnerLabel">
Vous pouvez:
</text>
<text name="LabelItemNameTitle">Nom:</text>
<text name="LabelCreatorTitle">Créateur:</text>
<text name="LabelOwnerTitle">Propriétaire:</text>
<text name="LabelAcquiredTitle">Acquis :</text>
<text name="OwnerLabel">Vous Pouvez:</text>
<check_box label="Modifier" name="CheckOwnerModify"/>
<check_box label="Copier" name="CheckOwnerCopy"/>
<check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
<text name="BaseMaskDebug">
B:
</text>
<text name="OwnerMaskDebug">
O:
</text>
<text name="GroupMaskDebug">
G:
</text>
<text name="EveryoneMaskDebug">
E:
</text>
<text name="NextMaskDebug">
N:
</text>
<check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
<text name="NextOwnerLabel" width="192">
Le prochain propriétaire pourra :
</text>
<text bottom_delta="-1" name="GroupLabel">Les Membres du Groupe peuvent:</text>
<check_box label="Modifer" name="CheckGroupMod"/>
<check_box label="Copier" name="CheckGroupCopy"/>
<check_box label="Déplacer" name="CheckGroupMove"/>
<text bottom_delta="-10" name="EveryoneLabel">Tout le Monde peux:</text>
<check_box bottom_delta="-20" label="Copier" name="CheckEveryoneCopy"/>
<check_box label="Déplacer" name="CheckEveryoneMove"/>
<text name="NextOwnerLabel" width="150">Le Prochain Propriétaire peux:</text>
<check_box label="Modifier" name="CheckNextOwnerModify"/>
<check_box label="Copier" name="CheckNextOwnerCopy"/>
<check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
<text name="SaleLabel">
Marquer l'objet:
</text>
<check_box label="À vendre" name="CheckPurchase"/>
<text name="SaleLabel">Marquer l'objet:</text>
<check_box label="A Vendre" name="CheckPurchase"/>
<radio_group name="RadioSaleType">
<radio_item name="radio">
Original
</radio_item>
<radio_item name="radio2">
Copie
</radio_item>
<radio_item name="radio">Original</radio_item>
<radio_item name="radio2">Copie</radio_item>
</radio_group>
<text name="TextPrice">
Prix: [CURRENCY]
</text>
<string name="unknown">
(inconnu)
</string>
<string name="public">
(public)
</string>
<string name="you_can">
Vous pouvez:
</string>
<string name="owner_can">
Le propriétaire peut:
</string>
<text name="TextPrice">Prix: [CURRENCY]</text>
<string name="unknown">(Inconnu au Bataillon)</string>
<string name="you_can">Vous pouvez:</string>
<string name="owner_can">Le Propriétaire peux:</string>
</floater>

156
indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
View File

@@ -1,94 +1,80 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="modal container" width="600">
<button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
<button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
<check_box label="Silhouette" name="checkbox_Shape"/>
<check_box label="Peau" name="checkbox_Skin"/>
<check_box label="Cheveux" name="checkbox_Hair"/>
<check_box label="Yeux" name="checkbox_Eyes"/>
<check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
<check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
<check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
<check_box label="Chemise" name="checkbox_Shirt"/>
<check_box label="Pantalon" name="checkbox_Pants"/>
<check_box label="Chaussures" name="checkbox_Shoes"/>
<floater name="modal container" title="Cr&#xE9;er un ensemble" width="600">
<button label="Enregistrer" label_selected="Enregistrer" name="Save" width="100"/>
<button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
<check_box label="Silhouette" name="checkbox_Shape"/>
<check_box label="Peau" name="checkbox_Skin"/>
<check_box label="Cheveux" name="checkbox_Hair"/>
<check_box label="Yeux" name="checkbox_Eyes"/>
<check_box label="Donner le nom du dossier &#10;&#xE0; l'ensemble" name="rename"/>
<check_box name="checkbox_use_outfits" label="Utiliser un dossier Viewer 2"/>
<check_box name="checkbox_use_links" label="Utiliser des Liens pour les No Copy, No Mod ou les éléments 'multi worn'"/>
<check_box label="Chemise" name="checkbox_Shirt"/>
<check_box label="Pantalon" name="checkbox_Pants"/>
<check_box label="Chaussures" name="checkbox_Shoes"/>
<check_box label="Chaussettes" name="checkbox_socks"/>
<check_box label="Veste" name="checkbox_Jacket"/>
<check_box label="Veste" name="checkbox_Jacket"/>
<check_box label="Gants" name="checkbox_gloves"/>
<check_box label="Tee Shirt" name="checkbox_Undershirt"/>
<check_box label="culotte" name="checkbox_Underpants"/>
<check_box label="Jupe" name="checkbox_Skirt"/>
<check_box label="Poitrine" left="225" name="checkbox_Chest"/>
<check_box label="Crâne" left="225" name="checkbox_Skull"/>
<check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
<check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
<check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
<check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
<check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
<check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
<check_box label="Colonne" left="225" name="checkbox_Spine"/>
<check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
<check_box label="Bouche" left="225" name="checkbox_Mouth"/>
<check_box label="Menton" left="225" name="checkbox_Chin"/>
<check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
<check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
<check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
<check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
<check_box label="Nez" left="325" name="checkbox_Nose"/>
<check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
<check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
<check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
<check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
<check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
<check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
<check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
<check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
<check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
<check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
<check_box label="Estomac" left="460" name="checkbox_Stomach"/>
<check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
<check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
<check_box label="Cou" left="460" name="checkbox_Neck"/>
<check_box label="Root" left="460" name="checkbox_Root"/>
<check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
<check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
<check_box label="En haut" left="460" name="checkbox_Top"/>
<check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
<check_box label="Centre" left="460" name="checkbox_Center"/>
<check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
<check_box label="En bas" left="460" name="checkbox_Bottom"/>
<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
<text name="Make New Outfit">
Cr&#xE9;er un ensemble
</text>
<text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
<check_box label="Tee Shirt" name="checkbox_Undershirt"/>
<check_box label="culotte" name="checkbox_Underpants"/>
<check_box label="Jupe" name="checkbox_Skirt"/>
<check_box label="Poitrine" left="225" name="checkbox_Chest"/>
<check_box label="Crâne" left="225" name="checkbox_Skull"/>
<check_box label="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
<check_box label="Epaule droite" left="225" name="checkbox_Right Shoulder"/>
<check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
<check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
<check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
<check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
<check_box label="Colonne" left="225" name="checkbox_Spine"/>
<check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
<check_box label="Bouche" left="225" name="checkbox_Mouth"/>
<check_box label="Menton" left="225" name="checkbox_Chin"/>
<check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
<check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
<check_box label="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
<check_box label="Oeil droit" left="325" name="checkbox_Right Eyeball"/>
<check_box label="Nez" left="325" name="checkbox_Nose"/>
<check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
<check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
<check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
<check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
<check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
<check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
<check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
<check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
<check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
<check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
<check_box label="Estomac" left="460" name="checkbox_Stomach"/>
<check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
<check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
<check_box label="Cou" left="460" name="checkbox_Neck"/>
<check_box left="460" name="checkbox_Root"/>
<check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
<check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
<check_box label="En haut" left="460" name="checkbox_Top"/>
<check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
<check_box label="Centre" left="460" name="checkbox_Center"/>
<check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
<check_box label="En bas" left="460" name="checkbox_Bottom"/>
<check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
<!--text name="Make New Outfit">
Cr&#xE9;er un ensemble
</text-->
<text name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
Faire glisser le dossier contenant un ensemble vers l&#x27;avatar pour lui faire porter.
Le bouton Cr&#xE9;er un ensemble vous permet de cr&#xE9;er un dossier et d'y sauvegarder les copies
des articles que vous portez maintenant.
</text>
<text name="Folder name:">
Nom du dossier :
</text>
<text name="Items to include in outfit:">
Articles &#xE0; inclure &#xE0; l'ensemble  :
</text>
<button label="Sélect. TOUT" name="Check All" width="85" />
<button label="Déselect. TOUT" left_delta="110" name="Uncheck All" width="105" />
<text name="Body Parts:">
Parties du corps :
</text>
<text name="Clothes:">
Habits :
</text>
<text name="Attachments:">
Attachements  :
</text>
<text name="Options:">
Options :
</text>
<line_editor name="name ed">
Nouvelle tenue
</line_editor>
</text>
<text name="Folder name:">Nom du dossier :</text>
<text name="Items to include in outfit:">Articles &#xE0; inclure &#xE0; l'ensemble :</text>
<button label="Sélect. TOUT" name="Check All"/>
<button label="Déselect. TOUT" name="Uncheck All"/>
<text name="Body Parts:">Parties du corps :</text>
<text left="115" name="Clothes:">Habits :</text>
<text left="227" name="Attachments:">Attachements :</text>
<text name="Options:">Options :</text>
<line_editor name="name ed">Nouvelle tenue</line_editor>
</floater>

141
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@@ -1,16 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" title="" short_title="Construire">
<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
<button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
<button label="" label_selected="" name="button create" tool_tip="Créer"/>
<button label="" label_selected="" name="button land" tool_tip="Terrain"/>
<!-- Main floater tabs -->
<button name="button focus" tool_tip="Mise au point"/>
<button name="button move" tool_tip="Déplacer"/>
<button name="button edit" tool_tip="Modifier"/>
<button name="button create" tool_tip="Créer"/>
<button name="button land" tool_tip="Terrain"/>
<!-- Focus panel -->
<check_box label="Zoom" name="radio zoom"/>
<check_box label="Orbite (Ctrl)" name="radio orbit"/>
<check_box label="Panoramique (Ctrl-Maj)" name="radio pan"/>
<!-- Move panel -->
<check_box label="Déplacer" name="radio move"/>
<check_box label="Orbite (Ctrl)" name="radio lift"/>
<check_box label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
<!-- Edit panel -->
<check_box label="Positionner" name="radio position"/>
<check_box label="Pivoter (Ctrl)" name="radio rotate"/>
<check_box label="Étirer (Ctrl-Maj)" name="radio stretch"/>
@@ -32,11 +43,20 @@
</combo_box>
<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
<check_box label="Étirer les textures" name="checkbox stretch textures"/>
<check_box label="Utiliser la grille" name="checkbox snap to grid"/>
<check_box label="Limiter le 'drag distance'" name="checkbox limit drag distance"/>
<check_box label="Editer l'axe sur le 'Root'" name="checkbox actual root"/>
<check_box label="Montrer les ojb. invisibles" name="checkbox show highlight"/>
<check_box label="Grille" name="checkbox snap to grid"/>
<button label="Options" label_selected="Options" name="Options"/>
<!-- Help text -->
<text name="text status">
Glissez pour déplacer, Maj-glissez pour copier.
</text>
<!-- Create panel -->
<button name="ToolCube" tool_tip="Cube"/>
<button name="ToolPrism" tool_tip="Prisme droit"/>
<button name="ToolPyramid" tool_tip="Pyramide"/>
@@ -56,6 +76,9 @@
<check_box label="Copier la sélection" name="checkbox copy selection"/>
<check_box label="Centrer" name="checkbox copy centers"/>
<check_box label="Pivoter" name="checkbox copy rotates"/>
<!-- Land panel -->
<check_box label="Sélectionner le terrain" name="radio select land"/>
<check_box label="Aplatir" name="radio flatten"/>
<check_box label="Élever" name="radio raise"/>
@@ -73,12 +96,12 @@
<text name="Strength:">
Force
</text>
<text name="obj_count">
Objets sélectionnés : [COUNT]
</text>
<text name="prim_count">
Prims : [COUNT]
Prims : [COUNT]
</text>
<!-- Sub-tabs -->
<tab_container name="Object Info Tabs">
<panel label="Général" name="General">
<text name="Name:">
@@ -97,15 +120,10 @@
<text name="Owner:">
Propriétaire :
</text>
<button label="Profil" label_selected="Profil" name="button last owner profile"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
<text name="Last Owner:">
Dernier Proprio :
</text>
<text name="Owner Name">
Thrax Linden
</text>
@@ -124,7 +142,7 @@
<text name="perm_modify">
Vous pouvez modifier cet objet.
</text>
<check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autorise tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Transférer."/>
<check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autorise tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Transférer."/>
<string name="text deed continued">
Transférer
</string>
@@ -132,12 +150,14 @@
Transférer
</string>
<button label="Céder" label_selected="Céder" name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
<check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
<check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Affiche l&apos;objet dans les résultats de recherche"/>
<text name="text anyone can">Tout le monde peux:</text>
<check_box label="Déplacer" name="checkbox allow everyone move"/>
<check_box label="Copier" name="checkbox allow everyone copy"/>
<check_box name="checkbox allow export" label="Exporter"/>
<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Affiche l'objet dans les résultats de recherche"/>
<check_box label="À vendre" name="checkbox for sale"/>
<text name="Cost">
Prix : [CURRENCY]
Prix : [CURRENCY]
</text>
<radio_group name="sale type">
<radio_item name="Original">
@@ -151,26 +171,26 @@
</radio_item>
</radio_group>
<text name="Next owner can:">
Le prochain propriétaire pourra :
Le prochain propriétaire pourra :
</text>
<check_box label="Modifier" name="checkbox next owner can modify"/>
<check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
<check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
<text name="label click action">
Action du clic-gauche :
Action du clic-gauche :
</text>
<combo_box name="clickaction" width="178">
<combo_item name="Touch/grab(default)">
Toucher/attraper (défaut)
</combo_item>
<combo_item name="Sitonobject">
S&apos;asseoir sur l&apos;objet
S'asseoir sur l'objet
</combo_item>
<combo_item name="Buyobject">
Acheter l&apos;objet
Acheter l'objet
</combo_item>
<combo_item name="Payobject">
Payer l&apos;objet
Payer l'objet
</combo_item>
<combo_item name="Open">
Ouvrir
@@ -183,24 +203,14 @@
</combo_item>
</combo_box>
<button bottom="-338" label="Copier la Clef" tool_tip="Copie la clef dans le presse-papier." width="80"/>
<text name="B:">
B :
</text>
<text name="O:">
O :
</text>
<text name="G:">
G :
</text>
<text name="E:">
E :
</text>
<text name="N:">
N :
</text>
<text name="F:">
F :
</text>
<panel name="pathfinding_attrs_panel">
<text name="pathfinding_attributes_label">
Pathfinding :
</text>
<text name="pathfinding_attributes_value">
Tester
</text>
</panel>
<string name="text modify info 1">
Vous pouvez modifier cet objet.
</string>
@@ -217,13 +227,13 @@
Sélectionnez l'objet en entier.
</string>
<string name="Cost Default">
Prix : [CURRENCY]
Prix : [CURRENCY]
</string>
<string name="Cost Total">
Prix total : [CURRENCY]
Prix total : [CURRENCY]
</string>
<string name="Cost Per Unit">
Prix par : [CURRENCY]
Prix par : [CURRENCY]
</string>
<string name="Cost Mixed">
Prix mixte
@@ -232,19 +242,12 @@
Vente mixte
</string>
</panel>
<!-- Object sub-tab -->
<panel label="Objet" name="Object">
<text name="select_single">
</text>
<text name="edit_object">
</text>
<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="Lier" left="10" mouse_opaque="true" name="link_obj" enabled="true"
tool_tip="" width="50" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="Delier" left_delta="50" mouse_opaque="true" name="unlink_obj" enabled="true"
tool_tip="Unlinks linkset." width="50" />
<button label="Lier" name="link_obj"/>
<button label="Delier" name="unlink_obj"/>
<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l'objet d'être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
<check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l'objet d'être poussé et affecté par la gravité"/>
<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L'objet est supprimé 2 mn après sa création."/>
@@ -252,21 +255,12 @@
<text name="label position">
Position (mètres)
</text>
<spinner label="X" name="Pos X"/>
<spinner label="Y" name="Pos Y"/>
<spinner label="Z" name="Pos Z"/>
<text name="label size">
Taille (mètres)
</text>
<spinner label="X" name="Scale X"/>
<spinner label="Y" name="Scale Y"/>
<spinner label="Z" name="Scale Z"/>
<text name="label rotation">
Rotation (degrés)
</text>
<spinner label="X" name="Rot X"/>
<spinner label="Y" name="Rot Y"/>
<spinner label="Z" name="Rot Z"/>
<text name="label material">
Matériau
</text>
@@ -414,12 +408,15 @@
</combo_item>
</combo_box>
</panel>
<!-- Features sub-tab -->
<panel label="Attributs" name="Features">
<text name="select_single">
Sélectionnez un prim pour modifier les attributs.
</text>
<text name="edit_object">
Modifiez les attributs de l'objet :
Modifiez les attributs de l'objet :
</text>
<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'axe des Z (côté client uniquement)."/>
<spinner label="Souplesse" name="FlexNumSections"/>
@@ -539,9 +536,7 @@
<text name="tex scale">
Répétitions par face
</text>
<spinner label="Horizontal (U)" name="TexScaleU"/>
<check_box label="Inverser" name="checkbox flip s"/>
<spinner label="Vertical (V)" name="TexScaleV"/>
<check_box label="Inverser" name="checkbox flip t"/>
<text name="tex rotate">
Rotation (degrés)
@@ -561,21 +556,17 @@
<text name="tex offset">
Décalage
</text>
<spinner label="Horizontal (U)" name="TexOffsetU"/>
<spinner label="Vertical (V)" name="TexOffsetV"/>
<text name="textbox autofix">
Ajuster la texture du média
(chargement préalable)
</text>
<button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/>
<text name="textbox params">Paramètres</text>
<button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier" width="55"/>
<button label="Coller" name="pastetextures" tool_tip="Colle les paramètres de la texture du presse papier" width="55"/>
</panel>
<panel label="Contenu" name="Contents">
<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
<button label="Permissions" name="button permissions"/>
</panel>
</tab_container>
<panel name="land info panel">

1
indra/newview/skins/default/xui/fr/menu_inventory.xml
View File

@@ -47,7 +47,6 @@
<menu_item_call name="Properties" label="Propriétés"/>
<menu_item_call name="Rename" label="Renommer"/>
<menu_item_call name="Copy Asset UUID" label="Copier l'UUID (identifiant universel unique)"/>
<menu_item_call name="Reupload..." label="Reupload..."/>
<menu_item_call name="Acquire Asset ID" label="Acquérir Asset ID"/>
<menu_item_call name="Copy" label="Copier"/>
<menu_item_call name="Paste" label="Coller"/>

4
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@@ -8,6 +8,7 @@
<menu_item_call label="Import multiples ([UPLOADFEE] par fichier)" name="Bulk Upload"/>
<menu_item_call label="Import XML" name="Import"/>
<menu_item_call label="Import avec textures" name="Import2"/>
<menu_item_call label="Changer les textures locales" name="Change Local Textures"/>
<menu_item_separator/>
<menu_item_call label="Définir les droits par défaut " name="perm prefs"/>
<menu_item_separator/>
@@ -15,6 +16,7 @@
<menu_item_call label="Enregistrer la texture sur le disque dur en PNG" name="Save Preview AsPNG..."/>
<menu_item_separator/>
<menu_item_call label="Minimiser toutes les fenêtres" name="Minimize All Windows"/>
<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
<menu_item_separator label="-----------" name="separator3"/>
@@ -240,4 +242,4 @@
</menu>
<menu_item_call label="A propos de Singularity" name="About Second Life..."/>
</menu>
</menu_bar>
</menu_bar>

4
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -696,8 +696,8 @@ Assurez-vous que le fichier a l&apos;extension correcte.
<notification name="UnableToCreateOutputFile">
Impossible de créer le fichier de sortie : [FILE]
</notification>
<notification name="DoNotSupportBulkAnimationUpload">
Nous ne prenons pas en charge le chargement de lots de fichiers d&apos;animation. (Chaque animation ayant ses propres réglages)
<notification name="DoNotSupportBulkBVHAnimationUpload">
Nous ne prenons pas en charge le chargement de lots de fichiers d&apos;BVH animation. (Chaque animation ayant ses propres réglages)
</notification>
<notification name="CannotUploadReason">
Impossible de charger [FILE] suite au problème suivant : [REASON]

32
indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
View File

@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Chat Avanc&#xE9;" name="ascsys">
<tab_container label="Advanced Chat" name="Ascent Chat">
<panel label="Chat/IM" name="Chat/IM">
<tab_container name="Ascent Chat">
<panel label="Chat/IM" name="Chat/IM">
<check_box label="Annonce les IMs entrants" name="quickstart_im_check"/>
<check_box label="Ne pas envoyer &#x22;[Machin Truc] is typing..." name="hide_typing_check"/>
<check_box label="Montrer le nom du groupe dans le chat" name="append_group_name_check"/>
<check_box label="Jouer le son typique pour le chat local" name="play_typing_sound_check"/>
<check_box label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
<check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
<check_box label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
<check_box label="Ajoute les fins des commentaires (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
<check_box label="Montre les changements de display name" tool_tip="" name="display_name_change"/>
<check_box label="Le texte ecris d&#xE9;file au dessus de l'avi" name="use_typing_bubbles"/>
<text name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
<radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
<radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
<radio_item name="no_object">Aucun objet</radio_item>
<radio_item name="others_objects">Les objets des autres</radio_item>
<radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>
</radio_group>
<text name="time_format_text_box">Type d'heure :</text>
<combo_box name="time_format_combobox">
<combo_item name="24hours">Horloge 24/H</combo_item>
@@ -29,22 +30,23 @@
<combo_item name="day_first">JJ/MM/AAAA</combo_item>
<combo_item name="month_first">MM/JJ/AAA</combo_item>
</combo_box>
<check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
<check_box label="Secondes dans les horaires de log" name="seconds_in_log"/>
<!-- Auto-responder -->
<check_box label="Activer le R&#xE9;pondeur Automatique" name="AscentInstantMessageResponseAnyone"/>
<check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
<check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
<check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
<check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
<check_box label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
<check_box label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
<check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
<check_box label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
<text left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
<text bottom_delta="140" left_delta="280" name="text_box1">Texte de la r&#xE9;ponse :</text>
<text_editor bottom_delta="-130" height="130" name="im_response" width="190"/>
<text name="text_box2">
#f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
#i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
</text>
</panel>
<panel label="Chat UI" name="ChatUI">
<check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
<check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
@@ -65,20 +67,19 @@
<spinner label="Multiplicateur du nombre de messages pour les sons:" name="antispamsoundmulti"/>
<spinner label="Multiplicateur du nombre de sons &#xE0; pr&#xE9;charger par spam:" name="antispamsoundpreloadmulti"/>
<spinner label="Nombre de lignes max. d'un message:" name="antispamnewlines"/>
<check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam"/>
<check_box label="D&#xE9;sactive toutes les fen&#xEA;tres de dialogue (D&#xE9;co/Reco)" name="antispam_checkbox"/>
<text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
<text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
<check_box label="Alertes" name="Alerts"/>
<check_box label="Demande d'amitié" name="Friendship Offers"/>
<check_box label="Invitation de groupe" name="Group Invites"/>
<check_box label="Invit. de frais de grp" name="Group Fee Invites"/>
<check_box label="Notices de groupes" name="Group Notices"/>
<check_box label="Offre d'objets" name="Item Offers"/>
<check_box label="Scripts" name="Scripts"/>
<check_box label="Offres de TP" name="Teleport Offers"/>
<check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked."/>
<check_box label="Notices de groupes" name="Group Notices"/>
<check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
</panel>
</panel>
<panel label="Options de Texte" name="TextOptions">
<check_box label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay"/>
@@ -99,9 +100,8 @@ Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
<check_box label="Chat local" name="KeywordsInChat"/>
<check_box label="IMs" name="KeywordsInIM"/>
<check_box label="Mettre en valeur le message avec cette couleur :" name="KeywordsChangeColor"/>
<color_swatch name="KeywordsColor" tool_tip="Click to open Color Picker"/>
<check_box label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
</panel>
</tab_container>
</panel>
</panel>

1
indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
View File

@@ -71,6 +71,7 @@
<check_box label="Prendre discr&#xE8;tement un photo, sur votre disque dur" tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." name="quiet_snapshots_check"/>
<check_box label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations." name="revoke_perms_on_stand_up_check"/>
<check_box label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet." name="disable_click_sit_check"/>
<check_box left_delta="210" label="Sur les objets qui ne sont pas a vous" tool_tip="" name="disable_click_sit_own_check"/>
<check_box label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." name="totalscriptjumps" tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
<spinner left_delta="350" name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
</panel>

12
indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Vanity" name="ascvan">
<tab_container label="Singularity Vanity" name="Ascent Vanity">
<panel name="ascvan">
<tab_container name="Ascent Vanity">
<panel label="Principal" name="General">
<check_box label="Lorsque c'est possible, sauver le setting personnalisé par compte." tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
<check_box label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
@@ -46,13 +46,7 @@
<check_box name="color_linden_check" tool_tip="Color Linden Chat"/>
<check_box name="color_muted_check" tool_tip="Color Muted Chat"/>
</panel>
<panel label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
<check_box label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" name="EmBreastsToggle"/>
<slider name="EmeraldBoobMass" label="Masse :" />
<slider name="EmeraldBoobHardness" label="Rebond :"/>
<slider name="EmeraldBoobVelMax" label="V&#xE9;locit&#xE9; max :"/>
<slider name="EmeraldBoobFriction" label="Friction :"/>
<slider name="EmeraldBoobVelMin" label="V&#xE9;locit&#xE9; min :"/>
<panel label="Body Dyn.(Offset de l'avatar)" name="Body Dynamics">
<text name="av_mod_textbox" follows="top">Modifier l'offset de l'avatar</text>
<spinner label="X Modif." name="X Modifier"/>
<spinner label="Y Modif." name="Y Modifier"/>

18
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
View File

@@ -4,7 +4,7 @@
<radio_item name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
<radio_item name="MyLastLocation" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
</radio_group>
<check_box abel="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
<check_box label="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
<combo_box name="fade_out_combobox">
<combo_item name="Never">Jamais</combo_item>
<combo_item name="Show Temporarily">Afficher temporairement</combo_item>
@@ -19,31 +19,23 @@
<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
<text name="group_titles_textbox">Titres de groupe :</text>
<check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
<text name="UI Size:">Taille de l'interface :</text>
<slider name="ui_scale_slider"/>
<check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
<spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
<check_box label="Avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
<check_box label="Sans afficher dans le coin" name="no_transaction_clutter_checkbox" tool_tip="Toujours présente mais momentanément affichée en bas"/>
<text name="maturity_desired_label">Catégories :</text>
<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
<text name="maturity_desired_prompt">Acc&#xE8;s au contenu classé :</text>
<combo_box name="maturity_desired_combobox" left="340">
<combo_item name="Desired_Adult">PG, Mature, Adulte</combo_item>
<combo_item name="Desired_Mature">PG et Mature</combo_item>
<combo_item name="Desired_PG">PG uniquement</combo_item>
</combo_box>
<text name="maturity_desired_textbox" left="340">PG uniquement</text>
<text name="start_location_textbox">Lieu de départ :</text>
<text name="show_names_textbox">Afficher les noms :</text>
<text bottom="-174" name="effects_color_textbox">
Couleur du faisceau
de sélection :
</text>
<text name="start_location_textbox">Lieu de départ :</text>
<text name="show_names_textbox">Afficher les noms :</text>
<text name="seconds_textbox">secondes</text>
<text name="crash_report_textbox">Rapports de crash :</text>
<text name="language_textbox">Langue :</text>
<text name="language_textbox">Langue :</text>
<text left_delta="313" name="language_textbox2">(redémarrage requis)</text>
<combo_box name="language_combobox" width="166">
<combo_item name="System Default Language">Choix par défaut</combo_item>

25
indra/newview/skins/default/xui/fr/panel_preferences_network.xml
View File

@@ -3,36 +3,31 @@
<text name="text_box">Bande passante max:</text>
<text name="text_box2">kbps (kilobits par seconde)</text>
<text name="text_box3">Bande passante de la texture:</text>
<slider left_delta="150" name="tex_bandwidth" width="140"/>
<text left_delta="146" name="text_box2">kbps (kilobits par seconde)</text>
<slider left_delta="145" name="tex_bandwidth" width="145"/>
<text left_delta="150" name="text_box4">kbps (kilobits par seconde)</text>
<text name="use_http_for">Utiliser HTTP pour:</text>
<check_box left_delta="100" label="Textures" name="http_textures"/>
<check_box label="Inventaire" name="http_inventory"/>
<text name="cache_size_label_l">Taille du cache:</text>
<text name="text_box5">Mo</text>
<button label="Vider la mémoire cache" label_selected="Vider le cache" name="clear_cache" width="150"/>
<button label="Vider le cache" name="clear_cache" width="130"/>
<text name="cache_location_label">Emplacement du cache:</text>
<button label="Modifier" label_selected="Modifier" name="set_cache"/>
<button label="Réinitialiser" label_selected="Réinitialiser" name="reset_cache"/>
<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
<spinner label="Numéro de port:" label_width="95" name="connection_port" width="170"/>
<text name="socks5_auth_label">Proxy Http:</text>
<check_box label="Port de Connexion personnalisé" name="connection_port_enabled"/>
<spinner label="Num. du Port:" name="connection_port"/>
<radio_group name="socks5_http_proxy_type">
<radio_item name="None">aucun</radio_item>
<radio_item name="None">Aucun</radio_item>
<radio_item name="Socks">Socks</radio_item>
<radio_item name="Web">Web</radio_item>
</radio_group>
<check_box label="Activer SOCKS 5 Proxy" name="socks5_proxy_enabled"/>
<text name="socks5_host_label">H&#xF4;te Socks 5:</text>
<line_editor name="socks5_proxy_host" tool_tip=""/>
<spinner label="Numéro de port:" label_width="80" name="socks5_proxy_port"/>
<text name="socks5_host_label">H&#xF4;te Socks 5 :</text>
<spinner label="Num. du Port:" name="socks5_proxy_port"/>
<text name="socks5_auth_label2">Authentification:</text>
<radio_group name="socks5_auth">
<radio_item name="None" tool_tip="">aucune</radio_item>
<radio_item name="UserPass" tool_tip="">Nom/Mot de passe</radio_item>
<radio_item name="None">Aucune</radio_item>
<radio_item name="UserPass">Nom/Mot de passe</radio_item>
</radio_group>
<text name="socks5_username_label">Nom:</text>
<line_editor name="socks5_proxy_username"/>
<text name="socks5_password_label">Mot de Passe:</text>
<line_editor name="socks5_proxy_password"/>
</panel>

0
indra/newview/skins/default/xui/pt/floater_animation_preview.xml → indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
View File

4
indra/newview/skins/default/xui/pt/notifications.xml
View File

@@ -773,8 +773,8 @@ Esperada [VALIDS]
Incapaz de criar arquivo de saída: [FILE]
</notification>
<notification name="DoNotSupportBulkAnimationUpload">
Atualmente, não suportamos o envio de arquivos de animação em massa.
<notification name="DoNotSupportBulkBVHAnimationUpload">
Atualmente, não suportamos o envio de arquivos de BVH animação em massa.
</notification>
<notification name="CannotUploadReason">

3
indra/newview/skins/default/xui/pt/panel_preferences_network.xml
View File

@@ -7,6 +7,9 @@
<text name="text_box2">
kbps (kilobits por segundo)
</text>
<text name="text_box4">
kbps (kilobits por segundo)
</text>
<text name="cache_size_label_l">
Tamanho do Cachê de Disco:
</text>