From f22f829b8642d59cb5953eb33f5297a1da90fadd Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 26 Oct 2009 17:14:32 +0200 Subject: Fixed normal bugs EXT-1628 ([BSI] - New IM system isn't sending typing notifications anymore) and EXT-1629 ([BSI] - add hint in IM window when Resident is typing) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 4c19b22ac5..7efda2b882 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -264,10 +264,6 @@ Track your camera Control your camera - - -- Instant message logging enabled -- - (Unnamed) - PG Mature @@ -2884,7 +2880,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Failed to start viewer - + + -- Instant message logging enabled -- + [NAME] is typing... + (Unnamed) + Joining Voice Chat... -- cgit v1.2.3 From 9a196cdda8fa62b90f6f390b21986712d198f03e Mon Sep 17 00:00:00 2001 From: Ramzi Ramey Date: Tue, 27 Oct 2009 20:59:48 +0000 Subject: DEV-33321 L10N: there are typos in the original fix to DEV-33321, also added comments to help translators. - TEXT CHANGE ONLY, no code changed. --- indra/newview/skins/default/xui/en/strings.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 a57c9cd97f..bdcea05c73 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2021,15 +2021,14 @@ this texture in your inventory teen + error - all estates -owned by [OWNER] + all estates owned by [OWNER] - all estates you owned + all estates that you own - all estates that -you managed for [OWNER] + all estates that you manage for [OWNER] Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS]) Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS]) -- cgit v1.2.3 From 33af464c441717db855651b70acc4b3636c649a0 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Wed, 28 Oct 2009 14:21:36 +0200 Subject: Implemented major sub-task EXT-1904 (New IM floater should handle Session Update) --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 7efda2b882..7e9585d4bd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2884,6 +2884,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. -- Instant message logging enabled -- [NAME] is typing... (Unnamed) + (Moderated: Voices off by default) + Joining Voice Chat... -- cgit v1.2.3 From a999e50a8ebb3ab641490294d67dbbd6eb0c8898 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Wed, 28 Oct 2009 16:14:52 +0200 Subject: Implemented major sub-task EXT-1912 ( Add handling restrictions of PSTN P2P calls in new IM Floaters ) --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 7e9585d4bd..8609d07be9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2885,6 +2885,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. [NAME] is typing... (Unnamed) (Moderated: Voices off by default) + Text chat is not available for this call. -- cgit v1.2.3 From a0e766da94d786d306a86667a27728524ca6eedb Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 28 Oct 2009 14:56:31 -0700 Subject: EXT-1697 tab label type not to spec EXT-1870 Remove default tooltips from tab_container widget EXT-1699 right and left tab edges don't align with edges of tab content area EXT-1869 tabs flash when your cursor passes over data fields reviewed by richard --- indra/newview/skins/default/xui/en/strings.xml | 4 +--- 1 file changed, 1 insertion(+), 3 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 a57c9cd97f..37379923d8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,9 +61,7 @@ Group Scripts No Scripts Land: - Only a single item can be dragged here - Alt+← for previous tab - Alt+→ for next tab + Only a single item can be dragged here Click to view this web page -- cgit v1.2.3