From 00e56b09071f4e29ccec1a5451161817ffba4d96 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Tue, 3 Nov 2009 19:08:11 +0000 Subject: DEV-41358 DEV-41361: Added support for secondlife:///app/worldmap SLurls to the LLUrlRegistry. These are now displayed with the more human-readable label of "Show Map for XXXX" and sport a context menu with various operations. I also added "Show on Map" options to the context menus for other location-based SLurls. I also internationalized the text for "Teleport to" and the new "Show Map for" strings. --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e842517853..0f7e8cb137 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -73,8 +73,13 @@ Click to view this parcel's description Click to teleport to this location Click to view this object's description + Click to view this location on a map Click to run the secondlife:// command + + + Teleport to + Show Map for Close (⌘W) -- cgit v1.2.3 From 321f5ac36ce04b01bd24d62eb4c7585e83c110f9 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Wed, 4 Nov 2009 15:06:52 -0500 Subject: Fix for EXT-2050 - Duplicate entries in strings.xml Removed all duplicates (verifying their dupe status and removing the second example). --- indra/newview/skins/default/xui/en/strings.xml | 45 -------------------------- 1 file changed, 45 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0f7e8cb137..ec2673644f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2047,9 +2047,6 @@ this texture in your inventory New Script - - - (by name) (resident) @@ -2306,9 +2303,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Body Thick Body Thickness Body Thin -Bottom -Bottom Left -Bottom Right Bow Legged Breast Buoyancy @@ -2330,13 +2324,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. No Bustle More Bustle -Center -Center 2 Chaplin Cheek Bones -Chest Chest Size -Chin Chin Angle Chin Cleft Chin Curtains @@ -2500,22 +2490,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Jowls Knee Angle Knock Kneed -L Forearm -L Lower Leg -L Upper Arm -L Upper Leg Large Large Hands -Left -Left Ear -Left Eyeball -Left Foot -Left Hand -Left Hip Left Part -Left Pec -Left Shoulder Leg Length Leg Muscles Less @@ -2533,7 +2511,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Less Square Less Volume Less soul -Light Lighter Lip Cleft Lip Cleft Depth @@ -2596,7 +2573,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. More soul Moustache -Mouth Mouth Corner Mouth Position Mowhawk @@ -2624,10 +2600,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. No Spikes No White No Wrinkles -None Normal Lower Normal Upper -Nose Nose Left Nose Right Nose Size @@ -2667,7 +2641,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Part Part Bangs Pectorals -Pelvis Pigment Pigtails Pink @@ -2683,24 +2656,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Pop Right Eye Puffy Puffy Eyelids -R Forearm -R Lower Leg -R Upper Arm -R Upper Leg Rainbow Color Red Hair Red Skin Regular Regular Muscles -Right -Right Ear -Right Eyeball -Right Foot -Right Hand -Right Hip Right Part -Right Pec -Right Shoulder Rosy Complexion Round Round Forehead @@ -2757,7 +2718,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Skinny Neck Skirt Fit Skirt Length -Skull Slanted Forehead Sleeve Length @@ -2780,12 +2740,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Sparse Spiked Hair -Spine Square Square Toe Squash Head Squash/Stretch Head -Stomach Stretch Head Sunken Sunken Chest @@ -2817,9 +2775,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Tilt Right Toe Shape Toe Thickness -Top -Top Left -Top Right Torso Length Torso Muscles Torso Scrawny -- cgit v1.2.3 From bc3377c1f6ed295afd7636d907702976adfd846d Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Fri, 6 Nov 2009 14:49:35 +0200 Subject: Partial implementation of EXT-1906 All speakers handling functional in old IM Floaters (Communicate) should be present in new IM Floaters/IM control panels, EXCLUDING voice related mute/moderation stuff --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ec2673644f..101426ee28 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2845,6 +2845,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. (Unnamed) (Moderated: Voices off by default) Text chat is not available for this call. + Your text chat has been disabled by a Group Moderator. + Click here to instant message. -- cgit v1.2.3 From 0c95cc78e56e9249df223dedd93e708d9f7698ab Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Fri, 6 Nov 2009 15:48:27 +0200 Subject: No ticket fixed dropped functionaliti by prev commit --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 101426ee28..b44420238f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2847,6 +2847,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Text chat is not available for this call. Your text chat has been disabled by a Group Moderator. Click here to instant message. + To -- cgit v1.2.3 From 4b804902229f610156920333dfb18f2f3fabf12b Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 6 Nov 2009 16:01:11 +0200 Subject: Fixed low bug EXT-2109 (Add moderator label if user is a moderator of a group chat(See old communication floater)) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b44420238f..c850dce141 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2848,6 +2848,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Your text chat has been disabled by a Group Moderator. Click here to instant message. To + (Moderator) -- cgit v1.2.3