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

Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

Browse Source
This commit is contained in:
Melanie
2013-08-03 23:44:26 +02:00
parent 5197449598 e939f0f7bc
commit fa6b021d83
23 changed files with 291 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,10 @@
<on_click function="List.ShowProfile"/>
<on_enable function="List.EnableAnySelected"/>
</menu_item_call>
<menu_item_call label="Web Profile" name="Web Profile">
<on_click function="List.ShowWebProfile"/>
<on_visible function="List.VisibleWebProfile"/>
</menu_item_call>
<menu_item_call label="Pay" name="Pay">
<on_click function="List.Pay"/>
<on_enable function="List.EnableSingleSelected"/>
@@ -54,10 +58,10 @@
<on_enable function="List.EnableMute"/>
<on_visible function="List.EnableAnySelected"/>
</menu_item_call>
<menu_item_call label="Report Abuse" name="Report Abuse">
<!--menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.ReportAbuse"/>
<on_visible function="List.EnableSingleSelected"/>
</menu_item_call>
</menu_item_call-->
<menu_item_call label="Copy Key" name="Copy Key">
<on_click function="List.CopyUUIDs"/>
<on_enable function="List.EnableAnySelected"/>

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

@@ -275,9 +275,9 @@
mouse_opaque="true" name="Offer Teleport..." width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
</menu_item_call>
<menu_item_call label="Request Teleport..." name="Request Teleport...">
<!--menu_item_call label="Request Teleport..." name="Request Teleport...">
<on_click filter="" function="Inventory.DoToSelected" userdata="request_lure" />
</menu_item_call>
</menu_item_call-->
<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
mouse_opaque="true" name="Conference Chat" width="128">
<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />

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

@@ -5,6 +5,10 @@
<on_click function="List.ShowProfile"/>
<on_enable function="List.EnableAnySelected"/>
</menu_item_call>
<menu_item_call label="Web Profile" name="Web Profile">
<on_click function="List.ShowWebProfile"/>
<on_visible function="List.VisibleWebProfile"/>
</menu_item_call>
<menu_item_call label="Pay" name="Pay">
<on_click function="List.Pay"/>
<on_enable function="List.EnableSingleSelected"/>
@@ -129,10 +133,10 @@
<on_enable function="List.EnableMute"/>
<on_visible function="List.EnableAnySelected"/>
</menu_item_call>
<menu_item_call label="Report Abuse" name="Report Abuse">
<!--menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.ReportAbuse"/>
<on_visible function="List.EnableSingleSelected"/>
</menu_item_call>
</menu_item_call-->
<menu_item_separator/>
<menu_item_call label="Freeze" name="Freeze">
<on_click function="List.Freeze"/>

12
indra/newview/skins/default/xui/en-us/panel_group_roles.xml
View File

@@ -72,7 +72,7 @@ execute the Ability.
label="Search" left_delta="105" name="search_button" width="60" />
<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
column_padding="0" draw_border="true" draw_heading="true"
heading_font="SansSerifSmall"
heading_font="SansSerifSmall" menu_file="menu_avs_list.xml"
heading_height="14" height="120" left="4" multi_select="true"
name="member_list" width="396">
<column label="Member Name" name="name" width="136" />
@@ -221,8 +221,8 @@ things in this group. There&apos;s a broad variety of Abilities.
Allowed Abilities
</text>
<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
height="105" left="0" multi_select="false" name="role_assigned_members"
width="145" />
height="105" left="0" multi_select="true" name="role_assigned_members"
width="145" menu_file="menu_avs_list.xml"/>
<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Members are visible" left="0"
mouse_opaque="true" name="role_visible_in_list" radio_style="false"
@@ -261,8 +261,8 @@ things in this group. There&apos;s a broad variety of Abilities.
<scroll_list bottom_delta="-125" draw_border="true" enabled="false" height="125" left="0"
multi_select="false" name="action_roles" width="145" />
<name_list background_opaque="true" background_visible="true" bg_alpha_color="blue"
bg_opaque_color="grey" bottom_delta="0" draw_border="true" enabled="false"
height="125" left="150" multi_select="false" name="action_members"
width="254" />
bg_opaque_color="grey" bottom_delta="0" draw_border="true"
height="125" left="150" multi_select="true" name="action_members"
width="254" menu_file="menu_avs_list.xml"/>
</panel>
</panel>

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

@@ -111,7 +111,10 @@ The following wildcards are available to enhance your autoresponses: #n for user
<check_box control_name="AntiSpamScripts" height="16" label="Scripts" name="Scripts" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamTeleports" height="16" label="Teleport Offers" name="Teleport Offers" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamGroupNotices" height="16" label="Group Notices" name="Group Notices" bottom_delta="0" left_delta="120"/>
<check_box control_name="AntiSpamTeleportRequests" height="16" label="Teleport Requests" name="Teleport Requests" left="14" bottom_delta="-20"/>
<!--check_box control_name="AntiSpamTeleportRequests" height="16" label="Teleport Requests" name="Teleport Requests" left="14" bottom_delta="-20"/-->
<text name="Except those from:" left="21" bottom_delta="-10">Except those from:</text>
<check_box control_name="AntiSpamNotMine" height="16" label="My objects" name="My objects" left="25" bottom_delta="-23"/>
<check_box control_name="AntiSpamNotFriends" height="16" label="My friends" name="My friends" bottom_delta="0" left_delta="120"/>
<check_box control_name="EnableGestureSounds" label="Enable Gesture Sounds" name="Enable Gesture Sounds" left="3" bottom_delta="-20"/>
</panel>

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

@@ -2,6 +2,8 @@
<panel border="true" bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
<text bottom_delta="-20" follows="left|top" left_delta="12" name="voice_unavailable">Voice Chat Is Not Available</text>
<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
<check_box bottom_delta="-18" follows="top" height="16" name="enable_multivoice_check"/>
<string value="Allow multiple instances of [APP_NAME] to use voice simultaneously (requires restart)" name="multivoice_label"/>
<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>

10
indra/newview/skins/default/xui/es/floater_instant_message.xml
View File

@@ -33,9 +33,13 @@
<string name="inventory_item_offered">
Ofrecido un Item de Inventario
</string>
<button label="Perfil" name="profile_callee_btn"/>
<button label="Teleportar" name="profile_tele_btn"/>
<button label="Historial" name="history_btn"/>
<flyout_button label="Perfil" name="instant_message_flyout">
<flyout_button_item label="Historial" name="history_btn"/>
<flyout_button_item label="Ofrecer Teleporte" name="profile_tele_btn"/>
<!--flyout_button_item label="Solicitar Teleporte" name="profile_tele_btn"/-->
<flyout_button_item label="Pagar" name="profile_tele_btn"/>
<flyout_button_item label="Invitar a Grupo" name="profile_tele_btn"/>
</flyout_button>
<check_box name="rp_mode">
Modo RP
</check_box>

12
indra/newview/skins/default/xui/es/floater_instant_message_concisebuttons.xml
View File

@@ -30,10 +30,14 @@
<string name="inventory_item_offered">
Ofrecido un Ítem de Inventario
</string>
<button label="Perfil" left="135" name="profile_callee_btn" width="60"/>
<button label="Historial" left_delta="60" name="history_btn" width="60"/>
<button label="Teleportar" name="profile_tele_btn" width="70"/>
<check_box left_delta="70" name="rp_mode">
<flyout_button label="Perfil" name="instant_message_flyout">
<flyout_button_item label="Historial" name="history_btn"/>
<flyout_button_item label="Ofrecer Teleporte" name="profile_tele_btn"/>
<!--flyout_button_item label="Solicitar Teleporte" name="profile_tele_btn"/-->
<flyout_button_item label="Pagar" name="profile_tele_btn"/>
<flyout_button_item label="Invitar a Grupo" name="profile_tele_btn" value="5"/>
</flyout_button>
<check_box left_delta="75" name="rp_mode">
Modo RP
</check_box>
<button label="Llamar" left_delta="67" name="start_call_btn" width="60"/>

18
indra/newview/skins/default/xui/es/menu_avs_list.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Avatar Menu" create_jump_keys="true">
<menu_item_call label="Perfil" name="Profile"/>
<menu_item_call label="Pagar" name="Pay"/>
<menu_item_call label="Mensaje Instantáneo" name="Instant Message"/>
<menu_item_call label="Conferencia de Chat" name="Conference Chat"/>
<menu_item_call label="Llamar" name="Call"/>
<menu_item_call label="Conferencia de Voz" name="Conference Call"/>
<menu_item_call label="Añadir Amigo" name="Add Friend"/>
<menu_item_call label="Quitar Amigo" name="Remove Friend"/>
<menu_item_call label="Invitar a Grupo" name="Invite To Group"/>
<menu_item_call label="Ofrecer Teleporte" name="Offer Teleport"/>
<!--menu_item_call label="Solicitar Teleporte" name="Request Teleport"/>-->
<menu_item_separator/>
<menu_item_call label="Ignorar/No Ignorar" name="Mute/Unmute"/>
<menu_item_call label="Reportar Abuso" name="Report Abuse"/>
<menu_item_call label="Copiar UUID" name="Copy Key"/>
</menu>

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

@@ -70,6 +70,7 @@
<menu_item_call name="Animation Audition" label="Reproducir localmente" />
<menu_item_call name="Send Instant Message" label="Enviar MI"/>
<menu_item_call name="Offer Teleport..." label="Ofrecer Teleporte..."/>
<menu_item_call label="Solicitar Teleporte..." name="Request Teleport..."/>
<menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal"/>
<menu_item_call name="Activate" label="Activar"/>
<menu_item_call name="Deactivate" label="Desactivar"/>

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

@@ -9,8 +9,10 @@
<menu_item_call label="Llamada de Conferencia" name="Conference Call"/>
<menu_item_call label="Añadir Amigo" name="Add Friend"/>
<menu_item_call label="Quitar Amigo" name="Remove Friend"/>
<menu_item_call label="Invitar a Grupo" name="Invite To Group"/>
<menu_item_call label="Ofrecer Teleporte" name="Offer Teleport"/>
<menu_item_call label="Teleportar a" name="Teleport To"/>
<!--menu_item_call label="Request Teleport" name="Request Teleport"/-->
<menu_item_call label="Rastrear/No Rastrear" name="Track/Untrack"/>
<menu_item_call label="Copiar UUID" name="Copy Key"/>
</menu>

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

@@ -2069,6 +2069,18 @@ Por favor, intenta con un nombre diferente.
</form>
</notification>
<notification name="TeleportRequestPrompt">
Solicitar Teleporte a [NAME] con el mensaje siguiente
<tag>confirm</tag>
<form name="form">
<input name="message" type="text">
Por favor, Telepórtame a tu ubicación.
</input>
<button name="OK" text="OK"/>
<button name="Cancel" text="Cancelar"/>
</form>
</notification>
<notification name="TooManyTeleportOffers">
Has intentado enviar [OFFERS] ofertas de teleporte
lo cual excede el límite de [LIMIT].
@@ -3817,6 +3829,19 @@ Por favor, reinténtalo en unos momentos.
</form>
</notification>
<notification name="TeleportRequest">
[NAME] está solicitando ser teleportado a tu ubicación.
[MESSAGE]
¿Ofrecerle Teleporte?
<tag>confirm</tag>
<form name="form">
<button name="Yes" text="Si"/>
<button name="No" text="No"/>
<button name="Profile" text="Perfil"/>
</form>
</notification>
<notification name="GotoURL">
[MESSAGE]
[URL]

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

@@ -125,6 +125,7 @@ Puedes usar los siguientes comodines para personalizar tus respuestas: #n para n
<check_box label="Scripts" name="Scripts"/>
<check_box label="Ofertas de Teleporte" name="Teleport Offers"/>
<check_box label="Avisos de Grupos" name="Group Notices"/>
<check_box control_name="AntiSpamTeleportRequests" label="Solicitudes de Teleporte" name="Teleport Requests"/>
<check_box control_name="EnableGestureSounds" label="Habilitar Sonidos de Gestos" name="Enable Gesture Sounds"/>
</panel>
<!-- ============================= -->