summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-07-09 13:31:53 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-07-09 13:31:53 -0700
commit05e6faf38172ab701ef2483408bffa9cceb4142e (patch)
tree1b4cd89acbd5a80bd61cc760e88ba7c7af54f100
parentdb480bcd9cfac89995cc52609b48ecee32281f3f (diff)
parentb7f6fb814cfdb6dec1d997ddd249735f028650e4 (diff)
Merge
-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 ece57a6682..0c31fda68b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2189,8 +2189,7 @@ Clears (deletes) the media and all params from the given face.
<!-- panel contents -->
<string name="PanelContentsTooltip">Content of object</string>
- <string name="PanelContentsNewScript">New Script</string>
- <string name="PanelContentsTooltip">Content of object</string>
+ <string name="PanelContentsNewScript">New Script</string>
<!-- panel preferences general -->
<string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>