diff options
author | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-04 10:56:19 -0800 |
commit | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (patch) | |
tree | 4262266a4b752a7599170b9a75a60f8d4956cd0b /indra/newview/skins/default/xui/en/strings.xml | |
parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
parent | ab6134c2310bae6aa68565b6a31093c123713135 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e47ec1ebda..b014b8d1c0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -270,8 +270,8 @@ <string name="NotConnected">Not Connected</string> <!-- Sim Access labels --> - <string name="SIM_ACCESS_PG">PG</string> - <string name="SIM_ACCESS_MATURE">Mature</string> + <string name="SIM_ACCESS_PG">General</string> + <string name="SIM_ACCESS_MATURE">Moderate</string> <string name="SIM_ACCESS_ADULT">Adult</string> <string name="SIM_ACCESS_DOWN">Offline</string> <string name="SIM_ACCESS_MIN">Unknown</string> @@ -2777,11 +2777,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Wild">Wild</string> <string name="Wrinkles">Wrinkles</string> - <!-- Favorites Bar --> + <!-- Navigation bar location input control. + Strings are here because widget xml is not localizable --> <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string> <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> <string name="LocationCtrlComboBtnTooltip">My location history</string> + <string name="LocationCtrlForSaleTooltip">Buy this land</string> + <string name="LocationCtrlVoiceTooltip">Voice not available here</string> + <string name="LocationCtrlFlyTooltip">Flying not allowed</string> + <string name="LocationCtrlPushTooltip">No pushing</string> + <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string> + <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string> + <string name="LocationCtrlDamageTooltip">Health</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> |