From 423cba155adc5ed68a6221001d779b3732cebd27 Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Mon, 28 Sep 2009 18:46:51 +0000
Subject: [PATCH] DEV-39252 fix duplicate name= elements in the EN xui. This
breaks localization.
---
indra/newview/skins/default/xui/en/floater_about_land.xml | 2 +-
indra/newview/skins/default/xui/en/floater_bulk_perms.xml | 4 ++--
indra/newview/skins/default/xui/en/menu_login.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index f11391c5e00..5a285cdcb0c 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1678,7 +1678,7 @@ Only large parcels can be listed in search.
height="16"
layout="topleft"
left="10"
- name="at URL:"
+ name="CurrentURL:"
top="49"
width="65">
Current URL:
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 897e5da4e8e..ef6af287866 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -200,7 +200,7 @@
layout="topleft"
height="16"
left="10"
- name="Group:"
+ name="GroupLabel"
width="88">
Group:
</text>
@@ -218,7 +218,7 @@
follows="left|top"
height="16"
layout="topleft"
- name="NextOwnerLabel"
+ name="AnyoneLabel"
left="100"
top="110"
width="88">
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 7a0a78bb50f..d3a2b2c66b3 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -234,7 +234,7 @@
<menu_item_call
label="Show Critical Message"
layout="topleft"
- name="TOS">
+ name="Critical">
<menu_item_call.on_click
function="ShowFloater"
parameter="message_critical" />
--
GitLab