From d2a7f239cd5c545ebed6cc3802e6114002d00946 Mon Sep 17 00:00:00 2001 From: eli <eli@lindenlab.com> Date: Mon, 9 Sep 2019 13:21:01 -0700 Subject: [PATCH] FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440) --- .../xui/de/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/de/floater_beacons.xml | 2 + .../default/xui/de/floater_bulk_perms.xml | 1 + .../xui/de/floater_edit_ext_day_cycle.xml | 43 ++++-- .../xui/de/floater_my_environments.xml | 8 +- .../default/xui/de/floater_perms_default.xml | 4 + .../default/xui/de/floater_pick_track.xml | 22 +++ .../xui/de/floater_preview_texture.xml | 2 +- .../xui/de/floater_settings_picker.xml | 21 ++- .../default/xui/de/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/de/menu_inventory.xml | 2 +- .../default/xui/de/menu_inventory_add.xml | 1 + .../skins/default/xui/de/menu_outfit_gear.xml | 1 + .../skins/default/xui/de/menu_viewer.xml | 5 + .../skins/default/xui/de/notifications.xml | 55 +++++++- .../default/xui/de/panel_edit_tattoo.xml | 14 +- .../default/xui/de/panel_edit_universal.xml | 19 +++ .../default/xui/de/panel_edit_wearable.xml | 6 + .../xui/de/panel_region_environment.xml | 125 ++++++++++------ .../xui/de/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/de/panel_tools_texture.xml | 7 +- .../skins/default/xui/de/role_actions.xml | 1 + .../newview/skins/default/xui/de/strings.xml | 83 ++++++++++- .../xui/es/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/es/floater_beacons.xml | 2 + .../default/xui/es/floater_bulk_perms.xml | 1 + .../xui/es/floater_edit_ext_day_cycle.xml | 49 +++++-- .../xui/es/floater_my_environments.xml | 10 +- .../default/xui/es/floater_perms_default.xml | 4 + .../default/xui/es/floater_pick_track.xml | 22 +++ .../xui/es/floater_preview_texture.xml | 2 +- .../xui/es/floater_settings_picker.xml | 21 ++- .../default/xui/es/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/es/menu_inventory.xml | 4 +- .../default/xui/es/menu_inventory_add.xml | 1 + .../skins/default/xui/es/menu_outfit_gear.xml | 1 + .../skins/default/xui/es/menu_viewer.xml | 5 + .../skins/default/xui/es/notifications.xml | 53 ++++++- .../default/xui/es/panel_edit_tattoo.xml | 14 +- .../default/xui/es/panel_edit_universal.xml | 19 +++ .../default/xui/es/panel_edit_wearable.xml | 6 + .../xui/es/panel_region_environment.xml | 125 ++++++++++------ .../xui/es/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/es/panel_tools_texture.xml | 7 +- .../skins/default/xui/es/role_actions.xml | 1 + .../newview/skins/default/xui/es/strings.xml | 75 +++++++++- .../xui/fr/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/fr/floater_beacons.xml | 2 + .../default/xui/fr/floater_bulk_perms.xml | 1 + .../xui/fr/floater_edit_ext_day_cycle.xml | 39 +++-- .../xui/fr/floater_my_environments.xml | 8 +- .../default/xui/fr/floater_perms_default.xml | 4 + .../default/xui/fr/floater_pick_track.xml | 22 +++ .../xui/fr/floater_preview_texture.xml | 6 +- .../xui/fr/floater_settings_picker.xml | 21 ++- .../default/xui/fr/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/fr/menu_inventory.xml | 2 +- .../default/xui/fr/menu_inventory_add.xml | 1 + .../skins/default/xui/fr/menu_outfit_gear.xml | 1 + .../skins/default/xui/fr/menu_viewer.xml | 5 + .../skins/default/xui/fr/notifications.xml | 57 +++++++- .../default/xui/fr/panel_edit_tattoo.xml | 14 +- .../default/xui/fr/panel_edit_universal.xml | 19 +++ .../default/xui/fr/panel_edit_wearable.xml | 6 + .../xui/fr/panel_region_environment.xml | 125 ++++++++++------ .../xui/fr/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/fr/panel_settings_water.xml | 2 +- .../default/xui/fr/panel_tools_texture.xml | 7 +- .../skins/default/xui/fr/role_actions.xml | 1 + .../newview/skins/default/xui/fr/strings.xml | 82 ++++++++++- .../xui/it/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/it/floater_beacons.xml | 2 + .../default/xui/it/floater_bulk_perms.xml | 1 + .../xui/it/floater_edit_ext_day_cycle.xml | 45 ++++-- .../xui/it/floater_my_environments.xml | 8 +- .../default/xui/it/floater_perms_default.xml | 4 + .../default/xui/it/floater_pick_track.xml | 22 +++ .../xui/it/floater_preview_texture.xml | 2 +- .../xui/it/floater_settings_picker.xml | 25 +++- .../default/xui/it/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/it/menu_inventory.xml | 2 +- .../default/xui/it/menu_inventory_add.xml | 1 + .../skins/default/xui/it/menu_outfit_gear.xml | 1 + .../skins/default/xui/it/menu_viewer.xml | 5 + .../skins/default/xui/it/notifications.xml | 59 ++++++-- .../default/xui/it/panel_edit_tattoo.xml | 14 +- .../default/xui/it/panel_edit_universal.xml | 19 +++ .../default/xui/it/panel_edit_wearable.xml | 6 + .../xui/it/panel_region_environment.xml | 125 ++++++++++------ .../xui/it/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/it/panel_settings_water.xml | 2 +- .../default/xui/it/panel_tools_texture.xml | 7 +- .../skins/default/xui/it/role_actions.xml | 1 + .../newview/skins/default/xui/it/strings.xml | 85 +++++++++-- .../xui/ja/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/ja/floater_beacons.xml | 2 + .../default/xui/ja/floater_bulk_perms.xml | 1 + .../xui/ja/floater_edit_ext_day_cycle.xml | 39 +++-- .../xui/ja/floater_fixedenvironment.xml | 2 +- .../xui/ja/floater_my_environments.xml | 8 +- .../default/xui/ja/floater_perms_default.xml | 4 + .../default/xui/ja/floater_pick_track.xml | 22 +++ .../xui/ja/floater_settings_picker.xml | 21 ++- .../default/xui/ja/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/ja/menu_inventory.xml | 2 +- .../default/xui/ja/menu_inventory_add.xml | 1 + .../skins/default/xui/ja/menu_outfit_gear.xml | 1 + .../default/xui/ja/menu_settings_gear.xml | 2 +- .../skins/default/xui/ja/menu_viewer.xml | 5 + .../skins/default/xui/ja/notifications.xml | 53 ++++++- .../default/xui/ja/panel_edit_classified.xml | 2 +- .../default/xui/ja/panel_edit_tattoo.xml | 14 +- .../default/xui/ja/panel_edit_universal.xml | 19 +++ .../default/xui/ja/panel_edit_wearable.xml | 6 + .../newview/skins/default/xui/ja/panel_me.xml | 6 +- .../xui/ja/panel_region_environment.xml | 125 ++++++++++------ .../xui/ja/panel_settings_sky_density.xml | 10 +- .../xui/ja/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/ja/panel_settings_water.xml | 2 +- .../default/xui/ja/panel_tools_texture.xml | 7 +- .../skins/default/xui/ja/role_actions.xml | 1 + .../newview/skins/default/xui/ja/strings.xml | 79 ++++++++++- .../xui/pt/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/pt/floater_beacons.xml | 2 + .../default/xui/pt/floater_bulk_perms.xml | 1 + .../xui/pt/floater_edit_ext_day_cycle.xml | 41 ++++-- .../xui/pt/floater_my_environments.xml | 8 +- .../default/xui/pt/floater_perms_default.xml | 4 + .../default/xui/pt/floater_pick_track.xml | 22 +++ .../xui/pt/floater_settings_picker.xml | 21 ++- .../default/xui/pt/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/pt/menu_inventory.xml | 2 +- .../default/xui/pt/menu_inventory_add.xml | 1 + .../skins/default/xui/pt/menu_outfit_gear.xml | 1 + .../skins/default/xui/pt/menu_viewer.xml | 9 +- .../skins/default/xui/pt/notifications.xml | 53 ++++++- .../default/xui/pt/panel_edit_tattoo.xml | 14 +- .../default/xui/pt/panel_edit_universal.xml | 19 +++ .../default/xui/pt/panel_edit_wearable.xml | 6 + .../xui/pt/panel_region_environment.xml | 125 ++++++++++------ .../xui/pt/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/pt/panel_tools_texture.xml | 7 +- .../skins/default/xui/pt/role_actions.xml | 1 + .../newview/skins/default/xui/pt/strings.xml | 79 ++++++++++- .../default/xui/ru/floater_about_land.xml | 2 +- .../xui/ru/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/ru/floater_beacons.xml | 2 + .../default/xui/ru/floater_bulk_perms.xml | 1 + .../xui/ru/floater_edit_ext_day_cycle.xml | 47 +++++-- .../xui/ru/floater_fixedenvironment.xml | 6 +- .../xui/ru/floater_my_environments.xml | 12 +- .../default/xui/ru/floater_perms_default.xml | 4 + .../default/xui/ru/floater_pick_track.xml | 22 +++ .../xui/ru/floater_preview_texture.xml | 8 +- .../xui/ru/floater_settings_picker.xml | 21 ++- .../default/xui/ru/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/ru/menu_inventory.xml | 4 +- .../default/xui/ru/menu_inventory_add.xml | 1 + .../skins/default/xui/ru/menu_outfit_gear.xml | 1 + .../default/xui/ru/menu_save_settings.xml | 2 +- .../default/xui/ru/menu_settings_gear.xml | 4 +- .../skins/default/xui/ru/menu_viewer.xml | 5 + .../skins/default/xui/ru/notifications.xml | 73 ++++++++-- .../default/xui/ru/panel_edit_tattoo.xml | 14 +- .../default/xui/ru/panel_edit_universal.xml | 19 +++ .../default/xui/ru/panel_edit_wearable.xml | 6 + .../xui/ru/panel_region_environment.xml | 133 +++++++++++------- .../xui/ru/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/ru/panel_tools_texture.xml | 7 +- .../skins/default/xui/ru/role_actions.xml | 1 + .../newview/skins/default/xui/ru/strings.xml | 83 ++++++++++- .../xui/tr/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/tr/floater_beacons.xml | 2 + .../default/xui/tr/floater_bulk_perms.xml | 1 + .../xui/tr/floater_edit_ext_day_cycle.xml | 39 +++-- .../xui/tr/floater_my_environments.xml | 8 +- .../default/xui/tr/floater_perms_default.xml | 4 + .../default/xui/tr/floater_pick_track.xml | 22 +++ .../skins/default/xui/tr/floater_picks.xml | 2 +- .../xui/tr/floater_preview_texture.xml | 2 +- .../xui/tr/floater_settings_picker.xml | 21 ++- .../default/xui/tr/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/tr/menu_inventory.xml | 2 +- .../default/xui/tr/menu_inventory_add.xml | 1 + .../skins/default/xui/tr/menu_outfit_gear.xml | 1 + .../skins/default/xui/tr/menu_viewer.xml | 5 + .../skins/default/xui/tr/notifications.xml | 52 ++++++- .../default/xui/tr/panel_edit_classified.xml | 2 +- .../default/xui/tr/panel_edit_tattoo.xml | 14 +- .../default/xui/tr/panel_edit_universal.xml | 19 +++ .../default/xui/tr/panel_edit_wearable.xml | 6 + .../newview/skins/default/xui/tr/panel_me.xml | 2 +- .../xui/tr/panel_region_environment.xml | 125 ++++++++++------ .../xui/tr/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/tr/panel_tools_texture.xml | 7 +- .../skins/default/xui/tr/role_actions.xml | 1 + .../newview/skins/default/xui/tr/strings.xml | 75 +++++++++- .../xui/zh/floater_adjust_environment.xml | 24 ++++ .../skins/default/xui/zh/floater_beacons.xml | 2 + .../default/xui/zh/floater_bulk_perms.xml | 1 + .../xui/zh/floater_edit_ext_day_cycle.xml | 39 +++-- .../xui/zh/floater_fixedenvironment.xml | 2 +- .../xui/zh/floater_my_environments.xml | 8 +- .../default/xui/zh/floater_perms_default.xml | 4 + .../default/xui/zh/floater_pick_track.xml | 22 +++ .../xui/zh/floater_preview_texture.xml | 2 +- .../xui/zh/floater_settings_picker.xml | 21 ++- .../default/xui/zh/floater_texture_ctrl.xml | 18 ++- .../skins/default/xui/zh/menu_inventory.xml | 2 +- .../default/xui/zh/menu_inventory_add.xml | 1 + .../skins/default/xui/zh/menu_outfit_gear.xml | 1 + .../default/xui/zh/menu_save_settings.xml | 2 +- .../skins/default/xui/zh/menu_viewer.xml | 5 + .../skins/default/xui/zh/notifications.xml | 57 +++++++- .../default/xui/zh/panel_edit_tattoo.xml | 14 +- .../default/xui/zh/panel_edit_universal.xml | 19 +++ .../default/xui/zh/panel_edit_wearable.xml | 6 + .../xui/zh/panel_region_environment.xml | 125 ++++++++++------ .../xui/zh/panel_settings_sky_density.xml | 14 +- .../xui/zh/panel_settings_sky_sunmoon.xml | 15 +- .../default/xui/zh/panel_tools_texture.xml | 7 +- .../skins/default/xui/zh/role_actions.xml | 1 + .../newview/skins/default/xui/zh/strings.xml | 85 +++++++++-- 223 files changed, 3567 insertions(+), 832 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/de/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/de/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/es/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/es/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/es/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/it/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/it/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/it/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_edit_universal.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_adjust_environment.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_pick_track.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_edit_universal.xml 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 00000000000..776a866077b --- /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 1a052bd8149..c44cd407de3 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 9454933264e..7a3fa41a24a 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_ext_day_cycle.xml index dd53b470d02..c21eec18930 100644 --- 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 @@ -7,10 +7,10 @@ Tageszyklus bearbeiten </string> <string name="hint_new"> - Geben Sie einen Namen für den Tageszyklus ein, passen Sie die Steuerungen an, um den Tageszyklus zu erstellen, und klicken Sie auf „Speichern“. + 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 den Tageszyklus zu bearbeiten, passen Sie die unten angezeigten Steuerungen an und klicken Sie auf „Speichern“. + Um Ihren Tageszyklus zu bearbeiten, passen Sie die unten angezeigten Steuerungen an und klicken Sie auf „Speichern“. </string> <string name="time_label"> ([HH]:[MM]) @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Schritt vor"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Schritt zurück"/> + <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> - <button label="Frame hinzufügen" name="add_frame"/> - <button label="Frame laden" name="btn_load_frame"/> - <button label="Frame löschen" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/de/floater_my_environments.xml b/indra/newview/skins/default/xui/de/floater_my_environments.xml index 16f7d6f6462..ff5556304aa 100644 --- a/indra/newview/skins/default/xui/de/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/de/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="Leere Ordner anzeigen" name="chk_showfolders"/> + <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="Diese Einstellung löschen"/> + <button name="btn_del" tool_tip="Ausgewähltes Objekt löschen"/> </panel> </layout_panel> </layout_stack> 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 6274739f702..a9b845611a2 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 00000000000..d5a565a2b0a --- /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_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml index 526c0813bd5..eacd11c3e6b 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml @@ -13,7 +13,7 @@ [WIDTH]px x [HEIGHT]px </text> <text name="aspect_ratio"> - Seitenverhältnis anzeigen + Vorschau Seitenverhältnis </text> <combo_box name="combo_aspect_ratio" tool_tip="Mit einem vordefinierten Seitenverhältnis anzeigen"> <combo_item name="Unconstrained"> diff --git a/indra/newview/skins/default/xui/de/floater_settings_picker.xml b/indra/newview/skins/default/xui/de/floater_settings_picker.xml index 1d8951078f3..1fe417bdee4 100644 --- a/indra/newview/skins/default/xui/de/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="AUSWÄHLEN: EINSTELLUNGEN"> - <floater.string name="choose_picture"> - Klicken, um ein Bild auszuwählen - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Texturen filtern" name="flt_inventory_search"/> - <check_box initial_value="false" label="Ordner anzeigen" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 b794d879f0f..b818a7d4800 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 8aafd162210..84cded77ce7 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Auf Region anwenden" name="Settings Apply Region"/> <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 4b4e96045de..251b219a126 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml @@ -23,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"> 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 211cc5c54e2..817ec28cff4 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_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 233adc5d6ca..6ea4ae9ab3d 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -86,6 +86,7 @@ <menu_item_check label="Mitternacht" name="Midnight"/> <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> @@ -330,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"/> @@ -461,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 cc4ee17097e..250e7c81f27 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1977,8 +1977,9 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - Durch Deaktivieren dieser Option können jegliche benutzerdefinierten Umgebungen entfernt werden, die von den Parzelleneigentümern zu den Parzellen hinzugefügt wurden. Bitte sprechen Sie mit den Parzellenbesitzern, falls erforderlich. - <usetemplate name="okbutton" yestext="OK"/> + 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. @@ -2459,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. @@ -4420,8 +4429,21 @@ Wählen Sie eine kleinere Landfläche aus. <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"> - Alter Windlight-Einstellungen aus [FILE] können nicht importiert werden. + 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. @@ -4429,13 +4451,23 @@ Bitte eine Parzelle eingeben oder auswählen, für die Sie die Änderungsrechte </notification> <notification name="SettingsUnsuported"> Einstellungen werden von dieser Region nicht unterstützt. -Bitte wechseln sie zu einer Region mit aktivierten Einstellungen und versuchen Sie es erneut. +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. @@ -4444,4 +4476,17 @@ 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 075a9d752a3..a74d16e50a7 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 00000000000..5ae4021b8f5 --- /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 94a79a0bbd9..83593e553f5 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 04b6926485b..f5e249b0832 100644 --- a/indra/newview/skins/default/xui/de/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Regionseinstellungen verwenden </string> - <string name="str_unknow_inventory"> - Unbekannt - </string> <string name="str_altitude_desription"> Himmel [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Einstellungen aus dem Inventar" name="rdo_use_inv_setting"/> - <radio_item label="Benutzerdefinierte Umgebung" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Unbekannt - </line_editor> - <button label="Umgebung bearbeiten" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Boden - </text> - <text name="alt1"> - Himmel [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - Himmel [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - Himmel [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Parzelleneigentümer können die Umgebung außer Kraft setzen" name="chk_allow_override"/> - <button label="Anwenden" name="btn_apply"/> - <button label="Zurücksetzen" name="btn_cancel"/> - </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 index 7778a9fbc30..9234e22d638 100644 --- a/indra/newview/skins/default/xui/de/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/de/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Sonne und Mond" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml index e0505ce1286..9557f2d6d8f 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 26187678a05..5507fcc04d1 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 7cefaf83bcf..cdb89d77fc2 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -636,12 +636,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Hilfe anzeigen </string> <string name="TooltipNotecardNotAllowedTypeDrop"> - Objekte dieses Typs können nicht an -die Region angehängt werden. + 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 Einschränkungen für den + An Notizkarten können nur Objekte ohne +Berechtigungseinschränkungen für den nächsten Eigentümer angehängt werden. </string> <string name="Searching"> @@ -723,6 +723,18 @@ nächsten Eigentümer angehängt werden. 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> @@ -795,12 +807,12 @@ besuchen Sie bitte http://secondlife.com/support <string name="symbolic link"> Link </string> - <string name="settings blob"> - Einstellungen - </string> <string name="symbolic folder link"> Link zu Ordner </string> + <string name="settings blob"> + Einstellungen + </string> <string name="mesh"> mesh </string> @@ -1131,6 +1143,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> @@ -1282,6 +1297,9 @@ besuchen Sie bitte http://secondlife.com/support <string name="tattoo"> Tätowierung </string> + <string name="universal"> + Universal + </string> <string name="physics"> Physik </string> @@ -1324,6 +1342,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> @@ -1375,6 +1396,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> @@ -2516,6 +2540,24 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo <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> @@ -4732,6 +4774,9 @@ Missbrauchsbericht <string name="New Tattoo"> Neue Tätowierung </string> + <string name="New Universal"> + Neues Universal + </string> <string name="New Physics"> Neue Physik </string> @@ -5395,6 +5440,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> @@ -5422,6 +5473,9 @@ 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> @@ -5518,6 +5572,9 @@ 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> @@ -5716,6 +5773,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> @@ -5740,6 +5803,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/es/floater_adjust_environment.xml b/indra/newview/skins/default/xui/es/floater_adjust_environment.xml new file mode 100644 index 00000000000..25b6fad1658 --- /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 49f990c84d9..0eabcc7c276 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 75e324c7efe..5ab13d2b09a 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_ext_day_cycle.xml index 7521b2aed39..c3273ea64eb 100644 --- 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 @@ -18,6 +18,18 @@ <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"> @@ -36,25 +48,36 @@ <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]"/> + <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 name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Ir hacia atrás"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Ir hacia adelante"/> + <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> - <button label="Añadir Marco" name="add_frame"/> - <button label="Cargar Marco" name="btn_load_frame"/> - <button label="Borrar Marco" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/es/floater_my_environments.xml b/indra/newview/skins/default/xui/es/floater_my_environments.xml index 9032ac7aa38..8f636490acc 100644 --- a/indra/newview/skins/default/xui/es/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/es/floater_my_environments.xml @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="my_environments" title="MIS ENTORNOS..."> +<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"> - <check_box initial_value="false" label="Mostrar Carpetas VacÃas" name="chk_showfolders"/> + <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="Borrar esta opción"/> + <button name="btn_del" tool_tip="Quitar el Ãtem seleccionado"/> </panel> </layout_panel> </layout_stack> 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 97e5390931b..7238ee77169 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 00000000000..44c24248a6d --- /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_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml index 4012191c788..b0afd44750e 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml @@ -10,7 +10,7 @@ Descripción: </text> <text name="dimensions"> - [WIDTH] px x [HEIGHT] px + [WIDTH]px x [HEIGHT]px </text> <text name="aspect_ratio"> Previsualizar la ratio de las proporciones diff --git a/indra/newview/skins/default/xui/es/floater_settings_picker.xml b/indra/newview/skins/default/xui/es/floater_settings_picker.xml index d537391c483..73b8de30c36 100644 --- a/indra/newview/skins/default/xui/es/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="DESTACADO: CONFIGURACIÓN"> - <floater.string name="choose_picture"> - Pulsa para elegir una imagen - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Filtrar las texturas" name="flt_inventory_search"/> - <check_box initial_value="false" label="Ver las carpetas" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 01b024bc3e4..2e409ef69c9 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 a49be406bad..c426158d3e6 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -33,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"> @@ -41,7 +42,7 @@ <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 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"/> @@ -108,7 +109,6 @@ <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="Aplicar a la Región" name="Settings Apply Region"/> <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 c06f5e21561..f9a9f3a9fee 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml @@ -23,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"> 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 b3f2b789d78..0cfab7ffc82 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_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 59d9d7255c1..10955567ba7 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -86,6 +86,7 @@ <menu_item_check label="Medianoche" name="Midnight"/> <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> @@ -307,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"/> @@ -390,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 288ed06b4eb..af9df87d251 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1969,8 +1969,9 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se <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. - <usetemplate name="okbutton" yestext="OK"/> + 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. @@ -2451,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. @@ -4403,8 +4412,21 @@ Prueba a seleccionar un terreno más pequeño. <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 de [FILE]. + 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. @@ -4419,6 +4441,16 @@ Por favor accede a una región cuya configuración esté disponible y vuelve a i ¿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. @@ -4427,4 +4459,17 @@ 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 8776dd6c103..6f6ee41e541 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 00000000000..5c825b5980d --- /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 799512968d1..c1edf99f876 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 98d4e7513cc..3aa7e12089b 100644 --- a/indra/newview/skins/default/xui/es/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Usar Configuración de la Región </string> - <string name="str_unknow_inventory"> - Desconocido - </string> <string name="str_altitude_desription"> Cielo [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Configuración del Inventario" name="rdo_use_inv_setting"/> - <radio_item label="Entorno personalizado" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Desconocido - </line_editor> - <button label="Editar Entorno" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100." name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Terreno - </text> - <text name="alt1"> - Cielo [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - Cielo [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - Cielo [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Los propietarios de parcelas pueden borrar el entorno" name="chk_allow_override"/> - <button label="Aplicar" name="btn_apply"/> - <button label="Restablecer" name="btn_cancel"/> - </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 index f322369063a..77db7457556 100644 --- a/indra/newview/skins/default/xui/es/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/es/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Sol y Luna" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml index 6ab95b9f5d5..fb1aa501988 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 80379da0640..cfa37432a8e 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 9277b009e45..7f4842df984 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -712,6 +712,18 @@ pueden adjuntarse a las notas. 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> @@ -784,12 +796,12 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro <string name="symbolic link"> el enlace </string> - <string name="settings blob"> - opciones - </string> <string name="symbolic folder link"> enlace de la carpeta </string> + <string name="settings blob"> + opciones + </string> <string name="mesh"> red </string> @@ -1117,6 +1129,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> @@ -1265,6 +1280,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> @@ -1307,6 +1325,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> @@ -1358,6 +1379,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> @@ -2487,6 +2511,24 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia <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> @@ -4643,6 +4685,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> @@ -5306,6 +5351,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> @@ -5333,6 +5384,9 @@ 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> @@ -5429,6 +5483,9 @@ 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> @@ -5627,6 +5684,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> @@ -5651,6 +5714,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_adjust_environment.xml b/indra/newview/skins/default/xui/fr/floater_adjust_environment.xml new file mode 100644 index 00000000000..ca5b0ec9483 --- /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 ebd4dab683c..c6adf67bac6 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 02b58f9b360..09186b67770 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_ext_day_cycle.xml index de79028bb6c..7e8e76fd5a5 100644 --- 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 @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Reculer"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Avancer"/> + <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> - <button label="Ajouter un cadre" name="add_frame"/> - <button label="Charger un cadre" name="btn_load_frame"/> - <button label="Supprimer le cadre" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/fr/floater_my_environments.xml b/indra/newview/skins/default/xui/fr/floater_my_environments.xml index 2214a2dab9f..5ee6e2d5fd4 100644 --- a/indra/newview/skins/default/xui/fr/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/fr/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="Afficher les dossiers vides" name="chk_showfolders"/> + <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 ce paramètre"/> + <button name="btn_del" tool_tip="Supprimer l'article sélectionné"/> </panel> </layout_panel> </layout_stack> 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 1cea8e55ccb..ef56ce56639 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 00000000000..46731bcec7d --- /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_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 9fc9d140264..d63d9903ec3 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml @@ -10,12 +10,12 @@ Description : </text> <text name="dimensions"> - [WIDTH] px x [HEIGHT] px + [WIDTH]px x [HEIGHT]px </text> <text name="aspect_ratio"> - Aperçu du rapport hauteur/largeur + Rapport d'aspect fixe </text> - <combo_box name="combo_aspect_ratio" tool_tip="Aperçu avec un rapport hauteur/largeur fixe"> + <combo_box name="combo_aspect_ratio" tool_tip="Prévisualiser avec un rapport d'aspect fixe"> <combo_item name="Unconstrained"> Sans contraintes </combo_item> diff --git a/indra/newview/skins/default/xui/fr/floater_settings_picker.xml b/indra/newview/skins/default/xui/fr/floater_settings_picker.xml index d92a4c27ae5..b75d8c6b8d2 100644 --- a/indra/newview/skins/default/xui/fr/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="CHOISIR : PARAMÈTRES"> - <floater.string name="choose_picture"> - Cliquer pour sélectionner une image. - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Filtrer les textures" name="flt_inventory_search"/> - <check_box initial_value="false" label="Afficher les dossiers" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 eace67026c8..2925727b489 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 2b946cf64f8..f81723e6cf5 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Appliquer à la région" name="Settings Apply Region"/> <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 b4801d2498d..de510eaeaa1 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml @@ -23,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"> 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 28ae2f74ad3..3fce2e9f335 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_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index f7167e8e40d..2594e9d0bb7 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -86,6 +86,7 @@ <menu_item_check label="Minuit" name="Midnight"/> <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> @@ -330,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"/> @@ -467,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 f7d7cc0f6f6..5dda3fb9547 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1960,8 +1960,9 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - Le fait de décocher cette option est susceptible de lever les restrictions que les propriétaires des parcelles ont ajouté à leurs parcelles. Veuillez discuter avec les propriétaires du terrain si nécessaire. - <usetemplate name="okbutton" yestext="OK"/> + 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. @@ -2443,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. @@ -4394,7 +4403,7 @@ Veuillez sélectionner un terrain plus petit. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FailedToFindSettings"> - Impossible de charger les paramètres de [NAME] à partir de la base de données. + 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. @@ -4405,8 +4414,21 @@ Veuillez sélectionner un terrain plus petit. <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 hérités depuis [FICHIER]. + 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. @@ -4417,10 +4439,20 @@ Veuillez entrer ou sélectionner une parcelle que vous avez le droit de modifier 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é "[NOM]". + 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. @@ -4429,4 +4461,17 @@ 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 086542dee29..24b4fc212a7 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 00000000000..a4626123f97 --- /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 def158cf684..d8851bb42cb 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 64cee04e885..5212c3a9ce8 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Utiliser les réglages de la région </string> - <string name="str_unknow_inventory"> - Inconnu(e) - </string> <string name="str_altitude_desription"> Ciel [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Paramètres de l'inventaire" name="rdo_use_inv_setting"/> - <radio_item label="Personnaliser l'environnement" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Inconnu(e) - </line_editor> - <button label="Modifier l'environnement" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Sol - </text> - <text name="alt1"> - Ciel [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - Ciel [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - Ciel [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Les propriétaires de parcelle peuvent neutraliser l'environnement" name="chk_allow_override"/> - <button label="Appliquer" name="btn_apply"/> - <button label="Réinitialiser" name="btn_cancel"/> - </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 index 5da3dff01cf..39d87c97275 100644 --- a/indra/newview/skins/default/xui/fr/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/fr/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Soleil et lune" name="panel_settings_sky_hbodies"/> +<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 index 4e85d71c1f7..203075f9871 100644 --- a/indra/newview/skins/default/xui/fr/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/fr/panel_settings_water.xml @@ -3,7 +3,7 @@ <layout_stack name="water_stack1"> <layout_panel> <text name="FresnelOffsetText"> - Capteur Fresnel Offset : + Décalage Fresnel : </text> </layout_panel> <layout_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 72c456aa6d4..d028336ac74 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 d10de384377..95e4799ce43 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 fe9315e8994..686aa240a1b 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -637,11 +637,12 @@ Veuillez réessayer de vous connecter dans une minute. 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. + 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 droits -illimités pour le prochain propriétaire + Seuls des éléments avec des autorisation +illimitées pour le 'prochain propriétaire' peuvent être joints aux notes. </string> <string name="Searching"> @@ -723,6 +724,18 @@ peuvent être joints aux notes. 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> @@ -795,12 +808,12 @@ http://secondlife.com/support pour vous aider à résoudre ce problème. <string name="symbolic link"> lien </string> - <string name="settings blob"> - paramètres - </string> <string name="symbolic folder link"> lien du dossier </string> + <string name="settings blob"> + paramètres + </string> <string name="mesh"> maillage </string> @@ -1131,6 +1144,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> @@ -1282,6 +1298,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> @@ -1324,6 +1343,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> @@ -1375,6 +1397,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> @@ -2516,6 +2541,24 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life <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> @@ -4732,6 +4775,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> @@ -5395,6 +5441,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> @@ -5422,6 +5474,9 @@ 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> @@ -5518,6 +5573,9 @@ 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> @@ -5716,6 +5774,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> @@ -5740,6 +5804,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_adjust_environment.xml b/indra/newview/skins/default/xui/it/floater_adjust_environment.xml new file mode 100644 index 00000000000..948e2d03aa7 --- /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 b7ab265cc23..303c2fdd6cc 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 10bbe933e33..b7572f17763 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_ext_day_cycle.xml index b878d735cce..12efdb81b52 100644 --- 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 @@ -7,10 +7,10 @@ Modifica ciclo giornata </string> <string name="hint_new"> - Dai un nome al ciclo della giornata, regola i controlli per crearlo e fai clic su "Salva". + 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 controlli seguenti e fai clic su "Salva". + Per modificare il ciclo della giornata, regola i comandi seguenti e fai clic su "Salva". </string> <string name="time_label"> ([HH]:[MM]) @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Passo indietro"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Passo avanti"/> + <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> - <button label="Aggiungi fotogramma" name="add_frame"/> - <button label="Carica fotogramma" name="btn_load_frame"/> - <button label="Elimina fotogramma" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> @@ -71,7 +94,7 @@ <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"/> + <panel label="Sole e Luna" name="moon_panel"/> </tab_container> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/it/floater_my_environments.xml b/indra/newview/skins/default/xui/it/floater_my_environments.xml index b6668a26a6c..bcbf4613f37 100644 --- a/indra/newview/skins/default/xui/it/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/it/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="Mostra cartelle vuote" name="chk_showfolders"/> + <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="Elimina questa impostazione"/> + <button name="btn_del" tool_tip="Rimuovi l'articolo selezionato"/> </panel> </layout_panel> </layout_stack> 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 9a88f53d471..bdfea6d0ad8 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 00000000000..8e1f3d70650 --- /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_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml index 5b4054514e3..8e8d020067b 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml @@ -10,7 +10,7 @@ Descrizione: </text> <text name="dimensions"> - [WIDTH] px x [HEIGHT] px + [WIDTH]px x [HEIGHT]px </text> <text name="aspect_ratio"> Antreprima rapporto di visualizzazione diff --git a/indra/newview/skins/default/xui/it/floater_settings_picker.xml b/indra/newview/skins/default/xui/it/floater_settings_picker.xml index f94c19e23dc..31dfb6ef19e 100644 --- a/indra/newview/skins/default/xui/it/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="settings picker" title="SCEGLI: IMPOSTAZIONI"> - <floater.string name="choose_picture"> - Fai clic per scegliere una fotografia - </floater.string> +<floater name="settings picker" title="PREFERITO: IMPOSTAZIONI"> <floater.string name="pick title"> - Scegli: + 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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Filtro texture" name="flt_inventory_search"/> - <check_box initial_value="false" label="Mostra cartelle" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 27a17868a76..2e4644cef3e 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 8b316f8d094..84ec7c4bd4e 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Applica alla regione" name="Settings Apply Region"/> <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 1178401b220..83ba78294a7 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml @@ -23,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"> 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 62c6d53e1c6..cf45fec09ef 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_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 8619603d56a..2c7ecfa6e71 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -86,6 +86,7 @@ <menu_item_check label="Mezzanotte" name="Midnight"/> <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> @@ -307,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"/> @@ -397,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 2cad6c330b4..70c1e966f77 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1964,8 +1964,8 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - Togliendo la spunta a questa opzione potrebbero essere rimosse le impostazioni personalizzate che i proprietari hanno aggiunto ai loro lotti. Parlane con i proprietari del tuo lotto se ce n’è bisogno. - <usetemplate name="okbutton" yestext="OK"/> + 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. @@ -2447,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. @@ -4404,28 +4412,63 @@ Prova a selezionare un pezzo di terreno più piccolo. <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 da [FILE]. + 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 diritto di modificare. +Inserisci o seleziona un lotto che hai il permesso di modificare. </notification> <notification name="SettingsUnsuported"> - Questa regione non supporta le impostazioni ambientali. + 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]â€. + 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 impostazione che stai modificando diventeranno non trasferibili. + 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 d76fb62c533..79938b79dc2 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 00000000000..10fab0e8bea --- /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 e54dc26d05a..83824591d62 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 9a18836c556..467bcdb005e 100644 --- a/indra/newview/skins/default/xui/it/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Usa impostazioni regione </string> - <string name="str_unknow_inventory"> - Sconosciuto - </string> <string name="str_altitude_desription"> Cielo [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Impostazioni da inventario" name="rdo_use_inv_setting"/> - <radio_item label="Ambiente personalizzato" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Sconosciuto - </line_editor> - <button label="Modifica ambiente" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Suolo - </text> - <text name="alt1"> - Cielo [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - Cielo [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - Cielo [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="I proprietari del lotto possono ignorare l’ambiente" name="chk_allow_override"/> - <button label="Applica" name="btn_apply"/> - <button label="Reimposta" name="btn_cancel"/> - </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 index 505d5dea08b..5a167b0aea3 100644 --- a/indra/newview/skins/default/xui/it/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/it/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Sole e luna" name="panel_settings_sky_hbodies"/> +<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 index a353732a124..0d123a62499 100644 --- a/indra/newview/skins/default/xui/it/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/it/panel_settings_water.xml @@ -3,7 +3,7 @@ <layout_stack name="water_stack1"> <layout_panel> <text name="FresnelOffsetText"> - Spostamento Fresnel + Spostamento Fresnel: </text> </layout_panel> <layout_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 46e2717647a..5b4cb5868f2 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 2bfaea89631..0e001652279 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 622aa48689a..625381ca65f 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -633,13 +633,13 @@ Prova ad accedere nuovamente tra un minuto. Mostra Aiuto </string> <string name="TooltipNotecardNotAllowedTypeDrop"> - Oggetti di questo tipo non possono essere allegati -ai biglietti in questa regione. + 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. + Solamente gli oggetti con autorizzazioni +illimitate al “proprietario successivo†+possono essere allegati ai biglietti. </string> <string name="Searching"> Ricerca in corso... @@ -717,6 +717,18 @@ essere allegati ai biglietti. 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> @@ -789,12 +801,12 @@ http://secondlife.com/support per risolvere il problema. <string name="symbolic link"> link </string> - <string name="settings blob"> - impostazioni - </string> <string name="symbolic folder link"> link alla cartella </string> + <string name="settings blob"> + impostazioni + </string> <string name="mesh"> reticolo </string> @@ -1125,6 +1137,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> @@ -1273,6 +1288,9 @@ http://secondlife.com/support per risolvere il problema. <string name="tattoo"> Tatuaggio </string> + <string name="universal"> + Universale + </string> <string name="physics"> Fisica </string> @@ -1315,6 +1333,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> @@ -1366,6 +1387,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> @@ -2495,6 +2519,24 @@ Se continui a ricevere questo messaggio, contatta l'assistenza Second Life <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> @@ -4648,6 +4690,9 @@ Segnala abuso <string name="New Tattoo"> Nuovo tatuaggio </string> + <string name="New Universal"> + Nuovo Universale + </string> <string name="New Physics"> Nuova fisica </string> @@ -5311,6 +5356,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> @@ -5338,6 +5389,9 @@ 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> @@ -5434,6 +5488,9 @@ 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> @@ -5632,6 +5689,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> @@ -5656,6 +5719,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_adjust_environment.xml b/indra/newview/skins/default/xui/ja/floater_adjust_environment.xml new file mode 100644 index 00000000000..6736dad336d --- /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 a55698e3d03..cb3dae06444 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 b34fd192a92..fc9b35a34d4 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml index 33df12db4bb..79c97472df0 100644 --- 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 @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="後ã‚ã«ç§»å‹•"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="å‰ã«ç§»å‹•"/> + <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> - <button label="ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’è¿½åŠ " name="add_frame"/> - <button label="フレームをèªã¿è¾¼ã¿" name="btn_load_frame"/> - <button label="フレームを削除" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml index bec18d95ced..a00b87b9905 100644 --- a/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml @@ -8,7 +8,7 @@ </string> <layout_stack name="floater_stack"> <layout_panel name="info_panel"> - <button label="ãƒãƒ¼ãƒ‰" name="btn_load" tool_tip="インベントリã‹ã‚‰è¨å®šã‚’ãƒãƒ¼ãƒ‰ã™ã‚‹"/> + <button label="ãƒãƒ¼ãƒ‰" name="btn_load" tool_tip="æŒã¡ç‰©ã‹ã‚‰è¨å®šã‚’ãƒãƒ¼ãƒ‰ã™ã‚‹"/> <button label="インãƒãƒ¼ãƒˆ" name="btn_import" tool_tip="ディスクã‹ã‚‰éŽåŽ»ã®è¨å®šã‚’インãƒãƒ¼ãƒˆã™ã‚‹ã€‚"/> </layout_panel> <layout_panel name="button_panel"> diff --git a/indra/newview/skins/default/xui/ja/floater_my_environments.xml b/indra/newview/skins/default/xui/ja/floater_my_environments.xml index 5ef9c3d82cf..d697a9f3215 100644 --- a/indra/newview/skins/default/xui/ja/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/ja/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="空ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’表示" name="chk_showfolders"/> + <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="ã“ã®è¨å®šã‚’削除"/> + <button name="btn_del" tool_tip="é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を削除"/> </panel> </layout_panel> </layout_stack> 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 0dfc75014e8..33551a57068 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 00000000000..e5773e1ec80 --- /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_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml index 16d5dbe983f..b8b1699f038 100644 --- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="é¸æŠžï¼šè¨å®š"> - <floater.string name="choose_picture"> - クリックã—ã¦å†™çœŸã‚’é¸æŠžã™ã‚‹ - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="テクスãƒãƒ£ã‚’フィルター" name="flt_inventory_search"/> - <check_box initial_value="false" label="フォルダを表示" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 37233d3e686..05e7bfefd2e 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 faa01bc2294..ec16f1cf172 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Settings Apply Region"/> <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 b8c9c8f25ec..eecf166a707 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml @@ -23,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"> 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 5e02fd3b8f3..4946d58fd84 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_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml index afce43fb25b..064eae95bfb 100644 --- a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml @@ -6,5 +6,5 @@ <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"/> + <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 a858f8bc468..ba8d8e49556 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -86,6 +86,7 @@ <menu_item_check label="深夜" name="Midnight"/> <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> @@ -330,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"/> @@ -467,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 4daa7bdcfb1..96a5cb741a7 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1997,8 +1997,9 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - ã“ã®ã‚ªãƒ—ションをオフã«ã™ã‚‹ã¨ã€åŒºç”»æ‰€æœ‰è€…ãŒãã®åŒºç”»ã«åŠ ãˆãŸã‚«ã‚¹ã‚¿ãƒ 環境ãŒå‰Šé™¤ã•ã‚Œã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚å¿…è¦ã«å¿œã˜ã¦åŒºç”»æ‰€æœ‰è€…ã¨ç›¸è«‡ã—ã¦ãã ã•ã„。 - <usetemplate name="okbutton" yestext="OK"/> + ã“ã®ã‚ªãƒ—ションをオフã«ã™ã‚‹ã¨ã€åŒºç”»æ‰€æœ‰è€…ãŒãã®åŒºç”»ã«åŠ ãˆãŸã‚«ã‚¹ã‚¿ãƒ 環境ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚å¿…è¦ã«å¿œã˜ã¦åŒºç”»æ‰€æœ‰è€…ã¨ç›¸è«‡ã—ã¦ãã ã•ã„。 +続ã‘ã¾ã™ã‹ï¼Ÿ + <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked"> 訪å•ã—よã†ã¨ã—ã¦ã„る地域（リージョン）ã«ã¯ç¾åœ¨ã®ç’°å¢ƒè¨å®šã‚’超ãˆã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚「ミー〠> 「環境è¨å®šã€ > 「一般ã€ã‚’é¸æŠžã—ã¦ã€ç’°å¢ƒè¨å®šã‚’変更ã§ãã¾ã™ã€‚ @@ -2487,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"> デイサイクルを空ã«ã¯ã§ããªã„ã®ã§ã€ã“ã®ãƒ‡ã‚¤ã‚µã‚¤ã‚¯ãƒ«ã®æœ€å¾Œã®ã‚ーを削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。最後ã®ã‚ーを削除ã—ã¦æ–°ã—ã„ã‚ーを作æˆã™ã‚‹ã®ã§ã¯ãªãã€æœ€å¾Œã®ã‚ーを変更ã—ã¦ãã ã•ã„。 @@ -4445,8 +4453,20 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ <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] ã‹ã‚‰éŽåŽ»ã®ã‚¦ã‚¤ãƒ³ãƒ‰ãƒ©ã‚¤ãƒˆã®è¨å®šã‚’インãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“。 + [FILE] ã‹ã‚‰éŽåŽ»ã®ã‚¦ã‚¤ãƒ³ãƒ‰ãƒ©ã‚¤ãƒˆã®è¨å®š [NAME] をインãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“。 + +[REASONS] </notification> <notification name="WLParcelApplyFail"> ã“ã®åŒºç”»ã§ç’°å¢ƒã‚’è¨å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 @@ -4457,10 +4477,20 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ è¨å®šã«å¯¾å¿œã—ã¦ã„るリージョンã«ç§»å‹•ã—ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’å†è©¦è¡Œã—ã¦ãã ã•ã„。 </notification> <notification name="SettingsConfirmLoss"> - "[NAME]"。ã¨å付ã‘られãŸã“ã® [TYPE] ã«åŠ ãˆã‚‰ã‚ŒãŸå¤‰æ›´ãŒå¤±ã‚ã‚Œã¾ã™ã€‚ + "[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"> ã“ã®ãƒ‡ã‚¤ã‚µã‚¤ã‚¯ãƒ«ã«ç§»è¡Œä¸å¯ã®è¨å®šã‚’インãƒãƒ¼ãƒˆã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ã“ã®ã¾ã¾ç¶šã‘ã‚‹ã¨ã€ç·¨é›†ä¸ã®è¨å®šã‚‚移行ä¸å¯ã«ãªã‚Šã¾ã™ã€‚ @@ -4469,4 +4499,17 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ 続ã‘ã¾ã™ã‹ï¼Ÿ <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_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml index b556b68e029..cf5f2489f1a 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml @@ -47,7 +47,7 @@ <button label="[LABEL]" name="save_changes_btn"/> </layout_panel> <layout_panel name="show_on_map_btn_lp"> - <button label="å–り消ã—" name="cancel_btn"/> + <button label="ã‚ャンセル" name="cancel_btn"/> </layout_panel> </layout_stack> </panel> 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 f4cfe6d83f7..5729cb75523 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 00000000000..614fd1059fa --- /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 000dac7b5b9..9101920f1b9 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_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index 3df1ae80487..9b1cf1c8a4d 100644 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="panel_me"> - <panel label="マイ-ピック" name="panel_picks"/> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="panel_me"> + <panel label="マイ ピック" name="panel_picks"/> </panel> 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 7ef6aab7def..444f8bae914 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> リージョンã®è¨å®šã‚’使用 </string> - <string name="str_unknow_inventory"> - ä¸æ˜Ž - </string> <string name="str_altitude_desription"> 空 [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="インベントリã‹ã‚‰ã®è¨å®š" name="rdo_use_inv_setting"/> - <radio_item label="環境ã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - ä¸æ˜Ž - </line_editor> - <button label="環境を編集" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - åœ°é¢ - </text> - <text name="alt1"> - 空 [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - 空 [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - 空 [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="区画所有者ãŒç’°å¢ƒã‚’上書ãã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™" name="chk_allow_override"/> - <button label="é©ç”¨" name="btn_apply"/> - <button label="リセット" name="btn_cancel"/> - </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 index 1dc7d6c5948..cb746d8792d 100644 --- a/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml @@ -10,11 +10,11 @@ </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"/> + <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"/> 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 index 31220f1bead..e5026dc9fd2 100644 --- a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="太陽＆月" name="panel_settings_sky_hbodies"/> +<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 index 6a86ad9a047..20341fcb8d5 100644 --- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml @@ -3,7 +3,7 @@ <layout_stack name="water_stack1"> <layout_panel> <text name="FresnelOffsetText"> - フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ + フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆï¼š </text> </layout_panel> <layout_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 1821a6fad6e..75bc8eb86f3 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 fe90da89c7e..05eca2cca39 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 895e7c697db..165c66b52fc 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -636,8 +636,8 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 ヘルプを表示 </string> <string name="TooltipNotecardNotAllowedTypeDrop"> - ã“ã®ã‚¿ã‚¤ãƒ—ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã« -添付ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ã“ã®ã‚¿ã‚¤ãƒ—ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ +ã«æ·»ä»˜ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </string> <string name="TooltipNotecardOwnerRestrictedDrop"> 制é™ã®ãªã„「次ã®æ‰€æœ‰è€…ã€ã® @@ -723,6 +723,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> @@ -795,12 +807,12 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="symbolic link"> リンク </string> - <string name="settings blob"> - è¨å®š - </string> <string name="symbolic folder link"> フォルダã®ãƒªãƒ³ã‚¯ </string> + <string name="settings blob"> + è¨å®š + </string> <string name="mesh"> メッシュ </string> @@ -1131,6 +1143,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="ForceSitAvatar"> ã‚¢ãƒã‚¿ãƒ¼ã‚’強制的ã«åº§ã‚‰ã›ã‚‹ </string> + <string name="ChangeEnvSettings"> + 自然環境ã®è¨å®šã‚’変更ã™ã‚‹ + </string> <string name="NotConnected"> 接続ã•ã‚Œã¦ã„ã¾ã›ã‚“ </string> @@ -1282,6 +1297,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="tattoo"> タトゥ </string> + <string name="universal"> + ユニãƒãƒ¼ã‚µãƒ« + </string> <string name="physics"> 物ç†ä½œç”¨ </string> @@ -1324,6 +1342,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="tattoo_not_worn"> タトゥー未ç€ç”¨ </string> + <string name="universal_not_worn"> + ユニãƒãƒ¼ã‚µãƒ«ãªã— + </string> <string name="physics_not_worn"> 物ç†ä½œç”¨ãªã— </string> @@ -1375,6 +1396,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="create_new_tattoo"> æ–°ã—ã„ã‚¿ãƒˆã‚¥ã‚’ä½œæˆ </string> + <string name="create_new_universal"> + æ–°ã—ã„ユニãƒãƒ¼ã‚µãƒ«ã‚’ä½œæˆ + </string> <string name="create_new_physics"> æ–°ã—ã„物ç†ä½œç”¨ã‚’ä½œæˆ </string> @@ -2515,6 +2539,24 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <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> @@ -4731,6 +4773,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã <string name="New Tattoo"> æ–°ã—ã„タトゥ </string> + <string name="New Universal"> + æ–°ã—ã„ユニãƒãƒ¼ã‚µãƒ« + </string> <string name="New Physics"> æ–°è¦ã®ç‰©ç†ä½œç”¨ </string> @@ -5394,6 +5439,12 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã <string name="BeaconMedia"> ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ“ãƒ¼ã‚³ãƒ³ï¼ˆç™½ï¼‰ã‚’è¡¨ç¤ºä¸ </string> + <string name="BeaconSun"> + 太陽ã®æ–¹è§’ãƒ“ãƒ¼ã‚³ãƒ³ï¼ˆã‚ªãƒ¬ãƒ³ã‚¸ï¼‰ã‚’è¡¨ç¤ºä¸ + </string> + <string name="BeaconMoon"> + 月ã®æ–¹è§’ãƒ“ãƒ¼ã‚³ãƒ³ï¼ˆç´«ï¼‰ã‚’è¡¨ç¤ºä¸ + </string> <string name="ParticleHiding"> パーティクルをéžè¡¨ç¤º </string> @@ -5421,6 +5472,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã <string name="Command_Destinations_Label"> è¡Œãå…ˆ </string> + <string name="Command_Environments_Label"> + ç§ã®ç’°å¢ƒ + </string> <string name="Command_Facebook_Label"> Facebook </string> @@ -5517,6 +5571,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã <string name="Command_Destinations_Tooltip"> è¡Œã£ã¦ã¿ãŸã„å ´æ‰€ </string> + <string name="Command_Environments_Tooltip"> + ç§ã®ç’°å¢ƒ + </string> <string name="Command_Facebook_Tooltip"> Facebook ã¸æŠ•ç¨¿ </string> @@ -5715,6 +5772,12 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã <string name="ExperiencePermission12"> 体験ã®æ¨©é™ã‚’自動的ã«æ‰¿è«¾ </string> + <string name="ExperiencePermission16"> + ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã‚’強制的ã«åº§ã‚‰ã›ã‚‹ + </string> + <string name="ExperiencePermission17"> + 自然環境ã®è¨å®šã‚’変更ã™ã‚‹ + </string> <string name="ExperiencePermissionShortUnknown"> ãŒä¸æ˜Žãªæ“作を実行ã—ã¾ã—ãŸï¼š [Permission] </string> @@ -5739,6 +5802,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/pt/floater_adjust_environment.xml b/indra/newview/skins/default/xui/pt/floater_adjust_environment.xml new file mode 100644 index 00000000000..4e2e96c54b5 --- /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 f8ae3cd2d8c..bcd6ae04002 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 a31b049345c..554865b3a6a 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_ext_day_cycle.xml index 893fed04ec2..f58af73e55f 100644 --- 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 @@ -4,7 +4,7 @@ Criar um ciclo de dias </string> <string name="title_edit"> - Editar ciclo de dias + 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â€. @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Passo para trás"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Passo para frente"/> + <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> - <button label="Adicionar uma estrutura" name="add_frame"/> - <button label="Carregar uma estrutura" name="btn_load_frame"/> - <button label="Excluir uma estrutura" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/pt/floater_my_environments.xml b/indra/newview/skins/default/xui/pt/floater_my_environments.xml index 36a4c1dcc64..71c1a33f58b 100644 --- a/indra/newview/skins/default/xui/pt/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/pt/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="Mostrar pastas vazias" name="chk_showfolders"/> + <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="Excluir esta configuração"/> + <button name="btn_del" tool_tip="Remover item selecionado"/> </panel> </layout_panel> </layout_stack> 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 40659a353ad..0b8914b4dd1 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 00000000000..dc09f262c04 --- /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_settings_picker.xml b/indra/newview/skins/default/xui/pt/floater_settings_picker.xml index 787348c6d6b..0dc80989be5 100644 --- a/indra/newview/skins/default/xui/pt/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="ESCOLHER: CONFIGURAÇÕES"> - <floater.string name="choose_picture"> - Clique para selecionar uma imagem - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Filtrar texturas" name="flt_inventory_search"/> - <check_box initial_value="false" label="Exibir pastas" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 ba4ef0afdef..d06c16d8c8a 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 195ee52f3db..78a0482deea 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Aplicar para a região" name="Settings Apply Region"/> <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 13039739134..d59b109aa83 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml @@ -23,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"> 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 ccf65ae5664..1de8fd939bb 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_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index ec489cf6b04..8b144390faf 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -80,12 +80,13 @@ <menu_item_check label="Menu avançado" name="Show Advanced Menu"/> </menu> <menu label="Ambiente" name="Environment"> - <menu_item_check label="Nascer-do-sol" name="Sunrise"/> + <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="Pôr do sol" name="Sunset"/> <menu_item_check label="Meia-noite" name="Midnight"/> <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> @@ -307,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"/> @@ -397,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 64df61f8434..7efb3333bc5 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1952,8 +1952,9 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar. <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. - <usetemplate name="okbutton" yestext="OK"/> + 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. @@ -2435,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. @@ -4392,8 +4401,21 @@ Tente selecionar uma quantidade menor de terreno. <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 importar as configurações do legado Windlight de [FILE]. + 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. @@ -4408,6 +4430,16 @@ Mude para uma configuração permitida para a região ou tente novamente realiza 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. @@ -4416,4 +4448,17 @@ 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 f85bb3c4999..f5d513e2f6b 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 00000000000..0bcaa36f1db --- /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 2e3e3d63058..e8d9063206d 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 f57bf7eb4da..f99a75d699e 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Usar as configurações da região </string> - <string name="str_unknow_inventory"> - Desconhecido - </string> <string name="str_altitude_desription"> Céu [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Configurações de inventário" name="rdo_use_inv_setting"/> - <radio_item label="Personalizar o ambiente" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Desconhecido - </line_editor> - <button label="Editar o ambiente" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Chão - </text> - <text name="alt1"> - Céu [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - Céu [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - Céu [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Os proprietários do lote podem desconsiderar o ambiente" name="chk_allow_override"/> - <button label="Aplicar" name="btn_apply"/> - <button label="Redefinir" name="btn_cancel"/> - </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 index df3a023f20a..fe6672b2617 100644 --- a/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Sol e Lua" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml index 5e97eca6059..4f484c5fce6 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 67ecfa0be3e..e09476a83ee 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 9f58426b40f..810f44709e7 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -598,8 +598,8 @@ Aguarde um minuto antes que tentar logar-se novamente. </string> <string name="TooltipNotecardOwnerRestrictedDrop"> Somente itens com permissões irrestritas -do 'próximo proprietário’ "pode -ser anexado à s anotações." +do 'próximo proprietário’ pode +ser anexado à s anotações. </string> <string name="Searching"> Buscando... @@ -677,6 +677,18 @@ ser anexado à s anotações." 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> @@ -749,12 +761,12 @@ http://secondlife.com/support para ajuda ao resolver este problema. <string name="symbolic link"> link </string> - <string name="settings blob"> - configurações - </string> <string name="symbolic folder link"> link da pasta </string> + <string name="settings blob"> + configurações + </string> <string name="mesh"> mesh </string> @@ -1085,6 +1097,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> @@ -1233,6 +1248,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> @@ -1275,6 +1293,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> @@ -1326,6 +1347,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> @@ -2455,6 +2479,24 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se <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> @@ -4607,6 +4649,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> @@ -5270,6 +5315,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> @@ -5297,6 +5348,9 @@ 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> @@ -5393,6 +5447,9 @@ 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> @@ -5591,6 +5648,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> @@ -5615,6 +5678,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 575f30b4e9b..d0f278f16e3 100644 --- a/indra/newview/skins/default/xui/ru/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml @@ -462,6 +462,6 @@ </panel> </panel> <panel label="ПРИКЛЮЧЕÐИЯ" name="land_experiences_panel"/> - <panel label="СРЕДÐ" name="land_environment_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 00000000000..85809966e49 --- /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 38d257ff818..9d706a7c5d4 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 55b0e0c3bd6..f5115a161de 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_ext_day_cycle.xml index a4ed7250fcf..ba01b13a822 100644 --- 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 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="env_edit_extdaycycle" title="Изменить Ñуточный цикл"> <string name="title_new"> - Создать Ñуточный цикл + Создать новый Ñуточный цикл </string> <string name="title_edit"> Изменить Ñуточный цикл @@ -16,14 +16,26 @@ ([HH]:[MM]) </string> <string name="sky_track_label"> - Ðебо \[ALT] + Ðебо [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="Импортировать уÑтаревшие параметры Ñ Ð´Ð¸Ñка."/> + <button label="Импортировать" name="btn_import" tool_tip="Импортировать уÑтаревшие наÑтройки Ñ Ð´Ð¸Ñка."/> </layout_panel> <layout_panel name="content"> <layout_stack name="content_stack"> @@ -44,22 +56,33 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Шаг назад"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Шаг вперед"/> + <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> - <button label="Добавить фрейм" name="add_frame"/> - <button label="Загрузить фрейм" name="btn_load_frame"/> - <button label="Удалить фрейм" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> <text name="icn_lock_edit"> - Выбрать ключевой фрейм на временной шкале Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек. + Выбрать ключевой фрейм на временной шкале выше Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек. </text> </layout_panel> <layout_panel name="frame_settings_water"> diff --git a/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml index c6e405ffe10..b5f1a1ced25 100644 --- a/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/ru/floater_fixedenvironment.xml @@ -1,15 +1,15 @@ <?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="Импортировать уÑтаревшие параметры Ñ Ð´Ð¸Ñка."/> + <button label="Импортировать" name="btn_import" tool_tip="Импортировать уÑтаревшие наÑтройки Ñ Ð´Ð¸Ñка."/> </layout_panel> <layout_panel name="button_panel"> <layout_stack name="button_bar_ls"> diff --git a/indra/newview/skins/default/xui/ru/floater_my_environments.xml b/indra/newview/skins/default/xui/ru/floater_my_environments.xml index 1233139e12e..ba31600df77 100644 --- a/indra/newview/skins/default/xui/ru/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/ru/floater_my_environments.xml @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="МеÑта" name="my_environments" title="МОЯ СРЕДÐ"> +<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"> - <check_box initial_value="false" label="Показать пуÑтые папки" name="chk_showfolders"/> + <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="Удалить Ñтот параметр"/> + <menu_button name="btn_newsettings" tool_tip="Создать новую наÑтройку"/> + <button name="btn_del" tool_tip="Удалить выбранную вещь"/> </panel> </layout_panel> </layout_stack> 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 a33c6b40b60..2a239c07c49 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 00000000000..7588e1759c9 --- /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_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml index c9cb87282a0..46d2a37503f 100644 --- a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml @@ -10,12 +10,12 @@ ОпиÑание: </text> <text name="dimensions"> - [WIDTH]x[HEIGHT] пикÑелей + [WIDTH]пикÑелей x [HEIGHT]пикÑелей </text> <text name="aspect_ratio"> - Соотношение Ñторон + ПроÑмотр Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñ Ñоотношением Ñторон </text> - <combo_box name="combo_aspect_ratio" tool_tip="ПроÑмотр Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Ñоотношением Ñторон"> + <combo_box name="combo_aspect_ratio" tool_tip="ПроÑмотр Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñ Ñ„Ð¸ÐºÑированным Ñоотношением Ñторон"> <combo_item name="Unconstrained"> Без Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ </combo_item> @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="Удалить" name="Discard"/> + <button label="Отменить" name="Discard"/> <button label="Сохранить как" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_settings_picker.xml b/indra/newview/skins/default/xui/ru/floater_settings_picker.xml index 09dd29b73e1..84f0e303fc4 100644 --- a/indra/newview/skins/default/xui/ru/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/ru/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="ВЫБРÐТЬ: ÐÐСТРОЙКИ"> - <floater.string name="choose_picture"> - Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Фильтровать текÑтуры" name="flt_inventory_search"/> - <check_box initial_value="false" label="Показать папки" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="OK" label_selected="OK" name="btn_select"/> 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 c9e117362f9..c56657b86bc 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 e39cbedca1f..05cccebafc7 100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml @@ -33,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"> @@ -107,9 +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 Local"/> <menu_item_call label="Применить к учаÑтку" name="Settings Apply Parcel"/> - <menu_item_call label="Применить к региону" name="Settings Apply Region"/> <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 0a9f00411bd..94ec61af90d 100644 --- a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml @@ -23,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"> 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 24d780ba1c6..1d883220e81 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 index daebb9af3db..9a9c796cf67 100644 --- a/indra/newview/skins/default/xui/ru/menu_save_settings.xml +++ b/indra/newview/skins/default/xui/ru/menu_save_settings.xml @@ -3,7 +3,7 @@ <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_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_gear.xml b/indra/newview/skins/default/xui/ru/menu_settings_gear.xml index 6e6dfd331d1..9d17424b85d 100644 --- a/indra/newview/skins/default/xui/ru/menu_settings_gear.xml +++ b/indra/newview/skins/default/xui/ru/menu_settings_gear.xml @@ -1,7 +1,7 @@ <?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="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"/> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 86bc9a5c487..8361464f4c1 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -84,6 +84,7 @@ <menu_item_check label="Полночь" name="Midnight"/> <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> @@ -327,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"/> @@ -464,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 b30849468b3..65e7e1a7cef 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -1960,8 +1960,9 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - При ÑнÑтии Ñтой опции вы можете удалить пользовательÑкую Ñреду, которую владельцы учаÑтка добавили Ð´Ð»Ñ Ñвоего учаÑтка. При необходимоÑти обÑудите Ñо Ñвоими владельцами учаÑтков. - <usetemplate name="okbutton" yestext="OK"/> + При ÑнÑтии Ñтой опции вы можете удалить пользовательÑкую Ñреду, которую владельцы учаÑтка добавили Ð´Ð»Ñ Ñвоих учаÑтков. При необходимоÑти обÑудите Ñо Ñвоими владельцами учаÑтков. +Ð’Ñ‹ хотите продолжить? + <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked"> Ð’Ñ‹ пытаетеÑÑŒ поÑетить регион, контент в котором не ÑоответÑтвует вашим наÑтройкам. Попробуйте изменить наÑтройки в меню «Я > ÐаÑтройки > Общие». @@ -2442,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"> Ðевозможно удалить поÑледний ключ в Ñтом Ñуточном цикле: пуÑтой Ñуточный цикл не разрешен. Следует изменить поÑледний оÑтавшийÑÑ ÐºÐ»ÑŽÑ‡, а не удалÑÑ‚ÑŒ его и Ñоздавать новый. @@ -4394,32 +4403,55 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FailedToFindSettings"> - Ðе удалоÑÑŒ загрузить наÑтройки Ð´Ð»Ñ \[NAME] из базы данных. + Ðе удалоÑÑŒ загрузить наÑтройки Ð´Ð»Ñ [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"> - Ðевозможно импортировать уÑтаревшие параметры Ð´Ð»Ñ Ñффекта Windlight из \[FILE]. + Ðевозможно импортировать уÑтаревшие уÑтановки [NAME] Ð´Ð»Ñ Ñффекта Windlight из +[FILE]. + +[REASONS] </notification> <notification name="WLParcelApplyFail"> - Ðевозможно уÑтановить параметры Ñреды Ð´Ð»Ñ Ñтого учаÑтка. -Введите или выберите учаÑток, которые вы вправе изменÑÑ‚ÑŒ. + Ðевозможно уÑтановить наÑтройки Ñреды Ð´Ð»Ñ Ñтого учаÑтка. +ВвеÑти или выбрать учаÑток, который вы можете модифицировать. </notification> <notification name="SettingsUnsuported"> - Параметры Ñреды не поддерживаютÑÑ Ð² Ñтом регионе. -Перейдите в регион Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¼Ð¸ параметрами и повторите дейÑтвие. + ÐаÑтройки окружающей Ñреды не поддерживаютÑÑ Ð² Ñтом регионе. +Перейдите в регион Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ñ‹Ð¼Ð¸ наÑтройками и повторите дейÑтвие. </notification> <notification name="SettingsConfirmLoss"> - Ð’Ñ‹ потерÑете изменениÑ, внеÑенные в Ñтот \[TYPE] под именем "[NAME]". + Ð’Ñ‹ потерÑете изменениÑ, внеÑенные в Ñтот [TYPE] под именем "[NAME]". +Ð’Ñ‹ уверены, что хотите продолжить? + <usetemplate ignoretext="Ð’Ñ‹ уверены, что хотите Ñделать наÑтройки непереноÑимыми?" name="okcancelignore" notext="Ðет" yestext="Да"/> + </notification> + <notification name="SettingsConfirmReset"> + Ð’Ñ‹ ÑобираетеÑÑŒ удалить вÑе примененные наÑтройки. +Ð’Ñ‹ уверены, что хотите продолжить? + <usetemplate name="okcancelbuttons" notext="Ðет" yestext="Да"/> + </notification> + <notification name="PersonalSettingsConfirmReset"> + Ð’Ñ‹ ÑобираетеÑÑŒ удалить вÑе примененные наÑтройки Ð´Ð»Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ оÑвещениÑ. Ð’Ñ‹ уверены, что хотите продолжить? - <usetemplate ignoretext="Ð’Ñ‹ уверены, что не хотите Ñохранить изменениÑ?" name="okcancelignore" notext="Ðет" yestext="Да"/> + <usetemplate name="okcancelbuttons" notext="Ðет" yestext="Да"/> </notification> <notification name="SettingsMakeNoTrans"> Ð’Ñ‹ ÑобираетеÑÑŒ импортировать непереноÑимые наÑтройки в Ñтот Ñуточный цикл. Ð’ Ñлучае дальнейшего Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ñтих параметрах они также Ñтанут непереноÑимыми. @@ -4429,4 +4461,17 @@ Ð’Ñ‹ уверены, что хотите продолжить? <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 874d5f8bc4a..ed5312b7239 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 00000000000..647d1aa9e70 --- /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 79130a9c80e..cede43f859d 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 a98e7bf106e..fcf1548ae5b 100644 --- a/indra/newview/skins/default/xui/ru/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_environment.xml @@ -1,25 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Среда" name="panel_env_info"> <string name="str_label_use_default"> - ИÑпользовать пользовательÑкие наÑтройки + ИÑпользовать наÑтройки по умолчанию </string> <string name="str_label_use_region"> ИÑпользовать наÑтройки региона </string> - <string name="str_unknow_inventory"> - ÐеизвеÑтно - </string> <string name="str_altitude_desription"> - Ðебо \[INDEX](\[ALTITUDE]m) + Ðебо [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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="ÐаÑтройки из инвентарного ÑпиÑка" name="rdo_use_inv_setting"/> - <radio_item label="ПользовательÑÐºÐ°Ñ Ñреда" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - ÐеизвеÑтно - </line_editor> - <button label="Изменить параметры окружающей Ñреды" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Ð—ÐµÐ¼Ð»Ñ - </text> - <text name="alt1"> - Ðебо \[INDEX](\[ALTITUDE]m) - </text> - <text name="alt2"> - Ðебо \[INDEX](\[ALTITUDE]m) - </text> - <text name="alt3"> - Ðебо \[INDEX](\[ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Владельцы учаÑтков могут менÑÑ‚ÑŒ окружающую Ñреду" name="chk_allow_override"/> - <button label="Применить" name="btn_apply"/> - <button label="СброÑ" name="btn_cancel"/> - </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 index 863cc13e6b6..a494bbbe0e8 100644 --- a/indra/newview/skins/default/xui/ru/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/ru/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Солнце и луна" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml index 707578cd074..5cd83c712fc 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 1d526b90e46..314f6b9cb53 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 c521a4771c1..150f3ca160e 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -636,6 +636,15 @@ support@secondlife.com. <string name="BUTTON_HELP"> Показать Ñправку </string> + <string name="TooltipNotecardNotAllowedTypeDrop"> + Ðлементы Ñтого типа не могут быть занеÑены в +карточку Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸ÐµÐ² в Ñтом регионе. + </string> + <string name="TooltipNotecardOwnerRestrictedDrop"> + Только Ñлементы Ñ Ð±ÐµÐ·ÑƒÑловным разрешением +‘Ñледующего владельца’ можно внеÑти +в карточки Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸ÐµÐ². + </string> <string name="Searching"> ПоиÑк... </string> @@ -712,6 +721,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> @@ -787,6 +808,9 @@ support@secondlife.com. <string name="symbolic folder link"> ÑÑылку на папку </string> + <string name="settings blob"> + наÑтройки + </string> <string name="mesh"> Ñетка </string> @@ -1117,6 +1141,9 @@ support@secondlife.com. <string name="ForceSitAvatar"> ЗаÑтавьте аватар ÑеÑÑ‚ÑŒ </string> + <string name="ChangeEnvSettings"> + Изменить Ñвои наÑтройки окружающей Ñреды + </string> <string name="NotConnected"> Ðет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ </string> @@ -1268,6 +1295,9 @@ support@secondlife.com. <string name="tattoo"> Тату </string> + <string name="universal"> + УниверÑальные + </string> <string name="physics"> ФизичеÑкие данные </string> @@ -1310,6 +1340,9 @@ support@secondlife.com. <string name="tattoo_not_worn"> Тату не надето </string> + <string name="universal_not_worn"> + УниверÑальный нарÑд не надет + </string> <string name="physics_not_worn"> Физика не учитываетÑÑ </string> @@ -1361,6 +1394,9 @@ support@secondlife.com. <string name="create_new_tattoo"> Создать тату </string> + <string name="create_new_universal"> + Создать новые универÑальные + </string> <string name="create_new_physics"> Создать физику </string> @@ -2500,7 +2536,25 @@ support@secondlife.com. Региональные наÑтройки </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] @@ -4715,6 +4769,9 @@ support@secondlife.com. <string name="New Tattoo"> Ðовое тату </string> + <string name="New Universal"> + Ðовые универÑальные + </string> <string name="New Physics"> ÐÐ¾Ð²Ð°Ñ Ñ„Ð¸Ð·Ð¸ÐºÐ° </string> @@ -5390,6 +5447,12 @@ support@secondlife.com. <string name="BeaconMedia"> ПроÑмотр медийных меток (белые) </string> + <string name="BeaconSun"> + ПроÑмотр метки Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñолнца (оранжевый) + </string> + <string name="BeaconMoon"> + ПроÑмотр метки Ð½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð»ÑƒÐ½Ñ‹ (багровый) + </string> <string name="ParticleHiding"> ЧаÑтицы Ñкрыты </string> @@ -5417,6 +5480,9 @@ support@secondlife.com. <string name="Command_Destinations_Label"> Пункты </string> + <string name="Command_Environments_Label"> + ÐœÐ¾Ñ Ð¾ÐºÑ€ÑƒÐ¶Ð°ÑŽÑ‰Ð°Ñ Ñреда + </string> <string name="Command_Facebook_Label"> Facebook </string> @@ -5513,6 +5579,9 @@ support@secondlife.com. <string name="Command_Destinations_Tooltip"> ИнтереÑные меÑта </string> + <string name="Command_Environments_Tooltip"> + ÐœÐ¾Ñ Ð¾ÐºÑ€ÑƒÐ¶Ð°ÑŽÑ‰Ð°Ñ Ñреда + </string> <string name="Command_Facebook_Tooltip"> Опубликовать в Facebook </string> @@ -5711,6 +5780,12 @@ support@secondlife.com. <string name="ExperiencePermission12"> автоматичеÑки принимать Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ </string> + <string name="ExperiencePermission16"> + поÑадить аватара + </string> + <string name="ExperiencePermission17"> + изменить Ñвои наÑтройки окружающей Ñреды + </string> <string name="ExperiencePermissionShortUnknown"> выполнил неизвеÑтную операцию: [Permission] </string> @@ -5735,6 +5810,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_adjust_environment.xml b/indra/newview/skins/default/xui/tr/floater_adjust_environment.xml new file mode 100644 index 00000000000..763845c54d9 --- /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 08ebf36be51..e5b598ee619 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 a7708b58827..4eee1b81a2f 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_ext_day_cycle.xml index 41d3842a94d..7ebbafa9bc3 100644 --- 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 @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="%[PRCNT] [DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="Geri çekil"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="Ä°leri çık"/> + <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> - <button label="Çerçeve Ekle" name="add_frame"/> - <button label="Çerçeve Yükle" name="btn_load_frame"/> - <button label="Çerçeve Sil" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/tr/floater_my_environments.xml b/indra/newview/skins/default/xui/tr/floater_my_environments.xml index 21df7ef0035..b91f48c5004 100644 --- a/indra/newview/skins/default/xui/tr/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/tr/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="BoÅŸ Klasörleri Göster" name="chk_showfolders"/> + <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="Bu ayarı sil"/> + <button name="btn_del" tool_tip="Seçilen öğeyi kaldır"/> </panel> </layout_panel> </layout_stack> 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 9691b678f24..9263d4e1c69 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 00000000000..83cfa8b652e --- /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_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml index 513a2e319ad..5aee6ae0911 100644 --- a/indra/newview/skins/default/xui/tr/floater_picks.xml +++ b/indra/newview/skins/default/xui/tr/floater_picks.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_picks" title="Seçmeler"/> +<floater name="floater_picks" title="Seçimler"/> diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml index 79e184130a2..8302c620705 100644 --- a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml @@ -10,7 +10,7 @@ Açıklama: </text> <text name="dimensions"> - [WIDTH]px x [HEIGHT]px + [WIDTH] pks x [HEIGHT] pks </text> <text name="aspect_ratio"> En boy oranını önizle diff --git a/indra/newview/skins/default/xui/tr/floater_settings_picker.xml b/indra/newview/skins/default/xui/tr/floater_settings_picker.xml index bbc8af04c33..0ef3aad5eee 100644 --- a/indra/newview/skins/default/xui/tr/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/tr/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="SEÇİM: AYARLAR"> - <floater.string name="choose_picture"> - Bir resim seçmek için tıklayın - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="Dokuları Filtrele" name="flt_inventory_search"/> - <check_box initial_value="false" label="Klasörleri göster" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="Tamam" label_selected="Tamam" name="btn_select"/> 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 42483c09e18..1a167091272 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 1ffc1ea07e2..d5e4113febf 100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Bölgeye Uygula" name="Settings Apply Region"/> <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 2f8f4507382..118081e3a3d 100644 --- a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml @@ -23,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"> 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 1b73032a5d3..7590ee28de3 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_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index 352bd2bc65d..1c977ba5cee 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -84,6 +84,7 @@ <menu_item_check label="Gece yarısı" name="Midnight"/> <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> @@ -328,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"/> @@ -465,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 04aa37bb848..b7593322e32 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -1961,8 +1961,9 @@ Binlerce bölgeyi deÄŸiÅŸtirecek ve alan sunucusunu kesintiye uÄŸratacaktır. <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ırabilir. Lütfen gerektiÄŸinde parsel sahiplerinizle tartışın. - <usetemplate name="okbutton" yestext="Tamam"/> + 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. @@ -2442,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. @@ -4398,8 +4407,20 @@ Daha küçük bir arazi parçası seçmeyi deneyin. <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ı [FILE] dosyasından içeri aktarılamıyor. + Eski Windlight ayarları [NAME], [FILE] kaynağından içeri aktarılamıyor. + +[REASONS] </notification> <notification name="WLParcelApplyFail"> Bu parsele ait ortam ayarlanamıyor. @@ -4414,6 +4435,16 @@ Lütfen ayarların etkin olduÄŸu bir bölgeye gidin ve eyleminizi yeniden deneyi 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. @@ -4422,4 +4453,17 @@ 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_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml index 7584b754f13..fc444f21f67 100644 --- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml @@ -47,7 +47,7 @@ <button label="[LABEL]" name="save_changes_btn"/> </layout_panel> <layout_panel name="show_on_map_btn_lp"> - <button label="Ä°ptal" name="cancel_btn"/> + <button label="Ä°ptal Et" name="cancel_btn"/> </layout_panel> </layout_stack> </panel> 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 7f5590a485a..fb97f1e1ced 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 00000000000..ef10307d119 --- /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 7a4a09aaedc..7880de8e7db 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_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml index 4b911c9ce6a..d9e79d171cd 100644 --- a/indra/newview/skins/default/xui/tr/panel_me.xml +++ b/indra/newview/skins/default/xui/tr/panel_me.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profilim" name="panel_me"> - <panel label="SEÇMELERÄ°M" name="panel_picks"/> + <panel label="SEÇTÄ°KLERÄ°M" name="panel_picks"/> </panel> 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 af409a424df..d375203cf62 100644 --- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> Bölge Ayarlarını Kullan </string> - <string name="str_unknow_inventory"> - Bilinmiyor - </string> <string name="str_altitude_desription"> Gökyüzü [INDEX]([ALTITUDE] m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="Envanterden Gelen Ayarlar" name="rdo_use_inv_setting"/> - <radio_item label="Özel Ortam" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - Bilinmiyor - </line_editor> - <button label="Ortamı Düzenle" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] (% [PRC]) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - Zemin - </text> - <text name="alt1"> - Gökyüzü [INDEX]([ALTITUDE] m) - </text> - <text name="alt2"> - Gökyüzü [INDEX]([ALTITUDE] m) - </text> - <text name="alt3"> - Gökyüzü [INDEX]([ALTITUDE] m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="Parsel Sahipleri Ortamı Geçersiz Kılabilir" name="chk_allow_override"/> - <button label="Uygula" name="btn_apply"/> - <button label="Sıfırla" name="btn_cancel"/> - </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 index bcd7cd077fc..44fccb594d7 100644 --- a/indra/newview/skins/default/xui/tr/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/tr/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="GüneÅŸ ve Ay" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml index 1324e2cc36c..baf53a7af42 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 5e830bddd56..3ac4a7b19fc 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 97e8f091be4..6db9e49c300 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -721,6 +721,18 @@ kartlarına eklenebilir. 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> @@ -793,12 +805,12 @@ http://secondlife.com/support adresini ziyaret edin. <string name="symbolic link"> baÄŸlantı </string> - <string name="settings blob"> - ayarlar - </string> <string name="symbolic folder link"> klasör baÄŸlantısı </string> + <string name="settings blob"> + ayarlar + </string> <string name="mesh"> örgü </string> @@ -1129,6 +1141,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> @@ -1280,6 +1295,9 @@ http://secondlife.com/support adresini ziyaret edin. <string name="tattoo"> Dövme </string> + <string name="universal"> + Evrensel + </string> <string name="physics"> Fizik </string> @@ -1322,6 +1340,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> @@ -1373,6 +1394,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> @@ -2514,6 +2538,24 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin <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> @@ -4728,6 +4770,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> @@ -5403,6 +5448,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> @@ -5430,6 +5481,9 @@ 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> @@ -5526,6 +5580,9 @@ 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> @@ -5724,6 +5781,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> @@ -5748,6 +5811,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_adjust_environment.xml b/indra/newview/skins/default/xui/zh/floater_adjust_environment.xml new file mode 100644 index 00000000000..192c4294309 --- /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 83e10804d6e..4df8c8f14bb 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 dbf4a21416b..3729aa7620b 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_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_ext_day_cycle.xml index 2b2f7757eb3..cdcf0a685ed 100644 --- 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 @@ -18,6 +18,18 @@ <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"> @@ -44,17 +56,28 @@ <multi_slider initial_value="0" name="WLTimeSlider"/> <multi_slider initial_value="0" name="WLDayCycleFrames"/> <text name="current_time" value="[PRCNT]%[DSC]"/> - <layout_stack name="progress_control"> - <layout_panel name="skip_back"> - <button name="skip_back_btn" tool_tip="倒轉"/> + <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 name="skip_forward"> - <button name="skip_forward_btn" tool_tip="快轉"/> + <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> - <button label="新增幀" name="add_frame"/> - <button label="載入幀" name="btn_load_frame"/> - <button label="刪除幀" name="delete_frame"/> </panel> </layout_panel> <layout_panel name="frame_edit_controls"> diff --git a/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml index 9246cbfd274..b47b8937641 100644 --- a/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/zh/floater_fixedenvironment.xml @@ -8,7 +8,7 @@ </string> <layout_stack name="floater_stack"> <layout_panel name="info_panel"> - <button label="載入" name="btn_load" tool_tip="從收ç´å€è¼‰å…¥è¨å®š"/> + <button label="載入" name="btn_load" tool_tip="從收ç´å€è¼‰å…¥ä¸€å€‹è¨å®š"/> <button label="匯入" name="btn_import" tool_tip="從ç£ç¢ŸåŒ¯å…¥èˆŠè¨å®šã€‚"/> </layout_panel> <layout_panel name="button_panel"> diff --git a/indra/newview/skins/default/xui/zh/floater_my_environments.xml b/indra/newview/skins/default/xui/zh/floater_my_environments.xml index be33d456dae..2184455dc9f 100644 --- a/indra/newview/skins/default/xui/zh/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/zh/floater_my_environments.xml @@ -5,15 +5,19 @@ <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"> - <check_box initial_value="false" label="顯示空資料夾" name="chk_showfolders"/> + <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="刪除這個è¨å®š"/> + <button name="btn_del" tool_tip="移除所é¸æ“‡çš„物å“"/> </panel> </layout_panel> </layout_stack> 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 d4706d8d87a..eb432a8bcd9 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 00000000000..f86132a423e --- /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_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml index c56b1c29874..2b6eac48b34 100644 --- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml @@ -10,7 +10,7 @@ æ述： </text> <text name="dimensions"> - [WIDTH] åƒç´ X [HEIGHT] åƒç´ + [WIDTH]åƒç´ x [HEIGHT]åƒç´ </text> <text name="aspect_ratio"> é 覽長寬比 diff --git a/indra/newview/skins/default/xui/zh/floater_settings_picker.xml b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml index dba6034b5a2..36e32777fb0 100644 --- a/indra/newview/skins/default/xui/zh/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/zh/floater_settings_picker.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings picker" title="é¸æ“‡ï¼šè¨å®š"> - <floater.string name="choose_picture"> - 點按以挑é¸åœ–片 - </floater.string> <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="temp"> + <layout_panel name="inv_list"> <filter_editor label="æ質éŽæ¿¾å™¨" name="flt_inventory_search"/> - <check_box initial_value="false" label="顯示資料夾" name="chk_showfolders"/> </layout_panel> <layout_panel name="temp"> <button label="確定" label_selected="確定" name="btn_select"/> 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 02d06323d47..881ca403383 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 4db6b4512dc..8b65b5c8dee 100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml @@ -33,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"> @@ -109,7 +110,6 @@ <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="Settings Apply Region"/> <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 013ac094b4b..c64b3996300 100644 --- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml @@ -23,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"> 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 124598a0982..460adf99188 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 index 9a70f381155..05ec0d97e27 100644 --- a/indra/newview/skins/default/xui/zh/menu_save_settings.xml +++ b/indra/newview/skins/default/xui/zh/menu_save_settings.xml @@ -2,7 +2,7 @@ <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="commit_changes"/> <menu_item_check label="僅套用到我自己" name="apply_local"/> <menu_item_check label="套用到地段" name="apply_parcel"/> <menu_item_check label="套用到地å€" name="apply_region"/> diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index a47102e864c..972434dfc52 100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -84,6 +84,7 @@ <menu_item_check label="åˆå¤œ" name="Midnight"/> <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> @@ -328,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"/> @@ -465,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 fa37576f69f..cfde824349b 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -1955,8 +1955,9 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="EstateParcelEnvironmentOverride"> - å–消勾é¸é€™é¸é …，å¯èƒ½æœƒç§»é™¤åœ°æ®µæ‰€æœ‰äººä¹‹å‰æ–°å¢žåˆ°åœ°æ®µçš„任何自定環境。 若有必è¦è«‹èˆ‡åœ°æ®µæ‰€æœ‰äººæºé€šã€‚ - <usetemplate name="okbutton" yestext="確定"/> + å–消勾é¸é€™é¸é …會移除地段æ“有人增è¨æ–¼åœ°æ®µçš„任何自訂環境è¨å®šã€‚ 若有必è¦è«‹èˆ‡åœ°æ®µæ‰€æœ‰äººæºé€šã€‚ +ä½ ç¢ºå®šè¦ç¹¼çºŒå—Žï¼Ÿ + <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/> </notification> <notification name="RegionEntryAccessBlocked"> ä½ æ‰€æ¬²å‰å¾€çš„地å€å«æœ‰è¶…éŽä½ ç›®å‰å好的分級的內容。 ä½ å¯ä»¥åˆ°ã€Œæˆ‘自己 > å好è¨å®š > 一般è¨å®šã€è®Šæ›´ä½ çš„å好è¨å®šã€‚ @@ -2437,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"> 無法刪除æ¤æ—¥å¾ªç’°çš„最後一組è¨å®šï¼Œæ—¥å¾ªç’°ä¸å¾—為空白。 ä½ æ‡‰è©²ä¿®æ”¹æœ€å¾Œä¸€çµ„è³‡æ–™ï¼Œä¸è¦è©¦åœ–刪除，然後å†å»ºç«‹æ–°çš„。 @@ -4396,8 +4405,21 @@ SHA1 指紋：[MD5_DIGEST] <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"> - 無法從[FILE]匯入舊的風光(Windlight)è¨å®šã€‚ + 無法匯入舊的風光(Windlight)è¨å®š[NAME]，來æºï¼š +[FILE]。 + +[REASONS] </notification> <notification name="WLParcelApplyFail"> 無法è¨å®šæ¤åœ°æ®µçš„環境。 @@ -4410,7 +4432,17 @@ SHA1 指紋：[MD5_DIGEST] <notification name="SettingsConfirmLoss"> ä½ å³å°‡é‡å°å爲"[NAME]"çš„[TYPE]放棄變更。 確定繼續？ - <usetemplate ignoretext="確定放棄變更？" name="okcancelignore" notext="å¦" yestext="是"/> + <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"> ä½ å³å°‡æŠŠç„¡æ³•è½‰ç§»çš„è¨å®šåŒ¯å…¥é€™å€‹æ—¥å¾ªç’°ã€‚ å¦‚æžœç¹¼çºŒï¼Œå°‡ä½¿å¾—ä½ æ£åœ¨ç·¨è¼¯çš„è¨å®šä¹Ÿè®Šæˆç„¡æ³•è½‰ç§»ã€‚ @@ -4418,6 +4450,19 @@ SHA1 指紋：[MD5_DIGEST] 這個改變無法å–消復原。 確定繼續？ - <usetemplate ignoretext="確定è¦æŠŠè¨å®šè®Šæˆç„¡æ³•è½‰ç§»ï¼Ÿ" name="okcancelignore" notext="å¦" yestext="是"/> + <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 f5111d629a6..10ed653472a 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 00000000000..6974efcc895 --- /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 4dd7ea6d93c..d41785858a1 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 16f9dc83a07..8caadf50ae0 100644 --- a/indra/newview/skins/default/xui/zh/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml @@ -6,9 +6,6 @@ <string name="str_label_use_region"> 使用地å€è¨å®š </string> - <string name="str_unknow_inventory"> - 未知 - </string> <string name="str_altitude_desription"> 天空 [INDEX]([ALTITUDE]m) </string> @@ -21,6 +18,18 @@ <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"> @@ -29,49 +38,79 @@ </layout_panel> <layout_panel name="pnl_environment_config"> <layout_stack> - <layout_panel name="pnl_environment_current"> - <radio_group name="rdg_environment_select"> - <radio_item label="[USEDEFAULT]" name="rdo_use_xxx_setting"/> - <radio_item label="來自收ç´å€çš„è¨å®š" name="rdo_use_inv_setting"/> - <radio_item label="自定環境" name="rdo_use_custom_setting"/> - </radio_group> - <line_editor name="edt_inventory_name"> - 未知 - </line_editor> - <button label="編輯環境" name="btn_edit"/> + <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_length"> - <text name="lbl_apparent_time"> - [HH]:[MM][AP] ([PRC]%) - </text> + <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_panel name="pnl_environment_altitudes"> - <panel name="cnt_panel"> - <multi_slider initial_value="100" name="sld_altitudes"> - <slider name="sld1" value="200"/> - <slider name="sld2" value="400"/> - <slider name="sld3" value="600"/> - </multi_slider> - <text name="ground"> - åœ°é¢ - </text> - <text name="alt1"> - 天空 [INDEX]([ALTITUDE]m) - </text> - <text name="alt2"> - 天空 [INDEX]([ALTITUDE]m) - </text> - <text name="alt3"> - 天空 [INDEX]([ALTITUDE]m) - </text> - </panel> - </layout_panel> - <layout_panel name="pnl_environment_buttons"> - <check_box label="地段所有人å¯å¼·åˆ¶è¨å®šç’°å¢ƒ" name="chk_allow_override"/> - <button label="套用" name="btn_apply"/> - <button label="é‡è¨" name="btn_cancel"/> - </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 index 4b043ccaa28..ddd5ecfe494 100644 --- a/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_density.xml @@ -2,23 +2,23 @@ <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_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_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 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_exponential"/> + <slider label="å¸æ”¶æŒ‡æ•¸æ¯”例尺：" name="absorption_exponential_scale"/> <slider label="å¸æ”¶ç·šæ€§é …：" name="absorption_linear"/> <slider label="å¸æ”¶å¸¸æ•¸é …：" name="absorption_constant"/> <slider label="å¸æ”¶æœ€å¤§é«˜åº¦ï¼š" name="absorption_max_altitude"/> 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 index 594f7e89d18..7d1d433cbc0 100644 --- a/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/zh/panel_settings_sky_sunmoon.xml @@ -1,2 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="日與月" name="panel_settings_sky_hbodies"/> +<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_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml index 9a4e2f68a8f..f7868ff8550 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 e3b0eb1261c..e7865b60567 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 c0ff177be34..bb7e27242bd 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -633,13 +633,13 @@ http://secondlife.com/viewer-access-faq 顯示幫助 </string> <string name="TooltipNotecardNotAllowedTypeDrop"> - é€™é¡žç‰©é …ç„¡æ³•é™„è‘— -到本地å€çš„記事å¡ã€‚ + é€™ç¨®é¡žåž‹çš„ç‰©é …ä¸èƒ½é™„è‘— +到這一å€åŸŸçš„記事å¡ã€‚ </string> <string name="TooltipNotecardOwnerRestrictedDrop"> - åªæœ‰å¸¶æœ‰ä¸å—é™åˆ¶çš„ -「下一個所有人ã€æ¬Šé™çš„物件 -æ‰å¯é™„著到記事å¡ã€‚ + 唯有「下一所有人ã€æ¬Šé™ +ä¸å—é™åˆ¶çš„ç‰©é …æ‰å¯ +附著到記事å¡ã€‚ </string> <string name="Searching"> æœå°‹ä¸... @@ -717,6 +717,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> @@ -789,12 +801,12 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="symbolic link"> è¯çµ </string> - <string name="settings blob"> - è¨å®š - </string> <string name="symbolic folder link"> 資料夾è¯çµ </string> + <string name="settings blob"> + è¨å®š + </string> <string name="mesh"> ç¶²é¢ </string> @@ -1125,6 +1137,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="ForceSitAvatar"> å¼·è¿«ä½ çš„åŒ–èº«å下 </string> + <string name="ChangeEnvSettings"> + æ”¹è®Šä½ çš„ç’°å¢ƒè¨å®š + </string> <string name="NotConnected"> 未è¯æŽ¥ </string> @@ -1276,6 +1291,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="tattoo"> åˆºé’ </string> + <string name="universal"> + 通用值 + </string> <string name="physics"> èº«é«”ç‰©ç† </string> @@ -1318,6 +1336,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="tattoo_not_worn"> 刺é’未穿 </string> + <string name="universal_not_worn"> + 未穿戴通用值 + </string> <string name="physics_not_worn"> 身體物ç†æœªç©¿ </string> @@ -1369,6 +1390,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="create_new_tattoo"> å‰µé€ æ–°åˆºé’ </string> + <string name="create_new_universal"> + 創立新的通用值 + </string> <string name="create_new_physics"> å‰µé€ æ–°èº«é«”ç‰©ç† </string> @@ -2510,6 +2534,24 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <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> @@ -4726,6 +4768,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="New Tattoo"> æ–°åˆºé’ </string> + <string name="New Universal"> + 新通用值 + </string> <string name="New Physics"> æ–°èº«é«”ç‰©ç† </string> @@ -5401,6 +5446,12 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="BeaconMedia"> 檢視媒體的導引（白色） </string> + <string name="BeaconSun"> + 檢視太陽方å‘指標（橘色） + </string> + <string name="BeaconMoon"> + 檢視月亮方å‘指標（紫色） + </string> <string name="ParticleHiding"> éš±è—ç²’å效果 </string> @@ -5428,6 +5479,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="Command_Destinations_Label"> 目的地 </string> + <string name="Command_Environments_Label"> + 我的環境 + </string> <string name="Command_Facebook_Label"> 臉書 </string> @@ -5524,6 +5578,9 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="Command_Destinations_Tooltip"> ä½ å¯èƒ½æ„Ÿèˆˆè¶£çš„目的地 </string> + <string name="Command_Environments_Tooltip"> + 我的環境 + </string> <string name="Command_Facebook_Tooltip"> 發佈到臉書 </string> @@ -5722,6 +5779,12 @@ http://secondlife.com/support 求助解決å•é¡Œã€‚ <string name="ExperiencePermission12"> 自動接å—å„ç¨®é«”é©—æ¬Šé™ </string> + <string name="ExperiencePermission16"> + å¼·è¿«ä½ çš„åŒ–èº«å下 + </string> + <string name="ExperiencePermission17"> + æ”¹è®Šä½ çš„ç’°å¢ƒè¨å®š + </string> <string name="ExperiencePermissionShortUnknown"> 進行了未知的æ“作：[Permission] </string> @@ -5746,6 +5809,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> -- GitLab