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

Merge remote-tracking branch 'singularity-viewer/master'

Browse Source
This commit is contained in:
Shyotl
2019-11-05 21:50:08 -06:00
parent 36bfaf0f05 3d7da6e858
commit 79bafbb943
98 changed files with 1653 additions and 2522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,7 +352,6 @@
<string name="RemapControlInputs">Steuerung neu zuweisen</string>
<string name="AnimateYourAvatar">Avatar animieren</string>
<string name="AttachToYourAvatar">An Avatar anhängen</string>
<string name="AGroupMemberNamed">A group member named</string>
<string name="ReleaseOwnership">Eigentum aufgeben und öffentlich machen</string>
<string name="LinkAndDelink">Mit Objekten verknüpfen und davon trennen</string>
<string name="AddAndRemoveJoints">Verbindungen zu anderen Objekten hinzufügen und entfernen</string>

127
indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
View File

@@ -7,223 +7,224 @@
label="Save" label_selected="Save" left="171" mouse_opaque="true"
name="Save" scale_image="true" width="82" />
<button bottom="5" enabled="true" font="SansSerif" halign="center" height="20"
label="Cancel" label_selected="Cancel" left="261" mouse_opaque="true"
label="Cancel" label_selected="Cancel" left_delta="90" mouse_opaque="true"
name="Cancel" scale_image="true" width="82" />
<check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Shape" left="13"
mouse_opaque="true" name="checkbox_shape" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Skin" left="13"
height="16" initial_value="false" label="Skin"
mouse_opaque="true" name="checkbox_skin" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Hair" left="13"
height="16" initial_value="false" label="Hair"
mouse_opaque="true" name="checkbox_hair" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Eyes" left="13"
height="16" initial_value="false" label="Eyes"
mouse_opaque="true" name="checkbox_eyes" radio_style="false" width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="95" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
font="SansSerifSmall" h_pad="0" halign="left" height="14"
mouse_opaque="true" name="Options:" v_pad="0" width="100">
Options:
</text>
<!--<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Rename Clothing To Folder Name"
left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />-->
mouse_opaque="true" name="rename" radio_style="false" width="210" />-->
<check_box name="checkbox_use_outfits" control_name="UseOutfitFolders" initial_value="false"
enabled="true" label="Use Viewer 2 outfit folders" font="SansSerifSmall"
bottom_delta="-20" left_delta="0" follows="left|top" height="16" width="300"
bottom_delta="-20" follows="left|top" height="16" width="300"
mouse_opaque="true" radio_style="false" />
<check_box name="checkbox_use_links" control_name="UseInventoryLinks" initial_value="false"
enabled="true" label="Use links for non-copy, no-mod, or multi-worn items" font="SansSerifSmall"
bottom_delta="-20" left_delta="0" follows="left|top" height="16" width="300"
bottom_delta="-20" follows="left|top" height="16" width="300"
mouse_opaque="true" radio_style="false" />
<check_box bottom_delta="-20" follows="left|top" control_name="LiruLegacyOutfitStoreObjChanges" name="checkbox_legacy_copy_changes" label="Copy changes made to attachments" tool_tip="Keeps changes made to attachments, since they were worn or you last logged in, by detaching them just before creating the outfit. Generally, this should be checked, if you know what you're doing, such as making a new outfit to undo bad changes, you'll need to uncheck it."/>
<check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Shirt" left="113"
height="16" initial_value="false" label="Shirt" left_delta="100"
mouse_opaque="true" name="checkbox_shirt" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Pants" left="113"
height="16" initial_value="false" label="Pants"
mouse_opaque="true" name="checkbox_pants" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Shoes" left="113"
height="16" initial_value="false" label="Shoes"
mouse_opaque="true" name="checkbox_shoes" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Socks" left="113"
height="16" initial_value="false" label="Socks"
mouse_opaque="true" name="checkbox_socks" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Jacket" left="113"
height="16" initial_value="false" label="Jacket"
mouse_opaque="true" name="checkbox_jacket" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Gloves" left="113"
height="16" initial_value="false" label="Gloves"
mouse_opaque="true" name="checkbox_gloves" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Undershirt" left="113"
height="16" initial_value="false" label="Undershirt"
mouse_opaque="true" name="checkbox_undershirt" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Underpants" left="113"
height="16" initial_value="false" label="Underpants"
mouse_opaque="true" name="checkbox_underpants" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Skirt" left="113"
height="16" initial_value="false" label="Skirt"
mouse_opaque="true" name="checkbox_skirt" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Tattoo" left="113"
height="16" initial_value="false" label="Tattoo"
mouse_opaque="true" name="checkbox_tattoo" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Alpha" left="113"
height="16" initial_value="false" label="Alpha"
mouse_opaque="true" name="checkbox_alpha" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Physics" left="113"
height="16" initial_value="false" label="Physics"
mouse_opaque="true" name="checkbox_physics" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" height="16" initial_value="false" label="Universal" mouse_opaque="true" name="checkbox_universal" width="100"/>
<check_box bottom="-196" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Chest" left="213"
height="16" initial_value="false" label="Chest" left_delta="100"
mouse_opaque="true" name="checkbox_Chest" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="true" label="Skull" left="213"
height="16" initial_value="true" label="Skull"
mouse_opaque="true" name="checkbox_Skull" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Shoulder" left="213"
height="16" initial_value="false" label="Left Shoulder"
mouse_opaque="true" name="checkbox_Left Shoulder" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Shoulder" left="213"
height="16" initial_value="false" label="Right Shoulder"
mouse_opaque="true" name="checkbox_Right Shoulder" radio_style="false"
width="106" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Hand" left="213"
height="16" initial_value="false" label="Left Hand"
mouse_opaque="true" name="checkbox_Left Hand" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Hand" left="213"
height="16" initial_value="false" label="Right Hand"
mouse_opaque="true" name="checkbox_Right Hand" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="true" label="Left Foot" left="213"
height="16" initial_value="true" label="Left Foot"
mouse_opaque="true" name="checkbox_Left Foot" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="true" label="Right Foot" left="213"
height="16" initial_value="true" label="Right Foot"
mouse_opaque="true" name="checkbox_Right Foot" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Spine" left="213"
height="16" initial_value="false" label="Spine"
mouse_opaque="true" name="checkbox_Spine" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Pelvis" left="213"
height="16" initial_value="false" label="Pelvis"
mouse_opaque="true" name="checkbox_Pelvis" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Mouth" left="213"
height="16" initial_value="false" label="Mouth"
mouse_opaque="true" name="checkbox_Mouth" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Chin" left="213"
height="16" initial_value="false" label="Chin"
mouse_opaque="true" name="checkbox_Chin" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Ear" left="213"
height="16" initial_value="false" label="Left Ear"
mouse_opaque="true" name="checkbox_Left Ear" radio_style="false"
width="100" />
<check_box bottom="-196" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Ear" left="313"
height="16" initial_value="false" label="Right Ear" left_delta="100"
mouse_opaque="true" name="checkbox_Right Ear" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Eyeball" left="313"
height="16" initial_value="false" label="Left Eyeball"
mouse_opaque="true" name="checkbox_Left Eyeball" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Eyeball" left="313"
height="16" initial_value="false" label="Right Eyeball"
mouse_opaque="true" name="checkbox_Right Eyeball" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Nose" left="313"
height="16" initial_value="false" label="Nose"
mouse_opaque="true" name="checkbox_Nose" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="R Upper Arm" left="313"
height="16" initial_value="false" label="R Upper Arm"
mouse_opaque="true" name="checkbox_R Upper Arm" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="R Forearm" left="313"
height="16" initial_value="false" label="R Forearm"
mouse_opaque="true" name="checkbox_R Forearm" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="L Upper Arm" left="313"
height="16" initial_value="false" label="L Upper Arm"
mouse_opaque="true" name="checkbox_L Upper Arm" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="L Forearm" left="313"
height="16" initial_value="false" label="L Forearm"
mouse_opaque="true" name="checkbox_L Forearm" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Hip" left="313"
height="16" initial_value="false" label="Right Hip"
mouse_opaque="true" name="checkbox_Right Hip" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="R Upper Leg" left="313"
height="16" initial_value="false" label="R Upper Leg"
mouse_opaque="true" name="checkbox_R Upper Leg" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="true" label="R Lower Leg" left="313"
height="16" initial_value="true" label="R Lower Leg"
mouse_opaque="true" name="checkbox_R Lower Leg" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Hip" left="313"
height="16" initial_value="false" label="Left Hip"
mouse_opaque="true" name="checkbox_Left Hip" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="L Upper Leg" left="313"
height="16" initial_value="false" label="L Upper Leg"
mouse_opaque="true" name="checkbox_L Upper Leg" radio_style="false"
width="100" />
<check_box bottom="-196" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="true" label="L Lower Leg" left="413"
height="16" initial_value="true" label="L Lower Leg" left_delta="100"
mouse_opaque="true" name="checkbox_L Lower Leg" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Stomach" left="413"
height="16" initial_value="false" label="Stomach"
mouse_opaque="true" name="checkbox_Stomach" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Left Pec" left="413"
height="16" initial_value="false" label="Left Pec"
mouse_opaque="true" name="checkbox_Left Pec" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Right Pec" left="413"
height="16" initial_value="false" label="Right Pec"
mouse_opaque="true" name="checkbox_Right Pec" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Neck" left="413"
height="16" initial_value="false" label="Neck"
mouse_opaque="true" name="checkbox_Neck" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Root" left="413"
height="16" initial_value="false" label="Root"
mouse_opaque="true" name="checkbox_Avatar Center" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Center 2" left="413"
height="16" initial_value="false" label="Center 2"
mouse_opaque="true" name="checkbox_Center 2" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Top Right" left="413"
height="16" initial_value="false" label="Top Right"
mouse_opaque="true" name="checkbox_Top Right" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Top" left="413"
height="16" initial_value="false" label="Top"
mouse_opaque="true" name="checkbox_Top" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Top Left" left="413"
height="16" initial_value="false" label="Top Left"
mouse_opaque="true" name="checkbox_Top Left" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Center" left="413"
height="16" initial_value="false" label="Center"
mouse_opaque="true" name="checkbox_Center" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Bottom Left" left="413"
height="16" initial_value="false" label="Bottom Left"
mouse_opaque="true" name="checkbox_Bottom Left" radio_style="false"
width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Bottom" left="413"
height="16" initial_value="false" label="Bottom"
mouse_opaque="true" name="checkbox_Bottom" radio_style="false" width="100" />
<check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Bottom Right" left="413"
height="16" initial_value="false" label="Bottom Right"
mouse_opaque="true" name="checkbox_Bottom Right" radio_style="false"
width="100" />
<!--text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -251,7 +252,7 @@ Drag an outfit folder onto your avatar to put it on.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-154" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16" left="13"
font="SansSerif" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="Items to include in outfit:" v_pad="0"
width="489">
Items to include in outfit:
@@ -270,13 +271,13 @@ Drag an outfit folder onto your avatar to put it on.
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="113"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left_delta="100"
mouse_opaque="true" name="Clothes:" v_pad="0" width="100">
Clothes:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="213"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left_delta="100"
mouse_opaque="true" name="Attachments:" v_pad="0" width="100">
Attachments:
</text>

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

@@ -24,14 +24,14 @@
name="trigger_label">
Trigger:
</text>
<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="31"
<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="128"
name="trigger_editor" width="105" />
<text bottom_delta="6" follows="top|left" font="SansSerif" left="220"
name="replace_text"
tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
Replace with:
</text>
<line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
<line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="128"
name="replace_editor"
tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
width="130" spell_check="true" />

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

@@ -8,6 +8,10 @@
<floater.string name="status_selectcount">
Primitives: [OBJ_COUNT], LI: [LAND_IMPACT]
</floater.string>
<string name="Selected Face:" value="Selected Face:"/>
<string name="Link number:" value="Link number:"/>
<string name="Selected prims:" value="Selected prims:"/>
<string name="Selected objects:" value="Selected objects:"/>
<floater.string
name="status_remaining_capacity">
Remaining capacity [LAND_CAPACITY].

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

@@ -6549,7 +6549,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
log_to_chat="true"
type="notifytip">
<tag>friendship</tag>
[NAME] is [STATUS]
[secondlife:///app/agent/[ID]/about [NAME]] is [STATUS]
</notification>
<notification
@@ -11450,6 +11450,19 @@ Do you wish to export anyway?
Object successfully exported to: [FILENAME]
</notification>
<notification
icon="alertmodal.tga"
name="SubmitCrashReports"
type="alertmodal">
Would you like to help improve [SHORT_APP_NAME] by sending crash reports?
(You can change your answer in Preferences -> General -> Crash reports)
<usetemplate
name="okcancelbuttons"
notext="No"
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="SupportChatShowInfo"

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

@@ -67,9 +67,8 @@
</combo_box>
<string name="region_name_prompt">&lt;Type region name&gt;</string>
<combo_box bottom="-328" height="18" left="103" name="crash_behavior_combobox" width="140">
<combo_item name="Askbeforesending" value="Ask before sending">Ask before sending</combo_item>
<combo_item name="Alwayssend" value="Always send">Always send</combo_item>
<combo_item name="Neversend" value="Never send">Never send</combo_item>
<combo_item name="Neversend" value="0">Never send</combo_item>
<combo_item name="Alwayssend" value="1">Always send</combo_item>
</combo_box>
<check_box bottom="-385" height="16" initial_value="false" label="Share language with objects" left="101" name="language_is_public" tool_tip="This lets in-world objects know your preferred language."/>
<button bottom="-425" height="25" label="Reset All Settings" name="clear_settings" width="200" />

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

@@ -6,9 +6,9 @@
<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="10000" 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_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"/>
<text bottom_delta="-25" follows="top" height="10" left="12" name="use_http_for" visible="false">Use HTTP for:</text>
<check_box bottom_delta="-5" follows="top" left_delta="90" label="Textures" name="http_textures" visible="false"/>
<check_box bottom_delta="0" follows="top" left_delta="90" label="Inventory" name="http_inventory" visible="false"/>
<text bottom_delta="-20" follows="top" height="10" left="12" name="cache_size_label_l">Disk Cache Size:</text>
<slider bottom_delta="-4" left_delta="110" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="64" initial_val="1024" max_val="9984" min_val="64" name="cache_size" show_text="true" width="180"/>
<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box5">MB</text>

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

@@ -452,7 +452,7 @@ http://secondlife.com/support for help fixing this problem.
<string name="RemapControlInputs">Remap your control inputs</string>
<string name="AnimateYourAvatar">Animate your avatar</string>
<string name="AttachToYourAvatar">Attach to your avatar</string>
<string name="AGroupMemberNamed">A group member named</string>
<string name="AGroupMemberNamed">A member of secondlife:///app/group/[GROUP_ID]/about named secondlife:///app/agent/[FROM_ID]/about</string>
<string name="ReleaseOwnership">Release ownership and become public</string>
<string name="LinkAndDelink">Link and delink from other objects</string>
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
@@ -3833,6 +3833,7 @@ This can be because you somehow have multiple copies running, or your system inc
If this message persists, restart your computer and try again.
If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
</string>
<string name="MBFatalError">Fatal Error. Crash and Loop?</string>
<string name="MBAlreadyRunning">
[APP_NAME] is already running.
Check your task bar for a minimized copy of the program.

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

@@ -3444,7 +3444,7 @@ Pero, vaya, diviértete si quieres.
</notification>
<notification name="FriendOnlineOffline">
[NAME] está [STATUS]
[secondlife:///app/agent/[ID]/about [NAME]] está [STATUS]
</notification>
<notification name="AddSelfFriend">

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

@@ -495,7 +495,7 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro
<string name="RemapControlInputs">Reconfigurar tus controles de entrada</string>
<string name="AnimateYourAvatar">Animar tu avatar</string>
<string name="AttachToYourAvatar">Anexar a tu avatar</string>
<string name="AGroupMemberNamed">un miembro del grupo de nombre</string>
<string name="AGroupMemberNamed">un miembro del secondlife:///app/group/[GROUP_ID]/about de nombre secondlife:///app/agent/[FROM_ID]/about</string>
<string name="ReleaseOwnership">Liberar propiedad y hacer público</string>
<string name="LinkAndDelink">Enlazar y desenlazar de otros objetos</string>
<string name="AddAndRemoveJoints">Agregar o remover uniones con otros objetos</string>