summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-09 17:01:20 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-09 17:01:20 -0800
commit6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (patch)
treecd57c55fa83783b39ce05229126669b4c21a125d
parentf429decb0c222b293cee4d3b27c8340262fab572 (diff)
parent1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff)
merging in latest changes
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 79ee83969b..8310e0c62d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -295,7 +295,7 @@ Please try logging in again in a minute.</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
<string name="AvatarAway">Away</string>
- <string name="AvatarDoNotDisturb">Busy</string>
+ <string name="AvatarDoNotDisturb">Do Not Disturb</string>
<string name="AvatarMuted">Blocked</string>
<!-- animations -->