Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2012-07-18 08:57:45 -03:00
parent 675d171104 03608103b8
commit 57ad7e62d2
2 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/fr/menu_inventory.xml
View File

@@ -68,6 +68,12 @@
<menu_item_call label="Éditer" name="Wearable Edit"/> <menu_item_call label="Éditer" name="Wearable Edit"/>
<menu_item_call label="Porter" name="Wearable Wear"/> <menu_item_call label="Porter" name="Wearable Wear"/>
<menu_item_call label="Enlever" name="Take Off"/> <menu_item_call label="Enlever" name="Take Off"/>
<menu_item_call label="Trouver l'origine" name="Find Original"/>
<menu_item_call label="Porter" name="Wearable And Object Wear"/>
<menu_item_call label="&#9650; Haut" name="Wearable Move Forward"/>
<menu_item_call label="&#9660; Bas" name="Wearable Move Back"/>
<menu_item_call label="Ajouter" name="Wearable Add"/>
<menu_item_call label="Enlever de l'ensemble" name="Remove From Outfit"/>
<menu_item_call label="--aucune option--" name="--no options--"/> <menu_item_call label="--aucune option--" name="--no options--"/>
<menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128"> <menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" /> <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />

134
indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
View File

@@ -5,7 +5,7 @@
D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran. D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
</text_editor> </text_editor>
<text name="WindowSizeLabel"> <text name="WindowSizeLabel">
Taille de la fen&#xEA;tre : Taille de la fen&#xEA;tre:
</text> </text>
<combo_box name="windowsize combo"> <combo_box name="windowsize combo">
<combo_item name="640x480"> <combo_item name="640x480">
@@ -25,48 +25,48 @@
</combo_item> </combo_item>
</combo_box> </combo_box>
<text name="DisplayResLabel" width="165"> <text name="DisplayResLabel" width="165">
R&#xE9;solution de l&apos;affichage : R&#xE9;solution de l'affichage:
</text> </text>
<text name="AspectRatioLabel1" tool_tip="largeur/hauteur"> <text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
Rapport hauteur/largeur : Rapport hauteur/largeur:
</text> </text>
<combo_box name="aspect_ratio" tool_tip="largeur/hauteur"> <combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
<combo_item length="1" name="4:3(StandardCRT)" type="string"> <combo_item name="4:3(StandardCRT)">
4:3 (Standard CRT) 4:3 (Standard CRT)
</combo_item> </combo_item>
<combo_item length="1" name="5:4(1280x1024LCD)" type="string"> <combo_item name="5:4(1280x1024LCD)">
5:4 (1280 x 1024 LCD) 5:4 (1280 x 1024 LCD)
</combo_item> </combo_item>
<combo_item name="8:5(Widescreen)"> <combo_item name="8:5(Widescreen)">
8:5 (&#xE9;cran large) 8:5 (&#xE9;cran large)
</combo_item> </combo_item>
<combo_item length="1" name="16:9(Widescreen)" type="string"> <combo_item name="16:9(Widescreen)">
16:9 (plein &#xE9;cran) 16:9 (plein &#xE9;cran)
</combo_item> </combo_item>
</combo_box> </combo_box>
<text length="1" name="text" type="string"> <text name="text">
R&#xE9;solution d&apos;affichage : R&#xE9;solution d'affichage:
</text> </text>
<text length="1" name="Fullscreen Aspect Ratio:" type="string"> <text name="Fullscreen Aspect Ratio:">
Format de plein &#xE9;cran : Format de plein &#xE9;cran:
</text> </text>
<text length="1" name="(width / height)" type="string"> <text name="(width / height)">
(largeur / hauteur) (largeur / hauteur)
</text> </text>
<text length="1" name="UI Size:" type="string"> <text name="UI Size:">
Taille de l&apos;IU : Taille de l'IU:
</text> </text>
<text length="1" name="(meters, lower is faster)" type="string"> <text name="(meters, lower is faster)">
(mètres, moins = plus rapide) (mètres, moins = plus rapide)
</text> </text>
<text length="1" name="text2" type="string"> <text name="text2">
Options d&apos;affichage : Options d'affichage:
</text> </text>
<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/> <check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/> <check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;pendante" name="ui_auto_scale"/> <check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;pendante" name="ui_auto_scale"/>
<check_box label="Montrer l&apos;avatar en vue subjective" name="avfp"/> <check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
<spinner label="Distance d&apos;affichage :" name="draw_distance"/> <spinner label="Distance d'affichage:" name="draw_distance"/>
<text name="HigherText"> <text name="HigherText">
Qualit&#xE9; et Qualit&#xE9; et
</text> </text>
@@ -94,68 +94,51 @@
<text name="QualityText2" visible="false"/> <text name="QualityText2" visible="false"/>
<check_box label="Personnaliser" left="395" name="CustomSettings"/> <check_box label="Personnaliser" left="395" name="CustomSettings"/>
<text name="ShadersText"> <text name="ShadersText">
Effets : Effets:
</text> </text>
<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/> <check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/> <check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/> <check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true" <check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
follows="left|top" font="SansSerifSmall" height="16" <check_box label="Occlusion ambiante" name="UseSSAO"/>
initial_value="true" label="D&#xE9;lissage" left_delta="0" <check_box label="Profondeur de champ" name="RenderDepthOfField"/>
mouse_opaque="true" name="RenderDeferred" radio_style="false" <check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
width="256" /> <text bottom_delta="-17" name="ReflectionDetailText" width="128">
<check_box bottom_delta="-17" control_name="RenderDepthOfField" initial_value="true" label="Profondeur de champ" left_delta="0" name="RenderDepthOfField"/> Reflets:
<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Illumination globale (Experimental)" left_delta="0"
mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
width="256" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
width="128">
Reflets :
</text> </text>
<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail" <combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16"> <combo_item name="0">
<combo_item type="string" length="1" name="0">
Aucun Aucun
</combo_item> </combo_item>
<combo_item type="string" length="1" name="1"> <combo_item name="1">
Terrain et arbres Terrain et arbres
</combo_item> </combo_item>
<combo_item type="string" length="1" name="2"> <combo_item name="2">
Objets Statiques Objets Statiques
</combo_item> </combo_item>
<combo_item type="string" length="1" name="3"> <combo_item name="3">
Avatars et objets Avatars et objets
</combo_item> </combo_item>
<combo_item type="string" length="1" name="4"> <combo_item name="4">
Tout Tout
</combo_item> </combo_item>
</combo_box> </combo_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bottom_delta="-17" name="ShadowDetailText" width="128">
bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top" Ombres att&#xE9;nu&#xE9;es:
font="SansSerifSmall" h_pad="0" halign="left" height="12" </text>
left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0" <combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
width="128"> <combo_item name="0">
Ombres att&#xE9;nu&#xE9;es : D&#xE9;sactiv&#xE9;
</text>
<combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
<combo_item type="string" length="1" name="0" value="0">
D&#xE9;sactiv&#xE9;
</combo_item> </combo_item>
<combo_item type="string" length="1" name="1" value="1"> <combo_item name="1">
Ombres solaires Ombres solaires
</combo_item> </combo_item>
<combo_item type="string" length="1" name="2" value="2"> <combo_item name="2">
Ombres des projecteurs Ombres des projecteurs
</combo_item> </combo_item>
</combo_box> </combo_box>
<text name="AvatarRenderingText"> <text name="AvatarRenderingText">
Rendu de l&apos;avatar : Rendu de l'avatar:
</text> </text>
<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/> <check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/> <check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
@@ -166,18 +149,18 @@
<text name="DrawDistanceMeterText2"> <text name="DrawDistanceMeterText2">
m m
</text> </text>
<slider label="Limite d&apos;affichage :" name="DrawDistance"/> <slider label="Limite d'affichage:" name="DrawDistance"/>
<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/> <slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/> <slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
<text name="MeshDetailText"> <text name="MeshDetailText">
D&#xE9;tails des rendus : D&#xE9;tails des rendus:
</text> </text>
<slider label=" Objets :" name="ObjectMeshDetail"/> <slider label=" Objets:" name="ObjectMeshDetail"/>
<slider label=" Flexiprims :" name="FlexibleMeshDetail"/> <slider label=" Flexiprims:" name="FlexibleMeshDetail"/>
<slider label=" Arbres :" name="TreeMeshDetail"/> <slider label=" Arbres:" name="TreeMeshDetail"/>
<slider label=" Avatars :" name="AvatarMeshDetail"/> <slider label=" Avatars:" name="AvatarMeshDetail"/>
<slider label=" Relief :" name="TerrainMeshDetail"/> <slider label=" Relief:" name="TerrainMeshDetail"/>
<slider label=" Ciel :" name="SkyMeshDetail"/> <slider label=" Ciel:" name="SkyMeshDetail"/>
<text name="PostProcessText"> <text name="PostProcessText">
Faible Faible
</text> </text>
@@ -200,7 +183,7 @@
Faible Faible
</text> </text>
<text name="LightingDetailText"> <text name="LightingDetailText">
Sources lumineuses : Sources lumineuses:
</text> </text>
<radio_group name="LightingDetailRadio"> <radio_group name="LightingDetailRadio">
<radio_item name="SunMoon"> <radio_item name="SunMoon">
@@ -211,7 +194,7 @@
</radio_item> </radio_item>
</radio_group> </radio_group>
<text left="380" name="TerrainDetailText"> <text left="380" name="TerrainDetailText">
Rendu du terrain : Rendu du terrain:
</text> </text>
<radio_group name="TerrainDetailRadio"> <radio_group name="TerrainDetailRadio">
<radio_item name="0"> <radio_item name="0">
@@ -221,8 +204,9 @@
Elev&#xE9; Elev&#xE9;
</radio_item> </radio_item>
</radio_group> </radio_group>
<button label="Param&#xE8;tres recommand&#xE9;s" name="Defaults"/> <button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
<button label="Configuration du matériel" label_selected="Configuration du mat&#xE9;riel" name="GraphicsHardwareButton"/> <!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
<text name="resolution_format"> <text name="resolution_format">
[RES_X] x [RES_Y] [RES_X] x [RES_Y]
</text> </text>