diff options
| author | James Cook <james@lindenlab.com> | 2009-12-03 13:11:57 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-03 13:11:57 -0800 |
| commit | 522fa624875800463f320f176af80db58d928c84 (patch) | |
| tree | b12215d026d592caeb6e556e5e919a38155f5dae /indra/newview/skins/default/xui/en | |
| parent | 90c42f0e5ab2a2062786575ee600c3e84bd29904 (diff) | |
| parent | d566f187a33ca775210ecfd99369b0340daed121 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e795c8e241..b014b8d1c0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -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"> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index d32952b04f..0e2700cb80 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -20,6 +20,8 @@ follows="left|top" allow_new_values="true" > + <!-- *NOTE: Tooltips are in strings.xml so they can be localized. + See LocationCtrlAddLandmarkTooltip etc. --> <info_button name="Place Information" width="16" height="16" @@ -50,6 +52,7 @@ top="21" /> <voice_icon + enabled="true" name="voice_icon" width="22" height="18" |