diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
| commit | dc6ce7f7826592c37810efa686f64ec2cf8a15ee (patch) | |
| tree | e770ee51180e855c7da7d4b98fc631d0a06e95bc /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 6eee48e16e75c1f70bb1cbce9544bad63d9621cf (diff) | |
| parent | fefb08eef53da3cb0204d31f349aabfa6369f10b (diff) | |
Manual merge from default branch.
--HG--
branch : product-engine
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 194e359e10..e72cacc8d5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -269,8 +269,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> @@ -2776,11 +2776,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"> |