diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-18 13:56:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-18 13:56:43 -0400 |
| commit | 83ddded5ab9429e1771d36426dcac5fe66734c71 (patch) | |
| tree | 959624c0375d830120fda8132e23aea2d80e94b4 /indra | |
| parent | d36f74ba331670de24031e23a5d15378f410c6af (diff) | |
| parent | a64bb32b0550afdf9cd54c4f3f38225a1fcc0b90 (diff) | |
merge changes for storm-1877
Diffstat (limited to 'indra')
| -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 4ccec4838a..f565928d44 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2139,11 +2139,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> |