diff options
Diffstat (limited to 'indra')
9 files changed, 21 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 58ea7cec9c..29c6ae8009 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -46,7 +46,7 @@ top="0"> <panel.string name="new users only"> - New users only + New Residents only </panel.string> <panel.string name="anyone"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 98508e5113..125b080519 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -64,7 +64,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="not_owned_by_you"> - Land owned by another user is selected. + Land owned by another Resident is selected. Try selecting a smaller area. </floater.string> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 0fac6cd5f1..36ef6beb59 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -31,8 +31,8 @@ <button follows="left|top" height="20" - label="Kick all users" - label_selected="Kick all users" + label="Kick all Residents" + label_selected="Kick all Residents" layout="topleft" left="10" name="Kick all users" diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index a21242ffe1..55efe83820 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -14,7 +14,7 @@ width="419"> <multi_floater.string name="only_user_message"> - You are the only user in this session. + You are the only Resident in this session. </multi_floater.string> <multi_floater.string name="offline_message"> @@ -54,7 +54,7 @@ </multi_floater.string> <multi_floater.string name="add_session_event"> - Unable to add users to chat session with [RECIPIENT]. + Unable to add Residents to chat session with [RECIPIENT]. </multi_floater.string> <multi_floater.string name="message_session_event"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 936f4a3fab..4264b86a72 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2848,11 +2848,11 @@ Leave Group? icon="alert.tga" name="ConfirmKick" type="alert"> -Do you REALLY want to kick all users off the grid? +Do you REALLY want to kick all Residents off the grid? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Kick All Users"/> + yestext="Kick All Residents"/> </notification> <notification @@ -2952,7 +2952,7 @@ You have reached your maximum number of groups. Please leave some group before j icon="alert.tga" name="KickUser" type="alert"> -Kick this user with what message? +Kick this Resident with what message? <form name="form"> <input name="message" type="text"> An administrator has logged you off. @@ -2994,7 +2994,7 @@ An administrator has logged you off. icon="alert.tga" name="FreezeUser" type="alert"> -Freeze this user with what message? +Freeze this Resident with what message? <form name="form"> <input name="message" type="text"> You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM). @@ -3015,7 +3015,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you icon="alert.tga" name="UnFreezeUser" type="alert"> -Unfreeze this user with what message? +Unfreeze this Resident with what message? <form name="form"> <input name="message" type="text"> You are no longer frozen. @@ -3057,7 +3057,7 @@ Join me in [REGION] icon="alertmodal.tga" name="OfferTeleportFromGod" type="alertmodal"> -God summon user to your location? +God summon Resident to your location? <form name="form"> <input name="message" type="text"> Join me in [REGION] @@ -3137,7 +3137,7 @@ Type a short announcement which will be sent to everyone currently in your estat type="alert"> You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). -This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. +This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. Proceed? <usetemplate @@ -5383,7 +5383,7 @@ Grant this request? icon="notify.tga" name="ScriptToast" type="notify"> - [FIRST] [LAST]'s '[TITLE]' is requesting user input. + [FIRST] [LAST]'s '[TITLE]' is requesting Resident input. <form name="form"> <button index="0" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 540e17e413..0c57b99b68 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -222,7 +222,7 @@ top="10" width="293" wrap="true"> - To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend. + To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend. If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index d336e18011..3913b6d709 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -59,7 +59,7 @@ left_delta="0" name="owner_text" top_pad="2" - width="180"> + width="80"> Estate owner: </text> <text @@ -198,7 +198,7 @@ <button follows="left|top" height="23" - label="Kick User from Estate..." + label="Kick Resident from Estate..." layout="topleft" left="50" name="kick_user_from_estate_btn" diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index c06e67a4bb..1bbe9d80c0 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -205,7 +205,7 @@ <button follows="left|top" height="20" - label="Teleport Home One User..." + label="Teleport Home One Resident..." layout="topleft" left="10" name="kick_btn" @@ -214,7 +214,7 @@ <button follows="left|top" height="20" - label="Teleport Home All Users..." + label="Teleport Home All Residents..." layout="topleft" left_delta="0" name="kick_all_btn" diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml index 525c5aa8e7..ffa1a257d5 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -203,7 +203,7 @@ <button follows="left|top" height="20" - label="Teleport Home One User..." + label="Teleport Home One Resident..." layout="topleft" left="10" name="kick_btn" @@ -212,7 +212,7 @@ <button follows="left|top" height="20" - label="Teleport Home All Users..." + label="Teleport Home All Residents..." layout="topleft" left_delta="0" name="kick_all_btn" |