diff options
| author | Ramzi Ramey <ramzi@lindenlab.com> | 2009-07-21 23:47:37 +0000 | 
|---|---|---|
| committer | Ramzi Ramey <ramzi@lindenlab.com> | 2009-07-21 23:47:37 +0000 | 
| commit | 80deb2a5358e5e912455a781b0d4aa5f29080e30 (patch) | |
| tree | 838883f0fe3ae017dbea0c2ecf159c9cadca6916 | |
| parent | 9ad6434bb7a3fdced7d9095a4c788a22b7bf028a (diff) | |
I18N fix: more nodes in XUI have duplicate name= parameters. This breaks localization.
5 files changed, 15 insertions, 15 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 55ae3ee2b0..b57fd00210 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -105,25 +105,25 @@           filename="panel_preferences_advanced.xml"           label="Advanced"           layout="topleft" -         name="input" /> +         name="advanced1" />          <panel  		 class="panel_preference"           filename="panel_preferences_advanced2.xml"           label="Move, not to Advanced"           layout="topleft" -         name="input" /> +         name="advanced2" />          <panel  		 class="panel_preference"           filename="panel_preferences_advanced3.xml"           label="Not in specs"           layout="topleft" -         name="input" /> +         name="advanced3" />          <panel  		 class="panel_preference"           filename="panel_preferences_advanced4.xml"           label="Storage/Kill"           layout="topleft" -         name="input" /> +         name="advanced4" />          <!--panel  		 class="panel_preference"           filename="panel_preferences_network.xml" diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index d327ddbb30..06422d6a26 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -108,7 +108,7 @@       initial_value="second"       layout="topleft"       left_delta="0" -     name="text_entry_combo" +     name="text_entry_combo2"       top_pad="2"       width="150">          <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index abbc63a6d4..5369a44cbf 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1131,7 +1131,7 @@              <text                 type="string"                 follows="left|top" -               name="Next owner can:" +               name="Anyone can:"                 width="250"                 top_pad="7"                 left="10"> diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 7ff53b8491..394c8e6a77 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -200,7 +200,7 @@       height="16"       layout="topleft"       left_pad="5" -     name="your_contribution_max_value" +     name="your_contribution_units"       top_delta="2">           sq. meters      </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 1d32229c9b..89d96b015f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -61,7 +61,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box1"       top_delta="5"       width="95">          Me @@ -111,7 +111,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box3"       top_delta="5"       width="95">          IM @@ -137,7 +137,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box4"       top_delta="5"       width="95">          System @@ -162,7 +162,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box5"       top_delta="5"       width="95">          Errors @@ -187,7 +187,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box6"       top_delta="5"       width="95">          Objects @@ -212,7 +212,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box7"       top_delta="5"       width="95">          Owner @@ -237,7 +237,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box8"       top_delta="5"       width="95">          Bubble @@ -262,7 +262,7 @@       layout="topleft"       left_pad="5"       mouse_opaque="false" -     name="text_box2" +     name="text_box9"       top_delta="5"       width="95">          URLs | 
