diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-17 11:51:04 +0000 |
| commit | 8331c1a83776abcfeeec4629d9dfbdd2c689d14f (patch) | |
| tree | 1654d69e483252c9c4d12e1012800de4740510e2 /indra/newview/skins/default/xui | |
| parent | 59e4b000a3ed41a3c83ae99501adc3eccf64367e (diff) | |
| parent | 5cae8140f4dfbdd9c4b3237a0d47248753180913 (diff) | |
PE merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 4be4d6b432..c658e0de6f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -13,6 +13,10 @@ name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <panel.string + name="middle_mouse"> + Middle Mouse + </panel.string> <icon follows="left|top" height="18" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 111daec242..da39f13726 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -56,7 +56,9 @@ <string name="SavingSettings">Saving your settings...</string> <string name="LoggingOut">Logging out...</string> <string name="ShuttingDown">Shutting down...</string> - + <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string> + <string name="SentToInvalidRegion">You were sent to an invalid region.</string> + <string name="TestingDisconnect">Testing viewer disconnect</string> <!-- Tooltip, lltooltipview.cpp --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> @@ -2121,6 +2123,7 @@ Clears (deletes) the media and all params from the given face. <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <string name="PanelContentsTooltip">Content of object</string> <!-- panel preferences general --> <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> |