diff options
Diffstat (limited to 'indra/newview/skins')
9 files changed, 71 insertions, 13 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index d02662681b..973df6998a 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -760,7 +760,7 @@ <color name="MenuBarProjectBgColor" reference="MdBlue" /> - + <color name="MeshImportTableNormalColor" value="1 1 1 1"/> @@ -768,6 +768,9 @@ name="MeshImportTableHighlightColor" value="0.2 0.8 1 1"/> + <color + name="DirectChatColor" + reference="LtOrange" /> <!-- Generic color names (legacy) --> <color diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ebfed990ec..5e7bd605d2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5227,6 +5227,20 @@ Insufficient permissions to rez object. <notification icon="notifytip.tga" + name="IMAcrossParentEstates" + type="notifytip"> +Unable to send IM across parent estates. + </notification> + + <notification + icon="notifytip.tga" + name="TransferInventoryAcrossParentEstates" + type="notifytip"> +Unable to transfer inventory across parent estates. + </notification> + + <notification + icon="notifytip.tga" name="UnableToLoadNotecard" type="notifytip"> Unable to load notecard. diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 7717872a6a..2b22f0d6e3 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -208,6 +208,37 @@ </text> <color_swatch can_apply_immediately="true" + color="LtOrange" + follows="left|top" + height="24" + label_height="0" + layout="topleft" + left="360" + name="direct" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="DirectChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="DirectChatColor" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_box10" + top_delta="5" + width="95"> + Direct + </text> + <color_swatch + can_apply_immediately="true" color="LtYellow" follows="left|top" height="24" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f8c90106b7..339f14eacb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1908,6 +1908,15 @@ Requests single-word username of an avatar. When data is available the dataserv key llRequestDisplayName(key id) Requests name of an avatar. When data is available the dataserver event will be raised. </string> +<string name="LSLTipText_llRegionSayTo" translate="false"> +llRegionSayTo(key target, integer channel, string msg) +Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region +</string> +<string name="LSLTipText_llGetEnv" translate="false"> +llGetEnv(string name) +Returns a string with the requested data about the region +</string> + <!-- Avatar busy/away mode --> <string name="AvatarSetNotAway">Not Away</string> diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml index ec3c38e8c7..5ebd7ad6e0 100644 --- a/indra/newview/skins/default/xui/es/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_help_browser" title="BUSCADOR DE AYUDA"> +<floater name="floater_help_browser" title="BUSCAR EN LA AYUDA"> <floater.string name="loading_text"> Cargando... </floater.string> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index fba969f267..f215e5909c 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -58,7 +58,7 @@ <radio_item label="Horizontal (Ctrl+Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> - <radio_item label="Moverse" name="radio position"/> + <radio_item label="Mover" name="radio position"/> <radio_item label="Girar (Ctrl)" name="radio rotate"/> <radio_item label="Estirar (Ctrl+Shift)" name="radio stretch"/> <radio_item label="Elegir la cara" name="radio select face"/> @@ -480,7 +480,7 @@ Modificar la parcela </text> <button label="Dividir" label_selected="Dividir" name="button subdivide land"/> - <button label="Inscribirse" label_selected="Inscribirse" name="button join land"/> + <button label="Inscribirse" label_selected="Unir" name="button join land"/> <text name="label_parcel_trans"> Transacciones de terreno </text> diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml index 7d4db6a630..f218324d50 100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -8,7 +8,7 @@ <button label="Añadir como amigo" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> + <button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> </layout_panel> <layout_panel name="share_btn_panel"> <button label="Compartir" name="share_btn"/> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index eee1844c46..0e94cbe70b 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -30,6 +30,7 @@ <combo_box name="start_location_combo"> <combo_box.item label="Mi última posición" name="MyLastLocation"/> <combo_box.item label="Mi Base" name="MyHome"/> + <combo_box.item label="<Escribe en qué región>" name="Typeregionname"/> </combo_box> </layout_panel> <layout_panel name="links"> diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml index 77341cad63..dc99d287b9 100644 --- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_preview.xml @@ -115,14 +115,14 @@ La lunghezza massima è [MAX_LENGTH] secondi. <text name="description_label"> Descrizione: </text> - <spinner label="Priorità" label_width="72" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione" width="110"/> + <spinner label="Priorità" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione"/> <check_box label="Ciclica" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/> <spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l'animazione"/> <spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l'animazione"/> <text name="hand_label"> Postura della mano </text> - <combo_box left_delta="100" name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l'animazione" width="184"> + <combo_box name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l'animazione"> <combo_box.item label="Stendi" name="Spread"/> <combo_box.item label="Rilassato" name="Relaxed"/> <combo_box.item label="Indica entrambi" name="PointBoth"/> @@ -140,7 +140,7 @@ La lunghezza massima è [MAX_LENGTH] secondi. <text name="emote_label"> Espressione </text> - <combo_box left_delta="100" name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l'animazione" width="184"> + <combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l'animazione"> <item label="(Nessuno)" name="[None]" value=""/> <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> <item label="Spavento" name="Afraid" value="Spavento"/> @@ -162,18 +162,18 @@ La lunghezza massima è [MAX_LENGTH] secondi. <item label="Occhiolino" name="Wink" value="Occhiolino"/> <item label="Preoccupato" name="Worry" value="Preoccupato"/> </combo_box> - <text name="preview_label" width="250"> + <text name="preview_label"> Vedi anteprima mentre </text> - <combo_box left_delta="154" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell'animazione mentre l'avatar svolge azioni abituali." width="130"> + <combo_box name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell'animazione mentre l'avatar svolge azioni abituali."> <item label="In piedi" name="Standing" value="In piedi"/> <item label="Camminando" name="Walking" value="Cammina"/> <item label="Seduto" name="Sitting" value="Seduto"/> <item label="Volo" name="Flying" value="Volo"/> </combo_box> - <spinner label="Avvio lento (sec)" label_width="125" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni" width="192"/> - <spinner bottom_delta="-20" label="Arresto lento (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni" width="192"/> - <button bottom_delta="-32" name="play_btn" tool_tip="Riproduci la tua animazione"/> + <spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/> + <spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/> + <button name="play_btn" tool_tip="Riproduci la tua animazione"/> <button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/> <button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell'animazione"/> <text name="bad_animation_text"> |