diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
commit | f61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch) | |
tree | e644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/newview/skins/default/xui/en/strings.xml | |
parent | bc06a9acf91035903d497bdd66e9bb26859616be (diff) | |
parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) |
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 605416524e..d89705fd00 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -201,21 +201,7 @@ Please try logging in again in a minute.</string> <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string> <string name="SentToInvalidRegion">You were sent to an invalid region.</string> <string name="TestingDisconnect">Testing viewer disconnect</string> - - <!-- SLShare: Flickr and Twitter --> - <string name="SocialFlickrConnecting">Connecting to Flickr...</string> - <string name="SocialFlickrPosting">Posting...</string> - <string name="SocialFlickrDisconnecting">Disconnecting from Flickr...</string> - <string name="SocialFlickrErrorConnecting">Problem connecting to Flickr</string> - <string name="SocialFlickrErrorPosting">Problem posting to Flickr</string> - <string name="SocialFlickrErrorDisconnecting">Problem disconnecting from Flickr</string> - <string name="SocialTwitterConnecting">Connecting to Twitter...</string> - <string name="SocialTwitterPosting">Posting...</string> - <string name="SocialTwitterDisconnecting">Disconnecting from Twitter...</string> - <string name="SocialTwitterErrorConnecting">Problem connecting to Twitter</string> - <string name="SocialTwitterErrorPosting">Problem posting to Twitter</string> - <string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string> - + <!-- SLShare: User Friendly Filter Names Translation --> <string name="BlackAndWhite">Black & White</string> <string name="Colors1970">1970's Colors</string> @@ -409,7 +395,7 @@ http://secondlife.com/support for help fixing this problem. <string name="favorite">favorite</string> <string name="symbolic link">link</string> <string name="symbolic folder link">folder link</string> - <string name="settings blob">settings</string> + <string name="settings blob">settings</string> <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> @@ -535,8 +521,7 @@ 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="ChangeEnvSettings">Change your environment settings</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> @@ -2656,6 +2641,7 @@ If you continue to receive this message, please contact Second Life support for <string name="Debits">Debits</string> <string name="Total">Total</string> <string name="NoGroupDataFound">No group data found for group </string> + <string name="AlreadyInGroup">You are already in this group </string> <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar. This is to help Lindens when answering questions. --> @@ -2797,8 +2783,7 @@ If you continue to receive this message, please contact Second Life support for <string name="LocalSettings">Local Settings</string> <string name="RegionSettings">Region Settings</string> -<string name="NoEnvironmentSettings">This Region does not support environmental settings.</string> - + <string name="NoEnvironmentSettings">This Region does not support environmental settings.</string> <string name="EnvironmentSun">Sun</string> <string name="EnvironmentMoon">Moon</string> <string name="EnvironmentBloom">Bloom</string> @@ -3683,13 +3668,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Drag items from inventory here </string> - <string name="flickr_post_success"> - You posted to Flickr. - </string> - <string name="twitter_post_success"> - You posted to Twitter. - </string> - <string name="no_session_message"> (IM Session Doesn't Exist) </string> @@ -4124,7 +4102,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Compass_Label">Compass</string> <string name="Command_Destinations_Label">Destinations</string> <string name="Command_Environments_Label">My Environments</string> - <string name="Command_Flickr_Label">Flickr</string> <string name="Command_Gestures_Label">Gestures</string> <string name="Command_Grid_Status_Label">Grid status</string> <string name="Command_HowTo_Label">How to</string> @@ -4144,7 +4121,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Search_Label">Search</string> <string name="Command_Snapshot_Label">Snapshot</string> <string name="Command_Speak_Label">Speak</string> - <string name="Command_Twitter_Label">Twitter</string> <string name="Command_View_Label">Camera controls</string> <string name="Command_Voice_Label">Voice settings</string> @@ -4157,7 +4133,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Compass_Tooltip">Compass</string> <string name="Command_Destinations_Tooltip">Destinations of interest</string> <string name="Command_Environments_Tooltip">My Environments</string> - <string name="Command_Flickr_Tooltip">Upload to Flickr</string> <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> <string name="Command_Grid_Status_Tooltip">Show current Grid status</string> <string name="Command_HowTo_Tooltip">How to do common tasks</string> @@ -4177,7 +4152,6 @@ Try enclosing path to the editor with double quotes. <string name="Command_Search_Tooltip">Find places, events, people</string> <string name="Command_Snapshot_Tooltip">Take a picture</string> <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> - <string name="Command_Twitter_Tooltip">Twitter</string> <string name="Command_View_Tooltip">Changing camera angle</string> <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string> @@ -4244,8 +4218,7 @@ Try enclosing path to the editor with double quotes. <string name="ExperiencePermissionShort10">Control Camera</string> <string name="ExperiencePermissionShort11">Teleport</string> <string name="ExperiencePermissionShort12">Permission</string> - -<string name="ExperiencePermissionShort16">Sit</string> + <string name="ExperiencePermissionShort16">Sit</string> <string name="ExperiencePermissionShort17">Environment</string> <!-- Conversation log messages --> |