livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fix for STORM-584

master
Oz Linden 2010-11-19 15:50:07 -05:00
parent c68d6c794c 025db4bab7
commit bf5e9b8374
6 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -160,7 +160,7 @@
layout="topleft"
left="10"
height="70"
top="54"
top="59"
name="focus_radio_group">
<radio_item
top_pad="6"
@ -197,7 +197,7 @@
<radio_group
left="10"
height="70"
top="54"
top="59"
layout="topleft"
name="move_radio_group">
<radio_item
@ -931,7 +931,7 @@
height="23"
image_overlay="Edit_Wrench"
layout="topleft"
left_pad="3"
left_pad="13"
name="button set group"
tab_stop="false"
tool_tip="Choose a group to share this object's permissions"
@ -944,7 +944,7 @@
name="checkbox share with group"
tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
top_pad="10"
left="106"
left="100"
width="87" />
<button
follows="top|left"
@ -953,7 +953,7 @@
label_selected="Deed"
layout="topleft"
name="button deed"
left_pad="3"
left_pad="19"
tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
width="80" />
<text
@ -974,7 +974,7 @@
layout="topleft"
name="clickaction"
width="148"
left_pad="0">
left_pad="10">
<combo_box.item
label="Touch (default)"
name="Touch/grab(default)"
@ -1009,7 +1009,7 @@
width="100" />
<!-- NEW SALE TYPE COMBO BOX -->
<combo_box
left_pad="0"
left_pad="10"
layout="topleft"
follows="left|top"
allow_text_entry="false"
@ -1041,7 +1041,7 @@ even though the user gets a free copy.
decimal_digits="0"
increment="1"
top_pad="8"
left="108"
left="118"
control_name="Edit Cost"
name="Edit Cost"
label="Price: L$"

55
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -70,7 +70,7 @@
name="UI Volume"
show_text="false"
slider_label.halign="right"
top_pad="5"
top_pad="4"
volume="true"
width="300">
<slider.commit_callback
@ -104,7 +104,7 @@
name="Wind Volume"
show_text="false"
slider_label.halign="right"
top_pad="5"
top_pad="4"
volume="true"
width="300">
<slider.commit_callback
@ -138,7 +138,7 @@
left="0"
name="SFX Volume"
show_text="false"
top_pad="7"
top_pad="4"
volume="true"
width="300">
<slider.commit_callback
@ -172,7 +172,7 @@
name="Music Volume"
slider_label.halign="right"
show_text="false"
top_pad="5"
top_pad="4"
volume="true"
width="300">
<slider.commit_callback
@ -215,7 +215,7 @@
name="Media Volume"
show_text="false"
slider_label.halign="right"
top_pad="5"
top_pad="4"
volume="true"
width="300">
<slider.commit_callback
@ -257,7 +257,7 @@
label_width="120"
layout="topleft"
left="0"
top_pad="5"
top_pad="4"
name="Voice Volume"
show_text="false"
slider_label.halign="right"
@ -301,9 +301,9 @@
height="15"
tool_tip="Check this to let media auto-play if it wants"
label="Allow Media to auto-play"
top_pad="5"
top_pad="1"
left="25"/>
<check_box
<check_box
name="media_show_on_others_btn"
control_name="MediaShowOnOthers"
value="true"
@ -313,16 +313,6 @@
label="Play media attached to other avatars"
left="25"
width="230"/>
<check_box
control_name="LipSyncEnabled"
follows="left|top"
height="20"
label="Move avatar lips when speaking"
layout="topleft"
left_pad="0"
name="enable_lip_sync"
width="237"
top_delta="-4" />
<text
type="string"
@ -333,7 +323,7 @@
left="25"
name="voice_chat_settings"
width="180"
top_pad="10">
top_pad="7">
Voice Chat Settings
</text>
<text
@ -341,10 +331,10 @@
length="1"
follows="left|top"
layout="topleft"
left="80"
left="46"
top_delta="16"
name="Listen from"
width="102">
width="112">
Listen from:
</text>
<icon
@ -363,7 +353,7 @@
height="18"
image_name="Move_Walk_Off"
layout="topleft"
left_pad="130"
left_pad="170"
name="avatar_icon"
mouse_opaque="false"
visible="true"
@ -375,7 +365,7 @@
draw_border="false"
follows="left|top"
layout="topleft"
left_delta="-128"
left_delta="-168"
width="221"
height="20"
name="ear_location">
@ -391,11 +381,21 @@
follows="left|top"
label="Avatar position"
layout="topleft"
left_pad="-54"
left_pad="-16"
name="1"
top_delta ="0"
width="200" />
</radio_group>
<check_box
control_name="LipSyncEnabled"
follows="left|top"
height="15"
label="Move avatar lips when speaking"
layout="topleft"
left="44"
name="enable_lip_sync"
top_pad="5"
width="237"/>
<check_box
follows="top|left"
enabled_control="EnableVoiceChat"
@ -403,10 +403,11 @@
height="15"
label="Toggle speak on/off when I press:"
layout="topleft"
left="30"
left="44"
name="push_to_talk_toggle_check"
width="237"
tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
top_pad="3"/>
<line_editor
follows="top|left"
control_name="PushToTalkButton"
@ -454,7 +455,7 @@
label="Input/Output devices"
layout="topleft"
left="20"
top_pad="8"
top_pad="6"
name="device_settings_btn"
width="190">
</button>

2
indra/newview/skins/default/xui/it/floater_tools.xml
View File

@ -283,7 +283,7 @@
<combo_box.item label="Plastica" name="Plastic"/>
<combo_box.item label="Gomma" name="Rubber"/>
</combo_box>
<text name="text cut">
<text name="text cut" left_delta="-10" width="170">
Riduci una sezione (inizio/fine)
</text>
<spinner label="I" name="cut begin"/>

12
indra/newview/skins/default/xui/nl/floater_tools.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" title="" short_title="BOUWEN" height="587">
<floater name="toolbox floater" title="" short_title="BOUWEN" height="592">
<button label="" label_selected="" name="button focus" tool_tip="Focus"/>
<button label="" label_selected="" name="button move" tool_tip="Verplaats"/>
<button label="" label_selected="" name="button edit" tool_tip="Bewerk"/>
@ -81,13 +81,13 @@
<text name="Strength:">
Sterkte
</text>
<text name="obj_count" top_pad="15">
<text name="obj_count" top_pad="20">
Geselecteerde objecten: [COUNT]
</text>
<text name="prim_count">
primitieven: [COUNT]
</text>
<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" top="180">
<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" top="185">
<panel label="Algemeen" name="General">
<text name="Name:">
Naam:
@ -115,19 +115,19 @@
<text name="Group Name Proxy">
De Lindens
</text>
<button label="Instellen..." label_selected="Instellen..." name="button set group" left_pad="13"/>
<button label="Instellen..." label_selected="Instellen..." name="button set group"/>
<text name="Permissions:">
Permissies:
</text>
<check_box label="Deel met groep" name="checkbox share with group" tool_tip="Alle leden van de ingestelde groep toestaan om te delen en uw permissies voor dit object te gebruiken. U moet &apos;Overdragen&apos; om rolbeperkingen in te schakelen." left="100"/>
<check_box label="Deel met groep" name="checkbox share with group" tool_tip="Alle leden van de ingestelde groep toestaan om te delen en uw permissies voor dit object te gebruiken. U moet &apos;Overdragen&apos; om rolbeperkingen in te schakelen."/>
<string name="text deed continued">
Overdragen...
</string>
<string name="text deed">
Overdragen
</string>
<button label="Overdragen..." label_selected="Overdragen..." name="button deed" tool_tip="Groepgedeelde objecten kunnen door een groepofficier worden overgedragen" left_pad="19"/>
<button label="Overdragen..." label_selected="Overdragen..." name="button deed" tool_tip="Groepgedeelde objecten kunnen door een groepofficier worden overgedragen"/>
<check_box label="Iedereen mag verplaatsen" name="checkbox allow everyone move"/>
<check_box label="Iedereen mag kopiëren" name="checkbox allow everyone copy"/>
<check_box label="Toon in zoeken" name="search_check" tool_tip="Laat mensen dit object zien in zoekresultaten"/>

2
indra/newview/skins/default/xui/pl/floater_tools.xml
View File

@ -307,7 +307,7 @@
<combo_box.item label="Kwadrat" name="Square"/>
<combo_box.item label="Trójkąt" name="Triangle"/>
</combo_box>
<text name="text twist">
<text name="text twist" left_delta="-5" width="160">
Skręcenie (początek/koniec)
</text>
<spinner label="P" name="Twist Begin"/>

2
indra/newview/skins/default/xui/pt/floater_tools.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" short_title="BUILD TOOLS" title="" width="288">
<floater name="toolbox floater" short_title="BUILD TOOLS" title="">
<floater.string name="status_rotate">
Arrastar as faixas coloridas para girar o objeto
</floater.string>