From 3a6a18ee30425bf1000f82b0a4b245c23f0deafc Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Thu, 8 Oct 2009 00:22:26 +0000 Subject: Clean up a bunch of weird indented spacing in notifications.xml. - Besides making some awkward spacing visible to the user, it flags a ton of strings for a new translation, when they havent really changed. Please dont do this. --- .../newview/skins/default/xui/en/notifications.xml | 422 ++++++++++----------- 1 file changed, 211 insertions(+), 211 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f141a909a8..f6228db229 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -650,7 +650,7 @@ Scripts must be allowed to run for weapons to work. icon="alertmodal.tga" name="MultipleFacesSelected" type="alertmodal"> - Multiple faces are currently selected. +Multiple faces are currently selected. If you continue this action, separate instances of media will be set on multiple faces of the object. To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add. - "There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again" +There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again @@ -5014,347 +5014,347 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="SystemMessageTip" type="notifytip"> - [MESSAGE] +[MESSAGE] - Cancelled +Cancelled - Cancelled Sit +Cancelled Sit - Cancelled Attach +Cancelled Attach - Replaced missing clothing/body part with default. +Replaced missing clothing/body part with default. - Topic: [SUBJECT], Message: [MESSAGE] +Topic: [SUBJECT], Message: [MESSAGE] - [FIRST] [LAST] is Online +[FIRST] [LAST] is Online - [FIRST] [LAST] is Offline +[FIRST] [LAST] is Offline - Although you're very nice, you can't add yourself as a friend. +Although you're very nice, you can't add yourself as a friend. - Uploading in-world and web site snapshots... - (Takes about 5 minutes.) +Uploading in-world and web site snapshots... +(Takes about 5 minutes.) - You paid L$[AMOUNT] to upload. +You paid L$[AMOUNT] to upload. - Web site snapshot upload done. +Web site snapshot upload done. - In-world snapshot upload done +In-world snapshot upload done - Terrain.raw downloaded +Terrain.raw downloaded - Hmm. Gesture [NAME] is missing from the database. +Hmm. Gesture [NAME] is missing from the database. - Unable to load gesture [NAME]. - Please try again. +Unable to load gesture [NAME]. +Please try again. - Landmark is missing from database. +Landmark is missing from database. - Unable to load landmark. Please try again. +Unable to load landmark. Please try again. - Your Caps Lock key is on. - This might affect your password. +Your Caps Lock key is on. +This might affect your password. - Notecard is missing from database. +Notecard is missing from database. - You don't have permission to view this notecard. +You don't have permission to view this notecard. - Insufficient permissions to rez object. +Insufficient permissions to rez object. - Unable to load notecard. - Please try again. +Unable to load notecard. +Please try again. - Script is missing from database. +Script is missing from database. - Insufficient permissions to view script. +Insufficient permissions to view script. - Unable to load script. Please try again. +Unable to load script. Please try again. - The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. +The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. - You cannot modify protected categories. +You cannot modify protected categories. - You cannot remove protected categories. +You cannot remove protected categories. - You have offered a calling card to [FIRST] [LAST] +You have offered a calling card to [FIRST] [LAST] - Unable to buy while downloading object data. - Please try again. +Unable to buy while downloading object data. +Please try again. - Unable to link while downloading object data. - Please try again. +Unable to link while downloading object data. +Please try again. - You can only buy objects from one owner at a time. - Please select a single object. +You can only buy objects from one owner at a time. +Please select a single object. - This object is not for sale. +This object is not for sale. - Entering god mode, level [LEVEL] +Entering god mode, level [LEVEL] - Now leaving god mode, level [LEVEL] +Now leaving god mode, level [LEVEL] - You don't have permission to copy this. +You don't have permission to copy this. - [NAME] accepted your inventory offer. +[NAME] accepted your inventory offer. - [NAME] declined your inventory offer. +[NAME] declined your inventory offer. - [NAME]: [MESSAGE] +[NAME]: [MESSAGE] - Your calling card was accepted. +Your calling card was accepted. - Your calling card was declined. +Your calling card was declined. - Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. - Double click on the landmark and click on Teleport to travel there. +Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. +Double click on the landmark and click on Teleport to travel there. - Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. - Double click on the card, click on Instant Message, and type a message. +Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. +Double click on the card, click on Instant Message, and type a message. - Can't select land across server boundaries. - Try selecting a smaller piece of land. +Can't select land across server boundaries. +Try selecting a smaller piece of land. - Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. +Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. - Please select at least one type of content to search (PG, Mature, or Adult). +Please select at least one type of content to search (PG, Mature, or Adult). - [NAME] has proposed to vote on: - [MESSAGE] +[NAME] has proposed to vote on: +[MESSAGE]
+ width="275"> Drag to move, shift-drag to copy - - - - - - - - + - - @@ -328,8 +334,8 @@ follows="left|top" height="20" image_disabled="Object_Cube" - image_disabled_selected="object_cube_active.tga" - image_selected="object_cube_active.tga" + image_disabled_selected="Object_Cube" + image_selected="Object_Cube" image_unselected="Object_Cube" layout="topleft" left="4" @@ -342,8 +348,8 @@ follows="left|top" height="20" image_disabled="Object_Prism" - image_disabled_selected="object_prism_active.tga" - image_selected="object_prism_active.tga" + image_disabled_selected="Object_Prism" + image_selected="Object_Prism" image_unselected="Object_Prism" layout="topleft" left_delta="26" @@ -384,8 +390,8 @@ follows="left|top" height="20" image_disabled="Object_Cylinder" - image_disabled_selected="object_cylinder_active.tga" - image_selected="object_cylinder_active.tga" + image_disabled_selected="Object_Cylinder" + image_selected="Object_Cylinder" image_unselected="Object_Cylinder" layout="topleft" left_delta="26" @@ -398,8 +404,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Cylinder" - image_disabled_selected="object_hemi_cylinder_active.tga" - image_selected="object_hemi_cylinder_active.tga" + image_disabled_selected="Object_Hemi_Cylinder" + image_selected="Object_Hemi_Cylinder" image_unselected="Object_Hemi_Cylinder" layout="topleft" left_delta="26" @@ -412,8 +418,8 @@ follows="left|top" height="20" image_disabled="Object_Cone" - image_disabled_selected="object_cone_active.tga" - image_selected="object_cone_active.tga" + image_disabled_selected="Object_Cone" + image_selected="Object_Cone" image_unselected="Object_Cone" layout="topleft" left_delta="26" @@ -426,8 +432,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Cone" - image_disabled_selected="object_hemi_cone_active.tga" - image_selected="object_hemi_cone_active.tga" + image_disabled_selected="Object_Hemi_Cone" + image_selected="Object_Hemi_Cone" image_unselected="Object_Hemi_Cone" layout="topleft" left_delta="26" @@ -440,8 +446,8 @@ follows="left|top" height="20" image_disabled="Object_Sphere" - image_disabled_selected="object_sphere_active.tga" - image_selected="object_sphere_active.tga" + image_disabled_selected="Object_Sphere" + image_selected="Object_Sphere" image_unselected="Object_Sphere" layout="topleft" left_delta="26" @@ -454,8 +460,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Sphere" - image_disabled_selected="object_hemi_sphere_active.tga" - image_selected="object_hemi_sphere_active.tga" + image_disabled_selected="Object_Hemi_Sphere" + image_selected="Object_Hemi_Sphere" image_unselected="Object_Hemi_Sphere" layout="topleft" left_delta="26" @@ -468,8 +474,8 @@ follows="left|top" height="20" image_disabled="Object_Torus" - image_disabled_selected="object_torus_active.tga" - image_selected="object_torus_active.tga" + image_disabled_selected="Object_Torus" + image_selected="Object_Torus" image_unselected="Object_Torus" layout="topleft" left="4" @@ -482,8 +488,8 @@ follows="left|top" height="20" image_disabled="Object_Tube" - image_disabled_selected="object_tube_active.tga" - image_selected="object_tube_active.tga" + image_disabled_selected="Object_Tube" + image_selected="Object_Tube" image_unselected="Object_Tube" layout="topleft" left_delta="26" @@ -496,8 +502,8 @@ follows="left|top" height="20" image_disabled="Object_Ring" - image_disabled_selected="object_ring_active.tga" - image_selected="object_ring_active.tga" + image_disabled_selected="Object_Ring" + image_selected="Object_Ring" image_unselected="Object_Ring" layout="topleft" left_delta="26" @@ -510,8 +516,8 @@ follows="left|top" height="20" image_disabled="Object_Tree" - image_disabled_selected="object_tree_active.tga" - image_selected="object_tree_active.tga" + image_disabled_selected="Object_Tree" + image_selected="Object_Tree" image_unselected="Object_Tree" layout="topleft" left_delta="26" @@ -524,8 +530,8 @@ follows="left|top" height="20" image_disabled="Object_Grass" - image_disabled_selected="object_grass_active.tga" - image_selected="object_grass_active.tga" + image_disabled_selected="Object_Grass" + image_selected="Object_Grass" image_unselected="Object_Grass" layout="topleft" left_delta="26" @@ -718,13 +724,13 @@ type="string" text_color="LabelSelectedDisabledColor" length="1" - top_pad="4" height="12" follows="left|top" halign="right" layout="topleft" - left="115" + right="-13" name="obj_count" + top_pad="8" width="143"> Objects: [COUNT] @@ -735,6 +741,7 @@ follows="left|top" halign="right" layout="topleft" + right="-13" name="prim_count" width="143"> Prims: [COUNT] @@ -784,7 +791,7 @@ - You must select entire object to set permissions + This object has linked parts @@ -827,7 +834,7 @@ name="Object Name" select_on_focus="true" top_delta="0" - width="165" /> + width="170" /> + width="170" /> Owner: - + + top_pad="5" + width="75"> Group: + + - + + + @@ -160,19 +173,8 @@ image_unselected="camera_presets/camera_presets_snapshot.png" name="snapshot" tool_tip="Take Snapshot" /> - + - + width="333"> + width="313"> - + width="298" + height="555"> + width="280" /> loading... @@ -165,7 +158,6 @@ name="set_to_curr_location_btn" width="200" /> - + word_wrap="true" + max_length="350" /> @@ -121,7 +121,7 @@ name="camera_btn" width="70"> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 713c3a41a2..78f53562cd 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -16,7 +16,7 @@ /> Jerry Knight diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 4088d96ebf..d914583352 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -21,15 +21,28 @@ tool_tip="Press Enter to say, Ctrl-Enter to shout." top="3" width="250" /> + + header_expand_img_pressed="Accordion_ArrowOpened_Press" + header_image="Accordion_Off.png" + header_image_over="Accordion_Over" + header_image_pressed="Accordion_Press" + /> -- cgit v1.2.3 From 93b92d960406d585627172bc7fb9fd9300046475 Mon Sep 17 00:00:00 2001 From: Justin Rounds Date: Tue, 13 Oct 2009 16:30:27 +0000 Subject: Adjusted position of Favorites button as per http://jira.secondlife.com/browse/EXT-1318 --- indra/newview/skins/default/xui/en/widgets/location_input.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index e06838a0f8..defa6ff00d 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -35,11 +35,13 @@ hover_glow_amount="0.15" image_hover_selected="Favorite_Star_Over" image_hover_unselected="Favorite_Star_Over" - width="16" - height="16" + width="18" + height="18" tool_tip="Add this to My Landmarks" follows="right|top" - scale_image="false" /> + scale_image="false" + top="19" + left="-3" /> Date: Tue, 13 Oct 2009 16:42:07 +0000 Subject: Adjusted height of location input field to match spec visually, related to http://jira.secondlife.com/browse/EXT-1318 --- indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 920bf08012..60d3256c44 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -70,7 +70,7 @@ Date: Tue, 13 Oct 2009 19:03:07 +0000 Subject: EXT-1499 Partial Fix: parts 1 & 2 only. Finalize the Home panel text to make it accurate. --- indra/newview/skins/default/xui/en/panel_side_tray.xml | 6 +++--- .../newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index d172154d49..d3d45640cb 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -74,7 +74,7 @@ help_topic="sidebar_places" tab_title="Places" label="Places" - description="Find places to go and places you've been." + description="Find places to go and places you've visited before." image="TabIcon_Places_Off" mouse_opaque="false" background_visible="true" @@ -93,7 +93,7 @@ name="sidebar_me" help_topic="sidebar_me" tab_title="Me" - description="Change your profile, your look and quick links to your outfits." + description="Edit your public profile and Picks." image="TabIcon_Me_Off" mouse_opaque="false" background_visible="true" @@ -111,7 +111,7 @@ name="sidebar_appearance" help_topic="sidebar_appearance" tab_title="Appearance" - description="Change your looks and appearance." + description="Change your appearance and current look." image="TabIcon_Appearance_Off" mouse_opaque="false" background_opaque="false" diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index d379c60aed..88379a5ed3 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -39,7 +39,7 @@ name="tab_icon" right="-10" top="10" - image_name="TabIcon_Home_Selected" + image_name="TabIcon_People_Off" width="20" /> - Find your friends, contacts and people nearby. + Find your friends, your groups, contacts and people nearby. - Find your friends, contacts and people nearby. + Find places to go and places you've visited before. - Change your profile. + Edit your public profile. + image_name="TabIcon_Appearance_Off"/> - Change your apperance and looks. + Change your appearance and current look. -- cgit v1.2.3 From 2f61bd2bd0c38b644b22417e1b1f3bfb7f139820 Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Tue, 13 Oct 2009 19:16:21 +0000 Subject: L10N: clean up/consistent wording of more EN strings. TEXT CHANGE ONLY; NO CODE CHANGED --- indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 25e6b1ae53..d79a27699a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5315,16 +5315,18 @@ Your calling card was declined. icon="notifytip.tga" name="TeleportToLandmark" type="notifytip"> -You can teleport to locations like '[NAME]' by opening the Places panel on the right of the viewer, and then select the Landmarks folder. -Click on the landmark to select it and click the 'Teleport' button at the bottom of the panel. You can also double-click on the landmark, or right-click and select 'Teleport' from the context menu. +You can teleport to locations like '[NAME]' by opening the Places panel on the right side of your screen, and then select the Landmarks tab. +Click on any landmark to select it, then click 'Teleport' at the bottom of the panel. +(You can also double-click on the landmark, or right-click it and choose 'Teleport'.) -You can contact residents like '[NAME]' by opening the People panel on the right of the viewer. -Select the resident from the list in the panel and click the 'IM' button at the bottom of the panel. You can also double-click on the resident in the list, or right-click and select 'Send IM...' from the context menu. +You can contact residents like '[NAME]' by opening the People panel on the right side of your screen. +Select the resident from the list, then click 'IM' at the bottom of the panel. +(You can also double-click on their name in the list, or right-click and choose 'IM'). Date: Tue, 13 Oct 2009 20:14:49 +0000 Subject: L10N: clean up/consistent wording of more EN strings. Two instances in the menu should refer to the same name used elsewhere. TEXT CHANGE ONLY; NO CODE CHANGED --- indra/newview/skins/default/xui/en/menu_viewer.xml | 4 ++-- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index aec6f3e654..57ea24ac0e 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -437,7 +437,7 @@ parameter="midnight" /> -Are you sure you want to delete teleport history? +Are you sure you want to delete your teleport history? Date: Tue, 13 Oct 2009 20:31:02 +0000 Subject: Reduced "Medium" font size, which is a temporary fix until menu font can be defined specifically. http://jira.secondlife.com/browse/EXT-1315 --- indra/newview/skins/default/xui/en/fonts.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index dec9839d1a..b261281c64 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -150,9 +150,11 @@ comment="Size of large font (points, or 1/72 of an inch)" size="10.0" /> + Date: Tue, 13 Oct 2009 20:36:53 +0000 Subject: EXT-261 Labels in avatar_lad.xml are not localizable -- Last little L10N consistency changes to the EN strings. --- indra/newview/skins/default/xui/en/strings.xml | 35 ++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 44875e9a25..ef601cbd38 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2270,9 +2270,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Big Big Butt Big Eyeball -Big Hair Back -Big Hair Front -Big Hair Top +Big Hair: Back +Big Hair: Front +Big Hair: Top Big Head Big Pectorals Big Spikes @@ -2308,6 +2308,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Bushy Eyebrows Bushy Hair Butt Size +Bustle Skirt +No Bustle +More Bustle CHEST Center Center 2 @@ -2434,16 +2437,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Glove Length bump HEAD Hair -Hair Back -Hair Front -Hair Sides +Hair: Back +Hair: Front +Hair: Sides Hair Sweep -Hair Thickess +Hair Thickness Hair Thickness Hair Tilt Hair Tilted Left Hair Tilted Right -Hair Volume +Hair: Volume Hand Size Handlebars Head Length @@ -2462,8 +2465,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Hip Length Hip Width In -In Shdw Color -In Shdw Opacity +Inner Shadow Color +Inner Shadow Opacity Inner Eye Corner Inner Eye Shadow Inner Shadow @@ -2626,8 +2629,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Open Right Orange Out -Out Shdw Color -Out Shdw Opacity +Outer Shadow Color +Outer Shadow Opacity Outer Eye Corner Outer Eye Shadow Outer Shadow @@ -2743,10 +2746,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Sleeve Length Shadow Sleeve Length bump Sleeve Looseness -Slit Back -Slit Front -Slit Left -Slit Right +Slit: Back +Slit: Front +Slit: Left +Slit: Right Small Small Hands Small Head -- cgit v1.2.3 From f024f38c42166dd94afa046faf84b34f21926ed0 Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Tue, 13 Oct 2009 21:17:41 +0000 Subject: L10N: salvage a useful tooltip in the Build window along with its localizations, that will also go into the new Help server for Tier 1 languages. TEXT ONLY CHANGE; NO CODE CHANGED. --- indra/newview/skins/default/xui/en/floater_tools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0e9dc5e750..32456c00ee 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2846,7 +2846,7 @@ layout="topleft" left_delta="0" name="checkbox show owners" - tool_tip="Colorize the parcels according to the type of owner" + tool_tip="Colorize the parcels according to the type of owner: Green = Your land Aqua = Your group's land Red = Owned by others Yellow = For sale Purple = For auction Grey = Public" top_pad="8" width="205" /> -- cgit v1.2.3 From 1dfb1a1eb7bdc05b4b1110f3b9d9557704b32b0e Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Tue, 13 Oct 2009 21:42:37 +0000 Subject: I18N: Pref > Graphics > windowsize combo will not honor its translations These werent constructed with a label=, so it was falling back to the display of the value= parameter. Only label=s are localized. --- .../default/xui/en/panel_preferences_graphics1.xml | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 ecfb0048a3..84fcf21623 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -48,41 +48,36 @@ length="1" enabled="true" name="640x480" - value="640 x 480"> - 640x480 - + value="640 x 480" + label="640x480"/> - 800x600 - + value="800 x 600" + label="800x600"/> - 720x480 (NTSC) - + value="720 x 480" + label="720x480 (NTSC)"/> - 768x576 (PAL) - + value="768 x 576" + label="768x576 (PAL)"/> - 1024x768 - + value="1024 x 768" + label="1024x768"/> -- cgit v1.2.3 From f4c43a15834099ddae78061f88a229c34e22bc1f Mon Sep 17 00:00:00 2001 From: Erica Olsen Date: Tue, 13 Oct 2009 23:00:44 +0000 Subject: EXT-1322 L$ balance button needs to dynamically size based on content --- indra/newview/skins/default/xui/en/panel_status_bar.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 05ad3ee16f..52c6b6eabc 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -41,7 +41,7 @@ + + diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index a243cb399e..5ee136c422 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -49,7 +49,7 @@ layout="topleft" left="80" name="Discard" - top="302" + top="283" width="100" /> + width="222" + sort_column="1"> + shortcut="control|M" + use_mac_ctrl="true"> @@ -981,6 +982,57 @@ + + + + + + + + + + + + + + + + + + + shortcut="control|shift|3" + use_mac_ctrl="true"> @@ -1615,7 +1668,8 @@ label="Debug Console" layout="topleft" name="Debug Console" - shortcut="control|shift|4"> + shortcut="control|shift|4" + use_mac_ctrl="true"> @@ -1627,7 +1681,8 @@ label="Fast Timers" layout="topleft" name="Fast Timers" - shortcut="control|shift|9"> + shortcut="control|shift|9" + use_mac_ctrl="true"> @@ -1639,7 +1694,8 @@ label="Memory" layout="topleft" name="Memory" - shortcut="control|shift|0"> + shortcut="control|shift|0" + use_mac_ctrl="true"> @@ -1651,7 +1707,8 @@ label="Notifications Console" layout="topleft" name="Notifications" - shortcut="control|shift|5"> + shortcut="control|shift|5" + use_mac_ctrl="true"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 91c19badfa..217178a5ef 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -483,6 +483,20 @@ Joining this group costs L$[COST]. You do not have enough L$ to join this group. + +Creating this group will cost L$100. +Groups need more than one member, or they are deleted forever. +Please invite members within 48 hours. + + + - + - - -Creating this group will cost L$100. -Groups need more than one member, or they are deleted forever. -Please invite members within 48 hours. - - 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 9a4480127d..6f01202680 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -212,4 +212,4 @@ Hover your mouse over the options for more help. value="Not Mature" /> - \ No newline at end of file + 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 06ecfdc995..f7d7d52b68 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -217,7 +217,7 @@ My Avatar: width="237" top_pad="0"/> - - - \ No newline at end of file + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f620e8f2d7..360fd3c2db 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -230,8 +230,10 @@ Yes (Happy) Yes + Loading... Offline + None found. OK @@ -2110,6 +2112,15 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Add Landmark... Edit Landmark... + + Ctrl- + Cmd- + Opt- + Shift- + Ctrl+ + Alt+ + Shift+ + File Saved Receiving @@ -2225,9 +2236,8 @@ Running in window. Can't find suitable pixel format Can't get pixel format description - [APP_NAME] requires True Color (32-bit) to run in a window. -Please go to Control Panels > Display > Settings and set the screen to 32-bit color. -Alternately, if you choose to run fullscreen, [APP_NAME] will automatically adjust the screen each time it runs. + [APP_NAME] requires True Color (32-bit) to run. +Please go to your computer's display settings and set the color mode to 32-bit. [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. -- cgit v1.2.3 From 2ec176c0d4ae53e1d8d3fa0c17f9f10da53c449b Mon Sep 17 00:00:00 2001 From: Erica Olsen Date: Wed, 14 Oct 2009 16:48:53 +0000 Subject: EXT-1268 'Remember me' is misleading (Reverted to "remember password" on login at Ramzi's suggestion) --- indra/newview/skins/default/xui/en/panel_login.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index aeeb884036..afe00271f7 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -164,7 +164,7 @@ control_name="RememberPassword" follows="left|bottom" height="16" - label="Remember me" + label="Remember password" layout="topleft" left_pad="10" name="remember_check" -- cgit v1.2.3 From ed606f343615a36b2e9d0435d8227d8235a986b9 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 14 Oct 2009 17:56:44 +0000 Subject: Fix bad attribute, possibly related to EXT-946 --- indra/newview/skins/default/xui/en/floater_map.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index dc6a02efe1..a2b2e1ddf3 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -67,7 +67,6 @@ left="0" name="floater_map_north" right="10" - text="N" text_color="1 1 1 0.7" top="215"> N -- cgit v1.2.3 From 09e46fe7513f9d8f03f888b56763dc34cbcc7a17 Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Wed, 14 Oct 2009 18:49:36 +0000 Subject: DEV-35179 (part2) improve Keyboard shortcut indicators, using native Mac symbols * This was made possible by DEV-24828 internationalization work. --- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++---- indra/newview/skins/default/xui/en/strings.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 217178a5ef..28c4f0766e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3756,7 +3756,7 @@ Default: Disallow label="Disable Scripts" name="HelpRegionDisableScripts" type="alertmodal"> -When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. +When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance. Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted 'top script'. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object. @@ -3771,7 +3771,7 @@ Default: off name="HelpRegionDisableCollisions" type="alertmodal"> When sim performance is poor, physical objects may be to blame. -Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button. +Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button. You will be given the name and location of physical objects that may be causing poor performance. Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted 'top collider'. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object. @@ -6212,8 +6212,8 @@ This object is flexible. Flexis must be phantom and not physical. You opened the Advanced menu. To toggle this menu, - Windows: Ctrl-Alt-D - Mac: ⌘-Opt-D + Windows: Ctrl+Alt+D + Mac: ⌥⌘D diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 360fd3c2db..cdea93a1dd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -75,8 +75,8 @@ Click to run the secondlife:// command - Close (⌘-W) - Close (Ctrl-W) + Close (⌘W) + Close (Ctrl+W) Restore Minimize Tear Off @@ -2113,10 +2113,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Edit Landmark... - Ctrl- - Cmd- - Opt- - Shift- + ⌃ + ⌘ + ⌥ + ⇧ Ctrl+ Alt+ Shift+ -- cgit v1.2.3 From 7197e1aa962be6174a219027ced4dec72b5553a2 Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Wed, 14 Oct 2009 19:57:31 +0000 Subject: EXT-1477 (part2) Update top menus and top menu spec - a few more consistencies so that same words are used to refer to same thing, put Rendering stuff together, eliminate the Alt+Enter shortcut --- indra/newview/skins/default/xui/en/menu_login.xml | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 433 +++++++++++---------- 2 files changed, 221 insertions(+), 214 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 8c78b0c82f..8cb0a69906 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -178,7 +178,7 @@ + + + + - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2392,7 +2577,7 @@ parameter="focus" /> @@ -2401,7 +2586,7 @@ parameter="move" /> @@ -2410,7 +2595,7 @@ parameter="edit" /> @@ -2419,7 +2604,7 @@ parameter="create" /> @@ -2460,193 +2645,13 @@ label="Toggle Fullscreen" layout="topleft" name="Toggle Fullscreen" - shortcut="alt|Enter"> + > + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Date: Wed, 14 Oct 2009 20:16:18 +0000 Subject: improved metrics for llfontgl::getWidth (use greater of character width/xadvance) llfontgl::Addchar now called consistently when requesting font metrics no longer possible to have font glyph info without rendered font EXT-1294 - LLExpandableTextBox: wrong ellipses reviewed by James and Mani --- indra/newview/skins/default/xui/en/widgets/expandable_text.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index 120deaaef5..319beac291 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -5,6 +5,7 @@ more_label="More" follows="left|top" name="text" + allow_scroll="true" use_ellipses="true" word_wrap="true" tab_stop="true" -- cgit v1.2.3 From 7475ec05fc81e358a6979f3e9d7050ab91511c57 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 14 Oct 2009 20:28:07 +0000 Subject: merge -r 2005-2011 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 * Bugs: EXT-1472 EXT-996 --- .../skins/default/xui/en/floater_im_session.xml | 8 ++-- .../default/xui/en/panel_group_control_panel.xml | 54 ++++++++++------------ 2 files changed, 29 insertions(+), 33 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 0921ccfb95..611c51ad11 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -11,10 +11,10 @@ can_dock="true" can_minimize="true" visible="true" - width="315"> + width="365">