diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
37 files changed, 184 insertions, 39 deletions
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml index 94839a7593..e8a705e744 100644 --- a/indra/newview/skins/default/xui/en/accordion_drag.xml +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml @@ -4,5 +4,5 @@ height="5" left="50" top="50" - follows="left|bottom|right" background_visible="true" label="splitter_drag" title=""> + follows="left|bottom|right" background_visible="true" label="splitter_drag" title="" translate="false"> </panel> diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index ea34bac0a7..e17a0dd351 100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml @@ -3,5 +3,6 @@ background_visible="true" label="splitter_parent" title="" + translate="false" > </panel> diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index b4d2dabc5c..7236351f2e 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -17,7 +17,7 @@ save_visibility="true" single_instance="true" width="320"> - <string name="nudge_parabuild">Nudge 1</string> + <string name="nudge_parabuild" translate="false">Nudge 1</string> <string name="test_the_vlt">This string CHANGE2 is extracted.</string> <string name="testing_eli">Just a test. change here. more change.</string> <chat_history @@ -35,6 +35,7 @@ parse_highlights="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" + translate="false" width="320"> Really long line that is long enough to wrap once with jyg descenders. Really long line that is long enough to wrap once with jyg descenders. diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 0911751fb4..e0f22b4ee2 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -21,7 +21,7 @@ Built with [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> -You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP]) +You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] @@ -91,7 +91,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number left="10" top_pad="5" height="25" - width="160" /> + width="180" /> </panel> <panel border="true" 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 d2e5473157..9aaa660574 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -12,7 +12,7 @@ can_minimize="true" can_close="true" visible="false" - width="360" + width="440" can_resize="true" min_width="250" min_height="190"> @@ -20,7 +20,7 @@ animate="false" follows="all" height="320" - width="360" + width="440" layout="topleft" orientation="horizontal" name="im_panels" @@ -38,7 +38,7 @@ left="0" top="0" height="200" - width="245" + width="325" user_resize="true"> <button height="20" @@ -65,7 +65,7 @@ parse_highlights="true" allow_html="true" left="1" - width="240"> + width="320"> </chat_history> <line_editor bottom="0" @@ -75,7 +75,7 @@ label="To" layout="bottomleft" name="chat_editor" - width="240"> + width="320"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index aa219b9615..ac0fca9cce 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -52,6 +52,7 @@ left_pad="5" name="reporter_field" top_delta="0" + translate="false" use_ellipses="true" width="200"> Loremipsum Dolorsitamut Longnamez @@ -153,6 +154,7 @@ left_pad="6" name="object_name" top_delta="0" + translate="false" use_ellipses="true" width="185"> Consetetur Sadipscing @@ -180,6 +182,7 @@ left_pad="6" name="owner_name" top_delta="0" + translate="false" use_ellipses="true" width="185"> Hendrerit Vulputate Kamawashi Longname diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 8c6ad5c0f7..bf0a774e76 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_button" help_topic="floater_test_button" + translate="false" width="500"> <button height="23" diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 042b4226c3..c828f6b284 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_checkbox" help_topic="floater_test_checkbox" + translate="false" width="400"> <check_box control_name="ShowStartLocation" diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 317d8f5ba8..45e2e34da7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_combobox" help_topic="floater_test_combobox" + translate="false" width="400"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 9143048aeb..0f5c5f2be0 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -7,6 +7,7 @@ name="floater_test_inspectors" help_topic="floater_test_inspectors" title="TEST INSPECTORS" + translate="false" width="400"> <text height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index c6acb7c96e..94f7e0b798 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_layout" help_topic="floater_test_layout" + translate="false" width="500"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index fe6ec91709..2894ad2a32 100644 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_line_editor" help_topic="floater_test_line_editor" + translate="false" width="400"> <line_editor height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index 247c705687..32ccc31dfd 100644 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_list_view" help_topic="floater_test_list_view" + translate="false" width="400"> <!-- intentionally empty --> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml index c6b4cca6b9..f4a50ecc96 100644 --- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_navigation_bar" help_topic="floater_test_navigation_bar" + translate="false" width="900"> <panel name="navigation_bar" diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index 7ef2d97cdc..db14ecae83 100644 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_radiogroup" help_topic="floater_test_radiogroup" + translate="false" width="400"> <radio_group height="54" diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 85d8bb2bb1..20bd555a03 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_slider" help_topic="floater_test_slider" + translate="false" width="450"> <slider height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index 3c44a4884d..acd49aa492 100644 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_spinner" help_topic="floater_test_spinner" + translate="false" width="450"> <spinner height="32" diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml index 8be0c28c5c..dc8f00d5f3 100644 --- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -5,6 +5,7 @@ height="600" layout="topleft" name="floater_test_text_editor" + translate="false" width="800"> <text_editor height="50" diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 8fc2677cbe..2df9bb35fe 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -6,6 +6,7 @@ layout="topleft" name="floater_test_textbox" help_topic="floater_test_textbox" + translate="false" width="800"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 2f88c234cc..447bd7f599 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -25,6 +25,7 @@ layout="topleft" name="floater_test_widgets" help_topic="floater_test_widgets" + translate="false" width="850"> <!-- Strings are used by C++ code for localization. They are not visible diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 8b2136c2dc..e86cb23c1e 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -10,6 +10,7 @@ help_topic="gui_preview_tool" single_instance="true" title="XUI PREVIEW TOOL" + translate="false" width="750"> <panel bottom="640" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 5f38522758..bbe6892b27 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -196,6 +196,7 @@ <menu_item_call label="Textbox" name="Textbox" + translate="false" shortcut="control|1"> <menu_item_call.on_click function="Floater.Show" @@ -204,6 +205,7 @@ <menu_item_call label="Text Editor" name="Text Editor" + translate="false" shortcut="control|2"> <menu_item_call.on_click function="Floater.Show" @@ -212,6 +214,7 @@ <menu_item_call label="Widgets" name="Widgets" + translate="false" shortcut="control|shift|T"> <menu_item_call.on_click function="Floater.Show" @@ -219,6 +222,7 @@ </menu_item_call> <menu_item_call label="Inspectors" + translate="false" name="Inspectors"> <menu_item_call.on_click function="Floater.Show" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b16660d06e..2c90bb50f8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3004,7 +3004,6 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo type="alert"> You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. -[INVITE] <usetemplate name="okcancelbuttons" notext="Decline" @@ -3151,7 +3150,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport to [LOCATION]? +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" @@ -5220,7 +5219,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th <notification icon="notify.tga" name="OfferFriendship" - type="alertmodal"> + type="offer"> [NAME] is offering friendship. [MESSAGE] @@ -5235,10 +5234,6 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th index="1" name="Decline" text="Decline"/> - <button - index="2" - name="Send IM" - text="Send IM"/> </form> </notification> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 09ec2137b7..aad55685d2 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -87,7 +87,7 @@ image_name="spacer24.tga" layout="topleft" left="0" - name="DUMMY" + name="after_speak_panel" min_width="3" top="0" width="3"/> @@ -127,7 +127,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_gesture_panel" top="0" width="3"/> <layout_panel @@ -169,7 +169,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_movement_panel" top="0" width="3"/> <layout_panel @@ -212,7 +212,7 @@ layout="topleft" left="0" min_width="3" - name="DUMMY" + name="after_cam_panel" top="0" width="3"/> <layout_panel @@ -317,6 +317,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. layout="topleft" left="0" min_width="4" + name="DUMMY" top="0" width="5"/> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..6e9476f814 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + default_tab_group="2" + mouse_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="left|bottom|right" + height="33" + layout="topleft" + left="0" + name="bottom_tray_lite" + tab_stop="true" + top="28" + chrome="true" + border_visible="false" + visible="false" + width="1000"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="28" + layout="topleft" + left="0" + name="toolbar_stack_lite" + orientation="horizontal" + top="0" + width="1000"> + <icon + auto_resize="false" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + min_width="2" + left="0" + top="0" + width="2" /> + <layout_panel + mouse_opaque="false" + auto_resize="true" + follows="left|right" + height="28" + layout="topleft" + left="0" + min_height="23" + width="310" + top="4" + min_width="188" + name="chat_bar" + user_resize="false" + filename="panel_nearby_chat_bar.xml" /> + <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + width="82" + top_delta="0" + min_width="52" + name="gesture_panel" + user_resize="false"> + <gesture_combo_list + follows="left|right" + height="23" + label="Gesture" + layout="topleft" + name="Gesture" + left="0" + top="5" + width="82" + tool_tip="Shows/hides gestures"> + <gesture_combo_list.combo_button + pad_right="10" + use_ellipses="true" /> + </gesture_combo_list> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="3" + name="after_gesture_panel" + top="0" + width="3"/> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index af73faf9a1..b903032ed5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -42,17 +42,20 @@ Hover your mouse over the options for more help. height="156" layout="topleft" left="0" - right="-1" name="visible_members" top_pad="2"> <name_list.columns label="Member" name="name" - relative_width="0.6" /> + relative_width="0.4" /> <name_list.columns label="Title" name="title" relative_width="0.4" /> + <name_list.columns + label="Status" + name="status" + relative_width="0.2" /> </name_list> <text follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 618d2f3b8e..5f6b670cd2 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -50,15 +50,15 @@ Select multiple Members by holding the Ctrl key and clicking on their names. </panel.string> <panel.string - name="power_folder_icon"> + name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> + name="power_all_have_icon" translate="false"> Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> + name="power_partial_icon" translate="false"> Checkbox_Off </panel.string> <filter_editor @@ -142,15 +142,15 @@ including the Everyone and Owner Roles. The 'Everyone' and 'Owners' Roles are special and can't be deleted. </panel.string> <panel.string - name="power_folder_icon"> + name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> + name="power_all_have_icon" translate="false"> Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> + name="power_partial_icon" translate="false"> Checkbox_Off </panel.string> <filter_editor @@ -223,15 +223,15 @@ including the Everyone and Owner Roles. things in this group. There's a broad variety of Abilities. </panel.string> <panel.string - name="power_folder_icon"> + name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> + name="power_all_have_icon" translate="false"> Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> + name="power_partial_icon" translate="false"> Checkbox_Off </panel.string> <filter_editor diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 7204e57479..5a1bc32db0 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -35,6 +35,16 @@ name="avatar_icon" top="3" width="18" /> + <group_icon + follows="right" + height="18" + default_icon_name="Generic_Group" + layout="topleft" + left="3" + mouse_opaque="false" + name="group_icon" + top="3" + width="18" /> <!--<icon follows="right" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 3fdaca604f..73c5b20f9c 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -12,10 +12,10 @@ top="600" http://join.secondlife.com/ </panel.string> <panel.string - name="real_url"> + name="real_url" translate="false"> http://secondlife.com/app/login/ </panel.string> - <string name="reg_in_client_url"> + <string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ </string> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 4894ae01da..4164ce73dd 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -119,6 +119,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" + translate="false" width="181" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -172,6 +173,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" + translate="false" width="181" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -187,6 +189,7 @@ left="10" name="homepage_edit" top_pad="0" + translate="false" value="http://librarianavengers.org" width="300" word_wrap="false" @@ -209,6 +212,7 @@ layout="topleft" left="10" name="register_date" + translate="false" value="05/31/2376" width="300" word_wrap="true" /> @@ -241,6 +245,7 @@ left="10" name="acc_status_text" top_pad="0" + translate="false" width="300" word_wrap="true"> Resident. No payment info on file. @@ -294,7 +299,8 @@ layout="topleft" left="7" name="sl_groups" - top_pad="0" + top_pad="0" + translate="false" width="298" expanded_bg_visible="true" expanded_bg_color="DkGray"> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index df37f9973c..145a24b642 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -11,6 +11,7 @@ name="notification_panel" top="0" height="140" + translate="false" width="305"> <!-- THIS PANEL CONTROLS TOAST HEIGHT? --> <panel diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index 7b6c0f33da..16593751f7 100644 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml @@ -3,6 +3,7 @@ height="100" layout="topleft" name="notifications_panel" + translate="false" width="100"> <layout_stack follows="left|right|top|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index a0fcf59fc8..82821a1dfe 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -707,7 +707,8 @@ top_delta="16" width="315" /> </radio_group> - </panel> + </panel> + <button follows="left|bottom" height="23" @@ -717,7 +718,8 @@ left="10" name="Apply" top="383" - width="115"> + width="115" + > <button.commit_callback function="Pref.Apply" /> </button> 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 0aaeb6114e..f7e3ede93c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -174,8 +174,7 @@ </text> <line_editor bottom="366" - control_name="InstantMessageLogFolder" - enabled="false" + control_name="InstantMessageLogPath" follows="top|left|right" halign="right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 7c584ba2c8..1f0ace5843 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -109,6 +109,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" + translate="false" width="180" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -152,6 +153,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" + translate="false" width="180" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -167,6 +169,7 @@ left="10" name="homepage_edit" top_pad="0" + translate="false" value="http://librarianavengers.org" width="300" word_wrap="false" @@ -189,6 +192,7 @@ layout="topleft" left="10" name="register_date" + translate="false" value="05/31/2376" width="300" word_wrap="true" /> @@ -221,6 +225,7 @@ left="10" name="acc_status_text" top_pad="0" + translate="false" width="300" word_wrap="true"> Resident. No payment info on file. @@ -275,6 +280,7 @@ left="7" name="sl_groups" top_pad="0" + translate="false" width="290" expanded_bg_visible="true" expanded_bg_color="DkGray"> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 2822f7b841..5e74689c5a 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- All our XML is utf-8 encoded. --> <panel + translate="false" name="sys_well_item" title="sys_well_item" visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index d198237e5d..bfe3cce7d0 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -40,8 +40,9 @@ word_wrap="true" text_color="white" top="5" + translate="false" v_pad="5" - use_ellipses="true" + use_ellipses="true" width="260"> Toast text; </text> |