summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-04-29 11:40:22 -0600
committerDave Houlton <euclid@lindenlab.com>2021-04-29 11:40:22 -0600
commit2386125ae0db3218c620667b05449cd25ee05ad5 (patch)
treedeee2618a9c33681e038845605db6719babd1d77 /indra/newview/skins/default/xui/en/strings.xml
parent18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff)
parentce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff)
Merge master into DV525-merge-6.4.19
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a6116dc9be..440e8b140f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2299,6 +2299,7 @@ For AI Character: Get the closest navigable point to the point provided.
<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>
<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
+ <string name="MarketplaceNoListing">You have no listings yet.</string>
<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
@@ -3693,10 +3694,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
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.
+ Please close and reopen the conversation, or relog and try again.
</string>
<string name="generic_request_error">
- Error making request, please try again later.
+ Please close and reopen the conversation, or relog and try again.
</string>
<string name="insufficient_perms_error">
You do not have sufficient permissions.