diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-21 12:51:29 -0500 |
| commit | 79029149a415a9f32e08d378653199a880d21e65 (patch) | |
| tree | 14b6f7d59c66602affd77b6e21f1981b28995fa8 /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 80552a465e9169b7326c346f4685790ea459823a (diff) | |
| parent | 8511385a5407181ced7bb226d4054185c597d05e (diff) | |
Automated merge with file:///F:%5Cviewer-bear
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d964ccaf79..ef01f27da2 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -409,10 +409,13 @@ Please try logging in again in a minute.</string> <string name="AddAndRemoveJoints">Add and remove joints with other objects</string> <string name="ChangePermissions">Change its permissions</string> <string name="TrackYourCamera">Track your camera</string> - <string name="ControlYourCamera">Control your camera</string> + <string name="ControlYourCamera">Control your camera</string> + <string name="TeleportYourAgent">Teleport you</string> + <string name="ManageEstateSilently">Manage your estates silently</string> + <string name="ChangeYourDefaultAnimations">Change your default animations</string> + <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> - <string name="TeleportYourAgent">Teleport you</string> <string name="JoinAnExperience">Join an experience</string> <!-- not used --> <string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string> <string name="OverrideYourAnimations">Replace your default animations</string> |