summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml21
1 files changed, 3 insertions, 18 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 25827fa236..b4b4ac4a86 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -328,6 +328,7 @@ are allowed.
<!-- searching - generic -->
<string name="Searching">Searching...</string>
<string name="NoneFound">None found.</string>
+ <string name="ServerUnavailable">Service not available.</string>
<!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
<string name="RetrievingData">Retrieving...</string>
@@ -2943,13 +2944,13 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim
<string name="None">None</string>
<string name="Linden Location">Linden Location</string>
<string name="Adult">Adult</string>
- <string name="Arts and Culture">Arts and Culture</string>
+ <string name="Arts&amp;Culture">Arts &amp; Culture</string>
<string name="Business">Business</string>
<string name="Educational">Educational</string>
<string name="Gaming">Gaming</string>
<string name="Hangout">Hangout</string>
<string name="Newcomer Friendly">Newcomer Friendly</string>
- <string name="Parks and Nature">Parks and Nature</string>
+ <string name="Parks&amp;Nature">Parks &amp; Nature</string>
<string name="Residential">Residential</string>
<!--<string name="Shopping">Shopping</string> -->
<string name="Stage">Stage</string>
@@ -4389,21 +4390,6 @@ and report the problem.
[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge Base]
</string>
- <!-- megapahit strings -->
- <string name="not_found">&apos;[TEXT]&apos; not found</string>
- <string name="no_results">No results</string>
- <string name="searching">Searching...</string>
- <string name="all_categories">All Categories</string>
- <string name="search_banned">Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.</string>
- <string name="search_short">Your search terms were too short so no search was performed.</string>
- <string name="search_disabled">Legacy Search has been disabled in this region.</string>
- <string name="NotifyIncomingMessage">Incoming message from [NAME]...</string>
- <string name="NearbyChatTitleChannel">Nearby chat (on channel [CHANNEL])</string>
- <string name="AvatarTyping">Typing</string>
- <string name="UnknownAvatar">Unknown Avatar</string>
- <string name="NotAvailableOnPlatform">Not available on this platform</string>
- <string name="NowPlaying">Now Playing</string>
- <string name="GridInfoTitle">GRID INFO</string>
<!-- RLVa -->
<string name="RlvConsoleDisable">RLVa is disabled</string>
<string name="RlvConsoleInvalidCmd">Invalid command</string>
@@ -4430,5 +4416,4 @@ and report the problem.
<string name="RlvReturnCodeBlocked">blocked object</string>
<string name="RlvReturnCodeThrottled">throttled</string>
<string name="RlvReturnCodeNoProcessor">no command processor found</string>
-
</strings>