livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automated merge

meow-7.2.2
Loren Shih 2010-03-31 12:06:22 -04:00
parent e5443c4e76 5038f1fb61
commit fc8c4ea485
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -4609,7 +4609,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>MediaShowOutsideParcel</key>
<map>

2
indra/newview/skins/default/xui/de/panel_status_bar.xml
View File

@ -22,7 +22,7 @@
[AMT] L$
</panel.string>
<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
<button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
<button label=" " name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
24:00 H PST
</text>

14
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -2842,7 +2842,7 @@ even though the user gets a free copy.
left_delta="0"
name="button about land"
top_pad="4"
width="112" />
width="125" />
<check_box
control_name="ShowParcelOwners"
height="19"
@ -2863,7 +2863,7 @@ even though the user gets a free copy.
left="20"
name="label_parcel_modify"
top="152"
width="150">
width="240">
Modify Parcel
</text>
<button
@ -2875,7 +2875,7 @@ even though the user gets a free copy.
left="30"
name="button subdivide land"
top="172"
width="112" />
width="125" />
<button
follows="left|top"
height="23"
@ -2885,7 +2885,7 @@ even though the user gets a free copy.
left_delta="0"
name="button join land"
top_pad="4"
width="112" />
width="125" />
<text
type="string"
length="1"
@ -2896,7 +2896,7 @@ even though the user gets a free copy.
left="20"
name="label_parcel_trans"
top="256"
width="150">
width="240">
Land Transactions
</text>
<button
@ -2908,7 +2908,7 @@ even though the user gets a free copy.
left="30"
name="button buy land"
top="276"
width="112" />
width="125" />
<button
follows="left|top"
height="23"
@ -2918,6 +2918,6 @@ even though the user gets a free copy.
left_delta="0"
name="button abandon land"
top_pad="4"
width="112" />
width="125" />
</panel>
</floater>

12
indra/newview/skins/default/xui/es/floater_tools.xml
View File

@ -399,7 +399,7 @@ máximo" name="checkbox fullbright"/>
<text name="tex gen">
Detallado
</text>
<combo_box name="combobox texgen" width="86">
<combo_box name="combobox texgen">
<combo_box.item label="Por defecto" name="Default"/>
<combo_box.item label="Plano" name="Planar"/>
</combo_box>
@ -442,9 +442,9 @@ máximo" name="checkbox fullbright"/>
<check_box label="Voltear" name="checkbox flip s"/>
<spinner label="Vertical (V)" name="TexScaleV"/>
<check_box label="Voltear" name="checkbox flip t"/>
<spinner label="Rotación" left="118" name="TexRot" width="62"/>
<spinner label="Repeticiones / Metro" left="118" name="rptctrl" width="62"/>
<button label="Aplicar" label_selected="Aplicar" left_delta="72" name="button apply"/>
<spinner label="Rotación" name="TexRot"/>
<spinner label="Repeticiones / Metro" name="rptctrl"/>
<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
<text name="tex offset">
Desplazar
</text>
@ -487,8 +487,8 @@ Gris = Público"/>
<text name="label_parcel_modify">
Modificar la parcela
</text>
<button label="Dividir" label_selected="Dividir" name="button subdivide land" width="140"/>
<button label="Inscribirse" label_selected="Inscribirse" name="button join land" width="140"/>
<button label="Dividir" label_selected="Dividir" name="button subdivide land"/>
<button label="Inscribirse" label_selected="Inscribirse" name="button join land"/>
<text name="label_parcel_trans">
Transacciones de terreno
</text>