diff options
author | James Cook <james@lindenlab.com> | 2009-07-06 21:58:04 +0000 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-07-06 21:58:04 +0000 |
commit | d6101558a171dbd2390792ac1e78d09fc2c27711 (patch) | |
tree | e5fea96c850fb254237c2869f2234fc4a4367e98 /indra/newview/skins/default/xui/en/strings.xml | |
parent | 39905b927d60e204438705728d2c214cb3f9ef81 (diff) |
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
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 58bb16581a..c21c691680 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -152,7 +152,7 @@ <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> <string name="AvatarBusy">Busy</string> - <string name="AvatarMuted">Muted</string> + <string name="AvatarMuted">Blocked</string> <!-- animations --> <string name="anim_express_afraid">Afraid</string> |