summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-11 14:06:09 -0800
committerJames Cook <james@lindenlab.com>2010-01-11 14:06:09 -0800
commita36087f5c1851b0bd5eec5788609f35b8a524384 (patch)
treed7057930083ba9499fc8b3783a531b24ac9ea7f1 /indra/newview/skins/default/xui/en/strings.xml
parenta570c39bd3ca9ca567ef6a778305b8231535eb70 (diff)
parent370a8592ac4c3b6eb6fd9f6ddd35960b763e634f (diff)
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 447901f984..f2f23a3847 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -8,6 +8,7 @@
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string>
<string name="APP_NAME">Second Life</string>
+ <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Second Life Support Portal</string>