diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 71133f582f..12edeb3ce9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -315,17 +315,6 @@ Please try logging in again in a minute.</string> <string name="BUTTON_DOCK">Dock</string> <string name="BUTTON_HELP">Show Help</string> - <!-- ToolTips for notecards --> - <string name="TooltipNotecardNotAllowedTypeDrop"> -Items of this type can't be attached -to notecards on this region. - </string> - <string name="TooltipNotecardOwnerRestrictedDrop"> -Only items with unrestricted -'next owner' permissions -"can be attached to notecards. - </string> - <!-- searching - generic --> <string name="Searching">Searching...</string> <string name="NoneFound">None found.</string> @@ -378,11 +367,6 @@ Error in upload request. Please visit http://secondlife.com/support for help fixing this problem. </string> - <!-- Settings errors --> - <string name="SettingValidationError">Validation failed for importing settings [NAME]</string> - <string name="SettingImportFileError">Could not open file [FILE]</string> - <string name="SettingParseFileError">Could not open file [FILE]</string> - <string name="SettingTranslateError">Could not translate legacy windlight [NAME]</string> <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem --> <string name="texture">texture</string> @@ -409,10 +393,9 @@ http://secondlife.com/support for help fixing this problem. <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> - <string name="settings blob">settings</string> - <string name="symbolic folder link">folder link</string> - <string name="mesh">mesh</string> - + <string name="symbolic folder link">folder link</string> + <string name="mesh">mesh</string> + <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> @@ -536,7 +519,6 @@ http://secondlife.com/support for help fixing this problem. <string name="ManageEstateSilently">Manage your estates silently</string> <string name="ChangeYourDefaultAnimations">Change your default animations</string> <string name="ForceSitAvatar">Force your avatar to sit</string> - <string name="ChangeEnvSettings">Change your environment settings</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> @@ -2676,6 +2658,10 @@ If you continue to receive this message, please contact Second Life support for <string name="RegionInfoBannedResidents">Always banned: ([BANNEDAGENTS], max [MAXBANNED])</string> <string name="RegionInfoListTypeAllowedAgents">Always allowed</string> <string name="RegionInfoListTypeBannedAgents">Always banned</string> + <string name="RegionInfoAllEstates">all estates</string> + <string name="RegionInfoManagedEstates">managed estates</string> + <string name="RegionInfoThisEstate">this estate</string> + <string name="AndNMore">and [EXTRA_COUNT] more</string> <!-- script limits floater --> <string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string> |