From 5b29bd3660852cdca3416ba779fbfdc032f8f222 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 2 May 2011 17:12:16 -0700 Subject: sync up with viewer-development --- .../skins/default/xui/en/widgets/avatar_icon.xml | 1 + .../skins/default/xui/en/widgets/scroll_bar.xml | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml index a1e32e44de..4d69dda7eb 100644 --- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml @@ -1,6 +1,7 @@ diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index 830ea12e41..e6d4bff8b5 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml @@ -6,20 +6,24 @@ track_color="ScrollbarTrackColor" thumb_color="ScrollbarThumbColor" thickness="15"> - - - - + -- cgit v1.2.3 From 6431f7fb287d357f9800aac7ce5496c7a7cd063f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 2 May 2011 17:14:53 -0700 Subject: WIP VWR-25074 add missing string in English, pending actual Danish translation --- indra/newview/skins/default/xui/da/notifications.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index a3c4897ee1..376538872f 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -748,6 +748,7 @@ Prøv venligst igen senere. [OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME]. + Offer a teleport to your location with the following message?
Mød mig i [REGION] -- cgit v1.2.3 From 76221ab9b3d5e4a185dfdfeb39719724739566ab Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 3 May 2011 11:55:21 -0700 Subject: FIX VWR-25074 add missing Danish translation --- indra/newview/skins/default/xui/da/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 376538872f..30b54d3eb2 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -748,7 +748,7 @@ Prøv venligst igen senere. [OLD_NAME] ([SLID]) er nu kendt som [NEW_NAME]. - Offer a teleport to your location with the following message? + Tilbyd en teleport til din position med følgende besked? Mød mig i [REGION] -- cgit v1.2.3 From af6a5b1f40ff0f0a8f0d10f609fa27da7e40959d Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 3 May 2011 16:37:12 -0700 Subject: FIX VWR-22337 translation (in utf-8) for "loading terms of service" string --- indra/newview/skins/default/xui/da/floater_tos.xml | 2 +- indra/newview/skins/default/xui/de/floater_tos.xml | 2 +- indra/newview/skins/default/xui/es/floater_tos.xml | 2 +- indra/newview/skins/default/xui/fr/floater_tos.xml | 2 +- indra/newview/skins/default/xui/pl/floater_tos.xml | 2 +- indra/newview/skins/default/xui/pt/floater_tos.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index 760f60c996..af9ee0bd06 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -4,7 +4,7 @@ http://secondlife.com/app/tos/ - data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E + data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Henter %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E