summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-09-15 17:23:55 -0500
committerDave Parks <davep@lindenlab.com>2022-09-15 17:23:55 -0500
commit5a3631659fb4fe8c2b70c90c490a6c7e486289e9 (patch)
treeba58c508de6f80636e0a01fd9e837c7bb8bf68e0 /indra/newview/skins/default/xui
parent82ab5f9765ad76c73d1d7ddd5716b22d6b92bf62 (diff)
parentc5dd5a0e49d08d106d28d872ce681430820585a7 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 960faabcfd..646f4af5d1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2467,6 +2467,8 @@ If you continue to receive this message, please contact Second Life support for
<string name="InvFolder Meshes">Meshes</string>
<string name="InvFolder Received Items">Received Items</string>
<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
+ <string name="InvFolder Settings">Settings</string>
+ <string name="InvFolder Materials">Materials</string>
<!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
<string name="InvFolder Friends">Friends</string>