diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml index 286feba2cb..bead0d8644 100755 --- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml @@ -70,7 +70,7 @@ image_pressed="PushButton_Press" image_pressed_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press" - tool_tip="Open chat history externally" + tool_tip="Open chat transcript externally" image_overlay="List_View_On" name="open_external_btn" top_delta="-2" diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml index 738ad6da59..a5dc1c12ae 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml @@ -284,7 +284,7 @@ image_pressed="PushButton_Press" image_pressed_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press" - tool_tip="Open this conversation's past history." + tool_tip="Open this conversation's past transcripts." image_overlay="Chat_History" name="im_history_btn" top="0" diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml index c4ee118f16..422f420d77 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml @@ -77,7 +77,7 @@ image_pressed="PushButton_Press" image_pressed_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press" - tool_tip="Open the nearby chat history." + tool_tip="Open the nearby chat transcript." name="chat_history_btn"/> diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index b3d28788da..84d1df386d 100755 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -60,7 +60,7 @@ diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml index 639fe2e447..dc0906cdcf 100755 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml @@ -25,7 +25,7 @@ parameter="can_call" /> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 3abb5f7bc8..c6c841ffcf 100755 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -40,7 +40,7 @@ - Length of group name to be printed in chat history + Length of group name to be printed in chat transcript - Fade IM text into the background of the chat history window + Fade IM text into the background of the chat transcript window - Clear the chat history (usage: cmd) + Clear the chat transcript (usage: cmd) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index aadd1b5697..f534858ffd 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -184,12 +184,12 @@ enabled="false" control_name="LogNearbyChat" name="LogNearbyChat" - label="Save Nearby chat" + label="Save nearby chat transcript" layout="topleft" top_delta="-2" left_pad="2" height="18" - tool_tip="Record nearby chat messages to your hard drive" + tool_tip="Record nearby chat message transcript to your hard drive" width="200" /> @@ -245,7 +246,6 @@ layout="topleft" follows="left|top" left="30" - text_color="White" height="12" top_pad="4" width="100"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index d41016a601..7fc74f17d1 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -262,7 +262,7 @@ name="log_path_desc" top_delta="35" width="300"> - Chat Logs location: + Conversation logs and transcripts location: