summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-05-25 11:16:37 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-05-25 11:16:37 +0300
commit3ec7c76abee043d6b3bf419998a351523aee70d9 (patch)
treebac9689508894d27f1bc365917e7d7ff3602cde0 /indra/newview/skins
parent88820c843beb4a068eb6f34bda2b35d9f8869efe (diff)
parent98ac69e3a8e6e02384e30b601c2d7fcddb20d438 (diff)
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8bb36b88a..e57b30185d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3176,5 +3176,11 @@ Abuse Report</string>
<!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
<string name="sentences_separator" value=" "></string>
+
+ <string name="server_is_down">
+ Despite our best efforts, something unexpected has gone wrong.
+
+ Please check secondlife.com/status to see if there is a known problem with the service.
+ </string>
</strings>