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

sync with viewer-development

meow-7.2.2
eli 2011-08-09 16:16:39 -07:00
parent 6cf42e25d7
commit 0e2b9f2144
14 changed files with 107 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/da/strings.xml
View File

@ -1835,7 +1835,7 @@ Prøv venligst om lidt igen.
<string name="RegionNoCovenantOtherOwner">
Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab. Kontakt venligst estate ejeren for detaljer om salg.
</string>
<string name="covenant_last_modified" value="Sidst rettet:"/>
<string name="covenant_last_modified" value="Sidst rettet: "/>
<string name="none_text" value=" (ingen) "/>
<string name="never_text" value=" (aldrig) "/>
<string name="GroupOwned">

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

@ -4,7 +4,7 @@
Wasser-Voreinstellung löschen
</string>
<string name="title_sky">
Hilmmel-Voreinstellung löschen
Himmel-Voreinstellung löschen
</string>
<string name="title_day_cycle">
Tageszyklus löschen

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

@ -1882,7 +1882,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="RegionNoCovenantOtherOwner">
Für diesen Grundbesitz liegt kein Vertrag vor. Das Land auf diesem Grundbesitz wird vom Grundbesitzer und nicht von Linden Lab verkauft. Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundbesitzer in Verbindung.
</string>
<string name="covenant_last_modified" value="Zuletzt geändert:"/>
<string name="covenant_last_modified" value="Zuletzt geändert: "/>
<string name="none_text" value=" (keiner) "/>
<string name="never_text" value=" (nie) "/>
<string name="GroupOwned">

2
indra/newview/skins/default/xui/en/floater_build_options.xml
View File

@ -37,7 +37,7 @@
layout="topleft"
left="10"
tool_tip="Grid opacity"
name="grid_opacity_label"
name="grid_mode_label"
top_pad="30"
width="123">
Mode

16
indra/newview/skins/default/xui/en/floater_buy_land.xml
View File

@ -208,7 +208,7 @@ supports [AMOUNT2] objects
name="region_name_text"
top_delta="0"
use_ellipses="true"
width="155">
width="150">
(unknown)
</text>
<icon
@ -240,7 +240,8 @@ supports [AMOUNT2] objects
left_delta="125"
name="region_type_text"
top_delta="0"
width="175">
use_ellipses="true"
width="170">
(unknown)
</text>
<text
@ -265,7 +266,8 @@ supports [AMOUNT2] objects
left_delta="125"
name="estate_name_text"
top_delta="0"
width="175">
use_ellipses="true"
width="170">
(unknown)
</text>
<text
@ -290,7 +292,8 @@ supports [AMOUNT2] objects
left_delta="125"
name="estate_owner_text"
top_delta="0"
width="175">
use_ellipses="true"
width="170">
(unknown)
</text>
<text
@ -348,11 +351,10 @@ supports [AMOUNT2] objects
follows="left|top"
height="12"
layout="topleft"
left="500"
name="covenant_timestamp_text"
right="725"
right="-15"
top="175"
width="275"
width="281"
word_wrap="true" />
<text_editor
type="string"

89
indra/newview/skins/default/xui/en/floater_model_wizard.xml
View File

@ -108,7 +108,7 @@
height="22"
top_pad="15"
width="505"
name="header_panel"
name="choose_file_header_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
@ -117,7 +117,7 @@
width="200"
left="10"
top="3"
name="header_text"
name="choose_file_header_text"
text_color="White"
height="10"
font="SansSerifBig"
@ -130,7 +130,7 @@
left="15"
height="310"
width="505"
name="content"
name="choose_file_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
@ -163,7 +163,7 @@
height="10"
layout="topleft"
left_delta="0"
name="Cache location"
name="choose_model_file_label"
width="320">
Choose model file to upload
</text>
@ -199,7 +199,7 @@
height="10"
layout="topleft"
left="10"
name="Cache location"
name="support_collada_text"
width="320">
Second Life supports COLLADA (.dae) files
</text>
@ -221,6 +221,7 @@
width="130"
height="14"
left_delta="0"
name="dimensions_label"
text_color="White"
word_wrap="true">
Dimensions (meters):
@ -287,7 +288,7 @@
<panel
height="22"
top_pad="15"
name="header_panel"
name="optimize_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -296,7 +297,7 @@
<text
width="200"
left="10"
name="header_text"
name="optimize_header_text"
top="3"
text_color="White"
height="10"
@ -311,7 +312,7 @@
height="20"
font="SansSerifSmall"
layout="topleft"
name="description"
name="optimize_hint"
word_wrap="true"
left_delta="5">
We have optimized the model for performance. Adjust it further if you wish.
@ -322,11 +323,12 @@
left="15"
height="270"
width="505"
name="content"
name="optimize_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text
name="generating_lod_label"
top="20"
width="300"
height="12"
@ -401,12 +403,12 @@
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
<text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
<text name="optimize_performance_text" top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
<text name="optimize_faster_rendering_text" top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
Less detail
Lower prim weight</text>
<text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
<text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
<text name="optimize_accuracy_text" top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
<text name="optimize_slower_rendering_text" top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
More detail
Higher prim weight</text>
@ -424,21 +426,24 @@ Higher prim weight</text>
top="130"
width="290" />
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark1"
top_pad="0"
width="5"
left_delta="6"
height="4">'
</text>
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark2"
top_delta="0"
width="5"
left_delta="137"
height="4">'
</text>
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark3"
top_delta="0"
width="5"
left_delta="137"
@ -454,7 +459,7 @@ Higher prim weight</text>
top_pad="15"
width="150">
</button>
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="geometry_preview_label">
Geometry preview
</text>
<panel
@ -471,16 +476,16 @@ Higher prim weight</text>
</panel>
<combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22"
name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render">
<combo_item name="high">
<combo_item name="preview_lod_high">
High detail
</combo_item>
<combo_item name="medium">
<combo_item name="preview_lod_medium">
Medium detail
</combo_item>
<combo_item name="low">
<combo_item name="preview_lod_low">
Low detail
</combo_item>
<combo_item name="lowest">
<combo_item name="preview_lod_lowest">
Lowest detail
</combo_item>
</combo_box>
@ -497,7 +502,7 @@ Higher prim weight</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="physics_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -506,7 +511,7 @@ Higher prim weight</text>
<text
width="200"
left="10"
name="header_text"
name="physics_header_text"
top="3"
height="10"
font="SansSerifBig"
@ -521,7 +526,7 @@ Higher prim weight</text>
height="50"
font="SansSerifSmall"
layout="topleft"
name="description"
name="physics_hint"
word_wrap="true"
left_delta="5">
We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
@ -531,16 +536,16 @@ Higher prim weight</text>
left="15"
height="270"
width="505"
name="content"
name="physics_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
<text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
<text name="physics_performance_text" top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
<text name="physics_faster_rendering_text" top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
Less detail
Lower prim weight</text>
<text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
<text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
<text name="physics_accuracy_text" top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
<text name="physics_slower_dendering_text" top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
More detail
Higher prim weight</text>
@ -558,15 +563,15 @@ Higher prim weight</text>
show_text="false"
top="25"
width="22" />
<text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
<text name="physics_example_1" top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
Moving objects
Flying objects
Vehicles</text>
<text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
<text name="physics_example_2" top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
Small static objects
Less detailed objects
Simple furniture</text>
<text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
<text name="physics_example_3" top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
Static objects
Detailed objects
Buildings</text>
@ -592,7 +597,7 @@ Buildings</text>
visible="false"
width="150">
</button>
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="physics_preview_label">
Physics preview
</text>
<panel
@ -609,16 +614,16 @@ Buildings</text>
</panel>
<combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22"
name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render">
<combo_item name="high">
<combo_item name="preview_lod2_high">
High detail
</combo_item>
<combo_item name="medium">
<combo_item name="preview_lod2_medium">
Medium detail
</combo_item>
<combo_item name="low">
<combo_item name="preview_lod2_low">
Low detail
</combo_item>
<combo_item name="lowest">
<combo_item name="preview_lod2_lowest">
Lowest detail
</combo_item>
</combo_box>
@ -635,7 +640,7 @@ Buildings</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="review_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -644,7 +649,7 @@ Buildings</text>
<text
width="200"
left="10"
name="header_text"
name="review_header_text"
text_color="White"
top="3"
height="10"
@ -658,7 +663,7 @@ Buildings</text>
left="15"
height="310"
width="505"
name="content"
name="review_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
@ -706,7 +711,7 @@ Buildings</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="upload_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -715,7 +720,7 @@ Buildings</text>
<text
width="200"
left="10"
name="header_text"
name="upload_header_text"
top="3"
text_color="White"
height="10"

1
indra/newview/skins/default/xui/en/floater_openobject.xml
View File

@ -22,6 +22,7 @@
layout="topleft"
left="10"
name="object_name"
parse_urls="false"
top="20"
width="284">
[DESC]:

2
indra/newview/skins/default/xui/en/floater_search.xml
View File

@ -14,5 +14,5 @@
title=""
initial_mime_type="text/html"
width="780"
tab_stop="true"
filename="floater_web_content.xml"/>
tab_stop="true"

40
indra/newview/skins/default/xui/en/floater_voice_effect.xml
View File

@ -25,6 +25,46 @@
<string name="new_voice_effect">
(New!)
</string>
<!-- effect names begin -->
<string name="effect_Arena">Arena</string>
<string name="effect_Beast">Beast</string>
<string name="effect_Buff">Buff</string>
<string name="effect_Buzz">Buzz</string>
<string name="effect_Camille">Camille</string>
<string name="effect_Creepy">Creepy</string>
<string name="effect_CreepyBot">CreepyBot</string>
<string name="effect_Cyber">Cyber</string>
<string name="effect_DeepBot">DeepBot</string>
<string name="effect_Demon">Demon</string>
<string name="effect_Flirty">Flirty</string>
<string name="effect_Foxy">Foxy</string>
<string name="effect_Halloween_2010_Bonus">Halloween_2010_Bonus</string>
<string name="effect_Helium">Helium</string>
<string name="effect_Husky">Husky</string>
<string name="effect_Intercom">Intercom</string>
<string name="effect_Macho">Macho</string>
<string name="effect_Micro">Micro</string>
<string name="effect_Mini">Mini</string>
<string name="effect_Nano">Nano</string>
<string name="effect_Nightmare">Nightmare</string>
<string name="effect_PopBot">PopBot</string>
<string name="effect_Rachel">Rachel</string>
<string name="effect_Radio">Radio</string>
<string name="effect_Robot">Robot</string>
<string name="effect_Roxanne">Roxanne</string>
<string name="effect_Sabrina">Sabrina</string>
<string name="effect_Samantha">Samantha</string>
<string name="effect_Sexy">Sexy</string>
<string name="effect_Shorty">Shorty</string>
<string name="effect_Sneaky">Sneaky</string>
<string name="effect_Stallion">Stallion</string>
<string name="effect_Sultry">Sultry</string>
<string name="effect_Thunder">Thunder</string>
<string name="effect_Vixen">Vixen</string>
<string name="effect_WhinyBot">WhinyBot</string>
<!-- effect names end -->
<text
height="16"
word_wrap="true"

2
indra/newview/skins/default/xui/it/strings.xml
View File

@ -1855,7 +1855,7 @@ Prova ad accedere nuovamente tra un minuto.
<string name="RegionNoCovenantOtherOwner">
Non esiste alcun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita.
</string>
<string name="covenant_last_modified" value="Ultima modifica:"/>
<string name="covenant_last_modified" value="Ultima modifica: "/>
<string name="none_text" value="(nessuno)"/>
<string name="never_text" value="(mai)"/>
<string name="GroupOwned">

4
indra/newview/skins/default/xui/nl/strings.xml
View File

@ -1300,9 +1300,7 @@
<string name="RegionNoCovenantOtherOwner">
There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.
</string>
<string name="covenant_last_modified">
Laatst bewerkt:
</string>
<string name="covenant_last_modified" value="Laatst bewerkt: " />
<string name="none_text" value="(none)"/>
<string name="never_text" value="(never)"/>
<string name="GroupOwned">

2
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -1695,7 +1695,7 @@
<string name="RegionNoCovenantOtherOwner">
Brak umowy dla tego majątku. Każda posiadłość w tym majątku została sprzedana przez właściciela majątku nie Linden Lab. Skontaktuj się z właścicielem majątku w celu uzuskania szczegółów sprzedaży.
</string>
<string name="covenant_last_modified" value="Ostatnio modyfikowano:"/>
<string name="covenant_last_modified" value="Ostatnio modyfikowano: "/>
<string name="none_text" value=" (żadne) "/>
<string name="never_text" value=" (nigdy) "/>
<string name="GroupOwned">

2
indra/newview/skins/default/xui/pt/strings.xml
View File

@ -1810,7 +1810,7 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
<string name="RegionNoCovenantOtherOwner">
Não foi definido um contrato para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda.
</string>
<string name="covenant_last_modified" value="Última modificação:"/>
<string name="covenant_last_modified" value="Última modificação: "/>
<string name="none_text" value="(nenhum)"/>
<string name="never_text" value="(nunca)"/>
<string name="GroupOwned">

2
indra/newview/skins/default/xui/zh/strings.xml
View File

@ -1728,7 +1728,7 @@
<string name="RegionNoCovenantOtherOwner">
There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.
</string>
<string name="covenant_last_modified" value="Last Modified:"/>
<string name="covenant_last_modified" value="Last Modified: "/>
<string name="none_text" value="（無）"/>
<string name="never_text" value="（絕不）"/>
<string name="GroupOwned">