summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 19:05:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 19:05:51 +0000
commit773e8eb8ea3acc75b0e8137412458f77effffb70 (patch)
treeb3e5a3069ac0ef154f10971ae701940eab369fcc /indra/newview/skins/default/xui/en/strings.xml
parent15ff4379e53eb5b3ed914c46c0051c3926de1ecb (diff)
parenta97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff)
merge from viewer2.
trivial xml conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-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 07344c7a24..b9dd87e878 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1805,7 +1805,7 @@ Clears (deletes) the media and all params from the given face.
<string name="LeaveMouselook">Press ESC to return to World View</string>
<!-- inventory -->
- <string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
+ <string name="InventoryNoMatchingItems">[secondlife:///app/search/groups No matching items found in inventory.Try "Search"?]</string>
<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
<string name="InventoryNoTexture">
You do not have a copy of