diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
14 files changed, 42 insertions, 212 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 60f36770bb..71f4d81195 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -8,14 +8,14 @@ help_topic="floater_about" save_rect="true" title="ABOUT [CAPITALIZED_APP_NAME]" - width="470"> + width="500"> <tab_container follows="all" top="25" left="10" height="405" - width="450" + width="480" name="about_tab" tab_position="top"> <panel @@ -33,7 +33,7 @@ max_length="65536" name="support_editor" top="5" - width="435" + width="465" word_wrap="true" /> <button follows="left|top" @@ -56,7 +56,7 @@ left="5" name="linden_intro" top="10" - width="435" + width="465" wrap="true"> Second Life is brought to you by the Lindens, with open source contributions from: @@ -71,7 +71,7 @@ with open source contributions from: max_length="65536" name="contrib_names" top_pad="10" - width="435" + width="465" word_wrap="true"> Dummy Name replaced at run time </text_editor> @@ -91,7 +91,7 @@ Dummy Name replaced at run time max_length="65536" name="licenses_editor" top="5" - width="435" + width="465" word_wrap="true"> 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion APR Copyright (C) 2011 The Apache Software Foundation diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index dddb258ed9..af6d11f47e 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -47,7 +47,6 @@ top="20" width="500"> <panel - border="none" height="150" label="Search" layout="topleft" @@ -108,7 +107,6 @@ </scroll_list> </panel> <panel - border="none" height="150" label="Friends" layout="topleft" @@ -144,7 +142,6 @@ <scroll_list follows="all" height="120" - border="false" layout="topleft" left="0" name="Friends" @@ -154,7 +151,6 @@ </panel> <panel - border="none" height="150" label="Near Me" layout="topleft" @@ -213,7 +209,6 @@ draw_heading="true" follows="all" height="100" - border="false" layout="topleft" left="0" name="NearMe" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 22cc058e46..9fe56e447e 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -702,16 +702,6 @@ This parcel is 512 m² of land. right="400"> You have L$ 2,100. </text> - <check_box - follows="bottom|left" - height="20" - label="Remove [AMOUNT] m² of contribution from group." - layout="topleft" - left_delta="3" - name="remove_contribution" - top_delta="14" - visible="false" - width="275" /> <button follows="bottom|left" height="20" @@ -721,6 +711,15 @@ This parcel is 512 m² of land. name="buy_btn" top="460" width="100" /> + <check_box + follows="bottom|left" + height="20" + label="Remove [AMOUNT] m² of contribution from group." + layout="topleft" + left_pad="3" + name="remove_contribution" + visible="false" + width="275" /> <button follows="bottom|right" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 76adaad57c..e50747cb5f 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -127,7 +127,7 @@ top_delta="0" width="31" /> <panel - height="154" + height="159" layout="topleft" follows="top|left" left="0" @@ -250,7 +250,7 @@ left="0" name="panel_container" default_panel_name="panel_snapshot_options" - top_pad="10" + top_pad="5" width="215"> <panel class="llpanelsnapshotoptions" diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index fe9ffba6cd..9a097d933b 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -178,108 +178,7 @@ width="22"> <button.commit_callback function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/> - </button> - - <button - image_overlay="Video_URL_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - chrome="true" - tool_tip="MPEG4 Video Test" - enabled="true" - follows="left|top" - height="22" - layout="topleft" - left="27" - name="VLC Plugin Test" - top="0" - width="22"> - <button.commit_callback - function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/sample_media/ss.mp4"/> - </button> - <button - image_overlay="Video_URL_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - chrome="true" - tool_tip="MKV Video Test" - enabled="true" - follows="left|top" - height="22" - layout="topleft" - left="51" - name="VLC Plugin Test" - top="0" - width="22"> - <button.commit_callback - function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/sample_media/jellyfish.mkv"/> - </button> - <button - image_overlay="Video_URL_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - chrome="true" - tool_tip="WebM Video Test" - enabled="true" - follows="left|top" - height="22" - layout="topleft" - left="75" - name="VLC Plugin Test" - top="0" - width="22"> - <button.commit_callback - function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/sample_media/jumprope.webm"/> - </button> - <button - image_overlay="Video_URL_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - chrome="true" - tool_tip="MP3 audio Test" - enabled="true" - follows="left|top" - height="22" - layout="topleft" - left="99" - name="VLC Plugin Test" - top="0" - width="22"> - <button.commit_callback - function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/> - </button> - <button - image_overlay="Video_URL_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - chrome="true" - tool_tip="FLV Test" - enabled="true" - follows="left|top" - height="22" - layout="topleft" - left="123" - name="VLC Plugin Test" - top="0" - width="22"> - <button.commit_callback - function="WebContent.TestURL" - parameter="https://callum-linden.s3.amazonaws.com/sample_media/vandal.flv"/> + parameter="https://sl-viewer-media-system.s3.amazonaws.com/index.html"/> </button> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 550af03683..82027d9e7c 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,6 +4,7 @@ <font name="default" comment="default font files (global fallbacks)"> <file>DejaVuSans.ttf</file> <os name="Windows"> + <file>meiryo.TTC</file> <file>MSGOTHIC.TTC</file> <file>gulim.ttc</file> <file>simhei.ttf</file> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 4e2f819023..07b3cc3bd8 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -245,7 +245,7 @@ name="Media Browser"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://google.com"/> + parameter="http://duckduckgo.com"/> </menu_item_call> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 92511167c0..dcd8f0b495 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2373,16 +2373,6 @@ function="ToggleControl" parameter="DebugShowMemory" /> </menu_item_check> - <menu_item_check - label="Show Private Mem Info" - name="Show Private Mem Info"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowPrivateMem" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowPrivateMem" /> - </menu_item_check> <menu_item_separator/> @@ -3173,7 +3163,7 @@ shortcut="control|alt|shift|Z"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://google.com"/> + parameter="http://duckduckgo.com"/> </menu_item_call> <menu_item_call label="FB Connect Test" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a0130b568a..6aa6653f42 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5928,7 +5928,7 @@ The folder '[FOLDERNAME]' is a system folder. Deleting system folders icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> -[COUNT] items will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash? +[COUNT] items and folders will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash? <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -8094,17 +8094,6 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now </notification> <notification - duration="10" - icon="notifytip.tga" - name="VoiceLoginRetry" - type="notifytip"> - <unique/> -We are creating a voice channel for you. This may take up to one minute. - <tag>status</tag> - <tag>voice</tag> - </notification> - - <notification icon="notify.tga" name="VoiceEffectsExpired" sound="UISndAlert" @@ -8559,12 +8548,18 @@ Please check your network and firewall setup. icon="alertmodal.tga" name="NoVoiceConnect" type="alertmodal"> -We're having trouble connecting to your voice server: +We are unable to connect to the voice server: [HOSTID] -Voice communications will not be available. +Ports that must be allowed for voice are: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + Please check your network and firewall setup. +Disable any SIP ALG feature in your router. + +Voice communications will not be available. <tag>voice</tag> <tag>fail</tag> <usetemplate diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index df70398599..d77fbdec0a 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -13,26 +13,27 @@ </panel.string> <panel.string name="ItemcountFetching"> - Fetching [ITEM_COUNT] Items... [FILTER] + Fetching [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] Items [FILTER] + [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Fetched [ITEM_COUNT] Items [FILTER] + Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER] </panel.string> <text type="string" length="1" - follows="left|top" + follows="left|top|right" height="13" layout="topleft" left="12" name="ItemcountText" font="SansSerifMedium" text_color="EmphasisColor" + use_ellipses="true" top_pad="0" width="300"> Items: diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 4d9316768b..c1a68fb9af 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -71,7 +71,6 @@ mouse_opaque="false" name="text_editor_box" read_only="true" - tab_stop="false" text_color="White" text_readonly_color="White" top="10" 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 284688d4d1..2ec5cef640 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -19,7 +19,7 @@ follows="left|top" height="23" label="Clear History" - tool_tip="Clear login image, last location, teleport history, web, and texture cache" + tool_tip="Clear login image, last location, teleport history, web and texture cache" layout="topleft" left="30" name="clear_cache" 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 1d4cbca1a5..6732f4ff1c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -106,38 +106,6 @@ width="300"> Web: </text> - <!-- <radio_group - control_name="UseExternalBrowser" - draw_border="false" - follows="top|left" - height="40" - layout="topleft" - left_delta="50" - name="use_external_browser" - top_pad="-2" - width="480"> - <radio_item - height="20" - label="Use my browser (IE, Firefox, Safari)" - layout="topleft" - left_delta="0" - name="external" - value="true" - top="0" - tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." - width="480" /> - <radio_item - height="20" - label="Use built-in browser" - layout="topleft" - left="0" - name="internal" - value="" - tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." - top_delta="20" - width="480" /> - </radio_group> --> - <radio_group control_name="PreferredBrowserBehavior" follows="left|top" @@ -149,7 +117,7 @@ width="480"> <radio_item height="20" - label="Use my browser (Chrome, Firefox, IE) for all links" + label="Use the default system browser for all links" layout="topleft" left="0" name="internal" @@ -159,17 +127,17 @@ width="480" /> <radio_item height="20" - label="Use built-in browser for Second Life links only" + label="Use the built-in browser for Second Life links only" layout="topleft" left_delta="0" name="external" value="1" - tool_tip="Use the default system web browser for help, web links, etc. Builtin browser will be used only for LindenLab/SecondLife links." + tool_tip="Use the default system web browser for help, web links, etc. The built-in browser will be used only for LindenLab/Second Life links." top_delta="20" width="480" /> <radio_item height="20" - label="Use built-in browser for all links" + label="Use the built-in browser for all links" layout="topleft" left="0" name="external_all" @@ -193,22 +161,6 @@ radio_style="false" width="400" top_pad="5"/> - - <check_box - top_delta="4" - enabled="true" - follows="left|top" - height="14" - initial_value="true" - control_name="CookiesEnabled" - label="Accept cookies" - left_delta="0" - mouse_opaque="true" - name="cookies_enabled" - radio_style="false" - width="400" - top_pad="5"/> - <check_box top_delta="4" enabled="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 807d116b3b..0a220e68fd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -159,8 +159,7 @@ Your account is not accessible until If you feel this is an error, please contact support@secondlife.com.</string> <string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string> <string name="LoginFailedPendingLogout">The system is logging you out right now. -Your Account will not be available until -[TIME] Pacific Time.</string> +Please wait a minute before you try logging in again.</string> <string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string> <string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string> <string name="LoginFailedRestrictedHours">Your account can only access Second Life @@ -2329,7 +2328,7 @@ If you continue to receive this message, please contact Second Life support for <string name="InventoryMarketplaceListingsNoItems"> Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. </string> - + <string name="InventoryItemsCount">( [ITEMS_COUNT] Items )</string> <string name="Marketplace Validation Log"></string> <string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string> <string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string> |