diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
| commit | 4cf42435733a111610a13620c56728b1b659b1e9 (patch) | |
| tree | 5ac5ac10070448dcfdf38bf36e23ea9b6b766f95 /indra/newview/skins | |
| parent | dcb6b5489d2c3cfdb13d5862f8cb29fee06745a7 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
Diffstat (limited to 'indra/newview/skins')
374 files changed, 12468 insertions, 4070 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Settings.png b/indra/newview/skins/default/textures/icons/Inv_Settings.png Binary files differnew file mode 100644 index 0000000000..c43ba349c4 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Settings.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png Binary files differnew file mode 100644 index 0000000000..258ade1327 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsDay.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png Binary files differnew file mode 100644 index 0000000000..77858b23c3 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png Binary files differnew file mode 100644 index 0000000000..46fb58c3f2 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index bd42bd1b07..1481d19cad 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -143,6 +143,7 @@ with the same filename but different name <texture name="Command_MiniCart_Icon" file_name="toolbar_icons/mini_cart.png" preload="true" /> <texture name="Command_MiniMap_Icon" file_name="toolbar_icons/mini_map.png" preload="true" /> <texture name="Command_Move_Icon" file_name="toolbar_icons/move.png" preload="true" /> + <texture name="Command_Environments_Icon" file_name="toolbar_icons/environments.png" preload="true" /> <texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" /> <texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" /> <texture name="Command_Places_Icon" file_name="toolbar_icons/places.png" preload="true" /> @@ -319,6 +320,11 @@ with the same filename but different name <texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" /> <texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" /> <texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" /> + <texture name="Inv_Settings" file_name="icons/Inv_Settings.png" preload="false" /> + <texture name="Inv_SettingsSky" file_name="icons/Inv_SettingsSky.png" preload="false" /> + <texture name="Inv_SettingsWater" file_name="icons/Inv_SettingsWater.png" preload="false" /> + <texture name="Inv_SettingsDay" file_name="icons/Inv_SettingsDay.png" preload="false" /> + <texture name="Inv_Invalid" file_name="icons/Inv_Invalid.png" preload="false" /> <texture name="Inv_Unknown" file_name="icons/Inv_UnknownObject.png" preload="false" /> <texture name="Inv_VersionFolderClosed" file_name="icons/Inv_VersionFolderClosed.png" preload="false" /> @@ -588,7 +594,6 @@ with the same filename but different name <texture name="Snapshot_Email" file_name="snapshot_email.png" preload="false" /> <texture name="Snapshot_Inventory" file_name="toolbar_icons/inventory.png" preload="false" /> <texture name="Snapshot_Profile" file_name="toolbar_icons/profile.png" preload="false" /> - <texture name="startup_logo" file_name="windows/startup_logo.png" preload="true" /> <texture name="login_sl_logo" file_name="windows/login_sl_logo.png" preload="true" /> @@ -679,6 +684,20 @@ with the same filename but different name <texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120" scale_type="scale_outer"/> + <texture name="VirtualTrackball_Moon_Back" file_name="widgets/track_control_moon_back.png" /> + <texture name="VirtualTrackball_Moon_Front" file_name="widgets/track_control_moon_front.png" /> + <texture name="VirtualTrackball_Rotate_Bottom" file_name="widgets/track_control_rotate_bottom.png" /> + <texture name="VirtualTrackball_Rotate_Left" file_name="widgets/track_control_rotate_left_side.png" /> + <texture name="VirtualTrackball_Rotate_Right" file_name="widgets/track_control_rotate_right_side.png" /> + <texture name="VirtualTrackball_Rotate_Top" file_name="widgets/track_control_rotate_top.png" /> + <texture name="VirtualTrackball_Rotate_Bottom_Active" file_name="widgets/track_control_rotate_bottom_active.png" /> + <texture name="VirtualTrackball_Rotate_Left_Active" file_name="widgets/track_control_rotate_left_side_active.png" /> + <texture name="VirtualTrackball_Rotate_Right_Active" file_name="widgets/track_control_rotate_right_side_active.png" /> + <texture name="VirtualTrackball_Rotate_Top_Active" file_name="widgets/track_control_rotate_top_active.png" /> + <texture name="VirtualTrackball_Sphere" file_name="widgets/track_control_sphere.png" /> + <texture name="VirtualTrackball_Sun_Back" file_name="widgets/track_control_sun_back.png" /> + <texture name="VirtualTrackball_Sun_Front" file_name="widgets/track_control_sun_front.png" /> + <texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false" scale.left="6" scale.top="33" scale.right="63" scale.bottom="10" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/environments.png b/indra/newview/skins/default/textures/toolbar_icons/environments.png Binary files differnew file mode 100644 index 0000000000..620db9f793 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/environments.png diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png Binary files differindex b627232012..8888e134d1 100644 --- a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png +++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png Binary files differnew file mode 100644 index 0000000000..30f538d35b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png Binary files differnew file mode 100644 index 0000000000..d3882c5e4c --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png Binary files differnew file mode 100644 index 0000000000..232c812aae --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom_active.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom_active.png Binary files differnew file mode 100644 index 0000000000..911618b08e --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom_active.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png Binary files differnew file mode 100644 index 0000000000..bcc78fc5e4 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side_active.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side_active.png Binary files differnew file mode 100644 index 0000000000..2fe04b93f1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side_active.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png Binary files differnew file mode 100644 index 0000000000..d0827abf28 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side_active.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side_active.png Binary files differnew file mode 100644 index 0000000000..824051562f --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side_active.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png Binary files differnew file mode 100644 index 0000000000..13a5e9c2e8 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_top_active.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_top_active.png Binary files differnew file mode 100644 index 0000000000..9a7493703b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_top_active.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_sphere.png b/indra/newview/skins/default/textures/widgets/track_control_sphere.png Binary files differnew file mode 100644 index 0000000000..a13b7725ea --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_sphere.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png Binary files differnew file mode 100644 index 0000000000..23c89068f8 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_front.png b/indra/newview/skins/default/textures/widgets/track_control_sun_front.png Binary files differnew file mode 100644 index 0000000000..6dfdc04423 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/track_control_sun_front.png diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index e494b2b755..c7770eb81b 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -29,7 +29,6 @@ <check_box initial_value="true" label="Gennemsigtig vand" name="TransparentWater"/> <check_box initial_value="true" label="Glatte flader og skin" name="BumpShiny"/> <check_box initial_value="true" label="Lokale lys" name="LocalLights"/> - <check_box initial_value="true" label="Basale flader" name="BasicShaders" tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher."/> <check_box initial_value="true" label="Atmosfæriske flader" name="WindLightUseAtmosShaders"/> <check_box initial_value="true" label="Lys og skygger" name="UseLightShaders"/> <check_box initial_value="true" label=""Ambient Occlusion"" name="UseSSAO"/> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index eee3dc2c77..ec6ba4800d 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -560,6 +560,9 @@ Prøv venligst om lidt igen. <string name="mesh"> mesh </string> + <string name="settings"> + indstillinger + </string> <string name="AvatarEditingAppearance"> (Redigering Udseende) </string> diff --git a/indra/newview/skins/default/xui/de/floater_adjust_environment.xml b/indra/newview/skins/default/xui/de/floater_adjust_environment.xml new file mode 100644 index 0000000000..776a866077 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Persönliche Beleuchtung"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Zurücksetzen" name="btn_reset" tool_tip="Schließen und auf gemeinsame Umgebung zurücksetzen"/> + <text name="cloud_map_label"> + Wolkenbild: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Sonne: + </text> + <check_box label="Beacon anzeigen" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Beacon anzeigen" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml index 1a052bd814..c44cd407de 100644 --- a/indra/newview/skins/default/xui/de/floater_beacons.xml +++ b/indra/newview/skins/default/xui/de/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Soundquellen" name="sounds"/> <check_box label="Partikelquellen" name="particles"/> <check_box label="Medienquellen" name="moapbeacon"/> + <check_box label="Sonne" name="sun"/> + <check_box label="Mond" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml index 9454933264..7a3fa41a24 100644 --- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="Sounds"/> <check_box label="Texturen" name="check_texture"/> <icon name="icon_texture" tool_tip="Texturen"/> + <icon name="icon_setting" tool_tip="Umgebungseinstellungen"/> <button label="√ Alle" label_selected="Alle" name="check_all"/> <button label="Löschen" label_selected="Keine" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml deleted file mode 100644 index ae7d5ef77d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="UMGEB.-VOREINST. LÖSCHEN"> - <string name="title_water"> - Wasser-Voreinstellung löschen - </string> - <string name="title_sky"> - Himmel-Voreinstellung löschen - </string> - <string name="title_day_cycle"> - Tageszyklus löschen - </string> - <string name="label_water"> - Voreinstellung: - </string> - <string name="label_sky"> - Voreinstellung: - </string> - <string name="label_day_cycle"> - Tageszyklus: - </string> - <string name="msg_confirm_deletion"> - Möchten Sie die ausgewählte Voreinstellung wirklich löschen? - </string> - <string name="msg_sky_is_referenced"> - Eine Voreinstellung, auf die sich ein Tageszyklus bezieht, kann nicht gelöscht werden. - </string> - <string name="combo_label"> - -Voreinstellung auswählen- - </string> - <text name="label"> - Voreinstellung: - </text> - <button label="Löschen" name="delete"/> - <button label="Abbrechen" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..c21eec1893 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Tageszyklus bearbeiten"> + <string name="title_new"> + Neuen Tageszyklus erstellen + </string> + <string name="title_edit"> + Tageszyklus bearbeiten + </string> + <string name="hint_new"> + Geben Sie einen Namen für Ihren Tageszyklus ein, passen Sie die Steuerungen an, um den Tageszyklus zu erstellen, und klicken Sie auf "Speichern". + </string> + <string name="hint_edit"> + Um Ihren Tageszyklus zu bearbeiten, passen Sie die unten angezeigten Steuerungen an und klicken Sie auf „Speichern“. + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Himmel [ALT] + </string> + <string name="sky_label"> + Himmel + </string> + <string name="water_label"> + Wasser + </string> + <string name="commit_parcel"> + Auf Parzelle anwenden + </string> + <string name="commit_region"> + Auf Region anwenden + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Name des Tageszyklus: + </text> + <button label="Importieren" name="btn_import" tool_tip="Alte Einstellungen von Datenträger importieren."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Himmel 4" name="sky4_track"/> + <button label="Himmel 3" name="sky3_track"/> + <button label="Himmel 2" name="sky2_track"/> + <button label="Bodenhöhe" name="sky1_track"/> + <button label="Wasser" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Pfad klonen von" name="copy_track"/> + <button label="Pfad laden von" name="load_track"/> + <button label="Pfad löschen" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Schritt vor"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Schritt zurück"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="[FRAME] hinzufügen" name="add_frame"/> + <button label="[FRAME] laden" name="btn_load_frame"/> + <button label="[FRAME] löschen" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Wählen Sie einen Schlüssel-Frame aus der obigen Zeitlinie, um die Einstellungen zu bearbeiten. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Wasser" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmosphäre und Beleuchtung" name="atmosphere_panel"/> + <panel label="Wolken" name="clouds_panel"/> + <panel label="Sonne und Mond" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Speichern" name="save_btn"/> + <button label="Abbrechen" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/de/floater_fixedenvironment.xml new file mode 100644 index 0000000000..c18e333571 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Festgelegte Umgebung"> + <string name="edit_sky"> + Himmel bearbeiten: + </string> + <string name="edit_water"> + Wasser bearbeiten: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Laden" name="btn_load" tool_tip="Einstellungen aus dem Inventar laden"/> + <button label="Importieren" name="btn_import" tool_tip="Alte Einstellungen von Datenträger importieren."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Speichern" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Abbrechen" name="btn_cancel" tool_tip="Zur zuletzt gespeicherten Version zurückkehren"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml index cdacabec90..b361b88aa8 100644 --- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Sounds" name="check_sound"/> <check_box label="Texturen" name="check_texture"/> <check_box label="Fotos" name="check_snapshot"/> + <check_box label="Einstellungen" name="check_settings"/> <button label="Alle" label_selected="Alle" name="All"/> <button label="Keine" label_selected="Keine" name="None"/> <check_box label="Ordner immer anzeigen" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/de/floater_my_environments.xml b/indra/newview/skins/default/xui/de/floater_my_environments.xml new file mode 100644 index 0000000000..ff5556304a --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Orte" name="my_environments" title="MEINE UMGEBUNGEN"> + <layout_stack> + <layout_panel label="Filter" name="filter_panel"> + <check_box label="Tage" name="chk_days"/> + <check_box label="Himmel" name="chk_skies"/> + <check_box label="Wasser" name="chk_water"/> + <filter_editor label="Umgebungen filtern" name="flt_search"/> + </layout_panel> + <layout_panel label="Umgebungen" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Alle Ordner anzeigen" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Weitere Optionen"/> + <menu_button name="btn_newsettings" tool_tip="Neue Einstellung erstellen"/> + <button name="btn_del" tool_tip="Ausgewähltes Objekt löschen"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_perms_default.xml b/indra/newview/skins/default/xui/de/floater_perms_default.xml index 6274739f70..a9b845611a 100644 --- a/indra/newview/skins/default/xui/de/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/de/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Standardberechtigungen für die Erstellung von Kleidungsstücken und Körperteilen festlegen"> Tragbare Objekte </text> + <text name="label_13" tool_tip="Standardberechtigungen für die Erstellung von Umgebungseinstellungen festlegen"> + Einstellungen + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel"/> diff --git a/indra/newview/skins/default/xui/de/floater_pick_track.xml b/indra/newview/skins/default/xui/de/floater_pick_track.xml new file mode 100644 index 0000000000..d5a565a2b0 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="AUSWÄHLEN: PFAD"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Ursprungshimmel auswählen: + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Himmel4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Himmel3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Himmel2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Boden" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Abbrechen" label_selected="Abbrechen" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml index 41e8dc5ef4..cd514f5afd 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/> <check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/> <check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/> - <check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/> <slider label="Terraindetails:" name="TerrainDetail"/> <text name="TerrainDetailText"> Niedrig diff --git a/indra/newview/skins/default/xui/de/floater_settings_picker.xml b/indra/newview/skins/default/xui/de/floater_settings_picker.xml new file mode 100644 index 0000000000..1fe417bdee --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="AUSWÄHLEN: EINSTELLUNGEN"> + <floater.string name="pick title"> + Auswahl: + </floater.string> + <floater.string name="pick_track"> + PFAD AUSWÄHLEN + </floater.string> + <floater.string name="pick_settings"> + EINSTELLUNGEN AUSWÄHLEN + </floater.string> + <floater.string name="track_water"> + Wasser + </floater.string> + <floater.string name="track_ground"> + Boden + </floater.string> + <floater.string name="track_sky"> + Himmel[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Texturen filtern" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Abbrechen" label_selected="Abbrechen" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml index b794d879f0..b818a7d480 100644 --- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Inventar" name="inventory" value="0"/> <radio_item label="Lokal" name="local" value="1"/> + <radio_item label="Backen" name="bake" value="2"/> </radio_group> <text name="unknown"> Größe: [DIMENSIONS] @@ -20,7 +21,6 @@ <button label="Leer" label_selected="Leer" name="Blank"/> <button label="Keine" label_selected="Keine" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/> <text name="preview_disabled" value="Vorschau deaktiviert"/> <filter_editor label="Texturen filtern" name="inventory search editor"/> <check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/> @@ -31,6 +31,22 @@ <column label="Name" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Back-Textur auswählen"> + <combo_box.item label="Keine" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Basis-Mesh-Region verbergen" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> + <check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index e02d464a3d..84cded77ce 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Aktivieren" name="Marketplace Activate"/> <menu_item_call label="Deaktivieren" name="Marketplace Deactivate"/> <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Kaufen" name="Task Buy"/> <menu_item_call label="Öffnen" name="Task Open"/> <menu_item_call label="Abspielen" name="Task Play"/> <menu_item_call label="Eigenschaften" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Neue Unterhose" name="New Underpants"/> <menu_item_call label="Neue Alpha-Maske" name="New Alpha Mask"/> <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> + <menu_item_call label="Neues Universal" name="New Universal"/> <menu_item_call label="Neue Physik" name="New Physics"/> </menu> <menu label="Neue Körperteile" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Neues Haar" name="New Hair"/> <menu_item_call label="Neue Augen" name="New Eyes"/> </menu> + <menu label="Neue Einstellungen" name="New Settings"> + <menu_item_call label="Neuer Himmel" name="New Sky"/> + <menu_item_call label="Neues Wasser" name="New Water"/> + <menu_item_call label="Neuer Tageszyklus" name="New Day Cycle"/> + </menu> <menu label="Als Standard verwenden für" name="upload_def"> <menu_item_call label="Hochgeladene Bilder" name="Image uploads"/> <menu_item_call label="Hochgeladene Sounds" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Bearbeiten" name="Wearable Edit"/> <menu_item_call label="Hinzufügen" name="Wearable Add"/> <menu_item_call label="Ausziehen" name="Take Off"/> + <menu_item_call label="Nur auf mich anwenden" name="Settings Apply Local"/> + <menu_item_call label="Auf Parzelle anwenden" name="Settings Apply Parcel"/> <menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/> <menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/> <menu_item_call label="--keine Optionen--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml index af70c08ba1..251b219a12 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/> <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/> <menu_item_call label="Modell..." name="Upload Model"/> - <menu_item_call label="Modellassistent..." name="Upload Model Wizard"/> <menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/> - <menu_item_call label="Hochlade-Berechtigungen (Standard) festlegen" name="perm prefs"/> </menu> <menu_item_call label="Neuer Ordner" name="New Folder"/> <menu_item_call label="Neues Skript" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Neue Unterhose" name="New Underpants"/> <menu_item_call label="Neues Alpha" name="New Alpha"/> <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> + <menu_item_call label="Neues Universal" name="New Universal"/> <menu_item_call label="Neue Physik" name="New Physics"/> </menu> <menu label="Neue Körperteile" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Neues Haar" name="New Hair"/> <menu_item_call label="Neue Augen" name="New Eyes"/> </menu> + <menu label="Neue Einstellungen" name="New Settings"> + <menu_item_call label="Neuer Himmel" name="New Sky"/> + <menu_item_call label="Neues Wasser" name="New Water"/> + <menu_item_call label="Neuer Tageszyklus" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml index 211cc5c54e..817ec28cff 100644 --- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Neues Alpha" name="New Alpha"/> <menu_item_call label="Neue Physik" name="New Physics"/> <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> + <menu_item_call label="Neues Universal" name="New Universal"/> </menu> <menu label="Neue Körperteile" name="New Body Parts"> <menu_item_call label="Neue Form" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/de/menu_save_settings.xml b/indra/newview/skins/default/xui/de/menu_save_settings.xml new file mode 100644 index 0000000000..458c3fdc14 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Speichern" name="save_settings"/> + <menu_item_check label="Speichern unter" name="save_as_new_settings"/> + <menu_item_check label="Festlegen" name="commit_changes"/> + <menu_item_check label="Nur auf mich anwenden" name="apply_local"/> + <menu_item_check label="Auf Parzelle anwenden" name="apply_parcel"/> + <menu_item_check label="Auf Region anwenden" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_settings_add.xml b/indra/newview/skins/default/xui/de/menu_settings_add.xml new file mode 100644 index 0000000000..ebf6c2b314 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Neuer Himmel" name="New Sky"/> + <menu_item_call label="Neues Wasser" name="New Water"/> + <menu_item_call label="Neuer Tageszyklus" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_settings_gear.xml b/indra/newview/skins/default/xui/de/menu_settings_gear.xml new file mode 100644 index 0000000000..4be4675899 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Bearbeiten" name="edit_settings"/> + <menu_item_call label="Nur auf mich anwenden" name="Settings Apply Local"/> + <menu_item_call label="Auf Parzelle anwenden" name="Settings Apply Parcel"/> + <menu_item_call label="Auf Region anwenden" name="Settings Apply Region"/> + <menu_item_call label="Kopieren" name="copy_settings"/> + <menu_item_call label="Einfügen" name="paste_settings"/> + <menu_item_call label="UUID kopieren" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 5917a0b529..6ea4ae9ab3 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/> <menu_item_check label="Menü „Erweitert“" name="Show Advanced Menu"/> </menu> - <menu label="Sonne" name="Sun"> + <menu label="Umgebung" name="Environment"> <menu_item_check label="Sonnenaufgang" name="Sunrise"/> <menu_item_check label="Mittag" name="Noon"/> <menu_item_check label="Sonnenuntergang" name="Sunset"/> <menu_item_check label="Mitternacht" name="Midnight"/> - <menu_item_check label="Regionseinstellungen verwenden" name="Use Region Settings"/> - </menu> - <menu label="Umwelt-Editor" name="Environment Editor"> - <menu_item_call label="Umwelt-Einstellungen..." name="Environment Settings"/> - <menu label="Wasser-Voreinstellungen" name="Water Presets"> - <menu_item_call label="Neue Voreinstellung..." name="new_water_preset"/> - <menu_item_call label="Voreinstellung bearbeiten..." name="edit_water_preset"/> - <menu_item_call label="Voreinstellung löschen..." name="delete_water_preset"/> - </menu> - <menu label="Himmel-Voreinstellungen" name="Sky Presets"> - <menu_item_call label="Neue Voreinstellung..." name="new_sky_preset"/> - <menu_item_call label="Voreinstellung bearbeiten..." name="edit_sky_preset"/> - <menu_item_call label="Voreinstellung löschen..." name="delete_sky_preset"/> - </menu> - <menu label="Tag-Voreinstellungen" name="Day Presets"> - <menu_item_call label="Neue Voreinstellung..." name="new_day_preset"/> - <menu_item_call label="Voreinstellung bearbeiten..." name="edit_day_preset"/> - <menu_item_call label="Voreinstellung löschen..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Gemeinsame Umgebung verwenden" name="Use Shared Environment"/> + <menu_item_call label="Meine Umgebungen..." name="my_environs"/> + <menu_item_call label="Persönliche Beleuchtung..." name="adjustment_tool"/> + <menu_item_check label="Wolken pausieren" name="pause_clouds"/> </menu> </menu> <menu label="Bauen" name="BuildTools"> @@ -346,6 +331,9 @@ <menu_item_check label="Automatische Alpha-Masken (nicht aufgeschoben)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Animationstexturen" name="Animation Textures"/> <menu_item_check label="Texturen deaktivieren" name="Disable Textures"/> + <menu_item_check label="Umgebung deaktivieren" name="Disable Ambient"/> + <menu_item_check label="Sonnenlicht deaktivieren" name="Disable Sunlight"/> + <menu_item_check label="Lokale Lichtquellen deaktivieren" name="Disable Local Lights"/> <menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/> <menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/> <menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/> @@ -477,6 +465,7 @@ <menu_item_call label="Rock" name="Skirt"/> <menu_item_call label="Alpha" name="Alpha"/> <menu_item_call label="Tätowierung" name="Tattoo"/> + <menu_item_call label="Universal" name="Universal"/> <menu_item_call label="Physik" name="Physics"/> <menu_item_call label="Alle Kleider" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index aac46aaadd..a5a05f7de0 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1976,6 +1976,11 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas Durch Deaktivieren dieser Option können Einstellungen der Parzellenbesitzer zum Schutz vor Belästigungen, zur Aufrechterhaltung der Privatsphäre oder zum Schutz von Minderjährigen vor nicht altersgemäßen Inhalten aufgehoben werden. Bitte sprechen Sie mit den Parzellenbesitzern, falls erforderlich. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Durch Deaktivieren dieser Option werden jegliche benutzerdefinierten Umgebungen entfernt, die von den Parzelleneigentümern zu ihren Parzellen hinzugefügt wurden. Bitte sprechen Sie mit den Parzellenbesitzern, falls erforderlich. +Fortfahren? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ > „Einstellungen“ > „Allgemein“ ändern. <usetemplate name="okbutton" yestext="OK"/> @@ -2455,7 +2460,15 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies Diese Tageszyklusdatei verweist auf eine fehlende Himmel-Datei: [SKY]. </notification> <notification name="WLRegionApplyFail"> - Die Einstellungen konnten nicht auf die Region angewendet werden. Verlassen Sie die Region und kehren Sie zurück, um das Problem zu beheben. Angegebener Grund: [FAIL_REASON] + Die Einstellungen konnten nicht auf die Region angewendet werden. Grund: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Eine lokale Textur wird im Pfad [TRACK], Frame #[FRAMENO] ([FRAME]%) im Feld [FIELD] verwendet. +Die Einstellungen können nicht mit lokalen Texturen gespeichert werden. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Im Feld [FIELD] wird eine lokale Textur verwendet. +Die Einstellungen können nicht mit lokalen Texturen gespeichert werden. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Der letzte Schlüssel in diesem Tageszyklus kann nicht gelöscht werden, da ein Tageszyklus nicht leer sein kann. Statt den letzten verbleibenden Schlüssel zu löschen, versuchen Sie stattdessen, ihn zu modifizieren und dann einen neuen zu erstellen. @@ -4407,4 +4420,76 @@ Wählen Sie eine kleinere Landfläche aus. [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + Die Einstellungen für [NAME] konnten nicht aus der Datenbank geladen werden. + </notification> + <notification name="FailedToLoadSettingsApply"> + Diese Einstellungen können nicht auf die Umgebung angewendet werden. + </notification> + <notification name="FailedToBuildSettingsDay"> + Diese Einstellungen können nicht auf die Umgebung angewendet werden. + </notification> + <notification name="NoEnvironmentSettings"> + Diese Region unterstützt keine Umgebungseinstellungen. + </notification> + <notification label="Outfit speichern" name="SaveSettingAs"> + Aktuelle Umgebungseinstellungen speichern unter: + <form name="form"> + <input name="message"> + [DESC] (neu) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Abbrechen"/> + </form> + </notification> + <notification name="WLImportFail"> + Alte Windlight-Einstellungen [NAME] konnten nicht aus +[FILE] geladen werden. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Die Umgebung für diese Parzelle kann nicht eingestellt werden. +Bitte eine Parzelle eingeben oder auswählen, für die Sie die Änderungsrechte besitzen. + </notification> + <notification name="SettingsUnsuported"> + Einstellungen werden von dieser Region nicht unterstützt. +Bitte wechseln sie zu einer Region mit aktivierten Einstellungsmöglichkeiten und versuchen Sie es erneut. + </notification> + <notification name="SettingsConfirmLoss"> + Sie werden die Änderungen an diesem [TYPE] mit der Bezeichnung "[NAME]" verlieren. +Möchten Sie diesen Vorgang wirklich fortsetzen? + <usetemplate ignoretext="Sind Sie sicher, dass Sie die Änderungen verlieren möchten?" name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> + <notification name="SettingsConfirmReset"> + Sie sind dabei, alle angewendeten Einstellungen zu entfernen. +Möchten Sie diesen Vorgang wirklich fortsetzen? + <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Sie sind dabei, alle angewendeten persönlichen Beleuchtungseinstellungen zu entfernen. +Möchten Sie diesen Vorgang wirklich fortsetzen? + <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Sie versuchen, nicht transferierbare Einstellungen in diesen Tageszyklus zu importieren. Wenn Sie fortfahren, verlieren die von Ihnen bearbeiteten Einstellungen ebenfalls ihre Transferierbarkeit. + +Diese Änderung kann nicht rückgängig gemacht werden. + +Möchten Sie diesen Vorgang wirklich fortsetzen? + <usetemplate ignoretext="Sind Sie sicher, dass Sie die Transferierbarkeit der Einstellungen aufgeben möchten?" name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> + <notification name="NoEditFromLibrary"> + Sie können Einstellungen aus der Bibliothek nicht direkt bearbeiten. +Bitte kopieren Sie diese in Ihr Inventar und versuchen Sie es erneut. + </notification> + <notification name="EnvironmentApplyFailed"> + Bei diesen Einstellungen wurde ein Problem festgestellt. Sie können momentan nicht gespeichert oder angewendet werden. + </notification> + <notification name="TrackLoadFailed"> + Pfad konnte nicht in [TRACK] geladen werden. + </notification> + <notification name="TrackLoadMismatch"> + Der Pfad konnte nicht aus [TRACK1] in [TRACK2] geladen werden. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml index 075a9d752a..a74d16e50a 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Kopf-Tattoo" name="Head Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Oberes Tattoo" name="Upper Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Unteres Tattoo" name="Lower Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_edit_universal.xml b/indra/newview/skins/default/xui/de/panel_edit_universal.xml new file mode 100644 index 0000000000..5ae4021b8f --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Kopf-Tattoo" name="Head Universal Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Oberes Tattoo" name="Upper Universal Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Unteres Tattoo" name="Lower Universal Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Rock-Tattoo" name="Skirt Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Haar-Tattoo" name="Hair Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Augen-Tattoo" name="Eyes Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Tattoo linker Arm" name="Left Arm Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Tattoo linkes Bein" name="Left Leg Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Aux1-Tattoo" name="Aux1 Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Aux2-Tattoo" name="Aux2 Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <texture_picker label="Aux3-Tattoo" name="Aux3 Tattoo" tool_tip="Klicken, um ein Bild auszuwählen"/> + <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml index 94a79a0bbd..83593e553f 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Tätowierung bearbeiten </string> + <string name="edit_universal_title"> + Universal bearbeiten + </string> <string name="edit_physics_title"> Physik bearbeiten </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Tätowierung: </string> + <string name="universal_desc_text"> + Universal: + </string> <string name="physics_desc_text"> Physik: </string> diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml index 089a3ae5fc..f5e249b083 100644 --- a/indra/newview/skins/default/xui/de/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Umgebung" name="panel_env_info"> - <text name="water_settings_title"> - Wählen Sie die Wasser- und Himmel-/Tageszykluseinstellungen aus, die alle Besucher Ihrer Region sehen sollen. Mehr Infos - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Second Life-Standard verwenden" name="use_sl_default_settings"/> - <radio_item label="Folgende Einstellungen verwenden" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Wassereinstellung - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Himmel/Tageszyklus - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Fester Himmel" name="my_sky_settings"/> - <radio_item label="Tageszyklus" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> - </combo_box> - </panel> - <button label="Anwenden" name="apply_btn"/> - <button label="Abbrechen" name="cancel_btn"/> + <string name="str_label_use_default"> + Standardeinstellungen verwenden + </string> + <string name="str_label_use_region"> + Regionseinstellungen verwenden + </string> + <string name="str_altitude_desription"> + Himmel [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + Es ist keine Parzelle ausgewählt. Umgebungseinstellungen sind deaktiviert. + </string> + <string name="str_cross_region"> + Umgebungseinstellungen sind außerhalb der Regionsgrenzen nicht verfügbar. + </string> + <string name="str_legacy"> + Umgebungseinstellungen sind für diese Region nicht verfügbar + </string> + <string name="str_disallowed"> + Der Grundbesitzverwalter lässt keine Änderung der Parzellenumgebungen in dieser Region zu. + </string> + <string name="str_too_small"> + Die Parzellengröße muss mindestens 128 Quadratmeter betragen, um eine Umgebung zu unterstützen. + </string> + <string name="str_empty"> + (leer) + </string> + <string name="str_region_env"> + (Regionsumgebung) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Inventar verwenden" name="btn_select_inventory"/> + <button label="Anpassen" name="btn_edit"/> + <check_box label="Parzelleneigentümer können die Umgebung außer Kraft setzen" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Himmel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + Unbekannt + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Ziehen Sie eine Einstellung aus dem Inventar auf dieses Zielfeld, um sie als aktuellen Himmel auszuwählen."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Himmel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + Unbekannt + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Ziehen Sie eine Einstellung aus dem Inventar auf dieses Zielfeld, um sie als aktuellen Himmel auszuwählen."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Himmel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + Unbekannt + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Ziehen Sie eine Einstellung aus dem Inventar auf dieses Zielfeld, um sie als aktuellen Himmel auszuwählen."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Boden + </text> + <line_editor name="edt_invname_ground"> + Unbekannt + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Ziehen Sie eine Einstellung aus dem Inventar auf dieses Zielfeld, um sie als aktuellen Himmel auf Bodenhöhe auszuwählen."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Wasser + </text> + <line_editor name="edt_invname_water"> + Unbekannt + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Ziehen Sie eine Einstellung aus dem Inventar auf dieses Zielfeld, um sie als aktuelles Wasser auszuwählen."/> + </panel> + <button label="Zurücksetzen" name="btn_rst_altitudes" tool_tip="Auf Standardhöhen zurücksetzen"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/de/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..f14e3fe47f --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmosphäre und Beleuchtung" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/de/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/de/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..9d78728eed --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Wolken" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/de/panel_settings_sky_density.xml new file mode 100644 index 0000000000..d7ee6308d8 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Dichte" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Rayleigh-Exponentialterm:" name="rayleigh_exponential"/> + <slider label="Rayleigh-Exponentialskala:" name="rayleigh_exponential_scale"/> + <slider label="Rayleigh-Linearterm:" name="rayleigh_linear"/> + <slider label="Rayleigh-Konstantenterm:" name="rayleigh_constant"/> + <slider label="Rayleigh-Maximalhöhe:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Mie-Exponentialterm:" name="mie_exponential"/> + <slider label="Mie-Exponentialskala:" name="mie_exponential_scale"/> + <slider label="Mie-Linearterm:" name="mie_linear"/> + <slider label="Mie-Konstantenterm:" name="mie_constant"/> + <slider label="Mie-Anisofaktor." name="mie_aniso_factor"/> + <slider label="Mie-Maximalhöhe:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Absorptions-Exponentialterm:" name="absorption_exponential"/> + <slider label="Absorptions-Exponentialskala:" name="absorption_exponential_scale"/> + <slider label="Absorptions-Linearterm:" name="absorption_linear"/> + <slider label="Absorptions-Konstantenterm:" name="absorption_constant"/> + <slider label="Absorptions-Maximalhöhe:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/de/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..9234e22d63 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Sonne und Mond" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Beacon anzeigen" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Beacon anzeigen" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_settings_water.xml b/indra/newview/skins/default/xui/de/panel_settings_water.xml new file mode 100644 index 0000000000..f11f50dcce --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Wasser" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Fresnel-Versatz: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml index e0505ce128..9557f2d6d8 100644 --- a/indra/newview/skins/default/xui/de/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Textur" name="Texture"> - <panel.string name="string repeats per meter"> - Wiederholungen pro Meter - </panel.string> - <panel.string name="string repeats per face"> - Wiederholungen pro Fläche - </panel.string> <text name="color label"> Farbe </text> @@ -114,4 +108,5 @@ <spinner label="Horizontaler Versatz" name="shinyOffsetU"/> <spinner label="Vertikaler Versatz" name="shinyOffsetV"/> <check_box initial_value="false" label="Planare Flächen ausrichten" name="checkbox planar align" tool_tip="Texturen auf allen ausgewählten Flächen an der zuletzt ausgewählten Fläche ausrichten. Erfordert planares Texture Mapping."/> + <button label="Ausrichten" label_selected="Aktuelle Texturebenen ausrichten" name="button align textures" tool_tip="Aktuelle Texturebenen ausrichten"/> </panel> diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml index 26187678a0..5507fcc04d 100644 --- a/indra/newview/skins/default/xui/de/role_actions.xml +++ b/indra/newview/skins/default/xui/de/role_actions.xml @@ -33,6 +33,7 @@ <action description="Musik- und Medieneinstellungen ändern" longdescription="Die Einstellungen für Streaming-Musik und Filme finden Sie unter „Land-Info“ > „Medien“." name="land change media" value="20"/> <action description="„Terrain bearbeiten“ ein/aus" longdescription="„Terrain bearbeiten“ ein/aus. *WARNUNG* „Land-Info“ > „Optionen“ > „Terrain bearbeiten“ ermöglicht jedem das Terraformen Ihres Grundbesitzes und das Setzen und Verschieben von Linden-Pflanzen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen. Diese Einstellung finden Sie unter „Land-Info“ > „Optionen“." name="land edit" value="21"/> <action description="„Land-Info“-Optionen einstellen" longdescription="„Sicher (kein Schaden)“ und „Fliegen“ ein- und ausschalten und Einwohnern folgende Aktionen erlauben: „Terrain bearbeiten“, „Bauen“, „Landmarken erstellen“ und „Skripts ausführen“ auf gruppeneigenem Land in „Land-Info“ > Registerkarte „Optionen“." name="land options" value="22"/> + <action description="Ändern Sie die Umgebungseinstellungen und den Tageszyklus." longdescription="Ändern Sie die Umgebungseinstellungen im Reiter "Landinformationen -> Umgebung"." name="land change environment" value="46"/> </action_set> <action_set description="Diese Fähigkeiten ermöglichen es, Mitgliedern das Umgehen von Restriktionen auf gruppeneigenen Parzellen zu erlauben." name="Parcel Powers"> <action description="„Terrain bearbeiten“ zulassen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle das Terrain bearbeiten, selbst wenn diese Option unter „Land-Info“ > „Optionen“ deaktiviert ist." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index a50cda83b6..5f216895ae 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -656,6 +656,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="BUTTON_HELP"> Hilfe anzeigen </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Objekte dieses Typs können nicht an Notizkarten +für diese Region angehängt werden. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + An Notizkarten können nur Objekte ohne +Berechtigungseinschränkungen für den +nächsten Eigentümer angehängt werden. + </string> <string name="Searching"> Suchen... </string> @@ -735,6 +744,18 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Fehler bei der Upload-Anforderung. Um das Problem zu lösen, besuchen Sie bitte http://secondlife.com/support </string> + <string name="SettingValidationError"> + Validierung für das Importieren der Einstellungen [NAME] fehlgeschlagen + </string> + <string name="SettingImportFileError"> + [FILE] konnte nicht geöffnet werden + </string> + <string name="SettingParseFileError"> + [FILE] konnte nicht geöffnet werden + </string> + <string name="SettingTranslateError"> + Altes Windlight [NAME] konnte nicht übernommen werden + </string> <string name="texture"> Textur </string> @@ -810,6 +831,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="symbolic folder link"> Link zu Ordner </string> + <string name="settings blob"> + Einstellungen + </string> <string name="mesh"> mesh </string> @@ -1140,6 +1164,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="ForceSitAvatar"> Ihren Avatar zwingen, sich zu setzen </string> + <string name="ChangeEnvSettings"> + Umgebungseinstellungen ändern + </string> <string name="NotConnected"> Nicht verbunden </string> @@ -1291,6 +1318,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="tattoo"> Tätowierung </string> + <string name="universal"> + Universal + </string> <string name="physics"> Physik </string> @@ -1333,6 +1363,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="tattoo_not_worn"> Tätowierung nicht getragen </string> + <string name="universal_not_worn"> + Universal nicht getragen + </string> <string name="physics_not_worn"> Physik nicht getragen </string> @@ -1384,6 +1417,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="create_new_tattoo"> Neue Tätowierung erstellen </string> + <string name="create_new_universal"> + Neues Universal erstellen + </string> <string name="create_new_physics"> Neue Physik erstellen </string> @@ -2531,6 +2567,27 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo <string name="RegionSettings"> Regionseinstellungen </string> + <string name="NoEnvironmentSettings"> + Diese Region unterstützt keine Umgebungseinstellungen. + </string> + <string name="EnvironmentSun"> + Sonne + </string> + <string name="EnvironmentMoon"> + Mond + </string> + <string name="EnvironmentBloom"> + Bloom + </string> + <string name="EnvironmentCloudNoise"> + Wolkenrauschen + </string> + <string name="EnvironmentNormalMap"> + Normal-Map + </string> + <string name="EnvironmentTransparent"> + Transparent + </string> <string name="ClassifiedClicksTxt"> Klicks: [TELEPORT] teleportieren, [MAP] Karte, [PROFILE] Profil </string> @@ -4762,6 +4819,9 @@ Missbrauchsbericht <string name="New Tattoo"> Neue Tätowierung </string> + <string name="New Universal"> + Neues Universal + </string> <string name="New Physics"> Neue Physik </string> @@ -4888,6 +4948,15 @@ Missbrauchsbericht <string name="Female - Wow"> Weiblich - Wow </string> + <string name="New Daycycle"> + Neuer Tageszyklus + </string> + <string name="New Water"> + Neues Wasser + </string> + <string name="New Sky"> + Neuer Himmel + </string> <string name="/bow"> /verbeugen </string> @@ -5416,6 +5485,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="BeaconMedia"> Medien-Beacons werden angezeigt (weiß) </string> + <string name="BeaconSun"> + Sonnenrichtungs-Beacon ansehen (orange) + </string> + <string name="BeaconMoon"> + Mondrichtungs-Beacon ansehen (lila) + </string> <string name="ParticleHiding"> Partikel werden ausgeblendet </string> @@ -5443,6 +5518,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Destinations_Label"> Ziele </string> + <string name="Command_Environments_Label"> + Meine Umgebungen + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5536,6 +5617,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Destinations_Tooltip"> Ziele von Interesse </string> + <string name="Command_Environments_Tooltip"> + Meine Umgebungen + </string> + <string name="Command_Facebook_Tooltip"> + Auf Facebook posten + </string> <string name="Command_Flickr_Tooltip"> Auf Flickr hochladen </string> @@ -5731,6 +5818,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="ExperiencePermission12"> automatisch Erlebnisberechtigungen akzeptieren </string> + <string name="ExperiencePermission16"> + ihren Avatar zwingen, sich zu setzen + </string> + <string name="ExperiencePermission17"> + Ändern Ihrer Umgebungseinstellungen + </string> <string name="ExperiencePermissionShortUnknown"> unbekannten Vorgang durchführen: [Permission] </string> @@ -5755,6 +5848,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="ExperiencePermissionShort12"> Berechtigung </string> + <string name="ExperiencePermissionShort16"> + Sitzen + </string> + <string name="ExperiencePermissionShort17"> + Umgebung + </string> <string name="logging_calls_disabled_log_empty"> Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ > „Chat“. </string> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index a143adfa06..a1dd179765 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -2140,5 +2140,17 @@ Only large parcels can be listed in search. class="land_experiences_panel" filename="panel_region_experiences.xml"> </panel> + <panel + border="true" + follows="all" + label="ENVIRONMENT" + layout="topleft" + left="0" + top="0" + help_topic="land_environment_tab" + name="land_environment_panel" + class="land_environment_panel" + filename="panel_region_environment.xml"> + </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml new file mode 100644 index 0000000000..59589e3665 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -0,0 +1,401 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater layout="topleft" + name="env_adjust_snapshot" + help_topic="day_presets" + save_rect="false" + title="Personal Lighting" + width="845" + height="240" + min_width="500" + min_height="235" + single_instance="true" + can_resize="false"> + <layout_stack name="outer_stack" + width="845" + height="230" + follows="all" + animate="false" + top="0" + orientation="vertical"> + <!-- If I put in a timeline it would go here --> + <layout_panel name="env_controls" + border="false" + bevel_style="in" + auto_resize="true" + user_resize="true" + height="150" + min_height="0" + visible="true"> + <layout_stack name="settings_stack" + width="855" + height="150" + follows="all" + animate="false" + orientation="horizontal"> + <layout_panel border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + visible="true" + width="160" + height="150"> + <text follows="left|top" + height="10" + layout="topleft" + left="10" + top="5" + width="80">Ambient:</text> + <color_swatch can_apply_immediately="true" + follows="left|top" + height="40" + label_height="0" + layout="topleft" + left_delta="0" + name="ambient_light" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + width="80">Blue Horizon:</text> + <color_swatch can_apply_immediately="true" + follows="left|top" + height="40" + label_height="0" + layout="topleft" + left_delta="0" + name="blue_horizon" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + width="80">Blue Density:</text> + <color_swatch can_apply_immediately="true" + follows="left|top" + height="40" + label_height="0" + layout="topleft" + left_delta="0" + name="blue_density" + top_pad="5" + width="60"/> + <button + follows="left|top" + height="23" + label="Reset" + tool_tip="Close and reset to Shared Environment" + layout="topleft" + name="btn_reset" + left_delta="-2" + top_pad="10" + width="100"/> + <text follows="right|top" + height="10" + layout="topleft" + right="-12" + top="5" + width="60">Sun Color:</text> + <color_swatch can_apply_immediately="true" + follows="left|top" + height="10" + label_height="0" + layout="topleft" + left_delta="0" + name="sun_color" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="5" + width="80">Cloud Color:</text> + <color_swatch can_apply_immediately="true" + follows="left|top" + height="10" + label_height="0" + layout="topleft" + left_delta="0" + name="cloud_color" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + name="cloud_map_label" + width="80">Cloud Image:</text> + <texture_picker height="63" + layout="topleft" + left_delta="0" + name="cloud_map" + top_pad="5" + width="60"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_pad="-13" + name="cloud_map_label" + width="80">Water Image:</text> + <texture_picker height="63" + layout="topleft" + left_delta="0" + name="water_normal_map" + top_pad="5" + width="60"/> + </layout_panel> + <layout_panel border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + visible="true" + width="200" + height="150"> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="5" + top_pad="5" + width="80">Haze Horizon:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="5" + name="haze_horizon" + top_pad="5" + width="185" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="5" + width="80">Haze Density:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="5" + name="haze_density" + top_pad="5" + width="185" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="5" + width="185">Cloud Coverage:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="cloud_coverage" + top_pad="5" + width="185" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="5" + width="185">Cloud Scale:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.01" + max_val="3" + name="cloud_scale" + top_pad="5" + width="185" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="15" + width="80">Scene Gamma:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + max_val="20" + name="scene_gamma" + top_pad="5" + width="185" + can_edit_text="true"/> + </layout_panel> + <layout_panel border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + height="150" + width="310" + min_height="0" + visible="true"> + <text follows="top|left" + font="SansSerifBold" + height="10" + layout="topleft" + name="label" + left="5" + top="5" + width="105">Sun:</text> + <sun_moon_trackball name="sun_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="sun"/> + <check_box control_name="sunbeacon" + width="60" + height="16" + label="Show Beacon" + layout="topleft" + name="sunbeacon" + left_delta="55" + bottom="-20" + follows="bottom|right"/> + <text follows="left|top" + height="10" + layout="topleft" + left_pad="40" + top="25" + width="80">Scale:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.25" + max_val="20" + name="sun_scale" + top_delta="15" + width="130" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="5" + width="100">Glow Focus:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="-2" + max_val="2" + name="glow_focus" + top_pad="5" + width="130" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="5" + width="200">Glow Size:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1.99" + name="glow_size" + top_pad="5" + width="130" + can_edit_text="true"/> + <text follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_pad="10" + width="200">Star Brightness:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="500" + name="star_brightness" + top_pad="5" + width="130" + can_edit_text="true"/> + </layout_panel> + <layout_panel border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + height="150" + width="160" + min_height="0" + visible="true"> + <text follows="top|left" + font="SansSerifBold" + height="10" + layout="topleft" + name="label" + left="5" + top="5" + width="105">Moon:</text> + <sun_moon_trackball name="moon_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="moon"/> + <check_box control_name="moonbeacon" + width="60" + height="16" + label="Show Beacon" + layout="topleft" + name="moonbeacon" + right="-50" + bottom="-20" + follows="bottom|right"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 3d29356b22..d5947fc0af 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="245" + height="310" layout="topleft" name="beacons" help_topic="beacons" @@ -12,7 +12,7 @@ width="240"> <panel follows="left|top|right|bottom" - height="240" + height="305" layout="topleft" left="10" name="beacons_panel" @@ -143,6 +143,43 @@ <check_box.commit_callback function="Beacons.UICheck" /> </check_box> + <view_border + bevel_style="in" + height="0" + layout="topleft" + left="0" + name="cost_text_border" + top_pad="5" + width="220"/> + <text + follows="all" + height="16" + font="SansSerif" + left="0" + top_pad="7" + name="label_objects" + text_color="White" + type="string"> + Show direction to: + </text> + <check_box + control_name="sunbeacon" + height="16" + label="Sun" + layout="topleft" + name="sun" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box + control_name="moonbeacon" + height="16" + label="Moon" + layout="topleft" + name="moon" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 9fa93b640f..431c33a339 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -156,7 +156,20 @@ name="icon_texture" tool_tip="Textures" left_pad="2" /> - + <check_box + control_name="BulkChangeIncludeSettings" + height="16" + name="check_settings" + left="245" + top="25" + width="16" /> + <icon + height="16" + image_name="Inv_Settings" + mouse_opaque="true" + name="icon_setting" + tool_tip="Environment settings" + left_pad="2" /> <button height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml deleted file mode 100644 index b5de4166f6..0000000000 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<floater - legacy_header_height="18" - height="130" - help_topic="" - layout="topleft" - name="Delete Env Preset" - save_rect="true" - title="DELETE ENV PRESET" - width="550"> - - <string name="title_water">Delete Water Preset</string> - <string name="title_sky">Delete Sky Preset</string> - <string name="title_day_cycle">Delete Day Cycle</string> - - <string name="label_water">Preset:</string> - <string name="label_sky">Preset:</string> - <string name="label_day_cycle">Day cycle:</string> - - <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> - <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string> - - <string name="combo_label">-Select a preset-</string> - - <text - follows="top|left|right" - font="SansSerif" - height="10" - layout="topleft" - left="50" - name="label" - top="60" - width="60"> - Preset: - </text> - <combo_box - follows="top|left" - layout="topleft" - left_pad="10" - name="preset_combo" - top_delta="-5" - width="200"/> - <button - follows="bottom|right" - height="23" - label="Delete" - layout="topleft" - left_pad="15" - name="delete" - width="70"/> - <button - follows="bottom|right" - height="23" - label="Cancel" - layout="topleft" - left_pad="5" - name="cancel" - width="70"/> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml deleted file mode 100644 index d9a3ad0c4b..0000000000 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ /dev/null @@ -1,485 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="381" - layout="topleft" - name="Edit Day cycle" - help_topic="day_presets" - save_rect="true" - title="Edit Day Cycle" - width="705"> - - <string name="title_new">Create a New Day Cycle</string> - <string name="title_edit">Edit Day Cycle</string> - <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> - <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> - <string name="combo_label">-Select a preset-</string> - - <text - follows="top|left|right" - height="10" - layout="topleft" - left="10" - name="hint" - top="25" - width="685" /> - <text - follows="top|left|right" - font="SansSerif" - height="10" - layout="topleft" - left="10" - name="label" - top_pad="25" - width="120"> - Preset Name: - </text> - <combo_box - allow_text_entry="true" - follows="top|left" - layout="topleft" - left_pad="10" - max_chars="100" - name="day_cycle_combo" - top_delta="-5" - width="200" /> - <line_editor - height="20" - left_delta="0" - name="day_cycle_name" - top_delta="0" - visible="true" - width="200" /> - <text - follows="top|left|right" - height="95" - layout="topleft" - left_pad="10" - name="note" - top_delta="0" - width="345" - wrap="true"> - Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. - </text> - <!--======== Controls panel ========--> - <text - follows="left|top|right" - height="10" - layout="topleft" - left="10" - name="hint_item1" - top="100" - width="300"> - - Click on a tab to edit the specific sky settings and time. - </text> - <text - follows="left|top|right" - height="10" - layout="topleft" - name="hint_item2" - top_pad="10" - width="300"> - - Click and drag the tabs to set the transition times. - </text> - <text - follows="left|top|right" - height="10" - layout="topleft" - name="hint_item3" - top_pad="10" - width="300"> - - Use the scrubber to preview your day cycle. - </text> - <panel - follows="top|left" - height="100" - name="day_cycle_slider_panel" - layout="topleft" - left_delta="25" - top_pad="15" - width="660"> - <multi_slider - can_edit_text="true" - control_name="WLTimeSlider" - decimal_digits="0" - draw_track="false" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left="20" - max_sliders="20" - max_val="24" - name="WLTimeSlider" - show_text="false" - top_pad="0" - use_triangle="true" - width="525" /> - <multi_slider - can_edit_text="true" - control_name="WLDayCycleKeys" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="20" - max_val="24" - name="WLDayCycleKeys" - show_text="false" - top_pad="15" - width="525" /> - <button - height="20" - label="Add Key" - label_selected="Add Key" - layout="topleft" - left_pad="20" - name="WLAddKey" - top_delta="-18" - width="96" /> - <button - height="20" - label="Delete Key" - label_selected="Delete Key" - layout="topleft" - name="WLDeleteKey" - top_pad="5" - width="96" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left="8" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3am" - top_delta="0" - width="55"> - 3am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9amHash" - top_delta="0" - width="55"> - 9am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3pm" - top_delta="0" - width="55"> - 3pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9pm" - top_delta="0" - width="55"> - 9pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left="20" - name="WL12amHash" - top="54" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3amHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6amHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9amHash2" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12pmHash2" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6pmHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12amHash2" - top_delta="-3" - width="6"> - | - </text> - </panel> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="192" - name="WLCurKeyPresetText" - top_pad="10" - width="80"> - Sky Setting: - </text> - <combo_box - height="18" - label="Preset" - layout="topleft" - left_pad="5" - name="WLSkyPresets" - width="205" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-40" - name="WLCurKeyTimeText" - top_pad="15" - width="35"> - Time: - </text> - <time - follows="left|top" - height="16" - label_width="0" - layout="topleft" - left_pad="3" - name="time" - top_delta="-1" - value="6:00 AM" - width="75"/> - <view_border - bevel_style="none" - follows="top|left" - height="0" - layout="topleft" - left="10" - name="horiz_separator" - top_pad="20" - width="685"/> - <loading_indicator - height="23" - layout="topleft" - left="25" - name="progress_indicator" - top="350" - visible="false" - width="23" /> - <check_box - follows="top|left" - height="10" - label="Make this my new day cycle" - layout="topleft" - left="310" - name="make_default_cb" - top_delta="13" - width="230"/> - <button - follows="bottom|right" - height="23" - label="Save" - layout="topleft" - left_pad="0" - name="save" - top_delta="-13" - width="70"/> - <button - follows="bottom|right" - height="23" - label="Cancel" - layout="topleft" - left_pad="15" - name="cancel" - top_delta="0" - width="70"/> - </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..30e9002230 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -0,0 +1,651 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + layout="topleft" + name="env_edit_extdaycycle" + help_topic="day_presets" + save_rect="false" + title="Edit Day Cycle" + width="705" + height="700" + min_width="705" + min_height="700" + single_instance="true" + can_resize="false"> + + <!-- obsolete?, add as hint for 'save' button? --> + <string name="title_new">Create a New Day Cycle</string> + <string name="title_edit">Edit Day Cycle</string> + <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> + + <!-- Substitutions --> + <string name="time_label">([HH]:[MM])</string> + <string name="sky_track_label">Sky [ALT]</string> + <string name="sky_label">Sky</string> + <string name="water_label">Water</string> + + <string name="commit_parcel">Apply To Parcel</string> + <string name="commit_region">Apply To Region</string> + + <!-- Layout --> + <layout_stack name="outer_stack" + width="705" + height="700" + follows="all" + animate="false" + top="0" + orientation="vertical"> + <layout_panel name="name_and_import" + border="false" + auto_resize="false" + user_resize="false" + height="29" + min_height="29" + background_visible="false"> + <!-- This layout_panel is for loading legacy presets --> + <text + follows="top|left" + font="SansSerif" + height="10" + layout="topleft" + name="label" + left="15" + top="5" + width="105"> + Day Cycle Name: + </text> + <line_editor + follows="top|left" + layout="topleft" + left_pad="10" + max_length_bytes="100" + name="day_cycle_name" + prevalidate_callback="ascii" + top="5" + width="200" + height="21" /> + <button + height="23" + label="Import" + follows="right|top" + right="-10" + font="SansSerif" + top_delta="0" + name="btn_import" + tool_tip="Import legacy settings from disk." + width="96" /> + </layout_panel> + <layout_panel name="content" + border="false" + auto_resize="true" + user_resize="false" + background_visible="false"> + <layout_stack name="content_stack" + width="705" + follows="all" + animate="false" + top="0" + orientation="vertical"> + <layout_panel name="timeline_track_selection" + border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + height="150" + min_height="0" + visible="true"> + <panel name="timeline_layers" + border="false" + follows="left|top" + height="150" + width="110" + top_pad="0" + min_height="0" + visible="true"> + <button + follows="left|top" + height="23" + label="Sky 4" + layout="topleft" + top_pad="5" + left="10" + name="sky4_track" + width="100"> + <button.commit_callback + function="DayCycle.Track" + parameter="4" /> + </button> + <button + follows="left|top" + height="23" + label="Sky 3" + layout="topleft" + top_pad="0" + left="10" + name="sky3_track" + width="100"> + <button.commit_callback + function="DayCycle.Track" + parameter="3" /> + </button> + <button + follows="left|top" + height="23" + label="Sky 2" + layout="topleft" + top_pad="0" + left="10" + name="sky2_track" + width="100"> + <button.commit_callback + function="DayCycle.Track" + parameter="2" /> + </button> + <button + follows="left|top" + height="23" + label="Ground Level" + layout="topleft" + top_pad="0" + left="10" + name="sky1_track" + width="100"> + <button.commit_callback + function="DayCycle.Track" + parameter="1" /> + </button> + <button + follows="left|top" + height="23" + label="Water" + layout="topleft" + top_pad="0" + left="10" + name="water_track" + width="100"> + <button.commit_callback + function="DayCycle.Track" + parameter="0" /> + </button> + </panel> + <panel name="timeline" + border="true" + follows="left|top" + height="150" + min_height="0" + width="595" + min_width="595" + left_pad="0" + visible="true"> + <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment--> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="p0" + top_pad="5" + value="0% [DSC]" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_delta="117" + name="p1" + top_delta="0" + value="25% [DSC]" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_delta="122" + name="p2" + top_delta="0" + value="50% [DSC]" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_delta="122" + name="p3" + top_delta="0" + value="75% [DSC]" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_delta="122" + name="p4" + top_delta="0" + value="100% [DSC]" + width="90" /> + <multi_slider + decimal_digits="0" + draw_track="false" + follows="bottom" + height="10" + increment="0.005" + overlap_threshold="0.026" + initial_value="0" + layout="topleft" + left="10" + max_sliders="1" + max_val="1" + name="WLTimeSlider" + show_text="false" + top_pad="0" + use_triangle="true" + width="525" /> + + <multi_slider + decimal_digits="0" + follows="bottom" + height="10" + increment="0.005" + overlap_threshold="0.026" + loop_overlap="true" + initial_value="0" + layout="topleft" + left="10" + max_sliders="20" + max_val="1" + name="WLDayCycleFrames" + show_text="false" + top_pad="15" + width="525" /> + + <text + follows="left|bottom" + height="25" + layout="topleft" + left_pad="0" + name="current_time" + value="[PRCNT]% [DSC]" + top_delta="-5" + width="56" + word_wrap="true"/> + + <layout_stack + follows="all" + height="200" + animate="false" + top_pad="0" + left="0" + orientation="horizontal"> + <layout_panel + border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + height="150" + width="200" + min_height="0" + visible="true"> + <button + follows="top|left" + height="23" + width="110" + label="Clone Track From" + left="10" + top_pad="10" + name="copy_track" /> + <button + follows="top|left" + height="23" + width="110" + label="Load Track From" + top_pad="0" + left_delta="0" + name="load_track" /> + <button + follows="top|left" + height="23" + width="110" + label="Clear Track" + top_pad="0" + left_delta="0" + name="clear_track" /> + + </layout_panel> + <layout_panel + border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + height="150" + width="200" + min_height="0" + visible="true"> + <layout_stack + name="progress_control" + follows="top|left" + height="25" + width="83" + layout="topleft" + animate="false" + left="31" + top="40" + orientation="horizontal"> + + <layout_panel + name="skip_back" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> + <button + name="skip_back_btn" + follows="top" + image_overlay="SkipBackward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + width="25" + height="25" + layout="topleft" + tool_tip="Step back" + top="0" + left="0"> + <button.commit_callback + function="DayCycle.PlayActions" + parameter="back" /> + </button> + </layout_panel> + + <layout_panel + name="play_layout" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> + <button + name="play_btn" + follows="top" + image_overlay="Play_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + layout="topleft" + height="25" + width="25" + left="0" + top="0"> + <button.commit_callback + function="DayCycle.PlayActions" + parameter="play" /> + </button> + </layout_panel> + + <layout_panel + name="pause_layout" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25" + visible="false"> + <button + name="pause_btn" + follows="top" + image_overlay="Pause_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + layout="topleft" + height="25" + width="25" + left="0" + top="0"> + <button.commit_callback + function="DayCycle.PlayActions" + parameter="pause" /> + </button> + </layout_panel> + + <layout_panel + name="skip_forward" + mouse_opaque="false" + auto_resize="false" + layout="topleft" + top="0" + height="25" + min_width="25" + width="25"> + <button + name="skip_forward_btn" + follows="top" + image_overlay="SkipForward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + width="25" + height="25" + layout="topleft" + tool_tip="Step forward" + top="0"> + <button.commit_callback + function="DayCycle.PlayActions" + parameter="forward" /> + </button> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + border="false" + bevel_style="in" + auto_resize="false" + user_resize="false" + width="190" + height="150" + min_height="0" + visible="true"> + <button + + follows="top|right" + height="23" + width="90" + right="-10" + top_pad="10" + label="Add [FRAME]" + name="add_frame" /> + <button + follows="top|left" + height="23" + width="90" + label="Load [FRAME]" + top_pad="0" + left_delta="0" + name="btn_load_frame" /> + <button + follows="left|top" + height="23" + width="90" + label="Delete [FRAME]" + top_pad="0" + left_delta="0" + name="delete_frame" /> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls" + auto_resize="false" + user_resize="false" + height="30" + width="700" + min_height="30" + visible="true"> + <!--bg_alpha_color="blue" + background_visible="true" --> + <text + name="icn_lock_edit" + follows="bottom" + height="10" + layout="bottomleft" + left_delta="15" + top_pad="15" + font="SansSerif" + text_color="Yellow" + width="500"> + Select a key frame from the timeline above to edit settings. + </text> + </layout_panel> + <layout_panel name="frame_settings_water" + auto_resize="true" + user_resize="false" + height="420" + width="700" + min_height="0" + visible="false"> + <tab_container + follows="all" + halign="left" + height="420" + layout="topleft" + left="0" + name="water_tabs" + tab_position="top" + tab_width="140" + tab_padding_right="3" + top_pad="0" + width="700"> + <panel + border="true" + class="panel_settings_water" + filename="panel_settings_water.xml" + label="Water" + layout="topleft" + left_delta="0" + top_pad="5" + name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky" + auto_resize="true" + user_resize="false" + height="420" + width="700" + min_height="0" + visible="true"> + <tab_container + follows="all" + halign="left" + height="420" + visible="true" + layout="topleft" + left="0" + name="sky_tabs" + tab_position="top" + tab_width="140" + tab_padding_right="3" + top_pad="0" + width="700"> + <panel + border="true" + class="panel_settings_atmos" + filename="panel_settings_sky_atmos.xml" + label="Atmosphere & Lighting" + layout="topleft" + left_delta="0" + top_pad="5" + name="atmosphere_panel" /> + <panel + border="true" + class="panel_settings_cloud" + filename="panel_settings_sky_clouds.xml" + label="Clouds" + layout="topleft" + left_delta="0" + top_pad="5" + name="clouds_panel" /> + <panel + border="true" + class="panel_settings_sunmoon" + filename="panel_settings_sky_sunmoon.xml" + label="Sun & Moon" + layout="topleft" + left_delta="0" + top_pad="5" + name="moon_panel" /> + <!-- added programatically so it doesn't show up whether we want it or not + <panel + border="true" + class="panel_settings_density" + filename="panel_settings_sky_density.xml" + label="Density" + layout="topleft" + left_delta="0" + top_pad="5" + name="density_panel" /> + --> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons" + auto_resize="false" + user_resize="false" + height="26" + min_height="26" + visible="true" + width="700"> + <button + follows="top|left" + height="23" + label="Save" + left="5" + top_pad="0" + name="save_btn" + width="156" /> + + <button + follows="top|left" + height="23" + name="btn_flyout" + label="" + layout="topleft" + left_pad="-20" + top="0" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + + <button + follows="top|left" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="150" /> + + </layout_panel> + </layout_stack> + +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml deleted file mode 100644 index 56233d91ee..0000000000 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ /dev/null @@ -1,953 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="375" - layout="topleft" - name="Edit Sky Preset" - help_topic="sky_preset" - save_rect="true" - title="Edit Sky Preset" - width="840"> - - <string name="title_new">Create a New Sky Preset</string> - <string name="title_edit">Edit Sky Preset</string> - <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> - <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string> - <string name="combo_label">-Select a preset-</string> - - <text - follows="top|left|right" - height="10" - layout="topleft" - left="30" - name="hint" - top="25" - width="700"> - To edit your preset, adjust the controls then click "Save" - </text> - <text - follows="top|left|right" - font="SansSerif" - height="10" - layout="topleft" - left="30" - name="label" - top_pad="25" - width="120"> - Preset Name: - </text> - <combo_box - allow_text_entry="true" - follows="top|left" - layout="topleft" - left_pad="10" - max_chars="100" - name="sky_preset_combo" - top_delta="-5" - width="200"/> - <line_editor - height="20" - left_delta="0" - name="sky_preset_name" - top_delta="0" - width="200" /> - <text - follows="top|left|right" - height="40" - layout="topleft" - left_pad="10" - name="note" - top_delta="0" - width="405" - wrap="true"> - Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. - </text> - <!--======== Controls panel ========--> - <view_border - bevel_style="none" - follows="top|left" - height="203" - layout="topleft" - left="25" - name="panel_water_preset" - top="122" - visible="true" - width="790"/> - <tab_container - follows="left|top" - height="225" - halign="center" - layout="topleft" - left="22" - name="WindLight Tabs" - tab_position="top" - top="101" - width="794"> - <panel - border="true" - bevel_style="none" - follows="left|top|right|bottom" - height="196" - label="ATMOSPHERE" - layout="topleft" - left="1" - help_topic="sky_preset_atmosphere" - mouse_opaque="false" - name="Atmosphere" - top="60" - width="698"> - - <!--======== Tab Panel I. I conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left="40" - name="BHText" - top="25" - width="200"> - Blue Horizon - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="0" - name="WLBlueHorizon" - top_pad="6" - width="60" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - top_pad="20" - name="BDensText" - width="200"> - Haze Horizon - </text> - <slider - control_name="WLHazeHorizon" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.25" - layout="topleft" - left_delta="0" - top_pad="6" - name="WLHazeHorizon" - width="200" /> - - <!--======== Tab Panel I. II conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="55" - name="BDensText2" - top="25" - width="200"> - Blue Density - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="0" - name="WLBlueDensity" - top_pad="6" - width="60" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="HDText" - top_pad="20" - width="200"> - Haze Density - </text> - <slider - control_name="WLHazeDensity" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - name="WLHazeDensity" - top_pad="6" - width="200" /> - - <!--======== Tab Panel I. III conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="55" - name="DensMultText" - top="25" - width="200"> - Density Multiplier - </text> - <slider - control_name="WLDensityMult" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="15" - max_val="0.9" - name="WLDensityMult" - top_pad="6" - width="200" /> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="WLDistanceMultText" - top_pad="20" - width="200"> - Distance Multiplier - </text> - <slider - control_name="WLDistancMult" - decimal_digits="1" - follows="left|top" - height="10" - initial_value="1.0" - layout="topleft" - left_delta="15" - max_val="100" - name="WLDistanceMult" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="MaxAltText" - top_pad="20" - width="200"> - Max Altitude - </text> - <slider - control_name="WLMaxAltitude" - decimal_digits="0" - follows="left|top" - height="10" - increment="1" - initial_value="500" - layout="topleft" - left_delta="15" - max_val="4000" - name="WLMaxAltitude" - top_pad="6" - width="200" /> - </panel> - <panel - border="true" - bevel_style="none" - follows="left|top|right|bottom" - height="196" - label="LIGHTING" - layout="topleft" - left_delta="0" - help_topic="sky_preset_lighting" - name="Lighting" - top_delta="4" - width="698"> - - <!--======== Tab Panel II. I conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left="20" - name="SLCText" - top="25" - width="150"> - Sun/Moon Color - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="10" - name="WLSunlight" - top_pad="6" - width="60" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-10" - name="WLAmbientText" - top_pad="20" - width="150"> - Ambient - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="10" - name="WLAmbient" - top_pad="6" - width="60" /> - - <!--======== Tab Panel II. II conlumn of controls ========--> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="100" - name="SunGlowText" - top="25" - width="200"> - Sun Glow - </text> - <slider - control_name="WLGlowB" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.1" - label="Focus " - layout="topleft" - left_delta="10" - max_val="0.5" - name="WLGlowB" - top_pad="6" - width="200" /> - <slider - control_name="WLGlowR" - decimal_digits="2" - follows="top|left" - height="10" - increment="0.01" - initial_value="0.25" - label="Size " - layout="topleft" - left_delta="0" - max_val="1.99" - min_val="1" - name="WLGlowR" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-10" - name="WLStarText" - top_pad="20" - width="200"> - Star Brightness - </text> - <slider - control_name="WLStarAlpha" - decimal_digits="2" - follows="top|left" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="10" - max_val="2" - name="WLStarAlpha" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-10" - name="SceneGammaText" - top_pad="20" - width="200"> - Scene Gamma - </text> - <slider - control_name="WLGamma" - decimal_digits="2" - follows="top|left" - height="10" - increment="0.01" - initial_value="2.0" - layout="topleft" - left_delta="10" - max_val="10" - name="WLGamma" - top_pad="6" - width="200" /> - - <!--======== Tab Panel II. III conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="60" - name="TODText" - top="25" - width="200"> - Sun/Moon Position - </text> - <multi_slider - can_edit_text="true" - control_name="WLSunPos" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="1" - max_val="24" - name="WLSunPos" - show_text="false" - top_pad="0" - width="300" /> - - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_delta="2" - name="WL12amHash" - top_pad="6" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="66" - name="WL6amHash" - top_delta="0" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="67" - name="WL12pmHash2" - top_delta="0" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="67" - name="WL6pmHash" - top_delta="0" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="67" - name="WL12amHash2" - top_delta="0" - width="6"> - | - </text> - - - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_delta="-300" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="20" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="15" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="18" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="15" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - - <time - follows="left|top" - height="16" - label_width="0" - layout="topleft" - left_delta="-175" - name="WLDayTime" - top_pad="15" - value="6:00 AM" - width="75"/> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-106" - name="WLEastAngleText" - top_pad="24" - width="200"> - East Angle - </text> - <slider - control_name="WLEastAngle" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.0" - layout="topleft" - left_delta="10" - name="WLEastAngle" - top_pad="6" - width="200" /> - - </panel> - <panel - border="true" - bevel_style="none" - follows="left|top|right|bottom" - height="196" - label="CLOUDS" - layout="topleft" - left_delta="0" - mouse_opaque="false" - help_topic="sky_preset_clouds" - name="Clouds" - top_delta="4" - width="698"> - - <!--======== Tab Panel III. I conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left="40" - name="WLCloudColorText" - top="25" - width="200"> - Cloud Color - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="0" - name="WLCloudColor" - top_pad="6" - width="60" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="WLCloudColorText2" - top_pad="20" - width="200"> - Cloud XY/Density - </text> - <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - label="X" - layout="topleft" - left_delta="0" - top_pad="6" - name="WLCloudX" - width="200" /> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - label="Y" - layout="topleft" - left_delta="0" - top_pad="6" - name="WLCloudY" - width="200" /> - <slider - control_name="WLCloudDensity" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="1.0" - label="D" - layout="topleft" - left_delta="0" - name="WLCloudDensity" - top_pad="6" - width="200" /> - - <!--======== Tab Panel III. II conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="55" - name="WLCloudCoverageText" - top="15" - width="200"> - Cloud Coverage - </text> - <slider - control_name="WLCloudCoverage" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="15" - name="WLCloudCoverage" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="WLCloudScaleText" - top_pad="20" - width="200"> - Cloud Scale - </text> - <slider - control_name="WLCloudScale" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="15" - min_val="0.01" - name="WLCloudScale" - top_pad="6" - width="200" /> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudDetailText" - top_pad="20" - width="200"> - Cloud Detail (XY/Density) - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - label="X" - layout="topleft" - left_delta="0" - top_pad="6" - name="WLCloudDetailX" - width="200" /> - <slider - control_name="WLCloudDetailY" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - label="Y" - layout="topleft" - left_delta="0" - name="WLCloudDetailY" - top_pad="6" - width="200" /> - <slider - control_name="WLCloudDetailDensity" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="1.0" - label="D" - layout="topleft" - left_delta="0" - name="WLCloudDetailDensity" - top_pad="6" - width="200" /> - - <!--======== Tab Panel III. III conlumn of controls ========--> - - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_pad="55" - name="WLCloudScrollXText" - top="15" - width="150"> - Cloud Scroll X - </text> - <check_box - control_name="WLCloudLockX" - follows="left|top" - height="16" - label="Lock" - layout="topleft" - left_delta="150" - name="WLCloudLockX" - top_delta="0" - width="200" /> - <slider - control_name="WLCloudScrollX" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="-135" - max_val="10" - min_val="-10" - name="WLCloudScrollX" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="WLCloudScrollYText" - top_pad="20" - width="150"> - Cloud Scroll Y - </text> - <check_box - control_name="WLCloudLockY" - follows="left|top" - height="16" - label="Lock" - layout="topleft" - left_delta="150" - name="WLCloudLockY" - width="200" /> - <slider - control_name="WLCloudScrollY" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="-135" - max_val="10" - min_val="-10" - name="WLCloudScrollY" - top_pad="6" - width="200" /> - </panel> - </tab_container> -<!--======== End of Controls panel ========--> - - <check_box - follows="top|left" - height="10" - label="Make this preset my new sky setting" - layout="topleft" - left="380" - name="make_default_cb" - top_pad="30" - width="280"/> - <button - follows="bottom|right" - height="23" - label="Save" - layout="topleft" - left_pad="0" - name="save" - width="70"/> - <button - follows="bottom|right" - height="23" - label="Cancel" - layout="topleft" - left_pad="15" - name="cancel" - width="70"/> - </floater> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml deleted file mode 100644 index 905983e7fa..0000000000 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ /dev/null @@ -1,448 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="375" - layout="topleft" - name="Edit Water Preset" - help_topic="water_preset" - save_rect="true" - title="Edit Water Preset" - width="725"> - - <string name="title_new">Create a New Water Preset</string> - <string name="title_edit">Edit a Water Preset</string> - <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> - <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string> - <string name="combo_label">-Select a preset-</string> - - <text - follows="top|left|right" - height="10" - layout="topleft" - left="30" - name="hint" - top="25" - width="680"> - To edit your preset, adjust the controls then click "Save" - </text> - - <text - follows="top|left|right" - font="SansSerif" - height="10" - layout="topleft" - left="30" - name="label" - top_pad="25" - width="120"> - Preset Name: - </text> - - <combo_box - allow_text_entry="true" - follows="top|left" - layout="topleft" - left_pad="10" - max_chars="100" - name="water_preset_combo" - top_delta="-5" - width="200"/> - - <line_editor - height="20" - left_delta="0" - name="water_preset_name" - top_delta="0" - width="200" /> - - <text - follows="top|left|right" - height="40" - layout="topleft" - left_pad="10" - name="note" - top_delta="0" - width="340" - wrap="true"> - Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed. - </text> - - <!--======== Controls panel ========--> - <panel - border="false" - bevel_style="none" - follows="top|left" - height="230" - layout="topleft" - left="10" - name="panel_water_preset" - top="100" - width="700"> - -<!--======== I conlumn of controls ========--> - <text - follows="left|top|right" - height="10" - font="SansSerif" - layout="topleft" - left="10" - name="water_color_label" - top="5" - width="215"> - Water Fog Color - </text> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="37" - label_height="0" - layout="topleft" - left_delta="15" - name="WaterFogColor" - top_pad="8" - width="60" /> - - - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - top_pad="10" - name="water_fog_density_label" - width="215"> - Fog Density Exponent - </text> - <slider - decimal_digits="1" - follows="left|top" - height="10" - initial_value="0" - layout="topleft" - left_delta="15" - max_val="10" - name="WaterFogDensity" - top_pad="10" - width="200"/> - - - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - top_pad="15" - name="underwater_fog_modifier_label" - width="215"> - Underwater Fog Modifier - </text> - <slider - decimal_digits="1" - follows="left|top" - height="10" - initial_value="0" - layout="topleft" - left_delta="15" - max_val="10" - name="WaterUnderWaterFogMod" - top_pad="10" - width="200"/> - - - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - name="BHText" - top_pad="15" - width="215"> - Big Wave Direction - </text> - <slider - control_name="WaterWave1DirX" - decimal_digits="2" - follows="left|top" - increment="0.01" - initial_value="0.7" - label="X" - layout="topleft" - max_val="4" - min_val="-4" - name="WaterWave1DirX" - top_pad="10" - width="216"/> - <slider - control_name="WaterWave1DirY" - decimal_digits="2" - follows="left|top" - increment="0.01" - initial_value="0.7" - label="Y" - layout="topleft" - max_val="4" - min_val="-4" - name="WaterWave1DirY" - top_pad="5" - width="216"/> - -<!--======== II conlumn of controls ========--> - - <text - follows="left|top|right" - font="SansSerif" - height="10" - layout="topleft" - left_pad="20" - name="BDensText" - top="5" - width="215"> - Reflection Wavelet Scale - </text> - <slider - control_name="WaterNormalScaleX" - decimal_digits="1" - follows="left|top" - initial_value="0.7" - layout="topleft" - left_delta="15" - max_val="10" - name="WaterNormalScaleX" - top_pad="10" - width="200"/> - <slider - control_name="WaterNormalScaleY" - decimal_digits="1" - follows="left|top" - initial_value="0.7" - layout="topleft" - max_val="10" - name="WaterNormalScaleY" - top_pad="6" - width="200"/> - <slider - control_name="WaterNormalScaleZ" - decimal_digits="1" - follows="left|top" - initial_value="0.7" - layout="topleft" - max_val="10" - name="WaterNormalScaleZ" - top_pad="6" - width="200"/> - - - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - name="HDText" - top_pad="16" - width="215"> - Fresnel Scale - </text> - <slider - control_name="WaterFresnelScale" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="15" - name="WaterFresnelScale" - top_pad="10" - width="200"/> - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - name="FresnelOffsetText" - top_pad="15" - width="215"> - Fresnel Offset - </text> - <slider - control_name="WaterFresnelOffset" - decimal_digits="2" - follows="left" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="15" - name="WaterFresnelOffset" - top_pad="10" - width="200"/> - - - <text - follows="left|top|right" - font="SansSerif" - layout="topleft" - left_delta="-15" - name="BHText2" - top_pad="15" - width="215"> - Little Wave Direction - </text> - <slider - control_name="WaterWave2DirX" - decimal_digits="2" - follows="left|top" - increment="0.01" - initial_value="0.7" - label="X" - layout="topleft" - max_val="4" - min_val="-4" - name="WaterWave2DirX" - top_pad="10" - width="216" /> - <slider - control_name="WaterWave2DirY" - decimal_digits="2" - follows="left|top" - increment="0.01" - initial_value="0.7" - label="Y" - layout="topleft" - max_val="4" - min_val="-4" - name="WaterWave2DirY" - top_pad="6" - width="216" /> - -<!--======== III conlumn of contorls ========--> - - <text - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="20" - name="DensMultText" - top="5" - width="215"> - Refract Scale Above - </text> - <slider - control_name="WaterScaleAbove" - decimal_digits="2" - follows="left|top" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="15" - name="WaterScaleAbove" - top_pad="5" - width="200" /> - - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="WaterScaleBelowText" - top_pad="15" - width="215"> - Refract Scale Below - </text> - <slider - control_name="WaterScaleBelow" - decimal_digits="2" - follows="left|top" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="15" - name="WaterScaleBelow" - top_pad="5" - width="200"/> - - <text - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="MaxAltText" - top_pad="15" - width="215"> - Blur Multiplier - </text> - <slider - control_name="WaterBlurMult" - follows="left|top" - height="10" - increment="0.001" - initial_value="0" - layout="topleft" - left_delta="15" - max_val="0.16" - name="WaterBlurMult" - top_pad="5" - width="200"/> - - <text - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-15" - name="BHText3" - top_pad="15" - width="215"> - Normal Map - </text> - <texture_picker - height="80" - layout="topleft" - left_delta="15" - name="WaterNormalMap" - top_pad="5" - width="100" /> - </panel> -<!--======== End of Controls panel ========--> - - <view_border - bevel_style="none" - follows="top|left" - height="0" - layout="topleft" - left="10" - name="horiz_separator" - top_pad="5" - width="700"/> - <check_box - follows="top|left" - height="10" - label="Make this preset my new water setting" - layout="topleft" - left="275" - name="make_default_cb" - top_pad="20" - width="280"/> - <button - follows="bottom|right" - height="23" - label="Save" - layout="topleft" - left_pad="0" - name="save" - width="70"/> - <button - follows="bottom|right" - height="23" - label="Cancel" - layout="topleft" - left_pad="15" - name="cancel" - width="70"/> - - </floater> diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml deleted file mode 100644 index 1b1cafaca6..0000000000 --- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml +++ /dev/null @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="328" - layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" - save_rect="true" - title="ENVIRONMENT SETTINGS" - width="540"> - - <text - follows="top|left|right" - height="15" - layout="topleft" - left="20" - name="note" - top="25" - width="510" - wrap="true"> - Use the options below to customize the environment settings for your viewer. - </text> - - <view_border - bevel_style="none" - follows="top|left" - height="237" - layout="topleft" - left="20" - name="border" - top_pad="8" - width="500"/> - <radio_group - follows="top|left" - height="45" - layout="topleft" - left_delta="10" - name="region_settings_radio_group" - top_delta="20" - width="200"> - <radio_item - label="Use region settings" - layout="topleft" - name="use_region_settings"/> - <radio_item - label="Customize my environment" - layout="topleft" - name="use_my_settings" - top_pad="20"/> - </radio_group> - - <panel - height="170" - layout="topleft" - left="50" - name="user_environment_settings" - top_pad="0" - width="470"> - - <text - follows="top|left|right" - font="SansSerifItalic" - height="15" - layout="topleft" - left_delta="0" - name="note" - top_pad="0" - width="470" - wrap="true"> - Note: your custom settings will not be visible to other users. - </text> - - <!-- Water Setting --> - <text - name="water_settings_title" - follows="top|left" - height="16" - layout="topleft" - left="50" - top="40" - width="200"> - Water Setting - </text> - <combo_box - follows="top|left" - left_pad="2" - name="water_settings_preset_combo" - top_delta="-5" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - - - <!-- Sky/Day Cycle Settings --> - <text - name="sky_dayc_settings_title" - follows="top|left" - height="16" - layout="topleft" - left="50" - top_pad="20" - width="100"> - Sky / Day Cycle - </text> - <radio_group - layout="topleft" - left_delta="50" - name="sky_dayc_settings_radio_group" - top_pad="10" - height="50" - width="150"> - <radio_item - layout="topleft" - label="Fixed sky" - name="my_sky_settings"/> - <radio_item - layout="topleft" - label="Day cycle" - name="my_dayc_settings" - top_pad="25"/> - </radio_group> - <combo_box - follows="top|left" - left_pad="2" - name="sky_settings_preset_combo" - top_delta="-7" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - <combo_box - follows="top|left" - name="dayc_settings_preset_combo" - top_delta="36" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - </panel> - - <button - follows="left|top" - height="23" - label="OK" - layout="topleft" - right="-130" - name="ok_btn" - top_pad="10" - width="100" /> - <button - follows="left|top" - height="23" - label="Cancel" - layout="topleft" - left_pad="10" - name="cancel_btn" - width="100" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml new file mode 100644 index 0000000000..dbf91b0834 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="true" + can_dock="false" + bevel_style="in" + height="550" + layout="topleft" + name="Fixed Environment" + save_rect="true" + title="Fixed Environment" + save_visibility="false" + help_topic="fixed_environment" + single_instance="true" + width="750"> + <string name="edit_sky">Edit Sky:</string> + <string name="edit_water">Edit Water:</string> + <layout_stack name="floater_stack" + left="5" + top="5" + right="-5" + bottom="-5" + follows="left|top|right|bottom" + orientation="vertical"> + <layout_panel name="info_panel" + auto_resize="false" + user_resize="false" + min_height="60"> + <text + follows="left|top" + top_delta="30" + left_delta="10" + width="35" + height="20" + font="SansSerif"> + Name: + </text> + <line_editor + follows="left|top" + top_delta="-2" + left_delta="45" + width="250" + name="settings_name" + prevalidate_callback="ascii" + max_length_chars="63" + height="20"/> + <button + height="23" + label="Load" + follows="left|top" + left_delta="260" + font="SansSerif" + top_delta="-2" + name="btn_load" + tool_tip="Load a settings from inventory" + width="96" /> + <button + height="23" + label="Import" + follows="right|top" + right="-10" + font="SansSerif" + top_delta="0" + name="btn_import" + tool_tip="Import legacy settings from disk." + width="96" /> + </layout_panel> + <layout_panel name="tab_area" + auto_resize="true" + user_resize="false" + height="11" + min_height="0" + visible="true"> + <tab_container + follows="all" + halign="left" + layout="topleft" + left="0" + name="tab_settings" + tab_position="top" + tab_width="120" + tab_padding_right="3"> + <!-- Tabs inserted here in code --> + </tab_container> + </layout_panel> + <layout_panel name="button_panel" + follows="left|top|right|bottom" + auto_resize="false" + user_resize="false" + height="40" + visible="true"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_bar_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save" + left="1" + layout="topleft" + name="btn_commit" + top="0" + width="155" /> + <button + follows="bottom|right" + height="23" + name="btn_flyout" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + top="0" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + auto_resize="true" + width="147"> + <button + follows="bottom|right" + height="23" + right="-1" + label="Cancel" + layout="topleft" + name="btn_cancel" + top="0" + tool_tip="Revert to last saved version" + width="147" /> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index ca1d299553..a8342e723b 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="448" + height="488" layout="topleft" name="Inventory Finder" help_topic="inventory_finder" @@ -195,6 +195,23 @@ name="check_snapshot" top_delta="0" width="126" /> + <icon + height="16" + image_name="Inv_Settings" + layout="topleft" + left="8" + mouse_opaque="true" + name="icon_settings" + top="262" + width="16" /> + <check_box + height="16" + label="Settings" + layout="topleft" + left_pad="2" + name="check_settings" + top_delta="0" + width="126" /> <button follows="left|top" height="20" @@ -203,7 +220,7 @@ layout="topleft" left="8" name="All" - top="242" + top="282" width="100" /> <button height="20" @@ -257,7 +274,7 @@ width="260"/> <check_box height="16" - top="332" + top="352" label="Since Logoff" layout="topleft" left_delta="0" @@ -273,7 +290,7 @@ layout="topleft" left_delta="0" name="- OR -" - top="350" + top="370" width="144"> - OR - </text> @@ -281,7 +298,7 @@ height="16" layout="topleft" name="date_search_direction" - top="368" + top="388" left="8" width="270"> <radio_item @@ -351,6 +368,6 @@ layout="topleft" name="Close" right="-6" - top="414" + top="454" width="76" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml new file mode 100644 index 0000000000..6aff387dcb --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + positioning="cascading" + save_rect="true" + single_instance="true" + reuse_instance="true" + legacy_header_height="18" + can_resize="true" + height="465" + name="my_environments" + help_topic="my_environments" + title="MY ENVIRONMENTS" + background_visible="true" + label="Places" + layout="topleft" + min_height="350" + min_width="265" + width="313"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="20" + right="-5" + bottom="-5" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="false" + tab_group="1" + height="54" + name="filter_panel" + label="Filters" + font="SansSerifBold"> + <icon + height="16" + image_name="Inv_SettingsDay" + layout="topleft" + mouse_opaque="true" + name="icon_settingsdays" + left="4" + width="16" /> + <check_box + height="16" + label="Days" + layout="topleft" + left_pad="2" + name="chk_days" + top_delta="0" + width="60" /> + <icon + height="16" + image_name="Inv_SettingsSky" + layout="topleft" + mouse_opaque="true" + name="icon_settingsskies" + left_pad="10" + width="16" /> + <check_box + height="16" + label="Skies" + layout="topleft" + left_pad="2" + name="chk_skies" + top_delta="0" + width="60" /> + <icon + height="16" + image_name="Inv_SettingsWater" + layout="topleft" + mouse_opaque="true" + name="icon_settingswater" + left_pad="10" + width="16" /> + <check_box + height="16" + label="Water" + layout="topleft" + left_pad="2" + name="chk_water" + top_delta="0" + width="60" /> + <filter_editor + follows="left|top|right" + height="23" + label="Filter Environments" + layout="topleft" + left="4" + name="flt_search" + top_pad="6" + right="-4" /> + </layout_panel> + <layout_panel + auto_resize="true" + user_resize="true" + tab_group="1" + name="list_panel" + label="Environments" + font="SansSerifBold"> + <panel + name="pnl_inv_wrap" + label="pnl_inv_wrap" + follows="all" + layout="topleft" + left="2" + top="2" + right="-2" + bottom="-2" + background_visible="true" + bg_alpha_color="DkGray2" + border="true"> + <asset_filtered_inv_panel + left="0" + top="0" + right="-1" + bottom="-1" + allow_multi_select="false" + follows="all" + layout="topleft" + name="pnl_settings" + filter_asset_type="settings"/> + </panel> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + tab_group="1" + height="15"> + <check_box + follows="left|bottom" + height="14" + initial_value="false" + label="Show All Folders" + layout="topleft" + name="chk_showfolders" + top="2" + left_delta="-1" + width="200" /> + </layout_panel> + <layout_panel + auto_resize="false" + tab_group="1" + height="31" + name="pnl_control" + font="SansSerifBold"> + <panel + background_visible="true" + bevel_style="none" + top_pad="1" + follows="top|left|right" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="pnl_bottom"> + <menu_button + follows="bottom|left" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + menu_filename="menu_settings_gear.xml" + name="btn_gear" + top="5" + tool_tip="More options" + width="18" /> + <menu_button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + menu_filename="menu_settings_add.xml" + name="btn_newsettings" + tool_tip="Make new setting" + top_delta="0" + width="18" /> + <button + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + image_disabled="TrashItem_Disabled" + layout="topleft" + name="btn_del" + right="-5" + tool_tip="Remove selected item" + top_delta="0" + width="18" /> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml index 1c3af49bfe..49dc719a24 100644 --- a/indra/newview/skins/default/xui/en/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml @@ -488,6 +488,67 @@ left_pad="0" top_delta="0" width="100" /> + <text + name="label_13" + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="0" + tool_tip="Set default permissions for when Environment settings are created" + width="100"> + Settings + </text> + <icon + follows="left|top" + height="16" + image_name="Inv_Settings" + layout="topleft" + left_pad="2" + width="18"/> + <check_box + height="16" + layout="topleft" + name="env_settings_c" + left_pad="45" + top_delta="0" + value="true" + enabled="false" + width="100"> + </check_box> + <check_box + control_name="SettingsNextOwnerModify" + height="16" + layout="topleft" + name="env_settings_m" + left_pad="0" + top_delta="0" + width="100" /> + <check_box + control_name="SettingsNextOwnerTransfer" + height="16" + layout="topleft" + name="env_settings_t" + left_pad="0" + top_delta="0" + width="100" /> + <check_box + enabled="false" + height="16" + layout="topleft" + name="env_settings_s" + left_pad="0" + top_delta="0" + width="120" /> + <check_box + enabled="false" + height="16" + layout="topleft" + name="env_settings_e" + left_pad="0" + top_delta="0" + width="100" /> </panel> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_pick_track.xml b/indra/newview/skins/default/xui/en/floater_pick_track.xml new file mode 100644 index 0000000000..d8a9877be2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_pick_track.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<floater + legacy_header_height="0" + can_minimize="false" + can_resize="true" + height="140" + layout="topleft" + min_height="140" + min_width="225" + name="track picker" + help_topic="track_picker" + title="PICK: TRACK" + width="225"> + <layout_stack name="adjuster" + follows="all" + animate="false" + top="0" + left="6" + right="-6" + bottom="-10" + orientation="vertical"> + <layout_panel name="pnl_desc" + border="false" + auto_resize="false" + user_resize="false" + height="11" + min_height="10" + bg_alpha_color="blue" + background_visible="false"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="select_description" + mouse_opaque="false" + top="0" + width="300"> + Select source sky: + </text> + </layout_panel> + <layout_panel name="pnl_traks" + border="false" + auto_resize="true" + user_resize="false" + height="29" + min_height="29" + bg_alpha_color="blue" + background_visible="false"> + <radio_group + follows="all" + height="60" + layout="topleft" + top="0" + left="3" + right="-3" + bottom="-3" + name="track_selection" + width="100"> + <radio_item + height="20" + label="Sky4 [ALT]" + layout="topleft" + left="0" + name="radio_sky4" + value="4" + top="0" + width="90" /> + <radio_item + height="20" + label="Sky3 [ALT]" + layout="topleft" + left="0" + name="radio_sky3" + value="3" + top_delta="20" + width="90" /> + <radio_item + height="20" + label="Sky2 [ALT]" + layout="topleft" + left="0" + name="radio_sky2" + value="2" + top_delta="20" + width="90" /> + <radio_item + height="20" + label="Ground" + layout="topleft" + left="0" + name="radio_sky1" + value="1" + top_delta="20" + width="90" /> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel" + border="false" + auto_resize="false" + user_resize="false" + height="29" + min_height="29"> + <button + follows="top|left" + height="20" + label="OK" + label_selected="OK" + layout="topleft" + left="2" + top="2" + name="btn_select" + width="100" /> + <button + follows="top|left" + height="20" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_delta="110" + top_delta="0" + name="btn_cancel" + width="100" /> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index bec484a5ea..e93568a87e 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -609,7 +609,7 @@ top_delta="16" width="300"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <check_box @@ -623,6 +623,7 @@ top_delta="16" width="300" /> + <!-- SL-12594, basic shaders always enabled, no fixed-function GL <check_box control_name="VertexShaderEnable" height="16" @@ -637,7 +638,8 @@ <check_box.commit_callback function="Pref.VertexShaderEnable" /> </check_box> - + --> + <slider control_name="RenderTerrainDetail" follows="left|top" @@ -683,7 +685,7 @@ top_delta="16" width="280"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <check_box @@ -751,7 +753,7 @@ top_delta="16" width="280"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <slider @@ -800,7 +802,7 @@ top_delta="16" width="260"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <check_box @@ -814,7 +816,7 @@ top_delta="16" width="240"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <check_box @@ -828,8 +830,24 @@ top_delta="16" width="240"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> + </check_box> + + <!-- + <check_box + control_name="RenderUseAdvancedAtmospherics" + height="16" + initial_value="true" + label="Advanced Atmospherics" + layout="topleft" + left="480" + name="UseAdvancedAtmo" + top_delta="16" + width="240"> + <check_box.commit_callback + function="Pref.AdvancedAtmosphericsEnable" /> </check_box> + --> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml new file mode 100644 index 0000000000..3a26c3b547 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + can_resize="true" + height="330" + layout="topleft" + min_height="330" + min_width="225" + name="settings picker" + help_topic="settings_picker" + title="PICK: SETTINGS" + width="225"> + + <!-- top static --> + <floater.string + name="pick title"> + Pick: + </floater.string> + <floater.string + name="pick_track"> + SELECT TRACK + </floater.string> + <floater.string + name="pick_settings"> + SELECT SETTINGS + </floater.string> + + <floater.string + name="track_water"> + Water + </floater.string> + <floater.string + name="track_ground"> + Ground + </floater.string> + <floater.string + name="track_sky"> + Sky[NUM] + </floater.string> + + <layout_stack name="test_stack" + follows="all" + animate="false" + top="20" + left="6" + right="-6" + bottom="-10" + orientation="vertical"> + <layout_panel name="inv_list" + border="false" + auto_resize="true" + user_resize="false" + height="29" + min_height="29" + bg_alpha_color="blue" + background_visible="false"> + <filter_editor + follows="left|top|right" + height="23" + label="Filter Settings" + layout="topleft" + left="4" + name="flt_inventory_search" + top="4" + right="-2" /> + <panel + name="pnl_inv_wrap" + follows="all" + layout="topleft" + left="2" + top="28" + right="-2" + bottom="-2" + background_visible="true" + bg_alpha_color="DkGray2"> + <asset_filtered_inv_panel + allow_multi_select="false" + allow_drag="false" + accepts_drag_and_drop="false" + suppress_folder_menu="true" + bg_visible="true" + bg_alpha_color="DkGray2" + border="false" + follows="all" + layout="topleft" + left_delta="0" + name="pnl_inventory" + top="1" + right="-4" + bottom="-1" + filter_asset_type="settings" /> + </panel> + </layout_panel> + <layout_panel name="pnl_combo" + border="false" + auto_resize="false" + user_resize="false" + visible="true" + height="29" + bg_alpha_color="blue" + background_visible="false"> + <combo_box + allow_text_entry="false" + follows="left|top" + height="23" + left="10" + max_chars="100" + mouse_opaque="true" + name="track_selection" + enabled="false" + top="1" + width="190"/> + </layout_panel> + <layout_panel name="temp" + border="false" + auto_resize="false" + user_resize="false" + height="29" + min_height="29"> + <button + follows="top|left" + height="20" + label="OK" + label_selected="OK" + layout="topleft" + left="2" + top="2" + name="btn_select" + width="100" /> + <button + follows="top|left" + height="20" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_delta="110" + top_delta="0" + name="btn_cancel" + width="100" /> + </layout_panel> + </layout_stack> + + <!-- middle: inventory mode --> + <!-- + + +--> + <!-- bottom static --> + <!-- + --> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml index a04050e7eb..a3ed22f422 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml @@ -1,226 +1,226 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - can_resize="true" - can_close="true" - bevel_style="in" - height="300" - layout="topleft" - min_height="40" - min_width="420" - name="Test Floater" - title="LAYOUTSTACK TESTS" - width="420"> - <layout_stack name="test_stack" - left="0" - top="0" - width="100" - height="250" - follows="left|top|bottom" - orientation="vertical"> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - visible="false" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - visible="true" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - </layout_stack> - <layout_stack name="test_stack" - left_pad="5" - top="0" - width="100" - height="250" - follows="left|top|bottom" - orientation="vertical"> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="100" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - visible="false" - bg_alpha_color="blue" - height="100" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="fixed" - auto_resize="false" - user_resize="true" - height="50" - min_height="10" - bg_alpha_color="green" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="fixed" + can_resize="true" + can_close="true" + bevel_style="in" + height="300" + layout="topleft" + min_height="40" + min_width="420" + name="Test Floater" + title="LAYOUTSTACK TESTS" + width="420"> + <layout_stack name="test_stack" + left="0" + top="0" + width="100" + height="250" + follows="left|top|bottom" + orientation="vertical"> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + visible="false" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + visible="true" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + </layout_stack> + <layout_stack name="test_stack" + left_pad="5" + top="0" + width="100" + height="250" + follows="left|top|bottom" + orientation="vertical"> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="100" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + visible="false" + bg_alpha_color="blue" + height="100" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="fixed" + auto_resize="false" + user_resize="true" + height="50" + min_height="10" + bg_alpha_color="green" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="fixed" auto_resize="false" - user_resize="true" + user_resize="true" height="50" min_height="10" bg_alpha_color="green" background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="100" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="100" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="100" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="100" - visible="true" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - </layout_stack> - <layout_stack name="test_stack" - left_pad="5" - top="0" - width="100" - height="250" - follows="left|top|bottom" - orientation="vertical"> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - height="11" - bg_alpha_color="blue" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="fixed" + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="100" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="100" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="100" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="100" + visible="true" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + </layout_stack> + <layout_stack name="test_stack" + left_pad="5" + top="0" + width="100" + height="250" + follows="left|top|bottom" + orientation="vertical"> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + height="11" + bg_alpha_color="blue" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="fixed" auto_resize="false" - user_resize="true" + user_resize="true" height="50" bg_alpha_color="green" background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - </layout_stack> - <layout_stack name="test_stack" - left_pad="5" - top="0" - width="100" - height="250" - follows="left|top|bottom" - orientation="vertical"> - <layout_panel name="fixed" + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + </layout_stack> + <layout_stack name="test_stack" + left_pad="5" + top="0" + width="100" + height="250" + follows="left|top|bottom" + orientation="vertical"> + <layout_panel name="fixed" auto_resize="false" - user_resize="true" + user_resize="true" height="50" bg_alpha_color="green" background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="fixed" + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="fixed" auto_resize="false" - user_resize="true" + user_resize="true" height="50" bg_alpha_color="green" background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="fixed" + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="fixed" auto_resize="false" - user_resize="true" + user_resize="true" height="50" bg_alpha_color="green" background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - <layout_panel name="flex" - auto_resize="true" - user_resize="true" - bg_alpha_color="blue" - height="11" - min_height="0" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel> - </layout_stack> + <text follows="top|left|right" halign="center" text_color="black">fixed</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index d122d7491c..a52d0a95d6 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -93,11 +93,22 @@ height="14" layout="topleft" left_delta="12" + name="size_lbl" + top_pad="4"> + Size: + </text> + + <text + type="string" + length="1" + follows="left|top" + height="14" + layout="topleft" + left_delta="0" name="unknown" top_pad="4"> - Size: [DIMENSIONS] + [DIMENSIONS] </text> - <!-- middle: inventory mode --> <button @@ -139,19 +150,20 @@ image_unselected="eye_button_inactive.tga" layout="topleft" left_delta="-80" - top_delta="-25" + top_delta="-10" name="Pipette" width="28" /> <text follows="left|bottom" - height="20" + height="40" layout="topleft" left="8" name="preview_disabled" - top="266" + top="285" value="Preview Disabled" + word_wrap="true" visible="false" - width="120" /> + width="87" /> <filter_editor follows="left|top|right" height="23" @@ -161,7 +173,7 @@ name="inventory search editor" top="20" width="231" /> - <inventory_panel + <asset_filtered_inv_panel allow_multi_select="false" bg_visible="true" bg_alpha_color="DkGray2" @@ -172,7 +184,8 @@ left_delta="0" name="inventory panel" top_pad="4" - width="231" /> + width="231" + filter_asset_type="texture"/> <check_box height="14" initial_value="false" @@ -301,7 +314,8 @@ height="20" initial_value="false" label="Hide Base Mesh Region" - layout="topleft" + +layout="topleft" name="hide_base_mesh_region" left_delta="0" top_pad="10" diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 3bdbbb04d7..9aa84c1bac 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -322,6 +322,41 @@ </menu_item_call> </menu> <menu + label="New Settings" + layout="topleft" + name="New Settings"> + <menu_item_call + label="New Sky" + layout="topleft" + name="New Sky"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="sky"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Water" + layout="topleft" + name="New Water"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="water"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Day Cycle" + layout="topleft" + name="New Day Cycle"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="daycycle"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + </menu_item_call> + </menu> + <menu label="Use as default for" layout="topleft" name="upload_def"> @@ -834,6 +869,25 @@ function="Inventory.DoToSelected" parameter="take_off" /> </menu_item_call> + <menu_item_separator + layout="topleft" + name="Settings Separator" /> + <menu_item_call + name="Settings Apply Local" + layout="topleft" + label="Apply Only To Myself"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="apply_settings_local" /> + </menu_item_call> + <menu_item_call + name="Settings Apply Parcel" + layout="topleft" + label="Apply To Parcel"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="apply_settings_parcel" /> + </menu_item_call> <menu_item_separator layout="topleft" name="Marketplace Separator" /> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index 05dd8f827d..3385a29a6c 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -253,4 +253,41 @@ parameter="eyes" /> </menu_item_call> </menu> -</menu> + <menu + label="New Settings" + layout="topleft" + name="New Settings"> + <menu_item_call + label="New Sky" + layout="topleft" + name="New Sky"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="sky"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + + </menu_item_call> + <menu_item_call + label="New Water" + layout="topleft" + name="New Water"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="water"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + + </menu_item_call> + <menu_item_call + label="New Day Cycle" + layout="topleft" + name="New Day Cycle"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="daycycle"/> + <menu_item_call.on_enable + function="Inventory.EnvironmentEnabled" /> + </menu_item_call> + </menu> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml new file mode 100644 index 0000000000..84dacaa8b8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="602" + layout="topleft" + mouse_opaque="false" + name="save_settings_menu" + width="120"> + <menu_item_check + name="save_settings" + label="Save"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="save" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="save"/> + </menu_item_check> + <menu_item_check + name="save_as_new_settings" + label="Save As"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="saveas" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="saveas" /> + </menu_item_check> + <menu_item_check + name="commit_changes" + label="Commit"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="commit" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="commit" /> + </menu_item_check> + <menu_item_check + name="apply_local" + label="Apply Only To Myself"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="local" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="local" /> + </menu_item_check> + <menu_item_check + name="apply_parcel" + label="Apply To Parcel"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="parcel" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="parcel" /> + </menu_item_check> + <menu_item_check + name="apply_region" + label="Apply To Region"> + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="region" /> + <menu_item_check.on_click + function="FlyoutCombo.Button.Action" + userdata="region" /> + </menu_item_check> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_settings_add.xml b/indra/newview/skins/default/xui/en/menu_settings_add.xml new file mode 100644 index 0000000000..a4782cfdc3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_settings_add.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + mouse_opaque="false" + name="menu_settings_add" + visible="false"> + <menu_item_call + label="New Sky" + layout="topleft" + name="New Sky"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="sky"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Water" + layout="topleft" + name="New Water"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="water"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Day Cycle" + layout="topleft" + name="New Day Cycle"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="daycycle"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> +</toggleable_menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml new file mode 100644 index 0000000000..ea8e328407 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + mouse_opaque="false" + name="menu_settings_gear" + visible="false"> + <menu_item_call + label="Edit" + layout="topleft" + name="edit_settings"> + <on_click + function="MyEnvironments.DoEdit" /> + <on_enable + function="MyEnvironments.EnableAction" + parameter="edit" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Separator" /> + <menu_item_call + name="Settings Apply Local" + layout="topleft" + label="Apply Only To Myself"> + <menu_item_call.on_click + function="MyEnvironments.DoApply" + parameter="local" /> + </menu_item_call> + <menu_item_call + name="Settings Apply Parcel" + layout="topleft" + label="Apply To Parcel"> + <menu_item_call.on_click + function="MyEnvironments.DoApply" + parameter="parcel" /> + <menu_item_call.on_enable + function="MyEnvironments.CanApply" + parameter="parcel"/> + </menu_item_call> + <menu_item_call + name="Settings Apply Region" + layout="topleft" + label="Apply To Region"> + <menu_item_call.on_click + function="MyEnvironments.DoApply" + parameter="region" /> + <menu_item_call.on_enable + function="MyEnvironments.CanApply" + parameter="region"/> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Separator" /> + <menu_item_call + label="Copy" + layout="topleft" + name="copy_settings"> + <on_click + function="MyEnvironments.CopyPaste" + parameter="copy" /> + <on_enable + function="MyEnvironments.EnableAction" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste_settings"> + <on_click + function="MyEnvironments.CopyPaste" + parameter="paste" /> + <on_enable + function="MyEnvironments.EnableAction" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Copy UUID" + layout="topleft" + name="copy_uuid"> + <on_click + function="MyEnvironments.CopyPaste" + parameter="copy_uuid" /> + <on_enable + function="MyEnvironments.EnableAction" + parameter="copy_uuid" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 52f8321271..7b61862f46 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -641,8 +641,8 @@ <menu create_jump_keys="true" - label="Sun" - name="Sun" + label="Environment" + name="Environment" tear_off="true"> <menu_item_check label="Sunrise" @@ -686,10 +686,9 @@ function="World.EnableEnvSettings" parameter="midnight" /> </menu_item_check> - <menu_item_separator/> <menu_item_check - label="Use Region Settings" - name="Use Region Settings"> + label="Use Shared Environment" + name="Use Shared Environment"> <menu_item_check.on_click function="World.EnvSettings" parameter="region" /> @@ -697,113 +696,105 @@ function="World.EnableEnvSettings" parameter="region" /> </menu_item_check> - </menu> - - + <menu_item_separator/> + <menu_item_call + label="My Environments..." + name="my_environs"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="my_environs" /> + </menu_item_call> + +<menu_item_call + label="Personal Lighting..." + name="adjustment_tool"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="adjust_tool" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_check + label="Pause Clouds" + name="pause_clouds"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="pause_clouds" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="pause_clouds" /> + </menu_item_check> + </menu> + +<!-- <menu create_jump_keys="true" label="Environment Editor" name="Environment Editor" tear_off="true"> - - <menu_item_call + <menu_item_call label="Environment Settings..." name="Environment Settings"> - <menu_item_call.on_click +<menu_item_call.on_click function="World.EnvSettings" parameter="editor"/> </menu_item_call> - - <menu_item_separator/> - - <menu + <menu_item_separator/> +<menu name="Water Presets" label="Water Presets"> - <menu_item_call - label="New preset..." +<menu_item_call +label="New preset..." name="new_water_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="new_water"/> - </menu_item_call> - <menu_item_call - label="Edit preset..." +</menu_item_call> +<menu_item_call +label="Edit preset..." name="edit_water_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="edit_water"/> - </menu_item_call> - <menu_item_call - label="Delete preset..." - name="delete_water_preset"> - <menu_item_call.on_click - function="World.EnvPreset" - parameter="delete_water"/> - <menu_item_call.on_enable - function="World.EnableEnvPreset" - parameter="delete_water"/> - </menu_item_call> - </menu> - - <menu - name="Sky Presets" +</menu_item_call> +</menu> + <menu +name="Sky Presets" label="Sky Presets"> - <menu_item_call - label="New preset..." +<menu_item_call +label="New preset..." name="new_sky_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="new_sky"/> - </menu_item_call> - <menu_item_call - label="Edit preset..." +</menu_item_call> +<menu_item_call +label="Edit preset..." name="edit_sky_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="edit_sky"/> - </menu_item_call> - <menu_item_call - label="Delete preset..." - name="delete_sky_preset"> - <menu_item_call.on_click - function="World.EnvPreset" - parameter="delete_sky"/> - <menu_item_call.on_enable - function="World.EnableEnvPreset" - parameter="delete_sky"/> - </menu_item_call> - </menu> - - <menu - name="Day Presets" +</menu_item_call> +</menu> +<menu +name="Day Presets" label="Day Presets"> - <menu_item_call - label="New preset..." +<menu_item_call +label="New preset..." name="new_day_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="new_day_cycle"/> - </menu_item_call> - <menu_item_call - label="Edit preset..." +</menu_item_call> +<menu_item_call +label="Edit preset..." name="edit_day_preset"> - <menu_item_call.on_click - function="World.EnvPreset" +<menu_item_call.on_click +function="World.EnvPreset" parameter="edit_day_cycle"/> - </menu_item_call> - <menu_item_call - label="Delete preset..." - name="delete_day_preset"> - <menu_item_call.on_click - function="World.EnvPreset" - parameter="delete_day_cycle"/> - <menu_item_call.on_enable - function="World.EnableEnvPreset" - parameter="delete_day_cycle"/> - </menu_item_call> - </menu> - </menu> - +</menu_item_call> +</menu> +</menu> +--> </menu> <menu @@ -1033,8 +1024,7 @@ shortcut="control|D"> <menu_item_call.on_click function="Object.Duplicate" /> - - </menu_item_call> + </menu_item_call> </menu> <menu create_jump_keys="true" @@ -2941,6 +2931,36 @@ parameter="TextureDisable" /> </menu_item_check> <menu_item_check + label="Disable Ambient" + name="Disable Ambient"> + <menu_item_check.on_check + function="CheckControl" + parameter="AmbientDisable" /> + <menu_item_check.on_click + function="ToggleShaderControl" + parameter="AmbientDisable" /> + </menu_item_check> + <menu_item_check + label="Disable Sunlight" + name="Disable Sunlight"> + <menu_item_check.on_check + function="CheckControl" + parameter="SunlightDisable" /> + <menu_item_check.on_click + function="ToggleShaderControl" + parameter="SunlightDisable" /> + </menu_item_check> + <menu_item_check + label="Disable Local Lights" + name="Disable Local Lights"> + <menu_item_check.on_check + function="CheckControl" + parameter="LocalLightDisable" /> + <menu_item_check.on_click + function="ToggleShaderControl" + parameter="LocalLightDisable" /> + </menu_item_check> + <menu_item_check label="Full Res Textures" name="Rull Res Textures"> <menu_item_check.on_check diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 57183ac3a6..61a23851ed 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5018,6 +5018,20 @@ Unchecking this option may remove restrictions that parcel owners have added to <notification icon="alertmodal.tga" + name="EstateParcelEnvironmentOverride" + type="alertmodal"> +(Estate-wide change: [ESTATENAME]) Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed. +Do you wish to proceed? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + + <notification + icon="alertmodal.tga" name="RegionEntryAccessBlocked" type="alertmodal"> <tag>fail</tag> @@ -6317,7 +6331,23 @@ This day cycle file references a missing sky file: [SKY]. icon="alertmodal.tga" name="WLRegionApplyFail" type="alertmodal"> -Sorry, the settings couldn't be applied to the region. Leaving the region and then returning may help rectify the problem. The reason given was: [FAIL_REASON] +Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON] + </notification> + + <notification + icon="alertmodal.tga" + name="WLLocalTextureDayBlock" + type="alertmodal"> +A Local texture is in use on track [TRACK], frame #[FRAMENO] ([FRAME]%) in field [FIELD]. +Settings may not be saved using local textures. + </notification> + + <notification + icon="alertmodal.tga" + name="WLLocalTextureFixedBlock" + type="alertmodal"> +A local texture is in use in field [FIELD]. +Settings may not be saved using local textures. </notification> <notification @@ -11422,4 +11452,190 @@ Cannot create large prims that intersect other residents. Please re-try when ot yestext="OK"/> </notification> + <notification + icon="notify.tga" + name="FailedToFindSettings" + persist="true" + type="alertmodal"> +Could not load the settings for [NAME] from the database. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="FailedToLoadSettingsApply" + persist="true" + type="alertmodal"> +Unable to apply those settings to the environment. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="FailedToBuildSettingsDay" + persist="true" + type="alertmodal"> +Unable to apply those settings to the environment. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="NoEnvironmentSettings" + persist="true" + type="alertmodal"> +This Region does not support environmental settings. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + label="Save Outfit" + name="SaveSettingAs" + type="alertmodal"> + <unique/> + Save current environmental settings as: + <tag>confirm</tag> + <form name="form"> + <input name="message" type="text"> + [DESC] (new) + </input> + <button + default="true" + index="0" + name="OK" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification + icon="notify.tga" + name="WLImportFail" + persist="true" + type="alertmodal"> +Unable to import legacy Windlight settings [NAME] from +[FILE]. + +[REASONS] + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="WLParcelApplyFail" + persist="true" + type="alertmodal"> +Unable to set the environment for this parcel. +Please enter or select a parcel that you have rights to modify. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="SettingsUnsuported" + persist="true" + type="alertmodal"> +Settings are not supported on this region. +Please move to a settings enabled region and retry your action. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" + name="SettingsConfirmLoss" + type="alertmodal"> +You are about to lose the changes you have made to this [TYPE] named "[NAME]". +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + ignoretext="Are you sure you want to lose changes?" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SettingsConfirmReset" + type="alertmodal"> +You are about to remove all applied settings. +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" + name="PersonalSettingsConfirmReset" + type="alertmodal"> +You are about to remove all applied Personal lighting settings. +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="No" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" + name="SettingsMakeNoTrans" + type="alertmodal"> +You are about to import non-transferable settings into this daycycle. Continuing will cause the settings you are editing to become non-transferable also. + +This change can not be undone. + +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + ignoretext="Are you sure you want to make settings non-transferable?" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> + + <notification + icon="notify.tga" + name="NoEditFromLibrary" + persist="true" + type="alertmodal"> +You may not edit settings directly from the libary. +Please copy to your own inventory and try again. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="EnvironmentApplyFailed" + persist="true" + type="alertmodal"> +We have encountered an issue with these settings. They can not be saved or applied at this time. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="TrackLoadFailed" + persist="true" + type="alertmodal"> +Unable to load the track into [TRACK]. + <tag>fail</tag> + </notification> + + <notification + icon="notify.tga" + name="TrackLoadMismatch" + persist="true" + type="alertmodal"> +Unable to load the track from [TRACK1] into [TRACK2]. + <tag>fail</tag> + </notification> + </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 3f13cea58e..afce9f6eb5 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -1,556 +1,556 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Side tray Outfit Edit panel --> <panel - background_visible="true" - border="false" - height="600" - follows="all" - layout="topleft" - help_topic="edit_outfit" - left="0" - min_height="350" - name="outfit_edit" - top="0" - width="320"> - <string - name="No Outfit" - value="No Outfit"/> - <string - name="unsaved_changes" - value="Unsaved Changes"/> - <string - name="now_editing" - value="Now Editing"/> - <string - name="folder_view_off" - value="Hierarchy_View_Disabled" - translate="false"/> - <string - name="folder_view_on" - value="Hierarchy_View_On" - translate="false"/> - <string - name="list_view_off" - value="List_View_Disabled" - translate="false"/> - <string - name="list_view_on" - value="List_View_On" - translate="false"/> + background_visible="true" + border="false" + height="600" + follows="all" + layout="topleft" + help_topic="edit_outfit" + left="0" + min_height="350" + name="outfit_edit" + top="0" + width="320"> + <string + name="No Outfit" + value="No Outfit"/> + <string + name="unsaved_changes" + value="Unsaved Changes"/> + <string + name="now_editing" + value="Now Editing"/> + <string + name="folder_view_off" + value="Hierarchy_View_Disabled" + translate="false"/> + <string + name="folder_view_on" + value="Hierarchy_View_On" + translate="false"/> + <string + name="list_view_off" + value="List_View_Disabled" + translate="false"/> + <string + name="list_view_on" + value="List_View_On" + translate="false"/> - <panel.string - name="not_available"> - (N\A) - </panel.string> - <panel.string - name="unknown"> - (unknown) - </panel.string> + <panel.string + name="not_available"> + (N\A) + </panel.string> + <panel.string + name="unknown"> + (unknown) + </panel.string> - <!-- Wearables filtering strings --> - <string name="Filter.All" value="All"/> - <string name="Filter.Clothes/Body" value="Clothes/Body"/> - <string name="Filter.Objects" value="Objects"/> - <string name="Filter.Clothing" value="Clothing"/> - <string name="Filter.Bodyparts" value="Body parts"/> + <!-- Wearables filtering strings --> + <string name="Filter.All" value="All"/> + <string name="Filter.Clothes/Body" value="Clothes/Body"/> + <string name="Filter.Objects" value="Objects"/> + <string name="Filter.Clothing" value="Clothing"/> + <string name="Filter.Bodyparts" value="Body parts"/> - <string - name="replace_body_part" - value="Click to replace your existing shape"/> + <string + name="replace_body_part" + value="Click to replace your existing shape"/> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back_btn" - left="5" - tab_stop="false" - top="1" - width="30" - use_draw_context_alpha="false" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="10" - name="title" - text_color="LtGray" - top="0" - value="Edit Outfit" - use_ellipses="true" - width="275" /> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back_btn" + left="5" + tab_stop="false" + top="1" + width="30" + use_draw_context_alpha="false" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="10" + name="title" + text_color="LtGray" + top="0" + value="Edit Outfit" + use_ellipses="true" + width="275" /> - <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" --> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - bevel_style="none" - follows="top|left|right" - height="40" - layout="topleft" - left="6" - name="header_panel" - top_pad="5" - width="311"> - <icon - follows="left|top" - height="31" - image_name="Shirt_Large" - left="2" - mouse_opaque="false" - name="outfit_icon" - top="2" - scale_image="true" - visible="true" - width="31" /> - <panel - bevel_style="none" - follows="top|left|right" - height="37" - layout="topleft" - left_pad="5" - name="outfit_name_and_status" - top="2" - width="270"> - <text - follows="top|left|right" - font="SansSerifSmallBold" - height="13" - layout="topleft" - name="status" - text_color="EmphasisColor" - top="2" - value="Now editing..." - use_ellipses="true" - width="245" /> - <text - follows="bottom|left|right" - font="SansSerifLargeBold" - height="18" - layout="topleft" - name="curr_outfit_name" - parse_urls="false" - text_color="LtGray" - top_pad="2" - value="[Current Outfit]" - use_ellipses="true" - width="245" /> - <loading_indicator - follows="right|top" - height="24" - layout="topleft" - right="-2" - name="edit_outfit_loading_indicator" - top="6" - width="24" /> - </panel> - </panel> + <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" --> + <panel + background_visible="true" + bg_alpha_color="DkGray2" + bevel_style="none" + follows="top|left|right" + height="40" + layout="topleft" + left="6" + name="header_panel" + top_pad="5" + width="311"> + <icon + follows="left|top" + height="31" + image_name="Shirt_Large" + left="2" + mouse_opaque="false" + name="outfit_icon" + top="2" + scale_image="true" + visible="true" + width="31" /> + <panel + bevel_style="none" + follows="top|left|right" + height="37" + layout="topleft" + left_pad="5" + name="outfit_name_and_status" + top="2" + width="270"> + <text + follows="top|left|right" + font="SansSerifSmallBold" + height="13" + layout="topleft" + name="status" + text_color="EmphasisColor" + top="2" + value="Now editing..." + use_ellipses="true" + width="245" /> + <text + follows="bottom|left|right" + font="SansSerifLargeBold" + height="18" + layout="topleft" + name="curr_outfit_name" + parse_urls="false" + text_color="LtGray" + top_pad="2" + value="[Current Outfit]" + use_ellipses="true" + width="245" /> + <loading_indicator + follows="right|top" + height="24" + layout="topleft" + right="-2" + name="edit_outfit_loading_indicator" + top="6" + width="24" /> + </panel> + </panel> - <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) --> - <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height. + <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) --> + <!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height. Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px. It is calculated as border_size + 2*UIResizeBarOverlap --> - <layout_stack - animate="true" - border_size="8" - clip="false" - default_tab_group="2" - follows="all" - height="465" - width="313" - layout="topleft" - orientation="vertical" - name="im_panels" - tab_group="1" - top_pad="5" - left="5"> - <layout_panel - layout="topleft" - height="187" - min_height="155" - name="outfit_wearables_panel" - width="313" - auto_resize="true" - user_resize="true"> + <layout_stack + animate="true" + border_size="8" + clip="false" + default_tab_group="2" + follows="all" + height="465" + width="313" + layout="topleft" + orientation="vertical" + name="im_panels" + tab_group="1" + top_pad="5" + left="5"> + <layout_panel + layout="topleft" + height="187" + min_height="155" + name="outfit_wearables_panel" + width="313" + auto_resize="true" + user_resize="true"> - <layout_stack - animate="true" - border_size="0" - follows="all" - height="185" - width="313" - orientation="vertical" - layout="topleft" - name="filter_panels" - top="0" - left="0"> - <layout_panel - auto_resize="true" - background_visible="false" - layout="topleft" - height="154" - name="add_button_and_combobox" - width="311" - visible="true"> + <layout_stack + animate="true" + border_size="0" + follows="all" + height="185" + width="313" + orientation="vertical" + layout="topleft" + name="filter_panels" + top="0" + left="0"> + <layout_panel + auto_resize="true" + background_visible="false" + layout="topleft" + height="154" + name="add_button_and_combobox" + width="311" + visible="true"> - <!-- List containing items from the COF and Base outfit --> - <panel - background_visible="false" - class="cof_wearables" - filename="panel_cof_wearables.xml" - follows="all" - height="129" - layout="topleft" - left="1" - name="cof_wearables_list" - top="0" - width="311" /> + <!-- List containing items from the COF and Base outfit --> + <panel + background_visible="false" + class="cof_wearables" + filename="panel_cof_wearables.xml" + follows="all" + height="129" + layout="topleft" + left="1" + name="cof_wearables_list" + top="0" + width="311" /> - <button - follows="left|bottom" - height="22" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Add More..." - layout="topleft" - left="2" - name="show_add_wearables_btn" - top_pad="2" - tool_tip="Open/Close" - width="125" /> + <button + follows="left|bottom" + height="22" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Add More..." + layout="topleft" + left="2" + name="show_add_wearables_btn" + top_pad="2" + tool_tip="Open/Close" + width="125" /> - <combo_box - follows="left|right|bottom" - height="22" - layout="topleft" - left_pad="5" - name="list_view_filter_combobox" - top_delta="0" - visible="false" - width="152"/> - <combo_box - follows="left|right|bottom" - height="22" - layout="topleft" - left_delta="0" - name="folder_view_filter_combobox" - top_delta="0" - visible="false" - width="152"/> + <combo_box + follows="left|right|bottom" + height="22" + layout="topleft" + left_pad="5" + name="list_view_filter_combobox" + top_delta="0" + visible="false" + width="152"/> + <combo_box + follows="left|right|bottom" + height="22" + layout="topleft" + left_delta="0" + name="folder_view_filter_combobox" + top_delta="0" + visible="false" + width="152"/> - <button - follows="bottom|right" - height="22" - image_overlay="Search_Icon" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - layout="topleft" - name="filter_button" - right="-5" - top_delta="0" - visible="false" - width="20" /> - </layout_panel> + <button + follows="bottom|right" + height="22" + image_overlay="Search_Icon" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + layout="topleft" + name="filter_button" + right="-5" + top_delta="0" + visible="false" + width="20" /> + </layout_panel> - <layout_panel - auto_resize="false" - background_visible="true" - bg_alpha_color="DkGray2" - height="30" - name="filter_panel" - width="311" - visible="false"> + <layout_panel + auto_resize="false" + background_visible="true" + bg_alpha_color="DkGray2" + height="30" + name="filter_panel" + width="311" + visible="false"> - <filter_editor - background_image="TextField_Search_Off" - enabled="true" - follows="left|right|top" - label="Filter Inventory Wearables" - layout="topleft" - left="5" - width="290" - height="25" - name="look_item_filter" - search_button_visible="true" - text_color="black" - visible="true"/> + <filter_editor + background_image="TextField_Search_Off" + enabled="true" + follows="left|right|top" + label="Filter Inventory Wearables" + layout="topleft" + left="5" + width="290" + height="25" + name="look_item_filter" + search_button_visible="true" + text_color="black" + visible="true"/> - </layout_panel> - </layout_stack> - </layout_panel> + </layout_panel> + </layout_stack> + </layout_panel> - <layout_panel background_visible="false" - bg_alpha_color="DkGray2" - auto_resize="true" - height="450" - min_height="80" - name="add_wearables_panel" - width="313" - tab_group="2" - user_resize="true" - visible="false"> + <layout_panel background_visible="false" + bg_alpha_color="DkGray2" + auto_resize="true" + height="450" + min_height="80" + name="add_wearables_panel" + width="313" + tab_group="2" + user_resize="true" + visible="false"> - <!-- this icon represent dragbar between layout panels. + <!-- this icon represent dragbar between layout panels. This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) --> - <icon follows="left|top|right" - height="10" - image_name="Dragbar" - left="0" - top_pad="-9" - width="313" /> - <inventory_panel allow_multi_select="true" - background_visible="false" - border="false" - follows="left|top|right|bottom" - height="418" - layout="topleft" - left="0" - mouse_opaque="false" - name="folder_view" - top_pad="0" - width="313" - visible="false"/> - <panel name="filtered_wearables_panel" - background_opaque="true" - background_visible="false" - layout="topleft" - follows="left|top|right|bottom" - border="false" - height="418" - left="0" - mouse_opaque="false" - width="310" - top_delta="0" - visible="true"> - <wearable_items_list color="0.107 0.107 0.107 1" - name="list_view" - allow_select="true" - layout="topleft" - follows="all" - multi_select="true" - width="313" - height="418" - left="0" - top="0"/> - </panel> - <button follows="bottom|left" - height="22" - left="2" - label="Wear Item" - layout="topleft" - name="plus_btn" - top_pad="5" - width="130" /> - </layout_panel> - </layout_stack> + <icon follows="left|top|right" + height="10" + image_name="Dragbar" + left="0" + top_pad="-9" + width="313" /> + <inventory_panel allow_multi_select="true" + background_visible="false" + border="false" + follows="left|top|right|bottom" + height="418" + layout="topleft" + left="0" + mouse_opaque="false" + name="folder_view" + top_pad="0" + width="313" + visible="false"/> + <panel name="filtered_wearables_panel" + background_opaque="true" + background_visible="false" + layout="topleft" + follows="left|top|right|bottom" + border="false" + height="418" + left="0" + mouse_opaque="false" + width="310" + top_delta="0" + visible="true"> + <wearable_items_list color="0.107 0.107 0.107 1" + name="list_view" + allow_select="true" + layout="topleft" + follows="all" + multi_select="true" + width="313" + height="418" + left="0" + top="0"/> + </panel> + <button follows="bottom|left" + height="22" + left="2" + label="Wear Item" + layout="topleft" + name="plus_btn" + top_pad="5" + width="130" /> + </layout_panel> + </layout_stack> - <!-- BUTTON BAR --> - <panel - background_visible="true" - bevel_style="none" - follows="bottom|left|right" - height="27" - layout="topleft" - left="5" - name="no_add_wearables_button_bar" - top_pad="0" - width="313"> - <menu_button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Left_Over" - image_overlay="OptionsMenu_Off" - image_selected="Toolbar_Left_Selected" - image_unselected="Toolbar_Left_Off" - layout="topleft" - left="0" - name="gear_menu_btn" - top="1" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_right_icon" - width="250" /> - <button - follows="bottom|right" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="Shop" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="shop_btn_1" - top="1" - tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" - width="31" /> - </panel> + <!-- BUTTON BAR --> + <panel + background_visible="true" + bevel_style="none" + follows="bottom|left|right" + height="27" + layout="topleft" + left="5" + name="no_add_wearables_button_bar" + top_pad="0" + width="313"> + <menu_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="gear_menu_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_right_icon" + width="250" /> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="shop_btn_1" + top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" + width="31" /> + </panel> - <!-- BUTTON BAR - WEARABLES ADDING MODE --> - <panel - background_visible="true" - bevel_style="none" - follows="left|right|bottom" - height="27" - layout="topleft" - left="5" - name="add_wearables_button_bar" - top_delta="0" - visible="false" - width="313"> - <menu_button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Left_Over" - image_overlay="OptionsMenu_Off" - image_selected="Toolbar_Left_Selected" - image_unselected="Toolbar_Left_Off" - layout="topleft" - left="0" - name="wearables_gear_menu_btn" - top="1" - width="31" /> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Hierarchy_View_Disabled" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - is_toggle="true" - layout="topleft" - left_pad="1" - name="folder_view_btn" - top="1" - width="31" /> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="List_View_On" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - is_toggle="true" - layout="topleft" - left_pad="1" - name="list_view_btn" - top="1" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_right_icon" - width="186" > - </icon> - <button - follows="bottom|right" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="Shop" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="shop_btn_2" - top="1" - tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" - width="31" /> - </panel> + <!-- BUTTON BAR - WEARABLES ADDING MODE --> + <panel + background_visible="true" + bevel_style="none" + follows="left|right|bottom" + height="27" + layout="topleft" + left="5" + name="add_wearables_button_bar" + top_delta="0" + visible="false" + width="313"> + <menu_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="wearables_gear_menu_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Hierarchy_View_Disabled" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + layout="topleft" + left_pad="1" + name="folder_view_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="List_View_On" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + layout="topleft" + left_pad="1" + name="list_view_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_right_icon" + width="186" > + </icon> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="shop_btn_2" + top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" + width="31" /> + </panel> - <!-- SAVE AND REVERT BUTTONS --> - <panel - follows="left|right|bottom" - height="30" - layout="topleft" - left="4" - top_pad="2" - name="save_revert_button_bar" - width="300"> - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - mouse_opaque="false" - name="button_bar_ls" - left="0" - orientation="horizontal" - top="0" - width="313"> - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - mouse_opaque="false" - name="save_btn_lp" - auto_resize="true" - width="156"> - <button - follows="bottom|left|right" - height="23" - label="Save" - left="1" - layout="topleft" - name="save_btn" - top="0" - width="155" /> - <button - follows="bottom|right" - height="23" - name="save_flyout_btn" - label="" - layout="topleft" - left_pad="-20" - tab_stop="false" - top="0" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> - </layout_panel> - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - mouse_opaque="false" - name="revert_btn_lp" - auto_resize="true" - width="147"> - <button - follows="bottom|left|right" - height="23" - left="0" - label="Undo Changes" - layout="topleft" - name="revert_btn" - top="0" - tool_tip="Revert to last saved version" - width="147" /> - </layout_panel> - </layout_stack> - </panel> + <!-- SAVE AND REVERT BUTTONS --> + <panel + follows="left|right|bottom" + height="30" + layout="topleft" + left="4" + top_pad="2" + name="save_revert_button_bar" + width="300"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_bar_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save" + left="1" + layout="topleft" + name="save_btn" + top="0" + width="155" /> + <button + follows="bottom|right" + height="23" + name="save_flyout_btn" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + top="0" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + auto_resize="true" + width="147"> + <button + follows="bottom|left|right" + height="23" + left="0" + label="Undo Changes" + layout="topleft" + name="revert_btn" + top="0" + tool_tip="Revert to last saved version" + width="147" /> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 4692a226d9..4d9152e9a5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -242,7 +242,7 @@ top_delta="24" width="280"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <check_box @@ -256,7 +256,7 @@ top_delta="24" width="256"> <check_box.commit_callback - function="Pref.VertexShaderEnable" /> + function="Pref.RenderOptionUpdate" /> </check_box> <slider diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index aa38c49fae..edf1e1efd4 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -1,149 +1,903 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="top|left" - height="300" - label="Environment" - layout="topleft" - help_topic="panel_region_environment_tab" - name="panel_env_info" - width="530"> - <text - name="water_settings_title" - follows="top|left" - height="30" - layout="topleft" - left="50" - top_pad="20" - width="430" - wrap="true"> - Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see. More info - </text> - <view_border - bevel_style="none" - follows="top|left" - height="237" - layout="topleft" - left="50" - name="border" - top="60" - width="430"/> - <radio_group - follows="top|left" - height="45" - layout="topleft" - left_delta="10" - name="region_settings_radio_group" - top_delta="20" - width="200"> - <radio_item - label="Use Second Life default" - layout="topleft" - name="use_sl_default_settings"/> - <radio_item - label="Use the following settings" - layout="topleft" - name="use_my_settings" - top_pad="20"/> - </radio_group> - <panel - follows="top|left" - height="150" - layout="topleft" - left="50" - name="user_environment_settings" - top_pad="20" - width="430"> - <text - name="water_settings_title" - follows="top|left" - height="16" - layout="topleft" - left="50" - top_pad="0" - width="160"> - Water Setting - </text> - <combo_box - follows="top|left" - left_pad="2" - name="water_settings_preset_combo" - top_delta="-7" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - <text - name="sky_dayc_settings_title" - follows="top|left" - height="16" - layout="topleft" - left="50" - top_pad="30" - width="100"> - Sky / Day Cycle - </text> - <radio_group - layout="topleft" - left_delta="50" - name="sky_dayc_settings_radio_group" - top_pad="10" - height="50" - width="110"> - <radio_item - layout="topleft" - label="Fixed sky" - name="my_sky_settings"/> - <radio_item - layout="topleft" - label="Day cycle" - name="my_dayc_settings" - top_pad="25"/> - </radio_group> - <combo_box - follows="top|left" - left_pad="2" - name="sky_settings_preset_combo" - top_delta="-7" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - <combo_box - follows="top|left" - name="dayc_settings_preset_combo" - top_delta="36" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0"/> - </combo_box> - </panel> - <button - follows="left|top" - height="23" - label="Apply" - layout="topleft" - right="-160" - name="apply_btn" - top_pad="10" - width="100" /> - <button - follows="left|top" - height="23" - label="Cancel" - layout="topleft" - left_pad="10" - name="cancel_btn" - width="100" /> - <loading_indicator - height="23" - left="50" - name="progress_indicator" - top_delta="0" - visible="false" - width="23" /> + border="true" + follows="all" + height="375" + label="Environment" + layout="topleft" + help_topic="panel_region_environment_tab" + name="panel_env_info" + width="530"> + <string name="str_label_use_default">Use Default Settings</string> + <string name="str_label_use_region">Use Region Settings</string> + <string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string> + <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string> + <string name="str_cross_region">Environmental settings are not available across region boundries.</string> + <string name="str_legacy">Environmental settings are not available on this region.</string> + <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string> + <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string> + <string name="str_empty">(empty)</string> + <string name="str_region_env">(region environment)</string> + + <layout_stack + width="530" + height="400" + follows="all" + layout="topleft" + left="0" + animate="false" + orientation="vertical"> + <layout_panel + user_resize="false" + auto_resize="false" + height="20" + name="pnl_environment_region_msg" + top="0"> + <text follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="region_text_lbl" + top="6" + width="100"> + Region: + </text> + <text follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_text" + top_delta="0" + width="400"> + unknown + </text> + </layout_panel> + <layout_panel + user_resize="false" + name="pnl_environment_disabled" + visible="false"> + <text follows="top|left|bottom|right" + halign="center" + valign="top" + top_pad="40" + name="txt_environment_disabled" + text_color="white"> + ... + </text> + </layout_panel> + <layout_panel + user_resize="false" + min_height="0" + top="0" + name="pnl_environment_config" + visible="true"> + <layout_stack + follows="all" + layout="topleft" + animate="false" + orientation="horizontal"> + <layout_panel + user_resize="false" + min_height="0" + top="0" + name="pnl_environment_config" + visible="true"> + <layout_stack + follows="all" + layout="topleft" + animate="false" + orientation="vertical"> + <layout_panel + min_height="140" + follows="all" + border="true" + bevel_style="in" + name="pnl_environment_current"> + <text follows="top|left" + font="SansSerif" + halign="left" + text_color="white" + left="5" + top="2">Select Environment</text> + <button + follows="top|left" + top_pad="20" + left_delta="10" + layout="topleft" + height="23" + label="[USEDEFAULT]" + width="120" + name="btn_usedefault"/> + <button + follows="top|left" + top_pad="5" + left_delta="0" + layout="topleft" + height="23" + label="Use Inventory" + width="120" + name="btn_select_inventory"/> + <button + follows="top|left" + top_pad="5" + left_delta="0" + layout="topleft" + height="23" + label="Customize" + width="120" + name="btn_edit"/> + <check_box + height="20" + label="Parcel Owners May Override Environment" + layout="topleft" + left_delta="0" + top_pad="10" + name="chk_allow_override" + width="200" /> + </layout_panel> + <layout_panel + min_height="130" + follows="all" + border="true" + bevel_style="in" + name="pnl_environment_length"> + <text + font="SansSerif" + follows="top|left|right" + halign="left" + text_color="white" + left="5" + top="2">Day Settings</text> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="10" + top_pad="16" + width="200"> + Day Length (hours) + </text> + <slider + can_edit_text="true" + decimal_digits="1" + follows="top|left|right" + layout="topleft" + increment="0.5" + height="20" + width="237" + left="10" + top_pad="0" + right="-10" + initial_value="4" + name="sld_day_length" + min_val="4" + max_val="168" /> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + top_pad="5" + width="200"> + Day Offset (hours) + </text> + <slider + can_edit_text="true" + decimal_digits="1" + follows="top|left|right" + layout="topleft" + height="20" + width="237" + increment="0.5" + initial_value="-8" + left="10" + top_pad="0" + right="-10" + name="sld_day_offset" + min_val="-11.5" + max_val="12" /> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + top_pad="5" + width="200"> + Apparent Time of Day: + </text> + <text + name="lbl_apparent_time" + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="10" + top_pad="5" + width="200"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel + follows="bottom" + border="true" + bevel_style="in" + name="pnl_environment_buttons"> +<!-- used to be buttons, but now spacer. +--> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + user_resize="false" + min_height="0" + top="0" + name="pnl_environment_altitudes" + visible="true"> + <!-- Three movable panels first so that they will be 'below' slider--> + <panel + follows="top|left" + height="26" + width="360" + layout="topleft" + visible="true" + left="1" + top="30" + name="pnl_alt1"> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="24" + width="52" + left_delta="2" + top_pad="1" + halign="right" + name="txt_alt1"> + Sky [INDEX] + [ALTITUDE]m + </text> + <line_editor + follows="left|top" + enabled="false" + top_delta="3" + left_pad="21" + height="20" + layout="topleft" + name="edt_invname_alt1" + use_bg_color="true" + bg_color="TextBgReadOnlyColor" + width="155"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_delta="0" + left_delta="0" + follows="top|left" + layout="topleft" + name="sdt_alt1" + tool_tip="Drag a setting from Inventory onto this target box to select it as current sky." + width="155" /> + </panel> + <panel + follows="top|left" + height="26" + width="360" + layout="topleft" + visible="true" + left="1" + top="60" + name="pnl_alt2"> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="24" + width="52" + left_delta="2" + top_pad="1" + halign="right" + name="txt_alt2"> + Sky [INDEX] + [ALTITUDE]m + </text> + <line_editor + follows="left|top" + enabled="false" + top_delta="3" + left_pad="21" + height="20" + layout="topleft" + name="edt_invname_alt2" + use_bg_color="true" + bg_color="TextBgReadOnlyColor" + width="155"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_delta="0" + left_delta="0" + follows="top|left" + layout="topleft" + name="sdt_alt2" + tool_tip="Drag a setting from Inventory onto this target box to select it as current sky." + width="155" /> + </panel> + <panel + follows="top|left" + height="26" + width="360" + layout="topleft" + visible="true" + left="1" + top="90" + name="pnl_alt3"> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="25" + width="52" + left_delta="2" + top_pad="1" + halign="right" + name="txt_alt3"> + Sky [INDEX] + [ALTITUDE]m + </text> + <line_editor + follows="left|top" + enabled="false" + top_delta="3" + left_pad="21" + height="20" + layout="topleft" + name="edt_invname_alt3" + use_bg_color="true" + bg_color="TextBgReadOnlyColor" + width="155"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_delta="0" + left_delta="0" + follows="top|left" + layout="topleft" + name="sdt_alt3" + tool_tip="Drag a setting from Inventory onto this target box to select it as current sky." + width="155" /> + </panel> + <text follows="top|left" + font="SansSerif" + halign="left" + text_color="white" + left="5" + top="2">Sky Altitudes</text> + <!-- Divider icons also should be under slider to not interfer with clicks--> + <icon + color="LtGray" + height="2" + width="17" + image_name="Rounded_Square" + layout="topleft" + left="57" + top="89" + name="mark0"/> + <icon + color="LtGray" + height="2" + width="17" + image_name="Rounded_Square" + layout="topleft" + left_delta="0" + top_delta="69" + name="mark1"/> + <icon + color="LtGray" + height="2" + width="17" + image_name="Rounded_Square" + layout="topleft" + left_delta="0" + top_delta="69" + name="mark2"/> + <multi_slider + height="270" + follows="top|left" + orientation="vertical" + increment="25" + min_val="100" + max_val="4000" + thumb_image="Inv_SettingsSky" + thumb_width="17" + thumb_highlight_color="white" + decimal_digits="0" + draw_track="true" + overlap_threshold="100" + initial_value="0" + layout="topleft" + left="57" + max_sliders="3" + name="sld_altitudes" + show_text="false" + top="20" + use_triangle="false" + width="17"> + <slider name="sld1" + value="1000"/> + <slider name="sld2" + value="2000"/> + <slider name="sld3" + value="3000"/> + </multi_slider> + <panel + follows="top|left" + height="21" + width="360" + layout="topleft" + visible="true" + left="1" + top_pad="10" + name="pnl_ground"> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="12" + width="52" + left_delta="2" + top_pad="2" + halign="right" + name="txt_ground"> + Ground + </text> + <icon + follows="top|left" + height="17" + width="17" + image_name="Inv_SettingsSky" + layout="topleft" + name="icon_ground" + mouse_opaque="false" + visible="true" + top_delta="-3" + left_pad="2"/> + <line_editor + follows="left|top" + enabled="false" + top_delta="-1" + left_pad="2" + height="20" + layout="topleft" + name="edt_invname_ground" + use_bg_color="true" + bg_color="TextBgReadOnlyColor" + width="155"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_delta="0" + left_delta="0" + follows="top|left" + layout="topleft" + name="sdt_ground" + tool_tip="Drag a setting from Inventory onto this target box to select it as the ground level sky." + width="155" /> + </panel> + <panel + follows="top|left" + height="21" + width="360" + layout="topleft" + visible="true" + left="1" + top_pad="10" + name="pnl_water"> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="12" + width="52" + left_delta="2" + top_pad="2" + halign="right" + name="txt_water"> + Water + </text> + <icon + follows="left|top" + height="17" + width="17" + image_name="Inv_SettingsWater" + layout="topleft" + name="icon_water" + mouse_opaque="false" + visible="true" + top_delta="-3" + left_pad="2"/> + <line_editor + follows="left|top" + enabled="false" + top_delta="-1" + left_pad="2" + height="20" + layout="topleft" + name="edt_invname_water" + use_bg_color="true" + bg_color="TextBgReadOnlyColor" + width="155"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_delta="0" + left_delta="0" + follows="top|left" + layout="topleft" + name="sdt_water" + tool_tip="Drag a setting from Inventory onto this target box to select it as current water." + width="155" /> + </panel> + <button + follows="top|right" + layout="topleft" + height="23" + width="100" + label="Reset" + right="-10" + top_pad="4" + tool_tip="Reset to default altitudes" + name="btn_rst_altitudes" /> + </layout_panel> + </layout_stack> + </layout_panel> + <!-- + <layout_panel + user_resize="false" + height="155" + min_height="0" + name="pnl_environment_config" + visible="true"> + <layout_stack + left="5" + top="0" + right="-5" + bottom="-1" + layout="topleft" + follows="all" + animate="false" + orientation="horizontal"> + <layout_panel + background_visible="true" + border="true" + bevel_style="in" + user_resize="false" + width="260" + min_width="260" + name="pnl_environment_current"> + <text follows="top|left" + font="SansSerif" + halign="left" + text_color="white" + top="2">Current Environment</text> + <radio_group + height="90" + layout="topleft" + top_pad="8" + left_delta="10" + name="rdg_environment_select"> + <radio_item + label="[USEDEFAULT]" + layout="topleft" + name="rdo_use_xxx_setting" + height="20"/> + <radio_item + label="Settings From Inventory" + layout="topleft" + valign="top" + name="rdo_use_inv_setting" + height="20"/> + <radio_item + top_pad="25" + label="Custom Environment" + layout="topleft" + height="20" + name="rdo_use_custom_setting"/> + </radio_group> + <line_editor + follows="top|left" + enabled="false" + left_delta="20" + top_delta="50" + height="20" + layout="topleft" + name="edt_inventory_name" + width="200"> + Unknown + </line_editor> + <settings_drop_target + height="20" + top_pad="-20" + follows="top|left" + layout="topleft" + name="sdt_drop_target" + tool_tip="Drag a setting from Inventory onto this target box to select it as current evironment." + width="200" /> + <button + name="btn_select_inventory" + follows="top|left" + image_overlay="Command_Inventory_Icon" + layout="topleft" + height="20" + width="20" + left_delta="205" + top_delta="0"/> + <button + follows="top|left" + top_pad="25" + left_delta="-205" + layout="topleft" + height="23" + label="Edit Environment" + width="120" + name="btn_edit"/> + + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + user_resize="false" + width="260" + min_width="260" + background_visible="true" + name="pnl_environment_length"> + <text + font="SansSerif" + follows="top|left|right" + halign="left" + text_color="white" + top="2">Day Settings</text> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="10" + top_pad="14" + width="200"> + Day Length (hours) + </text> + <slider + can_edit_text="true" + decimal_digits="1" + follows="left|top" + height="20" + increment="0.5" + initial_value="4" + layout="topleft" + left_delta="0" + top_pad="6" + name="sld_day_length" + min_val="4" + max_val="168" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + top_pad="10" + width="200"> + Day Offset (hours) + </text> + <slider + can_edit_text="true" + decimal_digits="1" + follows="left|top" + height="20" + increment="0.5" + initial_value="-8" + layout="topleft" + left_delta="0" + top_pad="6" + name="sld_day_offset" + min_val="-12" + max_val="12" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + top_pad="10" + width="200"> + Apparent Time of Day: + </text> + <text + name="lbl_apparent_time" + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="10" + top_pad="5" + width="200"> + [HH]:[MM][AP] ([PRC]%) + </text> + + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + user_resize="false" + height="155" + min_height="0" + name="pnl_environment_altitudes" + visible="true"> + <panel + left="5" + top="0" + bottom="-1" + width="260" + follows="left|top|bottom" + background_visible="true" + border="true" + bevel_style="in" + name="cnt_panel"> + <text follows="top|left" + font="SansSerif" + halign="left" + text_color="white" + top="2">Sky Altitudes</text> + <multi_slider + decimal_digits="0" + follows="bottom" + height="123" + width="17" + orientation="vertical" + increment="10" + overlap_threshold="100" + min_val="100" + max_val="4000" + layout="topleft" + left="15" + top="20" + max_sliders="20" + name="sld_altitudes" + show_text="false" + thumb_image="Inv_SettingsSky" + thumb_width="17" + thumb_highlight_color="white"> + <slider name="sld1" + value="200"/> + <slider name="sld2" + value="400"/> + <slider name="sld3" + value="600"/> + </multi_slider> + <icon + follows="left|top" + height="17" + width="17" + image_name="Inv_SettingsSky" + layout="topleft" + name="icon_ground" + mouse_opaque="false" + visible="true" + left_delta="0" + top_pad="-9"/> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_pad="3" + top_delta="2" + width="200" + name="ground"> + Ground + </text> + <text + type="string" + length="1" + follows="left" + height="12" + layout="topleft" + left="35" + top="30" + width="200" + name="alt1"> + Sky [INDEX]([ALTITUDE]m) + </text> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="35" + top="40" + width="200" + name="alt2"> + Sky [INDEX]([ALTITUDE]m) + </text> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="35" + top="50" + width="200" + name="alt3"> + Sky [INDEX]([ALTITUDE]m) + </text> + </panel> + </layout_panel> + <layout_panel + user_resize="false" + height="0" + min_height="0" + name="pnl_auto_adjust" + visible="true"/> + <layout_panel + user_resize="false" + height="59" + min_height="59" + name="pnl_environment_buttons"> + <check_box + height="20" + label="Parcel Owners May Override Environment" + layout="topleft" + left="10" + top="0" + name="chk_allow_override" + width="200" /> + <button + follows="top|left" + height="23" + label="Apply" + top_pad="5" + name="btn_apply" + width="100" /> + <button + follows="top|left" + height="23" + label="Reset" + layout="topleft" + left_pad="10" + top_delta="0" + name="btn_cancel" + width="100" /> + + </layout_panel> +--> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..bec793bbee --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + label="Atmosphere & Lighting" + layout="topleft" + left="0" + name="panel_settings_sky_atmos" + top="0"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="false" + user_resize="false" + visible="true" + height="75"> + + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + width="80"> + Ambient Color: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="ambient_light" + top_pad="5" + width="60" /> + <text + follows="left" + height="10" + layout="topleft" + left_delta="90" + top_delta="-15" + width="80"> + Blue Horizon: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="blue_horizon" + top_pad="5" + width="60" /> + <text + follows="left" + height="10" + layout="topleft" + left_delta="90" + top_delta="-15" + width="80"> + Blue Density: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="blue_density" + top_pad="5" + width="60" /> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true"> + <layout_stack name="atmosphere1" + left="5" + top="5" + right="-5" + bottom="-5" + follows="left|top|right|bottom" + orientation="hoizontal"> + <layout_panel + border="false" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + min_width="225"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + width="80"> + Haze Horizon: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="5" + name="haze_horizon" + top_delta="20" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Haze Density: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="5" + name="haze_density" + top_delta="20" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Moisture Level: + </text> + <slider + decimal_digits="3" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + left_delta="5" + top_delta="20" + layout="topleft" + min_val="0" + max_val="1" + name="moisture_level" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Droplet Radius: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="14" + increment="0.01" + initial_value="0" + left_delta="5" + top_delta="20" + layout="topleft" + min_val="5.0" + max_val="1000.0" + name="droplet_radius" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Ice Level: + </text> + <slider + decimal_digits="1" + follows="left|top" + height="14" + increment="0.1" + initial_value="0" + left_delta="5" + top_delta="20" + layout="topleft" + min_val="0" + max_val="1" + name="ice_level" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Scene Gamma: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + max_val="20" + name="scene_gamma" + top_delta="20" + width="207" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="false" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + min_width="225"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + width="200"> + Density Multiplier: + </text> + <slider + decimal_digits="4" + follows="left|top" + height="16" + increment="0.0001" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.0001" + max_val="2" + name="density_multip" + top_delta="20" + width="219" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="200"> + Distance Multiplier: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0.8" + layout="topleft" + left_delta="5" + min_val="0.05" + max_val="1000" + name="distance_multip" + top_delta="20" + width="219" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="200"> + Maximum Altitude: + </text> + <slider + decimal_digits="1" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="10000" + name="max_alt" + top_delta="20" + width="219" + can_edit_text="true"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..ac3b45d24c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml @@ -0,0 +1,271 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + label="Clouds" + layout="topleft" + left="0" + help_topic="land_general_tab" + name="panel_settings_sky_clouds" + top="0"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="hoizontal"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="75"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + width="80"> + Cloud Color: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="cloud_color" + top_pad="5" + width="60" /> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + top_delta="47" + width="200"> + Cloud Coverage: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="cloud_coverage" + top_delta="20" + width="214" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="200"> + Cloud Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.01" + max_val="3" + name="cloud_scale" + top_delta="20" + width="214" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="200"> + Cloud Variance: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1.0" + name="cloud_variance" + top_delta="20" + width="214" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="200"> + Cloud Scroll: + </text> + <xy_vector + follows="left|top" + name="cloud_scroll_xy" + width="127" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-30" + max_val_x="30" + min_val_y="-30" + max_val_y="30" + logarithmic="1"/> + + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="160" + top_delta="-20" + width="200"> + Cloud Image: + </text> + <texture_picker + height="123" + layout="topleft" + left_delta="5" + name="cloud_map" + top_pad="10" + width="100"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="75"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + width="200"> + Cloud Density: + </text> + <slider + label="X" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="cloud_density_x" + top_delta="20" + width="200" + can_edit_text="true"/> + <slider + label="Y" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + min_val="0" + max_val="1" + name="cloud_density_y" + top_delta="20" + width="200" + can_edit_text="true"/> + <slider + label="D" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + min_val="0" + max_val="3" + name="cloud_density_d" + top_delta="20" + width="200" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="35" + width="200"> + Cloud Detail: + </text> + <slider + label="X" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="cloud_detail_x" + top_delta="20" + width="200" + can_edit_text="true"/> + <slider + label="Y" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + min_val="0" + max_val="1" + name="cloud_detail_y" + top_delta="20" + width="200" + can_edit_text="true"/> + <slider + label="D" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="0" + min_val="0" + max_val="1" + name="cloud_detail_d" + top_delta="20" + width="200" + can_edit_text="true"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml new file mode 100644 index 0000000000..b3a33961bc --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml @@ -0,0 +1,273 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + label="Density" + layout="topleft" + left="0" + help_topic="sky_density" + name="panel_settings_sky_density" + top="0"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="12"> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="rayleigh_exponential" + label="Rayleigh Exponential Term:" + top_pad="12" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.000001" + initial_value="0" + layout="topleft" + min_val="-0.01" + max_val="0.01" + name="rayleigh_exponential_scale" + label="Rayleigh Exponential Scale:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="0.00001" + name="rayleigh_linear" + label="Rayleigh Linear Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="rayleigh_constant" + label="Rayleigh Constant Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="1" + follows="left|top" + height="14" + initial_value="0" + layout="topleft" + min_val="1000" + max_val="40000" + name="rayleigh_max_altitude" + label="Rayleigh Max Altitude:" + width="400" + label_width="160" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="14"> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="3.0" + name="mie_exponential" + label="Mie Exponential Term:" + top_pad="12" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="-0.01" + max_val="0.01" + name="mie_exponential_scale" + label="Mie Exponential Scale:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="0.000004" + name="mie_linear" + label="Mie Linear Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="mie_constant" + label="Mie Constant Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="14" + increment="0.01" + initial_value="0" + layout="topleft" + min_val="0.2" + max_val="1.8" + name="mie_aniso_factor" + label="Mie Aniso Factor:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="1" + follows="left|top" + height="14" + increment="0.1" + initial_value="0" + layout="topleft" + min_val="1000" + max_val="30000" + name="mie_max_altitude" + label="Mie Max Altitude:" + width="400" + label_width="160" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="12"> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="absorption_exponential" + label="Absorption Exponential Term:" + top_pad="8" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="-1" + max_val="1" + name="absorption_exponential_scale" + label="Absorption Exponential Scale:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="absorption_linear" + label="Absorption Linear Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="6" + follows="left|top" + height="14" + increment="0.0000001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="absorption_constant" + label="Absorption Constant Term:" + width="400" + label_width="160" + can_edit_text="true"/> + <slider + decimal_digits="1" + follows="left|top" + height="14" + increment="0.1" + initial_value="0" + layout="topleft" + min_val="1000" + max_val="25000" + name="absorption_max_altitude" + label="Absorption Max Altitude:" + width="400" + label_width="160" + can_edit_text="true"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..0e3de821d1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml @@ -0,0 +1,319 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + label="Sun & Moon" + layout="topleft" + left="0" + name="panel_settings_sky_hbodies" + top="0"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="horizontal"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + name="sun_layout" + height="400"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + font="SansSerifBold" + width="120"> + Sun & Stars + </text> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="10" + top_delta="30" + width="100"> + Position: + </text> + <sun_moon_trackball + name="sun_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="sun" /> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="160" + top_delta="-20" + width="200"> + Image: + </text> + <texture_picker + height="123" + layout="topleft" + left_delta="5" + name="sun_image" + top_pad="10" + width="100"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="110" + width="80"> + Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.25" + max_val="20" + name="sun_scale" + top_delta="15" + width="130" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="20" + width="80"> + Color: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="5" + name="sun_moon_color" + top_pad="5" + width="60" /> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-160" + top_delta="27" + width="200"> + Glow Focus: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="-2" + max_val="2" + name="glow_focus" + top_delta="15" + width="250" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="22" + width="200"> + Glow Size: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1.99" + name="glow_size" + top_delta="15" + width="250" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="22" + width="200"> + Star Brightness: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="500" + name="star_brightness" + top_delta="15" + width="250" + can_edit_text="true"/> + + <check_box + control_name="sunbeacon" + width="60" + height="16" + label="Show Beacon" + layout="topleft" + name="sunbeacon" + right="-50" + bottom="-10" + follows="bottom|right"/> + + </layout_panel> + <layout_panel + border="false" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + height="400"> + <layout_stack + left="5" + top="5" + right="-5" + bottom="-5" + follows="left|top|right|bottom" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + name="moon_layout" + height="220"> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="15" + top_pad="15" + font="SansSerifBold" + width="80"> + Moon + </text> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="10" + top_delta="30" + width="100"> + Position: + </text> + <sun_moon_trackball + name="moon_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="moon" /> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="160" + top_delta="-20" + width="200"> + Image: + </text> + <texture_picker + height="123" + layout="topleft" + left_delta="5" + name="moon_image" + top_pad="10" + width="100"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="110" + width="80"> + Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.25" + max_val="20" + name="moon_scale" + top_delta="15" + width="130" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="22" + width="200"> + Brightness: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.0" + max_val="1.0" + name="moon_brightness" + top_delta="15" + width="130" + can_edit_text="true"/> + <check_box + control_name="moonbeacon" + width="60" + height="16" + label="Show Beacon" + layout="topleft" + name="moonbeacon" + right="-50" + bottom="-10" + follows="bottom|right"/> + + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml new file mode 100644 index 0000000000..991ce25bec --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -0,0 +1,374 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + label="Water" + layout="topleft" + left="0" + help_topic="land_general_tab" + name="panel_settings_water" + top="0"> + <layout_stack name="water_stack1" + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="false" + user_resize="false" + visible="true" + height="105"> + <text + follows="left|top" + height="20" + font="SansSerif" + layout="topleft" + left="5" + top="5" + width="215"> + Water Fog: + </text> + <text + follows="left|top" + height="10" + layout="left|top" + left_delta="15" + top_delta="0" + width="60"> + Color: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="37" + label_height="0" + layout="topleft" + left_delta="0" + name="water_fog_color" + top_pad="5" + width="60" /> + <text + follows="left|top" + height="10" + top_delta="-15" + left_delta="80" + width="150"> + Density Exponent: + </text> + <slider + decimal_digits="1" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="top" + left_delta="15" + min_val="-10" + max_val="10" + name="water_fog_density" + top_delta="5" + width="150" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + top_delta="25" + left_delta="-15" + width="150"> + Underwater Modifier:</text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="top" + left_delta="15" + min_val="0.0" + max_val="20.0" + name="water_underwater_mod" + top_delta="20" + width="150" + can_edit_text="true"/> + + <text + follows="left|top|right" + height="10" + layout="topleft" + left_delta="165" + top_delta="-53" + width="150"> + Fresnel Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="5" + name="water_fresnel_scale" + top_delta="15" + width="150" + can_edit_text="true"/> + <text + follows="left|top|right" + layout="topleft" + left_delta="-5" + name="FresnelOffsetText" + top_delta="25" + width="150"> + Fresnel Offset: + </text> + <slider + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.7" + height="16" + layout="topleft" + left_delta="5" + name="water_fresnel_offset" + top_pad="5" + width="150" + can_edit_text="true"/> + + </layout_panel> + <layout_panel + auto_resize="true" + user_resize="false" + visible="true"> + <layout_stack name="water_stack2" + left="5" + top="5" + right="-5" + bottom="-5" + follows="left|top|right|bottom" + orientation="horizontal"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + visible="true" + min_width="460" + width="50"> + <text + follows="left|top|right" + height="16" + layout="topleft" + left="15" + top="5" + width="215"> + Normal Map + </text> + <texture_picker + height="84" + layout="topleft" + left_delta="0" + name="water_normal_map" + top_pad="5" + width="61"/> + + <text + follows="left|top" + height="16" + width="120" + layout="topleft" + top_delta="-20" + left_delta="175"> + Large Wave Speed + </text> + <xy_vector + follows="top|left" + name="water_wave1_xy" + width="120" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-20" + max_val_x="20" + increment_x="0.01f" + min_val_y="-20" + max_val_y="20" + increment_y="0.01f" + arrow_color="white"/> + + <text + follows="left|top" + height="16" + layout="topleft" + top_delta="-20" + left_delta="140"> + Small Wave Speed + </text> + <xy_vector + follows="top|left" + name="water_wave2_xy" + width="120" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-20" + max_val_x="20" + min_val_y="-20" + max_val_y="20" + increment_x="0.01f" + increment_y="0.01f" + arrow_color="white"/> + + <text + follows="left|top|right" + height="16" + layout="topleft" + left="10" + top="90" + width="215"> + Reflection Wavelet Scale + </text> + <slider + decimal_digits="1" + follows="left|top" + increment="0.01" + height="16" + initial_value="0.7" + layout="topleft" + label="X:" + left_delta="10" + max_val="10" + name="water_normal_scale_x" + top_pad="5" + width="150" + can_edit_text="true"/> + <slider + decimal_digits="1" + follows="left|top" + increment="0.01" + initial_value="0.7" + height="16" + layout="topleft" + max_val="10" + name="water_normal_scale_y" + top_pad="6" + label="Y:" + width="150" + can_edit_text="true"/> + <slider + decimal_digits="1" + follows="left|top" + increment="0.01" + initial_value="0.7" + height="16" + layout="topleft" + max_val="10" + name="water_normal_scale_z" + top_pad="6" + label="Z:" + width="150" + can_edit_text="true"/> + + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="false" + width="50" + visible="true"> + <text + follows="left|top" + height="20" + font="SansSerif" + layout="topleft" + left="5" + top="5" + width="215"> + Refraction And Blur: + </text> + <text + follows="left|top|right" + height="16" + layout="topleft" + top_delta="25" + left_delta="5" + width="215"> + Refraction Scale (Above) + </text> + <slider + control_name="water_scale_above" + decimal_digits="2" + follows="left|top" + increment="0.01" + initial_value="0.1" + height="16" + layout="topleft" + left_delta="5" + min_val="0" + max_val="3" + name="water_scale_above" + top_pad="5" + width="200" + can_edit_text="true" /> + <text + type="string" + length="1" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="-5" + top_pad="5" + width="215"> + Refraction Scale (Below) + </text> + <slider + control_name="water_scale_below" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="3" + name="water_scale_below" + top_pad="5" + width="200" + can_edit_text="true"/> + <text + follows="left|top|right" + font="SansSerif" + height="16" + layout="topleft" + left_delta="-5" + top_pad="5" + width="215"> + Blur Multiplier + </text> + <slider + control_name="water_blur_multip" + follows="left|top" + height="16" + increment="0.001" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="-0.5" + max_val="0.5" + name="water_blur_multip" + top_pad="5" + width="200" + can_edit_text="true"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index f79d752fdb..bda08f3421 100644 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml @@ -92,7 +92,10 @@ <action description="Toggle various About Land > Options settings" longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Edit Terrain', 'Build', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab." name="land options" value="22" /> - </action_set> + <action description="Modify environment settings and day cycle." + longdescription="Change the environment settings and day cycle from the About Land > Environment tab." + name="land change environment" value="46" /> + </action_set> <action_set description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels." name="Parcel Powers"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 17b300931e..aa68819e53 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -300,6 +300,17 @@ Please try logging in again in a minute.</string> <string name="BUTTON_DOCK">Dock</string> <string name="BUTTON_HELP">Show Help</string> + <!-- ToolTips for notecards --> + <string name="TooltipNotecardNotAllowedTypeDrop"> +Items of this type can't be attached +to notecards on this region. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> +Only items with unrestricted +'next owner' permissions +can be attached to notecards. + </string> + <!-- searching - generic --> <string name="Searching">Searching...</string> <string name="NoneFound">None found.</string> @@ -352,6 +363,11 @@ Error in upload request. Please visit http://secondlife.com/support for help fixing this problem. </string> + <!-- Settings errors --> + <string name="SettingValidationError">Validation failed for importing settings [NAME]</string> + <string name="SettingImportFileError">Could not open file [FILE]</string> + <string name="SettingParseFileError">Could not open file [FILE]</string> + <string name="SettingTranslateError">Could not translate legacy windlight [NAME]</string> <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem --> <string name="texture">texture</string> @@ -379,7 +395,8 @@ http://secondlife.com/support for help fixing this problem. <string name="favorite">favorite</string> <string name="symbolic link">link</string> <string name="symbolic folder link">folder link</string> - <string name="mesh">mesh</string> + <string name="settings blob">settings</string> + <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> @@ -504,6 +521,7 @@ http://secondlife.com/support for help fixing this problem. <string name="ManageEstateSilently">Manage your estates silently</string> <string name="ChangeYourDefaultAnimations">Change your default animations</string> <string name="ForceSitAvatar">Force your avatar to sit</string> + <string name="ChangeEnvSettings">Change your environment settings</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> @@ -2767,6 +2785,14 @@ If you continue to receive this message, please contact Second Life support for <string name="LocalSettings">Local Settings</string> <string name="RegionSettings">Region Settings</string> + <string name="NoEnvironmentSettings">This Region does not support environmental settings.</string> + <string name="EnvironmentSun">Sun</string> + <string name="EnvironmentMoon">Moon</string> + <string name="EnvironmentBloom">Bloom</string> + <string name="EnvironmentCloudNoise">Cloud Noise</string> + <string name="EnvironmentNormalMap">Normal Map</string> + <string name="EnvironmentTransparent">Transparent</string> + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> @@ -3843,6 +3869,12 @@ Abuse Report</string> <string name="Female - Stick tougue out">Female - Stick tongue out</string> <string name="Female - Wow">Female - Wow</string> +<!-- settings --> + <string name="New Daycycle">New Daycycle</string> + <string name="New Water">New Water</string> + <string name="New Sky">New Sky</string> + + <string name="/bow">/bow</string> <string name="/clap">/clap</string> <string name="/count">/count</string> @@ -4067,6 +4099,8 @@ Try enclosing path to the editor with double quotes. <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string> <string name="BeaconSound">Viewing sound beacons (yellow)</string> <string name="BeaconMedia">Viewing media beacons (white)</string> + <string name="BeaconSun">Viewing sun direction beacon (orange)</string> + <string name="BeaconMoon">Viewing moon direction beacon (purple)</string> <string name="ParticleHiding">Hiding Particles</string> <!-- commands --> @@ -4079,6 +4113,7 @@ Try enclosing path to the editor with double quotes. <string name="Command_Conversations_Label">Conversations</string> <string name="Command_Compass_Label">Compass</string> <string name="Command_Destinations_Label">Destinations</string> + <string name="Command_Environments_Label">My Environments</string> <string name="Command_Gestures_Label">Gestures</string> <string name="Command_Grid_Status_Label">Grid status</string> <string name="Command_HowTo_Label">How to</string> @@ -4108,6 +4143,7 @@ Try enclosing path to the editor with double quotes. <string name="Command_Conversations_Tooltip">Converse with everyone</string> <string name="Command_Compass_Tooltip">Compass</string> <string name="Command_Destinations_Tooltip">Destinations of interest</string> + <string name="Command_Environments_Tooltip">My Environments</string> <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> <string name="Command_Grid_Status_Tooltip">Show current Grid status</string> <string name="Command_HowTo_Tooltip">How to do common tasks</string> @@ -4182,6 +4218,8 @@ Try enclosing path to the editor with double quotes. <string name="ExperiencePermission10">control your camera</string> <string name="ExperiencePermission11">teleport you</string> <string name="ExperiencePermission12">automatically accept experience permissions</string> + <string name="ExperiencePermission16">force your avatar to sit</string> + <string name="ExperiencePermission17">change your environment settings</string> <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string> <string name="ExperiencePermissionShort1">Take Controls</string> <string name="ExperiencePermissionShort3">Trigger Animations</string> @@ -4190,6 +4228,8 @@ Try enclosing path to the editor with double quotes. <string name="ExperiencePermissionShort10">Control Camera</string> <string name="ExperiencePermissionShort11">Teleport</string> <string name="ExperiencePermissionShort12">Permission</string> + <string name="ExperiencePermissionShort16">Sit</string> + <string name="ExperiencePermissionShort17">Environment</string> <!-- Conversation log messages --> <string name="logging_calls_disabled_log_empty"> diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml new file mode 100644 index 0000000000..0f3f0159db --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<densityctrl + border="true" + follows="all" + label="Density" + name="density_ctrl" + layout="topleft" + left="0" + top="0" + width="320" + height="240"> + <text + follows="left|top" + height="11" + layout="topleft" + left="15" + top_pad="-5" + width="120"> +Exponential Term + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left="15" + min_val="0" + max_val="1" + name="level_exponential" + top_delta="15" + width="200" + can_edit_text="true"/> + + <view + left_pad="15" + top="15" + name="preview_image" + height="140" + width="140" + follows="left|top" + /> + <text + follows="left|top" + height="11" + layout="topleft" + left="15" + top_pad="-5" + width="120"> +Exponential Scale Factor + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left="15" + min_val="0" + max_val="1" + name="exponential_scale" + top_delta="15" + width="200" + can_edit_text="true"/> + + <text + follows="left|top" + height="11" + layout="topleft" + left="15" + top_pad="-5" + width="120"> +Linear Term + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left="15" + min_val="0" + max_val="1" + name="level_linear" + top_delta="15" + width="200" + can_edit_text="true"/> + + <text + follows="left|top" + height="11" + layout="topleft" + left="15" + top_pad="-5" + width="120"> +Constant Term + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left="15" + min_val="0" + max_val="1" + name="level_constant" + top_delta="15" + width="200" + can_edit_text="true"/> + + <text + follows="left|top" + height="11" + layout="topleft" + left="15" + top_pad="15" + width="80"> +Max Altitude + </text> + <slider + decimal_digits="0" + follows="left|top" + height="16" + increment="1" + initial_value="0" + layout="topleft" + left="15" + min_val="1000" + max_val="40000" + name="max_altitude" + top_delta="15" + width="200" + can_edit_text="true"/> + + <text + follows="left|top" + height="11" + layout="topleft" + name="aniso_factor_label" + left="15" + top_pad="15" + width="80"> +Anisotropy Factor + </text> + <slider + decimal_digits="0" + follows="left|top" + height="16" + increment="1" + initial_value="0" + layout="topleft" + left="15" + min_val="1000" + max_val="40000" + name="aniso_factor" + top_delta="15" + width="200" + can_edit_text="true"/> +</densityctrl> diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml new file mode 100644 index 0000000000..a190da3909 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<joystick_rotate + image_selected="Cam_Rotate_In" + image_unselected="Cam_Rotate_Out" + scale_image="false" + mouse_opaque="false" + held_down_delay.seconds="0"/> diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml index a190da3909..cbf721b346 100644 --- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml +++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<joystick_rotate +<joystick_quat image_selected="Cam_Rotate_In" image_unselected="Cam_Rotate_Out" - scale_image="false" + scale_image="true" mouse_opaque="false" held_down_delay.seconds="0"/> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index a054960bf8..f39e086196 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -6,6 +6,7 @@ commit_on_focus_lost="true" ignore_tab="true" cursor_color="TextCursorColor" + bg_color="White" text_color="TextFgColor" text_pad_left="2" text_readonly_color="TextFgReadOnlyColor" diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml new file mode 100644 index 0000000000..9fa77855c0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<sun_moon_trackball + name="virtualtrackball" + width="150" + height="150" + user_resize="false" + increment_angle_mouse="1.5f" + increment_angle_btn="1.0f" + image_sphere="VirtualTrackball_Sphere" + image_moon_back="VirtualTrackball_Moon_Back" + image_moon_front="VirtualTrackball_Moon_Front" + image_sun_back="VirtualTrackball_Sun_Back" + image_sun_front="VirtualTrackball_Sun_Front"> + + <sun_moon_trackball.border + visible="true"/> + + <sun_moon_trackball.labelN + font="SansSerif" + name="labelN" + valign="bottom" + halign="left" + label="N"/> + <sun_moon_trackball.labelS + font="SansSerif" + name="labelS" + valign="top" + halign="left" + label="S"/> + <sun_moon_trackball.labelW + font="SansSerif" + name="labelW" + valign="top" + halign="right" + label="W"/> + <sun_moon_trackball.labelE + font="SansSerif" + name="labelE" + valign="top" + halign="left" + label="E"/> + + <sun_moon_trackball.button_rotate_top + name="btn_rotate_top" + image_unselected="VirtualTrackball_Rotate_Top" + image_selected="VirtualTrackball_Rotate_Top_Active" + image_disabled="Blank" /> + + <sun_moon_trackball.button_rotate_bottom + name="btn_rotate_bottom" + image_unselected="VirtualTrackball_Rotate_Bottom" + image_selected="VirtualTrackball_Rotate_Bottom_Active" + image_disabled="Blank" /> + + <sun_moon_trackball.button_rotate_left + name="btn_rotate_left" + image_unselected="VirtualTrackball_Rotate_Left" + image_selected="VirtualTrackball_Rotate_Left_Active" + image_disabled="Blank" /> + + <sun_moon_trackball.button_rotate_right + name="btn_rotate_right" + image_unselected="VirtualTrackball_Rotate_Right" + image_selected="VirtualTrackball_Rotate_Right_Active" + image_disabled="Blank" /> + +</sun_moon_trackball> + diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml new file mode 100644 index 0000000000..93ae26a6ad --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<xy_vector + name="xyvector" + width="120" + height="140" + decimal_digits="1" + label_width="16" + padding="4" + edit_bar_height="18" + user_resize="false"> + + <xy_vector.border + visible="true"/> + + <xy_vector.x_entry + name="XEntry" + tab_stop="true" + label="X:"/> + <xy_vector.y_entry + name="YEntry" + tab_stop="true" + label="Y:"/> + + <xy_vector.touch_area + name="TouchArea" + bevel_style="in" + border_visible="true"/> + +</xy_vector> diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 57a1b2ec1e..df0edd498f 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -479,5 +479,6 @@ los media: </panel> </panel> <panel label="EXPERIENCIAS" name="land_experiences_panel"/> + <panel label="ENTORNO" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_adjust_environment.xml b/indra/newview/skins/default/xui/es/floater_adjust_environment.xml new file mode 100644 index 0000000000..25b6fad165 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Iluminación personal"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Restablecer" name="btn_reset" tool_tip="Cerrar y restablecer Entorno compartido"/> + <text name="cloud_map_label"> + Imagen nube: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Sol: + </text> + <check_box label="Mostrar baliza" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Mostrar baliza" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml index 49f990c84d..0eabcc7c27 100644 --- a/indra/newview/skins/default/xui/es/floater_beacons.xml +++ b/indra/newview/skins/default/xui/es/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Origen de sonidos" name="sounds"/> <check_box label="Origen de partículas" name="particles"/> <check_box label="Fuentes de media" name="moapbeacon"/> + <check_box label="Sol" name="sun"/> + <check_box label="Luna" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml index 75e324c7ef..5ab13d2b09 100644 --- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="Sonidos"/> <check_box label="Texturas" name="check_texture"/> <icon name="icon_texture" tool_tip="Texturas"/> + <icon name="icon_setting" tool_tip="Configuración de entorno"/> <button label="√ Todos" label_selected="Todo" name="check_all"/> <button label="Limpiar" label_selected="Ninguno" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml deleted file mode 100644 index bd0910e5d4..0000000000 --- a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="ELIMINAR EL ENV PREDEFINIDO"> - <string name="title_water"> - Eliminar el agua predefinida - </string> - <string name="title_sky"> - Eliminar cielo predefinido - </string> - <string name="title_day_cycle"> - Eliminar ciclo del día - </string> - <string name="label_water"> - Predefinido: - </string> - <string name="label_sky"> - Predefinido: - </string> - <string name="label_day_cycle"> - Ciclo del día: - </string> - <string name="msg_confirm_deletion"> - ¿Estás seguro de que quieres eliminar el valor predefinido seleccionado? - </string> - <string name="msg_sky_is_referenced"> - No se puede quitar un valor predefinido al que se hace referencia en otro u otros ciclos del día. - </string> - <string name="combo_label"> - -Selecciona un valor predefinido- - </string> - <text name="label"> - Predefinido: - </text> - <button label="Eliminar" name="delete"/> - <button label="Cancelar" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..c3273ea64e --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Editar Ciclo del día"> + <string name="title_new"> + Crear un Nuevo ciclo del día + </string> + <string name="title_edit"> + Editar Ciclo del día + </string> + <string name="hint_new"> + Asigna un nombre al ciclo del día, ajusta los controles para crearlo y selecciona "Guardar". + </string> + <string name="hint_edit"> + Para editar el ciclo del día, ajusta los controles siguientes y selecciona "Guardar". + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Cielo [ALT] + </string> + <string name="sky_label"> + Cielo + </string> + <string name="water_label"> + Agua + </string> + <string name="commit_parcel"> + Aplicar a la Parcela + </string> + <string name="commit_region"> + Aplicar a la Región + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Nombre del Ciclo del día: + </text> + <button label="Importar" name="btn_import" tool_tip="Importar configuración legado desde disco."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Cielo 4" name="sky4_track"/> + <button label="Cielo 3" name="sky3_track"/> + <button label="Cielo 2" name="sky2_track"/> + <button label="Nivel del terreno" name="sky1_track"/> + <button label="Agua" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0 %[DSC]"/> + <text name="p1" value="25 %[DSC]"/> + <text name="p2" value="50 %[DSC]"/> + <text name="p3" value="75 %[DSC]"/> + <text name="p4" value="100 %[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Clonar ruta de" name="copy_track"/> + <button label="Cargar ruta de" name="load_track"/> + <button label="Borrar ruta" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Ir hacia atrás"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Ir hacia adelante"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="Añadir [FRAME]" name="add_frame"/> + <button label="Cargar [FRAME]" name="btn_load_frame"/> + <button label="Borrar [FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Seleccionar un marco clave de la línea de tiempo indicada arriba para editar los parámetros. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Agua" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmósfera e Iluminación" name="atmosphere_panel"/> + <panel label="Nubes" name="clouds_panel"/> + <panel label="Sol y Luna" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Guardar" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/es/floater_fixedenvironment.xml new file mode 100644 index 0000000000..d17dcaad01 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Entorno fijo"> + <string name="edit_sky"> + Editar Cielo: + </string> + <string name="edit_water"> + Editar Agua: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Cargar" name="btn_load" tool_tip="Cargar una configuración del inventario"/> + <button label="Importar" name="btn_import" tool_tip="Importar configuración legado desde disco."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Guardar" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Cancelar" name="btn_cancel" tool_tip="Volver a la última versión guardada"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml index b69307c2cd..87f93e8fcf 100644 --- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Sonidos" name="check_sound"/> <check_box label="Texturas" name="check_texture"/> <check_box label="Fotos" name="check_snapshot"/> + <check_box label="Opciones" name="check_settings"/> <button label="Todos" label_selected="Todo" name="All"/> <button label="Ninguno" label_selected="Nada" name="None"/> <check_box label="Mostrar siempre las carpetas" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/es/floater_my_environments.xml b/indra/newview/skins/default/xui/es/floater_my_environments.xml new file mode 100644 index 0000000000..8f636490ac --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Lugares" name="my_environments" title="MIS ENTORNOS"> + <layout_stack> + <layout_panel label="Filtros" name="filter_panel"> + <check_box label="Días" name="chk_days"/> + <check_box label="Cielos" name="chk_skies"/> + <check_box label="Agua" name="chk_water"/> + <filter_editor label="Filtrar entornos" name="flt_search"/> + </layout_panel> + <layout_panel label="Entornos" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Mostrar todas las carpetas" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Más opciones"/> + <menu_button name="btn_newsettings" tool_tip="Crear una opción nueva"/> + <button name="btn_del" tool_tip="Quitar el ítem seleccionado"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_perms_default.xml b/indra/newview/skins/default/xui/es/floater_perms_default.xml index 97e5390931..7238ee7716 100644 --- a/indra/newview/skins/default/xui/es/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/es/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Definir los permisos predeterminados para la creación de ropa o partes del cuerpo"> Artículos de vestir </text> + <text name="label_13" tool_tip="Definir los permisos predeterminados para la creación de parámetros de entorno"> + Opciones + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Cancelar" label_selected="Cancelar" name="cancel"/> diff --git a/indra/newview/skins/default/xui/es/floater_pick_track.xml b/indra/newview/skins/default/xui/es/floater_pick_track.xml new file mode 100644 index 0000000000..44c24248a6 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="DESTACADO: RUTA"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Seleccionar cielo fuente: + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Cielo4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Cielo3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Cielo2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Terreno" name="radio_sky1" value="1."/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml index b8d5824fb7..2bcec020b2 100644 --- a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Agua transparente" name="TransparentWater"/> <check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/> <check_box initial_value="true" label="Puntos de luz locales" name="LocalLights"/> - <check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivar esta opción puede evitar que se bloqueen los controladores de algunas tarjetas gráficas"/> <slider label="Nivel de detalle del terreno:" name="TerrainDetail"/> <text name="TerrainDetailText"> Bajo diff --git a/indra/newview/skins/default/xui/es/floater_settings_picker.xml b/indra/newview/skins/default/xui/es/floater_settings_picker.xml new file mode 100644 index 0000000000..73b8de30c3 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="DESTACADO: CONFIGURACIÓN"> + <floater.string name="pick title"> + Destacado: + </floater.string> + <floater.string name="pick_track"> + SELECCIONAR RUTA + </floater.string> + <floater.string name="pick_settings"> + SELECCIONAR CONFIGURACIÓN + </floater.string> + <floater.string name="track_water"> + Agua + </floater.string> + <floater.string name="track_ground"> + Terreno + </floater.string> + <floater.string name="track_sky"> + Cielo[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Filtrar las texturas" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index 01b024bc3e..2e409ef69c 100644 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Inventario" name="inventory" value="0"/> <radio_item label="Local" name="local" value="1"/> + <radio_item label="Hornear" name="bake" value="2"/> </radio_group> <text name="unknown"> Tamaño: [DIMENSIONS] @@ -20,7 +21,6 @@ <button label="Blanca" label_selected="Blanca" name="Blank"/> <button label="Ninguna" label_selected="Ninguna" left="90" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/> <text name="preview_disabled" value="Vista previa inhabilitada"/> <filter_editor label="Filtrar las texturas" name="inventory search editor"/> <check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/> @@ -31,6 +31,22 @@ <column label="Nombre" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Elegir la textura de horneado"> + <combo_box.item label="Ninguno" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Esconder Región Malla Base" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index c5bc301608..c426158d3e 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Activar" name="Marketplace Activate"/> <menu_item_call label="Desactivar" name="Marketplace Deactivate"/> <menu_item_call label="Compartir" name="Share"/> - <menu_item_call label="Comprar" name="Task Buy"/> <menu_item_call label="Abrir" name="Task Open"/> <menu_item_call label="Ejecutar" name="Task Play"/> <menu_item_call label="Propiedades" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Ropa interior nueva" name="New Underpants"/> <menu_item_call label="Nueva capa Alpha" name="New Alpha Mask"/> <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + <menu_item_call label="Nuevo Universal" name="New Universal"/> <menu_item_call label="Nueva física" name="New Physics"/> </menu> <menu label="Nuevas partes del cuerpo" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Pelo nuevo" name="New Hair"/> <menu_item_call label="Ojos nuevos" name="New Eyes"/> </menu> + <menu label="Nueva Configuración" name="New Settings"> + <menu_item_call label="Nuevo Cielo" name="New Sky"/> + <menu_item_call label="Nueva Agua" name="New Water"/> + <menu_item_call label="Nuevo Ciclo del día" name="New Day Cycle"/> + </menu> <menu label="Usar como valor predeterminado para" name="upload_def"> <menu_item_call label="Imágenes subidas" name="Image uploads"/> <menu_item_call label="Sonidos subidos" name="Sound uploads"/> @@ -102,6 +107,8 @@ <menu_item_call label="Editar" name="Wearable Edit"/> <menu_item_call label="Añadir" name="Wearable Add"/> <menu_item_call label="Quitarse" name="Take Off"/> + <menu_item_call label="Aplicar sólo a Mi mismo" name="Settings Apply Local"/> + <menu_item_call label="Aplicar a la Parcela" name="Settings Apply Parcel"/> <menu_item_call label="Copiar en artículos del Mercado" name="Marketplace Copy"/> <menu_item_call label="Mover a artículos del Mercado" name="Marketplace Move"/> <menu_item_call label="--sin opciones--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml index f17cfe4ceb..f9a9f3a9fe 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/> <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> <menu_item_call label="Modelo..." name="Upload Model"/> - <menu_item_call label="Asistente de modelo..." name="Upload Model Wizard"/> <menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/> - <menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/> </menu> <menu_item_call label="Carpeta nueva" name="New Folder"/> <menu_item_call label="Script nuevo" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Ropa interior nueva" name="New Underpants"/> <menu_item_call label="Nueva Alfa" name="New Alpha"/> <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + <menu_item_call label="Nuevo Universal" name="New Universal"/> <menu_item_call label="Nueva física" name="New Physics"/> </menu> <menu label="Nuevas partes del cuerpo" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Pelo nuevo" name="New Hair"/> <menu_item_call label="Ojos nuevos" name="New Eyes"/> </menu> + <menu label="Nueva Configuración" name="New Settings"> + <menu_item_call label="Nuevo Cielo" name="New Sky"/> + <menu_item_call label="Nueva Agua" name="New Water"/> + <menu_item_call label="Nuevo Ciclo del día" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml index b3f2b789d7..0cfab7ffc8 100644 --- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Nueva Alfa" name="New Alpha"/> <menu_item_call label="Nueva física" name="New Physics"/> <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + <menu_item_call label="Nuevo Universal" name="New Universal"/> </menu> <menu label="Nuevas partes del cuerpo" name="New Body Parts"> <menu_item_call label="Anatomía nueva" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/es/menu_save_settings.xml b/indra/newview/skins/default/xui/es/menu_save_settings.xml new file mode 100644 index 0000000000..164763427d --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Guardar" name="save_settings"/> + <menu_item_check label="Guardar como" name="save_as_new_settings"/> + <menu_item_check label="Asignar" name="commit_changes"/> + <menu_item_check label="Aplicar sólo a Mi mismo" name="apply_local"/> + <menu_item_check label="Aplicar a la Parcela" name="apply_parcel"/> + <menu_item_check label="Aplicar a la Región" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_settings_add.xml b/indra/newview/skins/default/xui/es/menu_settings_add.xml new file mode 100644 index 0000000000..82bd384ab5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Nuevo Cielo" name="New Sky"/> + <menu_item_call label="Nueva Agua" name="New Water"/> + <menu_item_call label="Nuevo Ciclo del día" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_settings_gear.xml b/indra/newview/skins/default/xui/es/menu_settings_gear.xml new file mode 100644 index 0000000000..5d1b43933f --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Editar" name="edit_settings"/> + <menu_item_call label="Aplicar sólo a Mi mismo" name="Settings Apply Local"/> + <menu_item_call label="Aplicar a la Parcela" name="Settings Apply Parcel"/> + <menu_item_call label="Aplicar a la Región" name="Settings Apply Region"/> + <menu_item_call label="Copiar" name="copy_settings"/> + <menu_item_call label="Pegar" name="paste_settings"/> + <menu_item_call label="Copiar la UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 7cc3c0320a..10955567ba 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="Propiedades de la parcela" name="Parcel Properties"/> <menu_item_check label="Menú Avanzado" name="Show Advanced Menu"/> </menu> - <menu label="Dom" name="Sun"> + <menu label="Entorno" name="Environment"> <menu_item_check label="Amanecer" name="Sunrise"/> <menu_item_check label="Mediodía" name="Noon"/> <menu_item_check label="Atardecer" name="Sunset"/> <menu_item_check label="Medianoche" name="Midnight"/> - <menu_item_check label="Usar Configuración de la Región" name="Use Region Settings"/> - </menu> - <menu label="Editor de entorno" name="Environment Editor"> - <menu_item_call label="Configuración del entorno..." name="Environment Settings"/> - <menu label="Agua predefinida" name="Water Presets"> - <menu_item_call label="Nuevo predefinido..." name="new_water_preset"/> - <menu_item_call label="Editar predefinido..." name="edit_water_preset"/> - <menu_item_call label="Eliminar predefinido..." name="delete_water_preset"/> - </menu> - <menu label="Cielos predefinidos" name="Sky Presets"> - <menu_item_call label="Nuevo predefinido..." name="new_sky_preset"/> - <menu_item_call label="Editar predefinido..." name="edit_sky_preset"/> - <menu_item_call label="Eliminar predefinido..." name="delete_sky_preset"/> - </menu> - <menu label="Días predefinidos" name="Day Presets"> - <menu_item_call label="Nuevo predefinido..." name="new_day_preset"/> - <menu_item_call label="Editar predefinido..." name="edit_day_preset"/> - <menu_item_call label="Eliminar predefinido..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Usar entorno compartido" name="Use Shared Environment"/> + <menu_item_call label="Mis entornos..." name="my_environs"/> + <menu_item_call label="Iluminación personal..." name="adjustment_tool"/> + <menu_item_check label="Pausar Nubes" name="pause_clouds"/> </menu> </menu> <menu label="Construir" name="BuildTools"> @@ -323,6 +308,9 @@ <menu_item_check label="Capas alfa automáticas (no deferidas)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Animation Textures" name="Animation Textures"/> <menu_item_check label="Disable Textures" name="Disable Textures"/> + <menu_item_check label="Desactivar ambiente" name="Disable Ambient"/> + <menu_item_check label="Desactivar luz del sol" name="Disable Sunlight"/> + <menu_item_check label="Desactivar luces locales" name="Disable Local Lights"/> <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> @@ -406,6 +394,7 @@ </menu> <menu label="Admin" name="Deprecated"> <menu label="Take Off Clothing" name="Take Off Clothing"> + <menu_item_call label="Universal" name="Universal"/> <menu_item_call label="Física" name="Physics"/> </menu> <menu label="Ayuda" name="DeprecatedHelp"> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 030443dd4d..4d418b6eaf 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1968,6 +1968,11 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se Si esta opción no está seleccionada, se anularán las restricciones establecidas por los dueños de parcelas para evitar provocaciones, mantener la privacidad o proteger a los residentes menores de material para adultos. Por favor, consulte con los dueños de parcelas según sea necesario. <usetemplate name="okbutton" yestext="Aceptar"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Si esta opción no está seleccionada, se anularán los entornos personalizados añadidos por los dueños a sus parcelas. Por favor, consulta con los dueños de parcelas según sea necesario. +¿Quieres seguir? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo > Preferencias > General. <usetemplate name="okbutton" yestext="OK"/> @@ -2447,7 +2452,15 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p Este archivo del ciclo de un día se refiere a un archivo perdido de cielo: [SKY]. </notification> <notification name="WLRegionApplyFail"> - No se pudo aplicar la configuración a la región. El problema podría solucionarse saliendo de la región y regresando a ella. La razón especificada fue: [FAIL_REASON] + No se pudo aplicar la configuración a la región. Motivo: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Una textura local está en uso en la ruta, [TRACK], # cuadro [FRAMENO] ([FRAME]%) en el campo [FIELD]. +Los parámetros no pueden guardarse usando texturas locales. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Una textura local está en uso en el campo [FIELD]. +Los parámetros no pueden guardarse usando texturas locales. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> No se puede eliminar la última clave de este ciclo del día, ya que no puedes vaciar la caché del día. En lugar de intentar eliminar la última clave restante y después intentar crear una nueva, debes modificarla. @@ -4390,4 +4403,76 @@ Prueba a seleccionar un terreno más pequeño. [REASON] <usetemplate name="okbutton" yestext="Aceptar"/> </notification> + <notification name="FailedToFindSettings"> + No se pudo cargar la configuración para [NAME] a partir de la base de datos. + </notification> + <notification name="FailedToLoadSettingsApply"> + No se pudo aplicar esa configuración al entorno. + </notification> + <notification name="FailedToBuildSettingsDay"> + No se pudo aplicar esa configuración al entorno. + </notification> + <notification name="NoEnvironmentSettings"> + Esta región no es compatible con las opciones de entorno. + </notification> + <notification label="Guardar el vestuario" name="SaveSettingAs"> + Guardar parámetros de entorno actuales como: + <form name="form"> + <input name="message"> + [DESC] (nuevo) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> + <notification name="WLImportFail"> + No se pudo importar la configuración de Viento de luz legado [NAME] de +[FILE]. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + No se pudo configurar el entorno para esta parcela. +Por favor ingresa o selecciona una parcela cuyos derechos puedes modificar. + </notification> + <notification name="SettingsUnsuported"> + La configuración de entorno no está disponible en esta región. +Por favor accede a una región cuya configuración esté disponible y vuelve a intentar. + </notification> + <notification name="SettingsConfirmLoss"> + Estás a punto de perder los cambios que realizaste en este [TYPE] llamado "[NAME]". +¿Estás seguro de que deseas continuar? + <usetemplate ignoretext="¿Estás seguro de que quieres perder los cambios?" name="okcancelignore" notext="No" yestext="Sí"/> + </notification> + <notification name="SettingsConfirmReset"> + Estás a punto de eliminar todos los parámetros aplicados. +¿Estás seguro de que deseas continuar? + <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Estás a punto de eliminar todos los parámetros aplicados de iluminación personal. +¿Estás seguro de que deseas continuar? + <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Estás a punto de importar parámetros no transferibles a este ciclo del día. Si continúas, las opciones que estás editando pasarán a ser no transferibles también. + +Este cambio no se puede deshacer. + +¿Estás seguro de que deseas continuar? + <usetemplate ignoretext="¿Estás seguro de que quieres que esta opción sea no transferible?" name="okcancelignore" notext="No" yestext="Sí"/> + </notification> + <notification name="NoEditFromLibrary"> + No puedes editar parámetros directamente en la librería. +Por favor, copia a tu propio inventario y vuelve a intentarlo. + </notification> + <notification name="EnvironmentApplyFailed"> + Se produjo un error con estos parámetros. No pueden guardarse o aplicarse por el momento. + </notification> + <notification name="TrackLoadFailed"> + No se pudo cargar la ruta en [TRACK]. + </notification> + <notification name="TrackLoadMismatch"> + No se pudo cargar la ruta de [TRACK1] a [TRACK2]. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml index 8776dd6c10..6f6ee41e54 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatuaje de la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/> - <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/> - <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuaje en la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_universal.xml b/indra/newview/skins/default/xui/es/panel_edit_universal.xml new file mode 100644 index 0000000000..5c825b5980 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Tatuaje de la cabeza" name="Head Universal Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje superior" name="Upper Universal Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje inferior" name="Lower Universal Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje en falda" name="Skirt Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje en cabello" name="Hair Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje en ojos" name="Eyes Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje en brazo izquierdo" name="Left Arm Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje en pierna izquierda" name="Left Leg Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje Aux1" name="Aux1 Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje Aux2" name="Aux2 Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje Aux3" name="Aux3 Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml index 799512968d..c1edf99f87 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Modificando los tatuajes </string> + <string name="edit_universal_title"> + Modificando Universal + </string> <string name="edit_physics_title"> Modificar la física </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Tatuaje: </string> + <string name="universal_desc_text"> + Universal: + </string> <string name="physics_desc_text"> Física: </string> diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml index a73f1deed4..3aa7e12089 100644 --- a/indra/newview/skins/default/xui/es/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Entorno" name="panel_env_info"> - <text name="water_settings_title"> - Selecciona la configuración de agua y cielo/ciclo del día que deseas que vean todos los visitantes de tu región. Más información - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Usar los valores predeterminados de Second Life" name="use_sl_default_settings"/> - <radio_item label="Usar la configuración siguiente" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Configuración de agua - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Cielo/Ciclo del día - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Cielo invariable" name="my_sky_settings"/> - <radio_item label="Ciclo del día" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> - </combo_box> - </panel> - <button label="Aplicar" name="apply_btn"/> - <button label="Cancelar" name="cancel_btn"/> + <string name="str_label_use_default"> + Usar la configuración predeterminada + </string> + <string name="str_label_use_region"> + Usar Configuración de la Región + </string> + <string name="str_altitude_desription"> + Cielo [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + No se ha seleccionado ninguna parcela. Las opciones de entorno están desactivadas. + </string> + <string name="str_cross_region"> + Las opciones de entorno no están disponibles en las fronteras de regiones. + </string> + <string name="str_legacy"> + La configuración de entorno no está disponible en esta región. + </string> + <string name="str_disallowed"> + El administrador del estado no permite cambiar los entornos de parcela en esta región. + </string> + <string name="str_too_small"> + La parcela debe tener como mínimo 128 metros cuadrados para ser compatible con un entorno. + </string> + <string name="str_empty"> + (vacío) + </string> + <string name="str_region_env"> + (entorno de la región) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Usar Inventario" name="btn_select_inventory"/> + <button label="Personalizar" name="btn_edit"/> + <check_box label="Los propietarios de parcelas pueden borrar el entorno" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + Desconocido + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Mover un parámetro desde el Inventario hasta este recuadro para seleccionarlo como cielo actual."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + Desconocido + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Mover un parámetro desde el Inventario hasta este recuadro para seleccionarlo como cielo actual."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + Desconocido + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Mover un parámetro desde el Inventario hasta este recuadro para seleccionarlo como cielo actual."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Terreno + </text> + <line_editor name="edt_invname_ground"> + Desconocido + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Mover un parámetro desde el Inventario hasta este recuadro para seleccionarlo como cielo a nivel del terreno."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Agua + </text> + <line_editor name="edt_invname_water"> + Desconocido + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Mover un parámetro desde el Inventario hasta este recuadro para seleccionarlo como agua actual."/> + </panel> + <button label="Restablecer" name="btn_rst_altitudes" tool_tip="Restablecer altitudes predeterminadas"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index b3ee34bbfd..4cfbffb887 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -26,17 +26,17 @@ <check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/> <button label="Aplicar" name="apply_btn"/> <text name="estate_manager_label"> - Administradores del estado: + Administradores de estado: </text> <text name="allow_resident_label"> - Siempre permitido: + Siempre autorizado: </text> <button label="Añadir..." name="add_estate_manager_btn"/> <button label="Quitar..." name="remove_estate_manager_btn"/> <button label="Añadir..." name="add_allowed_avatar_btn"/> <button label="Quitar..." name="remove_allowed_avatar_btn"/> <text name="allow_group_label"> - Grupos siempre permitidos: + Grupos siempre autorizados: </text> <text name="ban_resident_label"> Siempre prohibido: diff --git a/indra/newview/skins/default/xui/es/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/es/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..bce312dc18 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmósfera e Iluminación" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/es/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/es/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..0aa6f1e41a --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Nubes" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/es/panel_settings_sky_density.xml new file mode 100644 index 0000000000..743f901c7f --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Densidad" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Período exponencial Rayleigh:" name="rayleigh_exponential"/> + <slider label="Escala exponencial Rayleigh:" name="rayleigh_exponential_scale"/> + <slider label="Período lineal Rayleigh:" name="rayleigh_linear"/> + <slider label="Período constante Rayleigh:" name="rayleigh_constant"/> + <slider label="Altitud máxima Rayleigh:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Período exponencial Mie:" name="mie_exponential"/> + <slider label="Escala exponencial Mie:" name="mie_exponential_scale"/> + <slider label="Período lineal Mie:" name="mie_linear"/> + <slider label="Período constante Mie:" name="mie_constant"/> + <slider label="Factor Aniso Mie:" name="mie_aniso_factor"/> + <slider label="Altitud máxima Mie:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Período exponencial de Absorción:" name="absorption_exponential"/> + <slider label="Escala exponencial de Absorción:" name="absorption_exponential_scale"/> + <slider label="Período lineal de Absorción:" name="absorption_linear"/> + <slider label="Período constante de Absorción:" name="absorption_constant"/> + <slider label="Altitud máxima de Absorción:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/es/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..77db745755 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Sol y Luna" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Mostrar baliza" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Mostrar baliza" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_settings_water.xml b/indra/newview/skins/default/xui/es/panel_settings_water.xml new file mode 100644 index 0000000000..c0d0cb5636 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Agua" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Compensación Fresnel: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml index 6ab95b9f5d..fb1aa50198 100644 --- a/indra/newview/skins/default/xui/es/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Textura" name="Texture"> - <panel.string name="string repeats per meter"> - Repeticiones por metro - </panel.string> - <panel.string name="string repeats per face"> - Repeticiones por cara - </panel.string> <text name="color label"> Color </text> @@ -114,4 +108,5 @@ <spinner label="Desplazamiento horizontal" name="shinyOffsetU"/> <spinner label="Desplazamiento vertical" name="shinyOffsetV"/> <check_box initial_value="false" label="Alinear caras del plano" name="checkbox planar align" tool_tip="Alinear texturas en todas las caras seleccionadas con la última cara seleccionada. Requiere la representación de texturas en el plano."/> + <button label="Centrar" label_selected="Alinear capas de textura actuales" name="button align textures" tool_tip="Alinear capas de textura actuales"/> </panel> diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml index 80379da064..cfa37432a8 100644 --- a/indra/newview/skins/default/xui/es/role_actions.xml +++ b/indra/newview/skins/default/xui/es/role_actions.xml @@ -33,6 +33,7 @@ <action description="Cambiar música y configuraciones de los media" longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno > pestaña Media." name="land change media" value="20"/> <action description="Activar/desactivar 'Editar el terreno'" longdescription="Activar/desactivar 'Editar el terreno'. *AVISO* Acerca del terreno > pestaña Opciones > Editar el terreno, permite a cualquiera alterar la forma de su terreno y sustituir y mover plantas Linden. Asegúrese de lo que está haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno > pestaña Opciones." name="land edit" value="21"/> <action description="Activar/desactivar varios ítems de Acerca del terreno > Opciones" longdescription="Cambia 'Seguro (sin daño)', 'Volar', y el permitir a otros residentes en terrenos propiedad del grupo 'Modificar el terreno', 'Construir', 'Crear hitos' y 'Ejecutat scripts', como aparece en Acerca del terreno > pestaña Opciones." name="land options" value="22"/> + <action description="Modificar configuración del entorno y ciclo del día" longdescription="Cambiar la configuración de entorno y el ciclo del día desde la pestaña Acerca del terreno > Entorno" name="land change environment" value="46"/> </action_set> <action_set description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." name="Parcel Powers"> <action description="Permitir siempre 'Editar el terreno'" longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 6436194990..2b59983529 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -648,6 +648,15 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="BUTTON_HELP"> Ver la Ayuda </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Los objetos de este tipo no se pueden adjuntar +a las notas de esta región. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Sólo los objetos con permisos +«próximo propietario» sin restricciones +pueden adjuntarse a las notas. + </string> <string name="Searching"> Buscando... </string> @@ -724,6 +733,18 @@ Intenta iniciar sesión de nuevo en unos instantes. Error en la solicitud de carga. Por favor, ingresa a http://secondlife.com/support para obtener ayuda sobre cómo solucionar este problema. </string> + <string name="SettingValidationError"> + Error en la validación para importar los parámetros [NAME] + </string> + <string name="SettingImportFileError"> + No se pudo abrir el archivo [FILE] + </string> + <string name="SettingParseFileError"> + No se pudo abrir el archivo [FILE] + </string> + <string name="SettingTranslateError"> + No se pudo traducir el Viento de luz legado [NAME] + </string> <string name="texture"> la textura </string> @@ -799,6 +820,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="symbolic folder link"> enlace de la carpeta </string> + <string name="settings blob"> + opciones + </string> <string name="mesh"> red </string> @@ -1126,6 +1150,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="ForceSitAvatar"> Forzar que el avatar se siente </string> + <string name="ChangeEnvSettings"> + Cambiar tu configuración del entorno + </string> <string name="AgentNameSubst"> (Tú) </string> @@ -1274,6 +1301,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="tattoo"> Tatuaje </string> + <string name="universal"> + Universal + </string> <string name="physics"> Física </string> @@ -1316,6 +1346,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="tattoo_not_worn"> Tatuaje no puesto </string> + <string name="universal_not_worn"> + Universal no puesto + </string> <string name="physics_not_worn"> Física no puesta </string> @@ -1367,6 +1400,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="create_new_tattoo"> Crear un tatuaje nuevo </string> + <string name="create_new_universal"> + Crear unos guantes nuevos + </string> <string name="create_new_physics"> Crear nueva física </string> @@ -2502,6 +2538,27 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia <string name="RegionSettings"> Configuración de la región </string> + <string name="NoEnvironmentSettings"> + Esta región no es compatible con las opciones de entorno. + </string> + <string name="EnvironmentSun"> + Sol + </string> + <string name="EnvironmentMoon"> + Luna + </string> + <string name="EnvironmentBloom"> + Florecimiento + </string> + <string name="EnvironmentCloudNoise"> + Ruido de nubes + </string> + <string name="EnvironmentNormalMap"> + Vista Normal + </string> + <string name="EnvironmentTransparent"> + Transparente + </string> <string name="ClassifiedClicksTxt"> Clics: [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil </string> @@ -4673,6 +4730,9 @@ Denuncia de infracción <string name="New Tattoo"> Tatuaje nuevo </string> + <string name="New Universal"> + Nuevo Universal + </string> <string name="New Physics"> Nueva física </string> @@ -4799,6 +4859,15 @@ Denuncia de infracción <string name="Female - Wow"> Mujer - Admiración </string> + <string name="New Daycycle"> + Nuevo Ciclo del día + </string> + <string name="New Water"> + Nueva Agua + </string> + <string name="New Sky"> + Nuevo Cielo + </string> <string name="/bow"> /reverencia </string> @@ -5327,6 +5396,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="BeaconMedia"> Viendo balizas de medios (blancas) </string> + <string name="BeaconSun"> + Visualización de la baliza de dirección del sol (naranja) + </string> + <string name="BeaconMoon"> + Visualización de la baliza de dirección de la luna (violeta) + </string> <string name="ParticleHiding"> Ocultando las partículas </string> @@ -5354,6 +5429,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Destinations_Label"> Destinos </string> + <string name="Command_Environments_Label"> + Mis entornos + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5447,6 +5528,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Destinations_Tooltip"> Destinos de interés </string> + <string name="Command_Environments_Tooltip"> + Mis entornos + </string> + <string name="Command_Facebook_Tooltip"> + Publicar en Facebook + </string> <string name="Command_Flickr_Tooltip"> Subir a Flickr </string> @@ -5642,6 +5729,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="ExperiencePermission12"> aceptar automáticamente permisos de experiencias </string> + <string name="ExperiencePermission16"> + forzar que el avatar se siente + </string> + <string name="ExperiencePermission17"> + cambiar tu configuración del entorno + </string> <string name="ExperiencePermissionShortUnknown"> realizar una operación desconocida: [Permission] </string> @@ -5666,6 +5759,12 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="ExperiencePermissionShort12"> Otorgar permisos </string> + <string name="ExperiencePermissionShort16"> + Sentarte + </string> + <string name="ExperiencePermissionShort17"> + Entorno + </string> <string name="logging_calls_disabled_log_empty"> No se están registrando las conversaciones. Para empezar a grabar un registro, elige "Guardar: Solo registro" o "Guardar: Registro y transcripciones" en Preferencias > Chat. </string> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index fb65e71ee1..fe863fc565 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -484,5 +484,6 @@ musique : </panel> </panel> <panel label="EXPÉRIENCES" name="land_experiences_panel"/> + <panel label="ENVIRONNEMENT" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_adjust_environment.xml b/indra/newview/skins/default/xui/fr/floater_adjust_environment.xml new file mode 100644 index 0000000000..ca5b0ec948 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Éclairage personnel"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Réinitialiser" name="btn_reset" tool_tip="Fermer et réinitialiser vers l'environnement partagé"/> + <text name="cloud_map_label"> + Image du nuage : + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Soleil : + </text> + <check_box label="Afficher la balise" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Afficher la balise" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml index ebd4dab683..c6adf67bac 100644 --- a/indra/newview/skins/default/xui/fr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Sources sonores" name="sounds"/> <check_box label="Sources des particules" name="particles"/> <check_box label="Sources des médias" name="moapbeacon"/> + <check_box label="Soleil" name="sun"/> + <check_box label="Lune" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml index 02b58f9b36..09186b6777 100644 --- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="Sons"/> <check_box label="Textures" name="check_texture"/> <icon name="icon_texture" tool_tip="Textures"/> + <icon name="icon_setting" tool_tip="Paramètres d'environnement"/> <button label="√ Tout" label_selected="Tout" name="check_all"/> <button label="Effacer" label_selected="Aucun" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml deleted file mode 100644 index c666a25c10..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="SUPPRIMER PRÉRÉGLAGE ENV."> - <string name="title_water"> - Supprimer un préréglage de l'eau - </string> - <string name="title_sky"> - Supprimer un préréglage du ciel - </string> - <string name="title_day_cycle"> - Supprimer un cycle du jour - </string> - <string name="label_water"> - Préréglage : - </string> - <string name="label_sky"> - Préréglage : - </string> - <string name="label_day_cycle"> - Cycle du jour : - </string> - <string name="msg_confirm_deletion"> - Voulez-vous vraiment supprimer le préréglage sélectionné ? - </string> - <string name="msg_sky_is_referenced"> - Impossible de supprimer un préréglage référencé dans un ou plusieurs cycles du jour. - </string> - <string name="combo_label"> - -Sélectionner un préréglage- - </string> - <text name="label"> - Préréglage : - </text> - <button label="Supprimer" name="delete"/> - <button label="Annuler" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..7e8e76fd5a --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Modifier un cycle du jour"> + <string name="title_new"> + Créer un nouveau cycle du jour + </string> + <string name="title_edit"> + Modifier un cycle du jour + </string> + <string name="hint_new"> + Donner un nom au cycle du jour, ajuster les contrôles afin de le créer, puis cliquez sur « Enregistrer ». + </string> + <string name="hint_edit"> + Pour modifier le cycle du jour, ajustez les contrôles ci-dessous, puis cliquez sur « Enregistrer ». + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Ciel [ALT] + </string> + <string name="sky_label"> + Ciel + </string> + <string name="water_label"> + Eau + </string> + <string name="commit_parcel"> + Appliquer à la parcelle + </string> + <string name="commit_region"> + Appliquer à la région + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Nom du cycle du jour : + </text> + <button label="Importer" name="btn_import" tool_tip="Importer les paramètres hérités du disque."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Ciel 4" name="sky4_track"/> + <button label="Ciel 3" name="sky3_track"/> + <button label="Ciel 2" name="sky2_track"/> + <button label="Niveau du sol" name="sky1_track"/> + <button label="Eau" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Cloner la piste à partir" name="copy_track"/> + <button label="Charger la piste à partir" name="load_track"/> + <button label="Effacer la piste" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Reculer"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Avancer"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="Ajouter [FRAME]" name="add_frame"/> + <button label="Charger [FRAME]" name="btn_load_frame"/> + <button label="Annuler [FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Sélectionnez un cadre clé à partir du calendrier ci-dessus pour modifier les paramètres. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Eau" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmosphère et éclairage" name="atmosphere_panel"/> + <panel label="Nuages" name="clouds_panel"/> + <panel label="Soleil et lune" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Enregistrer" name="save_btn"/> + <button label="Annuler" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/fr/floater_fixedenvironment.xml new file mode 100644 index 0000000000..515a1d2843 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Environnement fixe"> + <string name="edit_sky"> + Modifier le ciel : + </string> + <string name="edit_water"> + Modifier l'eau + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Charger" name="btn_load" tool_tip="Charger des paramètres à partir de l'inventaire"/> + <button label="Importer" name="btn_import" tool_tip="Importer les paramètres hérités du disque."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Enregistrer" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Annuler" name="btn_cancel" tool_tip="Rétablir la dernière version enregistrée"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml index 471dddf448..4e20431cc4 100644 --- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Sons" name="check_sound"/> <check_box label="Textures" name="check_texture"/> <check_box label="Photos" name="check_snapshot"/> + <check_box label="Paramètres" name="check_settings"/> <button label="Tout" label_selected="Tout" name="All"/> <button bottom_delta="0" label="Aucun" label_selected="Aucun" name="None"/> <check_box label="Toujours montrer les dossiers" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/fr/floater_my_environments.xml b/indra/newview/skins/default/xui/fr/floater_my_environments.xml new file mode 100644 index 0000000000..5ee6e2d5fd --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Endroits" name="my_environments" title="MES ENVIRONNEMENTS"> + <layout_stack> + <layout_panel label="Filtres" name="filter_panel"> + <check_box label="Jours" name="chk_days"/> + <check_box label="Ciels" name="chk_skies"/> + <check_box label="Eau" name="chk_water"/> + <filter_editor label="Filtrer les environnements" name="flt_search"/> + </layout_panel> + <layout_panel label="Environnements" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Afficher tous les dossiers" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Plus d'options"/> + <menu_button name="btn_newsettings" tool_tip="Créer un nouveau paramètre"/> + <button name="btn_del" tool_tip="Supprimer l'article sélectionné"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_perms_default.xml b/indra/newview/skins/default/xui/fr/floater_perms_default.xml index 1cea8e55cc..ef56ce5663 100644 --- a/indra/newview/skins/default/xui/fr/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/fr/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Définir les droits par défaut pour la création d’habits ou de parties de corps"> Articles à porter </text> + <text name="label_13" tool_tip="Définir les autorisations par défaut pour la création des paramètres environnementaux"> + Paramètres + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Annuler" label_selected="Annuler" name="cancel"/> diff --git a/indra/newview/skins/default/xui/fr/floater_pick_track.xml b/indra/newview/skins/default/xui/fr/floater_pick_track.xml new file mode 100644 index 0000000000..46731bcec7 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="CHOISIR : PISTE"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Sélectionner la source du ciel : + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Ciel4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Ciel3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Ciel2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Sol" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Annuler" label_selected="Annuler" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml index fd47254934..42af9c526d 100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Eau transparente" name="TransparentWater"/> <check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/> <check_box initial_value="true" label="Lumières locales" name="LocalLights"/> - <check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/> <slider label="Rendu du terrain :" name="TerrainDetail"/> <text name="TerrainDetailText"> Faible diff --git a/indra/newview/skins/default/xui/fr/floater_settings_picker.xml b/indra/newview/skins/default/xui/fr/floater_settings_picker.xml new file mode 100644 index 0000000000..b75d8c6b8d --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="CHOISIR : PARAMÈTRES"> + <floater.string name="pick title"> + Choisir : + </floater.string> + <floater.string name="pick_track"> + SÉLECTIONNER UNE PISTE + </floater.string> + <floater.string name="pick_settings"> + SÉLECTIONNEZ LES PARAMÈTRES + </floater.string> + <floater.string name="track_water"> + Eau + </floater.string> + <floater.string name="track_ground"> + Sol + </floater.string> + <floater.string name="track_sky"> + Ciel[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Filtrer les textures" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Annuler" label_selected="Annuler" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml index eace67026c..2925727b48 100644 --- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Inventaire" name="inventory" value="0"/> <radio_item label="Local" name="local" value="1"/> + <radio_item label="Figer" name="bake" value="2"/> </radio_group> <text name="unknown"> Taille : [DIMENSIONS] @@ -20,7 +21,6 @@ <button label="Vierge" label_selected="Vierge" name="Blank" width="60"/> <button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/> <button bottom="-240" label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/> <text name="preview_disabled" value="Aperçu désactivé"/> <filter_editor label="Filtrer les textures" name="inventory search editor"/> <check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/> @@ -31,6 +31,22 @@ <column label="Nom" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Choisir la texture mixte"> + <combo_box.item label="Aucun" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Masquer la région maillée de base" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> + <check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index c8bd7dc130..f81723e6cf 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Activer" name="Marketplace Activate"/> <menu_item_call label="Désactiver" name="Marketplace Deactivate"/> <menu_item_call label="Partager" name="Share"/> - <menu_item_call label="Acheter" name="Task Buy"/> <menu_item_call label="Ouvrir" name="Task Open"/> <menu_item_call label="Jouer" name="Task Play"/> <menu_item_call label="Propriétés" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Nouveau caleçon" name="New Underpants"/> <menu_item_call label="Nouveau masque alpha" name="New Alpha Mask"/> <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> + <menu_item_call label="Nouvel environnement universel" name="New Universal"/> <menu_item_call label="Nouvelles propriétés physiques" name="New Physics"/> </menu> <menu label="Nouvelles parties du corps" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Nouveaux cheveux" name="New Hair"/> <menu_item_call label="Nouveaux yeux" name="New Eyes"/> </menu> + <menu label="Nouveaux paramètres" name="New Settings"> + <menu_item_call label="Nouveau ciel" name="New Sky"/> + <menu_item_call label="Nouvelle eau" name="New Water"/> + <menu_item_call label="Nouveau cycle du jour" name="New Day Cycle"/> + </menu> <menu label="Utiliser comme défaut pour" name="upload_def"> <menu_item_call label="Chargements d’images" name="Image uploads"/> <menu_item_call label="Chargements de sons" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Modifier" name="Wearable Edit"/> <menu_item_call label="Ajouter" name="Wearable Add"/> <menu_item_call label="Enlever" name="Take Off"/> + <menu_item_call label="Appliquer uniquement à moi-même" name="Settings Apply Local"/> + <menu_item_call label="Appliquer à la parcelle" name="Settings Apply Parcel"/> <menu_item_call label="Copier dans les annonces Place du marché" name="Marketplace Copy"/> <menu_item_call label="Déplacer dans les annonces Place du marché" name="Marketplace Move"/> <menu_item_call label="--aucune option--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml index 1076af44d9..de510eaeaa 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/> <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/> <menu_item_call label="Modèle..." name="Upload Model"/> - <menu_item_call label="Assistant Modèle..." name="Upload Model Wizard"/> <menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/> - <menu_item_call label="Définir les droits de chargement par défaut" name="perm prefs"/> </menu> <menu_item_call label="Nouveau dossier" name="New Folder"/> <menu_item_call label="Nouveau script" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Nouveau caleçon" name="New Underpants"/> <menu_item_call label="Nouvel alpha" name="New Alpha"/> <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> + <menu_item_call label="Nouvel environnement universel" name="New Universal"/> <menu_item_call label="Nouvelles propriétés physiques" name="New Physics"/> </menu> <menu label="Nouvelles parties du corps" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Nouveaux cheveux" name="New Hair"/> <menu_item_call label="Nouveaux yeux" name="New Eyes"/> </menu> + <menu label="Nouveaux paramètres" name="New Settings"> + <menu_item_call label="Nouveau ciel" name="New Sky"/> + <menu_item_call label="Nouvelle eau" name="New Water"/> + <menu_item_call label="Nouveau cycle du jour" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml index 28ae2f74ad..3fce2e9f33 100644 --- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Nouvel alpha" name="New Alpha"/> <menu_item_call label="Nouvelles propriétés physiques" name="New Physics"/> <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> + <menu_item_call label="Nouvel environnement universel" name="New Universal"/> </menu> <menu label="Nouvelles parties du corps" name="New Body Parts"> <menu_item_call label="Nouvelle silhouette" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/fr/menu_save_settings.xml b/indra/newview/skins/default/xui/fr/menu_save_settings.xml new file mode 100644 index 0000000000..34a3f00925 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Enregistrer" name="save_settings"/> + <menu_item_check label="Enregistrer sous" name="save_as_new_settings"/> + <menu_item_check label="Valider" name="commit_changes"/> + <menu_item_check label="Appliquer uniquement à moi-même" name="apply_local"/> + <menu_item_check label="Appliquer à la parcelle" name="apply_parcel"/> + <menu_item_check label="Appliquer à la région" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_settings_add.xml b/indra/newview/skins/default/xui/fr/menu_settings_add.xml new file mode 100644 index 0000000000..cbd7cba494 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Nouveau ciel" name="New Sky"/> + <menu_item_call label="Nouvelle eau" name="New Water"/> + <menu_item_call label="Nouveau cycle du jour" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_settings_gear.xml b/indra/newview/skins/default/xui/fr/menu_settings_gear.xml new file mode 100644 index 0000000000..a4e52d373b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Modifier" name="edit_settings"/> + <menu_item_call label="Appliquer uniquement à moi-même" name="Settings Apply Local"/> + <menu_item_call label="Appliquer à la parcelle" name="Settings Apply Parcel"/> + <menu_item_call label="Appliquer à la région" name="Settings Apply Region"/> + <menu_item_call label="Copier" name="copy_settings"/> + <menu_item_call label="Coller" name="paste_settings"/> + <menu_item_call label="Copier l’UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 12c50464da..2594e9d0bb 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/> <menu_item_check label="Menu Avancé" name="Show Advanced Menu"/> </menu> - <menu label="Soleil" name="Sun"> + <menu label="Environnement" name="Environment"> <menu_item_check label="Aube" name="Sunrise"/> <menu_item_check label="Midi" name="Noon"/> <menu_item_check label="Coucher de soleil" name="Sunset"/> <menu_item_check label="Minuit" name="Midnight"/> - <menu_item_check label="Utiliser les réglages de la région" name="Use Region Settings"/> - </menu> - <menu label="Éditeur d'environnement" name="Environment Editor"> - <menu_item_call label="Paramètres d'environnement..." name="Environment Settings"/> - <menu label="Préréglages de l'eau" name="Water Presets"> - <menu_item_call label="Nouveau préréglage..." name="new_water_preset"/> - <menu_item_call label="Modifier un préréglage..." name="edit_water_preset"/> - <menu_item_call label="Supprimer un préréglage..." name="delete_water_preset"/> - </menu> - <menu label="Préréglages du ciel" name="Sky Presets"> - <menu_item_call label="Nouveau préréglage..." name="new_sky_preset"/> - <menu_item_call label="Modifier un préréglage..." name="edit_sky_preset"/> - <menu_item_call label="Supprimer un préréglage..." name="delete_sky_preset"/> - </menu> - <menu label="Préréglages du jour" name="Day Presets"> - <menu_item_call label="Nouveau préréglage..." name="new_day_preset"/> - <menu_item_call label="Modifier un préréglage..." name="edit_day_preset"/> - <menu_item_call label="Supprimer un préréglage..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Utiliser l'environnement partagé" name="Use Shared Environment"/> + <menu_item_call label="Mes environnements..." name="my_environs"/> + <menu_item_call label="Éclairage personnel..." name="adjustment_tool"/> + <menu_item_check label="Pause des nuages" name="pause_clouds"/> </menu> </menu> <menu label="Construire" name="BuildTools"> @@ -346,6 +331,9 @@ <menu_item_check label="Masques alpha automatiques (non différés)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Textures d'animation" name="Animation Textures"/> <menu_item_check label="Désactiver les textures" name="Disable Textures"/> + <menu_item_check label="Désactiver l'ambiance" name="Disable Ambient"/> + <menu_item_check label="Désactiver la lumière du soleil" name="Disable Sunlight"/> + <menu_item_check label="Désactiver les lumières locales" name="Disable Local Lights"/> <menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/> <menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/> <menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/> @@ -483,6 +471,7 @@ <menu_item_call label="Jupe" name="Skirt"/> <menu_item_call label="Alpha" name="Alpha"/> <menu_item_call label="Tatouage" name="Tattoo"/> + <menu_item_call label="Universel" name="Universal"/> <menu_item_call label="Propriétés physiques" name="Physics"/> <menu_item_call label="Tous les habits" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 91e7bbb2ed..77cfea5a63 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1959,6 +1959,11 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po Le fait de décocher cette option est susceptible de lever les restrictions que les propriétaires des parcelles ont ajouté pour éviter tout différend, maintenir la confidentialité ou protéger les jeunes résidents contre tout contenu réservé aux adultes. Veuillez discuter avec les propriétaires du terrain si nécessaire. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Si vous décochez cette option, tous les environnements personnalisés que les propriétaires de parcelles ont ajoutés à leurs parcelles seront supprimés. Veuillez discuter avec les propriétaires de votre parcelle si nécessaire. +Souhaitez-vous continuer ? + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi > Préférences > Général. <usetemplate name="okbutton" yestext="OK"/> @@ -2439,7 +2444,15 @@ Liez-la à partir d'une page web pour permettre aux autres résidents d&apo Une dossier semble manquer au Cycle du jour : [SKY]. </notification> <notification name="WLRegionApplyFail"> - Impossible d'appliquer les réglages à la région. Le problème est parfois résolu en quittant la région puis en y revenant. Motif fourni : [FAIL_REASON] + Impossible d'appliquer les réglages à la région. Raison : [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Une texture locale est utilisée sur la piste [TRACK], le cadre n° [FRAMENO] ([FRAME]%) dans le champ [FIELD]. +Les paramètres ne seront peut-être pas enregistrés en utilisant les textures locales + </notification> + <notification name="WLLocalTextureFixedBlock"> + Une texture locale est utilisée dans le champ [FIELD]. +Les paramètres ne seront peut-être pas enregistrés en utilisant les textures locales </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Impossible de supprimer la dernière clé de ce cycle du jour car ce dernier ne peut pas être vide. Modifiez la dernière clé restante au lieu d'essayer de la supprimer puis d'en créer une nouvelle. @@ -4392,4 +4405,76 @@ Veuillez sélectionner un terrain plus petit. [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + Impossible de charger les paramètres de [NOM] à partir de la base de données. + </notification> + <notification name="FailedToLoadSettingsApply"> + Impossible d'appliquer ces paramètres à l'environnement. + </notification> + <notification name="FailedToBuildSettingsDay"> + Impossible d'appliquer ces paramètres à l'environnement. + </notification> + <notification name="NoEnvironmentSettings"> + Cette région ne prend pas en charge les paramètres environnementaux. + </notification> + <notification label="Enregistrer la tenue" name="SaveSettingAs"> + Enregistrer les paramètres environnementaux actuels sous : + <form name="form"> + <input name="message"> + [DESC] (nouv.) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Annuler"/> + </form> + </notification> + <notification name="WLImportFail"> + Impossible d'importer les paramètres Windlight [NAME] hérités de +[FILE]. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Impossible de définir l'environnement pour cette parcelle. +Veuillez entrer ou sélectionner une parcelle que vous avez le droit de modifier. + </notification> + <notification name="SettingsUnsuported"> + Les paramètres ne sont pas pris en charge dans cette région. +Veuillez vous déplacer dans une région où les paramètres sont activés et relancer votre action. + </notification> + <notification name="SettingsConfirmLoss"> + Vous êtes sur le point de perdre les modifications que vous avez apportées à ce [TYPE] nommé "[NAME]". +Voulez-vous vraiment continuer ? + <usetemplate ignoretext="Voulez-vous vraiment perdre les modifications ?" name="okcancelignore" notext="Non" yestext="Oui"/> + </notification> + <notification name="SettingsConfirmReset"> + Vous êtes sur le point de supprimer tous les paramètres appliqués. +Voulez-vous vraiment continuer ? + <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Vous êtes sur le point de supprimer tous les paramètres d'éclairage personnel appliqués. +Voulez-vous vraiment continuer ? + <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Vous êtes sur le point d'importer des paramètres non transférables dans ce cycle de jour. Si vous continuez, les paramètres que vous modifiez deviennent également non transférables. + +Cette modification ne peut être être annulée. + +Voulez-vous vraiment continuer ? + <usetemplate ignoretext="Voulez-vous vraiment que ces paramètres soient non transférables ?" name="okcancelignore" notext="Non" yestext="Oui"/> + </notification> + <notification name="NoEditFromLibrary"> + Vous ne pouvez pas modifier les paramètres directement à partir de la bibliothèque. +Veuillez copier vers votre inventaire puis réessayer + </notification> + <notification name="EnvironmentApplyFailed"> + Nous avons rencontré un problème avec ces paramètres. Ils ne peuvent pas être enregistres ou appliqués pour l'instant. + </notification> + <notification name="TrackLoadFailed"> + Impossible de charger la piste dans [TRACK]. + </notification> + <notification name="TrackLoadMismatch"> + Impossible de charger la piste de [TRACK1] dans [TRACK2]. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml index 086542dee2..24b4fc212a 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_universal.xml b/indra/newview/skins/default/xui/fr/panel_edit_universal.xml new file mode 100644 index 0000000000..a4626123f9 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Tatouage tête" name="Head Universal Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage haut" name="Upper Universal Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage bas" name="Lower Universal Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage jupe" name="Skirt Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage cheveux" name="Hair Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage yeux" name="Eyes Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage bras gauche" name="Left Arm Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Tatouage jambe gauche" name="Left Leg Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Aux1 Tattoo" name="Aux1 Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Aux2 Tattoo" name="Aux2 Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <texture_picker label="Aux3 Tattoo" name="Aux3 Tattoo" tool_tip="Cliquer pour sélectionner une image."/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index def158cf68..d8851bb42c 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Modification du tatouage </string> + <string name="edit_universal_title"> + Modifier l'universel + </string> <string name="edit_physics_title"> Modification des propriétés physiques </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Tatouage : </string> + <string name="universal_desc_text"> + Universel : + </string> <string name="physics_desc_text"> Propriétés physiques : </string> diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml index a5be812ee5..5212c3a9ce 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Environnement" name="panel_env_info"> - <text name="water_settings_title"> - Sélectionnez les réglages d'eau et de ciel/cycle du jour que vous souhaitez afficher pour tous les résidents visitant votre région. En savoir plus - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Utiliser les réglages par défaut de Second Life" name="use_sl_default_settings"/> - <radio_item label="Utiliser les réglages suivants" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Réglage de l'eau - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Sélectionner un préréglage-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Ciel / Cycle du jour - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Ciel fixe" name="my_sky_settings"/> - <radio_item label="Cycle du jour" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Sélectionner un préréglage-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Sélectionner un préréglage-" name="item0"/> - </combo_box> - </panel> - <button label="Appliquer" name="apply_btn"/> - <button label="Annuler" name="cancel_btn"/> + <string name="str_label_use_default"> + Utiliser les réglages par défaut + </string> + <string name="str_label_use_region"> + Utiliser les réglages de la région + </string> + <string name="str_altitude_desription"> + Ciel [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + Aucune parcelle n'est sélectionnée. Les paramètres environnementaux sont désactivés.. + </string> + <string name="str_cross_region"> + Les paramètres environnementaux ne sont pas disponibles dans les limites des régions. + </string> + <string name="str_legacy"> + Les paramètres environnementaux ne sont pas disponibles dans cette région. + </string> + <string name="str_disallowed"> + Le gérant du domaine n'autorise pas la modification de l'environnement des parcelles dans cette région. + </string> + <string name="str_too_small"> + La parcelle doit faire au moins 128 mètres carrés pour supporter un environnement. + </string> + <string name="str_empty"> + (vide) + </string> + <string name="str_region_env"> + (environnement de la région) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Utiliser l'inventaire" name="btn_select_inventory"/> + <button label="Personnaliser" name="btn_edit"/> + <check_box label="Les propriétaires de parcelle peuvent neutraliser l'environnement" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Ciel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + Inconnu + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Faites glisser un paramètre de l'inventaire vers cette zone cible pour le sélectionner comme ciel actuel."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Ciel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + Inconnu + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Faites glisser un paramètre de l'inventaire vers cette zone cible pour le sélectionner comme ciel actuel."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Ciel [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + Inconnu + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Faites glisser un paramètre de l'inventaire vers cette zone cible pour le sélectionner comme ciel actuel."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Sol + </text> + <line_editor name="edt_invname_ground"> + Inconnu + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Faites glisser un paramètre de l'inventaire vers cette zone cible pour le sélectionner comme ciel au niveau du sol."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Eau + </text> + <line_editor name="edt_invname_water"> + Inconnu + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Faites glisser un paramètre de l'inventaire vers cette zone cible pour le sélectionner comme eau actuelle."/> + </panel> + <button label="Réinitialiser" name="btn_rst_altitudes" tool_tip="Rétablir les altitudes par défaut."/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/fr/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..1d6491c7e7 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmosphère et éclairage" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/fr/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/fr/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..180f09653e --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Nuages" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/fr/panel_settings_sky_density.xml new file mode 100644 index 0000000000..107858dc20 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Densité" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Terme exponentiel de Rayleigh :" name="rayleigh_exponential"/> + <slider label="Échelle exponentielle de Rayleigh :" name="rayleigh_exponential_scale"/> + <slider label="Terme linéaire de Rayleigh :" name="rayleigh_linear"/> + <slider label="Terme constant de Rayleigh :" name="rayleigh_constant"/> + <slider label="Altitude maximum de Rayleigh :" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Terme exponentiel de mie :" name="mie_exponential"/> + <slider label="Échelle exponentielle de mie :" name="mie_exponential_scale"/> + <slider label="Terme linéaire de mie :" name="mie_linear"/> + <slider label="Terme constant de mie :" name="mie_constant"/> + <slider label="Facteur aniso de mie :" name="mie_aniso_factor"/> + <slider label="Altitude maximum de mie :" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Terme exponentiel d'absorption :" name="absorption_exponential"/> + <slider label="Échelle exponentielle d'absorption :" name="absorption_exponential_scale"/> + <slider label="Terme linéaire d'absorption :" name="absorption_linear"/> + <slider label="Terme constant d'absorption :" name="absorption_constant"/> + <slider label="Altitude maximale d'absorption :" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/fr/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..39d87c9727 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Soleil et lune" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Afficher la balise" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Afficher la balise" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_settings_water.xml b/indra/newview/skins/default/xui/fr/panel_settings_water.xml new file mode 100644 index 0000000000..203075f987 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Eau" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Décalage Fresnel : + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X :" name="water_normal_scale_x"/> + <slider label="Y :" name="water_normal_scale_y"/> + <slider label="Z :" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml index 72c456aa6d..d028336ac7 100644 --- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Texture" name="Texture"> - <panel.string name="string repeats per meter"> - Répétitions au mètre - </panel.string> - <panel.string name="string repeats per face"> - Répétitions par face - </panel.string> <text name="color label"> Couleur </text> @@ -114,4 +108,5 @@ <spinner label="Décalage horizontal" name="shinyOffsetU"/> <spinner label="Décalage vertical" name="shinyOffsetV"/> <check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/> + <button label="Aligner" label_selected="Aligner les couches de texture actuelles" name="button align textures" tool_tip="Aligner les couches de texture actuelles"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml index d10de38437..95e4799ce4 100644 --- a/indra/newview/skins/default/xui/fr/role_actions.xml +++ b/indra/newview/skins/default/xui/fr/role_actions.xml @@ -33,6 +33,7 @@ <action description="Modifier la musique et les médias" longdescription="Changez la musique et les médias à partir du menu À propos du terrain > Médias." name="land change media" value="20"/> <action description="Changer l'option Modifier le terrain" longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer. " name="land edit" value="21"/> <action description="Changer diverses options du terrain" longdescription="Activez Sécurisé (pas de dégâts), Voler, et autorisez les autres résidents à : modifier le terrain, construire, créer des repères et exécuter des scripts sur les terrains appartenant au groupe dans l'onglet propos du terrain > Options." name="land options" value="22"/> + <action description="Modifier les paramètres environnementaux et le cycle du jour." longdescription="Charger les paramètres environnementaux et le cycle du jour à partir de l'onglet A propos du terrain > Environnement." name="land change environment" value="46"/> </action_set> <action_set description="Ces pouvoirs permettent aux membres d'outrepasser les restrictions sur les parcelles du groupe." name="Parcel Powers"> <action description="Toujours autoriser Modifier le terrain" longdescription="Vous pouvez modifier le relief d'une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 63838d830f..1108598a46 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -657,6 +657,15 @@ Veuillez réessayer de vous connecter dans une minute. <string name="BUTTON_HELP"> Afficher l'aide </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Les éléments de ce type ne peuvent pas être attachés +aux notes de cette région. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Seuls des éléments avec des autorisation +illimitées pour le 'prochain propriétaire' +peuvent être joints aux notes. + </string> <string name="Searching"> Recherche... </string> @@ -736,6 +745,18 @@ Veuillez réessayer de vous connecter dans une minute. Erreur dans la demande de chargement. Veuillez consulter le site : http://secondlife.com/support pour vous aider à résoudre ce problème. </string> + <string name="SettingValidationError"> + Échec de la validation pour l'importation des paramètres [NAME] + </string> + <string name="SettingImportFileError"> + Impossible d'ouvre le fichier [FILE] + </string> + <string name="SettingParseFileError"> + Impossible d'ouvre le fichier [FILE] + </string> + <string name="SettingTranslateError"> + Impossible de traduit les paramètres windlight hérités [NAME] + </string> <string name="texture"> texture </string> @@ -811,6 +832,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="symbolic folder link"> lien du dossier </string> + <string name="settings blob"> + paramètres + </string> <string name="mesh"> maillage </string> @@ -1141,6 +1165,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="ForceSitAvatar"> Forcez votre avatar à s’asseoir </string> + <string name="ChangeEnvSettings"> + Changer vos paramètres d'environnement + </string> <string name="NotConnected"> Pas connecté(e) </string> @@ -1292,6 +1319,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="tattoo"> Tatouage </string> + <string name="universal"> + Universel + </string> <string name="physics"> Propriétés physiques </string> @@ -1334,6 +1364,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="tattoo_not_worn"> Tatouage non porté </string> + <string name="universal_not_worn"> + Universel non porté + </string> <string name="physics_not_worn"> Propriétés physiques non portées </string> @@ -1385,6 +1418,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="create_new_tattoo"> Créer un nouveau tatouage </string> + <string name="create_new_universal"> + Créer un nouvel environnement universel + </string> <string name="create_new_physics"> Créer de nouvelles propriétés physiques </string> @@ -2532,6 +2568,27 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life <string name="RegionSettings"> Réglages de la région </string> + <string name="NoEnvironmentSettings"> + Cette région ne prend pas en charge les paramètres environnementaux. + </string> + <string name="EnvironmentSun"> + Soleil + </string> + <string name="EnvironmentMoon"> + Lune + </string> + <string name="EnvironmentBloom"> + Éclat + </string> + <string name="EnvironmentCloudNoise"> + Bruit du nuage + </string> + <string name="EnvironmentNormalMap"> + Carte normale + </string> + <string name="EnvironmentTransparent"> + Transparent + </string> <string name="ClassifiedClicksTxt"> Clics : [TELEPORT] téléportation, [MAP] carte, [PROFILE] profil </string> @@ -4763,6 +4820,9 @@ du rapport d'infraction <string name="New Tattoo"> Nouveau tatouage </string> + <string name="New Universal"> + Nouvel environnement universel + </string> <string name="New Physics"> Nouvelles propriétés physiques </string> @@ -4889,6 +4949,15 @@ du rapport d'infraction <string name="Female - Wow"> Femme - Ouah ! </string> + <string name="New Daycycle"> + Nouveau cycle du jour + </string> + <string name="New Water"> + Nouvelle eau + </string> + <string name="New Sky"> + Nouveau ciel + </string> <string name="/bow"> /s'incliner </string> @@ -5417,6 +5486,12 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="BeaconMedia"> Affichage des balises de média (blanc) </string> + <string name="BeaconSun"> + Balise de visibilité du soleil (orange) + </string> + <string name="BeaconMoon"> + Observation de la balise de direction de la lune (violet) + </string> <string name="ParticleHiding"> Masquage des particules </string> @@ -5444,6 +5519,12 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Destinations_Label"> Destinations </string> + <string name="Command_Environments_Label"> + Mes environnements + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5537,6 +5618,12 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Destinations_Tooltip"> Destinations intéressantes </string> + <string name="Command_Environments_Tooltip"> + Mes environnements + </string> + <string name="Command_Facebook_Tooltip"> + Publier sur Facebook + </string> <string name="Command_Flickr_Tooltip"> Charger sur Flickr </string> @@ -5732,6 +5819,12 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="ExperiencePermission12"> accepter automatiquement les permissions d’expérience </string> + <string name="ExperiencePermission16"> + forcez votre avatar à s’asseoir + </string> + <string name="ExperiencePermission17"> + changer vos paramètres d'environnement + </string> <string name="ExperiencePermissionShortUnknown"> a effectué une opération inconnue : [Permission] </string> @@ -5756,6 +5849,12 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="ExperiencePermissionShort12"> Permission </string> + <string name="ExperiencePermissionShort16"> + M'asseoir + </string> + <string name="ExperiencePermissionShort17"> + Environnement + </string> <string name="logging_calls_disabled_log_empty"> Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences > Chat. </string> diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index 70909b1f7c..03e03095d6 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -484,5 +484,6 @@ Media: </panel> </panel> <panel label="ESPERIENZE" name="land_experiences_panel"/> + <panel label="AMBIENTE" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_adjust_environment.xml b/indra/newview/skins/default/xui/it/floater_adjust_environment.xml new file mode 100644 index 0000000000..948e2d03aa --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Illuminazione personale"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Reimposta" name="btn_reset" tool_tip="Chiudi e reimposta a Ambiente Condiviso"/> + <text name="cloud_map_label"> + Immagine nuvola: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Sole: + </text> + <check_box label="Mostra marcatore" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Mostra marcatore" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml index b7ab265cc2..303c2fdd6c 100644 --- a/indra/newview/skins/default/xui/it/floater_beacons.xml +++ b/indra/newview/skins/default/xui/it/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Fonti sonore" name="sounds"/> <check_box label="Fonti delle particelle" name="particles"/> <check_box label="Fonti multimedia" name="moapbeacon"/> + <check_box label="Sole" name="sun"/> + <check_box label="Luna" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml index 10bbe933e3..b7572f1776 100644 --- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="Suoni"/> <check_box label="Texture" name="check_texture"/> <icon name="icon_texture" tool_tip="Texture"/> + <icon name="icon_setting" tool_tip="Impostazioni ambiente"/> <button label="√ Tutti" label_selected="Tutti" name="check_all"/> <button label="Cancella" label_selected="Nessuno" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml deleted file mode 100644 index 31cf01fc7b..0000000000 --- a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="CANCELLA VALORE PREDEFINITO AMB"> - <string name="title_water"> - Cancella valore predefinito acqua - </string> - <string name="title_sky"> - Cancella valore predefinito cielo - </string> - <string name="title_day_cycle"> - Cancella ciclo giornata - </string> - <string name="label_water"> - Valore predefinito: - </string> - <string name="label_sky"> - Valore predefinito: - </string> - <string name="label_day_cycle"> - Ciclo giornata: - </string> - <string name="msg_confirm_deletion"> - Sei sicuro di volere eliminare il valore predefinito selezionato? - </string> - <string name="msg_sky_is_referenced"> - Impossibile rimuovere un valore predefinito che viene utilizzato in uno o più cicli di giornata. - </string> - <string name="combo_label"> - -Seleziona un valore predefinito- - </string> - <text name="label"> - Valore predefinito: - </text> - <button label="Elimina" name="delete"/> - <button label="Annulla" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..12efdb81b5 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Modifica ciclo giornata"> + <string name="title_new"> + Crea un nuovo ciclo giornata + </string> + <string name="title_edit"> + Modifica ciclo giornata + </string> + <string name="hint_new"> + Dai un nome al ciclo della giornata, regola i comandi per crearlo e fai clic su "Salva". + </string> + <string name="hint_edit"> + Per modificare il ciclo della giornata, regola i comandi seguenti e fai clic su "Salva". + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Cielo [ALT] + </string> + <string name="sky_label"> + Cielo + </string> + <string name="water_label"> + Acqua + </string> + <string name="commit_parcel"> + Applica al lotto + </string> + <string name="commit_region"> + Applica alla regione + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Nome ciclo giornata: + </text> + <button label="Importa" name="btn_import" tool_tip="Importa impostazioni legacy dal disco."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Cielo 4:" name="sky4_track"/> + <button label="Cielo 3:" name="sky3_track"/> + <button label="Cielo 2:" name="sky2_track"/> + <button label="Suolo" name="sky1_track"/> + <button label="Acqua" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Clona Percorso Da" name="copy_track"/> + <button label="Carica Percorso Da" name="load_track"/> + <button label="Cancella Percorso" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Passo indietro"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Passo avanti"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="Aggiungi [FRAME]" name="add_frame"/> + <button label="Carica [FRAME]" name="btn_load_frame"/> + <button label="Elimina [FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Seleziona un fotogramma chiave dalla cronologia degli eventi qui sopra per modificare le impostazioni. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Acqua" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmosfera e illuminazione" name="atmosphere_panel"/> + <panel label="Nuvole" name="clouds_panel"/> + <panel label="Sole e Luna" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Salva" name="save_btn"/> + <button label="Annulla" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/it/floater_fixedenvironment.xml new file mode 100644 index 0000000000..4ca13a5891 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Ambiente stabilito"> + <string name="edit_sky"> + Modifica cielo: + </string> + <string name="edit_water"> + Modifica acqua: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Carica" name="btn_load" tool_tip="Carica impostazioni dall’inventario"/> + <button label="Importa" name="btn_import" tool_tip="Importa impostazioni legacy dal disco."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Salva" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Annulla" name="btn_cancel" tool_tip="Ripristina l'ultima versione salvata"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml index fe41b8ca65..c12c031198 100644 --- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Suoni" name="check_sound"/> <check_box label="Texture" name="check_texture"/> <check_box label="Fotografie" name="check_snapshot"/> + <check_box label="Impostazioni" name="check_settings"/> <button label="Tutto" label_selected="Tutto" name="All"/> <button label="Nulla" label_selected="Nulla" name="None"/> <check_box label="Mostra sempre le cartelle" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/it/floater_my_environments.xml b/indra/newview/skins/default/xui/it/floater_my_environments.xml new file mode 100644 index 0000000000..bcbf4613f3 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Luoghi" name="my_environments" title="I MIEI AMBIENTI"> + <layout_stack> + <layout_panel label="Filtri" name="filter_panel"> + <check_box label="Giorni" name="chk_days"/> + <check_box label="Cieli" name="chk_skies"/> + <check_box label="Acqua" name="chk_water"/> + <filter_editor label="Filtra Ambienti" name="flt_search"/> + </layout_panel> + <layout_panel label="Ambienti" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Mostra tutte le cartelle" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Altre opzioni"/> + <menu_button name="btn_newsettings" tool_tip="Crea nuova impostazione"/> + <button name="btn_del" tool_tip="Rimuovi l'articolo selezionato"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_perms_default.xml b/indra/newview/skins/default/xui/it/floater_perms_default.xml index 9a88f53d47..bdfea6d0ad 100644 --- a/indra/newview/skins/default/xui/it/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/it/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Imposta autorizzazioni predefinite per la creazione di vestiti o parti del corpo"> Indossabili </text> + <text name="label_13" tool_tip="Imposta autorizzazioni predefinite per la creazione delle impostazioni dell’Ambiente"> + Impostazioni + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Annulla" label_selected="Annulla" name="cancel"/> diff --git a/indra/newview/skins/default/xui/it/floater_pick_track.xml b/indra/newview/skins/default/xui/it/floater_pick_track.xml new file mode 100644 index 0000000000..8e1f3d7065 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="PREFERITO: PERCORSO"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Seleziona fonte cielo: + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Cielo4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Cielo3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Cielo2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Suolo" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Annulla" label_selected="Annulla" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml index 3773ef3711..53f9ebc6fd 100644 --- a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/> <check_box initial_value="true" label="Mappatura urti e brillantezza" name="BumpShiny"/> <check_box initial_value="true" label="Luci locali" name="LocalLights"/> - <check_box initial_value="true" label="Shader di base" name="BasicShaders" tool_tip="Se si disattiva questa opzione, si possono evitare interruzioni nei driver di alcune schede grafiche"/> <slider label="Dettagli terreno:" name="TerrainDetail"/> <text name="TerrainDetailText"> Basso diff --git a/indra/newview/skins/default/xui/it/floater_settings_picker.xml b/indra/newview/skins/default/xui/it/floater_settings_picker.xml new file mode 100644 index 0000000000..31dfb6ef19 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="PREFERITO: IMPOSTAZIONI"> + <floater.string name="pick title"> + Preferito: + </floater.string> + <floater.string name="pick_track"> + SELEZIONA PERCORSO + </floater.string> + <floater.string name="pick_settings"> + SELEZIONA IMPOSTAZIONI + </floater.string> + <floater.string name="track_water"> + Acqua + </floater.string> + <floater.string name="track_ground"> + Suolo + </floater.string> + <floater.string name="track_sky"> + Cielo[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Filtro texture" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Annulla" label_selected="Annulla" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index 27a17868a7..2e4644cef3 100644 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Inventario" name="inventory" value="0"/> <radio_item label="Locale" name="local" value="1"/> + <radio_item label="Effettua il bake" name="bake" value="2"/> </radio_group> <text name="unknown"> Dimensioni: [DIMENSIONS] @@ -19,7 +20,6 @@ <button label="Default" label_selected="Default" name="Default"/> <button label="Vuoto" label_selected="Vuoto" name="Blank"/> <button label="Niente" label_selected="Niente" name="None"/> - <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> <text name="preview_disabled" value="Anteprima disattivata"/> <filter_editor label="Filtro texture" name="inventory search editor"/> <check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/> @@ -30,6 +30,22 @@ <column label="Nome" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Scegli la bake della texture"> + <combo_box.item label="Nessuna" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Nascondi regione mesh base" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Annulla" label_selected="Annulla" name="Cancel"/> + <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml index de6855ca97..84ec7c4bd4 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Attiva" name="Marketplace Activate"/> <menu_item_call label="Disattiva" name="Marketplace Deactivate"/> <menu_item_call label="Condividi" name="Share"/> - <menu_item_call label="Compra" name="Task Buy"/> <menu_item_call label="Apri" name="Task Open"/> <menu_item_call label="Esegui" name="Task Play"/> <menu_item_call label="Proprietà" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Nuove mutande" name="New Underpants"/> <menu_item_call label="Nuovo Alfa Mask" name="New Alpha Mask"/> <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuovo Universale" name="New Universal"/> <menu_item_call label="Nuova fisica" name="New Physics"/> </menu> <menu label="Nuove parti del corpo" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Nuovi capelli" name="New Hair"/> <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> + <menu label="Nuove impostazioni" name="New Settings"> + <menu_item_call label="Nuovo cielo" name="New Sky"/> + <menu_item_call label="Nuova acqua" name="New Water"/> + <menu_item_call label="Nuovo ciclo giornata" name="New Day Cycle"/> + </menu> <menu label="Usa come impostazione predefinita per" name="upload_def"> <menu_item_call label="Caricamenti immagini" name="Image uploads"/> <menu_item_call label="Caricamenti suoni" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Modifica" name="Wearable Edit"/> <menu_item_call label="Aggiungi" name="Wearable Add"/> <menu_item_call label="Togli" name="Take Off"/> + <menu_item_call label="Applica solo a me stesso" name="Settings Apply Local"/> + <menu_item_call label="Applica al lotto" name="Settings Apply Parcel"/> <menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/> <menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/> <menu_item_call label="--nessuna opzione--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index e31f0ebb69..6f9212f56b 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/> <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> <menu_item_call label="Modella..." name="Upload Model"/> - <menu_item_call label="Procedura guidata modellazione..." name="Upload Model Wizard"/> <menu_item_call label="In blocco..." name="Bulk Upload"/> - <menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/> </menu> <menu_item_call label="Nuova cartella" name="New Folder"/> <menu_item_call label="Nuovo script" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Nuovi slip" name="New Underpants"/> <menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/> <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuovo Universale" name="New Universal"/> <menu_item_call label="Nuova fisica" name="New Physics"/> </menu> <menu label="Nuove parti del corpo" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Nuovi capelli" name="New Hair"/> <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> + <menu label="Nuove impostazioni" name="New Settings"> + <menu_item_call label="Nuovo cielo" name="New Sky"/> + <menu_item_call label="Nuova acqua" name="New Water"/> + <menu_item_call label="Nuovo ciclo giornata" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml index 62c6d53e1c..cf45fec09e 100644 --- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Nuovo Alpha (trasparenza)" name="New Alpha"/> <menu_item_call label="Nuova fisica" name="New Physics"/> <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuovo Universale" name="New Universal"/> </menu> <menu label="Nuove parti del corpo" name="New Body Parts"> <menu_item_call label="Nuova figura corporea" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/it/menu_save_settings.xml b/indra/newview/skins/default/xui/it/menu_save_settings.xml new file mode 100644 index 0000000000..80c0ef90a6 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Salva" name="save_settings"/> + <menu_item_check label="Salva con nome" name="save_as_new_settings"/> + <menu_item_check label="Esegui" name="commit_changes"/> + <menu_item_check label="Applica solo a me stesso" name="apply_local"/> + <menu_item_check label="Applica al lotto" name="apply_parcel"/> + <menu_item_check label="Applica alla regione" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_settings_add.xml b/indra/newview/skins/default/xui/it/menu_settings_add.xml new file mode 100644 index 0000000000..69fcacc374 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Nuovo cielo" name="New Sky"/> + <menu_item_call label="Nuova acqua" name="New Water"/> + <menu_item_call label="Nuovo ciclo giornata" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_settings_gear.xml b/indra/newview/skins/default/xui/it/menu_settings_gear.xml new file mode 100644 index 0000000000..6a879814fc --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Modifica" name="edit_settings"/> + <menu_item_call label="Applica solo a me stesso" name="Settings Apply Local"/> + <menu_item_call label="Applica al lotto" name="Settings Apply Parcel"/> + <menu_item_call label="Applica alla regione" name="Settings Apply Region"/> + <menu_item_call label="Copia" name="copy_settings"/> + <menu_item_call label="Incolla" name="paste_settings"/> + <menu_item_call label="Copia UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 795a23ca9b..c7a10df910 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="Proprietà del lotto" name="Parcel Properties"/> <menu_item_check label="Menu Avanzato" name="Show Advanced Menu"/> </menu> - <menu label="Dom" name="Sun"> + <menu label="Ambiente" name="Environment"> <menu_item_check label="Alba" name="Sunrise"/> <menu_item_check label="Mezzogiorno" name="Noon"/> <menu_item_check label="Tramonto" name="Sunset"/> <menu_item_check label="Mezzanotte" name="Midnight"/> - <menu_item_check label="Usa impostazioni regione" name="Use Region Settings"/> - </menu> - <menu label="Editor ambiente" name="Environment Editor"> - <menu_item_call label="Impostazioni ambiente..." name="Environment Settings"/> - <menu label="Valori predefiniti acqua" name="Water Presets"> - <menu_item_call label="Nuovo valore predefinito..." name="new_water_preset"/> - <menu_item_call label="Modifica valore predefinito..." name="edit_water_preset"/> - <menu_item_call label="Elimina valore predefinito..." name="delete_water_preset"/> - </menu> - <menu label="Valori predefiniti cielo" name="Sky Presets"> - <menu_item_call label="Nuovo valore predefinito..." name="new_sky_preset"/> - <menu_item_call label="Modifica valore predefinito..." name="edit_sky_preset"/> - <menu_item_call label="Elimina valore predefinito..." name="delete_sky_preset"/> - </menu> - <menu label="Valori predefiniti giorno" name="Day Presets"> - <menu_item_call label="Nuovo valore predefinito..." name="new_day_preset"/> - <menu_item_call label="Modifica valore predefinito..." name="edit_day_preset"/> - <menu_item_call label="Elimina valore predefinito..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Utilizza ambienti condivisi" name="Use Shared Environment"/> + <menu_item_call label="I miei ambienti..." name="my_environs"/> + <menu_item_call label="Illuminazione personale..." name="adjustment_tool"/> + <menu_item_check label="Ferma nuvole" name="pause_clouds"/> </menu> </menu> <menu label="Costruisci" name="BuildTools"> @@ -323,6 +308,9 @@ <menu_item_check label="Maschera alfa automatica (non differita)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Texture delle animazioni" name="Animation Textures"/> <menu_item_check label="Disabilita texture" name="Disable Textures"/> + <menu_item_check label="Disattiva Ambiente" name="Disable Ambient"/> + <menu_item_check label="Disattiva luce del sole" name="Disable Sunlight"/> + <menu_item_check label="Disattiva Luci locali" name="Disable Local Lights"/> <menu_item_check label="Rendering delle luci unite" name="Render Attached Lights"/> <menu_item_check label="Rendering particelle unite" name="Render Attached Particles"/> <menu_item_check label="Gli oggetti brillano quando sono sotto il cursore" name="Hover Glow Objects"/> @@ -413,6 +401,7 @@ </menu> <menu label="Admin" name="Deprecated"> <menu label="Take Off Clothing" name="Take Off Clothing"> + <menu_item_call label="Universale" name="Universal"/> <menu_item_call label="Fisica" name="Physics"/> </menu> <menu label="Guida" name="DeprecatedHelp"> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index bc95a23bd0..cec3561529 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1963,6 +1963,10 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server. Togliendo la spunta a questa opzione potrebbero essere rimosse le restrizioni che i proprietari di lotti hanno aggiunto per tenere lontani disturbatori, mantenere la privacy, o evitare che minorenni abbiano accesso a materiale per adulti. Parla con i proprietari del tuo lotto se ce n’è bisogno. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Togliendo la spunta a questa opzione potrebbero essere rimossi gli ambienti personalizzati che i proprietari hanno aggiunto ai loro lotti. Parlane con i proprietari del tuo lotto se ce n’è bisogno. Vuoi continuare? + <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze. Per cambiare le preferenze seleziona Io > Preferenze > Generale. <usetemplate name="okbutton" yestext="OK"/> @@ -2443,7 +2447,15 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica Questo file di ciclo giornaliero fa riferimento ad un file di cielo mancante: [SKY]. </notification> <notification name="WLRegionApplyFail"> - Queste impostazioni non possono essere applicare alla regione. Uscendo dalla regione e ritornandoci potrebbe risolvere il problema. Il motivo fornito: [FAIL_REASON] + Siamo spiacenti, queste impostazioni non possono essere applicate alla regione. Motivo: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Una texture Locale è in uso nel percorso [TRACK], fotogramma #[FRAMENO] ([FRAME%]) nel campo [FIELD]. +Utilizzando texture locali potrebbero non venire salvate le impostazioni. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Una texture Locale è in uso nel campo [FIELD]. +Utilizzando texture locali potrebbero non venire salvate le impostazioni. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Impossibile cancellare l'ultima chiave in questo ciclo giornata. Il ciclo giornata non può essere vuoto. Invece di cancellare la chiave restante, modificala e quindi creane una nuova. @@ -4391,4 +4403,75 @@ Prova a selezionare un pezzo di terreno più piccolo. [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + Non abbiamo potuto caricare le impostazioni per [NAME] dal database. + </notification> + <notification name="FailedToLoadSettingsApply"> + Impossibile applicare le impostazioni all’ambiente. + </notification> + <notification name="FailedToBuildSettingsDay"> + Impossibile applicare le impostazioni all’ambiente. + </notification> + <notification name="NoEnvironmentSettings"> + Questa regione non supporta le impostazioni per l’ambiente. + </notification> + <notification label="Salva Outfit" name="SaveSettingAs"> + Salva con nome le impostazioni attuali dell’ambiente: + <form name="form"> + <input name="message"> + [DESC] (nuovo) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Annulla"/> + </form> + </notification> + <notification name="WLImportFail"> + Impossibile importare le impostazioni legacy vento e luce [NAME] da +[FILE]. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Impossibile impostare l’ambiente per questo lotto. +Inserisci o seleziona un lotto che hai il permesso di modificare. + </notification> + <notification name="SettingsUnsuported"> + Questa regione non supporta le impostazioni. +Spostati in una regione che abbia le impostazioni abilitate e riprova. + </notification> + <notification name="SettingsConfirmLoss"> + Stai per perdere le modifiche che hai fatto a questo [TYPE] chiamato "[NAME]". +Vuoi continuare? + <usetemplate ignoretext="Sei sicuro di voler perdere le modifiche apportate?" name="okcancelignore" notext="No" yestext="Sì"/> + </notification> + <notification name="SettingsConfirmReset"> + Stai per rimuovere tutte le impostazioni applicate. +Vuoi continuare? + <usetemplate name="okcancelbuttons" notext="No" yestext="Sì"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Stai per rimuovere tutte le Impostazioni personali illuminazione. Vuoi continuare? + <usetemplate name="okcancelbuttons" notext="No" yestext="Sì"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Stai per importare impostazioni non trasferibili in questo ciclo giornata. Continuando, anche le impostazioni che stai modificando diventeranno non trasferibili. + +Questo cambiamento non può essere annullato. + +Vuoi continuare? + <usetemplate ignoretext="Sei sicuro di voler rendere le impostazioni non trasferibili?" name="okcancelignore" notext="No" yestext="Sì"/> + </notification> + <notification name="NoEditFromLibrary"> + Non puoi modificare le impostazioni direttamente dalla raccolta. +Copia nell’inventario e prova ancora. + </notification> + <notification name="EnvironmentApplyFailed"> + Abbiamo riscontrato un problema con queste impostazioni. Non possono essere salvate o applicate in questo momento. + </notification> + <notification name="TrackLoadFailed"> + Impossibile caricare il percorso in [TRACK]. + </notification> + <notification name="TrackLoadMismatch"> + Impossibile caricare il percorso da [TRACK1] a [TRACK2]. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml index d76fb62c53..79938b79dc 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatuaggio della testa" name="Head Tattoo" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Tatuaggio superiore" name="Upper Tattoo" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Tattuaggio inferiore" name="Lower Tattoo" tool_tip="Clicca per scegliere una fotografia"/> - <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuaggio testa" name="Head Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio parte alta" name="Upper Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio parte bassa" name="Lower Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Fai clic per aprire il selettore dei colori"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_universal.xml b/indra/newview/skins/default/xui/it/panel_edit_universal.xml new file mode 100644 index 0000000000..10fab0e8be --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Tatuaggio testa" name="Head Universal Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio parte alta" name="Upper Universal Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio parte bassa" name="Lower Universal Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio gonna" name="Skirt Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio capelli" name="Hair Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio occhi" name="Eyes Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio braccio sinistro" name="Left Arm Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio gamba sinistra" name="Left Leg Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio Aux1" name="Aux1 Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio Aux2" name="Aux2 Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <texture_picker label="Tatuaggio Aux3" name="Aux3 Tattoo" tool_tip="Fai clic per scegliere un’immagine"/> + <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Fai clic per aprire il selettore dei colori"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml index e54dc26d05..83824591d6 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Modifica del tatuaggio </string> + <string name="edit_universal_title"> + Modifica Universale: + </string> <string name="edit_physics_title"> Modifica fisica </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Tatuaggio: </string> + <string name="universal_desc_text"> + Universale: + </string> <string name="physics_desc_text"> Fisica: </string> diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml index d7d9658e26..467bcdb005 100644 --- a/indra/newview/skins/default/xui/it/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ambiente" name="panel_env_info"> - <text name="water_settings_title"> - Seleziona le impostazioni del ciclo dell'acqua e del cielo/giornata che vuoi che vedano tutti coloro che visitano la tua regione. Maggiori informazioni - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Usa valori predefiniti di Second Life" name="use_sl_default_settings"/> - <radio_item label="Usa le impostazioni seguenti" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Impostazione Acqua - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Ciclo cielo / giornata - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Cielo fisso" name="my_sky_settings"/> - <radio_item label="Ciclo giornata" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> - </combo_box> - </panel> - <button label="Applica" name="apply_btn"/> - <button label="Annulla" name="cancel_btn"/> + <string name="str_label_use_default"> + Usa impostazioni predefinite + </string> + <string name="str_label_use_region"> + Usa impostazioni regione + </string> + <string name="str_altitude_desription"> + Cielo [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + Non è stato selezionato alcun lotto. Le impostazioni ambientali sono disabilitate. + </string> + <string name="str_cross_region"> + Le impostazioni ambientali non sono disponibili oltre i confini della regione. + </string> + <string name="str_legacy"> + Le impostazioni ambientali non sono disponibili per questa regione. + </string> + <string name="str_disallowed"> + Il gestore della proprietà immobiliare non permette di cambiare gli ambienti del lotto in questa regione. + </string> + <string name="str_too_small"> + Il lotto deve essere di almeno 128 metri quadri per supportare un ambiente. + </string> + <string name="str_empty"> + (vuoto) + </string> + <string name="str_region_env"> + (ambiente regione) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Utilizza Inventario" name="btn_select_inventory"/> + <button label="Personalizza" name="btn_edit"/> + <check_box label="I proprietari del lotto possono ignorare l’ambiente" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + Sconosciuto + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Trascina un’impostazione dall’Inventario a questa casella per selezionarla come cielo corrente."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + Sconosciuto + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Trascina un’impostazione dall’Inventario a questa casella per selezionarla come cielo corrente."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Cielo [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + Sconosciuto + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Trascina un’impostazione dall’Inventario a questa casella per selezionarla come cielo corrente."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Suolo + </text> + <line_editor name="edt_invname_ground"> + Sconosciuto + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Trascina un’impostazione dall’Inventario a questa casella per selezionarla come suolo."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Acqua + </text> + <line_editor name="edt_invname_water"> + Sconosciuto + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Trascina un’impostazione dall’Inventario a questa casella per selezionarla come acqua."/> + </panel> + <button label="Reimposta" name="btn_rst_altitudes" tool_tip="Reimposta alle altitudini predefinite"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/it/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..b2d27b93fc --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmosfera e illuminazione" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/it/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/it/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..e4dd5e00c0 --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Nuvole" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/it/panel_settings_sky_density.xml new file mode 100644 index 0000000000..3142d1442a --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Densità" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Termine esponenziale Rayleigh:" name="rayleigh_exponential"/> + <slider label="Scala esponenziale Rayleigh:" name="rayleigh_exponential_scale"/> + <slider label="Termine lineare Rayleigh:" name="rayleigh_linear"/> + <slider label="Termine costante Rayleigh:" name="rayleigh_constant"/> + <slider label="Altitudine massima Rayleigh:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Termine esponenziale Mie:" name="mie_exponential"/> + <slider label="Scala esponenziale Mie:" name="mie_exponential_scale"/> + <slider label="Termine lineare Mie:" name="mie_linear"/> + <slider label="Termine costante Mie:" name="mie_constant"/> + <slider label="Fattore diverso Mie:" name="mie_aniso_factor"/> + <slider label="Altitudine massima Mie:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Termine esponenziale di assorbimento:" name="absorption_exponential"/> + <slider label="Scala esponenziale di assorbimento:" name="absorption_exponential_scale"/> + <slider label="Termine lineare di assorbimento:" name="absorption_linear"/> + <slider label="Termine costante di assorbimento:" name="absorption_constant"/> + <slider label="Altitudine massima di assorbimento:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/it/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..5a167b0aea --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Sole e Luna" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Mostra marcatore" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Mostra marcatore" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_settings_water.xml b/indra/newview/skins/default/xui/it/panel_settings_water.xml new file mode 100644 index 0000000000..0d123a6249 --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Acqua" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Spostamento Fresnel: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml index 46e2717647..5b4cb5868f 100644 --- a/indra/newview/skins/default/xui/it/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Texture" name="Texture"> - <panel.string name="string repeats per meter"> - Ripetizioni al metro - </panel.string> - <panel.string name="string repeats per face"> - Ripetizioni per faccia - </panel.string> <text name="color label"> Colore </text> @@ -114,4 +108,5 @@ <spinner label="Spostamento orizzontale" name="shinyOffsetU"/> <spinner label="Spostamento verticale" name="shinyOffsetV"/> <check_box initial_value="false" label="Allinea facce planari" name="checkbox planar align" tool_tip="Allinea le texture su tutte le facce selezionate con l’ultima faccia selezionata. È richiesta la mappatura planare delle texture."/> + <button label="Alllinea" label_selected="Alllinea livelli di texture attuali" name="button align textures" tool_tip="Alllinea livelli di texture attuali"/> </panel> diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml index 2bfaea8963..0e00165227 100644 --- a/indra/newview/skins/default/xui/it/role_actions.xml +++ b/indra/newview/skins/default/xui/it/role_actions.xml @@ -33,6 +33,7 @@ <action description="Cambiare impostazioni musica e multimediali" longdescription="Cambia le impostazioni per lo streaming della musica e dei video in Informazioni sul terreno > Media." name="land change media" value="20"/> <action description="Attiva 'Modifica terreno'" longdescription="Attiva 'Modifica terreno'. *ATTENZIONE* Informazioni sul terreno > Opzioni > Modifica terreno consente a chiunque di modificare la forma del tuo terreno e di collocare e spostare le piante Linden. Pertanto sii sicuro della scelta prima di assegnare questa Abilità. La funzione di modifica del terreno è attivata in Informazioni sul terreno > Opzioni." name="land edit" value="21"/> <action description="Attivazione di parametri per Informazioni sul terreno > Opzioni" longdescription="Premi Sicuro (nessun danno), Vola e consenti agli altri residenti di: modificare il terreno, costruire, creare punti di riferimento ed eseguire script nel terreno appartenente ad un gruppo in Informazioni sul terreno > scheda Opzioni." name="land options" value="22"/> + <action description="Modifica le impostazioni dell’ambiente e del ciclo giornata." longdescription="Cambia le impostazioni dell’ambiente e del ciclo giornata dalla scheda Informazioni sul terreno > Ambiente." name="land change environment" value="46"/> </action_set> <action_set description="Queste abilità permettono ai membri di non avere restrizioni in un lotto appartenente ad un gruppo." name="Parcel Powers"> <action description="Consenti sempre la modifica del terreno" longdescription="I membri con questo ruolo e abilità possono modificare il terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno > Opzioni." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 0fc72ea2f6..087e0610eb 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -653,6 +653,15 @@ Prova ad accedere nuovamente tra un minuto. <string name="BUTTON_HELP"> Mostra Aiuto </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Oggetti di questo tipo non possono essere allegati ai +biglietti in questa regione. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Solamente gli oggetti con autorizzazioni +illimitate al “proprietario successivo” +possono essere allegati ai biglietti. + </string> <string name="Searching"> Ricerca in corso... </string> @@ -729,6 +738,18 @@ Prova ad accedere nuovamente tra un minuto. Errore nella richiesta di caricamento. Vai alla pagina http://secondlife.com/support per risolvere il problema. </string> + <string name="SettingValidationError"> + Impossibile convalidare le impostazioni importate [NAME] + </string> + <string name="SettingImportFileError"> + Impossibile aprire il file [FILE] + </string> + <string name="SettingParseFileError"> + Impossibile aprire il file [FILE] + </string> + <string name="SettingTranslateError"> + Impossibile tradurre la legacy vento e luce [NAME] + </string> <string name="texture"> texture </string> @@ -804,6 +825,9 @@ http://secondlife.com/support per risolvere il problema. <string name="symbolic folder link"> link alla cartella </string> + <string name="settings blob"> + impostazioni + </string> <string name="mesh"> reticolo </string> @@ -1134,6 +1158,9 @@ http://secondlife.com/support per risolvere il problema. <string name="ForceSitAvatar"> Forza l'avatar a sedersi </string> + <string name="ChangeEnvSettings"> + Cambia le impostazioni dell’ambiente + </string> <string name="AgentNameSubst"> (Tu) </string> @@ -1282,6 +1309,9 @@ http://secondlife.com/support per risolvere il problema. <string name="tattoo"> Tatuaggio </string> + <string name="universal"> + Universale + </string> <string name="physics"> Fisica </string> @@ -1324,6 +1354,9 @@ http://secondlife.com/support per risolvere il problema. <string name="tattoo_not_worn"> Tatuaggio non portato </string> + <string name="universal_not_worn"> + Universale non indossato + </string> <string name="physics_not_worn"> Fisica non indossata </string> @@ -1375,6 +1408,9 @@ http://secondlife.com/support per risolvere il problema. <string name="create_new_tattoo"> Crea un nuovo tatuaggio </string> + <string name="create_new_universal"> + Crea nuovo universale + </string> <string name="create_new_physics"> Crea nuova fisica </string> @@ -2510,6 +2546,27 @@ Se continui a ricevere questo messaggio, contatta l'assistenza Second Life <string name="RegionSettings"> Impostazioni regione </string> + <string name="NoEnvironmentSettings"> + Questa regione non supporta le impostazioni per l’ambiente. + </string> + <string name="EnvironmentSun"> + Sole + </string> + <string name="EnvironmentMoon"> + Luna + </string> + <string name="EnvironmentBloom"> + Fioritura + </string> + <string name="EnvironmentCloudNoise"> + Rumore nuvole + </string> + <string name="EnvironmentNormalMap"> + Mappa normale + </string> + <string name="EnvironmentTransparent"> + Transparent + </string> <string name="ClassifiedClicksTxt"> Clicca: [TELEPORT] teleport, [MAP] mappa, [PROFILE] profilo </string> @@ -4678,6 +4735,9 @@ Segnala abuso <string name="New Tattoo"> Nuovo tatuaggio </string> + <string name="New Universal"> + Nuovo Universale + </string> <string name="New Physics"> Nuova fisica </string> @@ -4804,6 +4864,15 @@ Segnala abuso <string name="Female - Wow"> Femmina - Accipicchia </string> + <string name="New Daycycle"> + Nuovo ciclo giornata + </string> + <string name="New Water"> + Nuova acqua + </string> + <string name="New Sky"> + Nuovo cielo + </string> <string name="/bow"> /inchino </string> @@ -5332,6 +5401,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="BeaconMedia"> Visualizzazione marcatori multimedia (bianco) </string> + <string name="BeaconSun"> + Marcatore visualizza direzione sole (arancione) + </string> + <string name="BeaconMoon"> + Marcatore visualizza direzione luna (viola) + </string> <string name="ParticleHiding"> Particelle nascoste </string> @@ -5359,6 +5434,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Destinations_Label"> Destinazioni </string> + <string name="Command_Environments_Label"> + I miei ambienti + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5452,6 +5533,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Destinations_Tooltip"> Destinazioni interessanti </string> + <string name="Command_Environments_Tooltip"> + I miei ambienti + </string> + <string name="Command_Facebook_Tooltip"> + Pubblica su Facebook + </string> <string name="Command_Flickr_Tooltip"> Carica su Flickr </string> @@ -5647,6 +5734,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="ExperiencePermission12"> accettazione automatica delle autorizzazioni per le esperienze </string> + <string name="ExperiencePermission16"> + obbliga l'avatar a sedersi + </string> + <string name="ExperiencePermission17"> + cambia le impostazioni dell’ambiente + </string> <string name="ExperiencePermissionShortUnknown"> ha eseguito un'operazione sconosciuta: [Permission] </string> @@ -5671,6 +5764,12 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="ExperiencePermissionShort12"> Autorizzazione </string> + <string name="ExperiencePermissionShort16"> + Siediti + </string> + <string name="ExperiencePermissionShort17"> + Ambiente + </string> <string name="logging_calls_disabled_log_empty"> Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona "Salva: Solo registro" oppure "Salva: Registri e trascrizioni" in Preferenze > Chat. </string> diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index d26a1b34d5..4703dfaa34 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -478,5 +478,6 @@ </panel> </panel> <panel label="体験" name="land_experiences_panel"/> + <panel label="環境" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml new file mode 100644 index 0000000000..6736dad336 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="個人的な照明"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="リセット" name="btn_reset" tool_tip="閉じて共有された環境にリセットする"/> + <text name="cloud_map_label"> + 雲の画像： + </text> + </layout_panel> + <layout_panel> + <text name="label"> + 太陽： + </text> + <check_box label="ビーコンを表示" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="ビーコンを表示" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml index a55698e3d0..cb3dae0644 100644 --- a/indra/newview/skins/default/xui/ja/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="音源" name="sounds"/> <check_box label="パーティクル源" name="particles"/> <check_box label="メディア源" name="moapbeacon"/> + <check_box label="太陽" name="sun"/> + <check_box label="月" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml index b34fd192a9..fc9b35a34d 100644 --- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="サウンド"/> <check_box label="テクスチャ" name="check_texture"/> <icon name="icon_texture" tool_tip="テクスチャ"/> + <icon name="icon_setting" tool_tip="自然環境の設定"/> <button label="すべてに √" label_selected="全て" name="check_all"/> <button label="クリア" label_selected="なし" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml deleted file mode 100644 index 6467a69956..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="環境の事前設定を削除"> - <string name="title_water"> - 水の事前設定を削除 - </string> - <string name="title_sky"> - 空の事前設定を削除 - </string> - <string name="title_day_cycle"> - デイサイクルを削除 - </string> - <string name="label_water"> - 事前設定： - </string> - <string name="label_sky"> - 事前設定： - </string> - <string name="label_day_cycle"> - デイサイクル： - </string> - <string name="msg_confirm_deletion"> - 選択された事前設定を削除しますか？ - </string> - <string name="msg_sky_is_referenced"> - デイサイクルの参照先として使われている事前設定は削除できません。 - </string> - <string name="combo_label"> - - 事前設定を選択 - - </string> - <text name="label"> - 事前設定： - </text> - <button label="削除" name="delete"/> - <button label="キャンセル" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..79c97472df --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="デイサイクルを編集"> + <string name="title_new"> + 新しいデイサイクルを作成 + </string> + <string name="title_edit"> + デイサイクルを編集 + </string> + <string name="hint_new"> + 新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="hint_edit"> + 自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + 空 [ALT] + </string> + <string name="sky_label"> + 空 + </string> + <string name="water_label"> + 水 + </string> + <string name="commit_parcel"> + 区画に適用 + </string> + <string name="commit_region"> + リージョンに適用 + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + デイサイクル名： + </text> + <button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="空 4" name="sky4_track"/> + <button label="空 3" name="sky3_track"/> + <button label="空 2" name="sky2_track"/> + <button label="地表レベル" name="sky1_track"/> + <button label="水" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="トラックを以下からクローン" name="copy_track"/> + <button label="トラックを以下からロード" name="load_track"/> + <button label="トラックをクリア" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="後ろに移動"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="前に移動"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="[FRAME] を追加" name="add_frame"/> + <button label="[FRAME] をロード" name="btn_load_frame"/> + <button label="[FRAME] を削除" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + 上部のタイムラインからキーフレームを選択し、設定を編集します。 + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="水" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="大気＆光" name="atmosphere_panel"/> + <panel label="雲" name="clouds_panel"/> + <panel label="太陽＆月" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="保存" name="save_btn"/> + <button label="キャンセル" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml new file mode 100644 index 0000000000..a00b87b990 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="固定された環境"> + <string name="edit_sky"> + 空を編集： + </string> + <string name="edit_water"> + 水を編集： + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="ロード" name="btn_load" tool_tip="持ち物から設定をロードする"/> + <button label="インポート" name="btn_import" tool_tip="ディスクから過去の設定をインポートする。"/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="保存" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="キャンセル" name="btn_cancel" tool_tip="最後に保存された状態に戻す"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml index da63b54eab..425cb7ad81 100644 --- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="サウンド" name="check_sound"/> <check_box label="テクスチャ" name="check_texture"/> <check_box label="スナップショット" name="check_snapshot"/> + <check_box label="設定" name="check_settings"/> <button label="すべて" label_selected="すべて" name="All"/> <button label="なし" label_selected="なし" name="None"/> <check_box label="常にフォルダを表示" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml new file mode 100644 index 0000000000..d697a9f321 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="場所" name="my_environments" title="私の環境"> + <layout_stack> + <layout_panel label="フィルター" name="filter_panel"> + <check_box label="日間" name="chk_days"/> + <check_box label="空" name="chk_skies"/> + <check_box label="水" name="chk_water"/> + <filter_editor label="環境の絞り込み" name="flt_search"/> + </layout_panel> + <layout_panel label="環境" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="すべてのフォルダを表示" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="その他のオプションを表示"/> + <menu_button name="btn_newsettings" tool_tip="新規設定を作成"/> + <button name="btn_del" tool_tip="選択したアイテムを削除"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml index 0dfc75014e..33551a5706 100644 --- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="衣服またはボディパーツを作成するときにデフォルトの権限を設定する"> 着用物 </text> + <text name="label_13" tool_tip="自然環境の設定を作成するときにデフォルトの権限を設定する"> + 設定 + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="取り消し" label_selected="取り消し" name="cancel"/> diff --git a/indra/newview/skins/default/xui/ja/floater_pick_track.xml b/indra/newview/skins/default/xui/ja/floater_pick_track.xml new file mode 100644 index 0000000000..e5773e1ec8 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="選択：トラック"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + 空のソースを選択： + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="空 4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="空 3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="空 2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="地面" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml index c28afa4c98..8ba537faa2 100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="透明な水" name="TransparentWater"/> <check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/> <check_box initial_value="true" label="近くの光" name="LocalLights"/> - <check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/> <slider label="地形詳細：" name="TerrainDetail"/> <text name="TerrainDetailText"> 低 diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml new file mode 100644 index 0000000000..b8b1699f03 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="選択：設定"> + <floater.string name="pick title"> + 選択： + </floater.string> + <floater.string name="pick_track"> + トラックを選択 + </floater.string> + <floater.string name="pick_settings"> + 設定を選択 + </floater.string> + <floater.string name="track_water"> + 水 + </floater.string> + <floater.string name="track_ground"> + 地面 + </floater.string> + <floater.string name="track_sky"> + 空 [NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="テクスチャをフィルター" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml index 37233d3e68..05e7bfefd2 100644 --- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="インベントリ" name="inventory" value="0"/> <radio_item label="ローカル" name="local" value="1"/> + <radio_item label="構築（ベーク）" name="bake" value="2"/> </radio_group> <text name="unknown"> サイズ： [DIMENSIONS] @@ -20,7 +21,6 @@ <button label="ブランク" label_selected="ブランク" name="Blank"/> <button label="なし" label_selected="なし" name="None"/> <button label="" label_selected="" name="Pipette"/> - <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/> <text name="preview_disabled" value="プレビュー無効"/> <filter_editor label="テクスチャをフィルター" name="inventory search editor"/> <check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/> @@ -31,6 +31,22 @@ <column label="名前" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="構築（ベーク）するテクスチャを選択"> + <combo_box.item label="なし" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="基本となるメッシュリージョンを隠す" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="取り消し" label_selected="取り消し" name="Cancel"/> + <check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 0b06b77901..ec16f1cf17 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="有効にする" name="Marketplace Activate"/> <menu_item_call label="無効にする" name="Marketplace Deactivate"/> <menu_item_call label="共有" name="Share"/> - <menu_item_call label="購入" name="Task Buy"/> <menu_item_call label="開く" name="Task Open"/> <menu_item_call label="再生" name="Task Play"/> <menu_item_call label="プロパティ" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="新しいパンツ" name="New Underpants"/> <menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/> <menu_item_call label="新しいタトゥ" name="New Tattoo"/> + <menu_item_call label="新しいユニバーサル" name="New Universal"/> <menu_item_call label="新規の物理作用" name="New Physics"/> </menu> <menu label="新しい身体部位" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="新しい髪" name="New Hair"/> <menu_item_call label="新しい眼" name="New Eyes"/> </menu> + <menu label="新しい設定" name="New Settings"> + <menu_item_call label="新しい空" name="New Sky"/> + <menu_item_call label="新しい水" name="New Water"/> + <menu_item_call label="新しいデイサイクル" name="New Day Cycle"/> + </menu> <menu label="次のデフォルトとして使用" name="upload_def"> <menu_item_call label="画像のアップロード" name="Image uploads"/> <menu_item_call label="サウンドのアップロード" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="編集" name="Wearable Edit"/> <menu_item_call label="追加" name="Wearable Add"/> <menu_item_call label="取り外す" name="Take Off"/> + <menu_item_call label="自分にのみ適用" name="Settings Apply Local"/> + <menu_item_call label="区画に適用" name="Settings Apply Parcel"/> <menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/> <menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move"/> <menu_item_call label="－－オプションなし－－" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml index ae5ddbb78f..eecf166a70 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="サウンド （L$[COST] ）..." name="Upload Sound"/> <menu_item_call label="アニメーション （L$ [COST] ）..." name="Upload Animation"/> <menu_item_call label="モデル" name="Upload Model"/> - <menu_item_call label="モデルウィザード" name="Upload Model Wizard"/> <menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/> - <menu_item_call label="デフォルトのアップロード権限を設定" name="perm prefs"/> </menu> <menu_item_call label="新規フォルダ" name="New Folder"/> <menu_item_call label="新規スクリプト" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="新しい下着（下）" name="New Underpants"/> <menu_item_call label="新しいアルファ" name="New Alpha"/> <menu_item_call label="新しいタトゥー" name="New Tattoo"/> + <menu_item_call label="新しいユニバーサル" name="New Universal"/> <menu_item_call label="新規の物理作用" name="New Physics"/> </menu> <menu label="新しい身体部位" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="新しい髪" name="New Hair"/> <menu_item_call label="新しい目" name="New Eyes"/> </menu> + <menu label="新しい設定" name="New Settings"> + <menu_item_call label="新しい空" name="New Sky"/> + <menu_item_call label="新しい水" name="New Water"/> + <menu_item_call label="新しいデイサイクル" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml index 5e02fd3b8f..4946d58fd8 100644 --- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="アルファ" name="New Alpha"/> <menu_item_call label="新規の物理作用" name="New Physics"/> <menu_item_call label="新しいタトゥ" name="New Tattoo"/> + <menu_item_call label="新しいユニバーサル" name="New Universal"/> </menu> <menu label="新しい身体部位" name="New Body Parts"> <menu_item_call label="新しいシェイプ" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/ja/menu_save_settings.xml b/indra/newview/skins/default/xui/ja/menu_save_settings.xml new file mode 100644 index 0000000000..44fb1fb30b --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="保存" name="save_settings"/> + <menu_item_check label="別名で保存" name="save_as_new_settings"/> + <menu_item_check label="約束する" name="commit_changes"/> + <menu_item_check label="自分にのみ適用" name="apply_local"/> + <menu_item_check label="区画に適用" name="apply_parcel"/> + <menu_item_check label="リージョンに適用" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_settings_add.xml b/indra/newview/skins/default/xui/ja/menu_settings_add.xml new file mode 100644 index 0000000000..814ad9c1a6 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="新しい空" name="New Sky"/> + <menu_item_call label="新しい水" name="New Water"/> + <menu_item_call label="新しいデイサイクル" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml new file mode 100644 index 0000000000..064eae95bf --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="編集" name="edit_settings"/> + <menu_item_call label="自分にのみ適用" name="Settings Apply Local"/> + <menu_item_call label="区画に適用" name="Settings Apply Parcel"/> + <menu_item_call label="リージョンに適用" name="Settings Apply Region"/> + <menu_item_call label="コピー" name="copy_settings"/> + <menu_item_call label="貼り付け" name="paste_settings"/> + <menu_item_call label="UUID をコピー" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 7810094823..ba8d8e4955 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="区画プロパティ" name="Parcel Properties"/> <menu_item_check label="アドバンスメニュー" name="Show Advanced Menu"/> </menu> - <menu label="日" name="Sun"> + <menu label="環境" name="Environment"> <menu_item_check label="日の出" name="Sunrise"/> <menu_item_check label="正午" name="Noon"/> <menu_item_check label="日没" name="Sunset"/> <menu_item_check label="深夜" name="Midnight"/> - <menu_item_check label="リージョンの設定を使用" name="Use Region Settings"/> - </menu> - <menu label="自然環境エディター" name="Environment Editor"> - <menu_item_call label="自然環境の設定..." name="Environment Settings"/> - <menu label="水の事前設定" name="Water Presets"> - <menu_item_call label="新しい事前設定..." name="new_water_preset"/> - <menu_item_call label="事前設定を編集..." name="edit_water_preset"/> - <menu_item_call label="事前設定を削除..." name="delete_water_preset"/> - </menu> - <menu label="空の事前設定" name="Sky Presets"> - <menu_item_call label="新しい事前設定..." name="new_sky_preset"/> - <menu_item_call label="事前設定を編集..." name="edit_sky_preset"/> - <menu_item_call label="事前設定を削除..." name="delete_sky_preset"/> - </menu> - <menu label="デイの事前設定" name="Day Presets"> - <menu_item_call label="新しい事前設定..." name="new_day_preset"/> - <menu_item_call label="事前設定を編集..." name="edit_day_preset"/> - <menu_item_call label="事前設定を削除..." name="delete_day_preset"/> - </menu> + <menu_item_check label="共有された環境を使用" name="Use Shared Environment"/> + <menu_item_call label="私の環境…" name="my_environs"/> + <menu_item_call label="個人的な照明…" name="adjustment_tool"/> + <menu_item_check label="雲を一時停止" name="pause_clouds"/> </menu> </menu> <menu label="制作" name="BuildTools"> @@ -346,6 +331,9 @@ <menu_item_check label="自動アルファマスク（遅延なし）" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/> <menu_item_check label="テクスチャを無効にする" name="Disable Textures"/> + <menu_item_check label="アンビエントを無効にする" name="Disable Ambient"/> + <menu_item_check label="日の出を無効にする" name="Disable Sunlight"/> + <menu_item_check label="近くの光を無効にする" name="Disable Local Lights"/> <menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/> <menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/> <menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/> @@ -483,6 +471,7 @@ <menu_item_call label="スカート" name="Skirt"/> <menu_item_call label="アルファ" name="Alpha"/> <menu_item_call label="タトゥ" name="Tattoo"/> + <menu_item_call label="ユニバーサル" name="Universal"/> <menu_item_call label="物理作用" name="Physics"/> <menu_item_call label="すべての衣類" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 74208bb30b..bedcdbb627 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1996,6 +1996,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ このオプションをオフにすると、嫌がらせの防止やプライバシーの維持、18 才以下の住人を Adult コンテンツから守るために区画所有者が加えた制限が解除される可能性があります。必要に応じて区画所有者と相談してください。 <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + このオプションをオフにすると、区画所有者がその区画に加えたカスタム環境が削除されます。必要に応じて区画所有者と相談してください。 +続けますか？ + <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> 訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 > 「環境設定」 > 「一般」を選択して、環境設定を変更できます。 <usetemplate name="okbutton" yestext="OK"/> @@ -2483,7 +2488,14 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ このデイサイクルのファイルは次の存在しない「空」ファイルを参照しています： [SKY]。 </notification> <notification name="WLRegionApplyFail"> - 申し訳ございませんが、設定をリージョンに適用できませんでした。一度リージョンを出てから戻ると、問題が解決されるかもしれません。問題の発生した理由：[FAIL_REASON] + 申し訳ございませんが、設定をリージョンに適用できませんでした。理由： [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + ローカルテクスチャは、フィールド [FIELD] 内のトラック [TRACK]、フレーム #[FRAMENO] ([FRAME]%) で使用されています。ローカルテクスチャを使った設定は保存されない可能性があります。 + </notification> + <notification name="WLLocalTextureFixedBlock"> + ローカルテクスチャは、フィールド [FIELD] で使用されています。 +ローカルテクスチャを使った設定は保存されない可能性があります。 </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。 @@ -4432,4 +4444,75 @@ M キーを押して変更します。 [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + データベースから [NAME] の設定の読み込みができませんでした。 + </notification> + <notification name="FailedToLoadSettingsApply"> + 環境にこれらの設定を適用することができません。 + </notification> + <notification name="FailedToBuildSettingsDay"> + 環境にこれらの設定を適用することができません。 + </notification> + <notification name="NoEnvironmentSettings"> + このリージョンは環境設定をサポートしていません。 + </notification> + <notification label="アウトフィットを保存する" name="SaveSettingAs"> + 現在の環境設定を次の内容で保存する： + <form name="form"> + <input name="message"> + [DESC] （新） + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="キャンセル"/> + </form> + </notification> + <notification name="WLImportFail"> + [FILE] から過去のウインドライトの設定 [NAME] をインポートできません。 + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + この区画で環境を設定することはできません。 +変更する権限のある区画を入力または選択してください。 + </notification> + <notification name="SettingsUnsuported"> + このリージョンでは設定をサポートしていません。 +設定に対応しているリージョンに移動し、アクションを再試行してください。 + </notification> + <notification name="SettingsConfirmLoss"> + "[NAME]"と名付けられたこの [TYPE] に加えられた変更が失われます。 +続けますか？ + <usetemplate ignoretext="変更を失いますがよろしいですか？" name="okcancelignore" notext="いいえ" yestext="はい"/> + </notification> + <notification name="SettingsConfirmReset"> + 適用されたすべての設定を削除しようとしています。 +続けますか？ + <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + 適用されたすべての個人的な照明の設定を削除しようとしています。 +続けますか？ + <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> + </notification> + <notification name="SettingsMakeNoTrans"> + このデイサイクルに移行不可の設定をインポートしようとしています。このまま続けると、編集中の設定も移行不可になります。 + +この変更は元に戻すことができません。 + +続けますか？ + <usetemplate ignoretext="設定を移行不可にしますか？" name="okcancelignore" notext="いいえ" yestext="はい"/> + </notification> + <notification name="NoEditFromLibrary"> + ライブラリから直接設定を変更することはできません。 +自分の持ち物からコピーしてやり直してください。 + </notification> + <notification name="EnvironmentApplyFailed"> + この設定で問題が発生しました。この設定は現在保存または適用ができません。 + </notification> + <notification name="TrackLoadFailed"> + トラックを [TRACK] にロードできません。 + </notification> + <notification name="TrackLoadMismatch"> + トラックを [TRACK1] から [TRACK2] にロードできません。 + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml index f4cfe6d83f..5729cb7552 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択"/> - <texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択"/> - <texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択"/> - <color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択する"/> + <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml new file mode 100644 index 0000000000..614fd1059f --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="頭部のタトゥー" name="Head Universal Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="上部のタトゥー" name="Upper Universal Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="下部のタトゥー" name="Lower Universal Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="スカートのタトゥー" name="Skirt Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="髪の毛のタトゥー" name="Hair Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="目のタトゥー" name="Eyes Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="左腕のタトゥー" name="Left Arm Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="左脚のタトゥー" name="Left Leg Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="Aux1 のタトゥー" name="Aux1 Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="Aux2 のタトゥー" name="Aux2 Tattoo" tool_tip="クリックして写真を選択する"/> + <texture_picker label="Aux3 のタトゥー" name="Aux3 Tattoo" tool_tip="クリックして写真を選択する"/> + <color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml index 000dac7b5b..9101920f1b 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> タトゥーを編集中 </string> + <string name="edit_universal_title"> + ユニバーサルを編集中 + </string> <string name="edit_physics_title"> 物理作用の編集中 </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> タトゥ： </string> + <string name="universal_desc_text"> + ユニバーサル： + </string> <string name="physics_desc_text"> 物理作用： </string> diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml index a2981012dc..444f8bae91 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="環境" name="panel_env_info"> - <text name="water_settings_title"> - あなたのリージョンを訪れるユーザーに見せたい、水と空/デイサイクルの設定を選択します。詳細 - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Second Life のデフォルト設定を使用" name="use_sl_default_settings"/> - <radio_item label="次の設定を使用" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - 水の設定 - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="- 事前設定を選択 -" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - 空 / デイサイクル - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="空の固定" name="my_sky_settings"/> - <radio_item label="デイサイクル" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="- 事前設定を選択 -" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="- 事前設定を選択 -" name="item0"/> - </combo_box> - </panel> - <button label="適用" name="apply_btn"/> - <button label="キャンセル" name="cancel_btn"/> + <string name="str_label_use_default"> + 既定の設定を使用 + </string> + <string name="str_label_use_region"> + リージョンの設定を使用 + </string> + <string name="str_altitude_desription"> + 空 [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + 区画が選択されていません。環境設定が無効になっています。 + </string> + <string name="str_cross_region"> + リージョンの境界では環境設定ができません。 + </string> + <string name="str_legacy"> + このリージョンで環境設定はできません。 + </string> + <string name="str_disallowed"> + 不動産マネージャーが、このリージョンで区画の環境を変更することを許可していません。 + </string> + <string name="str_too_small"> + 環境をサポートするには、最低でも 128 平方メートルの区画が必要です。 + </string> + <string name="str_empty"> + (空) + </string> + <string name="str_region_env"> + （リージョンの環境） + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="持ち物を使う" name="btn_select_inventory"/> + <button label="カスタマイズ" name="btn_edit"/> + <check_box label="区画所有者が環境を上書きすることがあります" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + 空 [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + 不明 + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + 空 [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + 不明 + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + 空 [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + 不明 + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の空として選択する"/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + 地面 + </text> + <line_editor name="edt_invname_ground"> + 不明 + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、地表レベルの空として選択します。"/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + 水 + </text> + <line_editor name="edt_invname_water"> + 不明 + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="持ち物から設定をこのターゲットボックスにドラッグし、現在の水として選択する"/> + </panel> + <button label="リセット" name="btn_rst_altitudes" tool_tip="デフォルトの高度にリセット"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..56fab14f7c --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="大気＆光" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..232530c5f8 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="雲" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml new file mode 100644 index 0000000000..cb746d8792 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="密度" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="レイリー指数項：" name="rayleigh_exponential"/> + <slider label="レイリー指数スケール：" name="rayleigh_exponential_scale"/> + <slider label="レイリー線形項：" name="rayleigh_linear"/> + <slider label="レイリー定数項：" name="rayleigh_constant"/> + <slider label="レイリー最大高度：" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="レイリー指数項：" name="mie_exponential"/> + <slider label="Mie 指数スケール：" name="mie_exponential_scale"/> + <slider label="Mie 線形項：" name="mie_linear"/> + <slider label="Mie 定数項：" name="mie_constant"/> + <slider label="Mie 不等要素：" name="mie_aniso_factor"/> + <slider label="Mie 最大高度：" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="吸収指数項：" name="absorption_exponential"/> + <slider label="吸収指数スケール：" name="absorption_exponential_scale"/> + <slider label="吸収線形項：" name="absorption_linear"/> + <slider label="吸収定数項：" name="absorption_constant"/> + <slider label="吸収最大高度：" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..e5026dc9fd --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="太陽＆月" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="ビーコンを表示" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="ビーコンを表示" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml new file mode 100644 index 0000000000..20341fcb8d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="水" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + フレネル・オフセット： + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X：" name="water_normal_scale_x"/> + <slider label="Y：" name="water_normal_scale_y"/> + <slider label="Z：" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml index 1821a6fad6..75bc8eb86f 100644 --- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="テクスチャ" name="Texture"> - <panel.string name="string repeats per meter"> - メーターごとに繰り返す - </panel.string> - <panel.string name="string repeats per face"> - 面ごとに繰り返す - </panel.string> <text name="color label"> 色 </text> @@ -114,4 +108,5 @@ <spinner label="水平オフセット" name="shinyOffsetU"/> <spinner label="垂直オフセット" name="shinyOffsetV"/> <check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/> + <button label="揃える" label_selected="現在のテクスチャレイヤーを揃える" name="button align textures" tool_tip="現在のテクスチャレイヤーを揃える"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml index fe90da89c7..05eca2cca3 100644 --- a/indra/newview/skins/default/xui/ja/role_actions.xml +++ b/indra/newview/skins/default/xui/ja/role_actions.xml @@ -33,6 +33,7 @@ <action description="音楽とメディアの設定を変更" longdescription="ストリーミングミュージックと動画の設定を変更するには、「土地情報」 ＞ 「メディア」タブを使います。" name="land change media" value="20"/> <action description="「地形を編集」に切り替え" longdescription="「地形を編集」に切り替えます。 *警告* 「土地情報」＞「オプション」＞「地形を編集」の順で進むと、誰でもあなたの土地の形の整備や、リンデン製の樹木の設置、移動ができます。 この能力を割り振る前に、このことをよく理解しておいてください。 「土地情報」＞「オプション」タブから「地形を編集」に切り替えられます。" name="land edit" value="21"/> <action description="「土地情報」＞「オプション」タブ内のさまざまな設定を切り替え" longdescription="「安全（ダメージなし）」、「飛行」を切り替え、住人に以下を許可します： グループ所有地の「土地情報」 > 「オプション」タブ内の、「地形を編集」、「制作」、「ランドマークの作成」、「スクリプトの実行」。" name="land options" value="22"/> + <action description="自然環境の設定とデイサイクルを修正する。" longdescription="「土地について」 > 「環境」タブから自然環境の設定とデイサイクルを変更する。" name="land change environment" value="46"/> </action_set> <action_set description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。" name="Parcel Powers"> <action description="常に「地形を編集」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、地形の編集が可能です。" name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 396a952d64..f6c4a8d13f 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -656,6 +656,15 @@ support@secondlife.com にお問い合わせください。 <string name="BUTTON_HELP"> ヘルプを表示 </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + このタイプのアイテムは、このリージョンのノートカード +に添付することができません。 + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + 制限のない「次の所有者」の +許可のみノートカードに +添付できます。 + </string> <string name="Searching"> 検索中... </string> @@ -735,6 +744,18 @@ support@secondlife.com にお問い合わせください。 アップロードリクエスト中にエラーが発生しました。問題を解決するには、サポート （http://secondlife.com/support）にお問い合わせください。 </string> + <string name="SettingValidationError"> + インポートする設定 [NAME] の検証に失敗しました。 + </string> + <string name="SettingImportFileError"> + ファイル [FILE] を開くことができません + </string> + <string name="SettingParseFileError"> + ファイル [FILE] を開くことができません + </string> + <string name="SettingTranslateError"> + 過去のウインドライト [NAME] を変換できません + </string> <string name="texture"> テクスチャ </string> @@ -810,6 +831,9 @@ support@secondlife.com にお問い合わせください。 <string name="symbolic folder link"> フォルダのリンク </string> + <string name="settings blob"> + 設定 + </string> <string name="mesh"> メッシュ </string> @@ -1140,6 +1164,9 @@ support@secondlife.com にお問い合わせください。 <string name="ForceSitAvatar"> アバターを強制的に座らせる </string> + <string name="ChangeEnvSettings"> + 自然環境の設定を変更する + </string> <string name="NotConnected"> 接続されていません </string> @@ -1291,6 +1318,9 @@ support@secondlife.com にお問い合わせください。 <string name="tattoo"> タトゥ </string> + <string name="universal"> + ユニバーサル + </string> <string name="physics"> 物理作用 </string> @@ -1333,6 +1363,9 @@ support@secondlife.com にお問い合わせください。 <string name="tattoo_not_worn"> タトゥー未着用 </string> + <string name="universal_not_worn"> + ユニバーサルなし + </string> <string name="physics_not_worn"> 物理作用なし </string> @@ -1384,6 +1417,9 @@ support@secondlife.com にお問い合わせください。 <string name="create_new_tattoo"> 新しいタトゥを作成 </string> + <string name="create_new_universal"> + 新しいユニバーサルを作成 + </string> <string name="create_new_physics"> 新しい物理作用を作成 </string> @@ -2530,6 +2566,27 @@ support@secondlife.com にお問い合わせください。 <string name="RegionSettings"> リージョン（地域）の設定 </string> + <string name="NoEnvironmentSettings"> + このリージョンは環境設定をサポートしていません。 + </string> + <string name="EnvironmentSun"> + 太陽 + </string> + <string name="EnvironmentMoon"> + 月 + </string> + <string name="EnvironmentBloom"> + 花 + </string> + <string name="EnvironmentCloudNoise"> + 雲の音 + </string> + <string name="EnvironmentNormalMap"> + ノーマル・マップ + </string> + <string name="EnvironmentTransparent"> + Transparent + </string> <string name="ClassifiedClicksTxt"> クリック数： [TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール </string> @@ -4761,6 +4818,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="New Tattoo"> 新しいタトゥ </string> + <string name="New Universal"> + 新しいユニバーサル + </string> <string name="New Physics"> 新規の物理作用 </string> @@ -4887,6 +4947,15 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Female - Wow"> 女性 - Wow </string> + <string name="New Daycycle"> + 新しいデイサイクル + </string> + <string name="New Water"> + 新しい水 + </string> + <string name="New Sky"> + 新しい空 + </string> <string name="/bow"> /おじぎする </string> @@ -5415,6 +5484,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="BeaconMedia"> メディアビーコン（白）を表示中 </string> + <string name="BeaconSun"> + 太陽の方角ビーコン（オレンジ）を表示中 + </string> + <string name="BeaconMoon"> + 月の方角ビーコン（紫）を表示中 + </string> <string name="ParticleHiding"> パーティクルを非表示 </string> @@ -5442,6 +5517,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Destinations_Label"> 行き先 </string> + <string name="Command_Environments_Label"> + 私の環境 + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5535,6 +5616,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Destinations_Tooltip"> 行ってみたい場所 </string> + <string name="Command_Environments_Tooltip"> + 私の環境 + </string> + <string name="Command_Facebook_Tooltip"> + Facebook へ投稿 + </string> <string name="Command_Flickr_Tooltip"> Flickr にアップロード </string> @@ -5730,6 +5817,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="ExperiencePermission12"> 体験の権限を自動的に承諾 </string> + <string name="ExperiencePermission16"> + あなたのアバターを強制的に座らせる + </string> + <string name="ExperiencePermission17"> + 自然環境の設定を変更する + </string> <string name="ExperiencePermissionShortUnknown"> が不明な操作を実行しました： [Permission] </string> @@ -5754,6 +5847,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="ExperiencePermissionShort12"> 権限 </string> + <string name="ExperiencePermissionShort16"> + Sit + </string> + <string name="ExperiencePermissionShort17"> + 環境 + </string> <string name="logging_calls_disabled_log_empty"> 会話はログに記録されていません。ログの記録を開始するには、「環境設定」>「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。 </string> diff --git a/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml deleted file mode 100644 index fc750715c6..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<floater name="Delete Env Preset" title="USUŃ UST. OTOCZENIA"> - <string name="title_water"> - Usuń Ustawienie wody - </string> - <string name="title_sky"> - Usuń Ustawienie nieba - </string> - <string name="title_day_cycle"> - Usuń cykl dnia - </string> - <string name="label_water"> - Wybierz: - </string> - <string name="label_sky"> - Wybierz: - </string> - <string name="label_day_cycle"> - Cykl dnia: - </string> - <string name="msg_confirm_deletion"> - Masz absolutną pewność, że chcesz usunąć wybrane Ustawienie? - </string> - <string name="msg_sky_is_referenced"> - Nie można usunąć Ustawienia odwołującego się do jakiegoś cyklu dnia. - </string> - <string name="combo_label"> - -Wybierz Ustawienie- - </string> - <text name="label"> - Wybierz: - </text> - <button label="Usuń" name="delete" /> - <button label="Anuluj" name="cancel" /> -</floater> diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 2dfafff7f5..4d03e7c780 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -84,17 +84,14 @@ <menu name="Water Presets" label="Ustawienia wody"> <menu_item_call label="Nowe Ustawienie..." name="new_water_preset" /> <menu_item_call label="Edytuj Ustawienie..." name="edit_water_preset" /> - <menu_item_call label="Usuń Ustawienie..." name="delete_water_preset" /> </menu> <menu name="Sky Presets" label="Ustawienia nieba"> <menu_item_call label="Nowe Ustawienie..." name="new_sky_preset" /> <menu_item_call label="Edytuj Ustawienie..." name="edit_sky_preset" /> - <menu_item_call label="Usuń Ustawienie..." name="delete_sky_preset" /> </menu> <menu name="Day Presets" label="Ustawienia pory dnia"> <menu_item_call label="Nowe Ustawienie..." name="new_day_preset" /> <menu_item_call label="Edytuj Ustawienie..." name="edit_day_preset" /> - <menu_item_call label="Usuń Ustawienie..." name="delete_day_preset" /> </menu> </menu> </menu> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index 738805d800..e8c400dbd1 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml @@ -28,7 +28,6 @@ <check_box label="Przezroczysta woda" name="TransparentWater" /> <check_box label="Mapping wypukłości i połysk" name="BumpShiny" /> <check_box label="Lokalne światła" name="LocalLights" /> - <check_box label="Podstawowe shadery" name="BasicShaders" tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych" /> <check_box label="Shadery atmosfery" name="WindLightUseAtmosShaders" /> <check_box label="Zaawansowane oświetlenie" name="UseLightShaders" /> <check_box label="Okluzja otoczenia" name="UseSSAO" /> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 9aece1221d..91fea234d2 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -710,6 +710,9 @@ Spróbuj zalogować się ponownie za minutę. <string name="mesh"> mesz </string> + <string name="settings"> + ustawień + </string> <string name="AvatarEditingAppearance"> (Edycja wyglądu) </string> diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 0e7d0798c7..d7741fa902 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -479,5 +479,6 @@ Mídia: </panel> </panel> <panel label="EXPERIÊNCIAS" name="land_experiences_panel"/> + <panel label="AMBIENTE" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_adjust_environment.xml b/indra/newview/skins/default/xui/pt/floater_adjust_environment.xml new file mode 100644 index 0000000000..4e2e96c54b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Iluminação pessoal"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Redefinir" name="btn_reset" tool_tip="Feche e redefina e Compartilhe o Ambiente"/> + <text name="cloud_map_label"> + Imagem de nuvem: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Dom: + </text> + <check_box label="Exibir baliza" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Exibir baliza" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml index f8ae3cd2d8..bcd6ae0400 100644 --- a/indra/newview/skins/default/xui/pt/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Fontes de som" name="sounds"/> <check_box label="Fontes de partículas" name="particles"/> <check_box label="Fontes de mídia" name="moapbeacon"/> + <check_box label="Dom" name="sun"/> + <check_box label="Lua" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml index a31b049345..554865b3a6 100644 --- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml @@ -30,6 +30,7 @@ <icon name="icon_sound" tool_tip="Sons"/> <check_box label="Texturas" name="check_texture"/> <icon name="icon_texture" tool_tip="Texturas"/> + <icon name="icon_setting" tool_tip="Configurações de ambiente"/> <button label="Tudo" label_selected="Todas" name="check_all"/> <button label="Limpar" label_selected="Nenhuma" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml deleted file mode 100644 index 2434f67d6c..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="EXCLUIR PREDEFINIÇÃO ENV"> - <string name="title_water"> - Excluir predefinição da água - </string> - <string name="title_sky"> - Excluir predefinição de céu - </string> - <string name="title_day_cycle"> - Excluir ciclo de dias - </string> - <string name="label_water"> - Predefinição: - </string> - <string name="label_sky"> - Predefinição: - </string> - <string name="label_day_cycle"> - Ciclos de dias: - </string> - <string name="msg_confirm_deletion"> - Tem certeza de que quer excluir a predefinição selecionada? - </string> - <string name="msg_sky_is_referenced"> - Não é possível remover uma predefinição que está referenciada por algum(ns) ciclo(s) de dias. - </string> - <string name="combo_label"> - -Selecionar uma prefefinição- - </string> - <text name="label"> - Predefinição: - </text> - <button label="Excluir" name="delete"/> - <button label="Cancelar" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..f58af73e55 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Editar ciclo de dias"> + <string name="title_new"> + Criar um ciclo de dias + </string> + <string name="title_edit"> + Editar ciclo de dia + </string> + <string name="hint_new"> + Nomeie o seu ciclo de dias, ajustar os controles para criá-lo e clique em “Salvar”. + </string> + <string name="hint_edit"> + Editar o seu ciclo de dias, ajustar os controles para criá-lo e clique em “Salvar”. + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Céu [ALT] + </string> + <string name="sky_label"> + Céu + </string> + <string name="water_label"> + Água + </string> + <string name="commit_parcel"> + Aplicar ao lote + </string> + <string name="commit_region"> + Aplicar para a região + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Nome do ciclo de dias: + </text> + <button label="Importar" name="btn_import" tool_tip="Importar configurações do legado do disco."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Céu 4" name="sky4_track"/> + <button label="Céu 3" name="sky3_track"/> + <button label="Céu 2" name="sky2_track"/> + <button label="A nível do chão" name="sky1_track"/> + <button label="Água" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Clonar Rastreio de" name="copy_track"/> + <button label="Carregar rastreio de" name="load_track"/> + <button label="Limpar rastreio" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Passo para trás"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Passo para frente"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="Adicionar [FRAME]" name="add_frame"/> + <button label="Carregar [FRAME]" name="btn_load_frame"/> + <button label="Excluir [FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Selecionar uma estrutura chave da linha do tempo acima para editar as configurações. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Água" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmosfera e Claridade" name="atmosphere_panel"/> + <panel label="Nuvens" name="clouds_panel"/> + <panel label="Sol e Lua" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Salvar" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/pt/floater_fixedenvironment.xml new file mode 100644 index 0000000000..c969aac74e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Ambiente consertado"> + <string name="edit_sky"> + Editar céu: + </string> + <string name="edit_water"> + Editar água: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Carregar" name="btn_load" tool_tip="Carregar as configurações de inventário"/> + <button label="Importar" name="btn_import" tool_tip="Importar configurações do legado do disco."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Salvar" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Cancelar" name="btn_cancel" tool_tip="Voltar à última versão salva"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml index b31a066996..a43dec4e7b 100644 --- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Sons" name="check_sound"/> <check_box label="Texturas" name="check_texture"/> <check_box label="Fotos" name="check_snapshot"/> + <check_box label="Configurações" name="check_settings"/> <button label="Tudo" label_selected="Tudo" name="All"/> <button label="Nenhum" label_selected="Nenhum" name="None"/> <check_box label="Sempre mostrar as pastas" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/pt/floater_my_environments.xml b/indra/newview/skins/default/xui/pt/floater_my_environments.xml new file mode 100644 index 0000000000..71c1a33f58 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Lugares" name="my_environments" title="MEUS AMBIENTES"> + <layout_stack> + <layout_panel label="Filtros" name="filter_panel"> + <check_box label="Dias" name="chk_days"/> + <check_box label="Céus" name="chk_skies"/> + <check_box label="Água" name="chk_water"/> + <filter_editor label="Filtrar Ambientes" name="flt_search"/> + </layout_panel> + <layout_panel label="Ambientes" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Exibir todas as pastas" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Mais opções"/> + <menu_button name="btn_newsettings" tool_tip="Criar nova configuração"/> + <button name="btn_del" tool_tip="Remover item selecionado"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_perms_default.xml b/indra/newview/skins/default/xui/pt/floater_perms_default.xml index 40659a353a..0b8914b4dd 100644 --- a/indra/newview/skins/default/xui/pt/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/pt/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Definir permissões padrão para roupas ou partes do corpo criadas"> Itens de vestuário </text> + <text name="label_13" tool_tip="Definir permissões padrão para quando as configurações do Ambiente forem criadas"> + Configurações + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Cancelar" label_selected="Cancelar" name="cancel"/> diff --git a/indra/newview/skins/default/xui/pt/floater_pick_track.xml b/indra/newview/skins/default/xui/pt/floater_pick_track.xml new file mode 100644 index 0000000000..dc09f262c0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="ESCOLHER: RASTREAR"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Selecionar o céu de origem: + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Céu4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Céu3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Céu2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Chão" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml index c5039267ca..bbe36e3e03 100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Água transparente" name="TransparentWater"/> <check_box initial_value="true" label="Mapeamento de relevo e brilho" name="BumpShiny"/> <check_box initial_value="true" label="Luzes locais" name="LocalLights"/> - <check_box initial_value="true" label="Sombreamento simples" name="BasicShaders" tool_tip="Desativar essa opção pode evitar o travamento de alguns drivers de placas gráficas"/> <slider label="Detalhes do terreno:" name="TerrainDetail"/> <text name="TerrainDetailText"> Baixo diff --git a/indra/newview/skins/default/xui/pt/floater_settings_picker.xml b/indra/newview/skins/default/xui/pt/floater_settings_picker.xml new file mode 100644 index 0000000000..0dc80989be --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="ESCOLHER: CONFIGURAÇÕES"> + <floater.string name="pick title"> + Escolher: + </floater.string> + <floater.string name="pick_track"> + SELECIONE RASTREIO + </floater.string> + <floater.string name="pick_settings"> + SELECIONAR CONFIGURAÇÕES + </floater.string> + <floater.string name="track_water"> + Água + </floater.string> + <floater.string name="track_ground"> + Chão + </floater.string> + <floater.string name="track_sky"> + Céu[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Filtrar texturas" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml index ba4ef0afde..d06c16d8c8 100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Inventário" name="inventory" value="0"/> <radio_item label="Local" name="local" value="1"/> + <radio_item label="Assar" name="bake" value="2"/> </radio_group> <text name="unknown"> Tamanho: [DIMENSÕES] @@ -19,7 +20,6 @@ <button label="Padrão" label_selected="Padrão" name="Default"/> <button label="Branco" label_selected="Branco" name="Blank"/> <button label="Nenhum" label_selected="Nenhum" name="None"/> - <check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/> <text name="preview_disabled" value="Visualização desativada"/> <filter_editor label="Filtrar texturas" name="inventory search editor"/> <check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/> @@ -30,6 +30,22 @@ <column label="Nome" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Escolha a textura de assar"> + <combo_box.item label="Nenhum" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Ocultar região da mesh de base" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index b99ddc67d2..78a0482dee 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Ativar" name="Marketplace Activate"/> <menu_item_call label="Desativar" name="Marketplace Deactivate"/> <menu_item_call label="Compartilhar" name="Share"/> - <menu_item_call label="Comprar" name="Task Buy"/> <menu_item_call label="Abrir" name="Task Open"/> <menu_item_call label="Executar" name="Task Play"/> <menu_item_call label="Propriedades" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Nova roupa de baixo" name="New Underpants"/> <menu_item_call label="Nova máscara alfa" name="New Alpha Mask"/> <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + <menu_item_call label="Novo universal" name="New Universal"/> <menu_item_call label="Novo físico" name="New Physics"/> </menu> <menu label="Nova parte do corpo" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> </menu> + <menu label="Novas configurações" name="New Settings"> + <menu_item_call label="Novo céu" name="New Sky"/> + <menu_item_call label="Nova água" name="New Water"/> + <menu_item_call label="Novo ciclo de dias" name="New Day Cycle"/> + </menu> <menu label="Usar como padrão para" name="upload_def"> <menu_item_call label="Envios de imagem" name="Image uploads"/> <menu_item_call label="Envios de som" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Editar" name="Wearable Edit"/> <menu_item_call label="Adicionar" name="Wearable Add"/> <menu_item_call label="Tirar" name="Take Off"/> + <menu_item_call label="Aplicar somente a mim" name="Settings Apply Local"/> + <menu_item_call label="Aplicar ao lote" name="Settings Apply Parcel"/> <menu_item_call label="Copiar para Listagens do Marketplace" name="Marketplace Copy"/> <menu_item_call label="Mover para Listagens do Marketplace" name="Marketplace Move"/> <menu_item_call label="--Sem opções--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml index 92621e8493..0eaf3c7c5f 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Som (L$[COST])..." name="Upload Sound"/> <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Modelar..." name="Upload Model"/> - <menu_item_call label="Assistente de modelagem..." name="Upload Model Wizard"/> <menu_item_call label="Volume..." name="Bulk Upload"/> - <menu_item_call label="Autorizações de upload padrão" name="perm prefs"/> </menu> <menu_item_call label="Nova pasta" name="New Folder"/> <menu_item_call label="Novo script" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Novas roupa de baixo" name="New Underpants"/> <menu_item_call label="Novo alpha" name="New Alpha"/> <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + <menu_item_call label="Novo universal" name="New Universal"/> <menu_item_call label="Novo físico" name="New Physics"/> </menu> <menu label="Nova parte do corpo" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> </menu> + <menu label="Novas configurações" name="New Settings"> + <menu_item_call label="Novo céu" name="New Sky"/> + <menu_item_call label="Nova água" name="New Water"/> + <menu_item_call label="Novo ciclo de dias" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml index ccf65ae566..1de8fd939b 100644 --- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Novo alpha" name="New Alpha"/> <menu_item_call label="Novo físico" name="New Physics"/> <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + <menu_item_call label="Novo universal" name="New Universal"/> </menu> <menu label="Nova parte do corpo" name="New Body Parts"> <menu_item_call label="Nova silhueta" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/pt/menu_save_settings.xml b/indra/newview/skins/default/xui/pt/menu_save_settings.xml new file mode 100644 index 0000000000..9af5d01629 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Salvar" name="save_settings"/> + <menu_item_check label="Salvar como" name="save_as_new_settings"/> + <menu_item_check label="Enviar" name="commit_changes"/> + <menu_item_check label="Aplicar somente a mim" name="apply_local"/> + <menu_item_check label="Aplicar ao lote" name="apply_parcel"/> + <menu_item_check label="Aplicar para a região" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_settings_add.xml b/indra/newview/skins/default/xui/pt/menu_settings_add.xml new file mode 100644 index 0000000000..3bd87e6c12 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Novo céu" name="New Sky"/> + <menu_item_call label="Nova água" name="New Water"/> + <menu_item_call label="Novo ciclo de dias" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_settings_gear.xml b/indra/newview/skins/default/xui/pt/menu_settings_gear.xml new file mode 100644 index 0000000000..55817b22e0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Editar" name="edit_settings"/> + <menu_item_call label="Aplicar somente a mim" name="Settings Apply Local"/> + <menu_item_call label="Aplicar ao lote" name="Settings Apply Parcel"/> + <menu_item_call label="Aplicar para a região" name="Settings Apply Region"/> + <menu_item_call label="Copiar" name="copy_settings"/> + <menu_item_call label="Colar" name="paste_settings"/> + <menu_item_call label="Copiar UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index e82b7bc62a..8b144390fa 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -79,30 +79,15 @@ <menu_item_check label="Propriedades do lote" name="Parcel Properties"/> <menu_item_check label="Menu avançado" name="Show Advanced Menu"/> </menu> - <menu label="Dom" name="Sun"> + <menu label="Ambiente" name="Environment"> <menu_item_check label="Nascer do sol" name="Sunrise"/> <menu_item_check label="Meio-dia" name="Noon"/> <menu_item_check label="Pôr do sol" name="Sunset"/> <menu_item_check label="Meia-noite" name="Midnight"/> - <menu_item_check label="Usar as configurações da região" name="Use Region Settings"/> - </menu> - <menu label="Editor de ambientes" name="Environment Editor"> - <menu_item_call label="Configurações do ambiente..." name="Environment Settings"/> - <menu label="Predefinições da água" name="Water Presets"> - <menu_item_call label="Nova predefinição..." name="new_water_preset"/> - <menu_item_call label="Editar predefinição..." name="edit_water_preset"/> - <menu_item_call label="Excluir predefinição..." name="delete_water_preset"/> - </menu> - <menu label="Predefinições de céu" name="Sky Presets"> - <menu_item_call label="Nova predefinição..." name="new_sky_preset"/> - <menu_item_call label="Editar predefinição..." name="edit_sky_preset"/> - <menu_item_call label="Excluir predefinição..." name="delete_sky_preset"/> - </menu> - <menu label="Predefinições do dia" name="Day Presets"> - <menu_item_call label="Nova predefinição..." name="new_day_preset"/> - <menu_item_call label="Editar predefinição..." name="edit_day_preset"/> - <menu_item_call label="Excluir predefinição..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Use o ambiente compartilhado" name="Use Shared Environment"/> + <menu_item_call label="Meu ambiente..." name="my_environs"/> + <menu_item_call label="Iluminação pessoal..." name="adjustment_tool"/> + <menu_item_check label="Pausar as nuvens" name="pause_clouds"/> </menu> </menu> <menu label="Construir" name="BuildTools"> @@ -323,6 +308,9 @@ <menu_item_check label="Máscaras alpha automáticas (sem adiar)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Texturas de animação" name="Animation Textures"/> <menu_item_check label="Desativar texturas" name="Disable Textures"/> + <menu_item_check label="Desativar ambiente" name="Disable Ambient"/> + <menu_item_check label="Desabilitar a luz solar" name="Disable Sunlight"/> + <menu_item_check label="Desativar Luzes locais" name="Disable Local Lights"/> <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> <menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/> @@ -413,6 +401,7 @@ </menu> <menu label="Admin" name="Deprecated"> <menu label="Take Off Clothing" name="Take Off Clothing"> + <menu_item_call label="Universal" name="Universal"/> <menu_item_call label="Físico" name="Physics"/> </menu> <menu label="Ajuda" name="DeprecatedHelp"> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index b27d8dba1d..2a93ff4f63 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1951,6 +1951,11 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar. Ao desselecionar esta opção, você pode remover as restrições que os proprietários dos terrenos adicionaram para evitar problemas, manter a privacidade ou proteger residentes menores de idade contra conteúdo adulto. Por favor, discuta com os seus proprietários de terreno conforme necessário. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Desmarcando esta opção pode remover quaisquer ambientes personalizados que os proprietários tenham adicionado aos seus lotes.. +Por favor, discuta com os seus proprietários de terreno conforme necessário. Deseja continuar? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> A região que você está tentando visitar tem conteúdo que excede suas preferências atuais. Você pode alterar suas preferências acessando Eu > Preferências > Geral. <usetemplate name="okbutton" yestext="OK"/> @@ -2431,7 +2436,15 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de Este arquivo de ciclo de dia se refere a um arquivo de céu faltando: [SKY]. </notification> <notification name="WLRegionApplyFail"> - As configurações não podem ser aplicadas à região. Talvez sair e votlar à região resolva. Motivo: [FAIL_REASON] + As configurações não puderam ser aplicadas para a região. Motivo: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Uma textura local está em uso no rastreio [TRACK], moldura #[FRAMENO] ([FRAME]%) no campo [FIELD]. +As definições não puderam ser salvas usando as texturas locais. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Uma textura local está em uso no campo [FIELD]. +As definições não puderam ser salvas usando as texturas locais. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Impossível excluir a última chave do ciclo pois um ciclo não pode ficar vazio. Modifique a última chave em vez de tentar apagá-la, depois crie uma chave nova. @@ -4379,4 +4392,76 @@ Tente selecionar uma quantidade menor de terreno. [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + Não pode carregar as configurações para [NAME] da base de dados. + </notification> + <notification name="FailedToLoadSettingsApply"> + Não foi possível aplicar aquelas configurações para o ambiente. + </notification> + <notification name="FailedToBuildSettingsDay"> + Não foi possível aplicar aquelas configurações para o ambiente. + </notification> + <notification name="NoEnvironmentSettings"> + Esta Região não suporta as configurações do ambiente. + </notification> + <notification label="Salvar visual" name="SaveSettingAs"> + Salve as configurações do ambiente atual como: + <form name="form"> + <input name="message"> + [DESC] (novo) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> + <notification name="WLImportFail"> + Não foi possível imporar as configurações do vento antigo [NAME] de +[FILE]. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Não é possível definir o ambiente para este lote. +Inserir ou selecionar um lote que você tem direitos para modificar. + </notification> + <notification name="SettingsUnsuported"> + As configurações não são suportadas para esta região. +Mude para uma configuração permitida para a região ou tente novamente realizar a ação. + </notification> + <notification name="SettingsConfirmLoss"> + Você está prestes a perder as alterações que você fez para este [TYPE] com o nome "[NAME]". +Tem certeza de que deseja continuar? + <usetemplate ignoretext="Tem certeza de que deseja perder as alterações?" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> + <notification name="SettingsConfirmReset"> + Você está prestes a remover todas as configurações aplicadas. +Tem certeza de que deseja continuar? + <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Você está prestes a remover todas as configurações de Iluminação pessoal aplicadas. +Tem certeza de que deseja continuar? + <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Você está prestes a importar configurações não transferíveis para este ciclo de dias. Caso continue, transformará as configurações que você está editando não transferível também. + +Esta alteração não pode ser desfeita. + +Tem certeza de que deseja continuar? + <usetemplate ignoretext="Tem certeza de que deseja tornar as configurações não transferível?" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> + <notification name="NoEditFromLibrary"> + Você não pode editar as configurações diretamente da biblioteca. +Copie para o seu próprio inventário e tente novamente. + </notification> + <notification name="EnvironmentApplyFailed"> + Encontramos problemas com essas configurações. Eles não podem ser salvos ou aplicados desta vez. + </notification> + <notification name="TrackLoadFailed"> + Não foi possível carregar o rastreio para [TRACK]. + </notification> + <notification name="TrackLoadMismatch"> + Não foi possível carregar rastreio de [TRACK1] em [TRACK2]. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml index f85bb3c499..f5d513e2f6 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatuagem de cabeça" name="Head Tattoo" tool_tip="Clique para escolher uma foto"/> - <texture_picker label="Tatuagem superior" name="Upper Tattoo" tool_tip="Selecione uma foto"/> - <texture_picker label="Tatuagem inferior" name="Lower Tattoo" tool_tip="Selecione uma foto"/> - <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_universal.xml b/indra/newview/skins/default/xui/pt/panel_edit_universal.xml new file mode 100644 index 0000000000..0bcaa36f1d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Tatuagem na cabeça" name="Head Universal Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem parte de cima" name="Upper Universal Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem de baixo" name="Lower Universal Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem de saia" name="Skirt Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem de cabelo" name="Hair Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem de olhos" name="Eyes Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem no Braço esquerdo" name="Left Arm Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Tatuagem na perna esquerdo" name="Left Leg Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Aux1 Tatuagem" name="Aux1 Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Aux2 Tatuagem" name="Aux2 Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <texture_picker label="Aux3 Tatuagem" name="Aux3 Tattoo" tool_tip="Clique para selecionar uma imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml index 2e3e3d6305..e8d9063206 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Editando tatuagem </string> + <string name="edit_universal_title"> + Edição Universal + </string> <string name="edit_physics_title"> Editando o físico </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Tatuagem: </string> + <string name="universal_desc_text"> + Universal: + </string> <string name="physics_desc_text"> Físico: </string> diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml index 7593c50941..f99a75d699 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ambiente" name="panel_env_info"> - <text name="water_settings_title"> - Selecionar a Água e o Céu/Configurações de Ciclo de Dias que você gostaria que todos os visitantes da sua região visse. Mais informações - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Use o padrão Second Life" name="use_sl_default_settings"/> - <radio_item label="Use as seguintes configurações" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Configurações da água - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Céu / Ciclo de dias - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Céu fixo" name="my_sky_settings"/> - <radio_item label="Ciclos de dias" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Selecionar uma prefefinição-" name="item0"/> - </combo_box> - </panel> - <button label="Aplicar" name="apply_btn"/> - <button label="Cancelar" name="cancel_btn"/> + <string name="str_label_use_default"> + Usar as configurações padrões + </string> + <string name="str_label_use_region"> + Usar as configurações da região + </string> + <string name="str_altitude_desription"> + Céu [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + Nenhum lote está selecionado. As configurações do ambiente estão desativadas. + </string> + <string name="str_cross_region"> + As configurações do ambiente não estão disponíveis além das fronteiras da região. + </string> + <string name="str_legacy"> + As configurações do ambiente não estão disponíveis nesta região. + </string> + <string name="str_disallowed"> + O gerente do estado não permite alteração dos ambientes dos lotes nesta região. + </string> + <string name="str_too_small"> + O lote deve ter no mínimo 128 metros quadrados para suportar um ambiente. + </string> + <string name="str_empty"> + (vazio) + </string> + <string name="str_region_env"> + (região ambiente) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Usar inventário" name="btn_select_inventory"/> + <button label="Customizar" name="btn_edit"/> + <check_box label="Os proprietários do lote podem desconsiderar o ambiente" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Céu [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt1"> + Desconhecido + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Arraste uma configuração do Inventário para a caixa alvo para selecionar como o céu atual."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Céu [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt2"> + Desconhecido + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Arraste uma configuração do Inventário para a caixa alvo para selecionar como o céu atual."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Céu [INDEX] + [ALTITUDE]m + </text> + <line_editor name="edt_invname_alt3"> + Desconhecido + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Arraste uma configuração do Inventário para a caixa alvo para selecionar como o céu atual."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Chão + </text> + <line_editor name="edt_invname_ground"> + Desconhecido + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Arraste uma configuração do Inventário para a caixa alvo para selecionar como o nível do chão do céu."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Água + </text> + <line_editor name="edt_invname_water"> + Desconhecido + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Arraste uma configuração do Inventário para a caixa alvo para selecionar como a água atual."/> + </panel> + <button label="Redefinir" name="btn_rst_altitudes" tool_tip="Redefinir para padrão de altitudes"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/pt/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..25c27cd6e6 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmosfera e Claridade" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/pt/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/pt/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..70f814138a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Nuvens" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/pt/panel_settings_sky_density.xml new file mode 100644 index 0000000000..14143a928a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Densidade" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Espelhar termo exponencial:" name="rayleigh_exponential"/> + <slider label="Espelhar escala exponencial:" name="rayleigh_exponential_scale"/> + <slider label="Espelhar termo linear:" name="rayleigh_linear"/> + <slider label="Espelhar termo constante:" name="rayleigh_constant"/> + <slider label="Espelhar altitude máxima:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Mie termo exponencial:" name="mie_exponential"/> + <slider label="Mie escala exponencial:" name="mie_exponential_scale"/> + <slider label="Mie termo linear:" name="mie_linear"/> + <slider label="Mie termo constante:" name="mie_constant"/> + <slider label="Mie fator aniso:" name="mie_aniso_factor"/> + <slider label="Mie altitude máxima:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Absorção termo exponencial:" name="absorption_exponential"/> + <slider label="Absorção escala exponencial:" name="absorption_exponential_scale"/> + <slider label="Absorção termo linear:" name="absorption_linear"/> + <slider label="Absorção termo constante:" name="absorption_constant"/> + <slider label="Absorção altitude máxima:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..fe6672b261 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Sol e Lua" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Exibir baliza" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Exibir baliza" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_settings_water.xml b/indra/newview/skins/default/xui/pt/panel_settings_water.xml new file mode 100644 index 0000000000..9a6e6462bd --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Água" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Offset fresnel: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml index 5e97eca605..4f484c5fce 100644 --- a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Textura" name="Texture"> - <panel.string name="string repeats per meter"> - Repetições por metro - </panel.string> - <panel.string name="string repeats per face"> - Repetições por face - </panel.string> <text name="color label"> Cor </text> @@ -114,4 +108,5 @@ <spinner label="Offset horizontal" name="shinyOffsetU"/> <spinner label="Offset vertical" name="shinyOffsetV"/> <check_box initial_value="false" label="Alinhar planos planares" name="checkbox planar align" tool_tip="Alinhar texturas de todos os planos selecionados com o plano selecionado por último. Requer mapeamento de textura planar."/> + <button label="Alinhar" label_selected="Alinhar camadas de textura atual" name="button align textures" tool_tip="Alinhar camadas de textura atual"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml index 67ecfa0be3..e09476a83e 100644 --- a/indra/newview/skins/default/xui/pt/role_actions.xml +++ b/indra/newview/skins/default/xui/pt/role_actions.xml @@ -33,6 +33,7 @@ <action description="Mudar música & configurações de mídia" longdescription="Mude streaming de música e configurações de vídeo em Sobre o terreno > aba Mídia." name="land change media" value="20"/> <action description="Ativar/desativar 'Editar terreno'" longdescription="Ative/desative 'Editar terreno'. *AVISO* Sobre o terreno > aba Opções > Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno > aba Opções." name="land edit" value="21"/> <action description="Ativar/desativar variados Sobre o Terreno > Opções de configuração" longdescription="Alterna as opções 'Seguro (zero danos)', 'Voar' e autorizar outros residentes a: 'Editar terreno', 'Contruir', 'Criar marcos' e 'Executar scripts' nos terrenos do grupo. Clique em Sobre o terreno > guia Opções." name="land options" value="22"/> + <action description="Modificar configurações do ambiente e ciclos de dia." longdescription="Mude as configurações de ambiente e ciclos de dia em Sobre terrenos > Aba Ambiente." name="land change environment" value="46"/> </action_set> <action_set description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo." name="Parcel Powers"> <action description="Sempre permitir 'Editar terreno'" longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 188ee5f89f..ee2e8dfda8 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -613,6 +613,15 @@ Aguarde um minuto antes que tentar logar-se novamente. <string name="BUTTON_HELP"> Mostrar ajuda </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Os itens deste tipo não podem ser anexados +às anotações desta região. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Somente itens com permissões irrestritas +do 'próximo proprietário’ pode +ser anexado às anotações. + </string> <string name="Searching"> Buscando... </string> @@ -689,6 +698,18 @@ Aguarde um minuto antes que tentar logar-se novamente. Erro na solicitação de upload. Acesso http://secondlife.com/support para ajuda ao resolver este problema. </string> + <string name="SettingValidationError"> + Falha na validação para importação das configurações [NAME] + </string> + <string name="SettingImportFileError"> + Não foi possível abrir o arquivo [FILE] + </string> + <string name="SettingParseFileError"> + Não foi possível abrir o arquivo [FILE] + </string> + <string name="SettingTranslateError"> + Não foi possível traduzir o vento antigo [NAME] + </string> <string name="texture"> textura </string> @@ -764,6 +785,9 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="symbolic folder link"> link da pasta </string> + <string name="settings blob"> + configurações + </string> <string name="mesh"> mesh </string> @@ -1094,6 +1118,9 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="ForceSitAvatar"> Forçar o avatar a sentar </string> + <string name="ChangeEnvSettings"> + Alterar sua configurações de ambiente + </string> <string name="AgentNameSubst"> (Você) </string> @@ -1242,6 +1269,9 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="tattoo"> Tatuagem </string> + <string name="universal"> + Universal + </string> <string name="physics"> Físico </string> @@ -1284,6 +1314,9 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="tattoo_not_worn"> Tatuagem não usada </string> + <string name="universal_not_worn"> + Universal não usado + </string> <string name="physics_not_worn"> Físico não usado </string> @@ -1335,6 +1368,9 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="create_new_tattoo"> Criar nova tatuagem </string> + <string name="create_new_universal"> + Criar um novo universal + </string> <string name="create_new_physics"> Criar novo físico </string> @@ -2470,6 +2506,27 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se <string name="RegionSettings"> Configurações da região </string> + <string name="NoEnvironmentSettings"> + Esta Região não suporta as configurações do ambiente. + </string> + <string name="EnvironmentSun"> + Dom + </string> + <string name="EnvironmentMoon"> + Lua + </string> + <string name="EnvironmentBloom"> + Florescer + </string> + <string name="EnvironmentCloudNoise"> + Ruído na nuvem + </string> + <string name="EnvironmentNormalMap"> + Mapa normal + </string> + <string name="EnvironmentTransparent"> + Transparente + </string> <string name="ClassifiedClicksTxt"> Cliques: [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil </string> @@ -4637,6 +4694,9 @@ Denunciar abuso <string name="New Tattoo"> Nova tatuagem </string> + <string name="New Universal"> + Novo universal + </string> <string name="New Physics"> Novo físico </string> @@ -4763,6 +4823,15 @@ Denunciar abuso <string name="Female - Wow"> Wow - feminino </string> + <string name="New Daycycle"> + Novo ciclo de dias + </string> + <string name="New Water"> + Nova água + </string> + <string name="New Sky"> + Novo céu + </string> <string name="/bow"> /reverência </string> @@ -5291,6 +5360,12 @@ Tente colocar o caminho do editor entre aspas. <string name="BeaconMedia"> Vendo balizas de mídia (branco) </string> + <string name="BeaconSun"> + Visualizando farol de direção do sol (alaranjado) + </string> + <string name="BeaconMoon"> + Visualizando farol de direção da lua (roxo) + </string> <string name="ParticleHiding"> Ocultar partículas </string> @@ -5318,6 +5393,12 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Destinations_Label"> Destinos </string> + <string name="Command_Environments_Label"> + Meus ambientes + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5411,6 +5492,12 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Destinations_Tooltip"> Destinos de interesse </string> + <string name="Command_Environments_Tooltip"> + Meus ambientes + </string> + <string name="Command_Facebook_Tooltip"> + Publicar no Facebook + </string> <string name="Command_Flickr_Tooltip"> Carregar no Flickr </string> @@ -5606,6 +5693,12 @@ Tente colocar o caminho do editor entre aspas. <string name="ExperiencePermission12"> aceitar automaticamente permissões de experiência </string> + <string name="ExperiencePermission16"> + forçar o avatar a sentar + </string> + <string name="ExperiencePermission17"> + alterar sua configurações de ambiente + </string> <string name="ExperiencePermissionShortUnknown"> realizar uma operação desconhecida: [Permission] </string> @@ -5630,6 +5723,12 @@ Tente colocar o caminho do editor entre aspas. <string name="ExperiencePermissionShort12"> Autorização </string> + <string name="ExperiencePermissionShort16"> + Sentar + </string> + <string name="ExperiencePermissionShort17"> + Ambiente + </string> <string name="logging_calls_disabled_log_empty"> As conversas não estão sendo registradas. Para começar a manter um registro, selecione "Salvar: apenas registro" ou "Salvar: registro e transcrições" em Preferências> Bate-papo. </string> diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml index fb17896551..4848f2f7e7 100644 --- a/indra/newview/skins/default/xui/ru/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml @@ -474,5 +474,6 @@ </panel> </panel> <panel label="ПРИКЛЮЧЕНИЯ" name="land_experiences_panel"/> + <panel label="ОКРУЖАЮЩАЯ СРЕДА" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_adjust_environment.xml b/indra/newview/skins/default/xui/ru/floater_adjust_environment.xml new file mode 100644 index 0000000000..85809966e4 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Личное освещение"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Сброс" name="btn_reset" tool_tip="Закрыть и сбросить в общую среду"/> + <text name="cloud_map_label"> + Изображение облака: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Солнце: + </text> + <check_box label="Показать метку" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="Показать метку" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml index 38d257ff81..9d706a7c5d 100644 --- a/indra/newview/skins/default/xui/ru/floater_beacons.xml +++ b/indra/newview/skins/default/xui/ru/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Источники звука" name="sounds"/> <check_box label="Источники частиц" name="particles"/> <check_box label="Источники медиа" name="moapbeacon"/> + <check_box label="Солнце" name="sun"/> + <check_box label="Луна" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml index 55b0e0c3bd..f5115a161d 100644 --- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml @@ -21,6 +21,7 @@ <icon name="icon_script" tool_tip="Скрипты"/> <icon name="icon_sound" tool_tip="Звуки"/> <icon name="icon_texture" tool_tip="Текстуры"/> + <icon name="icon_setting" tool_tip="Настройки окружающей среды"/> <button label="√ Все" name="check_all"/> <button label="Очистить" label_selected="Нет" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml deleted file mode 100644 index 1ae278f03b..0000000000 --- a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="УДАЛЕНИЕ НАСТРОЙКИ СРЕДЫ"> - <string name="title_water"> - Удалить настройку воды - </string> - <string name="title_sky"> - Удалить настройку неба - </string> - <string name="title_day_cycle"> - Удалить суточный цикл - </string> - <string name="label_water"> - Настройка: - </string> - <string name="label_sky"> - Настройка: - </string> - <string name="label_day_cycle"> - Суточный цикл: - </string> - <string name="msg_confirm_deletion"> - Действительно удалить выбранную настройку? - </string> - <string name="msg_sky_is_referenced"> - Нельзя удалить настройку, которая используется в некоторых суточных циклах. - </string> - <string name="combo_label"> - -Выбор настройки- - </string> - <text name="label"> - Настройка: - </text> - <button label="Удалить" name="delete"/> - <button label="Отмена" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..ba01b13a82 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Изменить суточный цикл"> + <string name="title_new"> + Создать новый суточный цикл + </string> + <string name="title_edit"> + Изменить суточный цикл + </string> + <string name="hint_new"> + Введите имя суточного цикла, задайте его параметры с помощью элементов управления и нажмите кнопку «Сохранить». + </string> + <string name="hint_edit"> + Чтобы изменить суточный цикл, задайте его параметры с помощью элементов управления ниже и нажмите кнопку «Сохранить». + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Небо [ALT] + </string> + <string name="sky_label"> + Небо + </string> + <string name="water_label"> + Вода + </string> + <string name="commit_parcel"> + Применить к участку + </string> + <string name="commit_region"> + Применить к региону + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Название суточного цикла: + </text> + <button label="Импортировать" name="btn_import" tool_tip="Импортировать устаревшие настройки с диска."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Небо 4" name="sky4_track"/> + <button label="Небо 3" name="sky3_track"/> + <button label="Небо 2" name="sky2_track"/> + <button label="Уровень земли" name="sky1_track"/> + <button label="Вода" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="Клонировать режим редактирования из" name="copy_track"/> + <button label="Загрузить режим редактирования из" name="load_track"/> + <button label="Очистить режим редактирования" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Шаг назад"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Шаг вперед"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="Добавить [FRAME]" name="add_frame"/> + <button label="Загрузить [FRAME]" name="btn_load_frame"/> + <button label="Удалить [FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Выбрать ключевой фрейм на временной шкале выше для изменения настроек. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Вода" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Атмосфера и освещение" name="atmosphere_panel"/> + <panel label="Облака" name="clouds_panel"/> + <panel label="Солнце и луна" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Сохранить" name="save_btn"/> + <button label="Отмена" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml new file mode 100644 index 0000000000..b5f1a1ced2 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Фиксированная среда"> + <string name="edit_sky"> + Редактировать настройки неба: + </string> + <string name="edit_water"> + Редактировать настройки воды: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Загрузить" name="btn_load" tool_tip="Загрузить настройки из инвентарного списка"/> + <button label="Импортировать" name="btn_import" tool_tip="Импортировать устаревшие настройки с диска."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Сохранить" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="Отмена" name="btn_cancel" tool_tip="Вернуться к последней сохраненной версии"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml index 174ad6b1ce..bf90d898f9 100644 --- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Звуки" name="check_sound"/> <check_box label="Текстуры" name="check_texture"/> <check_box label="Снимки" name="check_snapshot"/> + <check_box label="Настройки" name="check_settings"/> <button label="Все" label_selected="Все" name="All"/> <button label="Нет" label_selected="Нет" name="None"/> <check_box label="Всегда показывать папки" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/ru/floater_my_environments.xml b/indra/newview/skins/default/xui/ru/floater_my_environments.xml new file mode 100644 index 0000000000..ba31600df7 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Места" name="my_environments" title="МОЯ ОКРУЖАЮЩАЯ СРЕДА"> + <layout_stack> + <layout_panel label="Фильтры" name="filter_panel"> + <check_box label="Дни" name="chk_days"/> + <check_box label="Небеса" name="chk_skies"/> + <check_box label="Вода" name="chk_water"/> + <filter_editor label="Фильтр окружающей среды" name="flt_search"/> + </layout_panel> + <layout_panel label="Окружающая среда" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Показать все папки" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Дополнительные параметры"/> + <menu_button name="btn_newsettings" tool_tip="Создать новую настройку"/> + <button name="btn_del" tool_tip="Удалить выбранную вещь"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_perms_default.xml b/indra/newview/skins/default/xui/ru/floater_perms_default.xml index a33c6b40b6..2a239c07c4 100644 --- a/indra/newview/skins/default/xui/ru/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/ru/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Задайте стандартные разрешения для создания одежды или частей тела"> Носимые вещи </text> + <text name="label_13" tool_tip="Задать стандартные разрешения, когда будут созданы настройки среды"> + Настройки + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="OK" label_selected="OK" name="ok"/> <button label="Отмена" label_selected="Отмена" name="cancel"/> diff --git a/indra/newview/skins/default/xui/ru/floater_pick_track.xml b/indra/newview/skins/default/xui/ru/floater_pick_track.xml new file mode 100644 index 0000000000..7588e1759c --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="ВЫБРАТЬ: РЕЖИМ РЕДАКТИРОВАНИЯ"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Выбрать источник неба: + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Небо4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Небо3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Небо2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Земля" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Отмена" label_selected="Отмена" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml index fc6b6a173e..84e1ff15a0 100644 --- a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Прозрачность воды" name="TransparentWater"/> <check_box initial_value="true" label="Рельефность и сияние" name="BumpShiny"/> <check_box initial_value="true" label="Локальный свет" name="LocalLights"/> - <check_box initial_value="true" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение этого параметра может предотвратить зависание некоторых видеокарт"/> <slider label="Ландшафт:" name="TerrainDetail"/> <text name="TerrainDetailText"> Низкая diff --git a/indra/newview/skins/default/xui/ru/floater_settings_picker.xml b/indra/newview/skins/default/xui/ru/floater_settings_picker.xml new file mode 100644 index 0000000000..84f0e303fc --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="ВЫБРАТЬ: НАСТРОЙКИ"> + <floater.string name="pick title"> + Выбрать: + </floater.string> + <floater.string name="pick_track"> + ВЫБРАТЬ РЕЖИМ РЕДАКТИРОВАНИЯ + </floater.string> + <floater.string name="pick_settings"> + ВЫБРАТЬ НАСТРОЙКИ + </floater.string> + <floater.string name="track_water"> + Вода + </floater.string> + <floater.string name="track_ground"> + Земля + </floater.string> + <floater.string name="track_sky"> + Небо[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Фильтровать текстуры" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="OK" label_selected="OK" name="btn_select"/> + <button label="Отмена" label_selected="Отмена" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml index c9e117362f..c56657b86b 100644 --- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Инвентарь" name="inventory" value="0"/> <radio_item label="Локально" name="local" value="1"/> + <radio_item label="Зафиксировать" name="bake" value="2"/> </radio_group> <text name="unknown"> Размер: [DIMENSIONS] @@ -19,7 +20,6 @@ <button label="По умолчанию" label_selected="По умолчанию" name="Default"/> <button label="Очистить" label_selected="Очистить" name="Blank"/> <button label="Нет" label_selected="Нет" name="None"/> - <check_box initial_value="true" label="Применить сейчас" name="apply_immediate_check"/> <text name="preview_disabled" value="Просмотр отключен"/> <filter_editor label="Фильтровать текстуры" name="inventory search editor"/> <check_box initial_value="false" label="Показывать папки" name="show_folders_check"/> @@ -30,6 +30,22 @@ <column label="Имя" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Выбрать фиксированную текстуру"> + <combo_box.item label="Никакой" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Скрыть регион базовой сетки" name="hide_base_mesh_region"/> <button label="ОК" label_selected="ОК" name="Select"/> <button label="Отмена" label_selected="Отмена" name="Cancel"/> + <check_box initial_value="true" label="Применить сейчас" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml index 3404ae29a3..05cccebafc 100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Активировать" name="Marketplace Activate"/> <menu_item_call label="Деактивировать" name="Marketplace Deactivate"/> <menu_item_call label="Поделиться" name="Share"/> - <menu_item_call label="Купить" name="Task Buy"/> <menu_item_call label="Открыть" name="Task Open"/> <menu_item_call label="Воспроизвести" name="Task Play"/> <menu_item_call label="Свойства" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Новые трусы" name="New Underpants"/> <menu_item_call label="Новая альфа-маска" name="New Alpha Mask"/> <menu_item_call label="Новое тату" name="New Tattoo"/> + <menu_item_call label="Новые универсальные" name="New Universal"/> <menu_item_call label="Новая физика" name="New Physics"/> </menu> <menu label="Новые части тела" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Новые волосы" name="New Hair"/> <menu_item_call label="Новые глаза" name="New Eyes"/> </menu> + <menu label="Новые настройки" name="New Settings"> + <menu_item_call label="Новое небо" name="New Sky"/> + <menu_item_call label="Новая вода" name="New Water"/> + <menu_item_call label="Новый суточный цикл" name="New Day Cycle"/> + </menu> <menu label="Использовать по умолчанию для" name="upload_def"> <menu_item_call label="Переданные изображения" name="Image uploads"/> <menu_item_call label="Переданные звуки" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Изменить" name="Wearable Edit"/> <menu_item_call label="Добавить" name="Wearable Add"/> <menu_item_call label="Снять" name="Take Off"/> + <menu_item_call label="Применить только к себе" name="Settings Apply Local"/> + <menu_item_call label="Применить к участку" name="Settings Apply Parcel"/> <menu_item_call label="Копировать в списки товаров торгового центра" name="Marketplace Copy"/> <menu_item_call label="Переместить в списки товаров торгового центра" name="Marketplace Move"/> <menu_item_call label="- нет действий -" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml index 9a240c653e..94ec61af90 100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Звук (L$[COST])..." name="Upload Sound"/> <menu_item_call label="Анимация (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Модель..." name="Upload Model"/> - <menu_item_call label="Мастер моделирования..." name="Upload Model Wizard"/> <menu_item_call label="Все сразу (L$[COST] за файл)..." name="Bulk Upload"/> - <menu_item_call label="Установить разрешения на передачу по умолчанию" name="perm prefs"/> </menu> <menu_item_call label="Новая папка" name="New Folder"/> <menu_item_call label="Новый скрипт" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Новые трусы" name="New Underpants"/> <menu_item_call label="Новая альфа-маска" name="New Alpha"/> <menu_item_call label="Новое тату" name="New Tattoo"/> + <menu_item_call label="Новые универсальные" name="New Universal"/> <menu_item_call label="Новая физика" name="New Physics"/> </menu> <menu label="Новые части тела" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Новые волосы" name="New Hair"/> <menu_item_call label="Новые глаза" name="New Eyes"/> </menu> + <menu label="Новые настройки" name="New Settings"> + <menu_item_call label="Новое небо" name="New Sky"/> + <menu_item_call label="Новая вода" name="New Water"/> + <menu_item_call label="Новый суточный цикл" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml index 24d780ba1c..1d883220e8 100644 --- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Новая альфа-маска" name="New Alpha"/> <menu_item_call label="Новая физика" name="New Physics"/> <menu_item_call label="Новое тату" name="New Tattoo"/> + <menu_item_call label="Новые универсальные" name="New Universal"/> </menu> <menu label="Новые части тела" name="New Body Parts"> <menu_item_call label="Новая фигура" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/ru/menu_save_settings.xml b/indra/newview/skins/default/xui/ru/menu_save_settings.xml new file mode 100644 index 0000000000..9a9c796cf6 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Сохранить" name="save_settings"/> + <menu_item_check label="Сохранить как" name="save_as_new_settings"/> + <menu_item_check label="Подтвердить" name="commit_changes"/> + <menu_item_check label="Применить только к себе" name="apply_local"/> + <menu_item_check label="Применить к участку" name="apply_parcel"/> + <menu_item_check label="Применить к региону" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_settings_add.xml b/indra/newview/skins/default/xui/ru/menu_settings_add.xml new file mode 100644 index 0000000000..a3ef976424 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Новое небо" name="New Sky"/> + <menu_item_call label="Новая вода" name="New Water"/> + <menu_item_call label="Новый суточный цикл" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_settings_gear.xml b/indra/newview/skins/default/xui/ru/menu_settings_gear.xml new file mode 100644 index 0000000000..9d17424b85 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Редактировать" name="edit_settings"/> + <menu_item_call label="Применить только к себе" name="Settings Apply Local"/> + <menu_item_call label="Применить к участку" name="Settings Apply Parcel"/> + <menu_item_call label="Применить к региону" name="Settings Apply Region"/> + <menu_item_call label="Копировать" name="copy_settings"/> + <menu_item_call label="Вставить" name="paste_settings"/> + <menu_item_call label="Копировать UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 876972ba24..8361464f4c 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -77,30 +77,15 @@ <menu_item_check label="Свойства участка" name="Parcel Properties"/> <menu_item_check label="Меню «Дополнительно»" name="Show Advanced Menu"/> </menu> - <menu label="Солнце" name="Sun"> + <menu label="Окружающая среда" name="Environment"> <menu_item_check label="Восход" name="Sunrise"/> <menu_item_check label="Полдень" name="Noon"/> <menu_item_check label="Закат" name="Sunset"/> <menu_item_check label="Полночь" name="Midnight"/> - <menu_item_check label="Использовать настройки региона" name="Use Region Settings"/> - </menu> - <menu label="Редактор среды" name="Environment Editor"> - <menu_item_call label="Настройки среды..." name="Environment Settings"/> - <menu label="Настройки воды" name="Water Presets"> - <menu_item_call label="Новая настройка..." name="new_water_preset"/> - <menu_item_call label="Изменить настройку..." name="edit_water_preset"/> - <menu_item_call label="Удалить настройку..." name="delete_water_preset"/> - </menu> - <menu label="Настройки неба" name="Sky Presets"> - <menu_item_call label="Новая настройка..." name="new_sky_preset"/> - <menu_item_call label="Изменить настройку..." name="edit_sky_preset"/> - <menu_item_call label="Удалить настройку..." name="delete_sky_preset"/> - </menu> - <menu label="Суточные настройки" name="Day Presets"> - <menu_item_call label="Новая настройка..." name="new_day_preset"/> - <menu_item_call label="Изменить настройку..." name="edit_day_preset"/> - <menu_item_call label="Удалить настройку..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Использование окружающей среды" name="Use Shared Environment"/> + <menu_item_call label="Моя среда…" name="my_environs"/> + <menu_item_call label="Личное освещение..." name="adjustment_tool"/> + <menu_item_check label="Приостановить движение облаков" name="pause_clouds"/> </menu> </menu> <menu label="Строительство" name="BuildTools"> @@ -343,6 +328,9 @@ <menu_item_check label="Автоматические альфа-маски (не отложенные)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Текстуры анимаций" name="Animation Textures"/> <menu_item_check label="Отключить текстуры" name="Disable Textures"/> + <menu_item_check label="Отключить окружающую среду" name="Disable Ambient"/> + <menu_item_check label="Отключить солнечный свет" name="Disable Sunlight"/> + <menu_item_check label="Отключить локальный свет" name="Disable Local Lights"/> <menu_item_check label="Текстуры в полном разрешении" name="Rull Res Textures"/> <menu_item_check label="Визуализация присоединенных источников света" name="Render Attached Lights"/> <menu_item_check label="Визуализация присоединенных частиц" name="Render Attached Particles"/> @@ -480,6 +468,7 @@ <menu_item_call label="Юбка" name="Skirt"/> <menu_item_call label="Альфа" name="Alpha"/> <menu_item_call label="Тату" name="Tattoo"/> + <menu_item_call label="Универсальные" name="Universal"/> <menu_item_call label="Физика" name="Physics"/> <menu_item_call label="Вся одежда" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 43e8c37fc6..25d8c49431 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -1959,6 +1959,11 @@ При снятии этой опции вы можете удалить ограничения, которые владельцы участка добавили для предотвращения провокационных сообщений, сохранения конфиденциальности и защиты несовершеннолетных жителей от материала для взрослых. При необходимости обсудите со своими владельцами участков. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + При снятии этой опции вы можете удалить пользовательскую среду, которую владельцы участка добавили для своих участков. При необходимости обсудите со своими владельцами участков. +Вы хотите продолжить? + <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> + </notification> <notification name="RegionEntryAccessBlocked"> Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам. Попробуйте изменить настройки в меню «Я > Настройки > Общие». <usetemplate name="okbutton" yestext="OK"/> @@ -2438,7 +2443,15 @@ Этот файл суточного цикла ссылается на отсутствующий файл неба: [SKY]. </notification> <notification name="WLRegionApplyFail"> - Не удалось применить настройки к региону. Попробуйте покинуть регион, а затем вернуться в него. Причина неполадки: [FAIL_REASON] + К сожалению настройки не применимы к этому региону. Причина: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Местная текстура используется в режиме редактирования [TRACK], № фрейма [FRAMENO] ([FRAMENO]%) на поле [FIELD]. +Настройки невозможно сохранить с использованием местных текстур. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Местная текстура используется на поле [FIELD]. +Настройки невозможно сохранить с использованием местных текстур. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Невозможно удалить последний ключ в этом суточном цикле: пустой суточный цикл не разрешен. Следует изменить последний оставшийся ключ, а не удалять его и создавать новый. @@ -4392,4 +4405,76 @@ [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FailedToFindSettings"> + Не удалось загрузить настройки для [NAME] из базы данных. + </notification> + <notification name="FailedToLoadSettingsApply"> + Невозможно применить эти настройки для этой среды. + </notification> + <notification name="FailedToBuildSettingsDay"> + Невозможно применить эти настройки для этой среды. + </notification> + <notification name="NoEnvironmentSettings"> + Этот регион не поддерживает настройки окружающей среды. + </notification> + <notification label="Сохранить костюм" name="SaveSettingAs"> + Сохранить текущие настройки как: + <form name="form"> + <input name="message"> + [DESC] (новый) + </input> + <button name="OK" text="OK"/> + <button name="Cancel" text="Отмена"/> + </form> + </notification> + <notification name="WLImportFail"> + Невозможно импортировать устаревшие установки [NAME] для эффекта Windlight из +[FILE]. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Невозможно установить настройки среды для этого участка. +Ввести или выбрать участок, который вы можете модифицировать. + </notification> + <notification name="SettingsUnsuported"> + Настройки окружающей среды не поддерживаются в этом регионе. +Перейдите в регион с поддерживаемыми настройками и повторите действие. + </notification> + <notification name="SettingsConfirmLoss"> + Вы потеряете изменения, внесенные в этот [TYPE] под именем "[NAME]". +Вы уверены, что хотите продолжить? + <usetemplate ignoretext="Вы уверены, что хотите сделать настройки непереносимыми?" name="okcancelignore" notext="Нет" yestext="Да"/> + </notification> + <notification name="SettingsConfirmReset"> + Вы собираетесь удалить все примененные настройки. +Вы уверены, что хотите продолжить? + <usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Вы собираетесь удалить все примененные настройки для личного освещения. +Вы уверены, что хотите продолжить? + <usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Вы собираетесь импортировать непереносимые настройки в этот суточный цикл. В случае дальнейшего изменения в этих параметрах они также станут непереносимыми. + +Это изменение не подлежит отмене. + +Вы уверены, что хотите продолжить? + <usetemplate ignoretext="Вы уверены, что хотите сделать настройки непереносимыми?" name="okcancelignore" notext="Нет" yestext="Да"/> + </notification> + <notification name="NoEditFromLibrary"> + Вы не можете редактировать настройки непосредственно из библиотеки. +Скопировать в свой собственный инвентарь и повторить попытку. + </notification> + <notification name="EnvironmentApplyFailed"> + Мы столкнулись с проблемой с этими настройками. Их невозможно сохранить или применить в данный момент. + </notification> + <notification name="TrackLoadFailed"> + Невозможно загрузить режим редактирования в [TRACK]. + </notification> + <notification name="TrackLoadMismatch"> + Невозможно загрузить режим редактирования из [TRACK1] в [TRACK2]. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml index 874d5f8bc4..ed5312b723 100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Тату на голове" name="Head Tattoo" tool_tip="Щелкните картинку, чтобы выбрать ее"/> - <texture_picker label="Тату вверху" name="Upper Tattoo" tool_tip="Щелкните картинку, чтобы выбрать ее"/> - <texture_picker label="Тату внизу" name="Lower Tattoo" tool_tip="Щелкните картинку, чтобы выбрать ее"/> - <color_swatch label="Цвет/оттенок" name="Color/Tint" tool_tip="Щелкните для выбора цвета"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Тату на голове" name="Head Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на верхних частях тела" name="Upper Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на нижних частях тела" name="Lower Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <color_swatch label="Цвет/оттенок" name="Color/Tint" tool_tip="Щелкнуть для появления палитры цветов"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_edit_universal.xml b/indra/newview/skins/default/xui/ru/panel_edit_universal.xml new file mode 100644 index 0000000000..647d1aa9e7 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Тату на голове" name="Head Universal Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на верхних частях тела" name="Upper Universal Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на нижних частях тела" name="Lower Universal Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на юбке" name="Skirt Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату волос" name="Hair Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату глаз" name="Eyes Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на левой руке" name="Left Arm Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату на левой ноге" name="Left Leg Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату Aux1" name="Aux1 Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату Aux2" name="Aux2 Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <texture_picker label="Тату Aux3" name="Aux3 Tattoo" tool_tip="Щелкнуть для выбора изображения"/> + <color_swatch label="Цвет/оттенок" name="Color/Tint" tool_tip="Щелкнуть для появления палитры цветов"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml index 79130a9c80..cede43f859 100644 --- a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Изменение тату </string> + <string name="edit_universal_title"> + Редактирование универсальных + </string> <string name="edit_physics_title"> Изменение физики </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Тату: </string> + <string name="universal_desc_text"> + Универсальные: + </string> <string name="physics_desc_text"> Физика: </string> diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml index 8057176cfb..fcf1548ae5 100644 --- a/indra/newview/skins/default/xui/ru/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Среда" name="panel_env_info"> - <text name="water_settings_title"> - Настройки воды и неба/суточного цикла определяют, каким посетители увидят ваш регион. Дополнительная информация - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Использовать настройки Second Life по умолчанию" name="use_sl_default_settings"/> - <radio_item label="Использовать следующие настройки" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Настройка воды - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Выбор настройки-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Небо/суточный цикл - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Зафиксированное небо" name="my_sky_settings"/> - <radio_item label="Суточный цикл" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Выбор настройки-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Выбор настройки-" name="item0"/> - </combo_box> - </panel> - <button label="Применить" name="apply_btn"/> - <button label="Отмена" name="cancel_btn"/> + <string name="str_label_use_default"> + Использовать настройки по умолчанию + </string> + <string name="str_label_use_region"> + Использовать настройки региона + </string> + <string name="str_altitude_desription"> + Небо [INDEX]([ALTITUDE]м) + </string> + <string name="str_no_parcel"> + Не выбрано ни одного участка. Настройки среды отключены. + </string> + <string name="str_cross_region"> + Настройки окружающей среды недоступны в рамках этого региона. + </string> + <string name="str_legacy"> + Настройки среды недоступны для этого региона. + </string> + <string name="str_disallowed"> + Управляющий недвижимостью не разрешает менять среду вокруг участка в этом регионе. + </string> + <string name="str_too_small"> + Чтобы поддерживать настройки окружающей среды участок должен быть не менее 128 кв. метров. + </string> + <string name="str_empty"> + (пусто) + </string> + <string name="str_region_env"> + (среда региона) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Использовать инвентарь" name="btn_select_inventory"/> + <button label="Настроить" name="btn_edit"/> + <check_box label="Владельцы участков могут менять окружающую среду" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Небо [INDEX] + [ALTITUDE]м + </text> + <line_editor name="edt_invname_alt1"> + Неизвестно + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Перетащить настройки из инвентаря на это целевое поле, чтобы выбрать его в качестве неба на настоящий момент."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Небо [INDEX] + [ALTITUDE]м + </text> + <line_editor name="edt_invname_alt2"> + Неизвестно + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Перетащить настройки из инвентаря на это целевое поле, чтобы выбрать его в качестве неба на настоящий момент."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Небо [INDEX] + [ALTITUDE]м + </text> + <line_editor name="edt_invname_alt3"> + Неизвестно + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Перетащить настройки из инвентаря на это целевое поле, чтобы выбрать его в качестве неба на настоящий момент."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Земля + </text> + <line_editor name="edt_invname_ground"> + Неизвестно + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Перетащить настройки из инвентаря на это целевое поле для выбора его в качестве неба на уровне земли."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Вода + </text> + <line_editor name="edt_invname_water"> + Неизвестно + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Перетащить настройки из инвентаря на это целевое поле для выбора его в качестве воды на настоящий момент."/> + </panel> + <button label="Сброс" name="btn_rst_altitudes" tool_tip="Сбросить настройки по умолчанию"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/ru/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..9c4c502694 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Атмосфера и освещение" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/ru/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/ru/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..46b4b10125 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Облака" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/ru/panel_settings_sky_density.xml new file mode 100644 index 0000000000..8886ceb539 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Плотность" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Экспоненциальный член Рэлея:" name="rayleigh_exponential"/> + <slider label="Экспоненциальная шкала Рэлея:" name="rayleigh_exponential_scale"/> + <slider label="Линейный член Рэлея:" name="rayleigh_linear"/> + <slider label="Постоянный член Рэлея:" name="rayleigh_constant"/> + <slider label="Максимальная высота Рэлея:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Экспоненциальный член Мие:" name="mie_exponential"/> + <slider label="Экспоненциальная шкала Мие:" name="mie_exponential_scale"/> + <slider label="Линейный член Мие:" name="mie_linear"/> + <slider label="Постоянный член Мие:" name="mie_constant"/> + <slider label="Анизо-фактор Мие:" name="mie_aniso_factor"/> + <slider label="Максимальная высота Мие:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Экспоненциальный член абсорбции:" name="absorption_exponential"/> + <slider label="Экспоненциальная шкала абсорбции:" name="absorption_exponential_scale"/> + <slider label="Линейный член абсорбции:" name="absorption_linear"/> + <slider label="Постоянный член абсорбции:" name="absorption_constant"/> + <slider label="Максимальная высота абсорбции:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ru/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..a494bbbe0e --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Солнце и луна" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Показать метку" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Показать метку" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_settings_water.xml b/indra/newview/skins/default/xui/ru/panel_settings_water.xml new file mode 100644 index 0000000000..de8b15ac19 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Вода" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Угловая зависимость: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml index 707578cd07..5cd83c712f 100644 --- a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Текстура" name="Texture"> - <panel.string name="string repeats per meter"> - Повторений на метр - </panel.string> - <panel.string name="string repeats per face"> - Повторений на грань - </panel.string> <text name="color label"> Цвет </text> @@ -114,4 +108,5 @@ <spinner label="Смещение по горизонтали" name="shinyOffsetU"/> <spinner label="Смещение по вертикали" name="shinyOffsetV"/> <check_box initial_value="false" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/> + <button label="Выровнять" label_selected="Выровнять текущие слои текстуры" name="button align textures" tool_tip="Выровнять текущие слои текстуры"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml index 1d526b90e4..314f6b9cb5 100644 --- a/indra/newview/skins/default/xui/ru/role_actions.xml +++ b/indra/newview/skins/default/xui/ru/role_actions.xml @@ -33,6 +33,7 @@ <action description="Изменение настроек музыки и медиа" longdescription="Измените настройки потоковой музыки и фильмов в окне «О земле» на вкладке «Медиа»." name="land change media" value="20"/> <action description="Включение-отключение изменения ландшафта" longdescription="Включение-отключение изменения ландшафта. *ПРЕДУПРЕЖДЕНИЕ* Выбрав параметры «О земле» > вкладка «Параметры» > «Изменить ландшафт», любой пользователь может изменить форму земли, а также размещать или перемещать растения Linden. Прежде чем назначить эту способность, убедитесь в целесообразности этого. Изменить ландшафт можно в окне «О земле» на вкладке «Параметры»." name="land edit" value="21"/> <action description="Включение-отключение различных настроек «О земле > Параметры»" longdescription="В окне «О земле» на вкладке «Параметры» можно включить-отключить параметр «Безопасно (нет повреждений)», «Полет» и разрешить другим жителям изменять ландшафт, строительство, создавать закладки и запускать скрипты для земли группы." name="land options" value="22"/> + <action description="Изменить установки окружающей среды и суточного цикла." longdescription="Изменить установки окружающей среды и суточного цикла от «О земле» > Вкладка окружающей среды." name="land change environment" value="46"/> </action_set> <action_set description="К этим способностям относится разрешение участникам обходить ограничения на участках группы." name="Parcel Powers"> <action description="Всегда разрешено изменение ландшафта" longdescription="Участники роли с этой способностью могут изменять ландшафт участка группы, даже если это отключено в окне «О земле» на вкладке «Параметры»." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index df3afcc4cf..02560af605 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -657,6 +657,15 @@ support@secondlife.com. <string name="BUTTON_HELP"> Показать справку </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Элементы этого типа не могут быть занесены в +карточку для комментариев в этом регионе. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Только элементы с безусловным разрешением +‘следующего владельца’ можно внести +в карточки для комментариев. + </string> <string name="Searching"> Поиск... </string> @@ -733,6 +742,18 @@ support@secondlife.com. Ошибка при запросе на передачу. Для получения помощи в решении этой проблемы пройдите по ссылке http://secondlife.com/support. </string> + <string name="SettingValidationError"> + Не удалось выполнить проверку для импорта настроек [NAME] + </string> + <string name="SettingImportFileError"> + Не удалось открыть файл [FILE] + </string> + <string name="SettingParseFileError"> + Не удалось открыть файл [FILE] + </string> + <string name="SettingTranslateError"> + Не удалось применить устаревший эффект windlight \[NAME] + </string> <string name="texture"> текстуру </string> @@ -808,6 +829,9 @@ support@secondlife.com. <string name="symbolic folder link"> ссылку на папку </string> + <string name="settings blob"> + настройки + </string> <string name="mesh"> сетка </string> @@ -1138,6 +1162,9 @@ support@secondlife.com. <string name="ForceSitAvatar"> Заставьте аватар сесть </string> + <string name="ChangeEnvSettings"> + Изменить свои настройки окружающей среды + </string> <string name="NotConnected"> Нет подключения </string> @@ -1289,6 +1316,9 @@ support@secondlife.com. <string name="tattoo"> Тату </string> + <string name="universal"> + Универсальные + </string> <string name="physics"> Физические данные </string> @@ -1331,6 +1361,9 @@ support@secondlife.com. <string name="tattoo_not_worn"> Тату не надето </string> + <string name="universal_not_worn"> + Универсальный наряд не надет + </string> <string name="physics_not_worn"> Физика не учитывается </string> @@ -1382,6 +1415,9 @@ support@secondlife.com. <string name="create_new_tattoo"> Создать тату </string> + <string name="create_new_universal"> + Создать новые универсальные + </string> <string name="create_new_physics"> Создать физику </string> @@ -2529,6 +2565,27 @@ support@secondlife.com. <string name="RegionSettings"> Региональные настройки </string> + <string name="NoEnvironmentSettings"> + Этот регион не поддерживает настройки окружающей среды. + </string> + <string name="EnvironmentSun"> + Солнце + </string> + <string name="EnvironmentMoon"> + Луна + </string> + <string name="EnvironmentBloom"> + Ореол + </string> + <string name="EnvironmentCloudNoise"> + Шум облака + </string> + <string name="EnvironmentNormalMap"> + Карта Нормалей + </string> + <string name="EnvironmentTransparent"> + Прозрачный + </string> <string name="ClassifiedClicksTxt"> Щелчки: телепорт [TELEPORT], карта [MAP], профиль [PROFILE] </string> @@ -4757,6 +4814,9 @@ support@secondlife.com. <string name="New Tattoo"> Новое тату </string> + <string name="New Universal"> + Новые универсальные + </string> <string name="New Physics"> Новая физика </string> @@ -4883,6 +4943,15 @@ support@secondlife.com. <string name="Female - Wow"> Женщина – ух ты! </string> + <string name="New Daycycle"> + Новый суточный цикл + </string> + <string name="New Water"> + Новая вода + </string> + <string name="New Sky"> + Новое небо + </string> <string name="/bow"> /поклониться </string> @@ -5423,6 +5492,12 @@ support@secondlife.com. <string name="BeaconMedia"> Просмотр медийных меток (белые) </string> + <string name="BeaconSun"> + Просмотр метки направления солнца (оранжевый) + </string> + <string name="BeaconMoon"> + Просмотр метки направления луны (багровый) + </string> <string name="ParticleHiding"> Частицы скрыты </string> @@ -5450,6 +5525,12 @@ support@secondlife.com. <string name="Command_Destinations_Label"> Пункты </string> + <string name="Command_Environments_Label"> + Моя окружающая среда + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5543,6 +5624,12 @@ support@secondlife.com. <string name="Command_Destinations_Tooltip"> Интересные места </string> + <string name="Command_Environments_Tooltip"> + Моя окружающая среда + </string> + <string name="Command_Facebook_Tooltip"> + Опубликовать в Facebook + </string> <string name="Command_Flickr_Tooltip"> Загрузить на Flickr </string> @@ -5738,6 +5825,12 @@ support@secondlife.com. <string name="ExperiencePermission12"> автоматически принимать разрешения для приключения </string> + <string name="ExperiencePermission16"> + посадить аватара + </string> + <string name="ExperiencePermission17"> + изменить свои настройки окружающей среды + </string> <string name="ExperiencePermissionShortUnknown"> выполнил неизвестную операцию: [Permission] </string> @@ -5762,6 +5855,12 @@ support@secondlife.com. <string name="ExperiencePermissionShort12"> Разрешение </string> + <string name="ExperiencePermissionShort16"> + Сесть + </string> + <string name="ExperiencePermissionShort17"> + Окружающая среда + </string> <string name="logging_calls_disabled_log_empty"> Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки > Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи». </string> diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml index 1101e5055a..f9dbda0378 100644 --- a/indra/newview/skins/default/xui/tr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml @@ -474,5 +474,6 @@ Sadece büyük parseller aramada görünür. </panel> </panel> <panel label="DENEYİMLER" name="land_experiences_panel"/> + <panel label="ORTAM" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_adjust_environment.xml b/indra/newview/skins/default/xui/tr/floater_adjust_environment.xml new file mode 100644 index 0000000000..763845c54d --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="Kişisel Aydınlatma"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="Sıfırla" name="btn_reset" tool_tip="Kapat ve Ortak Ortama sıfırla"/> + <text name="cloud_map_label"> + Bulut Görüntüsü: + </text> + </layout_panel> + <layout_panel> + <text name="label"> + Güneş: + </text> + <check_box label="İşareti Göster" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="İşareti Göster" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml index 08ebf36be5..e5b598ee61 100644 --- a/indra/newview/skins/default/xui/tr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/tr/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="Ses kaynakları" name="sounds"/> <check_box label="Parçacık kaynakları" name="particles"/> <check_box label="Ortam kaynakları" name="moapbeacon"/> + <check_box label="Güneş" name="sun"/> + <check_box label="Ay" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml index a7708b5882..4eee1b81a2 100644 --- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml @@ -21,6 +21,7 @@ <icon name="icon_script" tool_tip="Komut Dosyaları"/> <icon name="icon_sound" tool_tip="Sesler"/> <icon name="icon_texture" tool_tip="Dokular"/> + <icon name="icon_setting" tool_tip="Ortam ayarları"/> <button label="√ Tümü" name="check_all"/> <button label="Temizle" label_selected="Hiçbiri" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml deleted file mode 100644 index 7634bea642..0000000000 --- a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="ORTAM ÖN AYARINI SİL"> - <string name="title_water"> - Su Ön Ayarını Sil - </string> - <string name="title_sky"> - Gökyüzü Ön Ayarını Sil - </string> - <string name="title_day_cycle"> - Gün Döngüsünü Sil - </string> - <string name="label_water"> - Ön Ayar: - </string> - <string name="label_sky"> - Ön Ayar: - </string> - <string name="label_day_cycle"> - Gün döngüsü: - </string> - <string name="msg_confirm_deletion"> - Seçili ön ayarı silmek istediğinizden emin misiniz? - </string> - <string name="msg_sky_is_referenced"> - Bazı gün döngüleri tarafından referans alınan bir ön ayar kaldırılamaz. - </string> - <string name="combo_label"> - -Bir ön ayar seçin- - </string> - <text name="label"> - Ön Ayar: - </text> - <button label="Sil" name="delete"/> - <button label="İptal Et" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..7ebbafa9bc --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="Gün Döngüsünü Düzenle"> + <string name="title_new"> + Yeni bir Gün Döngüsü Oluştur + </string> + <string name="title_edit"> + Gün Döngüsünü Düzenle + </string> + <string name="hint_new"> + Gün döngünüze ad verin, bunu oluşturmak için denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın. + </string> + <string name="hint_edit"> + Gün döngünüzü düzenlemek için, alttaki denetimleri ayarlayın ve "Kaydet" düğmesine tıklayın. + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + Gökyüzü [ALT] + </string> + <string name="sky_label"> + Gökyüzü + </string> + <string name="water_label"> + Su + </string> + <string name="commit_parcel"> + Parsele Uygula + </string> + <string name="commit_region"> + Bölgeye Uygula + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + Gün Döngüsü Adı: + </text> + <button label="İçeri Aktar" name="btn_import" tool_tip="Eski ayarları diskten içeri aktarın."/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="Gökyüzü 4" name="sky4_track"/> + <button label="Gökyüzü 3" name="sky3_track"/> + <button label="Gökyüzü 2" name="sky2_track"/> + <button label="Zemin Seviyesi" name="sky1_track"/> + <button label="Su" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="%0 [DSC]"/> + <text name="p1" value="%25 [DSC]"/> + <text name="p2" value="%50 [DSC]"/> + <text name="p3" value="%75 [DSC]"/> + <text name="p4" value="%100 [DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="%[PRCNT] [DSC]"/> + <layout_stack> + <layout_panel> + <button label="Buradan Rota Kopyala:" name="copy_track"/> + <button label="Buradan Rota Yükle:" name="load_track"/> + <button label="Rotayı Temizle" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Geri çekil"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="İleri çık"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="[FRAME] Ekle" name="add_frame"/> + <button label="[FRAME] Yükle" name="btn_load_frame"/> + <button label="[FRAME] Sil" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + Ayarları düzenlemek için yukarıdaki zaman çizelgesinden bir anahtar çerçeve seçin. + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="Su" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="Atmosfer ve Aydınlatma" name="atmosphere_panel"/> + <panel label="Bulutlar" name="clouds_panel"/> + <panel label="Güneş ve Ay" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="Kaydet" name="save_btn"/> + <button label="İptal Et" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/tr/floater_fixedenvironment.xml new file mode 100644 index 0000000000..8a8757c86c --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="Sabit Ortam"> + <string name="edit_sky"> + Gökyüzünü Düzenle: + </string> + <string name="edit_water"> + Suyu Düzenle: + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="Yükle" name="btn_load" tool_tip="Envanterden bir ayar yükle"/> + <button label="İçeri Aktar" name="btn_import" tool_tip="Eski ayarları diskten içeri aktarın."/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="Kaydet" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="İptal Et" name="btn_cancel" tool_tip="Son kaydedilen sürüme dön"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml index 9657b6c3e0..caa8497d3a 100644 --- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="Sesler" name="check_sound"/> <check_box label="Dokular" name="check_texture"/> <check_box label="Anlık Görüntüler" name="check_snapshot"/> + <check_box label="Ayarlar" name="check_settings"/> <button label="Tümü" label_selected="Tümü" name="All"/> <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> <check_box label="Klasörleri her zaman göster" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/tr/floater_my_environments.xml b/indra/newview/skins/default/xui/tr/floater_my_environments.xml new file mode 100644 index 0000000000..b91f48c500 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Yerler" name="my_environments" title="ORTAMLARIM"> + <layout_stack> + <layout_panel label="Filtreler" name="filter_panel"> + <check_box label="Günler" name="chk_days"/> + <check_box label="Gökler" name="chk_skies"/> + <check_box label="Su" name="chk_water"/> + <filter_editor label="Ortamları Filtrele" name="flt_search"/> + </layout_panel> + <layout_panel label="Ortamlar" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="Tüm Klasörleri Göster" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="Diğer seçenekler"/> + <menu_button name="btn_newsettings" tool_tip="Yeni ayar oluştur"/> + <button name="btn_del" tool_tip="Seçilen öğeyi kaldır"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_perms_default.xml b/indra/newview/skins/default/xui/tr/floater_perms_default.xml index 9691b678f2..9263d4e1c6 100644 --- a/indra/newview/skins/default/xui/tr/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/tr/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="Giysi ya da Vücut Parçaları oluşturulduğunda varsayılan izinleri ayarla"> Giyilebilir öğeler </text> + <text name="label_13" tool_tip="Ortam ayarları oluşturulduğunda varsayılan izinleri ayarla"> + Ayarlar + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="Tamam" label_selected="Tamam" name="ok"/> <button label="İptal" label_selected="İptal" name="cancel"/> diff --git a/indra/newview/skins/default/xui/tr/floater_pick_track.xml b/indra/newview/skins/default/xui/tr/floater_pick_track.xml new file mode 100644 index 0000000000..83cfa8b652 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="SEÇİM: ROTA"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + Kaynak gökyüzünü seç + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="Gökyüzü 4 [ALT]" name="radio_sky4" value="4"/> + <radio_item label="Gökyüzü 3 [ALT]" name="radio_sky3" value="3"/> + <radio_item label="Gökyüzü 2 [ALT]" name="radio_sky2" value="2"/> + <radio_item label="Zemin" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="Tamam" label_selected="Tamam" name="btn_select"/> + <button label="İptal Et" label_selected="İptal Et" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml index 01ada1354c..c5ca997336 100644 --- a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="Saydam Su" name="TransparentWater"/> <check_box initial_value="true" label="Tümsek eşleme ve parlaklık" name="BumpShiny"/> <check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/> - <check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/> <slider label="Yüzey Ayrıntısı:" name="TerrainDetail"/> <text name="TerrainDetailText"> Düşük diff --git a/indra/newview/skins/default/xui/tr/floater_settings_picker.xml b/indra/newview/skins/default/xui/tr/floater_settings_picker.xml new file mode 100644 index 0000000000..0ef3aad5ee --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="SEÇİM: AYARLAR"> + <floater.string name="pick title"> + Seçim: + </floater.string> + <floater.string name="pick_track"> + ROTA SEÇ + </floater.string> + <floater.string name="pick_settings"> + AYARLARI SEÇ + </floater.string> + <floater.string name="track_water"> + Su + </floater.string> + <floater.string name="track_ground"> + Zemin + </floater.string> + <floater.string name="track_sky"> + Gökyüzü [NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="Dokuları Filtrele" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="Tamam" label_selected="Tamam" name="btn_select"/> + <button label="İptal Et" label_selected="İptal Et" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml index 42483c09e1..1a16709127 100644 --- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="Envanter" name="inventory" value="0"/> <radio_item label="Yerel" name="local" value="1"/> + <radio_item label="Kurut" name="bake" value="2"/> </radio_group> <text name="unknown"> Büyüklük: [DIMENSIONS] @@ -19,7 +20,6 @@ <button label="Varsayılan" label_selected="Varsayılan" name="Default"/> <button label="Boş" label_selected="Boş" name="Blank"/> <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> - <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> <text name="preview_disabled" value="Önizleme Devre Dışı"/> <filter_editor label="Dokuları Filtrele" name="inventory search editor"/> <check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/> @@ -30,6 +30,22 @@ <column label="Ad" name="unit_name"/> <column label="Kimlik" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Kurutma dokusunu seçin"> + <combo_box.item label="Yok" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Temel Ağ Bölgesini Gizle" name="hide_base_mesh_region"/> <button label="Tamam" label_selected="Tamam" name="Select"/> <button label="İptal" label_selected="İptal" name="Cancel"/> + <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml index 1e8dfc7d68..d5e4113feb 100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="Etkinleştir" name="Marketplace Activate"/> <menu_item_call label="Devre Dışı Bırak" name="Marketplace Deactivate"/> <menu_item_call label="Paylaş" name="Share"/> - <menu_item_call label="Satın Al" name="Task Buy"/> <menu_item_call label="Aç" name="Task Open"/> <menu_item_call label="Oyna" name="Task Play"/> <menu_item_call label="Özellikler" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="Yeni Külot" name="New Underpants"/> <menu_item_call label="Yeni Alfa Maskesi" name="New Alpha Mask"/> <menu_item_call label="Yeni Dövme" name="New Tattoo"/> + <menu_item_call label="Yeni Evrensel" name="New Universal"/> <menu_item_call label="Yeni Fizik" name="New Physics"/> </menu> <menu label="Yeni Vücut Bölümleri" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="Yeni Saç" name="New Hair"/> <menu_item_call label="Yeni Gözler" name="New Eyes"/> </menu> + <menu label="Yeni Ayarlar" name="New Settings"> + <menu_item_call label="Yeni Gökyüzü" name="New Sky"/> + <menu_item_call label="Yeni Su" name="New Water"/> + <menu_item_call label="Yeni Gün Döngüsü" name="New Day Cycle"/> + </menu> <menu label="Şunun için varsayılan olarak kullan" name="upload_def"> <menu_item_call label="Karşıya yüklenen görüntüler" name="Image uploads"/> <menu_item_call label="Karşıya yüklenen sesler" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="Düzenle" name="Wearable Edit"/> <menu_item_call label="Ekle" name="Wearable Add"/> <menu_item_call label="Çıkar" name="Take Off"/> + <menu_item_call label="Sadece Kendime Uygula" name="Settings Apply Local"/> + <menu_item_call label="Parsele Uygula" name="Settings Apply Parcel"/> <menu_item_call label="Pazaryeri İlanlarına Kopyala" name="Marketplace Copy"/> <menu_item_call label="Pazaryeri İlanlarına Taşı" name="Marketplace Move"/> <menu_item_call label="--seçenek yok--" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml index db2a9a2c8c..118081e3a3 100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Ses (L$[COST])..." name="Upload Sound"/> <menu_item_call label="Animasyon (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Model..." name="Upload Model"/> - <menu_item_call label="Model Sihirbazı..." name="Upload Model Wizard"/> <menu_item_call label="Toplu (dosya başına L$[COST])..." name="Bulk Upload"/> - <menu_item_call label="Varsayılan Karşıya Yükleme İzinlerini Ayarla" name="perm prefs"/> </menu> <menu_item_call label="Yeni Klasör" name="New Folder"/> <menu_item_call label="Yeni Komut Dosyası" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Yeni Külot" name="New Underpants"/> <menu_item_call label="Yeni Alfa" name="New Alpha"/> <menu_item_call label="Yeni Dövme" name="New Tattoo"/> + <menu_item_call label="Yeni Evrensel" name="New Universal"/> <menu_item_call label="Yeni Fizik" name="New Physics"/> </menu> <menu label="Yeni Vücut Bölümleri" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Yeni Saç" name="New Hair"/> <menu_item_call label="Yeni Gözler" name="New Eyes"/> </menu> + <menu label="Yeni Ayarlar" name="New Settings"> + <menu_item_call label="Yeni Gökyüzü" name="New Sky"/> + <menu_item_call label="Yeni Su" name="New Water"/> + <menu_item_call label="Yeni Gün Döngüsü" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml index 1b73032a5d..7590ee28de 100644 --- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="Yeni Alfa" name="New Alpha"/> <menu_item_call label="Yeni Fizik" name="New Physics"/> <menu_item_call label="Yeni Dövme" name="New Tattoo"/> + <menu_item_call label="Yeni Evrensel" name="New Universal"/> </menu> <menu label="Yeni Vücut Bölümleri" name="New Body Parts"> <menu_item_call label="Yeni Şekil" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/tr/menu_save_settings.xml b/indra/newview/skins/default/xui/tr/menu_save_settings.xml new file mode 100644 index 0000000000..dad150a54b --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="Kaydet" name="save_settings"/> + <menu_item_check label="Farklı Kaydet" name="save_as_new_settings"/> + <menu_item_check label="Yürüt" name="commit_changes"/> + <menu_item_check label="Sadece Kendime Uygula" name="apply_local"/> + <menu_item_check label="Parsele Uygula" name="apply_parcel"/> + <menu_item_check label="Bölgeye Uygula" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_settings_add.xml b/indra/newview/skins/default/xui/tr/menu_settings_add.xml new file mode 100644 index 0000000000..0afd8a7893 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="Yeni Gökyüzü" name="New Sky"/> + <menu_item_call label="Yeni Su" name="New Water"/> + <menu_item_call label="Yeni Gün Döngüsü" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_settings_gear.xml b/indra/newview/skins/default/xui/tr/menu_settings_gear.xml new file mode 100644 index 0000000000..f0d04a9e68 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="Düzenle" name="edit_settings"/> + <menu_item_call label="Sadece Kendime Uygula" name="Settings Apply Local"/> + <menu_item_call label="Parsele Uygula" name="Settings Apply Parcel"/> + <menu_item_call label="Bölgeye Uygula" name="Settings Apply Region"/> + <menu_item_call label="Kopyala" name="copy_settings"/> + <menu_item_call label="Yapıştır" name="paste_settings"/> + <menu_item_call label="UUID'yi Kopyala" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index b83847a013..1c977ba5ce 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -77,30 +77,15 @@ <menu_item_check label="Parsel Özellikleri" name="Parcel Properties"/> <menu_item_check label="Gelişmiş Menü" name="Show Advanced Menu"/> </menu> - <menu label="Güneş" name="Sun"> + <menu label="Ortam" name="Environment"> <menu_item_check label="Gün doğumu" name="Sunrise"/> <menu_item_check label="Öğle" name="Noon"/> <menu_item_check label="Gün batımı" name="Sunset"/> <menu_item_check label="Gece yarısı" name="Midnight"/> - <menu_item_check label="Bölge Ayarlarını Kullan" name="Use Region Settings"/> - </menu> - <menu label="Ortam Düzenleyici" name="Environment Editor"> - <menu_item_call label="Ortam Ayarları..." name="Environment Settings"/> - <menu label="Su Ön Ayarları" name="Water Presets"> - <menu_item_call label="Yeni ön ayar..." name="new_water_preset"/> - <menu_item_call label="Ön ayarı düzenle..." name="edit_water_preset"/> - <menu_item_call label="Ön ayarı sil..." name="delete_water_preset"/> - </menu> - <menu label="Gökyüzü Ön Ayarları" name="Sky Presets"> - <menu_item_call label="Yeni ön ayar..." name="new_sky_preset"/> - <menu_item_call label="Ön ayarı düzenle..." name="edit_sky_preset"/> - <menu_item_call label="Ön ayarı sil..." name="delete_sky_preset"/> - </menu> - <menu label="Gün Ön Ayarları" name="Day Presets"> - <menu_item_call label="Yeni ön ayar..." name="new_day_preset"/> - <menu_item_call label="Ön ayarı düzenle..." name="edit_day_preset"/> - <menu_item_call label="Ön ayarı sil..." name="delete_day_preset"/> - </menu> + <menu_item_check label="Ortak Ortam Kullan" name="Use Shared Environment"/> + <menu_item_call label="Ortamlarım..." name="my_environs"/> + <menu_item_call label="Kişisel Aydınlatma..." name="adjustment_tool"/> + <menu_item_check label="Bulutları Duraklat" name="pause_clouds"/> </menu> </menu> <menu label="İnşa Et" name="BuildTools"> @@ -344,6 +329,9 @@ <menu_item_check label="Otomatik Alfa Maskeleri (ertelenmemiş)" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="Animasyon Dokuları" name="Animation Textures"/> <menu_item_check label="Dokuları Devre Dışı Bırak" name="Disable Textures"/> + <menu_item_check label="Ortamı Devre Dışı Bırak" name="Disable Ambient"/> + <menu_item_check label="Güneş Işığını Devre Dışı Bırak" name="Disable Sunlight"/> + <menu_item_check label="Yerel Işıkları Devre Dışı Bırak" name="Disable Local Lights"/> <menu_item_check label="Tam Çöz. Dokular" name="Rull Res Textures"/> <menu_item_check label="Eklenmiş Işıkları İşle" name="Render Attached Lights"/> <menu_item_check label="Eklenmiş Parçacıkları İşle" name="Render Attached Particles"/> @@ -481,6 +469,7 @@ <menu_item_call label="Etek" name="Skirt"/> <menu_item_call label="Alfa" name="Alpha"/> <menu_item_call label="Dövme" name="Tattoo"/> + <menu_item_call label="Evrensel" name="Universal"/> <menu_item_call label="Fizik" name="Physics"/> <menu_item_call label="Tüm Giysiler" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index d39dd594c9..087619f2b6 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -1960,6 +1960,11 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır. Bu seçeneğin onay işaretini kaldırmak, parsel sahiplerinin rahatsızlık veren oyuncuları bunu yapmasını engellemek, gizliliği sürdürmek ve yaşı tutmayan sakinleri yetişkin içeriklerden korumak için ekledikleri kısıtlamaları kaldırabilir. Lütfen gerekli olduğunda parsel sahiplerinizle tartışın. <usetemplate name="okbutton" yestext="Tamam"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + Bu seçeneğin onay işaretinin kaldırılması, parsel sahiplerinin kendi parsellerine eklemiş oldukları tüm özel ortamları kaldırır. Lütfen gerektiğinde parsel sahiplerinizle görüşün. +Devam etmek istiyor musunuz? + <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/> + </notification> <notification name="RegionEntryAccessBlocked"> Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip. Ben > Tercihler > Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz. <usetemplate name="okbutton" yestext="Tamam"/> @@ -2438,7 +2443,15 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we Bu gün döngüsü dosyası kayıp bir gökyüzü dosyasına başvuruda bulunuyor: [SKY]. </notification> <notification name="WLRegionApplyFail"> - Üzgünüz, bu ayarlar bölgeye uygulanamadı. Bölgeden ayrılmak ve sonra geri dönmek sorunu çözebilir. Gösterilen neden şuydu: [FAIL_REASON] + Üzgünüz, ayarlar bölgeye uygulanamadı. Neden: [FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + Bir Yerel doku [FIELD] alanındaki [TRACK] rotasında, #[FRAMENO] ([FRAME]%) çerçevesinde kullanılıyor. +Ayarlar yerel dokular kullanılarak kaydedilemez. + </notification> + <notification name="WLLocalTextureFixedBlock"> + Bir yerel doku [FIELD] alanında kullanılıyor. +Ayarlar yerel dokular kullanılarak kaydedilemez. </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> Bu gün döngüsündeki son anahtar silinemedi çünkü boş bir gün döngünüz olamaz. Son kalan anahtarı silmek ve yenisini oluşturmaya kalkışmak yerine bunu değiştirmelisiniz. @@ -4385,4 +4398,75 @@ Daha küçük bir arazi parçası seçmeyi deneyin. [REASON] <usetemplate name="okbutton" yestext="Tamam"/> </notification> + <notification name="FailedToFindSettings"> + [NAME] ile ilgili ayarlar veritabanından yüklenemedi. + </notification> + <notification name="FailedToLoadSettingsApply"> + Bu değişiklikler ortama uygulanamıyor. + </notification> + <notification name="FailedToBuildSettingsDay"> + Bu değişiklikler ortama uygulanamıyor. + </notification> + <notification name="NoEnvironmentSettings"> + Bu Bölge ortam ayarlarını desteklemiyor. + </notification> + <notification label="Dış Görünümü Kaydet" name="SaveSettingAs"> + Geçerli ortam ayarlarını farklı kaydet: + <form name="form"> + <input name="message"> + [DESC] (yeni) + </input> + <button name="OK" text="Tamam"/> + <button name="Cancel" text="İptal Et"/> + </form> + </notification> + <notification name="WLImportFail"> + Eski Windlight ayarları [NAME], [FILE] kaynağından içeri aktarılamıyor. + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + Bu parsele ait ortam ayarlanamıyor. +Lütfen değişiklik yapma hakkına sahip olduğunuz bir parsel girin veya seçin. + </notification> + <notification name="SettingsUnsuported"> + Ayarlar bu bölgede desteklenmiyor. +Lütfen ayarların etkin olduğu bir bölgeye gidin ve eyleminizi yeniden deneyin. + </notification> + <notification name="SettingsConfirmLoss"> + "[NAME]" adlı bu [TYPE] öğesinde yaptığınız değişiklikleri kaybetmek üzeresiniz. +Devam etmek istediğinizden emin misiniz? + <usetemplate ignoretext="Değişiklikleri kaybetmek istediğinizden emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/> + </notification> + <notification name="SettingsConfirmReset"> + Uygulanan ayarlarınızın tümünü kaldırmak üzeresiniz. +Devam etmek istediğinizden emin misiniz? + <usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Uygulanan Kişisel aydınlatma ayarlarınızın tümünü kaldırmak üzeresiniz. +Devam etmek istediğinizden emin misiniz? + <usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/> + </notification> + <notification name="SettingsMakeNoTrans"> + Aktarılamayan ayarları bu gün döngüsüne aktarmak üzeresiniz. Bu işleme devam etmeniz düzenlemekte olduğunuz ayarların da aktarılamaz olmasına neden olacaktır. + +Bu değişiklik geri alınamaz. + +Devam etmek istediğinizden emin misiniz? + <usetemplate ignoretext="Ayarları aktarılamaz hale getirmek istediğinizden emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/> + </notification> + <notification name="NoEditFromLibrary"> + Ayarları doğrudan kütüphaneden düzenleyemezsiniz. +Lütfen kendi envanterinize kopyalayın ve yeniden deneyin. + </notification> + <notification name="EnvironmentApplyFailed"> + Bu ayarlarla ilgili bir sorunla karşılaştık. Bu ayarlar şu anda kaydedilemiyor veya uygulanamıyor. + </notification> + <notification name="TrackLoadFailed"> + Rota [TRACK] hedefine yüklenemiyor. + </notification> + <notification name="TrackLoadMismatch"> + Rota [TRACK1] kaynağından [TRACK2] hedefine yüklenemiyor. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml index 7f5590a485..fb97f1e1ce 100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Baş Dövmesi" name="Head Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> - <texture_picker label="Üst Gövde Dövmesi" name="Upper Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> - <texture_picker label="Alt Gövde Dövmesi" name="Lower Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> - <color_swatch label="Renk/Ton" name="Color/Tint" tool_tip="Renk seçiciyi açmak için tıklayın"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Baş Dövmesi" name="Head Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Üst Gövde Dövmesi" name="Upper Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Alt Gövde Dövmesi" name="Lower Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <color_swatch label="Renk/Ton" name="Color/Tint" tool_tip="Renk seçiciyi açmak için tıklayın"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_edit_universal.xml b/indra/newview/skins/default/xui/tr/panel_edit_universal.xml new file mode 100644 index 0000000000..ef10307d11 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="Baş Dövmesi" name="Head Universal Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Üst Gövde Dövmesi" name="Upper Universal Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Alt Gövde Dövmesi" name="Lower Universal Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Etek Dövmesi" name="Skirt Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Saç Dövmesi" name="Hair Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Göz Dövmesi" name="Eyes Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Sol Kol Dövmesi" name="Left Arm Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Sol Bacak Dövmesi" name="Left Leg Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Yedek 1 Dövme" name="Aux1 Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Yedek 2 Dövme" name="Aux2 Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <texture_picker label="Yedek 3 Dövme" name="Aux3 Tattoo" tool_tip="Bir resim seçmek için tıklayın"/> + <color_swatch label="Renk/Ton" name="Color/Tint" tool_tip="Renk seçiciyi açmak için tıklayın"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml index 7a4a09aaed..7880de8e7d 100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> Dövme Düzenleniyor </string> + <string name="edit_universal_title"> + Evrensel Düzenleniyor + </string> <string name="edit_physics_title"> Fizik Düzenleniyor </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> Dövme: </string> + <string name="universal_desc_text"> + Evrensel: + </string> <string name="physics_desc_text"> Fizik: </string> diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml index b5f505f25f..d375203cf6 100644 --- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ortam" name="panel_env_info"> - <text name="water_settings_title"> - Bölgenize gelen tüm ziyaretçilerin görmesini istediğiniz Su ve Gökyüzü/Gündüz Döngüsü Ayarlarını seçin. Ek bilgi - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="Second Life varsayılanını kullan" name="use_sl_default_settings"/> - <radio_item label="Aşağıdaki ayarları kullan" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - Su Ayarı - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-Bir ön ayar seçin-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - Gökyüzü / Gün Döngüsü - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="Sabit gökyüzü" name="my_sky_settings"/> - <radio_item label="Gün döngüsü" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-Bir ön ayar seçin-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-Bir ön ayar seçin-" name="item0"/> - </combo_box> - </panel> - <button label="Uygula" name="apply_btn"/> - <button label="İptal Et" name="cancel_btn"/> + <string name="str_label_use_default"> + Varsayılan Ayarları Kullan + </string> + <string name="str_label_use_region"> + Bölge Ayarlarını Kullan + </string> + <string name="str_altitude_desription"> + Gökyüzü [INDEX]([ALTITUDE] m) + </string> + <string name="str_no_parcel"> + Parsel seçilmedi. Ortam ayarları devre dışı. + </string> + <string name="str_cross_region"> + Ortam ayarları bölge sınırları dahilinde kullanılamıyor. + </string> + <string name="str_legacy"> + Ortam ayarları bu bölgede kullanılamıyor. + </string> + <string name="str_disallowed"> + Gayrimenkul yöneticisi bu bölgede parsel ortamlarını değiştirmeye izin vermiyor. + </string> + <string name="str_too_small"> + Parselin bir ortamı desteklemesi için en az 128 metrekare olması gerekir. + </string> + <string name="str_empty"> + (boş) + </string> + <string name="str_region_env"> + (bölge ortamı) + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="Envanteri Kullan" name="btn_select_inventory"/> + <button label="Özelleştir" name="btn_edit"/> + <check_box label="Parsel Sahipleri Ortamı Geçersiz Kılabilir" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] (% [PRC]) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + Gökyüzü [INDEX] + [ALTITUDE] m + </text> + <line_editor name="edt_invname_alt1"> + Bilinmiyor + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="Geçerli gökyüzü olarak seçmek için Envanterden bir ayarı bu hedef kutuya sürükleyin."/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + Gökyüzü [INDEX] + [ALTITUDE] m + </text> + <line_editor name="edt_invname_alt2"> + Bilinmiyor + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="Geçerli gökyüzü olarak seçmek için Envanterden bir ayarı bu hedef kutuya sürükleyin."/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + Gökyüzü [INDEX] + [ALTITUDE] m + </text> + <line_editor name="edt_invname_alt3"> + Bilinmiyor + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="Geçerli gökyüzü olarak seçmek için Envanterden bir ayarı bu hedef kutuya sürükleyin."/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + Zemin + </text> + <line_editor name="edt_invname_ground"> + Bilinmiyor + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="Zemin seviyesinde gökyüzü olarak seçmek için Envanterden bir ayarı bu hedef kutuya sürükleyin."/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + Su + </text> + <line_editor name="edt_invname_water"> + Bilinmiyor + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="Geçerli su olarak seçmek için Envanterden bir ayarı bu hedef kutuya sürükleyin."/> + </panel> + <button label="Sıfırla" name="btn_rst_altitudes" tool_tip="Varsayılan irtifalara sıfırla"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/tr/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..9bc23a5507 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Atmosfer ve Aydınlatma" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/tr/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/tr/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..5dd31546cd --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Bulutlar" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/tr/panel_settings_sky_density.xml new file mode 100644 index 0000000000..1d2aa30921 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Yoğunluk" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Rayleigh Üstel Terim:" name="rayleigh_exponential"/> + <slider label="Rayleigh Üstel Skala:" name="rayleigh_exponential_scale"/> + <slider label="Rayleigh Lineer Terim:" name="rayleigh_linear"/> + <slider label="Rayleigh Sabit Terim:" name="rayleigh_constant"/> + <slider label="Rayleigh Maks. İrtifa:" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Mie Üstel Terim:" name="mie_exponential"/> + <slider label="Mie Üstel Skala:" name="mie_exponential_scale"/> + <slider label="Mie Lineer Terim:" name="mie_linear"/> + <slider label="Mie Sabit Terim:" name="mie_constant"/> + <slider label="Mie Anizotropi Faktörü:" name="mie_aniso_factor"/> + <slider label="Mie Maks. İrtifa:" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Absorpsiyon Üstel Terim:" name="absorption_exponential"/> + <slider label="Absorpsiyon Üstel Skala:" name="absorption_exponential_scale"/> + <slider label="Absorpsiyon Lineer Terim:" name="absorption_linear"/> + <slider label="Absorpsiyon Sabit Terim:" name="absorption_constant"/> + <slider label="Absorpsiyon Maks. İrtifa:" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/tr/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..44fccb594d --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Güneş ve Ay" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="İşareti Göster" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="İşareti Göster" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_settings_water.xml b/indra/newview/skins/default/xui/tr/panel_settings_water.xml new file mode 100644 index 0000000000..9537a2b494 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Su" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + Fresnel Dengeleme: + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml index 1324e2cc36..baf53a7af4 100644 --- a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Doku" name="Texture"> - <panel.string name="string repeats per meter"> - Metrede Kaç Kez Tekrarlandığı - </panel.string> - <panel.string name="string repeats per face"> - Bir Yüzde Kaç Kez Tekrarlandığı - </panel.string> <text name="color label"> Renk </text> @@ -114,4 +108,5 @@ <spinner label="Yatay ofset" name="shinyOffsetU"/> <spinner label="Dikey ofset" name="shinyOffsetV"/> <check_box initial_value="false" label="Planar yüzleri hizala" name="checkbox planar align" tool_tip="Tüm seçili yüzeylerdeki dokuları son seçili yüzdekiyle hizalar. Planar doku eşleştirmesi gerektirir."/> + <button label="Hizala" label_selected="Geçerli doku katmanlarına hizala" name="button align textures" tool_tip="Geçerli doku katmanlarına hizala"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml index 5e830bddd5..3ac4a7b19f 100644 --- a/indra/newview/skins/default/xui/tr/role_actions.xml +++ b/indra/newview/skins/default/xui/tr/role_actions.xml @@ -33,6 +33,7 @@ <action description="Müziği & ortam ayarlarını değiştir" longdescription="Akış müziğini ve film ayarlarını Arazi Hakkında > Ortam sekmesinden değiştirin." name="land change media" value="20"/> <action description="'Yüzeyi Düzenle' seçeneğini Aç/Kapa" longdescription="'Yüzeyi Düzenle' seçeneğini açın/kapatın. *UYARI* Arazi Hakkında > Seçenekler sekmesi > Yüzeyi Düzenle seçeneği, herhangi bir kişinin arazinizin şeklini değiştirmesine, Linden bitkileri yerleştirmesine ve bu bitkilerin yerlerini değiştirmesine izin verir. Bu Yeteneği atamadan önce ne yaptığınızı bildiğinizden emin olun. Yüzey düzenleme seçeneği Arazi Hakkında > Seçenekler sekmesinden açılıp kapanır." name="land edit" value="21"/> <action description="Arazi Hakkında > Seçenekler sekmesindeki çeşitli ayarları Aç/Kapa" longdescription="'Güvenli (hasar yok)', 'Uç' ve diğer Second Life Sakinlerinin 'Yüzeyi Düzenle', 'İnşa Et', 'Yer İmleri Oluştur' ve 'Komut Dosyalarını Çalıştır' yeteneklerini grubun sahip olduğu arazi üzerinde kullanmalarına izin verme tercihini Arazi Hakkında > Seçenekler sekmesinden açın/kapayın." name="land options" value="22"/> + <action description="Ortam ayarlarını ve gün döngüsünü değiştirin." longdescription="Arazi Hakkında > Ortam sekmesinden ortam ayarlarını ve gün döngüsünü değiştirin." name="land change environment" value="46"/> </action_set> <action_set description="Bu Yeteneklere Üyelerin grubun sahip olduğu parseller üzerindeki kısıtlamaları geçmesine izin veren güçler de dahildir." name="Parcel Powers"> <action description="'Yüzeyi Düzenle' yeteneğine her zaman izin ver" longdescription="Bu Yeteneğe sahip olan bir Roldeki Üyeler, Arazi Hakkında > Seçenekler sekmesinde kapalı olsa da grubun sahip olduğu parsel üzerinde yüzey düzenleme yapabilir." name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 8535f683df..d52560695a 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -657,6 +657,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="BUTTON_HELP"> Yardımı Göster </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Bu türe ait öğeler bu bölgedeki +not kartlarına eklenemez. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Sadece kısıtlamasız 'sonraki sahip' +izinlerini içeren öğeler not +kartlarına eklenebilir. + </string> <string name="Searching"> Arıyor... </string> @@ -733,6 +742,18 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. Karşıya yükleme talebinde hata. Bu sorunu çözmek için lütfen http://secondlife.com/support adresini ziyaret edin. </string> + <string name="SettingValidationError"> + [NAME] ayarlarının içeri aktarılması için doğrulama başarısız oldu + </string> + <string name="SettingImportFileError"> + [FILE] dosyası açılamadı + </string> + <string name="SettingParseFileError"> + [FILE] dosyası açılamadı + </string> + <string name="SettingTranslateError"> + Eski Windlight [NAME] çevrilemedi + </string> <string name="texture"> doku </string> @@ -808,6 +829,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="symbolic folder link"> klasör bağlantısı </string> + <string name="settings blob"> + ayarlar + </string> <string name="mesh"> örgü </string> @@ -1138,6 +1162,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="ForceSitAvatar"> Avatarınızı oturmaya zorlayın </string> + <string name="ChangeEnvSettings"> + Ortam ayarlarınızı değiştirin + </string> <string name="NotConnected"> Bağlı Değil </string> @@ -1289,6 +1316,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="tattoo"> Dövme </string> + <string name="universal"> + Evrensel + </string> <string name="physics"> Fizik </string> @@ -1331,6 +1361,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="tattoo_not_worn"> Giyilmemiş dövme </string> + <string name="universal_not_worn"> + Evrensel giyilmiyor + </string> <string name="physics_not_worn"> Giyilmemiş fizik </string> @@ -1382,6 +1415,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="create_new_tattoo"> Yeni dövme oluştur </string> + <string name="create_new_universal"> + Yeni evrensel oluştur + </string> <string name="create_new_physics"> Yeni fizik oluştur </string> @@ -2529,6 +2565,27 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin <string name="RegionSettings"> Bölge Ayarları </string> + <string name="NoEnvironmentSettings"> + Bu Bölge ortam ayarlarını desteklemiyor. + </string> + <string name="EnvironmentSun"> + Güneş + </string> + <string name="EnvironmentMoon"> + Ay + </string> + <string name="EnvironmentBloom"> + Bahar + </string> + <string name="EnvironmentCloudNoise"> + Bulut Gürültüsü + </string> + <string name="EnvironmentNormalMap"> + Normal Harita + </string> + <string name="EnvironmentTransparent"> + Saydam + </string> <string name="ClassifiedClicksTxt"> Tıklamalar: [TELEPORT] ışınlama, [MAP] harita, [PROFILE] profil </string> @@ -4758,6 +4815,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="New Tattoo"> Yeni Dövme </string> + <string name="New Universal"> + Yeni Evrensel + </string> <string name="New Physics"> Yeni Fizik </string> @@ -4884,6 +4944,15 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun. <string name="Female - Wow"> Kadın - Vay be </string> + <string name="New Daycycle"> + Yeni Gün döngüsü + </string> + <string name="New Water"> + Yeni Su + </string> + <string name="New Sky"> + Yeni Gökyüzü + </string> <string name="/bow"> /selamlama </string> @@ -5424,6 +5493,12 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="BeaconMedia"> Ortam işaretleri gösteriliyor (beyaz) </string> + <string name="BeaconSun"> + Güneş yönü işareti (turuncu) görüntüleniyor + </string> + <string name="BeaconMoon"> + Ay yönü işareti (mor) görüntüleniyor + </string> <string name="ParticleHiding"> Parçacıklar Gizleniyor </string> @@ -5451,6 +5526,12 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Destinations_Label"> Hedef Konum </string> + <string name="Command_Environments_Label"> + Ortamlarım + </string> + <string name="Command_Facebook_Label"> + Facebook + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5544,6 +5625,12 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Destinations_Tooltip"> İlgilendiğiniz hedef konumlar </string> + <string name="Command_Environments_Tooltip"> + Ortamlarım + </string> + <string name="Command_Facebook_Tooltip"> + Facebook'ta Yayınla + </string> <string name="Command_Flickr_Tooltip"> Flickr'a yükle </string> @@ -5739,6 +5826,12 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="ExperiencePermission12"> deneyim izinlerini otomatik olarak kabul et </string> + <string name="ExperiencePermission16"> + avatarınızı oturmaya zorlayın + </string> + <string name="ExperiencePermission17"> + ortam ayarlarınızı değiştirin + </string> <string name="ExperiencePermissionShortUnknown"> bilinmeyen bir işlem gerçekleştirdi: [Permission] </string> @@ -5763,6 +5856,12 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="ExperiencePermissionShort12"> İzin </string> + <string name="ExperiencePermissionShort16"> + Otur + </string> + <string name="ExperiencePermissionShort17"> + Ortam + </string> <string name="logging_calls_disabled_log_empty"> Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler > Sohbet altında "Kaydet: Sadece günlük" veya "Kaydet: Günlük ve dökümler" seçimini yapın. </string> diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml index 1164722abf..bb680f822e 100644 --- a/indra/newview/skins/default/xui/zh/floater_about_land.xml +++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml @@ -474,5 +474,6 @@ </panel> </panel> <panel label="體驗" name="land_experiences_panel"/> + <panel label="環境" name="land_environment_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_adjust_environment.xml b/indra/newview/skins/default/xui/zh/floater_adjust_environment.xml new file mode 100644 index 0000000000..192c429430 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_adjust_environment.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_adjust_snapshot" title="個人照明"> + <layout_stack name="outer_stack"> + <layout_panel name="env_controls"> + <layout_stack name="settings_stack"> + <layout_panel> + <button label="重設" name="btn_reset" tool_tip="關閉並重設爲共享環境"/> + <text name="cloud_map_label"> + 雲彩圖像： + </text> + </layout_panel> + <layout_panel> + <text name="label"> + 太陽： + </text> + <check_box label="顯示指標" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <check_box label="顯示指標" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml index 83e10804d6..4df8c8f14b 100644 --- a/indra/newview/skins/default/xui/zh/floater_beacons.xml +++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml @@ -18,5 +18,7 @@ <check_box label="聲音來源" name="sounds"/> <check_box label="例子來源" name="particles"/> <check_box label="媒體來源" name="moapbeacon"/> + <check_box label="太陽" name="sun"/> + <check_box label="月亮" name="moon"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml index dbf4a21416..3729aa7620 100644 --- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml @@ -21,6 +21,7 @@ <icon name="icon_script" tool_tip="腳本"/> <icon name="icon_sound" tool_tip="聲音"/> <icon name="icon_texture" tool_tip="材質"/> + <icon name="icon_setting" tool_tip="環境設定"/> <button label="√ 全部" name="check_all"/> <button label="清除" label_selected="無" name="check_none"/> <text name="newperms"> diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml deleted file mode 100644 index 4aafb31952..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<floater name="Delete Env Preset" title="刪除環境自訂配置"> - <string name="title_water"> - 刪除水的自訂配置 - </string> - <string name="title_sky"> - 刪除天空自訂配置 - </string> - <string name="title_day_cycle"> - 刪除日循環 - </string> - <string name="label_water"> - 自訂配置： - </string> - <string name="label_sky"> - 自訂配置： - </string> - <string name="label_day_cycle"> - 日循環： - </string> - <string name="msg_confirm_deletion"> - 確定要刪除所選自訂配置？ - </string> - <string name="msg_sky_is_referenced"> - 無法刪除日循環有所指涉的自訂配置。 - </string> - <string name="combo_label"> - -選擇一個自訂配置- - </string> - <text name="label"> - 自訂配置： - </text> - <button label="刪除" name="delete"/> - <button label="取消" name="cancel"/> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml new file mode 100644 index 0000000000..cdcf0a685e --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="env_edit_extdaycycle" title="編輯日循環"> + <string name="title_new"> + 新建一個日循環 + </string> + <string name="title_edit"> + 編輯日循環 + </string> + <string name="hint_new"> + 為日循環定名，調整各項控制確定細節，再點按「儲存」。 + </string> + <string name="hint_edit"> + 若要編輯你的日循環，請調整下方各項控制，再點按「儲存」。 + </string> + <string name="time_label"> + ([HH]:[MM]) + </string> + <string name="sky_track_label"> + 天空[ALT] + </string> + <string name="sky_label"> + 天空 + </string> + <string name="water_label"> + 水文 + </string> + <string name="commit_parcel"> + 套用到地段 + </string> + <string name="commit_region"> + 套用到地區 + </string> + <layout_stack name="outer_stack"> + <layout_panel name="name_and_import"> + <text name="label"> + 日循環名稱： + </text> + <button label="匯入" name="btn_import" tool_tip="從磁碟匯入舊設定。"/> + </layout_panel> + <layout_panel name="content"> + <layout_stack name="content_stack"> + <layout_panel name="timeline_track_selection"> + <panel name="timeline_layers"> + <button label="天空 4" name="sky4_track"/> + <button label="天空 3" name="sky3_track"/> + <button label="天空 2" name="sky2_track"/> + <button label="地面水平" name="sky1_track"/> + <button label="水文" name="water_track"/> + </panel> + <panel name="timeline"> + <text name="p0" value="0%[DSC]"/> + <text name="p1" value="25%[DSC]"/> + <text name="p2" value="50%[DSC]"/> + <text name="p3" value="75%[DSC]"/> + <text name="p4" value="100%[DSC]"/> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleFrames"/> + <text name="current_time" value="[PRCNT]%[DSC]"/> + <layout_stack> + <layout_panel> + <button label="複製軌跡來源：" name="copy_track"/> + <button label="載入軌跡來源：" name="load_track"/> + <button label="清除軌跡" name="clear_track"/> + </layout_panel> + <layout_panel> + <layout_stack name="progress_control"> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="逐步後退"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="逐步前進"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel> + <button label="新增[FRAME]" name="add_frame"/> + <button label="載入[FRAME]" name="btn_load_frame"/> + <button label="刪除[FRAME]" name="delete_frame"/> + </layout_panel> + </layout_stack> + </panel> + </layout_panel> + <layout_panel name="frame_edit_controls"> + <text name="icn_lock_edit"> + 從上方的時間線選擇一個關鍵幀以編輯設定。 + </text> + </layout_panel> + <layout_panel name="frame_settings_water"> + <tab_container name="water_tabs"> + <panel label="水文" name="water_panel"/> + </tab_container> + </layout_panel> + <layout_panel name="frame_settings_sky"> + <tab_container name="sky_tabs"> + <panel label="大氣與照明" name="atmosphere_panel"/> + <panel label="雲彩" name="clouds_panel"/> + <panel label="日與月" name="moon_panel"/> + </tab_container> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="buttons"> + <button label="儲存" name="save_btn"/> + <button label="取消" name="cancel_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml new file mode 100644 index 0000000000..b47b893764 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Fixed Environment" title="固定環境"> + <string name="edit_sky"> + 編輯天空： + </string> + <string name="edit_water"> + 編輯水文： + </string> + <layout_stack name="floater_stack"> + <layout_panel name="info_panel"> + <button label="載入" name="btn_load" tool_tip="從收納區載入一個設定"/> + <button label="匯入" name="btn_import" tool_tip="從磁碟匯入舊設定。"/> + </layout_panel> + <layout_panel name="button_panel"> + <layout_stack name="button_bar_ls"> + <layout_panel name="save_btn_lp"> + <button label="儲存" name="btn_commit"/> + </layout_panel> + <layout_panel name="revert_btn_lp"> + <button label="取消" name="btn_cancel" tool_tip="恢復上一個已儲存版本"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml index 9001615d89..ae05396cc5 100644 --- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml @@ -12,6 +12,7 @@ <check_box label="聲音" name="check_sound"/> <check_box label="材質" name="check_texture"/> <check_box label="快照" name="check_snapshot"/> + <check_box label="設定" name="check_settings"/> <button label="全部" label_selected="全部" name="All"/> <button label="無" label_selected="無" name="None"/> <check_box label="固定顯示資料夾" name="check_show_empty"/> diff --git a/indra/newview/skins/default/xui/zh/floater_my_environments.xml b/indra/newview/skins/default/xui/zh/floater_my_environments.xml new file mode 100644 index 0000000000..2184455dc9 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_my_environments.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="地點" name="my_environments" title="我的環境"> + <layout_stack> + <layout_panel label="過濾器" name="filter_panel"> + <check_box label="日" name="chk_days"/> + <check_box label="天空" name="chk_skies"/> + <check_box label="水文" name="chk_water"/> + <filter_editor label="過濾環境" name="flt_search"/> + </layout_panel> + <layout_panel label="環境" name="list_panel"> + <panel label="pnl_inv_wrap" name="pnl_inv_wrap"/> + </layout_panel> + <layout_panel> + <check_box initial_value="false" label="顯示所有資料夾" name="chk_showfolders"/> + </layout_panel> + <layout_panel name="pnl_control"> + <panel label="bottom_panel" name="pnl_bottom"> + <menu_button name="btn_gear" tool_tip="更多選項"/> + <menu_button name="btn_newsettings" tool_tip="製作新的設定"/> + <button name="btn_del" tool_tip="移除所選擇的物品"/> + </panel> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_perms_default.xml b/indra/newview/skins/default/xui/zh/floater_perms_default.xml index d4706d8d87..eb432a8bcd 100644 --- a/indra/newview/skins/default/xui/zh/floater_perms_default.xml +++ b/indra/newview/skins/default/xui/zh/floater_perms_default.xml @@ -37,6 +37,10 @@ <text name="label_12" tool_tip="設定預設權限決定何時建立服裝或身體部位"> 可穿裝扮 </text> + <text name="label_13" tool_tip="設定預設權限決定何時建立環境設定"> + 設定 + </text> + <check_box name="env_settings_c" value="true"/> </panel> <button label="確定" label_selected="確定" name="ok"/> <button label="取消" label_selected="取消" name="cancel"/> diff --git a/indra/newview/skins/default/xui/zh/floater_pick_track.xml b/indra/newview/skins/default/xui/zh/floater_pick_track.xml new file mode 100644 index 0000000000..f86132a423 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_pick_track.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="track picker" title="選擇：軌跡"> + <layout_stack name="adjuster"> + <layout_panel name="pnl_desc"> + <text name="select_description"> + 選擇來源天空： + </text> + </layout_panel> + <layout_panel name="pnl_traks"> + <radio_group name="track_selection"> + <radio_item label="天空4[ALT]" name="radio_sky4" value="4"/> + <radio_item label="天空3[ALT]" name="radio_sky3" value="3"/> + <radio_item label="天空2[ALT]" name="radio_sky2" value="2"/> + <radio_item label="地面" name="radio_sky1" value="1"/> + </radio_group> + </layout_panel> + <layout_panel name="pnl_ok_cancel"> + <button label="確定" label_selected="確定" name="btn_select"/> + <button label="取消" label_selected="取消" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml index 7b127acd71..58314efeed 100644 --- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml @@ -82,7 +82,6 @@ <check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/> <check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/> <check_box initial_value="true" label="本地光線" name="LocalLights"/> - <check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/> <slider label="地形細節：" name="TerrainDetail"/> <text name="TerrainDetailText"> 低 diff --git a/indra/newview/skins/default/xui/zh/floater_settings_picker.xml b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml new file mode 100644 index 0000000000..36e32777fb --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="settings picker" title="選擇：設定"> + <floater.string name="pick title"> + 精選地點： + </floater.string> + <floater.string name="pick_track"> + 選取軌跡 + </floater.string> + <floater.string name="pick_settings"> + 選取設定 + </floater.string> + <floater.string name="track_water"> + 水文 + </floater.string> + <floater.string name="track_ground"> + 地面 + </floater.string> + <floater.string name="track_sky"> + 天空[NUM] + </floater.string> + <layout_stack name="test_stack"> + <layout_panel name="inv_list"> + <filter_editor label="材質過濾器" name="flt_inventory_search"/> + </layout_panel> + <layout_panel name="temp"> + <button label="確定" label_selected="確定" name="btn_select"/> + <button label="取消" label_selected="取消" name="btn_cancel"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml index 02d06323d4..881ca40338 100644 --- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml @@ -12,6 +12,7 @@ <radio_group name="mode_selection"> <radio_item label="收納區" name="inventory" value="0"/> <radio_item label="本地" name="local" value="1"/> + <radio_item label="確定產出" name="bake" value="2"/> </radio_group> <text name="unknown"> 尺寸：[DIMENSIONS] @@ -19,7 +20,6 @@ <button label="預設" label_selected="預設" name="Default"/> <button label="空白" label_selected="空白" name="Blank"/> <button label="無" label_selected="無" name="None"/> - <check_box initial_value="true" label="立即套用" name="apply_immediate_check"/> <text name="preview_disabled" value="已停用預覽"/> <filter_editor label="材質過濾器" name="inventory search editor"/> <check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/> @@ -30,6 +30,22 @@ <column label="名稱" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="選擇定貌材質"> + <combo_box.item label="無" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="隱藏基底網面區域" name="hide_base_mesh_region"/> <button label="確定" label_selected="確定" name="Select"/> <button label="取消" label_selected="取消" name="Cancel"/> + <check_box initial_value="true" label="立即套用" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml index 2ed078841e..8b65b5c8de 100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="啟用" name="Marketplace Activate"/> <menu_item_call label="停用" name="Marketplace Deactivate"/> <menu_item_call label="分享" name="Share"/> - <menu_item_call label="購買" name="Task Buy"/> <menu_item_call label="打開" name="Task Open"/> <menu_item_call label="播放" name="Task Play"/> <menu_item_call label="屬性" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="新內褲" name="New Underpants"/> <menu_item_call label="新半透明遮罩" name="New Alpha Mask"/> <menu_item_call label="新刺青" name="New Tattoo"/> + <menu_item_call label="新通用值" name="New Universal"/> <menu_item_call label="新身體物理" name="New Physics"/> </menu> <menu label="新身體部位" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="新頭髮" name="New Hair"/> <menu_item_call label="新眼睛" name="New Eyes"/> </menu> + <menu label="新的設定" name="New Settings"> + <menu_item_call label="新的天空" name="New Sky"/> + <menu_item_call label="新的水文" name="New Water"/> + <menu_item_call label="新的日循環" name="New Day Cycle"/> + </menu> <menu label="作這一用途的預設值：" name="upload_def"> <menu_item_call label="圖像上傳" name="Image uploads"/> <menu_item_call label="聲音上傳" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="編輯" name="Wearable Edit"/> <menu_item_call label="添加" name="Wearable Add"/> <menu_item_call label="脫下" name="Take Off"/> + <menu_item_call label="僅套用到我自己" name="Settings Apply Local"/> + <menu_item_call label="套用到地段" name="Settings Apply Parcel"/> <menu_item_call label="複製到 Marketplace 刊登" name="Marketplace Copy"/> <menu_item_call label="移到 Marketplace 刊登" name="Marketplace Move"/> <menu_item_call label="-- 無選項 --" name="--no options--"/> diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml index 30bf5a7e75..c64b399630 100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/> <menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/> <menu_item_call label="模型…" name="Upload Model"/> - <menu_item_call label="模型精靈…" name="Upload Model Wizard"/> <menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/> - <menu_item_call label="設定預設上傳權限" name="perm prefs"/> </menu> <menu_item_call label="新資料夾" name="New Folder"/> <menu_item_call label="新腳本" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="新內褲" name="New Underpants"/> <menu_item_call label="新半透明" name="New Alpha"/> <menu_item_call label="新刺青" name="New Tattoo"/> + <menu_item_call label="新通用值" name="New Universal"/> <menu_item_call label="新身體物理" name="New Physics"/> </menu> <menu label="新身體部位" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="新頭髮" name="New Hair"/> <menu_item_call label="新眼睛" name="New Eyes"/> </menu> + <menu label="新的設定" name="New Settings"> + <menu_item_call label="新的天空" name="New Sky"/> + <menu_item_call label="新的水文" name="New Water"/> + <menu_item_call label="新的日循環" name="New Day Cycle"/> + </menu> </menu> diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml index 124598a098..460adf9918 100644 --- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml @@ -20,6 +20,7 @@ <menu_item_call label="新半透明" name="New Alpha"/> <menu_item_call label="新身體物理" name="New Physics"/> <menu_item_call label="新刺青" name="New Tattoo"/> + <menu_item_call label="新通用值" name="New Universal"/> </menu> <menu label="新身體部位" name="New Body Parts"> <menu_item_call label="新體形" name="New Shape"/> diff --git a/indra/newview/skins/default/xui/zh/menu_save_settings.xml b/indra/newview/skins/default/xui/zh/menu_save_settings.xml new file mode 100644 index 0000000000..05ec0d97e2 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_save_settings.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="save_settings_menu"> + <menu_item_check label="儲存" name="save_settings"/> + <menu_item_check label="另存為" name="save_as_new_settings"/> + <menu_item_check label="確定" name="commit_changes"/> + <menu_item_check label="僅套用到我自己" name="apply_local"/> + <menu_item_check label="套用到地段" name="apply_parcel"/> + <menu_item_check label="套用到地區" name="apply_region"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_settings_add.xml b/indra/newview/skins/default/xui/zh/menu_settings_add.xml new file mode 100644 index 0000000000..4e11741241 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_settings_add.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_add"> + <menu_item_call label="新的天空" name="New Sky"/> + <menu_item_call label="新的水文" name="New Water"/> + <menu_item_call label="新的日循環" name="New Day Cycle"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_settings_gear.xml b/indra/newview/skins/default/xui/zh/menu_settings_gear.xml new file mode 100644 index 0000000000..342f9d50b4 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/menu_settings_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="menu_settings_gear"> + <menu_item_call label="編輯" name="edit_settings"/> + <menu_item_call label="僅套用到我自己" name="Settings Apply Local"/> + <menu_item_call label="套用到地段" name="Settings Apply Parcel"/> + <menu_item_call label="套用到地區" name="Settings Apply Region"/> + <menu_item_call label="複製" name="copy_settings"/> + <menu_item_call label="貼上" name="paste_settings"/> + <menu_item_call label="覆製 UUID" name="copy_uuid"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index a5c9684973..972434dfc5 100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -77,30 +77,15 @@ <menu_item_check label="地段屬性" name="Parcel Properties"/> <menu_item_check label="進階選單" name="Show Advanced Menu"/> </menu> - <menu label="太陽" name="Sun"> + <menu label="環境" name="Environment"> <menu_item_check label="日出" name="Sunrise"/> <menu_item_check label="中午" name="Noon"/> <menu_item_check label="日落" name="Sunset"/> <menu_item_check label="午夜" name="Midnight"/> - <menu_item_check label="使用地區設定" name="Use Region Settings"/> - </menu> - <menu label="環境編輯器" name="Environment Editor"> - <menu_item_call label="環境設定…" name="Environment Settings"/> - <menu label="水的自訂配置" name="Water Presets"> - <menu_item_call label="新的自訂配置…" name="new_water_preset"/> - <menu_item_call label="編輯自訂配置…" name="edit_water_preset"/> - <menu_item_call label="刪除自訂配置…" name="delete_water_preset"/> - </menu> - <menu label="天空自訂配置" name="Sky Presets"> - <menu_item_call label="新的自訂配置…" name="new_sky_preset"/> - <menu_item_call label="編輯自訂配置…" name="edit_sky_preset"/> - <menu_item_call label="刪除自訂配置…" name="delete_sky_preset"/> - </menu> - <menu label="日的自訂配置" name="Day Presets"> - <menu_item_call label="新的自訂配置…" name="new_day_preset"/> - <menu_item_call label="編輯自訂配置…" name="edit_day_preset"/> - <menu_item_call label="刪除自訂配置…" name="delete_day_preset"/> - </menu> + <menu_item_check label="使用共享環境" name="Use Shared Environment"/> + <menu_item_call label="我的環境…" name="my_environs"/> + <menu_item_call label="個人照明⋯" name="adjustment_tool"/> + <menu_item_check label="暫停雲彩" name="pause_clouds"/> </menu> </menu> <menu label="建造" name="BuildTools"> @@ -344,6 +329,9 @@ <menu_item_check label="自動半透明遮罩（非遞延）" name="Automatic Alpha Masks (non-deferred)"/> <menu_item_check label="動作材質" name="Animation Textures"/> <menu_item_check label="關閉材質" name="Disable Textures"/> + <menu_item_check label="停用環境光" name="Disable Ambient"/> + <menu_item_check label="停用日光" name="Disable Sunlight"/> + <menu_item_check label="停用本地光線" name="Disable Local Lights"/> <menu_item_check label="全解析度材質" name="Rull Res Textures"/> <menu_item_check label="使附著燈光呈像" name="Render Attached Lights"/> <menu_item_check label="使附著例子效果呈像" name="Render Attached Particles"/> @@ -481,6 +469,7 @@ <menu_item_call label="裙子" name="Skirt"/> <menu_item_call label="半透明" name="Alpha"/> <menu_item_call label="刺青" name="Tattoo"/> + <menu_item_call label="通用值" name="Universal"/> <menu_item_call label="身體物理" name="Physics"/> <menu_item_call label="全部衣服" name="All Clothes"/> </menu> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 557aab928d..4d0f1cb85b 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -1954,6 +1954,11 @@ SHA1 指紋：[MD5_DIGEST] 若不勾選這選項，可能會移除地段所有人為防止惡意騷擾及為維護隱私、保護幼未成年居民不接觸成年限制級內容的限制措施。 若有必要請與地段所有人溝通。 <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="EstateParcelEnvironmentOverride"> + 取消勾選這選項會移除地段擁有人增設於地段的任何自訂環境設定。 若有必要請與地段所有人溝通。 +你確定要繼續嗎？ + <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> + </notification> <notification name="RegionEntryAccessBlocked"> 你所欲前往的地區含有超過你目前偏好的分級的內容。 你可以到「我自己 > 偏好設定 > 一般設定」變更你的偏好設定。 <usetemplate name="okbutton" yestext="確定"/> @@ -2433,7 +2438,15 @@ SHA1 指紋：[MD5_DIGEST] 這個「一日循環」檔案參考了一個不存在的天空檔案：[SKY]。 </notification> <notification name="WLRegionApplyFail"> - 抱歉，設定無法套用到地區。 離開地區再返回也許可以解決這個問題。 所得的原因為：[FAIL_REASON] + 抱歉，設定無法套用到地區。 原因：[FAIL_REASON] + </notification> + <notification name="WLLocalTextureDayBlock"> + 一個本地材質正在使用中：軌跡[TRACK]，幀#[FRAMENO]([FRAME]%)，欄位[FIELD]。 +無法儲存使用本地材質的設定。 + </notification> + <notification name="WLLocalTextureFixedBlock"> + 一個本地材質正在欄位[FIELD]使用中。 +無法儲存使用本地材質的設定。 </notification> <notification name="EnvCannotDeleteLastDayCycleKey"> 無法刪除此日循環的最後一組設定，日循環不得為空白。 你應該修改最後一組資料，不要試圖刪除，然後再建立新的。 @@ -4383,4 +4396,76 @@ SHA1 指紋：[MD5_DIGEST] [REASON] <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="FailedToFindSettings"> + 無法從資料庫載入[NAME]的設定。 + </notification> + <notification name="FailedToLoadSettingsApply"> + 無法將設定套用到環境。 + </notification> + <notification name="FailedToBuildSettingsDay"> + 無法將設定套用到環境。 + </notification> + <notification name="NoEnvironmentSettings"> + 這區域不支援環境設定。 + </notification> + <notification label="儲存裝扮" name="SaveSettingAs"> + 把目前的環境設定儲存為： + <form name="form"> + <input name="message"> + [DESC]（新） + </input> + <button name="OK" text="確定"/> + <button name="Cancel" text="取消"/> + </form> + </notification> + <notification name="WLImportFail"> + 無法匯入舊的風光(Windlight)設定[NAME]，來源： +[FILE]。 + +[REASONS] + </notification> + <notification name="WLParcelApplyFail"> + 無法設定此地段的環境。 +請輸入或選擇一個你有權修改的地段。 + </notification> + <notification name="SettingsUnsuported"> + 這地區不支援設定。 +請移位到支援設定的地區，再試一次。 + </notification> + <notification name="SettingsConfirmLoss"> + 你即將針對名爲"[NAME]"的[TYPE]放棄變更。 +確定繼續？ + <usetemplate ignoretext="確定放棄變更？" name="okcancelignore" notext="取消" yestext="確定"/> + </notification> + <notification name="SettingsConfirmReset"> + 你即將移除所有已用的設定。 +確定繼續？ + <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + 你即將移除所有已用的個人照明設定。 +確定繼續？ + <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> + </notification> + <notification name="SettingsMakeNoTrans"> + 你即將把無法轉移的設定匯入這個日循環。 如果繼續，將使得你正在編輯的設定也變成無法轉移。 + +這個改變無法取消復原。 + +確定繼續？ + <usetemplate ignoretext="確定要把設定變成無法轉移？" name="okcancelignore" notext="取消" yestext="確定"/> + </notification> + <notification name="NoEditFromLibrary"> + 你不得直接從資源庫編輯設定。 +請複製到你自己的收納區，然後再試一次。 + </notification> + <notification name="EnvironmentApplyFailed"> + 這些設定發生一個問題。 它們此時無法儲存或套用。 + </notification> + <notification name="TrackLoadFailed"> + 無法把軌跡載入[TRACK]。 + </notification> + <notification name="TrackLoadMismatch"> + 無法把軌跡從[TRACK1]載入[TRACK2]。 + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml index f5111d629a..10ed653472 100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> - <panel name="avatar_tattoo_color_panel"> - <texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點按以挑選圖片"/> - <texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點按以挑選圖片"/> - <texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點按以挑選圖片"/> - <color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/> - </panel> + <scroll_container name="avatar_tattoo_scroll"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點按以挑選圖片"/> + <color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_edit_universal.xml b/indra/newview/skins/default/xui/zh/panel_edit_universal.xml new file mode 100644 index 0000000000..6974efcc89 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_edit_universal.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_universal_panel"> + <scroll_container name="avatar_universal_scroll"> + <panel name="avatar_universal_color_panel"> + <texture_picker label="頭部刺青" name="Head Universal Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="上半身刺青" name="Upper Universal Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="下半身刺青" name="Lower Universal Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="裙子刺青" name="Skirt Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="頭髮刺青" name="Hair Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="眼睛刺青" name="Eyes Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="左臂刺青" name="Left Arm Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="左腿刺青" name="Left Leg Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="Aux1刺青" name="Aux1 Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="Aux2刺青" name="Aux2 Tattoo" tool_tip="點按以挑選圖片"/> + <texture_picker label="Aux3刺青" name="Aux3 Tattoo" tool_tip="點按以挑選圖片"/> + <color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml index 4dd7ea6d93..d41785858a 100644 --- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml @@ -45,6 +45,9 @@ <string name="edit_tattoo_title"> 刺青編輯中 </string> + <string name="edit_universal_title"> + 編輯通用值 + </string> <string name="edit_physics_title"> 身體物理編輯中 </string> @@ -93,6 +96,9 @@ <string name="tattoo_desc_text"> 刺青： </string> + <string name="universal_desc_text"> + 通用值： + </string> <string name="physics_desc_text"> 身體物理： </string> diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml index afea391dda..8caadf50ae 100644 --- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml @@ -1,33 +1,116 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="環境" name="panel_env_info"> - <text name="water_settings_title"> - 選擇你希望到你地區的訪客所能看到的水和天空 / 日循環設定。 詳情 - </text> - <radio_group name="region_settings_radio_group"> - <radio_item label="使用第二人生預設值" name="use_sl_default_settings"/> - <radio_item label="使用以下設定" name="use_my_settings"/> - </radio_group> - <panel name="user_environment_settings"> - <text name="water_settings_title"> - 水的設定 - </text> - <combo_box name="water_settings_preset_combo"> - <combo_box.item label="-選擇一個自訂配置-" name="item0"/> - </combo_box> - <text name="sky_dayc_settings_title"> - 天空／日循環 - </text> - <radio_group name="sky_dayc_settings_radio_group"> - <radio_item label="固定天空" name="my_sky_settings"/> - <radio_item label="日循環" name="my_dayc_settings"/> - </radio_group> - <combo_box name="sky_settings_preset_combo"> - <combo_box.item label="-選擇一個自訂配置-" name="item0"/> - </combo_box> - <combo_box name="dayc_settings_preset_combo"> - <combo_box.item label="-選擇一個自訂配置-" name="item0"/> - </combo_box> - </panel> - <button label="套用" name="apply_btn"/> - <button label="取消" name="cancel_btn"/> + <string name="str_label_use_default"> + 使用預設設定 + </string> + <string name="str_label_use_region"> + 使用地區設定 + </string> + <string name="str_altitude_desription"> + 天空 [INDEX]([ALTITUDE]m) + </string> + <string name="str_no_parcel"> + 未選擇地段。 環境設定已停用。 + </string> + <string name="str_cross_region"> + 跨越地區不提供環境設定。 + </string> + <string name="str_legacy"> + 這地區不提供環境設定。 + </string> + <string name="str_disallowed"> + 領地管理人不允許改變此區域的地段環境。 + </string> + <string name="str_too_small"> + 地段必須至少128平方公尺才可支撐環境。 + </string> + <string name="str_empty"> + （空白） + </string> + <string name="str_region_env"> + （地區環境） + </string> + <layout_stack> + <layout_panel name="pnl_environment_disabled"> + <text name="txt_environment_disabled"> + ... + </text> + </layout_panel> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_config"> + <layout_stack> + <layout_panel name="pnl_environment_current"> + <button label="[USEDEFAULT]" name="btn_usedefault"/> + <button label="使用收納區" name="btn_select_inventory"/> + <button label="自訂" name="btn_edit"/> + <check_box label="地段所有人可強制設定環境" name="chk_allow_override"/> + </layout_panel> + <layout_panel name="pnl_environment_length"> + <text name="lbl_apparent_time"> + [HH]:[MM][AP] ([PRC]%) + </text> + </layout_panel> + <layout_panel name="pnl_environment_buttons"/> + </layout_stack> + </layout_panel> + <layout_panel name="pnl_environment_altitudes"> + <panel name="pnl_alt1"> + <text name="txt_alt1"> + 天空[INDEX] + [ALTITUDE]公尺 + </text> + <line_editor name="edt_invname_alt1"> + 未知 + </line_editor> + <settings_drop_target name="sdt_alt1" tool_tip="將一個設定從收納區拖曳到這個目標箱框，便可把它選定為目前的天空。"/> + </panel> + <panel name="pnl_alt2"> + <text name="txt_alt2"> + 天空[INDEX] + [ALTITUDE]公尺 + </text> + <line_editor name="edt_invname_alt2"> + 未知 + </line_editor> + <settings_drop_target name="sdt_alt2" tool_tip="將一個設定從收納區拖曳到這個目標箱框，便可把它選定為目前的天空。"/> + </panel> + <panel name="pnl_alt3"> + <text name="txt_alt3"> + 天空[INDEX] + [ALTITUDE]公尺 + </text> + <line_editor name="edt_invname_alt3"> + 未知 + </line_editor> + <settings_drop_target name="sdt_alt3" tool_tip="將一個設定從收納區拖曳到這個目標箱框，便可把它選定為目前的天空。"/> + </panel> + <multi_slider initial_value="0" name="sld_altitudes"> + <slider name="sld1" value="1000"/> + <slider name="sld2" value="2000"/> + <slider name="sld3" value="3000"/> + </multi_slider> + <panel name="pnl_ground"> + <text name="txt_ground"> + 地面 + </text> + <line_editor name="edt_invname_ground"> + 未知 + </line_editor> + <settings_drop_target name="sdt_ground" tool_tip="將一個設定從收納區拖曳到這個目標箱框，便可把它選定為地面水平的天空。"/> + </panel> + <panel name="pnl_water"> + <text name="txt_water"> + 水文 + </text> + <line_editor name="edt_invname_water"> + 未知 + </line_editor> + <settings_drop_target name="sdt_water" tool_tip="將一個設定從收納區拖曳到這個目標箱框，便可把它選定為目前的水文。"/> + </panel> + <button label="重設" name="btn_rst_altitudes" tool_tip="重設為預設高度"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml new file mode 100644 index 0000000000..a352055d6d --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_atmos.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="大氣與照明" name="panel_settings_sky_atmos"/> diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml new file mode 100644 index 0000000000..e27e2278df --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_clouds.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="雲彩" name="panel_settings_sky_clouds"> + <layout_stack> + <layout_panel> + <slider label="X" name="cloud_density_x"/> + <slider label="Y" name="cloud_density_y"/> + <slider label="D" name="cloud_density_d"/> + <slider label="X" name="cloud_detail_x"/> + <slider label="Y" name="cloud_detail_y"/> + <slider label="D" name="cloud_detail_d"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml new file mode 100644 index 0000000000..ddd5ecfe49 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="密度" name="panel_settings_sky_density"> + <layout_stack> + <layout_panel> + <slider label="Rayleigh指數項：" name="rayleigh_exponential"/> + <slider label="Rayleigh指數比例尺：" name="rayleigh_exponential_scale"/> + <slider label="Rayleigh線性項：" name="rayleigh_linear"/> + <slider label="Rayleigh常數項：" name="rayleigh_constant"/> + <slider label="Rayleigh最大高度：" name="rayleigh_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="Mie指數項：" name="mie_exponential"/> + <slider label="Mie指數比例尺：" name="mie_exponential_scale"/> + <slider label="Mie線性項：" name="mie_linear"/> + <slider label="Mie常數項：" name="mie_constant"/> + <slider label="Mie Aniso因數：" name="mie_aniso_factor"/> + <slider label="Mie最大高度：" name="mie_max_altitude"/> + </layout_panel> + <layout_panel> + <slider label="吸收指數項：" name="absorption_exponential"/> + <slider label="吸收指數比例尺：" name="absorption_exponential_scale"/> + <slider label="吸收線性項：" name="absorption_linear"/> + <slider label="吸收常數項：" name="absorption_constant"/> + <slider label="吸收最大高度：" name="absorption_max_altitude"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..7d1d433cbc --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="日與月" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="顯示指標" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="顯示指標" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_settings_water.xml b/indra/newview/skins/default/xui/zh/panel_settings_water.xml new file mode 100644 index 0000000000..59687c001b --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_settings_water.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="水文" name="panel_settings_water"> + <layout_stack name="water_stack1"> + <layout_panel> + <text name="FresnelOffsetText"> + 菲涅耳偏距： + </text> + </layout_panel> + <layout_panel> + <layout_stack name="water_stack2"> + <layout_panel> + <slider label="X:" name="water_normal_scale_x"/> + <slider label="Y:" name="water_normal_scale_y"/> + <slider label="Z:" name="water_normal_scale_z"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml index 9a4e2f68a8..f7868ff855 100644 --- a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="材質" name="Texture"> - <panel.string name="string repeats per meter"> - 每公尺重覆次數 - </panel.string> - <panel.string name="string repeats per face"> - 每一面重覆次數 - </panel.string> <text name="color label"> 顏色 </text> @@ -114,4 +108,5 @@ <spinner label="水平偏距" name="shinyOffsetU"/> <spinner label="垂直偏距" name="shinyOffsetV"/> <check_box initial_value="false" label="對齊平面" name="checkbox planar align" tool_tip="以最後所選擇的面為基準，對齊全部所選擇的面上的材質。 這必須使用平面材質映射方式。"/> + <button label="對齊" label_selected="對齊目前的材質層次" name="button align textures" tool_tip="對齊目前的材質層次"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml index e3b0eb1261..e7865b6056 100644 --- a/indra/newview/skins/default/xui/zh/role_actions.xml +++ b/indra/newview/skins/default/xui/zh/role_actions.xml @@ -33,6 +33,7 @@ <action description="更改音樂和媒體設定" longdescription="在「土地資料」> 媒體頁籤更改串流音樂和影片設定。" name="land change media" value="20"/> <action description="切換「編輯地形」設定" longdescription="切換「編輯地形」設定。 *警告* 「土地資料」> 「選項」頁籤 >「編輯地形」可允許任何人變更你的土地形狀，放置或移動 Linden 植物。 賦予這項能力之前，敬請慎重考慮。 編輯地形可在「土地資料」> 選項頁籤做切換。" name="land edit" value="21"/> <action description="切換各項「土地資料」> 選項設定" longdescription="在「土地資料」> 選項頁籤切換「安全（無傷害）」設定，並允許其他居民在群組所有土地上「編輯地形」、「建製」、「建立地標」、「執行腳本」。" name="land options" value="22"/> + <action description="修改環境設定和日循環。" longdescription="從「土地資料」>「環境頁籤」變更環境設定和日循環。" name="land change environment" value="46"/> </action_set> <action_set description="這些能力包括可允許成員在群組所有地段上規避限制。" name="Parcel Powers"> <action description="固定允許「編輯地形」" longdescription="身負具此能力的角色的成員可以在群組所有地段上編輯地形，無論這功能在「土地資料」> 選項頁籤裡是否被禁止。" name="land allow edit land" value="23"/> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index c265f5b595..572b79816b 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -653,6 +653,15 @@ http://secondlife.com/viewer-access-faq <string name="BUTTON_HELP"> 顯示幫助 </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + 這種類型的物項不能附著 +到這一區域的記事卡。 + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + 唯有「下一所有人」權限 +不受限制的物項才可 +附著到記事卡。 + </string> <string name="Searching"> 搜尋中... </string> @@ -729,6 +738,18 @@ http://secondlife.com/viewer-access-faq 上傳要求發生錯誤。 請參見： http://secondlife.com/support 求助解決問題。 </string> + <string name="SettingValidationError"> + 匯入設定[NAME]時驗證失敗 + </string> + <string name="SettingImportFileError"> + 無法開啟檔案[FILE] + </string> + <string name="SettingParseFileError"> + 無法開啟檔案[FILE] + </string> + <string name="SettingTranslateError"> + 無法轉譯舊的風光(windlight)[NAME] + </string> <string name="texture"> 材質 </string> @@ -804,6 +825,9 @@ http://secondlife.com/support 求助解決問題。 <string name="symbolic folder link"> 資料夾聯結 </string> + <string name="settings blob"> + 設定 + </string> <string name="mesh"> 網面 </string> @@ -1134,6 +1158,9 @@ http://secondlife.com/support 求助解決問題。 <string name="ForceSitAvatar"> 強迫你的化身坐下 </string> + <string name="ChangeEnvSettings"> + 改變你的環境設定 + </string> <string name="NotConnected"> 未聯接 </string> @@ -1285,6 +1312,9 @@ http://secondlife.com/support 求助解決問題。 <string name="tattoo"> 刺青 </string> + <string name="universal"> + 通用值 + </string> <string name="physics"> 身體物理 </string> @@ -1327,6 +1357,9 @@ http://secondlife.com/support 求助解決問題。 <string name="tattoo_not_worn"> 刺青未穿 </string> + <string name="universal_not_worn"> + 未穿戴通用值 + </string> <string name="physics_not_worn"> 身體物理未穿 </string> @@ -1378,6 +1411,9 @@ http://secondlife.com/support 求助解決問題。 <string name="create_new_tattoo"> 創造新刺青 </string> + <string name="create_new_universal"> + 創立新的通用值 + </string> <string name="create_new_physics"> 創造新身體物理 </string> @@ -2525,6 +2561,27 @@ http://secondlife.com/support 求助解決問題。 <string name="RegionSettings"> 地區設定 </string> + <string name="NoEnvironmentSettings"> + 這區域不支援環境設定。 + </string> + <string name="EnvironmentSun"> + 太陽 + </string> + <string name="EnvironmentMoon"> + 月亮 + </string> + <string name="EnvironmentBloom"> + 開花 + </string> + <string name="EnvironmentCloudNoise"> + 雲彩噪度 + </string> + <string name="EnvironmentNormalMap"> + 正常地圖 + </string> + <string name="EnvironmentTransparent"> + 透明 + </string> <string name="ClassifiedClicksTxt"> 點按：[TELEPORT] 瞬間傳送，[MAP] 地圖，[PROFILE] 檔案 </string> @@ -4756,6 +4813,9 @@ http://secondlife.com/support 求助解決問題。 <string name="New Tattoo"> 新刺青 </string> + <string name="New Universal"> + 新通用值 + </string> <string name="New Physics"> 新身體物理 </string> @@ -4882,6 +4942,15 @@ http://secondlife.com/support 求助解決問題。 <string name="Female - Wow"> 女性 - 哇塞 </string> + <string name="New Daycycle"> + 新的日循環 + </string> + <string name="New Water"> + 新的水文 + </string> + <string name="New Sky"> + 新的天空 + </string> <string name="/bow"> /彎腰點頭 </string> @@ -5422,6 +5491,12 @@ http://secondlife.com/support 求助解決問題。 <string name="BeaconMedia"> 檢視媒體的導引（白色） </string> + <string name="BeaconSun"> + 檢視太陽方向指標（橘色） + </string> + <string name="BeaconMoon"> + 檢視月亮方向指標（紫色） + </string> <string name="ParticleHiding"> 隱藏粒子效果 </string> @@ -5449,6 +5524,12 @@ http://secondlife.com/support 求助解決問題。 <string name="Command_Destinations_Label"> 目的地 </string> + <string name="Command_Environments_Label"> + 我的環境 + </string> + <string name="Command_Facebook_Label"> + 臉書 + </string> <string name="Command_Flickr_Label"> Flickr </string> @@ -5542,6 +5623,12 @@ http://secondlife.com/support 求助解決問題。 <string name="Command_Destinations_Tooltip"> 你可能感興趣的目的地 </string> + <string name="Command_Environments_Tooltip"> + 我的環境 + </string> + <string name="Command_Facebook_Tooltip"> + 發佈到臉書 + </string> <string name="Command_Flickr_Tooltip"> 上傳到 Flickr </string> @@ -5737,6 +5824,12 @@ http://secondlife.com/support 求助解決問題。 <string name="ExperiencePermission12"> 自動接受各種體驗權限 </string> + <string name="ExperiencePermission16"> + 強迫你的化身坐下 + </string> + <string name="ExperiencePermission17"> + 改變你的環境設定 + </string> <string name="ExperiencePermissionShortUnknown"> 進行了未知的操作：[Permission] </string> @@ -5761,6 +5854,12 @@ http://secondlife.com/support 求助解決問題。 <string name="ExperiencePermissionShort12"> 權限 </string> + <string name="ExperiencePermissionShort16"> + 坐下 + </string> + <string name="ExperiencePermissionShort17"> + 環境 + </string> <string name="logging_calls_disabled_log_empty"> 交談未留記錄。 若想開始留記錄，請到「偏好設定 > 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。 </string> |
