diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-04 14:52:19 -0800 |
| commit | 90f9f5dbad8a0e6dc20b3f7fc58527e572a6b3f7 (patch) | |
| tree | 2b6d67485b851d3c9a7adcad4709fed64b11c428 /indra/newview/skins | |
| parent | b43c8afc36a11c34fa76443be85430cac6c72c42 (diff) | |
| parent | 3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 1d74f1bc25..faf54774f6 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -43,6 +43,12 @@ <floater.string name="tooltip_to_main_window" value="Move this conversation back to main window"/> + <floater.string + name="start_call_button_tooltip" + value="Open voice connection"/> + <floater.string + name="end_call_button_tooltip" + value="Close voice connection"/> <view follows="all" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a884ac94d6..c75bd98c38 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3400,7 +3400,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Connecting... </string> <string name="conference-title"> - Ad-hoc Conference + Multi-person chat </string> <string name="conference-title-incoming"> Conference with [AGENT_NAME] |