diff options
| author | Ramzi Ramey <ramzi@lindenlab.com> | 2009-07-16 19:45:34 +0000 |
|---|---|---|
| committer | Ramzi Ramey <ramzi@lindenlab.com> | 2009-07-16 19:45:34 +0000 |
| commit | e0179932d1545afe13de8202ffa5175a928abe88 (patch) | |
| tree | a9a09245113bf16ee1ed0fb6dd4cfe8fe798233d | |
| parent | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (diff) | |
I18N fix: some nodes in XUI have duplicate name= parameters. This breaks localization.
4 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 79833ea20b..a017e7398e 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -112,7 +112,7 @@ height="20" layout="topleft" left="10" - name="description_label" + name="location_label" text_color="white" v_pad="15" valign="bottom"> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index a9585717ed..47d9088a62 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -79,7 +79,7 @@ height="20" layout="topleft" left="10" - name="pick_title" + name="pick_title2" text_color="white" top_pad="10" width="250" @@ -95,7 +95,7 @@ height="15" layout="topleft" left="10" - name="status_message" + name="status_message2" text_color="0.1 0.1 0.1 1" top_pad="10" width="300"> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 576654b860..e43d8d5c00 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -111,7 +111,7 @@ height="20" layout="topleft" left="10" - name="description_label" + name="location_label" text_color="white" top_pad="20" valign="bottom"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e8027b1b4b..e54ef88f34 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -772,7 +772,6 @@ If you continue to receive this message, contact customer support. <string name="LTimeHour">hour,datetime,local</string> <string name="LTimeMin">min,datetime,local</string> <string name="LTimeYear">year,datetime,local</string> - <string name="LTimeSec">second,datetime,local</string> <string name="UTCTimeWeek">weekday,datetime,utc</string> <string name="UTCTimeDay">day,datetime,utc</string> |