diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
commit | 4091e47cf206a41cac7ee440b8fd2e2898006685 (patch) | |
tree | 61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/skins/default/xui/en/strings.xml | |
parent | 81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff) | |
parent | 09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff) |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d5186e4c1b..15eb46c348 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2272,11 +2272,15 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <!-- historically default name of the Favorites folder can start from either "f" or "F" letter. We should localize both of them with the same value --> <string name="InvFolder favorite">My Favorites</string> + <string name="InvFolder Favorites">My Favorites</string> + <string name="InvFolder favorites">My Favorites</string> <string name="InvFolder Current Outfit">Current Outfit</string> <string name="InvFolder Initial Outfits">Initial Outfits</string> <string name="InvFolder My Outfits">My Outfits</string> <string name="InvFolder Accessories">Accessories</string> <string name="InvFolder Meshes">Meshes</string> + <string name="InvFolder Received Items">Received Items</string> + <string name="InvFolder Merchant Outbox">Merchant Outbox</string> <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> <string name="InvFolder Friends">Friends</string> |