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.xml19
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1f7784d9ab..ec4723bd55 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2074,6 +2074,10 @@ this texture in your inventory
<!-- panel classified -->
<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
+
+ <!-- panel picks -->
+ <string name="NoPicksClassifiedsText">There are no picks/classifieds here</string>
+ <string name="PicksClassifiedsLoadingText">Loading...</string>
<!-- Multi Preview Floater -->
<string name="MultiPreviewTitle">Preview</string>
@@ -2842,6 +2846,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_to_label">To</string>
<string name="IM_moderator_label">(Moderator)</string>
+ <!-- voice calls -->
+ <string name="started_call">Started a voice call</string>
+ <string name="joined_call">Joined the voice call</string>
+
<string name="ringing-im">
Joining Voice Chat...
</string>
@@ -2877,6 +2885,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="muted_message">
You have blocked this resident. Sending a message will automatically unblock them.
</string>
+ <!--Some times string name is getting from the body of server response.
+ For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+ In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+ Also there are some other places where "generic" is used.
+ So, let add string with name="generic" with the same value as "generic_request_error" -->
+ <string name="generic">
+ Error making request, please try again later.
+ </string>
<string name="generic_request_error">
Error making request, please try again later.
</string>
@@ -2904,6 +2920,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="message_session_event">
Unable to send your message to the chat session with [RECIPIENT].
</string>
+ <string name="mute">
+ Error while moderating.
+ </string>
<string name="removed_from_group">
You have been removed from the group.
</string>