Skip to content

Commit 8fabb3e

Browse files
authored
Merge pull request #259 from AlchemyViewer/rye/fix-translation
Fix various xui files preventing proper translation support
2 parents d95a633 + 21416fd commit 8fabb3e

5 files changed

Lines changed: 27 additions & 15 deletions

File tree

indra/newview/skins/default/xui/en/control_table_contents_camera.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,39 +175,39 @@
175175
tool_tip="Camera spin around clockwise"
176176
value="Clockwise" />
177177
</rows>
178-
<rows
178+
<rows
179179
name="roll_left"
180180
value="roll_left">
181-
<columns
181+
<columns
182182
column="lst_action"
183183
font="SansSerif"
184184
halign="left"
185185
name="lst_action"
186186
tool_tip="Camera roll left"
187187
value="Roll Left" />
188-
</rows>
189-
<rows
188+
</rows>
189+
<rows
190190
name="roll_right"
191191
value="roll_right">
192-
<columns
192+
<columns
193193
column="lst_action"
194194
font="SansSerif"
195195
halign="left"
196196
name="lst_action"
197197
tool_tip="Camera roll right"
198198
value="Roll Right" />
199-
</rows>
200-
<rows
199+
</rows>
200+
<rows
201201
name="roll_reset"
202202
value="roll_reset">
203-
<columns
203+
<columns
204204
column="lst_action"
205205
font="SansSerif"
206206
halign="left"
207207
name="lst_action"
208208
tool_tip="Reset camera roll"
209209
value="Roll Reset" />
210-
</rows>
210+
</rows>
211211
<rows
212212
name="move_forward_sitting"
213213
value="move_forward_sitting">

indra/newview/skins/default/xui/en/floater_adjust_environment.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@
252252
height="10"
253253
layout="topleft"
254254
left_delta="-5"
255+
name="probe_ambiance_label"
256+
tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
255257
top_pad="15"
256258
width="180">Reflection Probe Ambiance:</text>
257259
<slider decimal_digits="2"

indra/newview/skins/default/xui/en/panel_region_environment.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<string name="str_empty">(empty)</string>
2121
<string name="str_region_env">(region environment)</string>
2222

23-
<layout_stack
23+
<layout_stack
24+
name="ls_main"
2425
width="530"
2526
height="400"
2627
follows="all"
@@ -76,6 +77,7 @@
7677
visible="true">
7778
<layout_stack
7879
follows="all"
80+
name="ls_environment_config"
7981
layout="topleft"
8082
animate="false"
8183
orientation="horizontal">
@@ -87,6 +89,7 @@
8789
visible="true">
8890
<layout_stack
8991
follows="all"
92+
name="ls_environment_current"
9093
layout="topleft"
9194
animate="false"
9295
orientation="vertical">
@@ -97,6 +100,7 @@
97100
bevel_style="in"
98101
name="pnl_environment_current">
99102
<text follows="top|left"
103+
name="select_environment_label"
100104
font="SansSerif"
101105
halign="left"
102106
text_color="white"
@@ -146,13 +150,15 @@
146150
name="pnl_environment_length">
147151
<text
148152
font="SansSerif"
153+
name="day_settings_label"
149154
follows="top|left|right"
150155
halign="left"
151156
text_color="white"
152157
left="5"
153158
top="2">Day Settings</text>
154159
<text
155160
type="string"
161+
name="day_length_label"
156162
length="1"
157163
follows="left|top"
158164
height="12"
@@ -179,6 +185,7 @@
179185
max_val="168" />
180186
<text
181187
type="string"
188+
name="day_offset_label"
182189
length="1"
183190
follows="left|top"
184191
height="12"
@@ -205,6 +212,7 @@
205212
max_val="12" />
206213
<text
207214
type="string"
215+
name="apparent_time_of_day_label"
208216
length="1"
209217
follows="left|top"
210218
height="12"
@@ -381,6 +389,7 @@
381389
</panel>
382390
<text follows="top|left"
383391
font="SansSerif"
392+
name="sky_altitudes_label"
384393
halign="left"
385394
text_color="white"
386395
left="5"

indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,10 @@
318318
layout="topleft"
319319
left_delta="-5"
320320
top_delta="25"
321-
tool_tip="Irradiance control. When not zero, enables HDR lighting model."
321+
name="probe_ambiance_label"
322+
tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
322323
width="200">
323-
Reflection Probe Ambiance (HDR):
324+
Reflection Probe Ambiance:
324325
</text>
325326
<slider
326327
decimal_digits="2"

indra/newview/skins/default/xui/en/panel_teleport_history.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
height="150"
5858
layout="topleft"
5959
left="0"
60-
name="2_days_ago"
60+
name="2_days_ago_items"
6161
top="0"
6262
width="307">
6363
</flat_list_view>
@@ -71,7 +71,7 @@
7171
height="150"
7272
layout="topleft"
7373
left="0"
74-
name="3_days_ago"
74+
name="3_days_ago_items"
7575
top="0"
7676
width="307">
7777
</flat_list_view>
@@ -85,7 +85,7 @@
8585
height="150"
8686
layout="topleft"
8787
left="0"
88-
name="4_days_ago"
88+
name="4_days_ago_items"
8989
top="0"
9090
width="307">
9191
</flat_list_view>

0 commit comments

Comments
 (0)