Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

Browse Source 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2012-11-29 11:54:41 -06:00
parent 3a4b6cf6b6 e17405d80a
commit 794dbacea3
358 changed files with 27109 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -2818,8 +2818,8 @@ Where tag = tag string to match. Removes bot's matching the tag.
<!-- Strings needed by drop targets -->
<string name="CurrentlyNotSet">Currently not set</string>
<string name="CurrentlySetTo">Currently set to</string>
<string name="AnItemNotOnThisAccount">an item not on this account</string>
<string name="CurrentlySetTo">Currently set to: [ITEM]</string>
<string name="CurrentlySetToAnItemNotOnThisAccount">Currently set to an item not on this account</string>
<string name="NotLoggedIn">Not logged in</string>
<!-- Avatar busy/away mode -->
@@ -2854,6 +2854,23 @@ Where tag = tag string to match. Removes bot's matching the tag.
<!-- inventory -->
<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
<string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string>
<string name="InventoryOutboxNotMerchantTooltip"></string>
<string name="InventoryOutboxNotMerchant">
If you'd like to become a merchant, you'll need to
</string>
<string name="InventoryOutboxNotMerchantSubs">create a Marketplace store.</string>
<string name="InventoryOutboxNoItemsTitle">Your outbox is empty.</string>
<string name="InventoryOutboxNoItemsTooltip"></string>
<string name="InventoryOutboxNoItems">
Drag folders to this area and click "Send to Marketplace" to list them for sale on the
</string>
<string name="InventoryOutboxNoItemsSubs">Marketplace.</string>
<!-- use value="" because they have preceding spaces -->
<string name="no_transfer" value=" (no transfer)" />
@@ -2918,6 +2935,52 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Rubber">Rubber</string>
<string name="Light">Light</string>
<!-- Avatar Skeleton -->
<string name="Chest">Chest</string>
<string name="Skull">Skull</string>
<string name="Left Shoulder">Left Shoulder</string>
<string name="Right Shoulder">Right Shoulder</string>
<string name="Left Hand">Left Hand</string>
<string name="Right Hand">Right Hand</string>
<string name="Left Foot">Left Foot</string>
<string name="Right Foot">Right Foot</string>
<string name="Spine">Spine</string>
<string name="Pelvis">Pelvis</string>
<string name="Mouth">Mouth</string>
<string name="Chin">Chin</string>
<string name="Left Ear">Left Ear</string>
<string name="Right Ear">Right Ear</string>
<string name="Left Eyeball">Left Eyeball</string>
<string name="Right Eyeball">Right Eyeball</string>
<string name="Nose">Nose</string>
<string name="R Upper Arm">R Upper Arm</string>
<string name="R Forearm">R Forearm</string>
<string name="L Upper Arm">L Upper Arm</string>
<string name="L Forearm">L Forearm</string>
<string name="Right Hip">Right Hip</string>
<string name="R Upper Leg">R Upper Leg</string>
<string name="R Lower Leg">R Lower Leg</string>
<string name="Left Hip">Left Hip</string>
<string name="L Upper Leg">L Upper Leg</string>
<string name="L Lower Leg">L Lower Leg</string>
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="unsupported point">unsupported point</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- HUD Position -->
<string name="Center 2">Center 2</string>
<string name="Top Right">Top Right</string>
<string name="Top">Top</string>
<string name="Top Left">Top Left</string>
<string name="Center">Center</string>
<string name="Bottom Left">Bottom Left</string>
<string name="Bottom">Bottom</string>
<string name="Bottom Right">Bottom Right</string>
<!-- compile queue-->
<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
<string name="CompileQueueScriptNotFound">Script not found on server.</string>
@@ -2958,6 +3021,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="IMMainland">mainland</string>
<string name="IMTeen">teen</string>
<!-- floater about land -->
<string name="Anyone">Anyone</string>
<!-- floater region info -->
<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
<string name="RegionInfoError">error</string>
@@ -3697,6 +3763,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_autoresponded_to">Autoresponse sent to</string>
<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
<string name="Unnamed">(Unnamed)</string>
<string name="inventory_item_offered_to">Inventory item offered to</string>
<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
<string name="PowerUser2">Use your newfound abilities wisely.</string>
@@ -3815,7 +3882,32 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="group_role_owners">Owners</string>
<string name="group_member_status_online">Online</string>
<string name="uploading_abuse_report">Uploading...
Abuse Report</string>
<!-- names for new inventory items-->
<string name="New Shape">New Shape</string>
<string name="New Skin">New Skin</string>
<string name="New Hair">New Hair</string>
<string name="New Eyes">New Eyes</string>
<string name="New Shirt">New Shirt</string>
<string name="New Pants">New Pants</string>
<string name="New Shoes">New Shoes</string>
<string name="New Socks">New Socks</string>
<string name="New Jacket">New Jacket</string>
<string name="New Gloves">New Gloves</string>
<string name="New Undershirt">New Undershirt</string>
<string name="New Underpants">New Underpants</string>
<string name="New Skirt">New Skirt</string>
<string name="New Alpha">New Alpha</string>
<string name="New Tattoo">New Tattoo</string>
<string name="New Physics">New Physics</string>
<string name="Invalid Wearable">Invalid Wearable</string>
<string name="New Gesture">New Gesture</string>
<string name="New Script">New Script</string>
<string name="New Note">New Note</string>
<string name="New Folder">New Folder</string>
<string name="DefaultMimeType">none/none</string>
<string name="Chat">Chat</string>