summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-04 10:32:58 -0400
committerLoren Shih <seraph@lindenlab.com>2010-11-04 10:32:58 -0400
commitc24586756954107218b6a85b480732c46444a02a (patch)
treeba410d561dd5cbe53574c313380c676b16e0db0c /indra/newview/skins/default/xui/en/strings.xml
parent89f191cd68c54f1d6f46d7d8d4011df180c9de8d (diff)
parent6a9e70053beaa0fb936482f5594137a8bcdf2f1e (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 403d976350..5d3f19edcf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2242,8 +2242,7 @@ Clears (deletes) the media and all params from the given face.
<string name="InvOfferOwnedBy">owned by</string>
<string name="InvOfferOwnedByUnknownUser">owned by an unknown user</string>
<string name="InvOfferGaveYou">gave you</string>
- <string name="InvOfferYouDecline">You decline</string>
- <string name="InvOfferFrom">from</string>
+ <string name="InvOfferDecline">You decline [DESC] from &lt;nolink&gt;[NAME]&lt;/nolink&gt;.</string>
<!-- group money -->
<string name="GroupMoneyTotal">Total</string>