From 996ed16fa1b3eb005c90b67f8ea363fd423ef711 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 11 Sep 2013 15:15:34 -0700
Subject: [PATCH] FIX INTL-123 translation of Viewer Set36 for 9 languages
(changed and new files)
---
.../skins/default/xui/de/floater_about.xml | 4 +-
.../default/xui/de/floater_bulk_perms.xml | 7 +-
.../default/xui/de/floater_goto_line.xml | 7 ++
.../default/xui/de/floater_im_session.xml | 12 +-
.../xui/de/floater_pathfinding_console.xml | 2 +-
.../default/xui/de/menu_attachment_other.xml | 2 +
.../default/xui/de/menu_attachment_self.xml | 2 +
.../default/xui/de/menu_avatar_other.xml | 2 +
.../skins/default/xui/de/menu_avatar_self.xml | 2 +
.../default/xui/de/menu_conversation.xml | 1 +
.../skins/default/xui/de/menu_land.xml | 1 +
.../skins/default/xui/de/menu_login.xml | 8 +-
.../default/xui/de/menu_mute_particle.xml | 5 +
.../skins/default/xui/de/menu_object.xml | 5 +-
.../skins/default/xui/de/menu_url_agent.xml | 1 +
.../default/xui/de/menu_url_objectim.xml | 1 +
.../skins/default/xui/de/menu_viewer.xml | 15 ++-
.../skins/default/xui/de/notifications.xml | 71 +++++++++--
.../skins/default/xui/de/panel_people.xml | 3 +
.../default/xui/de/panel_preferences_chat.xml | 44 ++++---
.../xui/de/panel_preferences_graphics1.xml | 2 +-
.../xui/de/panel_preferences_setup.xml | 1 +
.../skins/default/xui/de/panel_script_ed.xml | 1 +
.../default/xui/de/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/de/role_actions.xml | 2 +-
.../newview/skins/default/xui/de/strings.xml | 36 ++++++
.../skins/default/xui/es/floater_about.xml | 4 +-
.../default/xui/es/floater_bulk_perms.xml | 7 +-
.../default/xui/es/floater_goto_line.xml | 7 ++
.../default/xui/es/floater_im_session.xml | 12 +-
.../xui/es/floater_pathfinding_console.xml | 2 +-
.../default/xui/es/menu_attachment_other.xml | 2 +
.../default/xui/es/menu_attachment_self.xml | 2 +
.../default/xui/es/menu_avatar_other.xml | 2 +
.../skins/default/xui/es/menu_avatar_self.xml | 2 +
.../default/xui/es/menu_conversation.xml | 1 +
.../skins/default/xui/es/menu_land.xml | 1 +
.../skins/default/xui/es/menu_login.xml | 8 +-
.../default/xui/es/menu_mute_particle.xml | 5 +
.../skins/default/xui/es/menu_object.xml | 5 +-
.../skins/default/xui/es/menu_url_agent.xml | 1 +
.../default/xui/es/menu_url_objectim.xml | 1 +
.../skins/default/xui/es/menu_viewer.xml | 14 ++-
.../skins/default/xui/es/notifications.xml | 87 ++++++++++---
.../skins/default/xui/es/panel_people.xml | 3 +
.../default/xui/es/panel_preferences_chat.xml | 70 ++++++-----
.../xui/es/panel_preferences_graphics1.xml | 2 +-
.../xui/es/panel_preferences_setup.xml | 1 +
.../skins/default/xui/es/panel_script_ed.xml | 1 +
.../default/xui/es/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/es/role_actions.xml | 2 +-
.../newview/skins/default/xui/es/strings.xml | 36 ++++++
.../skins/default/xui/fr/floater_about.xml | 2 +
.../default/xui/fr/floater_bulk_perms.xml | 7 +-
.../default/xui/fr/floater_goto_line.xml | 7 ++
.../default/xui/fr/floater_im_session.xml | 12 +-
.../xui/fr/floater_pathfinding_console.xml | 2 +-
.../default/xui/fr/menu_attachment_other.xml | 2 +
.../default/xui/fr/menu_attachment_self.xml | 2 +
.../default/xui/fr/menu_avatar_other.xml | 2 +
.../skins/default/xui/fr/menu_avatar_self.xml | 2 +
.../default/xui/fr/menu_conversation.xml | 1 +
.../skins/default/xui/fr/menu_land.xml | 1 +
.../skins/default/xui/fr/menu_login.xml | 8 +-
.../default/xui/fr/menu_mute_particle.xml | 5 +
.../skins/default/xui/fr/menu_object.xml | 5 +-
.../skins/default/xui/fr/menu_url_agent.xml | 1 +
.../default/xui/fr/menu_url_objectim.xml | 1 +
.../skins/default/xui/fr/menu_viewer.xml | 14 ++-
.../skins/default/xui/fr/notifications.xml | 73 +++++++++--
.../skins/default/xui/fr/panel_people.xml | 3 +
.../default/xui/fr/panel_preferences_chat.xml | 46 ++++---
.../xui/fr/panel_preferences_graphics1.xml | 2 +-
.../xui/fr/panel_preferences_setup.xml | 1 +
.../skins/default/xui/fr/panel_script_ed.xml | 1 +
.../default/xui/fr/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/fr/role_actions.xml | 2 +-
.../newview/skins/default/xui/fr/strings.xml | 36 ++++++
.../skins/default/xui/it/floater_about.xml | 4 +-
.../default/xui/it/floater_bulk_perms.xml | 7 +-
.../default/xui/it/floater_goto_line.xml | 7 ++
.../default/xui/it/floater_im_session.xml | 12 +-
.../xui/it/floater_pathfinding_console.xml | 2 +-
.../default/xui/it/menu_attachment_other.xml | 2 +
.../default/xui/it/menu_attachment_self.xml | 2 +
.../default/xui/it/menu_avatar_other.xml | 2 +
.../skins/default/xui/it/menu_avatar_self.xml | 2 +
.../default/xui/it/menu_conversation.xml | 1 +
.../skins/default/xui/it/menu_land.xml | 1 +
.../skins/default/xui/it/menu_login.xml | 8 +-
.../default/xui/it/menu_mute_particle.xml | 5 +
.../skins/default/xui/it/menu_object.xml | 5 +-
.../skins/default/xui/it/menu_url_agent.xml | 1 +
.../default/xui/it/menu_url_objectim.xml | 1 +
.../skins/default/xui/it/menu_viewer.xml | 14 ++-
.../skins/default/xui/it/notifications.xml | 79 +++++++++---
.../skins/default/xui/it/panel_people.xml | 3 +
.../default/xui/it/panel_preferences_chat.xml | 40 +++---
.../xui/it/panel_preferences_graphics1.xml | 2 +-
.../xui/it/panel_preferences_setup.xml | 1 +
.../skins/default/xui/it/panel_script_ed.xml | 1 +
.../default/xui/it/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/it/role_actions.xml | 2 +-
.../newview/skins/default/xui/it/strings.xml | 36 ++++++
.../skins/default/xui/ja/floater_about.xml | 4 +-
.../default/xui/ja/floater_bulk_perms.xml | 7 +-
.../default/xui/ja/floater_goto_line.xml | 7 ++
.../default/xui/ja/floater_im_session.xml | 12 +-
.../xui/ja/floater_pathfinding_console.xml | 2 +-
.../default/xui/ja/menu_attachment_other.xml | 2 +
.../default/xui/ja/menu_attachment_self.xml | 2 +
.../default/xui/ja/menu_avatar_other.xml | 2 +
.../skins/default/xui/ja/menu_avatar_self.xml | 2 +
.../default/xui/ja/menu_conversation.xml | 1 +
.../skins/default/xui/ja/menu_land.xml | 1 +
.../skins/default/xui/ja/menu_login.xml | 8 +-
.../default/xui/ja/menu_mute_particle.xml | 5 +
.../skins/default/xui/ja/menu_object.xml | 5 +-
.../skins/default/xui/ja/menu_url_agent.xml | 1 +
.../default/xui/ja/menu_url_objectim.xml | 1 +
.../skins/default/xui/ja/menu_viewer.xml | 14 ++-
.../skins/default/xui/ja/notifications.xml | 87 ++++++++++---
.../skins/default/xui/ja/panel_people.xml | 3 +
.../default/xui/ja/panel_preferences_chat.xml | 84 +++++++------
.../xui/ja/panel_preferences_graphics1.xml | 2 +-
.../xui/ja/panel_preferences_setup.xml | 1 +
.../skins/default/xui/ja/panel_script_ed.xml | 1 +
.../default/xui/ja/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/ja/role_actions.xml | 4 +-
.../newview/skins/default/xui/ja/strings.xml | 36 ++++++
.../skins/default/xui/pt/floater_about.xml | 4 +-
.../default/xui/pt/floater_bulk_perms.xml | 7 +-
.../default/xui/pt/floater_goto_line.xml | 7 ++
.../default/xui/pt/floater_im_session.xml | 12 +-
.../xui/pt/floater_pathfinding_console.xml | 2 +-
.../default/xui/pt/menu_attachment_other.xml | 2 +
.../default/xui/pt/menu_attachment_self.xml | 2 +
.../default/xui/pt/menu_avatar_other.xml | 2 +
.../skins/default/xui/pt/menu_avatar_self.xml | 2 +
.../default/xui/pt/menu_conversation.xml | 1 +
.../skins/default/xui/pt/menu_land.xml | 1 +
.../skins/default/xui/pt/menu_login.xml | 8 +-
.../default/xui/pt/menu_mute_particle.xml | 5 +
.../skins/default/xui/pt/menu_object.xml | 5 +-
.../skins/default/xui/pt/menu_url_agent.xml | 1 +
.../default/xui/pt/menu_url_objectim.xml | 1 +
.../skins/default/xui/pt/menu_viewer.xml | 14 ++-
.../skins/default/xui/pt/notifications.xml | 83 ++++++++++---
.../skins/default/xui/pt/panel_people.xml | 3 +
.../default/xui/pt/panel_preferences_chat.xml | 66 ++++++----
.../xui/pt/panel_preferences_graphics1.xml | 2 +-
.../xui/pt/panel_preferences_setup.xml | 1 +
.../skins/default/xui/pt/panel_script_ed.xml | 1 +
.../default/xui/pt/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/pt/role_actions.xml | 2 +-
.../newview/skins/default/xui/pt/strings.xml | 36 ++++++
.../skins/default/xui/ru/floater_about.xml | 2 +
.../default/xui/ru/floater_bulk_perms.xml | 7 +-
.../default/xui/ru/floater_goto_line.xml | 7 ++
.../default/xui/ru/floater_im_session.xml | 12 +-
.../xui/ru/floater_pathfinding_console.xml | 2 +-
.../default/xui/ru/menu_attachment_other.xml | 2 +
.../default/xui/ru/menu_attachment_self.xml | 2 +
.../default/xui/ru/menu_avatar_other.xml | 2 +
.../skins/default/xui/ru/menu_avatar_self.xml | 2 +
.../default/xui/ru/menu_conversation.xml | 1 +
.../skins/default/xui/ru/menu_land.xml | 1 +
.../skins/default/xui/ru/menu_login.xml | 8 +-
.../default/xui/ru/menu_mute_particle.xml | 5 +
.../skins/default/xui/ru/menu_object.xml | 5 +-
.../skins/default/xui/ru/menu_url_agent.xml | 1 +
.../default/xui/ru/menu_url_objectim.xml | 1 +
.../skins/default/xui/ru/menu_viewer.xml | 16 ++-
.../skins/default/xui/ru/notifications.xml | 61 ++++++++-
.../skins/default/xui/ru/panel_people.xml | 3 +
.../default/xui/ru/panel_preferences_chat.xml | 38 ++++--
.../xui/ru/panel_preferences_graphics1.xml | 2 +-
.../xui/ru/panel_preferences_setup.xml | 1 +
.../skins/default/xui/ru/panel_script_ed.xml | 1 +
.../default/xui/ru/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/ru/role_actions.xml | 2 +-
.../newview/skins/default/xui/ru/strings.xml | 36 ++++++
.../skins/default/xui/tr/floater_about.xml | 2 +
.../default/xui/tr/floater_bulk_perms.xml | 7 +-
.../default/xui/tr/floater_goto_line.xml | 7 ++
.../default/xui/tr/floater_im_session.xml | 12 +-
.../xui/tr/floater_pathfinding_console.xml | 2 +-
.../default/xui/tr/menu_attachment_other.xml | 2 +
.../default/xui/tr/menu_attachment_self.xml | 2 +
.../default/xui/tr/menu_avatar_other.xml | 2 +
.../skins/default/xui/tr/menu_avatar_self.xml | 2 +
.../default/xui/tr/menu_conversation.xml | 1 +
.../skins/default/xui/tr/menu_land.xml | 1 +
.../skins/default/xui/tr/menu_login.xml | 8 +-
.../default/xui/tr/menu_mute_particle.xml | 5 +
.../skins/default/xui/tr/menu_object.xml | 5 +-
.../skins/default/xui/tr/menu_url_agent.xml | 1 +
.../default/xui/tr/menu_url_objectim.xml | 1 +
.../skins/default/xui/tr/menu_viewer.xml | 14 ++-
.../skins/default/xui/tr/notifications.xml | 65 ++++++++--
.../skins/default/xui/tr/panel_people.xml | 3 +
.../default/xui/tr/panel_preferences_chat.xml | 44 ++++---
.../xui/tr/panel_preferences_graphics1.xml | 2 +-
.../xui/tr/panel_preferences_setup.xml | 1 +
.../skins/default/xui/tr/panel_script_ed.xml | 1 +
.../default/xui/tr/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/tr/role_actions.xml | 2 +-
.../newview/skins/default/xui/tr/strings.xml | 36 ++++++
.../skins/default/xui/zh/floater_about.xml | 2 +
.../default/xui/zh/floater_bulk_perms.xml | 7 +-
.../default/xui/zh/floater_goto_line.xml | 7 ++
.../default/xui/zh/floater_im_session.xml | 12 +-
.../xui/zh/floater_pathfinding_console.xml | 2 +-
.../default/xui/zh/menu_attachment_other.xml | 2 +
.../default/xui/zh/menu_attachment_self.xml | 2 +
.../default/xui/zh/menu_avatar_other.xml | 2 +
.../skins/default/xui/zh/menu_avatar_self.xml | 2 +
.../default/xui/zh/menu_conversation.xml | 1 +
.../skins/default/xui/zh/menu_land.xml | 1 +
.../skins/default/xui/zh/menu_login.xml | 8 +-
.../default/xui/zh/menu_mute_particle.xml | 5 +
.../skins/default/xui/zh/menu_object.xml | 5 +-
.../skins/default/xui/zh/menu_url_agent.xml | 1 +
.../default/xui/zh/menu_url_objectim.xml | 1 +
.../skins/default/xui/zh/menu_viewer.xml | 14 ++-
.../skins/default/xui/zh/notifications.xml | 57 ++++++++-
.../skins/default/xui/zh/panel_people.xml | 3 +
.../default/xui/zh/panel_preferences_chat.xml | 46 ++++---
.../xui/zh/panel_preferences_graphics1.xml | 2 +-
.../xui/zh/panel_preferences_setup.xml | 1 +
.../skins/default/xui/zh/panel_script_ed.xml | 1 +
.../default/xui/zh/panel_tools_texture.xml | 116 ++++++++++++++++++
.../skins/default/xui/zh/role_actions.xml | 2 +-
.../newview/skins/default/xui/zh/strings.xml | 36 ++++++
234 files changed, 2788 insertions(+), 483 deletions(-)
create mode 100644 indra/newview/skins/default/xui/de/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/de/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/de/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/es/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/es/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/es/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/fr/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/fr/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/fr/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/it/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/it/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/it/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/ja/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/ja/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/ja/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/pt/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/pt/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/pt/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/ru/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/ru/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/ru/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/tr/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/tr/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/tr/panel_tools_texture.xml
create mode 100644 indra/newview/skins/default/xui/zh/floater_goto_line.xml
create mode 100644 indra/newview/skins/default/xui/zh/menu_mute_particle.xml
create mode 100644 indra/newview/skins/default/xui/zh/panel_tools_texture.xml
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 52454671832..bc0eae7c5de 100755
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -8,7 +8,9 @@
Kompiliert mit [COMPILER] version [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Sie befinden sich in [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+ Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 8f99fc933c2..27a74c874ea 100755
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN">
+<floater name="floaterbulkperms" title="INHALTSBERECHTIGUNGEN ÄNDERN">
<floater.string name="nothing_to_modify_text">
Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
</floater.string>
@@ -33,7 +33,7 @@
<button label="√ Alle" label_selected="Alle" name="check_all"/>
<button label="Löschen" label_selected="Keine" name="check_none"/>
<text name="newperms">
- Neue Inhalts-Berechtigungen
+ Inhaltsberechtigungen ändern in
</text>
<text name="GroupLabel">
Gruppe:
@@ -49,6 +49,7 @@
<check_box label="Bearbeiten" name="next_owner_modify"/>
<check_box label="Kopieren" name="next_owner_copy"/>
<check_box initial_value="true" label="Transferieren" name="next_owner_transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Anwenden" name="apply"/>
<button label="Abbrechen" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_goto_line.xml b/indra/newview/skins/default/xui/de/floater_goto_line.xml
new file mode 100644
index 00000000000..02550ec398d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="GEHE ZU ZEILE">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Gehe zu Zeile
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index f96eb72cb1d..b07b74bf4a2 100755
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index 88e9f53a4c3..ebf8f01632f 100755
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Anzeigen:
</text>
- <check_box label="Test" name="show_world"/>
+ <check_box label="Welt" name="show_world"/>
<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
<check_box label="Navmesh" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
index 237c92f7d26..4c125c8b5d8 100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Einfrieren" name="Freeze..."/>
<menu_item_call label="Hinauswerfen" name="Eject..."/>
<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+ <menu_item_call label="XML ausgeben" name="Dump XML"/>
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
<menu_item_call label="Bezahlen" name="Pay..."/>
<menu_item_call label="Objektprofil" name="Object Inspect"/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index 325d52a22ec..7888c7b0a11 100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+ <menu_item_call label="XML ausgeben" name="Dump XML"/>
<menu_item_call label="Fallen lassen" name="Drop"/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
index 8aee0be3d2e..65dc054ed50 100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Einfrieren" name="Freeze..."/>
<menu_item_call label="Hinauswerfen" name="Eject..."/>
<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+ <menu_item_call label="XML ausgeben" name="Dump XML"/>
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
<menu_item_call label="Bezahlen" name="Pay..."/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
index c49f4b198bf..022cd8c3caa 100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+ <menu_item_call label="XML ausgeben" name="Dump XML"/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
index 30d3ab79e1a..bdfa66c23b8 100644
--- a/indra/newview/skins/default/xui/de/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+ <menu_item_call label="Ausgewählte schließen" name="close_selected_conversations"/>
<menu_item_call label="Profil anzeigen" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
index de679da3d8e..0bbf8c666ed 100755
--- a/indra/newview/skins/default/xui/de/menu_land.xml
+++ b/indra/newview/skins/default/xui/de/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Pass kaufen" name="Land Buy Pass"/>
<menu_item_call label="Bauen" name="Create"/>
<menu_item_call label="Land bearbeiten" name="Edit Terrain"/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index b43b41a5dc2..62358cc5a88 100755
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
<menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/>
- <menu label="Protokollierungsstufe festlegen" name="Set Logging Level"/>
+ <menu label="Protokollierungsstufe festlegen" name="Set Logging Level">
+ <menu_item_check label="Debug" name="Debug"/>
+ <menu_item_check label="Info" name="Info"/>
+ <menu_item_check label="Warnung" name="Warning"/>
+ <menu_item_check label="Fehler" name="Error"/>
+ <menu_item_check label="Keine" name="None"/>
+ </menu>
<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
<menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_mute_particle.xml b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
new file mode 100644
index 00000000000..ea8ae03ee07
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 9f44ced928b..de2b4096780 100755
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="Bearbeiten" name="Edit..."/>
<menu_item_call label="Bauen" name="Build"/>
- <menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
- <menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
<menu_item_call label="Öffnen" name="Open"/>
<menu_item_call label="Hier sitzen" name="Object Sit"/>
<menu_item_call label="Aufstehen" name="Object Stand Up"/>
<menu_item_call label="Objektprofil" name="Object Inspect"/>
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
+ <menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
+ <menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
<context_menu label="Anziehen" name="Put On">
<menu_item_call label="Anziehen" name="Wear"/>
<menu_item_call label="Hinzufügen" name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="Bezahlen" name="Pay..."/>
<menu_item_call label="Kaufen" name="Buy..."/>
<menu_item_call label="Löschen" name="Delete"/>
+ <menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index c61ebb0eae2..ddb072ba8f1 100755
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Profil anzeigen" name="show_agent"/>
<menu_item_call label="IM senden..." name="send_im"/>
<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
+ <menu_item_call label="Freund entfernen..." name="remove_friend"/>
<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 77b7004e44f..fc01ea84447 100755
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Objektprofil..." name="show_object"/>
+ <menu_item_call label="Blockieren..." name="block_object"/>
<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 47d9fec3527..be5d4891d71 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
</menu>
- <menu label="Status" name="Status"/>
+ <menu label="Status" name="Status">
+ <menu_item_check label="Abwesend" name="Away"/>
+ <menu_item_check label="Nicht stören" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
<menu_item_call label="Kontoübersicht..." name="Manage My Account">
@@ -32,6 +35,7 @@
<menu_item_check label="Unterhaltungen..." name="Conversations"/>
<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
<menu_item_check label="Sprechen" name="Speak"/>
+ <menu_item_check label="Unterhaltungsprotokoll..." name="Conversation Log..."/>
<menu label="Voice-Morphing" name="VoiceMorphing">
<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
<menu_item_check label="Vorschau..." name="Preview"/>
@@ -42,6 +46,7 @@
<menu_item_check label="Gruppen" name="My Groups"/>
<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
<menu_item_call label="Blockierliste" name="Block List"/>
+ <menu_item_check label="Nicht stören" name="Do Not Disturb"/>
</menu>
<menu label="Welt" name="World">
<menu_item_call label="Landmarke für diesen Ort setzen" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
<menu label="Objekt" name="Object">
@@ -279,6 +285,7 @@
<menu_item_check label="Framerate randomisieren" name="Randomize Framerate"/>
<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
<menu_item_check label="Frame-Test" name="Frame Test"/>
+ <menu_item_call label="Rahmenprofil" name="Frame Profile"/>
</menu>
<menu label="Metadaten darstellen" name="Render Metadata">
<menu_item_check label="Bonding Boxes" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
<menu_item_check label="Achsen" name="Axes"/>
<menu_item_check label="Tangentenbasis" name="Tangent Basis"/>
<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
+ <menu_item_call label="Ausgewählte Materialinfos" name="Selected Material Info"/>
<menu_item_check label="Wireframe" name="Wireframe"/>
<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
- <menu_item_check label="Uber Licht Modell" name="Advanced Lighting Model"/>
+ <menu_item_check label="Erweitertes Beleuchtungsmodell" name="Advanced Lighting Model"/>
<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
@@ -325,7 +333,6 @@
<menu_item_check label="Animationstexturen" name="Animation Textures"/>
<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
- <menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/>
<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>
<menu_item_check label="Leucht-Objekte schweben lassen" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
<menu_item_call label="Fokus ausgeben" name="Dump Focus Holder"/>
<menu_item_call label="Ausgewählte Objektinfo drucken" name="Print Selected Object Info"/>
<menu_item_call label="Agent-Info drucken" name="Print Agent Info"/>
- <menu_item_call label="Speicher-Stats" name="Memory Stats"/>
<menu_item_check label="Regions-Debug-Konsole" name="Region Debug Console"/>
<menu_item_check label="Fehler in SelectMgr beseitigen" name="Debug SelectMgr"/>
<menu_item_check label="Fehler in Klicks beseitigen" name="Debug Clicks"/>
@@ -395,7 +401,6 @@
</menu>
<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
<menu_item_check label="Animations-Info" name="Animation Info"/>
- <menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index dc0d7dc6b4b..b3ae98f6333 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -146,7 +146,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Alles speichern"/>
</notification>
<notification name="FriendsAndGroupsOnly">
- Leute, die nicht auf Ihrer Freundesliste stehen, werden nicht wissen, dass Sie deren Anrufe oder Sofortnachrichten ignoriert haben.
+ Personen, die nicht auf Ihrer Freundesliste stehen, werden nicht informiert, dass Sie ihre Anrufe und Instant Messages ignorieren.
<usetemplate name="okbutton" yestext="Ja"/>
</notification>
<notification name="FavoritesOnLogin">
@@ -216,6 +216,14 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Sie sind dabei, [AVATAR_NAME] aus der Gruppe hinauszuwerfen.
+ <usetemplate ignoretext="Hinauswerfen eines einzelnen Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Sie sind dabei, [COUNT] Mitglieder aus der Gruppe hinauszuwerfen.
+ <usetemplate ignoretext="Hinauswerfen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+ </notification>
<notification name="AttachmentDrop">
Sie möchten Ihren Anhang wirklich fallen lassen?
Möchten Sie fortfahren?
@@ -1124,7 +1132,7 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
Geben sie einen höheren Betrag ein.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Mindestens eines Ihrer ausgewählten Objekte verfügt über verknüpfte Objekte. Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr. Wir empfehlen Ihnen daher, diese Verknüpfungen zuerst zu löschen.
+ Auf mindestens eines der Objekte wird über Verknüpfungen Bezug genommen. Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr. Wir empfehlen daher, diese Verknüpfungen zuerst zu löschen.
Möchten Sie diese Objekte wirklich löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1142,9 +1150,9 @@ Möchten Sie diese Objekte löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
- Mindestens eines der ausgewählten Objekt gehört nicht Ihnen.
+ Mindestens eines der ausgewählten Objekte gehört nicht Ihnen.
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1158,14 +1166,14 @@ Möchten Sie diese Objekte löschen?
Mindestens ein Objekt ist gesperrt.
Mindestens ein Objekt gehört nicht Ihnen.
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
Mindestens ein Objekt kann nicht kopiert werden.
Mindestens ein Objekt gehört nicht Ihnen.
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
@@ -1173,7 +1181,7 @@ Möchten Sie diese Objekte löschen?
Mindestens ein Objekt kann nicht kopiert werden.
Mindestens ein Objekt gehört nicht Ihnen.
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
@@ -1492,13 +1500,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informationen zu diesem Update]
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
Ein erforderliches Softwareupdate wurde heruntergeladen.
-Version [VERSION]
+Version [VERSION] [[INFO_URL] Infos zu diesem Update]
Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+[[INFO_URL] Infos zu diesem Update]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Details zu diesem Update finden Sie [[INFO_URL] hier].
+ <usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+ <usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Ein erforderliches Softwareupdate wurde heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+
+Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1549,6 +1587,10 @@ Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
Diese Gruppe verlassen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
@@ -2410,9 +2452,7 @@ Wählen Sie ein einzelnes Objekt aus.
„Teleportieren“ wählen.)
</notification>
<notification name="TeleportToPerson">
- Um Einwohner wie „[NAME]“ zu kontaktieren, klicken Sie auf die Schaltfläche „Leute“, wählen Sie eingeblendeten Fenster einen Einwohner aus
- und klicken Sie unten im Fenster auf „IM“.
- (Sie können auch auf den Namen doppelklicken bzw. ihn mit der rechten Maustaste anklicken und dann „IM“ wählen.)
+ Um eine private Unterhaltung zu beginnen, klicken Sie mit der rechten Maustaste auf den gewünschten Avatar und wählen Sie im Menü „IM“ aus.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
Land kann nicht über Servergrenzen hinweg ausgewählt werden.
@@ -2786,6 +2826,15 @@ Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein s
<button name="Deny" text="Verweigern"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ Die Runtime-Skript-Berechtigung, die von „<nolink>[OBJECTNAME]</nolink>“ (Besitzer: „[NAME]“) angefordert wurde, wird vom Viewer nicht erkannt und kann nicht gewährt werden.
+
+Um diese Berechtigung zu gewähren, laden Sie die neueste Version des Viewers von [DOWNLOADURL] herunter.
+ <form name="form">
+ <button name="Deny" text="OK"/>
+ <button name="Mute" text="Blockieren"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
„<nolink>[TITLE]</nolink>“ von [NAME]
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 8c05ca2c247..2d56d6b7d2e 100755
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -49,6 +49,9 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
</panel>
+ <text name="groupcount">
+ Sie gehören [COUNT] Gruppen an und können [REMAINING] weiteren beitreten.
+ </text>
</panel>
<panel label="AKTUELL" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 8193fd42c11..8eb815fd1bd 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Text-Chat" name="chat">
- <panel>
+ <panel name="general_chat_settings">
<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
- <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+ <check_box label="IMs per E-Mail zustellen, wenn ich offline bin" name="send_im_to_email"/>
<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
<text name="font_size">
Schriftgröße:
@@ -14,10 +14,7 @@
</combo_box>
<check_box label="Blasen-Chat" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Benachrichtigungen
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
IMs von Freunden:
</text>
@@ -25,8 +22,9 @@
<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
- <item label="None" name="None" value="none"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sound abspielen" name="play_sound_friend_im"/>
<text name="non_friend_ims">
IMs von anderen:
</text>
@@ -34,8 +32,9 @@
<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
- <item label="None" name="None" value="none"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sound abspielen" name="play_sound_non_friend_im"/>
<text name="conference_ims">
Konferenz-IMs:
</text>
@@ -43,8 +42,9 @@
<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
- <item label="None" name="None" value="none"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sound abspielen" name="play_sound_conference_im"/>
<text name="group_chat">
Gruppen-Chat:
</text>
@@ -52,8 +52,9 @@
<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
- <item label="None" name="None" value="none"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sound abspielen" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
Chat in der Nähe:
</text>
@@ -61,25 +62,36 @@
<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
- <item label="None" name="None" value="none"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Sound abspielen" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ IMs von Objekten:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+ <item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+ <item label="Keine Aktion" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sound abspielen" name="play_sound_object_im"/>
<text name="notifications_alert">
Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ > „Nicht stören“.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Sound abspielen:
</text>
<check_box label="Neue Unterhaltung" name="new_conversation"/>
- <check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
+ <check_box label="Eingehender Anruf" name="incoming_voice_call"/>
<check_box label="Teleport-Angebot" name="teleport_offer"/>
<check_box label="Inventarangebot" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="Protokoll löschen..." name="clear_log"/>
- <button label="Protokolle löschen..." name="delete_transcripts"/>
- <button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
+ <button label="Transkripte löschen..." name="delete_transcripts"/>
+ <button label="Durchsuchen..." label_selected="Durchblättern" name="log_path_button"/>
</panel>
<button label="Ãœbersetzen..." name="ok_btn"/>
<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 9175ea0bae9..f3746a7c824 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Licht und Schatten" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 8c7ea688d7f..24e5033bfc7 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
<combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
</combo_box>
+ <check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Proxy-Einstellungen:
</text>
diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml
index 7e03aeff15f..d688bedd5cc 100755
--- a/indra/newview/skins/default/xui/de/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Alle auswählen" name="Select All"/>
<menu_item_call label="Auswahl aufheben" name="Deselect"/>
<menu_item_call label="Suchen / Ersetzen..." name="Search / Replace..."/>
+ <menu_item_call label="Gehe zu Zeile..." name="Go to line..."/>
</menu>
<menu label="Hilfe" name="Help">
<menu_item_call label="Hilfe..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
new file mode 100644
index 00000000000..18517d7a7d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+ <text name="color trans">
+ Transparenz %
+ </text>
+ <text name="glow label">
+ Leuchten
+ </text>
+ <check_box label="Ganz hell" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Material" name="Materials"/>
+ <combo_box.item label="Medien" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Textur (diffus)" name="Texture (diffuse)"/>
+ <combo_box.item label="Unebenheit (normal)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Glanzlicht (Spiegel)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
+ <text name="label alphamode">
+ Alpha-Modus
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Keiner" name="None"/>
+ <combo_box.item label="Alpha-Mischung" name="Alpha blending"/>
+ <combo_box.item label="Alpha-Maske" name="Alpha masking"/>
+ <combo_box.item label="Selbststrahlende Maske" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ Maskenabgrenzung
+ </text>
+ <texture_picker label="Textur" name="bumpytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+ <text name="label bumpiness">
+ Unebenheit
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Keine" name="None"/>
+ <combo_box.item label="Helligkeit" name="Brightness"/>
+ <combo_box.item label="Dunkelheit" name="Darkness"/>
+ <combo_box.item label="Holzmaserung" name="woodgrain"/>
+ <combo_box.item label="Rinde" name="bark"/>
+ <combo_box.item label="Backsteine" name="bricks"/>
+ <combo_box.item label="Schachbrett" name="checker"/>
+ <combo_box.item label="Beton" name="concrete"/>
+ <combo_box.item label="Rostkachel" name="crustytile"/>
+ <combo_box.item label="Steinfliesen" name="cutstone"/>
+ <combo_box.item label="Scheiben" name="discs"/>
+ <combo_box.item label="Kies" name="gravel"/>
+ <combo_box.item label="Petrischale" name="petridish"/>
+ <combo_box.item label="Verkleidung" name="siding"/>
+ <combo_box.item label="Steinkachel" name="stonetile"/>
+ <combo_box.item label="Stuck" name="stucco"/>
+ <combo_box.item label="Saugkraft" name="suction"/>
+ <combo_box.item label="Gewebe" name="weave"/>
+ </combo_box>
+ <texture_picker label="Textur" name="shinytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+ <text name="label shininess">
+ Glanz
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Keiner" name="None"/>
+ <combo_box.item label="Niedrig" name="Low"/>
+ <combo_box.item label="Mittel" name="Medium"/>
+ <combo_box.item label="Hoch" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Glanz
+ </text>
+ <text name="label environment">
+ Umgebung
+ </text>
+ <text name="label shinycolor">
+ Farbe
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+ <text name="media_info">
+ URL der ausgewählten Medien ggf. hier angeben
+ </text>
+ <button label="Auswählen..." name="add_media" tool_tip="Medien hinzufügen"/>
+ <button label="Entfernen" name="delete_media" tool_tip="Diese Medientextur löschen"/>
+ <button label="Ausrichten" label_selected="Medien ausrichten" name="button align" tool_tip="Medientextur ausrichten (muss zuerst geladen werden)"/>
+ <text name="tex gen">
+ Zuordnung
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Standard" name="Default"/>
+ <combo_box.item label="Planar" name="Planar"/>
+ </combo_box>
+ <spinner label="Horizontale Skalierung" name="TexScaleU"/>
+ <spinner label="Vertikale Skalierung" name="TexScaleV"/>
+ <spinner label="Wiederholungen pro Meter" name="rptctrl"/>
+ <spinner label="Drehung (Grad)" name="TexRot"/>
+ <spinner label="Horizontaler Versatz" name="TexOffsetU"/>
+ <spinner label="Vertikaler Versatz" name="TexOffsetV"/>
+ <spinner label="Horizontale Skalierung" name="bumpyScaleU"/>
+ <spinner label="Vertikale Skalierung" name="bumpyScaleV"/>
+ <spinner label="Drehung (Grad)" name="bumpyRot"/>
+ <spinner label="Horizontaler Versatz" name="bumpyOffsetU"/>
+ <spinner label="Vertikaler Versatz" name="bumpyOffsetV"/>
+ <spinner label="Horizontale Skalierung" name="shinyScaleU"/>
+ <spinner label="Vertikale Skalierung" name="shinyScaleV"/>
+ <spinner label="Drehung (Grad)" name="shinyRot"/>
+ <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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
index 5d9dcacd51c..3e9d406e5f0 100755
--- a/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/indra/newview/skins/default/xui/de/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Diese Fähigkeiten ermöglichen es, den Parzellennamen und die Veröffentlichungseinstellungen sowie die Anzeige des Suchverzeichnisses, den Landepunkt und die TP-Routenoptionen festzulegen." name="Parcel Identity">
<action description="„Ort in Suche anzeigen" ein-/ausschalten und Kategorie festlegen." longdescription="Auf der Registerkarte „Optionen“ unter „Land-Info“ können Sie „Ort in Suche anzeigen“ ein- und ausschalten und die Parzellenkategorie festlegen." name="land find places" value="17"/>
- <action description="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen" ändern" longdescription="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen" ändern Diese Einstellungen finden Sie unter „Land-Info“ > Registerkarte „Optionen“." name="land change identity" value="18"/>
+ <action description="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern" longdescription="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern. Diese Einstellungen finden Sie unter „Land-Info“ > Registerkarte „Optionen“." name="land change identity" value="18"/>
<action description="Landepunkt und Teleport-Route festlegen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle einen Landepunkt für ankommende Teleports und Teleport-Routen festlegen. Diese Einstellungen finden Sie unter „Land-Info“ > „Optionen“." name="land set landing point" value="19"/>
</action_set>
<action_set description="Diese Fähigkeiten ermöglichen es, Parzellenoptionen wie „Objekte erstellen“, „Terrain bearbeiten“ sowie Musik- und Medieneinstellungen zu ändern." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e142cb80296..c8c20424e16 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
http://secondlife.com/download
@@ -448,6 +451,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="SLappAgentRequestFriend">
Freundschaftsangebot
</string>
+ <string name="SLappAgentRemoveFriend">
+ Entfernen von Freunden
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Schließen (⌘W)
</string>
@@ -838,6 +844,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="multiple_textures">
Mehrfach
</string>
+ <string name="use_texture">
+ Textur verwenden
+ </string>
<string name="texture_loading">
Wird geladen...
</string>
@@ -937,6 +946,21 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="TeleportYourAgent">
Sie teleportieren
</string>
+ <string name="JoinAnExperience">
+ Bei einem Erlebnis mitmachen
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
+ </string>
+ <string name="OverrideYourAnimations">
+ Ihre Standardanimationen ersetzen
+ </string>
+ <string name="ScriptReturnObjects">
+ Objekte in Ihrem Namen zurückgeben
+ </string>
+ <string name="UnknownScriptPermission">
+ (unbekannt)
+ </string>
<string name="SIM_ACCESS_PG">
Generell
</string>
@@ -1968,6 +1992,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD unten rechts
</string>
+ <string name="ATTACH_NECK">
+ Hals
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Avatar-Mitte
+ </string>
<string name="CursorPos">
Zeile [LINE], Spalte [COLUMN]
</string>
@@ -2997,6 +3027,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
<string name="Hip Width">
Breite der Hüfte
</string>
+ <string name="Hover">
+ Schweben
+ </string>
<string name="In">
In
</string>
@@ -5081,4 +5114,7 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="logging_calls_enabled_log_empty">
Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
</string>
+ <string name="loading_chat_logs">
+ Laden...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 7ca1e3721f4..e0a2375067f 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -8,7 +8,9 @@
Compilado con [COMPILER], versión [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+ Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] de [REGION], alojada en <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 f1948220b46..5cd8b3c01f7 100755
--- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR LOS PERMISOS DEL CONTENIDO">
+<floater name="floaterbulkperms" title="AJUSTAR LOS PERMISOS DEL CONTENIDO">
<floater.string name="nothing_to_modify_text">
Lo seleccionado tiene contenidos no editables.
</floater.string>
@@ -33,7 +33,7 @@
<button label="√ Todos" label_selected="Todo" name="check_all"/>
<button label="Limpiar" label_selected="Ninguno" name="check_none"/>
<text name="newperms">
- Permisos nuevos del contenido
+ Ajustar los permisos del contenido a
</text>
<text name="GroupLabel">
Grupo:
@@ -49,6 +49,7 @@
<check_box label="Modificarlo" name="next_owner_modify"/>
<check_box label="Copiarlo" name="next_owner_copy"/>
<check_box initial_value="true" label="Transferirlo" name="next_owner_transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Aplicar" name="apply"/>
<button label="Cancelar" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_goto_line.xml b/indra/newview/skins/default/xui/es/floater_goto_line.xml
new file mode 100644
index 00000000000..ef3ed80fcb9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR A LA LÃNEA">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Ir a la lÃnea
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 5f38fbd6151..e5f48e3fd5b 100755
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Traducir el chat" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index 3602270e5a5..e93ecc9e10d 100755
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Mostrar:
</text>
- <check_box label="Prueba" name="show_world"/>
+ <check_box label="Mundo virtual" name="show_world"/>
<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
<check_box label="Navmesh" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
index 00bdb748813..7698348c004 100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Congelar" name="Freeze..."/>
<menu_item_call label="Expulsar" name="Eject..."/>
<menu_item_call label="Depurar las texturas" name="Debug..."/>
+ <menu_item_call label="Volcar XML" name="Dump XML"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index 0ba39378bb9..5acd0c327a3 100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
<menu_item_call label="Depurar las texturas" name="Debug..."/>
+ <menu_item_call label="Volcar XML" name="Dump XML"/>
<menu_item_call label="Soltar" name="Drop"/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
index 7df2d7c4e08..244099214a2 100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Congelar" name="Freeze..."/>
<menu_item_call label="Expulsar" name="Eject..."/>
<menu_item_call label="Depurar las texturas" name="Debug..."/>
+ <menu_item_call label="Volcar XML" name="Dump XML"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 268d6f70ab4..717b46ac744 100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
<menu_item_call label="Depurar las texturas" name="Debug..."/>
+ <menu_item_call label="Volcar XML" name="Dump XML"/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
index e4e9a0bf63d..b63711589db 100644
--- a/indra/newview/skins/default/xui/es/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Cerrar conversación" name="close_conversation"/>
<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+ <menu_item_call label="Cerrar seleccionados" name="close_selected_conversations"/>
<menu_item_call label="Ver el perfil" name="view_profile"/>
<menu_item_call label="MI" name="im"/>
<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
index b0f15be1b63..20976283566 100755
--- a/indra/newview/skins/default/xui/es/menu_land.xml
+++ b/indra/newview/skins/default/xui/es/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Comprar un pase" name="Land Buy Pass"/>
<menu_item_call label="Construir" name="Create"/>
<menu_item_call label="Modificar el terreno" name="Edit Terrain"/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 289ac3f0757..2286d0527a5 100755
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -17,7 +17,13 @@
<menu_item_call label="Mostrar los 'TOS'" name="TOS"/>
<menu_item_call label="Mostrar mensaje crÃtico" name="Critical"/>
<menu_item_call label="Prueba de depuración de ventanas de contenido web" name="Web Content Floater Debug Test"/>
- <menu label="Configurar el nivel de registro" name="Set Logging Level"/>
+ <menu label="Configurar el nivel de registro" name="Set Logging Level">
+ <menu_item_check label="Depurar" name="Debug"/>
+ <menu_item_check label="Información" name="Info"/>
+ <menu_item_check label="¡Atención!" name="Warning"/>
+ <menu_item_check label="Error" name="Error"/>
+ <menu_item_check label="Ninguno" name="None"/>
+ </menu>
<menu_item_check label="Mostrar el selector de Grid" name="Show Grid Picker"/>
<menu_item_call label="Mostrar la consola de notificaciones" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_mute_particle.xml b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
new file mode 100644
index 00000000000..daddf982de6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 33ea8c88d8a..e75c7283af1 100755
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="Editar" name="Edit..."/>
<menu_item_call label="Construir" name="Build"/>
- <menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
- <menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Sentarme aquÃ" name="Object Sit"/>
<menu_item_call label="Levantarme" name="Object Stand Up"/>
<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
+ <menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
+ <menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
<context_menu label="Ponerme" name="Put On">
<menu_item_call label="Ponerme" name="Wear"/>
<menu_item_call label="Añadir" name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Comprar" name="Buy..."/>
<menu_item_call label="Borrar" name="Delete"/>
+ <menu_item_call label="Ignorar al propietario de la partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index 69a03671aba..610d65465d9 100755
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Ver el perfil" name="show_agent"/>
<menu_item_call label="Enviar un MI..." name="send_im"/>
<menu_item_call label="Añadir como amigo..." name="add_friend"/>
+ <menu_item_call label="Quitar de los amigos..." name="remove_friend"/>
<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index e78fdec5580..c3c8439ea2a 100755
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Perfil del objeto..." name="show_object"/>
+ <menu_item_call label="Ignorar..." name="block_object"/>
<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 1e0ceb22205..e4fe871683b 100755
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
</menu>
- <menu label="Estado" name="Status"/>
+ <menu label="Estado" name="Status">
+ <menu_item_check label="Ausente" name="Away"/>
+ <menu_item_check label="No molestar" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -31,6 +34,7 @@
<menu_item_check label="Conversaciones..." name="Conversations"/>
<menu_item_check label="Chat..." name="Nearby Chat"/>
<menu_item_check label="Hablar" name="Speak"/>
+ <menu_item_check label="Registro de conversación..." name="Conversation Log..."/>
<menu label="Transformación de voz" name="VoiceMorphing">
<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
<menu_item_check label="Probar..." name="Preview"/>
@@ -41,6 +45,7 @@
<menu_item_check label="Grupos" name="My Groups"/>
<menu_item_check label="Gente cerca" name="Active Speakers"/>
<menu_item_call label="Lista de ignorados" name="Block List"/>
+ <menu_item_check label="No molestar" name="Do Not Disturb"/>
</menu>
<menu label="Mundo" name="World">
<menu_item_call label="Crear un hito de este sitio" name="Create Landmark Here"/>
@@ -109,6 +114,7 @@
<menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/>
<menu_item_call label="Incluir la parte previa" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
<menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
<menu label="Objeto" name="Object">
@@ -272,6 +278,7 @@
<menu_item_check label="Camera Offset" name="Camera Offset"/>
<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
<menu_item_check label="Frame Test" name="Frame Test"/>
+ <menu_item_call label="Perfil del fotograma" name="Frame Profile"/>
</menu>
<menu label="Render Metadata" name="Render Metadata">
<menu_item_check label="Normales" name="Normals"/>
@@ -292,15 +299,15 @@
</menu>
<menu label="Rendering" name="Rendering">
<menu_item_check label="Axes" name="Axes"/>
+ <menu_item_call label="Información sobre el material seleccionado" name="Selected Material Info"/>
<menu_item_check label="Wireframe" name="Wireframe"/>
- <menu_item_check label="Luces y sombras" name="Advanced Lighting Model"/>
+ <menu_item_check label="Modelo de iluminación avanzado" name="Advanced Lighting Model"/>
<menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/>
<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="Atlas de texturas (experimental)" name="Texture Atlas"/>
<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"/>
@@ -319,7 +326,6 @@
<menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/>
<menu_item_call label="Navegador de contenido web" name="Web Content Browser"/>
<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
- <menu_item_call label="Memory Stats" name="Memory Stats"/>
<menu_item_check label="Consola de depuración de región" name="Region Debug Console"/>
<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 05455f54c39..d4451ad2510 100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -206,6 +206,14 @@ No podrás removérseles de ese rol, sino que deberán renunciar a él por sà m
¿Añadir esta capacidad a '[ROLE_NAME]'?
<usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Estás a punto de expulsar a [AVATAR_NAME] del grupo.
+ <usetemplate ignoretext="Confirmar la expulsión de un miembro del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Estás a punto de expulsar a [COUNT] miembros del grupo.
+ <usetemplate ignoretext="Confirmar la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+ </notification>
<notification name="AttachmentDrop">
Vas a soltar tu anexado.
¿Estás seguro de que quieres continuar?
@@ -1113,7 +1121,7 @@ en TODO EL TERRENO de este sim?
Por favor, elige un pago mayor.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Por lo menos uno de los elementos seleccionados contiene vÃnculos que le señalan. Si eliminas este elemento, los vÃnculos dejarán de funcionar permanentemente. Lo más recomendable es eliminar primero los vÃnculos.
+ Por lo menos uno de los elementos contiene vÃnculos que lo señalan. Si eliminas este elemento, los vÃnculos dejarán de funcionar permanentemente. Lo más recomendable es eliminar primero los vÃnculos.
¿Estás seguro de que quieres eliminar los elementos?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -1131,9 +1139,9 @@ Por favor, elige un pago mayor.
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
- No eres el propietario de, al menos, uno de los Ãtems que has seleccionado.
+ Uno o más de los elementos seleccionados no son tuyos.
-¿Estás seguro de que quieres borrar estos Ãtems?
+¿Estás seguro de que quieres eliminar los elementos?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1144,25 +1152,25 @@ Al menos un objeto no es copiable.
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoOwn">
- Al menos un objeto está bloqueado.
-No eres propietario de, al menos, un objeto.
+ Hay un objeto bloqueado como mÃnimo.
+No eres propietario de al menos un objeto.
-¿Estás seguro de que quieres borrar estos Ãtems?
+¿Estás seguro de que quieres eliminar los elementos?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
- Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+ No se puede copiar un objeto como mÃnimo.
+No eres propietario de al menos un objeto.
-¿Estás seguro de que quieres borrar estos Ãtems?
+¿Estás seguro de que quieres eliminar los elementos?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
- Al menos un objeto está bloqueado.
-Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+ Hay un objeto bloqueado como mÃnimo.
+No se puede copiar un objeto como mÃnimo.
+No eres propietario de al menos un objeto.
-¿Estás seguro de que quieres borrar estos Ãtems?
+¿Estás seguro de que quieres eliminar los elementos?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
@@ -1486,13 +1494,43 @@ Versión [VERSION] [[RELEASE_NOTES_FULL_URL]; información acerca de esta actual
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
Hemos descargado una actualización de software necesaria.
-Versión [VERSION]
+Versión [VERSION] [[INFO_URL] Información sobre esta actualización]
-Debemos reiniciar [APP_NAME] para instalar la actualización.
+Para instalar la actualización, hay que reiniciar [APP_NAME].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
- Debemos reiniciar [APP_NAME] para instalar la actualización.
+ Para instalar la actualización, hay que reiniciar [APP_NAME].
+[[INFO_URL] Información sobre esta actualización]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] para informarte sobre esta actualización.]
+ <usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+ <usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Hemos descargado una actualización de software necesaria.
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+
+Para instalar la actualización, hay que reiniciar [APP_NAME].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Para instalar la actualización, hay que reiniciar [APP_NAME].
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1543,6 +1581,10 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
¿Deseas abandonar el grupo?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ No es posible abandonar el grupo. No puedes abandonarlo porque eres su último propietario. Antes tienes que asignar el papel de propietario a otro miembro.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
¿Quieres realmente expulsar a todos los residentes de la cuadrÃcula?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/>
@@ -2404,9 +2446,7 @@ Por favor, selecciona un sólo objeto.
elegir 'Teleportar'.)
</notification>
<notification name="TeleportToPerson">
- Para ponerte en contacto con Residentes como '[NAME]', pulsa el botón "Gente", selecciona un Residente en la ventana que se abre y después pulsa en 'MI' en
- la parte inferior de la ventana.
- (También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir 'MI').
+ Para abrir una conversación privada con alguien, pulsa con el botón derecho en su avatar y selecciona 'MI' en el menú.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
No puedes seleccionar un terreno que cruce las fronteras entre servidores.
@@ -2780,6 +2820,15 @@ No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
<button name="Deny" text="Denegar"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ '<nolink>[OBJECTNAME]</nolink>', un objeto propiedad de '[NAME]', ha solicitado un permiso de script en tiempo de ejecución que el visor no reconoce ni puede conceder.
+
+Para obtener el permiso, descárgate aquà la última versión: [DOWNLOADURL].
+ <form name="form">
+ <button name="Deny" text="Aceptar"/>
+ <button name="Mute" text="Ignorar"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
'<nolink>[TITLE]</nolink>' de [NAME]
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 7a7dfca0b8e..06150f7619d 100755
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -49,6 +49,9 @@
<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
</panel>
+ <text name="groupcount">
+ Formas parte de [COUNT] grupos y puedes unirte a [REMAINING] más.
+ </text>
</panel>
<panel label="RECIENTE" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 28bc98f9885..7feff9005ca 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat de texto" name="chat">
- <panel>
+ <panel name="general_chat_settings">
<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
@@ -8,66 +8,78 @@
Tamaño de la fuente:
</text>
<combo_box name="chat_font_size">
- <item label="Pequeña" name="Small" value="0"/>
- <item label="Mediana" name="Medium" value="1"/>
+ <item label="Pequeño" name="Small" value="0"/>
+ <item label="Medio" name="Medium" value="1"/>
<item label="Grande" name="Large" value="2"/>
</combo_box>
<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Notificaciones
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
MI de amigos:
</text>
<combo_box name="FriendIMOptions">
- <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Ninguno" name="None" value="ninguno"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_friend_im"/>
<text name="non_friend_ims">
MI de no amigos:
</text>
<combo_box name="NonFriendIMOptions">
- <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Ninguno" name="None" value="ninguno"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_non_friend_im"/>
<text name="conference_ims">
- MI de conferencia:
+ MI de conferencias:
</text>
<combo_box name="ConferenceIMOptions">
- <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Ninguno" name="None" value="ninguno"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_conference_im"/>
<text name="group_chat">
Chat de grupo:
</text>
<combo_box name="GroupChatOptions">
- <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Ninguno" name="None" value="ninguno"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
- Chat:
+ Chat con gente cercana:
</text>
<combo_box name="NearbyChatOptions">
- <item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+ <item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ MI de objetos:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
- <item label="Ninguno" name="None" value="ninguno"/>
+ <item label="Ninguna acción" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Reproducir sonido" name="play_sound_object_im"/>
<text name="notifications_alert">
- Para suspender provisionalmente todas las notificaciones, usa Comunicarme > No molestar.
+ Para dejar de recibir avisos durante un tiempo, usa Comunicarme > No molestar.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Reproducir sonido:
</text>
@@ -76,9 +88,9 @@
<check_box label="Oferta de teleporte" name="teleport_offer"/>
<check_box label="Oferta de inventario" name="inventory_offer"/>
</panel>
- <panel>
- <button label="Limpiar el registro..." name="clear_log"/>
- <button label="Eliminar transcripciones..." name="delete_transcripts"/>
+ <panel name="log_settings">
+ <button label="Borrar registro..." name="clear_log"/>
+ <button label="Borrar grabaciones..." name="delete_transcripts"/>
<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
</panel>
<button label="Traducción…" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 281b871fed1..9362f767086 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="verdadero" label="Luces locales" name="LocalLights"/>
<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="verdadero" label="Luces y sombras" name="UseLightShaders"/>
+ <check_box initial_value="verdadero" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
<check_box initial_value="verdadero" label="Oclusión del ambiente" name="UseSSAO"/>
<check_box initial_value="verdadero" label="Profundidad del campo" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 81a29dae5ad..f7eaa03d632 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
<combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
</combo_box>
+ <check_box label="Admitir candidatos a la versión comercial a la hora de realizar actualizaciones" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Configuración de proxy:
</text>
diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml
index 4c4077b96f0..87314820a61 100755
--- a/indra/newview/skins/default/xui/es/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Seleccionar todo" name="Select All"/>
<menu_item_call label="Deseleccionar" name="Deselect"/>
<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
+ <menu_item_call label="Ir a la lÃnea..." name="Go to line..."/>
</menu>
<menu label="Ayuda" name="Help">
<menu_item_call label="Ayuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
new file mode 100644
index 00000000000..7199905a1c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+ <text name="color trans">
+ Porcentaje de transparencia
+ </text>
+ <text name="glow label">
+ Resplandor
+ </text>
+ <check_box label="Brillo total" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Materiales" name="Materials"/>
+ <combo_box.item label="Media" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Textura (difuminar)" name="Texture (diffuse)"/>
+ <combo_box.item label="Rugosidad (normal)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Brillo (efecto espejo)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
+ <text name="label alphamode">
+ Modo alfa
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Ninguno" name="None"/>
+ <combo_box.item label="Mezclado alfa" name="Alpha blending"/>
+ <combo_box.item label="Máscara alfa" name="Alpha masking"/>
+ <combo_box.item label="Máscara de emisión lumÃnica" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ LÃmite de máscara
+ </text>
+ <texture_picker label="Textura" name="bumpytexture control" tool_tip="Pulsa para elegir una imagen"/>
+ <text name="label bumpiness">
+ Rugosidad
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Ninguna" name="None"/>
+ <combo_box.item label="Claridad" name="Brightness"/>
+ <combo_box.item label="Oscuridad" name="Darkness"/>
+ <combo_box.item label="madera" name="woodgrain"/>
+ <combo_box.item label="corteza" name="bark"/>
+ <combo_box.item label="ladrillos" name="bricks"/>
+ <combo_box.item label="cuadrÃcula" name="checker"/>
+ <combo_box.item label="hormigón" name="concrete"/>
+ <combo_box.item label="azulejo" name="crustytile"/>
+ <combo_box.item label="piedralabrada" name="cutstone"/>
+ <combo_box.item label="discos" name="discs"/>
+ <combo_box.item label="gravilla" name="gravel"/>
+ <combo_box.item label="placadepetri" name="petridish"/>
+ <combo_box.item label="revestimiento" name="siding"/>
+ <combo_box.item label="baldosa" name="stonetile"/>
+ <combo_box.item label="estuco" name="stucco"/>
+ <combo_box.item label="succión" name="suction"/>
+ <combo_box.item label="tejido" name="weave"/>
+ </combo_box>
+ <texture_picker label="Textura" name="shinytexture control" tool_tip="Pulsa para elegir una imagen"/>
+ <text name="label shininess">
+ Brillo
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Ninguno" name="None"/>
+ <combo_box.item label="Bajo" name="Low"/>
+ <combo_box.item label="Medio" name="Medium"/>
+ <combo_box.item label="Alto" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Efecto pulido
+ </text>
+ <text name="label environment">
+ Entorno
+ </text>
+ <text name="label shinycolor">
+ Color
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+ <text name="media_info">
+ Espacio para la URL del media elegido, si procede
+ </text>
+ <button label="Elegir..." name="add_media" tool_tip="Añadir un media"/>
+ <button label="Eliminar" name="delete_media" tool_tip="Borrar esta textura para media"/>
+ <button label="Centrar" label_selected="Centrar los media" name="button align" tool_tip="Centrar esta textura para media (primero debe cargarse)"/>
+ <text name="tex gen">
+ Representación
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Por defecto" name="Default"/>
+ <combo_box.item label="En el plano" name="Planar"/>
+ </combo_box>
+ <spinner label="Escala horizontal" name="TexScaleU"/>
+ <spinner label="Escala vertical" name="TexScaleV"/>
+ <spinner label="Repeticiones por metro" name="rptctrl"/>
+ <spinner label="Grados de rotación" name="TexRot"/>
+ <spinner label="Desplazamiento horizontal" name="TexOffsetU"/>
+ <spinner label="Desplazamiento vertical" name="TexOffsetV"/>
+ <spinner label="Escala horizontal" name="bumpyScaleU"/>
+ <spinner label="Escala vertical" name="bumpyScaleV"/>
+ <spinner label="Grados de rotación" name="bumpyRot"/>
+ <spinner label="Desplazamiento horizontal" name="bumpyOffsetU"/>
+ <spinner label="Desplazamiento vertical" name="bumpyOffsetV"/>
+ <spinner label="Escala horizontal" name="shinyScaleU"/>
+ <spinner label="Escala vertical" name="shinyScaleV"/>
+ <spinner label="Grados de rotación" name="shinyRot"/>
+ <spinner label="Desplazamiento horizontal" name="shinyOffsetU"/>
+ <spinner label="Desplazamiento vertical" name="shinyOffsetV"/>
+ <check_box initial_value="falso" 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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 660293b02c5..902ed4df520 100755
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, asà como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte." name="Parcel Identity">
<action description="Cambiar 'Mostrar el sitio en Buscar' y configurar la categorÃa" longdescription="Cambia 'Mostrar el sitio en Buscar' y el configurar la categorÃa de una parcela en Acerca del terreno > pestaña Opciones." name="land find places" value="17"/>
- <action description="Cambiar el nombre de la parcela, su descripción, y la configuración de 'Mostrar el sitio en Buscar'" longdescription="Cambia el nombre de la parcela, su descripción, y la configuración de 'Mostrar el sitio en Buscar'. Se hace en Acerca del terreno > pestaña Opciones." name="land change identity" value="18"/>
+ <action description="Cambia el nombre de la parcela, su descripción y la configuración de 'Contenido moderado'." longdescription="Cambia el nombre de la parcela, su descripción y la configuración de 'Contenido moderado'. Se hace en Acerca del terreno > pestaña Opciones." name="land change identity" value="18"/>
<action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno > pestaña Opciones." name="land set landing point" value="19"/>
</action_set>
<action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como 'Crear objetos', 'Editar el terreno' y las configuraciones de la música y los media." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 937433e210f..4686d1ed3a5 100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -130,6 +130,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download.
+ </string>
<string name="LoginFailedViewerNotPermitted">
Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
http://secondlife.com/download.
@@ -439,6 +442,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="SLappAgentRequestFriend">
Petición de amistad
</string>
+ <string name="SLappAgentRemoveFriend">
+ Eliminación de amigos
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Cerrar (⌘W)
</string>
@@ -823,6 +829,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="anim_yes_head">
SÃ
</string>
+ <string name="use_texture">
+ Usar textura
+ </string>
<string name="texture_loading">
Cargando...
</string>
@@ -919,6 +928,21 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="TeleportYourAgent">
Teleportarte
</string>
+ <string name="JoinAnExperience">
+ Únete a una experiencia
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Suprimir alertas al gestionar las listas de acceso a un estado
+ </string>
+ <string name="OverrideYourAnimations">
+ Reemplazar tus animaciones predeterminadas
+ </string>
+ <string name="ScriptReturnObjects">
+ Devolver objetos en tu nombre
+ </string>
+ <string name="UnknownScriptPermission">
+ (desconocido)
+ </string>
<string name="SIM_ACCESS_PG">
General
</string>
@@ -1944,6 +1968,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD: abajo der.
</string>
+ <string name="ATTACH_NECK">
+ Cuello
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Centro del avatar
+ </string>
<string name="CursorPos">
LÃnea [LINE], Columna [COLUMN]
</string>
@@ -2931,6 +2961,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
<string name="Hip Width">
Cadera: ancho
</string>
+ <string name="Hover">
+ Pasa el cursor
+ </string>
<string name="In">
Pegadas
</string>
@@ -4991,4 +5024,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="logging_calls_enabled_log_empty">
No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquà se mostrará una entrada de registro.
</string>
+ <string name="loading_chat_logs">
+ Cargando...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index d45bdccf3e8..384966354e5 100755
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -9,6 +9,8 @@
</floater.string>
<floater.string name="AboutPosition">
Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURLÂ : <nolink>[SLURL]</nolink>
+(coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 ab68ce166b0..7ee44417586 100755
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFIER LES DROITS">
+<floater name="floaterbulkperms" title="MODIFIER LES DROITS RELATIFS AU CONTENU">
<floater.string name="nothing_to_modify_text">
Certains contenus sont non modifiables.
</floater.string>
@@ -33,7 +33,7 @@
<button label="√ Tout" label_selected="Tout" name="check_all"/>
<button label="Effacer" label_selected="Aucun" name="check_none"/>
<text name="newperms">
- Nouveaux droits
+ Modifier les droits relatifs au contenu et remplacer par
</text>
<text name="GroupLabel">
Groupe :
@@ -49,6 +49,7 @@
<check_box label="Modifier" name="next_owner_modify"/>
<check_box label="Copier" name="next_owner_copy"/>
<check_box initial_value="true" label="Transférer" name="next_owner_transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Appliquer" name="apply"/>
<button label="Annuler" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_goto_line.xml b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
new file mode 100644
index 00000000000..fdc800b40be
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ALLER À LA LIGNE">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Aller à la ligne
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 8ab98b8e4ea..6d98f0a846e 100755
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Traduire le chat" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 0bcf55aba59..02d969dc089 100755
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Afficher :
</text>
- <check_box label="Test" name="show_world"/>
+ <check_box label="Monde" name="show_world"/>
<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
<check_box label="Maillage de navigation" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
index f48513eb2b4..0450be28e08 100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Figer" name="Freeze..."/>
<menu_item_call label="Expulser" name="Eject..."/>
<menu_item_call label="Déboguer les textures" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<menu_item_call label="Payer" name="Pay..."/>
<menu_item_call label="Profil de l'objet" name="Object Inspect"/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index 6af2064e440..f2e7928c24c 100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
<menu_item_call label="Déboguer les textures" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Lâcher" name="Drop"/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
index 08d1a203615..1f5c1724f80 100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Figer" name="Freeze..."/>
<menu_item_call label="Expulser" name="Eject..."/>
<menu_item_call label="Déboguer les textures" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<menu_item_call label="Payer" name="Pay..."/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index 6310a2177a8..4815ad06763 100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
<menu_item_call label="Déboguer les textures" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
index 857ead603b5..09109f45558 100644
--- a/indra/newview/skins/default/xui/fr/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Fermer la conversation" name="close_conversation"/>
<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+ <menu_item_call label="Fermer la sélection" name="close_selected_conversations"/>
<menu_item_call label="Voir le profil" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml
index b84daee3ae9..7beaf00c58a 100755
--- a/indra/newview/skins/default/xui/fr/menu_land.xml
+++ b/indra/newview/skins/default/xui/fr/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Acheter un pass" name="Land Buy Pass"/>
<menu_item_call label="Construire" name="Create"/>
<menu_item_call label="Modifier le terrain" name="Edit Terrain"/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index dc6b2793cae..7b1e106474f 100755
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="Afficher les conditions d'utilisation" name="TOS"/>
<menu_item_call label="Afficher le message critique" name="Critical"/>
<menu_item_call label="Test de débogage de la fenêtre flottante du contenu Web" name="Web Content Floater Debug Test"/>
- <menu label="Définir le niveau de connexion" name="Set Logging Level"/>
+ <menu label="Définir le niveau de connexion" name="Set Logging Level">
+ <menu_item_check label="Débogage" name="Debug"/>
+ <menu_item_check label="Infos" name="Info"/>
+ <menu_item_check label="Avertissement" name="Warning"/>
+ <menu_item_check label="Erreur" name="Error"/>
+ <menu_item_check label="Aucun" name="None"/>
+ </menu>
<menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/>
<menu_item_call label="Afficher la console des notifications" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_mute_particle.xml b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
new file mode 100644
index 00000000000..5f5e4c8b084
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 573b6da5827..d7b69e495a2 100755
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="Modifier" name="Edit..."/>
<menu_item_call label="Construire" name="Build"/>
- <menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
- <menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
<menu_item_call label="Ouvrir" name="Open"/>
<menu_item_call label="M'asseoir ici" name="Object Sit"/>
<menu_item_call label="Me lever" name="Object Stand Up"/>
<menu_item_call label="Profil de l'objet" name="Object Inspect"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
+ <menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
+ <menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
<context_menu label="Porter" name="Put On">
<menu_item_call label="Porter" name="Wear"/>
<menu_item_call label="Ajouter" name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="Payer" name="Pay..."/>
<menu_item_call label="Acheter" name="Buy..."/>
<menu_item_call label="Supprimer" name="Delete"/>
+ <menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index d701b3a4143..2c7443c6ca1 100755
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Voir le profil" name="show_agent"/>
<menu_item_call label="Envoyer IM..." name="send_im"/>
<menu_item_call label="Devenir amis..." name="add_friend"/>
+ <menu_item_call label="Supprimer cet ami..." name="remove_friend"/>
<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index 0a934d3e69c..5d745ef5f89 100755
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Profil de l'objet…" name="show_object"/>
+ <menu_item_call label="Ignorer…" name="block_object"/>
<menu_item_call label="Voir sur la carte" name="show_on_map"/>
<menu_item_call label="Me téléporter à l'emplacement de l'objet" name="teleport_to_object"/>
<menu_item_call label="Copier le nom de l'objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 548f144742e..5d0026ace00 100755
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
</menu>
- <menu label="Statut" name="Status"/>
+ <menu label="Statut" name="Status">
+ <menu_item_check label="Absent" name="Away"/>
+ <menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
<menu_item_call label="Boîte d'envoi vendeur..." name="MerchantOutbox"/>
<menu_item_call label="Page d'accueil du compte..." name="Manage My Account">
@@ -32,6 +35,7 @@
<menu_item_check label="Conversations..." name="Conversations"/>
<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
<menu_item_check label="Parler" name="Speak"/>
+ <menu_item_check label="Journal des conversations..." name="Conversation Log..."/>
<menu label="Effet de voix" name="VoiceMorphing">
<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
<menu_item_check label="Aperçu..." name="Preview"/>
@@ -42,6 +46,7 @@
<menu_item_check label="Groupes" name="My Groups"/>
<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
<menu_item_call label="Liste des ignorés" name="Block List"/>
+ <menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
</menu>
<menu label="Monde" name="World">
<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
<menu_item_call label="Inclure la partie suivante" name="Include Next Part"/>
<menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Groupes de liens..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
<menu label="Objet" name="Object">
@@ -279,6 +285,7 @@
<menu_item_check label="Taux de défilement aléatoire" name="Randomize Framerate"/>
<menu_item_check label="Cadre lent périodique" name="Periodic Slow Frame"/>
<menu_item_check label="Test cadre" name="Frame Test"/>
+ <menu_item_call label="Profil du cadre" name="Frame Profile"/>
</menu>
<menu label="Métadonnées de rendu" name="Render Metadata">
<menu_item_check label="Cadres" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
<menu_item_check label="Axes" name="Axes"/>
<menu_item_check label="Tangente" name="Tangent Basis"/>
<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
+ <menu_item_call label="Infos sur les matériaux sélectionnés" name="Selected Material Info"/>
<menu_item_check label="Filaire" name="Wireframe"/>
<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
- <menu_item_check label="Éclairage et ombres" name="Advanced Lighting Model"/>
+ <menu_item_check label="Modèle d'éclairage avancé" name="Advanced Lighting Model"/>
<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Débogage GL" name="Debug GL"/>
@@ -325,7 +333,6 @@
<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="Textures pleine résolution" name="Rull Res Textures"/>
- <menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/>
<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"/>
<menu_item_check label="Objets en surbrillance avec le pointeur" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
<menu_item_call label="Imprimer les infos sur l'objet sélectionné" name="Print Selected Object Info"/>
<menu_item_call label="Imprimer les infos sur l'avatar" name="Print Agent Info"/>
- <menu_item_call label="Statistiques de mémoire" name="Memory Stats"/>
<menu_item_check label="Console de débogage de région" name="Region Debug Console"/>
<menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/>
<menu_item_check label="Débogage clics" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index e73cc6e6e04..c295a6f5a7e 100755
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -209,6 +209,14 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ?
Ajouter ce pouvoir à « [ROLE_NAME] » ?
<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Vous allez expulser [AVATAR_NAME] du groupe.
+ <usetemplate ignoretext="Confirmer l'expulsion d'un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Vous allez expulser [COUNT] membres du groupe.
+ <usetemplate ignoretext="Confirmer l'expulsion de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+ </notification>
<notification name="AttachmentDrop">
Vous êtes sur le point d'abandonner l'élément joint.
Voulez-vous vraiment continuer ?
@@ -1106,7 +1114,7 @@ Voir https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
Veuillez saisir un montant plus élevé.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Des articles liés pointent vers au moins un article sélectionné. Les liens arrêteront définitivement de fonctionner si vous supprimez cet article. Il est vivement conseillé de supprimer d'abord ces liens.
+ Des liens pointent vers au moins un article sélectionné. Les liens arrêteront définitivement de fonctionner si vous supprimez cet article. Il est vivement conseillé de supprimer d'abord ces liens.
Voulez-vous vraiment supprimer ces articles ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -1126,7 +1134,7 @@ Voulez-vous vraiment supprimer ces articles ?
<notification name="ConfirmObjectDeleteNoOwn">
Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1140,23 +1148,23 @@ Au moins un des objets n'est pas copiable.
Au moins un des objets est verrouillé.
Au moins un des objets ne vous appartient pas.
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
- Au moins un des objets n'est pas copiable.
+ Au moins un des objets n'est pas reproductible.
Au moins un des objets ne vous appartient pas.
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
Au moins un des objets est verrouillé.
-Au moins un des objets n'est pas copiable.
+Au moins un des objets n'est pas reproductible.
Au moins un des objets ne vous appartient pas.
-Êtes-vous certain de vouloir supprimer ces objets ?
- <usetemplate name="okcancelbuttons" notext="annuler" yestext="OK"/>
+Voulez-vous vraiment supprimer ces articles ?
+ <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
Au moins un des objets est verrouillé.
@@ -1477,13 +1485,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informations relatives à cette mise
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
Nous avons téléchargé une mise à jour logicielle requise.
-Version [VERSION]
+Version [VERSION] [Informations au sujet de cette mise à jour [INFO_URL]]
[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+[Informations au sujet de cette mise à jour [INFO_URL]]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [[INFO_URL] pour en savoir plus sur cette mise à jour]
+ <usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+ <usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Nous avons téléchargé une mise à jour logicielle requise.
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+
+[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ [APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1534,6 +1572,10 @@ Version [VERSION]
Quitter le groupe ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Impossible de quitter le groupe. Vous ne pouvez pas quitter le groupe car vous en êtes le dernier propriétaire. Vous devez d'abord affecter le rôle de propriétaire à un autre membre.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Souhaitez-vous vraiment éjecter tous les résidents de la grille ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/>
@@ -2396,9 +2438,7 @@ Veuillez sélectionner un seul objet.
choisir Téléportation).
</notification>
<notification name="TeleportToPerson">
- Pour contacter un résident tel que [NAME], cliquez sur le bouton Personnes, sélectionnez le résident dans la fenêtre qui s'ouvre, puis cliquez sur IM en
- bas de la fenêtre.
- (Vous pouvez aussi double-cliquer sur le nom du résident dans la liste ou cliquer-droit dessus et choisir IM.)
+ Pour ouvrir une conversation privée avec une autre personne, cliquez-droit sur son avatar et choisissez IM dans le menu.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
@@ -2772,6 +2812,15 @@ N'autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l
<button name="Deny" text="Refuser"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ Le client ne reconnaît pas le droit de script à l'exécution demandé par <nolink>[OBJECTNAME]</nolink>, objet appartenant à [NAME], et ne peut donc pas l'accorder.
+
+Pour accorder ce droit, mettez votre client à jour pour passer à la version la plus récente, à partir de [DOWNLOADURL].
+ <form name="form">
+ <button name="Deny" text="OK"/>
+ <button name="Mute" text="Ignorer"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
<nolink>[TITLE]</nolink> de [NAME]
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 227ce26df72..e306a001836 100755
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -49,6 +49,9 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
</panel>
+ <text name="groupcount">
+ Vous appartenez à [COUNT] groupes, et pouvez en rejoindre [REMAINING] autres.
+ </text>
</panel>
<panel label="RÉCENT" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 972190dc159..52c6ed24b9d 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat écrit" name="chat">
- <panel>
+ <panel name="general_chat_settings">
<check_box initial_value="true" label="Exécuter l'animation clavier quand vous écrivez" name="play_typing_animation"/>
<check_box label="M'envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
<check_box label="Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM" name="voice_call_friends_only_check"/>
@@ -14,60 +14,72 @@
</combo_box>
<check_box label="Bulles de chat" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Notifications
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
IM amis :
</text>
<combo_box name="FriendIMOptions">
<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
- <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/>
- <item label="Aucun(e)" name="None" value="aucun(e)"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Écouter le son" name="play_sound_friend_im"/>
<text name="non_friend_ims">
IM non amis :
</text>
<combo_box name="NonFriendIMOptions">
<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
- <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/>
- <item label="Aucun(e)" name="None" value="aucun(e)"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Écouter le son" name="play_sound_non_friend_im"/>
<text name="conference_ims">
IM conférence :
</text>
<combo_box name="ConferenceIMOptions">
<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
- <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/>
- <item label="Aucun(e)" name="None" value="aucun(e)"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Écouter le son" name="play_sound_conference_im"/>
<text name="group_chat">
Chat de groupe :
</text>
<combo_box name="GroupChatOptions">
<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
- <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="clignote"/>
- <item label="Aucun(e)" name="None" value="aucun(e)"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolbarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Écouter le son" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
Chat près de moi :
</text>
<combo_box name="NearbyChatOptions">
<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
- <item label="Bouton de la barre d'outils Flash" name="FlashToolBarButton" value="clignote"/>
- <item label="Aucun(e)" name="None" value="aucun(e)"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolBarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Écouter le son" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ IM objet :
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+ <item label="Bouton de la barre d'outils Flash" name="FlashToolBarButton" value="flash"/>
+ <item label="Aucune action" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Écouter le son" name="play_sound_object_im"/>
<text name="notifications_alert">
Pour suspendre temporairement toutes les notifications, utilisez Communication > Ne pas déranger.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Écouter le son :
</text>
@@ -76,7 +88,7 @@
<check_box label="Offre de téléportation" name="teleport_offer"/>
<check_box label="Offre d'inventaire" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="Effacer le journal..." name="clear_log"/>
<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index a738b2d43fd..4946b098142 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Éclairage et ombres" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Modèle d'éclairage avancé" name="UseLightShaders"/>
<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 83303950dcd..50f4a49bd03 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Installation automatique" name="Install_automatically"/>
<combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
</combo_box>
+ <check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Paramètres de proxy :
</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
index 29fbe3c7e7d..38e5cbe1f15 100755
--- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Tout sélectionner" name="Select All"/>
<menu_item_call label="Désélectionner" name="Deselect"/>
<menu_item_call label="Rechercher / Remplacer..." name="Search / Replace..."/>
+ <menu_item_call label="Aller à la ligne..." name="Go to line..."/>
</menu>
<menu label="Aide" name="Help">
<menu_item_call label="Aide..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
new file mode 100644
index 00000000000..c69cb61a926
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+ <text name="color trans">
+ % de transparence
+ </text>
+ <text name="glow label">
+ Rayonnement
+ </text>
+ <check_box label="Lumineux" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Matériaux" name="Materials"/>
+ <combo_box.item label="Médias" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
+ <combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
+ <text name="label alphamode">
+ Mode alpha
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Aucun" name="None"/>
+ <combo_box.item label="Fusion alpha" name="Alpha blending"/>
+ <combo_box.item label="Masquage alpha" name="Alpha masking"/>
+ <combo_box.item label="Masque émissif" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ Coupe du masque
+ </text>
+ <texture_picker label="Texture" name="bumpytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+ <text name="label bumpiness">
+ Relief
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Aucun" name="None"/>
+ <combo_box.item label="Luminosité" name="Brightness"/>
+ <combo_box.item label="Obscurité" name="Darkness"/>
+ <combo_box.item label="aggloméré" name="woodgrain"/>
+ <combo_box.item label="écorce" name="bark"/>
+ <combo_box.item label="briques" name="bricks"/>
+ <combo_box.item label="damier" name="checker"/>
+ <combo_box.item label="béton" name="concrete"/>
+ <combo_box.item label="carrelage" name="crustytile"/>
+ <combo_box.item label="pierre de taille" name="cutstone"/>
+ <combo_box.item label="disques" name="discs"/>
+ <combo_box.item label="gravier" name="gravel"/>
+ <combo_box.item label="boîte de Petri" name="petridish"/>
+ <combo_box.item label="lattes" name="siding"/>
+ <combo_box.item label="carreaux" name="stonetile"/>
+ <combo_box.item label="stuc" name="stucco"/>
+ <combo_box.item label="ventouses" name="suction"/>
+ <combo_box.item label="tissage" name="weave"/>
+ </combo_box>
+ <texture_picker label="Texture" name="shinytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+ <text name="label shininess">
+ Brillance
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Aucune" name="None"/>
+ <combo_box.item label="Faible" name="Low"/>
+ <combo_box.item label="Moyenne" name="Medium"/>
+ <combo_box.item label="Élevée" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Lustrage
+ </text>
+ <text name="label environment">
+ Environnement
+ </text>
+ <text name="label shinycolor">
+ Couleur
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+ <text name="media_info">
+ L'URL du média choisi, le cas échéant, se place ici.
+ </text>
+ <button label="Choisir..." name="add_media" tool_tip="Ajouter un média"/>
+ <button label="Supprimer" name="delete_media" tool_tip="Supprimer cette texture de média"/>
+ <button label="Aligner" label_selected="Aligner le média" name="button align" tool_tip="Ajuster la texture du média (le chargement doit d’abord se terminer)"/>
+ <text name="tex gen">
+ Application
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Valeur par défaut" name="Default"/>
+ <combo_box.item label="Plan" name="Planar"/>
+ </combo_box>
+ <spinner label="Échelle horizontale" name="TexScaleU"/>
+ <spinner label="Échelle verticale" name="TexScaleV"/>
+ <spinner label="Répétitions au mètre" name="rptctrl"/>
+ <spinner label="Degrés de rotation" name="TexRot"/>
+ <spinner label="Décalage horizontal" name="TexOffsetU"/>
+ <spinner label="Décalage vertical" name="TexOffsetV"/>
+ <spinner label="Échelle horizontale" name="bumpyScaleU"/>
+ <spinner label="Échelle verticale" name="bumpyScaleV"/>
+ <spinner label="Degrés de rotation" name="bumpyRot"/>
+ <spinner label="Décalage horizontal" name="bumpyOffsetU"/>
+ <spinner label="Décalage vertical" name="bumpyOffsetV"/>
+ <spinner label="Échelle horizontale" name="shinyScaleU"/>
+ <spinner label="Échelle verticale" name="shinyScaleV"/>
+ <spinner label="Degrés de rotation" name="shinyRot"/>
+ <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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 7187de87601..2a68ca0ddb6 100755
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation." name="Parcel Identity">
<action description="Activer Afficher le lieu dans la recherche et définir la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d'une parcelle dans l'onglet À propos du terrain > Options." name="land find places" value="17"/>
- <action description="Modifier le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche. Pour ce faire, utilisez l'onglet À propos du terrain > Options." name="land change identity" value="18"/>
+ <action description="Changer le nom de la parcelle, la description et les paramètres de contenu modéré" longdescription="Changez le nom de la parcelle, la description et les paramètres de contenu modéré. Pour ce faire, utilisez l'onglet À propos du terrain > Options." name="land change identity" value="18"/>
<action description="Définir le lieu d'arrivée et le routage des téléportations" longdescription="Définissez le lieu d'arrivée des téléportations et le routage à partir du menu À propos du terrain > Options." name="land set landing point" value="19"/>
</action_set>
<action_set description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 69ed20f3764..346fa62351a 100755
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
Le client que vous utilisez ne permet plus d'accéder à Second Life. Téléchargez un nouveau client à la page suivante :
http://secondlife.com/download
@@ -448,6 +451,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="SLappAgentRequestFriend">
Demande d'amitié
</string>
+ <string name="SLappAgentRemoveFriend">
+ Suppression d'un ami
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Fermer (⌘W)
</string>
@@ -838,6 +844,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="multiple_textures">
Multiples
</string>
+ <string name="use_texture">
+ Utiliser la texture
+ </string>
<string name="texture_loading">
Chargement...
</string>
@@ -937,6 +946,21 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="TeleportYourAgent">
Vous téléporter
</string>
+ <string name="JoinAnExperience">
+ Rejoindre une expérience
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Supprimer les alertes lors de la gestion des listes d'accès aux domaines
+ </string>
+ <string name="OverrideYourAnimations">
+ Remplacer vos animations par défaut
+ </string>
+ <string name="ScriptReturnObjects">
+ Renvoyer les objets de votre part
+ </string>
+ <string name="UnknownScriptPermission">
+ (inconnu)
+ </string>
<string name="SIM_ACCESS_PG">
Général
</string>
@@ -1968,6 +1992,12 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD en bas à droite
</string>
+ <string name="ATTACH_NECK">
+ Cou
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Centre de l'avatar
+ </string>
<string name="CursorPos">
Ligne [LINE], colonne [COLUMN]
</string>
@@ -2997,6 +3027,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
<string name="Hip Width">
Largeur hanche
</string>
+ <string name="Hover">
+ Survol
+ </string>
<string name="In">
Rentré
</string>
@@ -5081,4 +5114,7 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
<string name="logging_calls_enabled_log_empty">
Il n'y a aucune conversation enregistrée. Quand quelqu'un vous contacte ou quand vous contactez quelqu'un, une entrée de journal s'affiche ici.
</string>
+ <string name="loading_chat_logs">
+ Chargement...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index b0fb585fa25..6f09eca90c4 100755
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -8,7 +8,9 @@
Generato con [COMPILER] versione [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Tu sei [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+ Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 89f4a0cb71f..399eb158029 100755
--- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFICA PERMESSI DEL CONTENUTO">
+<floater name="floaterbulkperms" title="CAMBIA I PERMESSI DEL CONTENUTO">
<floater.string name="nothing_to_modify_text">
La selezione non contiene nessun contenuto modificabile.
</floater.string>
@@ -33,7 +33,7 @@
<button label="√ Tutti" label_selected="Tutti" name="check_all"/>
<button label="Cancella" label_selected="Nessuno" name="check_none"/>
<text name="newperms">
- Nuovi permessi del contenuto
+ Cambia i permessi del contenuto a
</text>
<text name="GroupLabel">
Gruppo:
@@ -49,6 +49,7 @@
<check_box label="Modificare" name="next_owner_modify"/>
<check_box label="Copiare" name="next_owner_copy"/>
<check_box initial_value="true" label="Trasferisci" name="next_owner_transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Applica" name="apply"/>
<button label="Annulla" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_goto_line.xml b/indra/newview/skins/default/xui/it/floater_goto_line.xml
new file mode 100644
index 00000000000..29a4aabb990
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="PASSA ALLA RIGA">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Passa alla riga
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d38ec7a5fe5..71f90accde1 100755
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Traduci chat" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Traduci chat" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 77774441612..77be220a2ac 100755
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Mostra:
</text>
- <check_box label="Test" name="show_world"/>
+ <check_box label="Mondo" name="show_world"/>
<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
<check_box label="Navmesh" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
index d4d6fd68d0b..d4ce25e6a57 100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Congela" name="Freeze..."/>
<menu_item_call label="Espelli" name="Eject..."/>
<menu_item_call label="Debug delle texture" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoom avanti" name="Zoom In"/>
<menu_item_call label="Paga" name="Pay..."/>
<menu_item_call label="Profilo dell'oggetto" name="Object Inspect"/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 0b841d591f2..b28137262fa 100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
<menu_item_call label="Debug delle texture" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Lascia" name="Drop"/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
index c2edc32a49a..a2b864b3e16 100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Congela" name="Freeze..."/>
<menu_item_call label="Espelli" name="Eject..."/>
<menu_item_call label="Debug delle texture" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
<menu_item_call label="Zoom avanti" name="Zoom In"/>
<menu_item_call label="Paga" name="Pay..."/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index a4dafd7b5f4..36665710652 100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
<menu_item_call label="Debug delle texture" name="Debug..."/>
+ <menu_item_call label="Dump XML" name="Dump XML"/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
index 46ced93f1df..24486f2af20 100644
--- a/indra/newview/skins/default/xui/it/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+ <menu_item_call label="Chiudi selezionato" name="close_selected_conversations"/>
<menu_item_call label="Vedi profilo" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="Offri teleport" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml
index f510078e147..816849a7b5a 100755
--- a/indra/newview/skins/default/xui/it/menu_land.xml
+++ b/indra/newview/skins/default/xui/it/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Acquista Permesso" name="Land Buy Pass"/>
<menu_item_call label="Costruisci" name="Create"/>
<menu_item_call label="Modifica terreno" name="Edit Terrain"/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 7b060e65654..35053ec4990 100755
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -17,7 +17,13 @@
<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
<menu_item_call label="Mostra messaggio critico" name="Critical"/>
<menu_item_call label="Test debug finestra contenuti Web" name="Web Content Floater Debug Test"/>
- <menu label="Imposta livello di registrazione" name="Set Logging Level"/>
+ <menu label="Imposta livello di registrazione" name="Set Logging Level">
+ <menu_item_check label="Debug" name="Debug"/>
+ <menu_item_check label="Info" name="Info"/>
+ <menu_item_check label="Attenzione" name="Warning"/>
+ <menu_item_check label="Errore" name="Error"/>
+ <menu_item_check label="Nessuno" name="None"/>
+ </menu>
<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
<menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_mute_particle.xml b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
new file mode 100644
index 00000000000..7eb4b094956
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 7f41e8937f1..9bcc0879d21 100755
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="Modifica" name="Edit..."/>
<menu_item_call label="Costruisci" name="Build"/>
- <menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
- <menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
<menu_item_call label="Apri" name="Open"/>
<menu_item_call label="Siediti qui" name="Object Sit"/>
<menu_item_call label="Alzati" name="Object Stand Up"/>
<menu_item_call label="Profilo dell'oggetto" name="Object Inspect"/>
<menu_item_call label="Zoom avanti" name="Zoom In"/>
+ <menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
+ <menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
<context_menu label="Metti" name="Put On">
<menu_item_call label="Indossa" name="Wear"/>
<menu_item_call label="Aggiungi" name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="Paga" name="Pay..."/>
<menu_item_call label="Acquista" name="Buy..."/>
<menu_item_call label="Elimina" name="Delete"/>
+ <menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index abfbab35a34..e5c20fb9e9b 100755
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Vedi profilo" name="show_agent"/>
<menu_item_call label="Manda IM..." name="send_im"/>
<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
+ <menu_item_call label="Togli amicizia..." name="remove_friend"/>
<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 8456d14b63e..116b6521727 100755
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Profilo oggetto..." name="show_object"/>
+ <menu_item_call label="Blocca..." name="block_object"/>
<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
<menu_item_call label="Teleport sul luogo dell'oggetto" name="teleport_to_object"/>
<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 2b7bc71df79..52247d6c9cf 100755
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
</menu>
- <menu label="Stato" name="Status"/>
+ <menu label="Stato" name="Status">
+ <menu_item_check label="Assente" name="Away"/>
+ <menu_item_check label="Non disturbare" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="Acquista L$..." name="Buy and Sell L$"/>
<menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/>
<menu_item_call label="Dashboard dell'account..." name="Manage My Account">
@@ -32,6 +35,7 @@
<menu_item_check label="Conversazioni..." name="Conversations"/>
<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
<menu_item_check label="Parla" name="Speak"/>
+ <menu_item_check label="Registro conversazioni..." name="Conversation Log..."/>
<menu label="Manipolazione voce" name="VoiceMorphing">
<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
<menu_item_check label="Anteprima..." name="Preview"/>
@@ -42,6 +46,7 @@
<menu_item_check label="Gruppi" name="My Groups"/>
<menu_item_check label="Persone vicine" name="Active Speakers"/>
<menu_item_call label="Blocca lista" name="Block List"/>
+ <menu_item_check label="Non disturbare" name="Do Not Disturb"/>
</menu>
<menu label="Mondo" name="World">
<menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
<menu_item_call label="Includi parte successiva" name="Include Next Part"/>
<menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Set collegati..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
<menu label="Oggetto" name="Object">
@@ -273,6 +279,7 @@
<menu_item_check label="Spostamento fotocamera" name="Camera Offset"/>
<menu_item_check label="Veloc. di visualizzazione casuale" name="Randomize Framerate"/>
<menu_item_check label="Test frame" name="Frame Test"/>
+ <menu_item_call label="Profilo frame" name="Frame Profile"/>
</menu>
<menu label="Render Metadata" name="Render Metadata">
<menu_item_check label="Normali" name="Normals"/>
@@ -293,15 +300,15 @@
</menu>
<menu label="Rendering" name="Rendering">
<menu_item_check label="Assi" name="Axes"/>
+ <menu_item_call label="Info materiale selezionato" name="Selected Material Info"/>
<menu_item_check label="Wireframe" name="Wireframe"/>
- <menu_item_check label="Luci e ombre" name="Advanced Lighting Model"/>
+ <menu_item_check label="Modello illuminazione avanzato" name="Advanced Lighting Model"/>
<menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/>
<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="Atlante tessitura (sperimentale)" name="Texture Atlas"/>
<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"/>
@@ -320,7 +327,6 @@
<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
<menu_item_call label="Browser contenuto Web" name="Web Content Browser"/>
<menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/>
- <menu_item_call label="Statistiche memoria" name="Memory Stats"/>
<menu_item_check label="Console di debug regione" name="Region Debug Console"/>
<menu_item_check label="Debug clic" name="Debug Clicks"/>
<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 8adbebb62ac..96b8c96595b 100755
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -210,6 +210,14 @@ Aggiungi questo potere a '[ROLE_NAME]'?
Aggiungi questo potere a '[ROLE_NAME]'?
<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Stai per espellere [AVATAR_NAME] dal gruppo.
+ <usetemplate ignoretext="Conferma l'espulsione di un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Stai per espellere [COUNT] membri dal gruppo.
+ <usetemplate ignoretext="Conferma l'espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+ </notification>
<notification name="AttachmentDrop">
Stai per abbandonare il tuo accessorio.
Vuoi continuare?
@@ -1110,7 +1118,7 @@ su TUTTI I TERRENI di questa sim?
Introduci un prezzo più alto.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Almeno uno degli oggetti selezionati è collegato tramite link ad altri oggetti. Se elimini l'oggetto, i relativi link non funzioneranno più. Pertanto si consiglia vivamente di eliminare prima i link.
+ Almeno uno degli oggetti è collegato tramite link ad altri oggetti. Se elimini l'oggetto, i relativi link non funzioneranno più. Si consiglia vivamente di eliminare prima i link.
Sei sicuro di volere eliminare gli oggetti?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1128,9 +1136,9 @@ Confermi di voler cancellare questi elementi?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
- Non possiedi neanche uno degli oggetti selezionati.
+ Non possiedi almeno uno degli oggetti selezionati.
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1142,24 +1150,24 @@ Confermi di voler cancellare questi elementi?
</notification>
<notification name="ConfirmObjectDeleteLockNoOwn">
Almeno un oggetto è bloccato.
-Non possiedi neanche un oggetto.
+Non possiedi almeno uno degli oggetti.
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
<usetemplate name="okcancelbuttons" notext="Cancella" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
- Almeno un oggetto non è copiabile.
-Non possiedi neanche un oggetto.
+ Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
Almeno un oggetto è bloccato.
-Almeno un oggetto è non copiabile.
-Non possiedi neanche un oggetto.
+Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
@@ -1481,13 +1489,43 @@ Versione [VERSION] [[RELEASE_NOTES_FULL_URL] Informazioni su questo aggiornament
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
È stato scaricato un aggiornamento obbligatorio del software.
-Versione [VERSION]
+Versione [VERSION] [[INFO_URL] Informazioni su questo aggiornamento]
Per installare l'aggiornamento è necessario riavviare [APP_NAME].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
Per installare l'aggiornamento è necessario riavviare [APP_NAME].
+[[INFO_URL] Informazioni su questo aggiornamento]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ È stato scaricato un aggiornamento dell'installazione di [APP_NAME].
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] per informazioni su queesto aggiornamento]
+ <usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ È stato scaricato un aggiornamento dell'installazione di [APP_NAME].
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+ <usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ È stato scaricato un aggiornamento obbligatorio del software.
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+
+Per installare l'aggiornamento è necessario riavviare [APP_NAME].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Per installare l'aggiornamento è necessario riavviare [APP_NAME].
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1538,6 +1576,10 @@ Per installare l'aggiornamento è necessario riavviare [APP_NAME].
Lasciare il gruppo?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Impossibile abbandonare il gruppo. Non puoi abbandonare il gruppo perché sei l'ultimo proprietario del gruppo. Devi prima assegnare a un altro membro il ruolo di proprietario.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Vuoi veramente espellere tutti i residenti dalla griglia?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/>
@@ -2401,9 +2443,7 @@ Seleziona solo un oggetto.
scegliere Teleport.)
</notification>
<notification name="TeleportToPerson">
- Per contattare Residenti come '[NAME]', clicca sul pulsante "Persone", seleziona un Residente nel pannello che viene aperto, quindi clicca su 'IM' in
- basso nel pannello.
- (Puoi anche fare doppio clic sul nome nell'elenco oppure fare clic con il pulsante destro del mouse e selezionare 'IM').
+ Per avviare una conversazione privata con un'altra persona, fai clic con il tasto destro sull'avatar e seleziona 'IM' dal menu.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
Non è possibile selezionare il terreno attraverso i confini del server.
@@ -2777,6 +2817,15 @@ Non consentire l'accesso se non comprendi perfettamente il motivo per cui d
<button name="Deny" text="Nega"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ L'autorizzazione per script runtime richiesta da '<nolink>[OBJECTNAME]</nolink>', un oggetto di proprietà di '[NAME]', non è stata riconosciuta nel viewer e non può essere concessa.
+
+Per concedere questa autorizzazione è necessario che il viewer venga aggiornato alla versione più recente da [DOWNLOADURL].
+ <form name="form">
+ <button name="Deny" text="Ok"/>
+ <button name="Mute" text="Blocca"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
'<nolink>[TITLE]</nolink>' di [NAME]
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index e1468db76ea..2f40d4bdc4a 100755
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -49,6 +49,9 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
</panel>
+ <text name="groupcount">
+ Fai parte di [COUNT] gruppi e puoi iscriverti a [REMAINING] altri.
+ </text>
</panel>
<panel label="RECENTE" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index c2ac6e97a9c..09d7c963708 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Text Chat" name="chat">
- <panel>
- <check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+ <panel name="general_chat_settings">
+ <check_box initial_value="true" label="Simula la battitura tasti quando sei in chat" name="play_typing_animation"/>
<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
<text name="font_size">
- Dimensioni caratteri:
+ Dimensioni carattere:
</text>
<combo_box name="chat_font_size">
<item label="Piccolo" name="Small" value="0"/>
@@ -14,10 +14,7 @@
</combo_box>
<check_box label="Chat a vignetta" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Notifiche
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
IM degli amici:
</text>
@@ -25,8 +22,9 @@
<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Nessuno" name="None" value="none"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Riproduci suono" name="play_sound_friend_im"/>
<text name="non_friend_ims">
IM non di amici:
</text>
@@ -34,8 +32,9 @@
<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Nessuno" name="None" value="none"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Riproduci suono" name="play_sound_non_friend_im"/>
<text name="conference_ims">
IM conferenza:
</text>
@@ -43,8 +42,9 @@
<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Nessuno" name="None" value="none"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Riproduci suono" name="play_sound_conference_im"/>
<text name="group_chat">
Chat di gruppo:
</text>
@@ -52,8 +52,9 @@
<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
- <item label="Nessuno" name="None" value="none"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Riproduci suono" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
Chat nei dintorni:
</text>
@@ -61,13 +62,24 @@
<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
- <item label="Nessuno" name="None" value="none"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Riproduci suono" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ IM di oggetti:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+ <item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+ <item label="Nessuna azione" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Riproduci suono" name="play_sound_object_im"/>
<text name="notifications_alert">
Per interrompere temporaneamente le notifiche, usa Comunica > Non disturbare.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Riproduci suono:
</text>
@@ -76,7 +88,7 @@
<check_box label="Offerta di Teleport" name="teleport_offer"/>
<check_box label="Offerta inventario" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="Cancella registro..." name="clear_log"/>
<button label="Cancella trascrizioni..." name="delete_transcripts"/>
<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 1f2b97af450..e7483b1ba5c 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Luci e ombre" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 0189d47f45e..4c190197b43 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
</combo_box>
+ <check_box label="Disponibile agli aggiornamenti con versioni non rilasciate" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Impostazioni proxy:
</text>
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
index d7ee8230b35..feee8b19276 100755
--- a/indra/newview/skins/default/xui/it/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Seleziona tutto" name="Select All"/>
<menu_item_call label="Deseleziona" name="Deselect"/>
<menu_item_call label="Cerca / Sostituisci..." name="Search / Replace..."/>
+ <menu_item_call label="Passa alla riga..." name="Go to line..."/>
</menu>
<menu label="Guida" name="Help">
<menu_item_call label="Aiuto..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
new file mode 100644
index 00000000000..4e515563aca
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+ <text name="color trans">
+ Trasparenza %
+ </text>
+ <text name="glow label">
+ Bagliore
+ </text>
+ <check_box label="Luminosità massima" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Materiali" name="Materials"/>
+ <combo_box.item label="Multimedia" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Texture (diffusa)" name="Texture (diffuse)"/>
+ <combo_box.item label="Irregolarità (normale)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Lucentezza (speculare)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
+ <text name="label alphamode">
+ Modalità Alfa
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Nessuno" name="None"/>
+ <combo_box.item label="Miscelazione Alfa" name="Alpha blending"/>
+ <combo_box.item label="Mascheratura Alfa" name="Alpha masking"/>
+ <combo_box.item label="Mascheratura emissiva" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ Limite mascheratura
+ </text>
+ <texture_picker label="Texture" name="bumpytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+ <text name="label bumpiness">
+ IrregolaritÃ
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Nessuno" name="None"/>
+ <combo_box.item label="Luminosità " name="Brightness"/>
+ <combo_box.item label="Oscurità " name="Darkness"/>
+ <combo_box.item label="venatura" name="woodgrain"/>
+ <combo_box.item label="corteccia" name="bark"/>
+ <combo_box.item label="mattoni" name="bricks"/>
+ <combo_box.item label="scacchiera" name="checker"/>
+ <combo_box.item label="cemento" name="concrete"/>
+ <combo_box.item label="incrostatura" name="crustytile"/>
+ <combo_box.item label="gemma" name="cutstone"/>
+ <combo_box.item label="dischi" name="discs"/>
+ <combo_box.item label="ciottoli" name="gravel"/>
+ <combo_box.item label="batteri" name="petridish"/>
+ <combo_box.item label="rivestimento" name="siding"/>
+ <combo_box.item label="lastricato" name="stonetile"/>
+ <combo_box.item label="stucco" name="stucco"/>
+ <combo_box.item label="suzione" name="suction"/>
+ <combo_box.item label="trama" name="weave"/>
+ </combo_box>
+ <texture_picker label="Texture" name="shinytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+ <text name="label shininess">
+ Lucentezza
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Nessuna" name="None"/>
+ <combo_box.item label="Bassa" name="Low"/>
+ <combo_box.item label="Media" name="Medium"/>
+ <combo_box.item label="Alta" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Patinatura
+ </text>
+ <text name="label environment">
+ Ambiente
+ </text>
+ <text name="label shinycolor">
+ Colore
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+ <text name="media_info">
+ L'URL dell'eventuale elemento multimediale selezionato va qui
+ </text>
+ <button label="Scegli..." name="add_media" tool_tip="Aggiungi elemento multimediale"/>
+ <button label="Rimuovi" name="delete_media" tool_tip="Cancella questa texture dell'elemento multimediale"/>
+ <button label="Alllinea" label_selected="Allinea elmento multimediale" name="button align" tool_tip="Allinea texture dell'elemento multimediale (il caricamento deve prima essere completato)"/>
+ <text name="tex gen">
+ Mappatura
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Predefinita" name="Default"/>
+ <combo_box.item label="Planare" name="Planar"/>
+ </combo_box>
+ <spinner label="Scala orizzontale" name="TexScaleU"/>
+ <spinner label="Scala veritcale" name="TexScaleV"/>
+ <spinner label="Ripetizioni al metro" name="rptctrl"/>
+ <spinner label="Gradi di rotazione" name="TexRot"/>
+ <spinner label="Spostamento orizzontale" name="TexOffsetU"/>
+ <spinner label="Spostamento verticale" name="TexOffsetV"/>
+ <spinner label="Scala orizzontale" name="bumpyScaleU"/>
+ <spinner label="Scala veritcale" name="bumpyScaleV"/>
+ <spinner label="Gradi di rotazione" name="bumpyRot"/>
+ <spinner label="Spostamento orizzontale" name="bumpyOffsetU"/>
+ <spinner label="Spostamento verticale" name="bumpyOffsetV"/>
+ <spinner label="Scala orizzontale" name="shinyScaleU"/>
+ <spinner label="Scala veritcale" name="shinyScaleV"/>
+ <spinner label="Gradi di rotazione" name="shinyRot"/>
+ <spinner label="Spostamento orizzontale" name="shinyOffsetU"/>
+ <spinner label="Spostamento verticale" name="shinyOffsetV"/>
+ <check_box initial_value="falso" 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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
index 300e6cf7213..3ccb674ed0b 100755
--- a/indra/newview/skins/default/xui/it/role_actions.xml
+++ b/indra/newview/skins/default/xui/it/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Queste abilità permettono di cambiare il nome del lotto, le impostazioni di pubblicazione, la visibilità negli elenchi e il punto di arrivo, nonché opzioni di indirizzamento del Teleport." name="Parcel Identity">
<action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno > scheda Opzioni." name="land find places" value="17"/>
- <action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno > scheda Opzioni." name="land change identity" value="18"/>
+ <action description="Cambia il nome, la descrizione e le impostazioni 'Contenuto Moderato' per il lotto" longdescription="Cambia il nome, la descrizione e le impostazioni 'Contenuto Moderato' per il lotto. Ciò viene fatto in Informazioni sul terreno > scheda Opzioni." name="land change identity" value="18"/>
<action description="Impostare il punto di arrivo e l'indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l'indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno > Opzioni." name="land set landing point" value="19"/>
</action_set>
<action_set description="Queste abilità hanno poteri relativi alle opzioni dei lotti, come la creazione di oggetti, la modifica del terreno e le impostazioni per la musica e gli elementi multimediali." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f95318542b4..160df911d36 100755
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -136,6 +136,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download.
+ </string>
<string name="LoginFailedViewerNotPermitted">
Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
http://secondlife.com/download.
@@ -445,6 +448,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="SLappAgentRequestFriend">
Richiesta di amicizia
</string>
+ <string name="SLappAgentRemoveFriend">
+ Rimozione amico
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Chiudi (⌘W)
</string>
@@ -832,6 +838,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="multiple_textures">
Multiple
</string>
+ <string name="use_texture">
+ Usa texture
+ </string>
<string name="texture_loading">
Caricamento in corso...
</string>
@@ -928,6 +937,21 @@ Prova ad accedere nuovamente tra un minuto.
<string name="TeleportYourAgent">
Teleportarti
</string>
+ <string name="JoinAnExperience">
+ Partecipa a un'esperienza
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
+ </string>
+ <string name="OverrideYourAnimations">
+ Sostituisce le animazioni predefinite
+ </string>
+ <string name="ScriptReturnObjects">
+ Restituisce oggetti per conto tuo
+ </string>
+ <string name="UnknownScriptPermission">
+ (sconosciuto)!
+ </string>
<string name="SIM_ACCESS_PG">
Generale
</string>
@@ -1953,6 +1977,12 @@ Prova ad accedere nuovamente tra un minuto.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD basso a destra
</string>
+ <string name="ATTACH_NECK">
+ Collo
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Centro avatar
+ </string>
<string name="CursorPos">
Riga [LINE], Colonna [COLUMN]
</string>
@@ -2940,6 +2970,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
<string name="Hip Width">
Larghezza bacino
</string>
+ <string name="Hover">
+ Muovi sopra
+ </string>
<string name="In">
Dentro
</string>
@@ -4994,4 +5027,7 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
<string name="logging_calls_enabled_log_empty">
Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
</string>
+ <string name="loading_chat_logs">
+ Caricamento in corso...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index eae52c98ec2..63a4e69c102 100755
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -8,7 +8,9 @@
コンパイラー [COMPILER] [COMPILER_VERSION] ãƒãƒ¼ã‚¸ãƒ§ãƒ³
</floater.string>
<floater.string name="AboutPosition">
- ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ <nolink>[HOSTNAME]</nolink> ã§ã™ã€‚（[HOSTIP]）
+ ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_LOCAL_0,number,1]ã€[POSITION_LOCAL_1,number,1]ã€[POSITION_LOCAL_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ <nolink>[HOSTNAME]</nolink> ã§ã™ã€‚（[HOSTIP]）
+SLURL:<nolink>[SLURL]</nolink>
+(ã‚°ãƒãƒ¼ãƒãƒ«åº§æ¨™ [POSITION_0,number,1]ã€[POSITION_1,number,1]ã€[POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 d8d01646181..1b5a745cc46 100755
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="ä¸èº«ã®æ¨©é™ã®ç·¨é›†">
+<floater name="floaterbulkperms" title="コンテンツ権é™ã‚’調整">
<floater.string name="nothing_to_modify_text">
é¸æŠžã—ãŸä¸ã«ç·¨é›†ã§ããªã„ã‚‚ã®ãŒå«ã¾ã‚Œã¦ã„ã¾ã™
</floater.string>
@@ -33,7 +33,7 @@
<button label="ã™ã¹ã¦ã« √" label_selected="å…¨ã¦" name="check_all"/>
<button label="クリア" label_selected="ãªã—" name="check_none"/>
<text name="newperms">
- æ–°ã—ã„ä¸èº«ã®æ¨©é™
+ コンテンツ権é™ã‚’以下ã«èª¿æ•´
</text>
<text name="GroupLabel">
グループ：
@@ -49,6 +49,7 @@
<check_box label="ä¿®æ£" name="next_owner_modify"/>
<check_box label="コピー" name="next_owner_copy"/>
<check_box initial_value="true" label="å†è²©ãƒ»ãƒ—レゼント" name="next_owner_transfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="é©ç”¨" name="apply"/>
<button label="ã‚ャンセル" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
new file mode 100644
index 00000000000..5f2717ace54
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="è¡Œã«ç§»å‹•">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ è¡Œã«ç§»å‹•
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index a44c843df7f..7ed46f7f013 100755
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="ãƒãƒ£ãƒƒãƒˆã‚’翻訳" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 9733c619181..ec107f3e6b9 100755
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
表示：
</text>
- <check_box label="テスト" name="show_world"/>
+ <check_box label="世界" name="show_world"/>
<check_box label="å¯å‹•ç‰©ã®ã¿" name="show_world_movables_only"/>
<check_box label="ナビメッシュ" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 5adf0b3745f..930af106923 100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="フリーズ" name="Freeze..."/>
<menu_item_call label="追放" name="Eject..."/>
<menu_item_call label="テクスãƒãƒ£ã®ãƒ‡ãƒãƒƒã‚°" name="Debug..."/>
+ <menu_item_call label="ダンプ XML" name="Dump XML"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払ã†" name="Pay..."/>
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Object Inspect"/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index 6036e1075e7..d87ef8e2a08 100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile..."/>
<menu_item_call label="テクスãƒãƒ£ã®ãƒ‡ãƒãƒƒã‚°" name="Debug..."/>
+ <menu_item_call label="ダンプ XML" name="Dump XML"/>
<menu_item_call label="下ã«è½ã¨ã™" name="Drop"/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 54dd96f5eff..f9cadc36ac5 100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="フリーズ" name="Freeze..."/>
<menu_item_call label="追放" name="Eject..."/>
<menu_item_call label="テクスãƒãƒ£ã®ãƒ‡ãƒãƒƒã‚°" name="Debug..."/>
+ <menu_item_call label="ダンプ XML" name="Dump XML"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
<menu_item_call label="支払ã†" name="Pay..."/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index 4709522665b..eb8e98059a9 100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile..."/>
<menu_item_call label="テクスãƒãƒ£ã®ãƒ‡ãƒãƒƒã‚°" name="Debug..."/>
+ <menu_item_call label="ダンプ XML" name="Dump XML"/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index c7df20d2529..66940471da8 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="会話を終ãˆã‚‹" name="close_conversation"/>
<menu_item_call label="ボイスãƒãƒ£ãƒƒãƒˆã‚’始ã‚ã‚‹" name="open_voice_conversation"/>
<menu_item_call label="ボイスãƒãƒ£ãƒƒãƒˆã‚’切æ–ã™ã‚‹" name="disconnect_from_voice"/>
+ <menu_item_call label="é¸æŠžã—ãŸé …目を閉ã˜ã‚‹" name="close_selected_conversations"/>
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="テレãƒãƒ¼ãƒˆã‚’é€ã‚‹" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 89c122f14fd..3754bd7fa43 100755
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="å…¥å ´è¨±å¯ã‚’購入" name="Land Buy Pass"/>
<menu_item_call label="制作" name="Create"/>
<menu_item_call label="地形を編集" name="Edit Terrain"/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index ab6d9e3546d..3918732fa8e 100755
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="利用è¦ç´„を表示" name="TOS"/>
<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
<menu_item_call label="Web コンテンツフãƒãƒ¼ã‚¿ãƒ¼ã®ãƒ‡ãƒãƒƒã‚°ãƒ†ã‚¹ãƒˆ" name="Web Content Floater Debug Test"/>
- <menu label="ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’è¨å®š" name="Set Logging Level"/>
+ <menu label="ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’è¨å®š" name="Set Logging Level">
+ <menu_item_check label="デãƒãƒƒã‚°" name="Debug"/>
+ <menu_item_check label="æƒ…å ±" name="Info"/>
+ <menu_item_check label="è¦å‘Š" name="Warning"/>
+ <menu_item_check label="エラー" name="Error"/>
+ <menu_item_check label="ãªã—" name="None"/>
+ </menu>
<menu_item_check label="グリッドピッカーを表示ã™ã‚‹" name="Show Grid Picker"/>
<menu_item_call label="通知コンソールを表示ã™ã‚‹" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
new file mode 100644
index 00000000000..8dab0253090
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 01436ad12bc..39c32bc41e4 100755
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="編集" name="Edit..."/>
<menu_item_call label="制作" name="Build"/>
- <menu_item_call label="リンクセットã§è¡¨ç¤º" name="show_in_linksets"/>
- <menu_item_call label="ã‚ャラクターã§è¡¨ç¤º" name="show_in_characters"/>
<menu_item_call label="é–‹ã" name="Open"/>
<menu_item_call label="ã“ã“ã«åº§ã‚‹" name="Object Sit"/>
<menu_item_call label="ç«‹ã¡ä¸ŠãŒã‚‹" name="Object Stand Up"/>
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Object Inspect"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
+ <menu_item_call label="リンクセットã§è¡¨ç¤º" name="show_in_linksets"/>
+ <menu_item_call label="ã‚ャラクターã§è¡¨ç¤º" name="show_in_characters"/>
<context_menu label="装ç€" name="Put On">
<menu_item_call label="装ç€" name="Wear"/>
<menu_item_call label="è¿½åŠ " name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="支払ã†" name="Pay..."/>
<menu_item_call label="è²·ã†" name="Buy..."/>
<menu_item_call label="削除" name="Delete"/>
+ <menu_item_call label="パーティクル所有者をブãƒãƒƒã‚¯" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 72722db7cca..639602ce3c0 100755
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示" name="show_agent"/>
<menu_item_call label="IM ã‚’é€ä¿¡..." name="send_im"/>
<menu_item_call label="ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’è¿½åŠ ..." name="add_friend"/>
+ <menu_item_call label="フレンドを削除..." name="remove_friend"/>
<menu_item_call label="åå‰ã‚’クリップボードã«ã‚³ãƒ”ー" name="url_copy_label"/>
<menu_item_call label="SLurl をクリップボードã«ã‚³ãƒ”ー" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 9e340e3239c..a02ca8415d3 100755
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«..." name="show_object"/>
+ <menu_item_call label="ブãƒãƒƒã‚¯..." name="block_object"/>
<menu_item_call label="地図ã«è¡¨ç¤º" name="show_on_map"/>
<menu_item_call label="オブジェクトã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="teleport_to_object"/>
<menu_item_call label="オブジェクトåをクリップボードã«ã‚³ãƒ”ー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 89f58d3bace..b1ec62115c6 100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="ç§ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹" name="Stop Animating My Avatar"/>
<menu_item_call label="æ©è¡Œï¼èµ°è¡Œï¼é£›è¡Œ..." name="Walk / run / fly"/>
</menu>
- <menu label="ãƒã‚°ã‚¤ãƒ³" name="Status"/>
+ <menu label="ãƒã‚°ã‚¤ãƒ³" name="Status">
+ <menu_item_check label="一時退å¸ä¸" name="Away"/>
+ <menu_item_check label="ç€ä¿¡æ‹’å¦" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="L$ ã®è³¼å…¥..." name="Buy and Sell L$"/>
<menu_item_call label="マーãƒãƒ£ãƒ³ãƒˆã‚¢ã‚¦ãƒˆãƒœãƒƒã‚¯ã‚¹..." name="MerchantOutbox"/>
<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -32,6 +35,7 @@
<menu_item_check label="会話..." name="Conversations"/>
<menu_item_check label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆ..." name="Nearby Chat"/>
<menu_item_check label="話ã™" name="Speak"/>
+ <menu_item_check label="会話ãƒã‚°..." name="Conversation Log..."/>
<menu label="ボイスモーフィング" name="VoiceMorphing">
<menu_item_check label="ボイスモーフィングãªã—" name="NoVoiceMorphing"/>
<menu_item_check label="プレビュー..." name="Preview"/>
@@ -42,6 +46,7 @@
<menu_item_check label="グループ" name="My Groups"/>
<menu_item_check label="è¿‘ãã«ã„る人" name="Active Speakers"/>
<menu_item_call label="リストをブãƒãƒƒã‚¯" name="Block List"/>
+ <menu_item_check label="ç€ä¿¡æ‹’å¦" name="Do Not Disturb"/>
</menu>
<menu label="世界" name="World">
<menu_item_call label="ç¾åœ¨åœ°ã‚’ランドマーク" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
<menu_item_call label="次ã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Next Part"/>
<menu_item_call label="å‰å›žã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="リンクセット..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã«ç„¦ç‚¹ã‚’åˆã‚ã›ã‚‹" name="Focus on Selection"/>
<menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã‚’ズームã™ã‚‹" name="Zoom to Selection"/>
<menu label="オブジェクト" name="Object">
@@ -279,6 +285,7 @@
<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
<menu_item_check label="定期的ã«é…ã„フレームを挿入ã™ã‚‹" name="Periodic Slow Frame"/>
<menu_item_check label="フレームテスト" name="Frame Test"/>
+ <menu_item_call label="フレームプãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Frame Profile"/>
</menu>
<menu label="メタデータã®ãƒ¬ãƒ³ãƒ€ãƒ¼" name="Render Metadata">
<menu_item_check label="ãƒã‚¦ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ãƒœãƒƒã‚¯ã‚¹" name="Bounding Boxes"/>
@@ -313,9 +320,10 @@
<menu_item_check label="軸" name="Axes"/>
<menu_item_check label="接線基底" name="Tangent Basis"/>
<menu_item_call label="é¸æŠžã—ãŸãƒ†ã‚¯ã‚¹ãƒãƒ£æƒ…å ±åŸºåº•" name="Selected Texture Info Basis"/>
+ <menu_item_call label="é¸æŠžã—ãŸãƒžãƒ†ãƒªã‚¢ãƒ«æƒ…å ±" name="Selected Material Info"/>
<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
- <menu_item_check label="å…‰ã¨å½±" name="Advanced Lighting Model"/>
+ <menu_item_check label="高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«" name="Advanced Lighting Model"/>
<menu_item_check label="太陽・月・プãƒã‚¸ã‚§ã‚¯ã‚¿ã‹ã‚‰ã®å½±" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO ã¨å½±ã®å¹³æ»‘化" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="GL デãƒãƒƒã‚°" name="Debug GL"/>
@@ -325,7 +333,6 @@
<menu_item_check label="アニメーションテクスãƒãƒ£" name="Animation Textures"/>
<menu_item_check label="テクスãƒãƒ£ã‚’無効ã«ã™ã‚‹" name="Disable Textures"/>
<menu_item_check label="フル解åƒåº¦ãƒ†ã‚¯ã‚¹ãƒãƒ£" name="Rull Res Textures"/>
- <menu_item_check label="テクスãƒãƒ£ã‚¢ãƒˆãƒ©ã‚¹ï¼ˆè©¦é¨“段階）" name="Texture Atlas"/>
<menu_item_check label="装ç€ã•ã‚ŒãŸå…‰æºã‚’æç”»ã™ã‚‹" name="Render Attached Lights"/>
<menu_item_check label="å–り付ã‘られãŸãƒ‘ーティクルをæç”»ã™ã‚‹" name="Render Attached Particles"/>
<menu_item_check label="マウスオーãƒãƒ¼ã§å¼·èª¿è¡¨ç¤ºã™ã‚‹" name="Hover Glow Objects"/>
@@ -361,7 +368,6 @@
<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
<menu_item_call label="é¸æŠžã—ãŸã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Selected Object Info"/>
<menu_item_call label="ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Agent Info"/>
- <menu_item_call label="メモリ使用状æ³" name="Memory Stats"/>
<menu_item_check label="地域デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Region Debug Console"/>
<menu_item_check label="SelectMgr ã®ãƒ‡ãƒãƒƒã‚°" name="Debug SelectMgr"/>
<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 356506f1912..f1c916bf533 100755
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -150,7 +150,7 @@
<usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ä¿å˜ã—ãªã„" yestext="ã™ã¹ã¦ä¿å˜"/>
</notification>
<notification name="FriendsAndGroupsOnly">
- フレンド以外ã‹ã‚‰ã®ã‚³ãƒ¼ãƒ«ã‚„インスタントメッセージを無視ã™ã‚‹è¨å®šã«ã—ãŸã“ã¨ã‚’ã€ç›¸æ‰‹ã«çŸ¥ã‚‰ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。
+ フレンド以外ã®äººã‹ã‚‰ã®ã‚³ãƒ¼ãƒ«ã‚„ã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’無視ã™ã‚‹è¨å®šã«ã—ãŸã“ã¨ã‚’ã€ç›¸æ‰‹ã«çŸ¥ã‚‰ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="FavoritesOnLogin">
@@ -221,6 +221,14 @@
ã“ã®èƒ½åŠ›ã‚’ [ROLE_NAME] ã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ [AVATAR_NAME] をグループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="グループã‹ã‚‰ã®å‚åŠ è€…ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="追放"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ [COUNT] åã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’グループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
+ <usetemplate ignoretext="グループã‹ã‚‰ã®è¤‡æ•°ã®ãƒ¡ãƒ³ãƒãƒ¼ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="追放"/>
+ </notification>
<notification name="AttachmentDrop">
アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«ç½®ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚
続ã‘ã¾ã™ã‹ï¼Ÿ
@@ -1139,7 +1147,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries ã‚’å‚ç…§ã—ã¦ã
金é¡ã‚’増やã—ã¦ãã ã•ã„。
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- ã“ã“ã«ãƒªãƒ³ã‚¯ã•ã‚ŒãŸã‚¢ã‚¤ãƒ†ãƒ ãŒå°‘ãªãã¨ã‚‚1ã¤ã‚ã‚Šã¾ã™ã€‚ ã“ã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã™ã‚‹ã¨ã“ã“ã«ãƒªãƒ³ã‚¯ã•ã‚ŒãŸã‚‚ã®ãŒæ©Ÿèƒ½ã—ãªããªã‚Šã¾ã™ã€‚ リンクを先ã«å‰Šé™¤ã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚
+ 1 ã¤ä»¥ä¸Šã®ã‚¢ã‚¤ãƒ†ãƒ ã«ãƒã‚¤ãƒ³ãƒˆã™ã‚‹ãƒªãƒ³ã‚¯ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã™ã‚‹å ´åˆã€ãã®ãƒªãƒ³ã‚¯ã¯æ°¸ä¹…ã«æ©Ÿèƒ½ã—ãªããªã‚Šã¾ã™ã€‚ã¾ãšæœ€åˆã«ãƒªãƒ³ã‚¯ã‚’削除ã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚
ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
@@ -1157,9 +1165,9 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries ã‚’å‚ç…§ã—ã¦ã
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
- é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®ã†ã¡ã€å°‘ãªãã¨ã‚‚ 1 ã¤ãŒã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã® 1 ã¤ä»¥ä¸Šã‚’所有ã—ã¦ã„ã¾ã›ã‚“。
-本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
+ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1170,26 +1178,26 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries ã‚’å‚ç…§ã—ã¦ã
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoOwn">
- å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚
-å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¾ã—ãŸã€‚
+1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトを所有ã—ã¦ã„ã¾ã›ã‚“。
-本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
+ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
- å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。
-å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。
+1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトを所有ã—ã¦ã„ã¾ã›ã‚“。
-本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
+ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
- å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚
-å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。
-å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。
+ 1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚
+1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。
+1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトを所有ã—ã¦ã„ã¾ã›ã‚“。
-本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
+ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™ã‹ï¼Ÿ
+ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚
@@ -1513,13 +1521,43 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
å¿…è¦ãªã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã®ã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚
-ãƒãƒ¼ã‚¸ãƒ§ãƒ³ [VERSION]
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ [VERSION] [[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±]
アップデートをインストールã™ã‚‹ã«ã¯ [APP_NAME] ã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
アップデートをインストールã™ã‚‹ã«ã¯ [APP_NAME] ã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+[[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ ãŠä½¿ã„ã® [APP_NAME] ã«å¿…è¦ãªã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ [VERSION]
+ã“ã®è©¦é¨“çš„ãªãƒ“ューア㌠[NEW_CHANNEL] ビューアã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™;
+ã“ã®ã‚¢ãƒƒãƒ—デートã®è©³ç´°ã«ã¤ã„ã¦ã¯ã€[[INFO_URL] ã‚’å‚ç…§ã—ã¦ãã ã•ã„]
+ <usetemplate name="okcancelbuttons" notext="後ã§å®Ÿè¡Œ" yestext="今ã™ãインストールã—㦠[APP_NAME] ã‚’å†èµ·å‹•"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ ãŠä½¿ã„ã® [APP_NAME] ã«å¿…è¦ãªã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ [VERSION]
+ã“ã®è©¦é¨“çš„ãªãƒ“ューア㌠[NEW_CHANNEL] ビューアã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™;
+[[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±] ã‚’å‚ç…§
+ <usetemplate name="okcancelbuttons" notext="後ã§å®Ÿè¡Œ" yestext="今ã™ãインストールã—㦠[APP_NAME] ã‚’å†èµ·å‹•"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ å¿…è¦ãªã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã®ã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚
+ãƒãƒ¼ã‚¸ãƒ§ãƒ³ [VERSION]
+ã“ã®è©¦é¨“çš„ãªãƒ“ューア㌠[NEW_CHANNEL] ビューアã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™;
+[[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±] ã‚’å‚ç…§
+
+アップデートをインストールã™ã‚‹ã«ã¯ [APP_NAME] ã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ アップデートをインストールã™ã‚‹ã«ã¯ [APP_NAME] ã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ã“ã®è©¦é¨“çš„ãªãƒ“ューア㌠[NEW_CHANNEL] ビューアã«ç½®ãæ›ãˆã‚‰ã‚Œã¦ã„ã¾ã™;
+[[INFO_URL] ã“ã®ã‚¢ãƒƒãƒ—デートã«é–¢ã™ã‚‹æƒ…å ±] ã‚’å‚ç…§
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1572,6 +1610,10 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
グループã‹ã‚‰è„±é€€ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ グループを抜ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。グループã®æœ€å¾Œã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã‚ã‚‹ãŸã‚ã€ã‚°ãƒ«ãƒ¼ãƒ—を抜ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。最åˆã«ã€åˆ¥ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’オーナーã®å½¹å‰²ã«å‰²ã‚Šå½“ã¦ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
本当ã«ä½äººå…¨å“¡ã‚’グリッドã‹ã‚‰è¿½ã„出ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="ä½äººå…¨å“¡ã‚’追ã„出ã™"/>
@@ -2443,9 +2485,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
「テレãƒãƒ¼ãƒˆã€ã‚’é¸æŠžã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚）
</notification>
<notification name="TeleportToPerson">
- [NAME] ã®ã‚ˆã†ãªä½äººã«é€£çµ¡ã‚’ã¨ã‚‹ã«ã¯ã€ã€Œäººã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã€è¡¨ç¤ºã•ã‚Œã‚‹ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ã€Œä½äººã€ã‚’é¸æŠžã—ã¦ã‹ã‚‰ã€
-ウィンドウ下部ã«ã‚る「IMã€ã‚’クリックã—ã¾ã™ã€‚
-（リストã®åå‰ã‚’ダブルクリックã€ã¾ãŸã¯å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€ŒIMã€ã‚’é¸ã‚“ã§ã‚‚åŒã˜ã§ã™ã€‚）
+ 誰ã‹ã¨ã®ãƒ—ライベートãªä¼šè©±ã‚’é–‹ãã«ã¯ã€ç›¸æ‰‹ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’クリックã—ã¦ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ã€ŒIMã€ã‚’é¸æŠžã—ã¾ã™ã€‚
</notification>
<notification name="CantSelectLandFromMultipleRegions">
サーãƒãƒ¼ã®å¢ƒç•Œã‚’越ãˆã¦åœŸåœ°ã‚’é¸æŠžã™ã‚‹ã“ã¨ã§ãã¾ã›ã‚“。
@@ -2820,6 +2860,15 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<button name="Deny" text="æ‹’å¦"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ '[NAME]' ãŒæ‰€æœ‰ã™ã‚‹ '<nolink>[OBJECTNAME]</nolink>' ã«ã‚ˆã£ã¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã•ã‚ŒãŸãƒ©ãƒ³ã‚¿ã‚¤ãƒ スクリプト権é™ãŒãƒ“ューアã«ã‚ˆã£ã¦èªè˜ã•ã‚Œãªã„ãŸã‚ã€è¨±å¯ã§ãã¾ã›ã‚“。
+
+ã“ã®æ¨©é™ã‚’許å¯ã™ã‚‹ã«ã¯ã€ãƒ“ューアを [DOWNLOADURL] ã‹ã‚‰ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—デートã—ã¦ãã ã•ã„。
+ <form name="form">
+ <button name="Deny" text="Ok"/>
+ <button name="Mute" text="ブãƒãƒƒã‚¯"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
[NAME] ã®ã€Œ<nolink>[TITLE]</nolink>ã€
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 03ce87537a5..dd8fd416815 100755
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -49,6 +49,9 @@
<menu_button name="plus_btn" tool_tip="グループã«å‚åŠ / æ–°è¦ã‚°ãƒ«ãƒ¼ãƒ—を作æˆã—ã¾ã™"/>
<dnd_button name="minus_btn" tool_tip="é¸æŠžã—ãŸã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰è„±é€€"/>
</panel>
+ <text name="groupcount">
+ ã‚ãªãŸã¯[COUNT]グループã«å±žã—ã¦ã„ã‚‹ã®ã§ã€ã¾ã [REMAINING]å‚åŠ ã§ãã¾ã™ã€‚
+ </text>
</panel>
<panel label="最新" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ae5391c7bd8..1c3204ea04d 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="ãƒãƒ£ãƒƒãƒˆ" name="chat">
- <panel>
+ <panel name="general_chat_settings">
<check_box initial_value="true" label="ãƒãƒ£ãƒƒãƒˆä¸ã«ã‚¿ã‚¤ãƒ”ング動作ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’å†ç”Ÿ" name="play_typing_animation"/>
<check_box label="オフライン時ã«å—ã‘å–ã£ãŸ IM をメールã§å—ä¿¡" name="send_im_to_email"/>
<check_box label="フレンドã¨ã‚°ãƒ«ãƒ¼ãƒ—以外ã‹ã‚‰ã¯ã‚³ãƒ¼ãƒ«ã¨ IM ã‚’å—ä¿¡ã—ãªã„" name="voice_call_friends_only_check"/>
@@ -14,71 +14,83 @@
</combo_box>
<check_box label="å¹ã出ã—ãƒãƒ£ãƒƒãƒˆ" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- 通知
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
フレンド IM:
</text>
<combo_box name="FriendIMOptions">
- <item label="会話ウィンドウを開ã" name="OpenConversationsWindow" value="openconversations"/>
- <item label="メッセージã®ãƒãƒƒãƒ—アップ" name="PopUpMessage" value="toast"/>
- <item label="Flash ツールãƒãƒ¼ãƒœã‚¿ãƒ³" name="FlashToolbarButton" value="flash"/>
- <item label="フィルターãªã—" name="None" value="none"/>
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_friend_im"/>
<text name="non_friend_ims">
- éžãƒ•ãƒ¬ãƒ³ãƒ‰ IM:
+ フレンドã®ã„ãªã„ IM:
</text>
<combo_box name="NonFriendIMOptions">
- <item label="会話ウィンドウを開ã" name="OpenConversationsWindow" value="openconversations"/>
- <item label="メッセージã®ãƒãƒƒãƒ—アップ" name="PopUpMessage" value="toast"/>
- <item label="Flash ツールãƒãƒ¼ãƒœã‚¿ãƒ³" name="FlashToolbarButton" value="flash"/>
- <item label="フィルターãªã—" name="None" value="none"/>
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_non_friend_im"/>
<text name="conference_ims">
- コンファレンス IM:
+ ä¼šè° IM:
</text>
<combo_box name="ConferenceIMOptions">
- <item label="会話ウィンドウを開ã" name="OpenConversationsWindow" value="openconversations"/>
- <item label="メッセージã®ãƒãƒƒãƒ—アップ" name="PopUpMessage" value="toast"/>
- <item label="Flashツールãƒãƒ¼ãƒœã‚¿ãƒ³" name="FlashToolbarButton" value="flash"/>
- <item label="フィルターãªã—" name="None" value="none"/>
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_conference_im"/>
<text name="group_chat">
グループãƒãƒ£ãƒƒãƒˆ:
</text>
<combo_box name="GroupChatOptions">
- <item label="会話ウィンドウを開ã" name="OpenConversationsWindow" value="openconversations"/>
- <item label="メッセージã®ãƒãƒƒãƒ—アップ" name="PopUpMessage" value="toast"/>
- <item label="Flash ツールãƒãƒ¼ãƒœã‚¿ãƒ³" name="FlashToolbarButton" value="flash"/>
- <item label="ãªã—" name="None" value="none"/>
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
è¿‘ãã®ãƒãƒ£ãƒƒãƒˆ:
</text>
<combo_box name="NearbyChatOptions">
- <item label="会話ウィンドウを開ã" name="OpenConversationsWindow" value="openconversations"/>
- <item label="メッセージã®ãƒãƒƒãƒ—アップ" name="PopUpMessage" value="toast"/>
- <item label="Flash ツールãƒãƒ¼ãƒœã‚¿ãƒ³" name="FlashToolBarButton" value="flash"/>
- <item label="フィルターãªã—" name="None" value="none"/>
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ オブジェクト IM：
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="é–‹ã„ã¦ã„る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="メッセージをãƒãƒƒãƒ—アップ表示" name="PopUpMessage" value="トースト"/>
+ <item label="フラッシュ ツールãƒãƒ¼ ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+ <item label="動作ãªã—" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="サウンドをå†ç”Ÿ" name="play_sound_object_im"/>
<text name="notifications_alert">
- ã™ã¹ã¦ã®é€šçŸ¥ã‚’一時的ã«å—ã‘付ã‘ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€ã€Œã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ãƒˆã€>「通知をå—ã‘ãªã„ã€ã‚’使用ã—ã¾ã™ã€‚
+ 一時的ã«ã™ã¹ã¦ã®é€šçŸ¥ã‚’åœæ¢ã™ã‚‹ã«ã¯ã€ã€Œã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã€ > 「ç€ä¿¡æ‹’å¦]を使用ã—ã¾ã™ã€‚
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
- 音ã®å†ç”Ÿ:
+ サウンドをå†ç”Ÿ:
</text>
<check_box label="æ–°ã—ã„会話" name="new_conversation"/>
- <check_box label="ボイスコールã®ç€ä¿¡" name="incoming_voice_call"/>
- <check_box label="テレãƒãƒ¼ãƒˆã‚’渡ã™" name="teleport_offer"/>
- <check_box label="アイテムã®ã‚ªãƒ•ã‚¡ãƒ¼" name="inventory_offer"/>
+ <check_box label="å—信音声コール" name="incoming_voice_call"/>
+ <check_box label="テレãƒãƒ¼ãƒˆã‚’é€ã‚‹" name="teleport_offer"/>
+ <check_box label="インベントリをé€ã‚‹" name="inventory_offer"/>
</panel>
- <panel>
- <button label="ãƒã‚°ã®ã‚¯ãƒªã‚¢..." name="clear_log"/>
- <button label="テã‚ストã®å‰Šé™¤..." name="delete_transcripts"/>
+ <panel name="log_settings">
+ <button label="ãƒã‚°ã‚’消去..." name="clear_log"/>
+ <button label="テã‚ストãƒãƒ£ãƒƒãƒˆã‚’削除..." name="delete_transcripts"/>
<button label="å‚ç…§..." label_selected="å‚ç…§" name="log_path_button"/>
</panel>
<button label="ä»–ã®è¨€èªž..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 1786b4befc9..15017e330e4 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="è¿‘ãã®å…‰" name="LocalLights"/>
<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="ã“ã®ã‚ªãƒ—ションを無効ã«ã™ã‚‹ã¨ã€ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ã®ãƒ‰ãƒ©ã‚¤ãƒã®ç¨®é¡žã«ã‚ˆã£ã¦ã¯ã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã™ã‚‹ã®ã‚’防ãŽã¾ã™ã€‚"/>
<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="å…‰ã¨å½±" name="UseLightShaders"/>
+ <check_box initial_value="true" label="高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«" name="UseLightShaders"/>
<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
<check_box initial_value="true" label="フィールドã®é è¿‘æ„Ÿ" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index d90a1632ab6..2c0359cb156 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="自動的ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" name="Install_automatically"/>
<combo_box.item label="手動ã§ã‚¢ãƒƒãƒ—デートをダウンãƒãƒ¼ãƒ‰&インストール" name="Install_manual"/>
</combo_box>
+ <check_box label="release candidate ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™" name="update_willing_to_test"/>
<text name="Proxy Settings:">
プãƒã‚ã‚·è¨å®šï¼š
</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 14d55002a38..b6d51085eb3 100755
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="ã™ã¹ã¦é¸æŠž" name="Select All"/>
<menu_item_call label="é¸æŠžè§£é™¤" name="Deselect"/>
<menu_item_call label="検索 / å†é…ç½®..." name="Search / Replace..."/>
+ <menu_item_call label="è¡Œã«ç§»å‹•..." name="Go to line..."/>
</menu>
<menu label="ヘルプ" name="Help">
<menu_item_call label="ヘルプ..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
new file mode 100644
index 00000000000..34763f78c12
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
+ <text name="color trans">
+ é€éŽåº¦ %
+ </text>
+ <text name="glow label">
+ ã‚°ãƒãƒ¼
+ </text>
+ <check_box label="明るã•å…¨é–‹" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="æ質" name="Materials"/>
+ <combo_box.item label="メディア" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="テクスãƒãƒ£ (æ‹¡æ•£)" name="Texture (diffuse)"/>
+ <combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
+ <combo_box.item label="è¼ã (åå°„)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="テクスãƒãƒ£" name="texture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
+ <text name="label alphamode">
+ アルファモード
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="ãªã—" name="None"/>
+ <combo_box.item label="アルファブレンディング" name="Alpha blending"/>
+ <combo_box.item label="アルファマスã‚ング" name="Alpha masking"/>
+ <combo_box.item label="放射状マスク" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ マスクカットオフ
+ </text>
+ <texture_picker label="テクスãƒãƒ£" name="bumpytexture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
+ <text name="label bumpiness">
+ 凹凸
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="ãªã—" name="None"/>
+ <combo_box.item label="明るã•" name="Brightness"/>
+ <combo_box.item label="æš—ã•" name="Darkness"/>
+ <combo_box.item label="木目調" name="woodgrain"/>
+ <combo_box.item label="ãƒãƒ¼ã‚¯" name="bark"/>
+ <combo_box.item label="レンガ" name="bricks"/>
+ <combo_box.item label="市æ¾æ¨¡æ§˜" name="checker"/>
+ <combo_box.item label="コンクリート" name="concrete"/>
+ <combo_box.item label="å …ã„タイル" name="crustytile"/>
+ <combo_box.item label="カットストーン" name="cutstone"/>
+ <combo_box.item label="円æ¿" name="discs"/>
+ <combo_box.item label="å°çŸ³" name="gravel"/>
+ <combo_box.item label="ペトリ皿" name="petridish"/>
+ <combo_box.item label="サイディング" name="siding"/>
+ <combo_box.item label="ストーンタイル" name="stonetile"/>
+ <combo_box.item label="化粧ã—ã£ãã„" name="stucco"/>
+ <combo_box.item label="サクション" name="suction"/>
+ <combo_box.item label="ウィーブ" name="weave"/>
+ </combo_box>
+ <texture_picker label="テクスãƒãƒ£" name="shinytexture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
+ <text name="label shininess">
+ è¼ã
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="ãªã—" name="None"/>
+ <combo_box.item label="低" name="Low"/>
+ <combo_box.item label="ä¸" name="Medium"/>
+ <combo_box.item label="高" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ 光沢度
+ </text>
+ <text name="label environment">
+ 環境
+ </text>
+ <text name="label shinycolor">
+ 色
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
+ <text name="media_info">
+ é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã® URL ãŒã‚‚ã—ã‚ã‚Œã°ã€ã“ã“ã«å…¥ã‚Šã¾ã™
+ </text>
+ <button label="é¸æŠž..." name="add_media" tool_tip="ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’è¿½åŠ ã—ã¾ã™"/>
+ <button label="削除" name="delete_media" tool_tip="ã“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’削除ã—ã¾ã™"/>
+ <button label="æƒãˆã‚‹" label_selected="メディアを一列ã«æƒãˆã¾ã™" name="button align" tool_tip="メディアテクスãƒãƒ£ã‚’一列ã«æƒãˆã‚‹ï¼ˆæœ€åˆã«èªã¿è¾¼ã‚€å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰"/>
+ <text name="tex gen">
+ マッピング
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="デフォルト" name="Default"/>
+ <combo_box.item label="å¹³é¢" name="Planar"/>
+ </combo_box>
+ <spinner label="水平スケール" name="TexScaleU"/>
+ <spinner label="垂直スケール" name="TexScaleV"/>
+ <spinner label="メーターã”ã¨ã«ç¹°ã‚Šè¿”ã™" name="rptctrl"/>
+ <spinner label="回転度" name="TexRot"/>
+ <spinner label="水平オフセット" name="TexOffsetU"/>
+ <spinner label="垂直オフセット" name="TexOffsetV"/>
+ <spinner label="水平スケール" name="bumpyScaleU"/>
+ <spinner label="垂直スケール" name="bumpyScaleV"/>
+ <spinner label="回転度" name="bumpyRot"/>
+ <spinner label="水平オフセット" name="bumpyOffsetU"/>
+ <spinner label="垂直オフセット" name="bumpyOffsetV"/>
+ <spinner label="水平スケール" name="shinyScaleU"/>
+ <spinner label="垂直スケール" name="shinyScaleV"/>
+ <spinner label="回転度" name="shinyRot"/>
+ <spinner label="水平オフセット" name="shinyOffsetU"/>
+ <spinner label="垂直オフセット" name="shinyOffsetV"/>
+ <check_box initial_value="false" label="å¹³é¢ã‚’æƒãˆã‚‹" name="checkbox planar align" 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 896ed556ae4..5c2e18df03f 100755
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<role_actions>
<action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã‚’è¿½åŠ ã€æŽ’除ã—ã€æ‹›å¾…状ãªã—ã«æ–°ãƒ¡ãƒ³ãƒãƒ¼ã®å‚åŠ ã‚’èªã‚る権é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Membership">
<action description="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«äººã‚’招待" longdescription="「役割ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ã€Œãƒ¡ãƒ³ãƒãƒ¼ã€ã‚¿ãƒ–内ã«ã‚る「招待ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’招待ã—ã¾ã™ã€‚" name="member invite" value="1"/>
@@ -25,7 +25,7 @@
</action_set>
<action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€åŒºç”»åã€å…¬é–‹è¨å®šã€æ¤œç´¢ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ç™»éŒ²ã€ç€åœ°ç‚¹ãªã‚‰ã³ã« TP ルートã®ã‚ªãƒ—ションを変更ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Identity">
<action description="ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã‚’切り替ãˆã‚«ãƒ†ã‚´ãƒªã‚’è¨å®š" longdescription="ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã«åˆ‡ã‚Šæ›¿ãˆã€ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–ã§åŒºç”»ã®ã‚«ãƒ†ã‚´ãƒªã‚’è¨å®šã—ã¾ã™ã€‚" name="land find places" value="17"/>
- <action description="区画åã€èª¬æ˜Žã€ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã®è¨å®šã‚’変更" longdescription="区画åã€èª¬æ˜Žã€ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã®è¨å®šã‚’変更ã—ã¾ã™ã€‚ ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land change identity" value="18"/>
+ <action description="区画åã€èª¬æ˜Žã€ãŠã‚ˆã³ã€ŒModerate コンテンツã€è¨å®šã‚’変更" longdescription="区画åã€èª¬æ˜Žã€ãŠã‚ˆã³ã€ŒModerate コンテンツã€è¨å®šã‚’変更ã—ã¾ã™ã€‚ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land change identity" value="18"/>
<action description="ç€åœ°ç‚¹ãŠã‚ˆã³ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ«ãƒ¼ãƒˆã‚’è¨å®š" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åŒºç”»ä¸Šã§ç€åœ°ç‚¹ã‚’è¨å®šã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šå¤–部ã‹ã‚‰ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®åˆ°ç€ä½ç½®ã‚’指定ã§ãã‚‹ã¨å…±ã«ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ«ãƒ¼ãƒˆã‚’è¨å®šã—ã¦ç´°ã‹ã制御ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æ“作ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land set landing point" value="19"/>
</action_set>
<action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã€Œã‚ªãƒ–ジェクトを作æˆã€ã€ã€Œåœ°å½¢ã‚’編集ã€ã€éŸ³æ¥½ã¨ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¨å®šãªã©ã€åŒºç”»ã®ã‚ªãƒ—ションã«é–¢é€£ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index b27904c4d74..ab2fd461ab4 100755
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
ãŠä½¿ã„ã®å¤ã„ビューワã§ã¯ Second Life ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。以下ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰æ–°ã—ã„ビューワをダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„：
http://secondlife.com/download
@@ -448,6 +451,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="SLappAgentRequestFriend">
フレンド登録リクエスト
</string>
+ <string name="SLappAgentRemoveFriend">
+ フレンドã®å‰Šé™¤
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
é–‰ã˜ã‚‹ （⌘W）
</string>
@@ -838,6 +844,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="multiple_textures">
複数
</string>
+ <string name="use_texture">
+ テクスãƒãƒ£ã‚’使用
+ </string>
<string name="texture_loading">
ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
</string>
@@ -937,6 +946,21 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="TeleportYourAgent">
ã‚ãªãŸã‚’テレãƒãƒ¼ãƒˆ
</string>
+ <string name="JoinAnExperience">
+ 体験ã«å‚åŠ ã™ã‚‹
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ 土地ã®ã‚¢ã‚¯ã‚»ã‚¹ãƒªã‚¹ãƒˆã‚’管ç†ã™ã‚‹ã¨ãã«ã‚¢ãƒ©ãƒ¼ãƒˆã‚’表示ã—ãªã„
+ </string>
+ <string name="OverrideYourAnimations">
+ デフォルトã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ç½®ãæ›ãˆ
+ </string>
+ <string name="ScriptReturnObjects">
+ ã‚ãªãŸã®ä»£ã‚ã‚Šã«ã‚ªãƒ–ジェクトを返å´
+ </string>
+ <string name="UnknownScriptPermission">
+ (ä¸æ˜Ž)!
+ </string>
<string name="SIM_ACCESS_PG">
General
</string>
@@ -1968,6 +1992,12 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD（å³ä¸‹ï¼‰
</string>
+ <string name="ATTACH_NECK">
+ 首
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ ã‚¢ãƒã‚¿ãƒ¼ã®ä¸å¤®
+ </string>
<string name="CursorPos">
[LINE] 行目ã€[COLUMN] 列目
</string>
@@ -2997,6 +3027,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="Hip Width">
è…°ã®å¹…
</string>
+ <string name="Hover">
+ ホãƒãƒ¼
+ </string>
<string name="In">
内å‘ã
</string>
@@ -5081,4 +5114,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="logging_calls_enabled_log_empty">
ãƒã‚°ã‚¤ãƒ³æ™‚ã®ä¼šè©±ã¯ã‚ã‚Šã¾ã›ã‚“。誰ã‹ã«ã”連絡ã—ãŸå¾Œã€ã¾ãŸã¯èª°ã‹ãŒã‚ãªãŸã«é€£çµ¡ã—ãŸå¾Œã€ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªãŒã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
</string>
+ <string name="loading_chat_logs">
+ ãƒãƒ¼ãƒ‰ä¸...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index d0892663420..47975a6386a 100755
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -7,7 +7,9 @@
ConstruÃdo com [COMPILER] versão [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em [HOSTNAME]</nolink>([HOSTIP])
+ Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 8823d04b624..998fa8b2d6d 100755
--- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR AUTORIZAÇÕES DE CONTEÚDO">
+<floater name="floaterbulkperms" title="AJUSTAR PERMISSÕES DE CONTEÚDO">
<floater.string name="nothing_to_modify_text">
A seleção não contém nenhum conteúdo editável.
</floater.string>
@@ -33,7 +33,7 @@
<button label="Tudo" label_selected="Todas" name="check_all"/>
<button label="Limpar" label_selected="Nenhuma" name="check_none"/>
<text name="newperms">
- Novas autorizações de conteúdo
+ Ajustar permissões de conteúdo para
</text>
<text name="GroupLabel">
Grupo:
@@ -49,6 +49,7 @@
<check_box label="Modificar" name="next_owner_modify"/>
<check_box label="Copiar" name="next_owner_copy"/>
<check_box initial_value="true" label="Transferir" name="next_owner_transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
- <button label="OK" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Aplicar" name="apply"/>
<button label="Cancelar" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_goto_line.xml b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
new file mode 100644
index 00000000000..f2ef825ba08
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR PARA A LINHA">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Ir para a linha
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 9f6a7a06ad0..e592b14fa7e 100755
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Traduzir conversa" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index d04cf2a173c..182f2513e0c 100755
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Exibir:
</text>
- <check_box label="Testar" name="show_world"/>
+ <check_box label="Mundo" name="show_world"/>
<check_box label="Apenas móveis" name="show_world_movables_only"/>
<check_box label="Navmesh" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
index cfd69158bca..61953f9f786 100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Congelar" name="Freeze..."/>
<menu_item_call label="Ejetar" name="Eject..."/>
<menu_item_call label="Depurar texturas" name="Debug..."/>
+ <menu_item_call label="Descartar XML" name="Dump XML"/>
<menu_item_call label="Mais zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
index 5b32784c323..2d4cd670e69 100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
<menu_item_call label="Depurar texturas" name="Debug..."/>
+ <menu_item_call label="Descartar XML" name="Dump XML"/>
<menu_item_call label="Largar" name="Drop"/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
index a4a26144c79..1af8d64438c 100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Congelar" name="Freeze..."/>
<menu_item_call label="Ejetar" name="Eject..."/>
<menu_item_call label="Depurar texturas" name="Debug..."/>
+ <menu_item_call label="Descartar XML" name="Dump XML"/>
<menu_item_call label="Mais zoom" name="Zoom In"/>
<menu_item_call label="Pagar" name="Pay..."/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index e84dcb093db..447b77657bf 100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
<menu_item_call label="Depurar texturas" name="Debug..."/>
+ <menu_item_call label="Descartar XML" name="Dump XML"/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
index 01316b887d4..2dd150a61ef 100644
--- a/indra/newview/skins/default/xui/pt/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Encerrar conversa" name="close_conversation"/>
<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+ <menu_item_call label="Fechar selecionados" name="close_selected_conversations"/>
<menu_item_call label="Exibir perfil" name="view_profile"/>
<menu_item_call label="MI" name="im"/>
<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml
index 9182ce321af..2ebe85df6e3 100755
--- a/indra/newview/skins/default/xui/pt/menu_land.xml
+++ b/indra/newview/skins/default/xui/pt/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Comprar passe" name="Land Buy Pass"/>
<menu_item_call label="Construir" name="Create"/>
<menu_item_call label="Editar a topografia" name="Edit Terrain"/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index be94ad49dbe..cd840f3137f 100755
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -17,7 +17,13 @@
<menu_item_call label="Mostrar TOS" name="TOS"/>
<menu_item_call label="Mostrar mensagem crÃtica" name="Critical"/>
<menu_item_call label="Test de Bugs de Conteúdo Web" name="Web Content Floater Debug Test"/>
- <menu label="Configurar nÃvel de registro em log" name="Set Logging Level"/>
+ <menu label="Configurar nÃvel de registro em log" name="Set Logging Level">
+ <menu_item_check label="Depurar" name="Debug"/>
+ <menu_item_check label="Info" name="Info"/>
+ <menu_item_check label="Aviso" name="Warning"/>
+ <menu_item_check label="Erro" name="Error"/>
+ <menu_item_check label="Nenhum" name="None"/>
+ </menu>
<menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/>
<menu_item_call label="Exibir painel de notificações" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_mute_particle.xml b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
new file mode 100644
index 00000000000..be13c66d7a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index 28dd9febe24..a552a5de5aa 100755
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -5,13 +5,13 @@
</menu_item_call>
<menu_item_call label="Editar" name="Edit..."/>
<menu_item_call label="Construir" name="Build"/>
- <menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
- <menu_item_call label="Exibir em personagens" name="show_in_characters"/>
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Sentar aqui" name="Object Sit"/>
<menu_item_call label="Ficar de pé" name="Object Stand Up"/>
<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
<menu_item_call label="Mais zoom" name="Zoom In"/>
+ <menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
+ <menu_item_call label="Exibir em personagens" name="show_in_characters"/>
<context_menu label="Colocar no(a)" name="Put On">
<menu_item_call label="Vestir" name="Wear"/>
<menu_item_call label="Adicionar" name="Add"/>
@@ -28,4 +28,5 @@
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Comprar" name="Buy..."/>
<menu_item_call label="Excluir" name="Delete"/>
+ <menu_item_call label="Bloquear proprietário da partÃcula" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index aa0a4264054..102df18b28c 100755
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Exibir perfil" name="show_agent"/>
<menu_item_call label="Enviar MI..." name="send_im"/>
<menu_item_call label="Adicionar amigo..." name="add_friend"/>
+ <menu_item_call label="Remover amigo..." name="remove_friend"/>
<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index 247a92567af..2cd0f52ef31 100755
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Perfil do objeto..." name="show_object"/>
+ <menu_item_call label="Bloquear..." name="block_object"/>
<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 15814fed4cf..e6eceb5f2fd 100755
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
</menu>
- <menu label="Status" name="Status"/>
+ <menu label="Status" name="Status">
+ <menu_item_check label="Ausente" name="Away"/>
+ <menu_item_check label="Não perturbe" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
<menu_item_call label="Caixa de saÃda do lojista..." name="MerchantOutbox"/>
<menu_item_call label="Painel da conta..." name="Manage My Account">
@@ -32,6 +35,7 @@
<menu_item_check label="Conversas..." name="Conversations"/>
<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
<menu_item_check label="Falar" name="Speak"/>
+ <menu_item_check label="Registro de conversas..." name="Conversation Log..."/>
<menu label="Distorção de voz" name="VoiceMorphing">
<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
<menu_item_check label="Visualizar..." name="Preview"/>
@@ -42,6 +46,7 @@
<menu_item_check label="Grupos" name="My Groups"/>
<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
<menu_item_call label="Lista de bloqueados" name="Block List"/>
+ <menu_item_check label="Não perturbe" name="Do Not Disturb"/>
</menu>
<menu label="Mundo" name="World">
<menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
@@ -110,6 +115,7 @@
<menu_item_call label="Incluir próxima parte" name="Include Next Part"/>
<menu_item_call label="Incluir parte anterior" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Enfocar seleção" name="Focus on Selection"/>
<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
<menu label="Objeto:" name="Object">
@@ -273,6 +279,7 @@
<menu_item_check label="Camera Offset" name="Camera Offset"/>
<menu_item_check label="Taxa de quadros aleatória" name="Randomize Framerate"/>
<menu_item_check label="Frame Test" name="Frame Test"/>
+ <menu_item_call label="Perfil do quadro" name="Frame Profile"/>
</menu>
<menu label="Render Metadata" name="Render Metadata">
<menu_item_check label="Normais" name="Normals"/>
@@ -293,15 +300,15 @@
</menu>
<menu label="Rendering" name="Rendering">
<menu_item_check label="Axes" name="Axes"/>
+ <menu_item_call label="Informações sobre o material selecionado" name="Selected Material Info"/>
<menu_item_check label="Wireframe" name="Wireframe"/>
- <menu_item_check label="Iluminação e sombras" name="Advanced Lighting Model"/>
+ <menu_item_check label="Modelo avançado de luzes" name="Advanced Lighting Model"/>
<menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/>
<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="Atlas texturizado (fase experimental)" name="Texture Atlas"/>
<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"/>
@@ -320,7 +327,6 @@
<menu_item_call label="Teste de mÃdia do navegador" name="Web Browser Test"/>
<menu_item_call label="Navegador de conteúdo web" name="Web Content Browser"/>
<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
- <menu_item_call label="Dados de memória" name="Memory Stats"/>
<menu_item_check label="Console de depuração de região" name="Region Debug Console"/>
<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index d9f5e48745d..d5096ec8586 100755
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -209,6 +209,14 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sà mesmo --
Adicionar esta habilidade a '[ROLE_NAME]'?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Você está prestes a expulsar [AVATAR_NAME] do grupo.
+ <usetemplate ignoretext="Confirmar expulsão de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Você está prestes a expulsar [COUNT] membros do grupo.
+ <usetemplate ignoretext="Confirmar expulsão de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+ </notification>
<notification name="AttachmentDrop">
Você está prestes a largar seu anexo.
Tem certeza de que quer prosseguir?
@@ -1105,9 +1113,9 @@ em TODOS OS TERRENOS deste sim?
Por favor, insira um valor maior.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Pelo menos um dos itens possui links que levam a ele. Ao excluir o item, os links não funcionarão mais. Por isso, recomendamos excluir os links primeiro.
+ Pelo menos um dos itens possui links que levam a ele. Ao excluir o item, os links não funcionarão mais. Por isso, recomendamos excluir os links primeiro.
-Tem certeza de que quer excluir estes items?
+Tem certeza de que quer excluir estes itens?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmObjectDeleteLock">
@@ -1123,9 +1131,9 @@ Tem certeza de que deseja apagar estes itens?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectDeleteNoOwn">
- Você não é proprietário de pelo menos um dos itens selecionados.
+ Ao menos um dos itens selecionados não é seu.
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1135,22 +1143,26 @@ Tem certeza de que deseja apagar estes itens?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoOwn">
- Pelo menos um dos objetos está trancado ou não é de sua posse.
+ Ao menos um objeto está bloqueado.
+Ao menos um objeto não é seu.
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectDeleteNoCopyNoOwn">
- Pelo menos um dos objetos não é copiável ou não é de sua posse.
+ Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
- Pelo menos um dos objetos está trancado, não é copiável ou você não o possui.
+ Ao menos um objeto está bloqueado.
+Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
-Tem certeza de que deseja apagar estes itens?
- <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
+Tem certeza de que quer excluir estes itens?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/>
</notification>
<notification name="ConfirmObjectTakeLock">
Pelo menos um dos objetos está trancado.
@@ -1468,13 +1480,43 @@ Versão [VERSION] [[RELEASE_NOTES_FULL_URL] sobre esta atualização]
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
O software requer uma atualização que já foi baixada.
-Versão [VERSION]
+Versão [VERSION] Informação [[INFO_URL] sobre essa atualização]
Para instalar a atualização, será preciso reiniciar o [APP_NAME].
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+Informação [[INFO_URL] sobre essa atualização]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION]
+O visualizador experimental foi substituÃdo por um visualizador [NEW_CHANNEL];
+consulte [[INFO_URL] para obter mais detalhes sobre essa atualização]
+ <usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION]
+O visualizador experimental foi substituÃdo por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+ <usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ O software requer uma atualização que já foi baixada.
+Versão [VERSION]
+O visualizador experimental foi substituÃdo por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+
+Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+O visualizador experimental foi substituÃdo por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1524,6 +1566,10 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
Você é atualmente um membro do grupo
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Não foi possÃvel deixar o grupo. Você não pode deixar o grupo pois é o último proprietário dele. Primeiramente, atribua outro membro à função de proprietário.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Tem CERTEZA de que deseja expulsar todos os residentes do grid?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/>
@@ -2384,9 +2430,7 @@ Selecione só um objeto.
e selecionar 'Teletransportar'.)
</notification>
<notification name="TeleportToPerson">
- Para entrar em contato com residentes como '[NAME]', clique no botão "Pessoas", selecione um residente na janela que é exibida e clique em 'MI' na
- parte inferior da janela.
- (Também é possÃvel clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar 'MI'.)
+ Para iniciar uma conversa particular com alguém, clique com o botão direito no avatar e selecione "MI" no menu.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
ImpossÃvel selecionar terra nas fronteiras do servidor. Tente selecionar um pedaço menor de terra.
@@ -2757,6 +2801,15 @@ Não conceda acesso se você não entender completamente por que ele deseja aces
<button name="Deny" text="Negar"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ A permissão de script de tempo de execução solicitada por '<nolink>[OBJECTNAME]</nolink>', um objeto de '[NAME]', não é reconhecida pelo visualizador e não pode ser concedida.
+
+Para conceder essa permissão, atualize seu visualizador para a versão mais recente em [DOWNLOADURL].
+ <form name="form">
+ <button name="Deny" text="Ok"/>
+ <button name="Mute" text="Bloquear"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
'<nolink>[TITLE]</nolink>' de [NAME]
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index babb48c208f..205fd6b97dd 100755
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -49,6 +49,9 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
</panel>
+ <text name="groupcount">
+ Você pertence a [COUNT] grupos e pode entrar em mais [REMAINING].
+ </text>
</panel>
<panel label="RECENTE" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index baf14c2c23f..89f1e076479 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat" name="chat">
- <panel>
- <check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
- <check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+ <panel name="general_chat_settings">
+ <check_box initial_value="true" label="Executar animação de digitação durante o bate-papo" name="play_typing_animation"/>
+ <check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
<text name="font_size">
Tamanho da fonte:
@@ -12,62 +12,74 @@
<item label="Médio" name="Medium" value="1"/>
<item label="Grande" name="Large" value="2"/>
</combo_box>
- <check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+ <check_box label="Balão de conversa" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Notificações
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
MIs de amigos:
</text>
<combo_box name="FriendIMOptions">
<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
- <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
- <item label="Nenhum" name="None" value="none"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Executar som" name="play_sound_friend_im"/>
<text name="non_friend_ims">
MIs de não amigos:
</text>
<combo_box name="NonFriendIMOptions">
<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
- <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
- <item label="Nenhum" name="None" value="none"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Executar som" name="play_sound_non_friend_im"/>
<text name="conference_ims">
MIs de conferências:
</text>
<combo_box name="ConferenceIMOptions">
<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
- <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
- <item label="Nenhum" name="None" value="none"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Executar som" name="play_sound_conference_im"/>
<text name="group_chat">
- Bate-papo de grupo:
+ Conversa em grupo:
</text>
<combo_box name="GroupChatOptions">
<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
- <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
- <item label="Nenhum" name="None" value="none"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Executar som" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
- Bate-papo local:
+ Conversa local:
</text>
<combo_box name="NearbyChatOptions">
<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
- <item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
- <item label="Nenhum" name="None" value="none"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Executar som" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ MIs de objetos:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+ <item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+ <item label="Nenhuma ação" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Executar som" name="play_sound_object_im"/>
<text name="notifications_alert">
Para interromper temporariamente todas as notificações, use Comunicar > Não perturbe.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Executar som:
</text>
@@ -76,7 +88,7 @@
<check_box label="Oferta de teletransporte" name="teleport_offer"/>
<check_box label="Oferta de inventário" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="Limpar registro..." name="clear_log"/>
<button label="Excluir transcrições..." name="delete_transcripts"/>
<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 28e71843267..37e8838bf43 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -31,7 +31,7 @@ rápido
<check_box initial_value="verdadeiro" label="Luzes locais" name="LocalLights"/>
<check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/>
<check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="verdadeiro" label="Iluminação e sombras" name="UseLightShaders"/>
+ <check_box initial_value="verdadeiro" label="Modelo avançado de luzes" name="UseLightShaders"/>
<check_box initial_value="verdadeiro" label="Oclusão ambiental" name="UseSSAO"/>
<check_box initial_value="verdadeiro" label="Profundidade" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index ebbd63138a5..887d0cfe98c 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
<combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
</combo_box>
+ <check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Configurações de proxy:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
index de02aafe2fd..39bb5edc754 100755
--- a/indra/newview/skins/default/xui/pt/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Selecionar tudo" name="Select All"/>
<menu_item_call label="Desmarcar" name="Deselect"/>
<menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/>
+ <menu_item_call label="Ir para a linha..." name="Go to line..."/>
</menu>
<menu label="Ajuda" name="Help">
<menu_item_call label="ajuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
new file mode 100644
index 00000000000..03da89dd3bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Selecionar a cor"/>
+ <text name="color trans">
+ % de transparência
+ </text>
+ <text name="glow label">
+ Brilho
+ </text>
+ <check_box label="Completamente luminoso" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Materiais" name="Materials"/>
+ <combo_box.item label="MÃdia" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Textura (difusa)" name="Texture (diffuse)"/>
+ <combo_box.item label="Relevo (normal)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Brilho (especular)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
+ <text name="label alphamode">
+ Modo alpha
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Nenhum" name="None"/>
+ <combo_box.item label="Mistura alpha" name="Alpha blending"/>
+ <combo_box.item label="Máscara alpha" name="Alpha masking"/>
+ <combo_box.item label="Máscara emissiva" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ Corte da máscara
+ </text>
+ <texture_picker label="Textura" name="bumpytexture control" tool_tip="Selecionar imagem"/>
+ <text name="label bumpiness">
+ Relevo
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Nenhum" name="None"/>
+ <combo_box.item label="Luminosidade" name="Brightness"/>
+ <combo_box.item label="Escuridão" name="Darkness"/>
+ <combo_box.item label="grão de madeira" name="woodgrain"/>
+ <combo_box.item label="casca de árvore" name="bark"/>
+ <combo_box.item label="tijolos" name="bricks"/>
+ <combo_box.item label="quadriculado" name="checker"/>
+ <combo_box.item label="concreto" name="concrete"/>
+ <combo_box.item label="ladrilho rÃspido" name="crustytile"/>
+ <combo_box.item label="pedra talhada" name="cutstone"/>
+ <combo_box.item label="discos" name="discs"/>
+ <combo_box.item label="cascalho" name="gravel"/>
+ <combo_box.item label="placa de petri" name="petridish"/>
+ <combo_box.item label="desvio" name="siding"/>
+ <combo_box.item label="ladrilho de pedra" name="stonetile"/>
+ <combo_box.item label="estuque" name="stucco"/>
+ <combo_box.item label="sucção" name="suction"/>
+ <combo_box.item label="tecelagem" name="weave"/>
+ </combo_box>
+ <texture_picker label="Textura" name="shinytexture control" tool_tip="Selecionar imagem"/>
+ <text name="label shininess">
+ Brilho
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Nenhum" name="None"/>
+ <combo_box.item label="Baixo" name="Low"/>
+ <combo_box.item label="Médio" name="Medium"/>
+ <combo_box.item label="Alto" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Acetinação
+ </text>
+ <text name="label environment">
+ Ambiente
+ </text>
+ <text name="label shinycolor">
+ Cor
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Selecionar a cor"/>
+ <text name="media_info">
+ A URL da mÃdia escolhida, caso haja, é inserida aqui
+ </text>
+ <button label="Selecionar..." name="add_media" tool_tip="Adicionar mÃdia"/>
+ <button label="Remover" name="delete_media" tool_tip="Excluir esta textura de mÃdia"/>
+ <button label="Alinhar" label_selected="Alinhar mÃdia" name="button align" tool_tip="Alinhar texturas de mÃdia (após carregar mÃdia)"/>
+ <text name="tex gen">
+ Mapeamento
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Padrão" name="Default"/>
+ <combo_box.item label="Planar" name="Planar"/>
+ </combo_box>
+ <spinner label="Escala horizontal" name="TexScaleU"/>
+ <spinner label="Escala vertical" name="TexScaleV"/>
+ <spinner label="Repetições por metro" name="rptctrl"/>
+ <spinner label="Graus de rotação" name="TexRot"/>
+ <spinner label="Offset horizontal" name="TexOffsetU"/>
+ <spinner label="Offset vertical" name="TexOffsetV"/>
+ <spinner label="Escala horizontal" name="bumpyScaleU"/>
+ <spinner label="Escala vertical" name="bumpyScaleV"/>
+ <spinner label="Graus de rotação" name="bumpyRot"/>
+ <spinner label="Offset horizontal" name="bumpyOffsetU"/>
+ <spinner label="Offset vertical" name="bumpyOffsetV"/>
+ <spinner label="Escala horizontal" name="shinyScaleU"/>
+ <spinner label="Escala vertical" name="shinyScaleV"/>
+ <spinner label="Graus de rotação" name="shinyRot"/>
+ <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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 21b085431e4..e45a3bd21f0 100755
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem & opções de rota de TP." name="Parcel Identity">
<action description="Alternar 'Exibir nos resultados de busca' e selecionar a categoria" longdescription="Alterne entre 'Exibir nos resultados de busca' ou não, e selecione a categoria do terreno em 'Sobre o terreno'." name="land find places" value="17"/>
- <action description="Mude o nome, a descrição e a exibição do terreno nos resultados de busca." longdescription="Mude o nome, a descrição e a exibição do terreno nos resultados de busca. Veja essas opções em Sobre o terreno > guia Opções." name="land change identity" value="18"/>
+ <action description="Alterar nome da parcela, descrição e configurações de "Conteúdo moderado"" longdescription="Altere o nome da parcela, descrição e configurações de "Conteúdo moderado". Isso é feito em Sobre o terreno > guia Opções." name="land change identity" value="18"/>
<action description="Definir ponto de aterrissagem e rota de teletransporte" longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno > aba Opções." name="land set landing point" value="19"/>
</action_set>
<action_set description="Estas habilidade incluem poderes que afetam opções de parcela, como 'Criar objetos', 'Editar terreno' e música & configurações de mÃdia." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 4bf18aab705..adc3ee14e02 100755
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -130,6 +130,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
O visualizador utilizado já não é compatÃvel com o Second Life. Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -400,6 +403,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="SLappAgentRequestFriend">
Pedido de amizade
</string>
+ <string name="SLappAgentRemoveFriend">
+ Remoção de amigo
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Fechar (⌘W)
</string>
@@ -787,6 +793,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="multiple_textures">
Múltiplo
</string>
+ <string name="use_texture">
+ Usar textura
+ </string>
<string name="texture_loading">
Carregando...
</string>
@@ -883,6 +892,21 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="TeleportYourAgent">
Teletransportá-lo
</string>
+ <string name="JoinAnExperience">
+ Participar de uma experiência
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Suprimir alertas ao gerenciar listas de acesso ao terreno
+ </string>
+ <string name="OverrideYourAnimations">
+ Substituir suas animações padrão
+ </string>
+ <string name="ScriptReturnObjects">
+ Retornar objetos em seu nome
+ </string>
+ <string name="UnknownScriptPermission">
+ (desconhecido)!
+ </string>
<string name="SIM_ACCESS_PG">
Público geral
</string>
@@ -1908,6 +1932,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="ATTACH_HUD_BOTTOM_RIGHT">
HUD direito inferior
</string>
+ <string name="ATTACH_NECK">
+ Pescoço
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Centro do avatar
+ </string>
<string name="CursorPos">
Linha [LINE], Coluna [COLUMN]
</string>
@@ -2894,6 +2924,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Hip Width">
Largura do quadril
</string>
+ <string name="Hover">
+ Pairar
+ </string>
<string name="In">
Dentro
</string>
@@ -4951,4 +4984,7 @@ Tente colocar o caminho do editor entre aspas.
<string name="logging_calls_enabled_log_empty">
Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
</string>
+ <string name="loading_chat_logs">
+ Carregando...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 2b2b3cf4533..9494106e96f 100755
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -9,6 +9,8 @@
</floater.string>
<floater.string name="AboutPosition">
Ð’Ñ‹ в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», раÑположенном на <nolink>[HOSTNAME]</nolink> ([HOSTIP])
+SLURL: <nolink>[SLURL]</nolink>
+(глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 ccf13cf02ab..31fc1c5ed35 100755
--- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="ИЗМЕÐИТЬ Ð ÐЗРЕШЕÐИЯ ÐРИСПОЛЬЗОВÐÐИЕ КОÐТЕÐТÐ">
+<floater name="floaterbulkperms" title="ÐÐСТРОИТЬ Ð ÐЗРЕШЕÐИЯ ÐРИСПОЛЬЗОВÐÐИЕ КОÐТЕÐТÐ">
<floater.string name="nothing_to_modify_text">
Ð’ выбранной облаÑти нет контента, который можно изменÑÑ‚ÑŒ.
</floater.string>
@@ -24,7 +24,7 @@
<button label="√ Ð’Ñе" name="check_all"/>
<button label="ОчиÑтить" label_selected="Ðет" name="check_none"/>
<text name="newperms">
- Ðовые Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð½Ð° контент
+ ÐаÑтроить Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð½Ð° иÑпользование контента:
</text>
<text name="GroupLabel">
Группа:
@@ -40,6 +40,7 @@
<check_box label="ИзменÑÑ‚ÑŒ" name="next_owner_modify"/>
<check_box label="Копировать" name="next_owner_copy"/>
<check_box initial_value="иÑтина" label="Передать" name="next_owner_transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
- <button label="ОК" name="apply"/>
+ <button label="OK" name="ok"/>
+ <button label="Применить" name="apply"/>
<button label="Отмена" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_goto_line.xml b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
new file mode 100644
index 00000000000..51caaa471df
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ПЕРЕЙТИ ÐРСТРОКУ">
+ <button label="OK" label_selected="OK" name="goto_btn"/>
+ <text name="txt">
+ Перейти на Ñтроку
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index ea110ffb44a..d4ca04b88b5 100755
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Переводить чат" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Переводить чат" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index 8faddb18058..fa72df04fdc 100755
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Показать:
</text>
- <check_box label="ТеÑÑ‚" name="show_world"/>
+ <check_box label="Мир" name="show_world"/>
<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
<check_box label="ÐÐ°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ñетка" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
index fb1c24448bd..76acb32a641 100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Заморозить" name="Freeze..."/>
<menu_item_call label="Выкинуть" name="Eject..."/>
<menu_item_call label="Отладка текÑтур" name="Debug..."/>
+ <menu_item_call label="Вывод XML" name="Dump XML"/>
<menu_item_call label="Приблизить" name="Zoom In"/>
<menu_item_call label="Заплатить" name="Pay..."/>
<menu_item_call label="Профиль объекта" name="Object Inspect"/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
index f241b488712..2b1291a8d5f 100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
<menu_item_call label="Отладка текÑтур" name="Debug..."/>
+ <menu_item_call label="Вывод XML" name="Dump XML"/>
<menu_item_call label="БроÑить" name="Drop"/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
index fb283c9d800..dfe3c2e7011 100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Заморозить" name="Freeze..."/>
<menu_item_call label="Выкинуть" name="Eject..."/>
<menu_item_call label="Отладка текÑтур" name="Debug..."/>
+ <menu_item_call label="Вывод XML" name="Dump XML"/>
<menu_item_call label="Приблизить" name="Zoom In"/>
<menu_item_call label="Заплатить" name="Pay..."/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
index b72f3dcc427..e09117226ce 100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
<menu_item_call label="Отладка текÑтур" name="Debug..."/>
+ <menu_item_call label="Вывод XML" name="Dump XML"/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
index 530b1ea704e..4d1240db988 100644
--- a/indra/newview/skins/default/xui/ru/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Закрыть разговор" name="close_conversation"/>
<menu_item_call label="Открыть голоÑовой чат" name="open_voice_conversation"/>
<menu_item_call label="Прекратить голоÑовой чат" name="disconnect_from_voice"/>
+ <menu_item_call label="Закрыть выбранные" name="close_selected_conversations"/>
<menu_item_call label="Смотреть профиль" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml
index 89889d7bf64..5aa4e6ccd2f 100755
--- a/indra/newview/skins/default/xui/ru/menu_land.xml
+++ b/indra/newview/skins/default/xui/ru/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Купить пропуÑк" name="Land Buy Pass"/>
<menu_item_call label="СтроительÑтво" name="Create"/>
<menu_item_call label="Изменить ландшафт" name="Edit Terrain"/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 93a5ffbb25f..835c4e186e8 100755
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="Показать лицензионное Ñоглашение" name="TOS"/>
<menu_item_call label="Показать Ñообщение об ошибке" name="Critical"/>
<menu_item_call label="ТеÑÑ‚ отладки плавающего окна Ñ Ð²ÐµÐ±-контентом" name="Web Content Floater Debug Test"/>
- <menu label="Уровень журнала" name="Set Logging Level"/>
+ <menu label="Уровень журнала" name="Set Logging Level">
+ <menu_item_check label="Отладка" name="Debug"/>
+ <menu_item_check label="ИнформациÑ" name="Info"/>
+ <menu_item_check label="Внимание!" name="Warning"/>
+ <menu_item_check label="Ошибка" name="Error"/>
+ <menu_item_check label="Ðет" name="None"/>
+ </menu>
<menu_item_check label="Выбор Ñетки" name="Show Grid Picker"/>
<menu_item_call label="КонÑоль уведомлений" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_mute_particle.xml b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
new file mode 100644
index 00000000000..0c5a1474198
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index 288df3beb92..056dab74c14 100755
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -3,13 +3,13 @@
<menu_item_call label="КоÑнутьÑÑ" name="Object Touch"/>
<menu_item_call label="Изменить" name="Edit..."/>
<menu_item_call label="СтроительÑтво" name="Build"/>
- <menu_item_call label="Показывать в наборах ÑвÑзей" name="show_in_linksets"/>
- <menu_item_call label="Показывать в перÑонажах" name="show_in_characters"/>
<menu_item_call label="Открыто" name="Open"/>
<menu_item_call label="СеÑÑ‚ÑŒ здеÑÑŒ" name="Object Sit"/>
<menu_item_call label="Ð’Ñтать" name="Object Stand Up"/>
<menu_item_call label="Профиль объекта" name="Object Inspect"/>
<menu_item_call label="Приблизить" name="Zoom In"/>
+ <menu_item_call label="Показывать в наборах ÑвÑзей" name="show_in_linksets"/>
+ <menu_item_call label="Показывать в перÑонажах" name="show_in_characters"/>
<context_menu label="Ðадеть" name="Put On">
<menu_item_call label="Ðадеть" name="Wear"/>
<menu_item_call label="Добавить" name="Add"/>
@@ -26,4 +26,5 @@
<menu_item_call label="Заплатить" name="Pay..."/>
<menu_item_call label="Купить" name="Buy..."/>
<menu_item_call label="Удалить" name="Delete"/>
+ <menu_item_call label="Блокировать владельца учаÑтка" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 230d049fad6..fcd1fe310db 100755
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Смотреть профиль" name="show_agent"/>
<menu_item_call label="Отправить Ñообщение..." name="send_im"/>
<menu_item_call label="Добавить в друзьÑ..." name="add_friend"/>
+ <menu_item_call label="Удалить из друзей..." name="remove_friend"/>
<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
<menu_item_call label="Копировать URL-Ð°Ð´Ñ€ÐµÑ SL в буфер обмена" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 1326db708e5..4f5361b2e36 100755
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Профиль объекта..." name="show_object"/>
+ <menu_item_call label="Блокировать..." name="block_object"/>
<menu_item_call label="Показать на карте" name="show_on_map"/>
<menu_item_call label="Телепорт в меÑтоположение объекта" name="teleport_to_object"/>
<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 92a9943b937..fcb7c4e5310 100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="ОÑтановить анимацию" name="Stop Animating My Avatar"/>
<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
</menu>
- <menu label="СтатуÑ" name="Status"/>
+ <menu label="СтатуÑ" name="Status">
+ <menu_item_check label="Ðет на меÑте" name="Away"/>
+ <menu_item_check label="Ðе беÑпокоить" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
<menu_item_call label="Торговые иÑходÑщие..." name="MerchantOutbox"/>
<menu_item_call label="Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ аккаунта..." name="Manage My Account"/>
@@ -30,6 +33,7 @@
<menu_item_check label="Разговоры..." name="Conversations"/>
<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
<menu_item_check label="Говорить" name="Speak"/>
+ <menu_item_check label="Журнал разговора..." name="Conversation Log..."/>
<menu label="Изменение голоÑа" name="VoiceMorphing">
<menu_item_check label="Без Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð³Ð¾Ð»Ð¾Ñа" name="NoVoiceMorphing"/>
<menu_item_check label="ПроÑмотр..." name="Preview"/>
@@ -40,6 +44,7 @@
<menu_item_check label="Группы" name="My Groups"/>
<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
<menu_item_call label="Черный ÑпиÑок" name="Block List"/>
+ <menu_item_check label="Ðе беÑпокоить" name="Do Not Disturb"/>
</menu>
<menu label="Мир" name="World">
<menu_item_call label="Добавить закладку на Ñто меÑто" name="Create Landmark Here"/>
@@ -108,13 +113,13 @@
<menu_item_call label="Включить Ñледующую" name="Include Next Part"/>
<menu_item_call label="Включить предыдущую" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Ðаборы ÑвÑзей..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Ð¤Ð¾ÐºÑƒÑ Ð½Ð° выбранном" name="Focus on Selection"/>
<menu_item_call label="Приблизить к выбранному" name="Zoom to Selection"/>
<menu label="Объект" name="Object">
<menu_item_call label="Купить" name="Menu Object Buy"/>
<menu_item_call label="ВзÑÑ‚ÑŒ" name="Menu Object Take"/>
<menu_item_call label="ВзÑÑ‚ÑŒ копию" name="Take Copy"/>
- <menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
</menu>
@@ -270,6 +275,7 @@
<menu_item_check label="Ð¡Ð»ÑƒÑ‡Ð°Ð¹Ð½Ð°Ñ Ñ‡Ð°Ñтота кадров" name="Randomize Framerate"/>
<menu_item_check label="ПериодичеÑкое замедление кадров" name="Periodic Slow Frame"/>
<menu_item_check label="ТеÑÑ‚ кадров" name="Frame Test"/>
+ <menu_item_call label="Профиль кадра" name="Frame Profile"/>
</menu>
<menu label="Визуализировать метаданные" name="Render Metadata">
<menu_item_check label="Рамки" name="Bounding Boxes"/>
@@ -304,9 +310,10 @@
<menu_item_check label="ОÑи" name="Axes"/>
<menu_item_check label="КаÑательный базиÑ" name="Tangent Basis"/>
<menu_item_call label="Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ñ‚ÐµÐºÑтура в оÑнове" name="Selected Texture Info Basis"/>
+ <menu_item_call label="Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ выбранном материале" name="Selected Material Info"/>
<menu_item_check label="КаркаÑ" name="Wireframe"/>
<menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/>
- <menu_item_check label="ОÑвещение и тени" name="Advanced Lighting Model"/>
+ <menu_item_check label="РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ" name="Advanced Lighting Model"/>
<menu_item_check label="Тени от Ñолнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO и Ñглаживание теней" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="Отладка GL" name="Debug GL"/>
@@ -316,7 +323,6 @@
<menu_item_check label="ТекÑтуры анимаций" name="Animation Textures"/>
<menu_item_check label="Отключить текÑтуры" name="Disable Textures"/>
<menu_item_check label="ТекÑтуры в полном разрешении" name="Rull Res Textures"/>
- <menu_item_check label="ÐÑ‚Ð»Ð°Ñ Ñ‚ÐµÐºÑтур (ÑкÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ)" name="Texture Atlas"/>
<menu_item_check label="Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñоединенных иÑточников Ñвета" name="Render Attached Lights"/>
<menu_item_check label="Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñоединенных чаÑтиц" name="Render Attached Particles"/>
<menu_item_check label="ПарÑщие ÑветÑщиеÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹" name="Hover Glow Objects"/>
@@ -352,7 +358,6 @@
<menu_item_call label="Вывод ÑредÑтва фокуÑировки" name="Dump Focus Holder"/>
<menu_item_call label="Печать информации о выбранных объектах" name="Print Selected Object Info"/>
<menu_item_call label="Печать информации об агенте" name="Print Agent Info"/>
- <menu_item_call label="СтатиÑтичеÑÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ памÑти" name="Memory Stats"/>
<menu_item_check label="КонÑоль отладки региона" name="Region Debug Console"/>
<menu_item_check label="Отладка SelectMgr" name="Debug SelectMgr"/>
<menu_item_check label="Отладка щелчков мышью" name="Debug Clicks"/>
@@ -386,7 +391,6 @@
</menu>
<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
<menu_item_check label="Данные об анимации" name="Animation Info"/>
- <menu_item_check label="ÐÐ½Ð¸Ð¼Ð°Ñ†Ð¸Ñ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ñ… движений" name="Slow Motion Animations"/>
<menu_item_check label="Показать взглÑд" name="Show Look At"/>
<menu_item_check label="Показать указание" name="Show Point At"/>
<menu_item_check label="Отладка обновленных движений ÑуÑтавов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 00ab0b57633..1dc8202b00c 100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -210,6 +210,14 @@
Добавить Ñту ÑпоÑобноÑÑ‚ÑŒ к роли «[ROLE_NAME]»?
<usetemplate name="okcancelbuttons" notext="Ðет" yestext="Да"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Ð’Ñ‹ ÑобираетеÑÑŒ иÑключить [AVATAR_NAME] из группы.
+ <usetemplate ignoretext="Подтвердите иÑключение учаÑтника из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Ð’Ñ‹ ÑобираетеÑÑŒ иÑключить [COUNT] учаÑтников из группы.
+ <usetemplate ignoretext="Подтвердите иÑключение учаÑтников из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+ </notification>
<notification name="AttachmentDrop">
Ð’Ñ‹ ÑобираетеÑÑŒ ÑброÑить Ñвое приÑоединение.
Продолжить?
@@ -1111,7 +1119,7 @@
Введите более выÑокую цену.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- ИмеетÑÑ ÑÑылка, ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ ÐºÐ°Ðº минимум на один из выбранных вами предметов. ЕÑли удалить Ñтот предмет, его ÑÑылки переÑтанут работать. ÐаÑтоÑтельно рекомендуетÑÑ Ñначала удалить ÑÑылки.
+ По крайней мере у одного предмета еÑÑ‚ÑŒ ÑÑылки, указывающие на него. ЕÑли удалить Ñтот предмет, его ÑÑылки переÑтанут работать. ÐаÑтоÑтельно рекомендуетÑÑ Ñначала удалить ÑÑылки.
ДейÑтвительно удалить Ñти предметы?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -1161,7 +1169,7 @@
Вы не владеете по крайней мере одним объектом.
ДейÑтвительно удалить Ñти предметы?
- <usetemplate name="okcancelbuttons" notext="отмена" yestext="OK"/>
+ <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
<notification name="ConfirmObjectTakeLock">
Как минимум один объект фикÑирован.
@@ -1480,13 +1488,43 @@ http://secondlife.com/download.
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
Загружено обÑзательное обновление.
-ВерÑÐ¸Ñ [VERSION]
+ВерÑÐ¸Ñ [VERSION]. [[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
Ðеобходимо перезапуÑтить [APP_NAME] Ð´Ð»Ñ ÑƒÑтановки обновлениÑ.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
Ðеобходимо перезапуÑтить [APP_NAME] Ð´Ð»Ñ ÑƒÑтановки обновлениÑ.
+[[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ Загружено обновление Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ верÑии [APP_NAME].
+ВерÑÐ¸Ñ [VERSION]
+Ðа замену Ñтой ÑкÑпериментальной верÑии клиента предлагаетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚ [NEW_CHANNEL];
+Ñм. [[INFO_URL] об Ñтом обновлении]
+ <usetemplate name="okcancelbuttons" notext="Позже..." yestext="УÑтановите обновление и перезапуÑтите [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ Загружено обновление Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ верÑии [APP_NAME].
+ВерÑÐ¸Ñ [VERSION]
+Ðа замену Ñтой ÑкÑпериментальной верÑии клиента предлагаетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚ [NEW_CHANNEL];
+Ñм. [[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
+ <usetemplate name="okcancelbuttons" notext="Позже..." yestext="УÑтановите обновление и перезапуÑтите [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Загружено обÑзательное обновление.
+ВерÑÐ¸Ñ [VERSION]
+Ðа замену Ñтой ÑкÑпериментальной верÑии клиента предлагаетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚ [NEW_CHANNEL];
+Ñм. [[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
+
+Ðеобходимо перезапуÑтить [APP_NAME] Ð´Ð»Ñ ÑƒÑтановки обновлениÑ.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Ðеобходимо перезапуÑтить [APP_NAME] Ð´Ð»Ñ ÑƒÑтановки обновлениÑ.
+Ðа замену Ñтой ÑкÑпериментальной верÑии клиента предлагаетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚ [NEW_CHANNEL];
+Ñм. [[INFO_URL] Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ñтом обновлении]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1537,6 +1575,10 @@ http://secondlife.com/download.
Хотите покинуть группу?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Ðевозможно покинуть группу. Ð’Ñ‹ не можете покинуть группу, так как вы ее поÑледний владелец. Сначала назначьте владельцем другого учаÑтника.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Ð’Ñ‹ ДЕЙСТВИТЕЛЬÐО хотите выброÑить вÑех жителей Ñ Ñетки?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="ВыброÑить вÑех жителей"/>
@@ -2396,9 +2438,7 @@ http://secondlife.com/download.
выбрать команду «ТелепортациÑ».)
</notification>
<notification name="TeleportToPerson">
- Чтобы обратитьÑÑ Ðº жителю, например «[NAME]», нажмите кнопку «Люди», выберите Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð² поÑвившемÑÑ Ð¾ÐºÐ½Ðµ и нажмите кнопку
- «IM» внизу окна.
- (Также можно дважды щелкнуть Ð¸Ð¼Ñ Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð² ÑпиÑке или щелкнуть его правой кнопкой мыши и выбрать команду «IM».)
+ Чтобы начать личный разговор, щелкните аватар ÑобеÑедника правой кнопкой мыши и выберите в меню «IM».
</notification>
<notification name="CantSelectLandFromMultipleRegions">
ÐÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ землю Ñ Ð¾Ð±ÐµÐ¸Ñ… Ñторон границы между Ñерверами.
@@ -2772,6 +2812,15 @@ http://secondlife.com/download.
<button name="Deny" text="Отклонить"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ Объект <nolink>[OBJECTNAME]</nolink>» владельца «[NAME]» требует Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð½Ð° выполнение Ñкрипта; разрешение не раÑпознаетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð¼ и не будет предоÑтавлено
+
+Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñтого Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ ÑƒÑтановите поÑледнюю верÑию клиента из [DOWNLOADURL].
+ <form name="form">
+ <button name="Deny" text="OK"/>
+ <button name="Mute" text="Заблокировать"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
[NAME] – «<nolink>[TITLE]</nolink>»
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 7da7fb3191f..9606f0aec13 100755
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -49,6 +49,9 @@
<menu_button name="plus_btn" tool_tip="ПриÑоединитьÑÑ Ðº группе/Ñоздать новую группу"/>
<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
</panel>
+ <text name="groupcount">
+ Ð’Ñ‹ входите в [COUNT] групп и можете приÑоединитьÑÑ ÐµÑ‰Ðµ к [REMAINING].
+ </text>
</panel>
<panel label="ÐЕДÐÐ’ÐИЕ" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 6383fc8c2c0..914426c91e3 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="ТекÑтовый чат" name="chat">
- <panel>
- <check_box initial_value="иÑтина" label="ВоÑпроизводить анимацию ввода текÑта при общении" name="play_typing_animation"/>
+ <panel name="general_chat_settings">
+ <check_box initial_value="true" label="ВоÑпроизводить анимацию ввода текÑта при общении" name="play_typing_animation"/>
<check_box label="ОтправлÑÑ‚ÑŒ мне ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾ почте, когда Ð¼ÐµÐ½Ñ Ð½ÐµÑ‚ в Ñети" name="send_im_to_email"/>
<check_box label="Только Ð´Ñ€ÑƒÐ·ÑŒÑ Ð¸ группы могут звонить мне и отправлÑÑ‚ÑŒ IM" name="voice_call_friends_only_check"/>
<text name="font_size">
@@ -14,10 +14,7 @@
</combo_box>
<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- УведомлениÑ
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
IM друзей:
</text>
@@ -25,8 +22,9 @@
<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
<item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
<item label="Мигание кнопки на панели инÑтрументов" name="FlashToolbarButton" value="мигание"/>
- <item label="Ðет" name="None" value="нет"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Звук" name="play_sound_friend_im"/>
<text name="non_friend_ims">
IM чужих:
</text>
@@ -34,8 +32,9 @@
<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
<item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
<item label="Мигание кнопки на панели инÑтрументов" name="FlashToolbarButton" value="мигание"/>
- <item label="Ðет" name="None" value="нет"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Звук" name="play_sound_non_friend_im"/>
<text name="conference_ims">
IM конференции:
</text>
@@ -43,8 +42,9 @@
<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
<item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
<item label="Мигание кнопки на панели инÑтрументов" name="FlashToolbarButton" value="мигание"/>
- <item label="Ðет" name="None" value="нет"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Звук" name="play_sound_conference_im"/>
<text name="group_chat">
Групповой чат:
</text>
@@ -52,8 +52,9 @@
<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
<item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
<item label="Мигание кнопки на панели инÑтрументов" name="FlashToolbarButton" value="мигание"/>
- <item label="Ðет" name="None" value="нет"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Звук" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
Локальный чат:
</text>
@@ -61,13 +62,24 @@
<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
<item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
<item label="Мигание кнопки на панели инÑтрументов" name="FlashToolBarButton" value="мигание"/>
- <item label="Ðет" name="None" value="нет"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Звук" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ IM объектов:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Сообщение во вÑплывающем окне" name="PopUpMessage" value="вÑплывание"/>
+ <item label="Мигание кнопки на панели инÑтрументов" name="FlashToolBarButton" value="мигание"/>
+ <item label="Без дейÑтвиÑ" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Звук" name="play_sound_object_im"/>
<text name="notifications_alert">
Ð”Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²Ñех уведомлений вызовите меню «Общение > Ðе беÑпокоить».
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Звук:
</text>
@@ -76,7 +88,7 @@
<check_box label="Предложение телепортации" name="teleport_offer"/>
<check_box label="Предложение инвентарÑ" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="ОчиÑтить журнал..." name="clear_log"/>
<button label="Удалить запиÑи..." name="delete_transcripts"/>
<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
index a7e826f5fcb..029e72e1379 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="иÑтина" label="Локальный Ñвет" name="LocalLights"/>
<check_box initial_value="иÑтина" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение Ñтого параметра может предотвратить завиÑание некоторых видеокарт"/>
<check_box initial_value="иÑтина" label="ÐтмоÑферные шейдеры" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="иÑтина" label="ОÑвещение и тени" name="UseLightShaders"/>
+ <check_box initial_value="иÑтина" label="РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ" name="UseLightShaders"/>
<check_box initial_value="иÑтина" label="Объемный Ñвет" name="UseSSAO"/>
<check_box initial_value="иÑтина" label="Глубина полÑ" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index 8e7fc71f0d5..e9c0c7de107 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="УÑтанавливать автоматичеÑки" name="Install_automatically"/>
<combo_box.item label="Загружать и уÑтанавливать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ" name="Install_manual"/>
</combo_box>
+ <check_box label="УÑтанавливать бета-верÑии" name="update_willing_to_test"/>
<text name="Proxy Settings:">
ÐаÑтройки прокÑи-Ñервера:
</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
index 05ccaeb54b3..a9e5d9ef107 100755
--- a/indra/newview/skins/default/xui/ru/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Выделить вÑе" name="Select All"/>
<menu_item_call label="СнÑÑ‚ÑŒ выделение" name="Deselect"/>
<menu_item_call label="ПоиÑк и замена..." name="Search / Replace..."/>
+ <menu_item_call label="Перейти на Ñтроку..." name="Go to line..."/>
</menu>
<menu label="Справка" name="Help">
<menu_item_call label="Справка..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
new file mode 100644
index 00000000000..60717a3d1d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° цвета"/>
+ <text name="color trans">
+ ПрозрачноÑÑ‚ÑŒ %
+ </text>
+ <text name="glow label">
+ Свечение
+ </text>
+ <check_box label="СобÑÑ‚Ð²ÐµÐ½Ð½Ð°Ñ ÑркоÑÑ‚ÑŒ" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Материалы" name="Materials"/>
+ <combo_box.item label="Медиа" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="ТекÑтура (раÑÑеÑннаÑ)" name="Texture (diffuse)"/>
+ <combo_box.item label="ШероховатоÑÑ‚ÑŒ (обычнаÑ)" name="Bumpiness (normal)"/>
+ <combo_box.item label="БлеÑк (зеркальный)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="ТекÑтура" name="texture control" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
+ <text name="label alphamode">
+ Ðльфа-режим
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Ðет" name="None"/>
+ <combo_box.item label="Ðльфа-Ñмешивание" name="Alpha blending"/>
+ <combo_box.item label="Ðльфа-маÑкирование" name="Alpha masking"/>
+ <combo_box.item label="Ð˜Ð·Ð»ÑƒÑ‡Ð°ÑŽÑ‰Ð°Ñ Ð¼Ð°Ñка" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ ОтÑечка маÑки
+ </text>
+ <texture_picker label="ТекÑтура" name="bumpytexture control" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
+ <text name="label bumpiness">
+ РельефноÑÑ‚ÑŒ
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Ðет" name="None"/>
+ <combo_box.item label="ЯркоÑÑ‚ÑŒ" name="Brightness"/>
+ <combo_box.item label="По темному" name="Darkness"/>
+ <combo_box.item label="дерево" name="woodgrain"/>
+ <combo_box.item label="кора" name="bark"/>
+ <combo_box.item label="кирпич" name="bricks"/>
+ <combo_box.item label="ÑˆÐ°Ñ…Ð¼Ð°Ñ‚Ð½Ð°Ñ Ð´Ð¾Ñка" name="checker"/>
+ <combo_box.item label="бетон" name="concrete"/>
+ <combo_box.item label="ÑÑ‚Ð°Ñ€Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ°" name="crustytile"/>
+ <combo_box.item label="теÑаный камень" name="cutstone"/>
+ <combo_box.item label="диÑки" name="discs"/>
+ <combo_box.item label="гравий" name="gravel"/>
+ <combo_box.item label="чашка Петри" name="petridish"/>
+ <combo_box.item label="Ñайдинг" name="siding"/>
+ <combo_box.item label="ÐºÐ°Ð¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð»Ð¸Ñ‚ÐºÐ°" name="stonetile"/>
+ <combo_box.item label="штукатурка" name="stucco"/>
+ <combo_box.item label="приÑоÑка" name="suction"/>
+ <combo_box.item label="переплетение" name="weave"/>
+ </combo_box>
+ <texture_picker label="ТекÑтура" name="shinytexture control" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° изображениÑ"/>
+ <text name="label shininess">
+ БлеÑк
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Ðет" name="None"/>
+ <combo_box.item label="Ðизкий" name="Low"/>
+ <combo_box.item label="Средний" name="Medium"/>
+ <combo_box.item label="Ð’Ñ‹Ñокий" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ ГлÑнец
+ </text>
+ <text name="label environment">
+ Среда
+ </text>
+ <text name="label shinycolor">
+ Цвет
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Щелкните Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° цвета"/>
+ <text name="media_info">
+ URL выбранного медиа (еÑли еÑÑ‚ÑŒ)
+ </text>
+ <button label="Выбрать..." name="add_media" tool_tip="Добавить медиа"/>
+ <button label="Удалить" name="delete_media" tool_tip="Удалить медиа-текÑтуру"/>
+ <button label="ВыровнÑÑ‚ÑŒ" label_selected="ВыровнÑÑ‚ÑŒ медиа" name="button align" tool_tip="МаÑштабирование медиа-текÑтуры (Ñначала нужно загрузить)"/>
+ <text name="tex gen">
+ Ðаложение
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="По умолчанию" name="Default"/>
+ <combo_box.item label="Ðа плоÑкоÑÑ‚ÑŒ" name="Planar"/>
+ </combo_box>
+ <spinner label="МаÑштаб по горизонтали" name="TexScaleU"/>
+ <spinner label="МаÑштаб по вертикали" name="TexScaleV"/>
+ <spinner label="Повторений на метр" name="rptctrl"/>
+ <spinner label="Поворот, градуÑÑ‹" name="TexRot"/>
+ <spinner label="Смещение по горизонтали" name="TexOffsetU"/>
+ <spinner label="Смещение по вертикали" name="TexOffsetV"/>
+ <spinner label="МаÑштаб по горизонтали" name="bumpyScaleU"/>
+ <spinner label="МаÑштаб по вертикали" name="bumpyScaleV"/>
+ <spinner label="Поворот, градуÑÑ‹" name="bumpyRot"/>
+ <spinner label="Смещение по горизонтали" name="bumpyOffsetU"/>
+ <spinner label="Смещение по вертикали" name="bumpyOffsetV"/>
+ <spinner label="МаÑштаб по горизонтали" name="shinyScaleU"/>
+ <spinner label="МаÑштаб по вертикали" name="shinyScaleV"/>
+ <spinner label="Поворот, градуÑÑ‹" name="shinyRot"/>
+ <spinner label="Смещение по горизонтали" name="shinyOffsetU"/>
+ <spinner label="Смещение по вертикали" name="shinyOffsetV"/>
+ <check_box initial_value="ложь" label="СоглаÑование" name="checkbox planar align" 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 b6ba818abd8..3f31ecfa108 100755
--- a/indra/newview/skins/default/xui/ru/role_actions.xml
+++ b/indra/newview/skins/default/xui/ru/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="К Ñтим ÑпоÑобноÑÑ‚Ñм отноÑитÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑƒÑ‡Ð°Ñтка и Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ð°Ñтроек, поиÑк видимых каталогов, а также наÑтройки точек и вариантов телепортации." name="Parcel Identity">
<action description="Включение-отключение показа меÑта в результатах поиÑка и наÑтройка категории" longdescription="Включить-отключить показ меÑта в результатах поиÑка и наÑтроить категорию учаÑтка можно в окне «О земле» на вкладке «Параметры»." name="land find places" value="17"/>
- <action description="Изменение Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ опиÑÐ°Ð½Ð¸Ñ ÑƒÑ‡Ð°Ñтка, наÑтройки «Показать меÑто в поиÑке»" longdescription="Изменение Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ опиÑÐ°Ð½Ð¸Ñ ÑƒÑ‡Ð°Ñтка, наÑтройки «Показать меÑто в поиÑке». Ðто можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
+ <action description="Изменение Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ опиÑÐ°Ð½Ð¸Ñ ÑƒÑ‡Ð°Ñтка, наÑтройки «Умеренный контент»" longdescription="Изменение Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ опиÑÐ°Ð½Ð¸Ñ ÑƒÑ‡Ð°Ñтка, наÑтройки «Умеренный контент». Ðто можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
<action description="УÑтановка конечной точки и варианта телепортации" longdescription="УчаÑтники роли Ñ Ñтой ÑпоÑобноÑтью могут уÑтановить конечную точку телепортации на учаÑтке группы, а также задать вариант телепортации Ð´Ð»Ñ ÑƒÑÐ¸Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ. Ðто можно выполнить в окне «О земле» на вкладке «Параметры»." name="land set landing point" value="19"/>
</action_set>
<action_set description="К Ñтим ÑпоÑобноÑÑ‚Ñм отноÑитÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ наÑтроек учаÑтка, в Ñ‚. ч. «Создать объекты», «Изменить ландшафт», а также наÑтройки музыки и медиа." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index d7d4df4a37c..49ce33ec96d 100755
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
У клиента, которым вы пользуетеÑÑŒ, больше нет доÑтупа к игре Second Life. Загрузить новую верÑию клиента можно по адреÑу
http://secondlife.com/download
@@ -448,6 +451,9 @@ support@secondlife.com.
<string name="SLappAgentRequestFriend">
Предложить дружбу
</string>
+ <string name="SLappAgentRemoveFriend">
+ Удаление друга
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Закрыть (⌘W)
</string>
@@ -835,6 +841,9 @@ support@secondlife.com.
<string name="multiple_textures">
ÐеÑколько
</string>
+ <string name="use_texture">
+ ИÑпользовать текÑтуру
+ </string>
<string name="texture_loading">
Загрузка...
</string>
@@ -934,6 +943,21 @@ support@secondlife.com.
<string name="TeleportYourAgent">
Телепортировать ваÑ
</string>
+ <string name="JoinAnExperience">
+ ПриÑоединитеÑÑŒ
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Отключить Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ управлении ÑпиÑками доÑтупа к землевладениÑм
+ </string>
+ <string name="OverrideYourAnimations">
+ Заменить ваши Ñтандартные анимации
+ </string>
+ <string name="ScriptReturnObjects">
+ Вернуть объекты от вашего имени
+ </string>
+ <string name="UnknownScriptPermission">
+ (неизвеÑтно)!
+ </string>
<string name="SIM_ACCESS_PG">
Общий
</string>
@@ -1965,6 +1989,12 @@ support@secondlife.com.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
Данные в игре внизу Ñправа
</string>
+ <string name="ATTACH_NECK">
+ ШеÑ
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Центр аватара
+ </string>
<string name="CursorPos">
Строка [LINE], Ñтолбец [COLUMN]
</string>
@@ -2991,6 +3021,9 @@ support@secondlife.com.
<string name="Hip Width">
Ширина бедер
</string>
+ <string name="Hover">
+ Ðаведите
+ </string>
<string name="In">
Внутрь
</string>
@@ -5087,4 +5120,7 @@ support@secondlife.com.
<string name="logging_calls_enabled_log_empty">
Ðет зарегиÑтрированных разговоров. ЕÑли вы обратитеÑÑŒ к кому-то или наоборот, в журнале поÑвитÑÑ Ð½Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ.
</string>
+ <string name="loading_chat_logs">
+ Загрузка...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 4dcf6200c63..7b925e8830d 100755
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -9,6 +9,8 @@
</floater.string>
<floater.string name="AboutPosition">
<nolink>[HOSTNAME]</nolink> ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
+SLURL: <nolink>[SLURL]</nolink>
+(küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 1d929a2dd3d..bf4473ce1fc 100755
--- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ DÜZENLE">
+<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ AYARLA">
<floater.string name="nothing_to_modify_text">
Seçim içerisinde düzenlenebilir içerik yok.
</floater.string>
@@ -24,7 +24,7 @@
<button label="√ Tümü" name="check_all"/>
<button label="Temizle" label_selected="Hiçbiri" name="check_none"/>
<text name="newperms">
- Yeni İçerik İzinleri
+ Şunun İçin İçerik İzinlerini Ayarla:
</text>
<text name="GroupLabel">
Grup:
@@ -40,6 +40,7 @@
<check_box label="DeÄŸiÅŸtir" name="next_owner_modify"/>
<check_box label="Kopyala" name="next_owner_copy"/>
<check_box initial_value="true" label="Aktar" name="next_owner_transfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
- <button label="Tamam" name="apply"/>
+ <button label="Tamam" name="ok"/>
+ <button label="Uygula" name="apply"/>
<button label="Ä°ptal" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_goto_line.xml b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
new file mode 100644
index 00000000000..673fe553cc7
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ÅžU SATIRA GÄ°T:">
+ <button label="Tamam" label_selected="Tamam" name="goto_btn"/>
+ <text name="txt">
+ Şu satıra git:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index 8ce8f0fe13d..52a10feeefd 100755
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 35f47e6dfaa..6eecc7fb776 100755
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
Göster:
</text>
- <check_box label="Test" name="show_world"/>
+ <check_box label="Dünya" name="show_world"/>
<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
index 9ba214ff313..0cb233a6578 100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="Dondur" name="Freeze..."/>
<menu_item_call label="Çıkar" name="Eject..."/>
<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+ <menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
<menu_item_call label="Yakınlaştır" name="Zoom In"/>
<menu_item_call label="Öde" name="Pay..."/>
<menu_item_call label="Nesne Profili" name="Object Inspect"/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
index 16d1e3f3568..ff7c7189791 100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+ <menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
<menu_item_call label="Bırak" name="Drop"/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
index 7d691d2ac59..0da328a8946 100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="Dondur" name="Freeze..."/>
<menu_item_call label="Çıkar" name="Eject..."/>
<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+ <menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
<menu_item_call label="Yakınlaştır" name="Zoom In"/>
<menu_item_call label="Öde" name="Pay..."/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
index c520aff521f..6996dc612fe 100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+ <menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
index 31404f25010..c2773cdc263 100644
--- a/indra/newview/skins/default/xui/tr/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+ <menu_item_call label="Seçileni Kapat" name="close_selected_conversations"/>
<menu_item_call label="Profili Göster" name="view_profile"/>
<menu_item_call label="AÄ°" name="im"/>
<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml
index db65f1af1ec..d6d8dbf7301 100755
--- a/indra/newview/skins/default/xui/tr/menu_land.xml
+++ b/indra/newview/skins/default/xui/tr/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="Geçiş Hakkı Satın Al" name="Land Buy Pass"/>
<menu_item_call label="Ä°nÅŸa Et" name="Create"/>
<menu_item_call label="Yüzeyi Düzenle" name="Edit Terrain"/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
index f27908bf7ae..79c95407e8e 100755
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="Hizmet Şartlarını Göster" name="TOS"/>
<menu_item_call label="Kritik İletiyi Göster" name="Critical"/>
<menu_item_call label="Web İçeriği Gezdiricisi Hata Ayıklama Testi" name="Web Content Floater Debug Test"/>
- <menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level"/>
+ <menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level">
+ <menu_item_check label="Hata ayıkla" name="Debug"/>
+ <menu_item_check label="Bilgi" name="Info"/>
+ <menu_item_check label="Uyarı" name="Warning"/>
+ <menu_item_check label="Hata" name="Error"/>
+ <menu_item_check label="Hiçbiri" name="None"/>
+ </menu>
<menu_item_check label="Izgara Seçiciyi Göster" name="Show Grid Picker"/>
<menu_item_call label="Bildirimler Konsolunu Göster" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_mute_particle.xml b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
new file mode 100644
index 00000000000..a05a745ed02
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
index 72f7adf0163..2f8b5c03624 100755
--- a/indra/newview/skins/default/xui/tr/menu_object.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object.xml
@@ -3,13 +3,13 @@
<menu_item_call label="Dokun" name="Object Touch"/>
<menu_item_call label="Düzenle" name="Edit..."/>
<menu_item_call label="Ä°nÅŸa Et" name="Build"/>
- <menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
- <menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
<menu_item_call label="Aç" name="Open"/>
<menu_item_call label="Buraya Otur" name="Object Sit"/>
<menu_item_call label="Kalk" name="Object Stand Up"/>
<menu_item_call label="Nesne Profili" name="Object Inspect"/>
<menu_item_call label="Yakınlaştır" name="Zoom In"/>
+ <menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
+ <menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
<context_menu label="Ãœzerine Koy" name="Put On">
<menu_item_call label="Giy" name="Wear"/>
<menu_item_call label="Ekle" name="Add"/>
@@ -26,4 +26,5 @@
<menu_item_call label="Öde" name="Pay..."/>
<menu_item_call label="Satın Al" name="Buy..."/>
<menu_item_call label="Sil" name="Delete"/>
+ <menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index b14a0509bfe..109cd624951 100755
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Profili Göster" name="show_agent"/>
<menu_item_call label="Aİ Gönder..." name="send_im"/>
<menu_item_call label="ArkadaÅŸ Ekle..." name="add_friend"/>
+ <menu_item_call label="Arkadaşı Çıkar..." name="remove_friend"/>
<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
<menu_item_call label="SLurl'yi Panoya Kopyala" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index 00fa3c27c2e..ae686696057 100755
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="Nesne Profili..." name="show_object"/>
+ <menu_item_call label="Engelle..." name="block_object"/>
<menu_item_call label="Haritada Göster" name="show_on_map"/>
<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 35485bb292b..4236f916361 100755
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
</menu>
- <menu label="Durum" name="Status"/>
+ <menu label="Durum" name="Status">
+ <menu_item_check label="Uzakta" name="Away"/>
+ <menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/>
<menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/>
<menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -30,6 +33,7 @@
<menu_item_check label="Sohbetler..." name="Conversations"/>
<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
<menu_item_check label="KonuÅŸ" name="Speak"/>
+ <menu_item_check label="Sohbet Günlüğü..." name="Conversation Log..."/>
<menu label="Ses ÅŸekillendirme" name="VoiceMorphing">
<menu_item_check label="Ses ÅŸekillendirme yok" name="NoVoiceMorphing"/>
<menu_item_check label="Önizleme..." name="Preview"/>
@@ -40,6 +44,7 @@
<menu_item_check label="Gruplar" name="My Groups"/>
<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
<menu_item_call label="Engelleme Listesi" name="Block List"/>
+ <menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
</menu>
<menu label="Dünya" name="World">
<menu_item_call label="Bu Yeri Yer Ä°mlerine Ekle" name="Create Landmark Here"/>
@@ -108,6 +113,7 @@
<menu_item_call label="Sonraki Parçayı Dahil Et" name="Include Next Part"/>
<menu_item_call label="Önceki Parçayı Dahil Et" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Seçime Odaklan" name="Focus on Selection"/>
<menu_item_call label="Seçimi Yakınlaştır" name="Zoom to Selection"/>
<menu label="Nesne" name="Object">
@@ -277,6 +283,7 @@
<menu_item_check label="Çerçeve Hızını Rastgele Seç" name="Randomize Framerate"/>
<menu_item_check label="Düzenli Yavaş Çerçeve" name="Periodic Slow Frame"/>
<menu_item_check label="Çerçeve Testi" name="Frame Test"/>
+ <menu_item_call label="Çerçeve Profili..." name="Frame Profile"/>
</menu>
<menu label="Meta Verileri Ä°ÅŸle" name="Render Metadata">
<menu_item_check label="Sınırlama Kutuları" name="Bounding Boxes"/>
@@ -311,9 +318,10 @@
<menu_item_check label="Eksenler" name="Axes"/>
<menu_item_check label="Tanjant Temeli" name="Tangent Basis"/>
<menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/>
+ <menu_item_call label="Seçilen Malzeme Bilgisi" name="Selected Material Info"/>
<menu_item_check label="Telkafes" name="Wireframe"/>
<menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/>
- <menu_item_check label="Işıklandırma ve Gölgeler" name="Advanced Lighting Model"/>
+ <menu_item_check label="Gelişmiş Aydınlatma Modeli" name="Advanced Lighting Model"/>
<menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="GL Hata Ayıklama" name="Debug GL"/>
@@ -323,7 +331,6 @@
<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="Tam Çöz. Dokular" name="Rull Res Textures"/>
- <menu_item_check label="Doku Atlas (deneysel)" name="Texture Atlas"/>
<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"/>
<menu_item_check label="Parıldayan Nesneler Üzerine Gel" name="Hover Glow Objects"/>
@@ -359,7 +366,6 @@
<menu_item_call label="Odaklayıcı Tutucunun Dökümünü Al" name="Dump Focus Holder"/>
<menu_item_call label="Seçilen Nesne Bilgisini Yazdır" name="Print Selected Object Info"/>
<menu_item_call label="Aracı Bilgisini Yazdır" name="Print Agent Info"/>
- <menu_item_call label="Bellek Ä°statistikleri" name="Memory Stats"/>
<menu_item_check label="Bölge Hata Ayıklama Konsolu" name="Region Debug Console"/>
<menu_item_check label="SelectMgr İçin Hata Ayıklama" name="Debug SelectMgr"/>
<menu_item_check label="Tıklamalar İçin Hata Ayıklama" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index ad92a4b478d..492178ab824 100755
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -210,6 +210,14 @@ Bu Yetenek '[ROLE_NAME]' rolüne eklensin mi?
Bu Yetenek '[ROLE_NAME]' rolüne eklensin mi?
<usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ Gruptan [AVATAR_NAME] adlı üyeyi çıkarmak üzeresiniz.
+ <usetemplate ignoretext="Gruptan bir katılımcının çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ Gruptan [COUNT] üyeyi çıkarmak üzeresiniz.
+ <usetemplate ignoretext="Gruptan birden çok üyenin çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+ </notification>
<notification name="AttachmentDrop">
Aksesuarınızı çıkarmak üzeresiniz.
Devam etmek istediÄŸinize emin misiniz?
@@ -1111,7 +1119,7 @@ bu simdeki TÃœM ARAZÄ°LERDEN SÄ°LMEK istediÄŸinize emin misiniz?
Lütfen daha yüksek bir tutar girin.
</notification>
<notification name="ConfirmItemDeleteHasLinks">
- Seçtiğiniz öğelerden en az birinin kendisine işaret eden bağlantılı öğeler var. Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek. Önce bağlantıları silmeniz önemle tavsiye edilir.
+ Öğelerden en az birinde kendisine işaret eden bağlantılar var. Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek. Önce bağlantıları silmeniz önemle tavsiye edilir.
Bu öğeleri silmek istediğinize emin misiniz?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
@@ -1479,14 +1487,44 @@ Sürüm [VERSION] [[RELEASE_NOTES_FULL_URL] Bu güncelleme hakkında ayrıntıl
<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi kur ve [APP_NAME] uygulamasını yeniden başlat"/>
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
- Gerekli bir yazılım güncellemesini karşıdan yükledik.
-Sürüm [VERSION]
+ Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION] [[INFO_URL] Bu güncelleme hakkında ayrıntılı bilgi]
-Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
- Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+ Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+[[INFO_URL] Bu güncelleme hakkında bilgi]
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ [APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [bu güncelleme hakkında bilgi için [INFO_URL]]
+ <usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ [APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+ <usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1537,6 +1575,10 @@ Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız
Gruptan ayrılmak istiyor musunuz?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ Gruptan ayrılınamıyor. Gruptan ayrılamazsınız çünkü grubun son sahibisiniz. Lütfen önce sahip rolüne başka bir üye atayın.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="ConfirmKick">
Tüm Sakinleri GERÇEKTEN ağ dışına çıkarmak istiyor musunuz?
<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tüm Sakinleri Çıkar"/>
@@ -2396,9 +2438,7 @@ Lütfen tek bir nesne seçin.
'Işınla' seçimini yapabilirsiniz.)
</notification>
<notification name="TeleportToPerson">
- '[NAME]' gibi sakinlerle bağlantıya geçmek için "Kişiler" düğmesine tıklayın, açılan pencereden bir Sakin seçin ve sonra
- pencerenin altında 'Anlık İleti" üzerine tıklayın.
- (Listede adlarına çift tıklayarak veya sağ tıklayıp "Anlık İleti"yi seçerek de bunu yapabilirsiniz.)
+ Biriyle özel bir sohbet başlatmak için, avatarlarına sağ tıklayın ve menüden "Aİ" seçimini yapın.
</notification>
<notification name="CantSelectLandFromMultipleRegions">
Sunucunun sınırları dışındaki arazi seçilemez.
@@ -2772,6 +2812,15 @@ Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, eriş
<button name="Deny" text="Reddet"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ '[NAME]' tarafından sahip olunan bir nesne olan '<nolink>[OBJECTNAME]</nolink>' tarafından istenen çalışma zamanı komut dosyası izni görüntüleyici tarafından tanınmadı ve verilemez.
+
+Bu izni vermek için lütfen [DOWNLOADURL] adresinden görüntüleyicinizi en son sürüme güncelleyin.
+ <form name="form">
+ <button name="Deny" text="Tamam"/>
+ <button name="Mute" text="Engelle"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
[NAME] adlı kişiye ait '<nolink>[TITLE]</nolink>'
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 08efd0aa616..b499ec83076 100755
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -49,6 +49,9 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
</panel>
+ <text name="groupcount">
+ [COUNT] gruba üyesiniz, daha [REMAINING] gruba üye olabilirsiniz.
+ </text>
</panel>
<panel label="SON" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aaeebdfe6e8..d46f3e08ccb 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Metin Sohbeti" name="chat">
- <panel>
+ <panel name="general_chat_settings">
<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
<check_box label="Çevrimdışı olduğunda Aİ'ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
@@ -14,19 +14,17 @@
</combo_box>
<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- Bildirimler
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
ArkadaÅŸ AÄ°'leri:
</text>
<combo_box name="FriendIMOptions">
<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+ <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
- <item label="Hiçbiri" name="None" value="none"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sesi çal" name="play_sound_friend_im"/>
<text name="non_friend_ims">
ArkadaÅŸ harici AÄ°'ler:
</text>
@@ -34,40 +32,54 @@
<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
- <item label="Hiçbiri" name="None" value="none"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sesi çal" name="play_sound_non_friend_im"/>
<text name="conference_ims">
Konferans AÄ°'leri:
</text>
<combo_box name="ConferenceIMOptions">
<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+ <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
- <item label="Hiçbiri" name="None" value="none"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sesi çal" name="play_sound_conference_im"/>
<text name="group_chat">
Grup sohbeti:
</text>
<combo_box name="GroupChatOptions">
<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+ <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
- <item label="Hiçbiri" name="None" value="none"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sesi çal" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
Yakındaki sohbet:
</text>
<combo_box name="NearbyChatOptions">
<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
- <item label="Mesajı aç" name="PopUpMessage" value="toast"/>
+ <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+ <item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="Sesi çal" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ Nesne AÄ°'leri:
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
- <item label="Hiçbiri" name="None" value="none"/>
+ <item label="Eylem yok" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="Sesi çal" name="play_sound_object_im"/>
<text name="notifications_alert">
Tüm bildirimleri geçici olarak durdurmak için İletişim Kur > Rahatsız Etme seçeneğini kullanın.
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
Sesi çal:
</text>
@@ -76,7 +88,7 @@
<check_box label="Işınlama teklifi" name="teleport_offer"/>
<check_box label="Envanter teklifi" name="inventory_offer"/>
</panel>
- <panel>
+ <panel name="log_settings">
<button label="Günlüğü temizle..." name="clear_log"/>
<button label="Dökümleri sil..." name="delete_transcripts"/>
<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
index ddb83ffc695..25c9e966c77 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
<check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="Işıklandırma ve Gölgeler" name="UseLightShaders"/>
+ <check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
<check_box initial_value="true" label="Ortam Gölgeleme" name="UseSSAO"/>
<check_box initial_value="true" label="Alan DerinliÄŸi" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index 9d03d9b01d6..2039761748c 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="Otomatik olarak kurulsun" name="Install_automatically"/>
<combo_box.item label="Güncelleştirmeler manuel olarak karşıdan yüklensin ve kurulsun" name="Install_manual"/>
</combo_box>
+ <check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
<text name="Proxy Settings:">
Proxy Ayarları:
</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
index 7aa1da6fb2c..79cd86c3f06 100755
--- a/indra/newview/skins/default/xui/tr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="Tümünü Seç" name="Select All"/>
<menu_item_call label="Seçimi Kaldır" name="Deselect"/>
<menu_item_call label="Ara / DeÄŸiÅŸtir..." name="Search / Replace..."/>
+ <menu_item_call label="Şu satıra git:" name="Go to line..."/>
</menu>
<menu label="Yardım" name="Help">
<menu_item_call label="Yardım..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
new file mode 100644
index 00000000000..2ce7c9c11f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+ <text name="color trans">
+ Saydamlık %
+ </text>
+ <text name="glow label">
+ Parıltı
+ </text>
+ <check_box label="Tam Parlak" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="Malzemeler" name="Materials"/>
+ <combo_box.item label="Ortam" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="Doku (yayılmış)" name="Texture (diffuse)"/>
+ <combo_box.item label="Yumruluk (normal)" name="Bumpiness (normal)"/>
+ <combo_box.item label="Parıldama (yansıtan)" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="Doku" name="texture control" tool_tip="Bir resim seçmek için tıklayın"/>
+ <text name="label alphamode">
+ Alfa modu
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="Hiçbiri" name="None"/>
+ <combo_box.item label="Alfa karıştırma" name="Alpha blending"/>
+ <combo_box.item label="Alfa maskeleme" name="Alpha masking"/>
+ <combo_box.item label="Yayımlatıcı maske" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ Maske kesimi
+ </text>
+ <texture_picker label="Doku" name="bumpytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+ <text name="label bumpiness">
+ Yumruluk
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="Yok" name="None"/>
+ <combo_box.item label="Parlaklık" name="Brightness"/>
+ <combo_box.item label="Koyuluk" name="Darkness"/>
+ <combo_box.item label="damarlı ahşap" name="woodgrain"/>
+ <combo_box.item label="ağaç kabuğu" name="bark"/>
+ <combo_box.item label="tuÄŸlalar" name="bricks"/>
+ <combo_box.item label="dama tahtası" name="checker"/>
+ <combo_box.item label="beton" name="concrete"/>
+ <combo_box.item label="sert çini" name="crustytile"/>
+ <combo_box.item label="kesilmiÅŸ taÅŸ" name="cutstone"/>
+ <combo_box.item label="diskler" name="discs"/>
+ <combo_box.item label="çakıl" name="gravel"/>
+ <combo_box.item label="petri kabı" name="petridish"/>
+ <combo_box.item label="dış kaplama" name="siding"/>
+ <combo_box.item label="taş çini" name="stonetile"/>
+ <combo_box.item label="stükko" name="stucco"/>
+ <combo_box.item label="vakum" name="suction"/>
+ <combo_box.item label="örgü" name="weave"/>
+ </combo_box>
+ <texture_picker label="Doku" name="shinytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+ <text name="label shininess">
+ Parıldama
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="Yok" name="None"/>
+ <combo_box.item label="Düşük" name="Low"/>
+ <combo_box.item label="Orta" name="Medium"/>
+ <combo_box.item label="Yüksek" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ Pürüzsüzlük
+ </text>
+ <text name="label environment">
+ Ortam
+ </text>
+ <text name="label shinycolor">
+ Renk
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+ <text name="media_info">
+ Varsa, seçilen ortamın URL'si burada yer alır
+ </text>
+ <button label="Seç..." name="add_media" tool_tip="Ortam Ekle"/>
+ <button label="Kaldır" name="delete_media" tool_tip="Bu ortam dokusunu sil"/>
+ <button label="Hizala" label_selected="Ortamı Hizala" name="button align" tool_tip="Ortam dokusunu hizala (önce yüklenmelidir)"/>
+ <text name="tex gen">
+ EÅŸleÅŸtirme
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="Varsayılan" name="Default"/>
+ <combo_box.item label="Planar" name="Planar"/>
+ </combo_box>
+ <spinner label="Yatay ölçek" name="TexScaleU"/>
+ <spinner label="Dikey ölçek" name="TexScaleV"/>
+ <spinner label="Metrede kaç kez tekrarlandığı" name="rptctrl"/>
+ <spinner label="Dönüş derecesi" name="TexRot"/>
+ <spinner label="Yatay ofset" name="TexOffsetU"/>
+ <spinner label="Dikey ofset" name="TexOffsetV"/>
+ <spinner label="Yatay ölçek" name="bumpyScaleU"/>
+ <spinner label="Dikey ölçek" name="bumpyScaleV"/>
+ <spinner label="Dönüş derecesi" name="bumpyRot"/>
+ <spinner label="Yatay ofset" name="bumpyOffsetU"/>
+ <spinner label="Dikey ofset" name="bumpyOffsetV"/>
+ <spinner label="Yatay ölçek" name="shinyScaleU"/>
+ <spinner label="Dikey ölçek" name="shinyScaleV"/>
+ <spinner label="Dönüş derecesi" name="shinyRot"/>
+ <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."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
index 655ac641720..76ca58c319f 100755
--- a/indra/newview/skins/default/xui/tr/role_actions.xml
+++ b/indra/newview/skins/default/xui/tr/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="Bu yetenekler arasında parsel adını ve yayınlama ayarlarını, Bul dizinindeki görünürlük ile iniş noktası ve TP yönlendirme seçeneklerini değiştirme imkanları yer alır." name="Parcel Identity">
<action description="'Konumu Arama Sonuçlarında Göster' seçeneğini Aç/Kapa ve kategoriyi ayarla" longdescription="Arazi Hakkında > Seçenekler sekmesinden 'Konumu Arama Sonuçlarında Göster' seçeneğini Açın/Kapayın ve parsel kategorisini ayarlayın." name="land find places" value="17"/>
- <action description="Parsel adını, açıklamasını ve "Konumu Arama Sonuçlarında Göster" ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve "Konumu Arama Sonuçlarında Göster" ayarlarını değiştirin. Bu işlem Arazi Hakkında > Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
+ <action description="Parsel adını, açıklamasını ve "Orta Seviyede İçerik" ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve "Orta Seviyede İçerik" ayarlarını değiştir. Bu işlem Arazi Hakkında > Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
<action description="İniş noktasını ve ışınlama yönlendirmesini ayarlayın" longdescription="Bir grubun sahip olduğu parsel üzerinde, bu Yeteneğe sahip olan bir Roldeki Üyeler gelen ışınlanmaların varacağı iniş noktasını ve daha fazla kontrol için ışınlama yönlendirmesini ayarlayabilirler. Bu işlem Arazi Hakkında > Seçenekler sekmesinde yapılır." name="land set landing point" value="19"/>
</action_set>
<action_set description="Bu Yeteneklere 'Nesneleri Oluştur', 'Yüzeyi Düzenle', müzik ve ortam ayarları gibi parsel seçeneklerini etkileyen güçler de dahildir." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 155dc8749a0..5a809ea7833 100755
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
Kullandığınız görüntüleyici ile artık Second Life'a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
http://secondlife.com/download
@@ -448,6 +451,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="SLappAgentRequestFriend">
Arkadaşlık Talebi
</string>
+ <string name="SLappAgentRemoveFriend">
+ Arkadaşların Çıkarılması
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Kapat (⌘W)
</string>
@@ -835,6 +841,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="multiple_textures">
Birden Çok
</string>
+ <string name="use_texture">
+ Dokuyu kullan
+ </string>
<string name="texture_loading">
Yükleniyor...
</string>
@@ -934,6 +943,21 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="TeleportYourAgent">
Sizi ışınlama
</string>
+ <string name="JoinAnExperience">
+ Bir tecrübeye katıl
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ Gayri menkul erişim listelerini yönetirken uyarıları bastır
+ </string>
+ <string name="OverrideYourAnimations">
+ Varsayılan animasyonlarınızı değiştirin
+ </string>
+ <string name="ScriptReturnObjects">
+ Kendi adınıza nesneler iade edin
+ </string>
+ <string name="UnknownScriptPermission">
+ (bilinmiyor)!
+ </string>
<string name="SIM_ACCESS_PG">
Genel
</string>
@@ -1965,6 +1989,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="ATTACH_HUD_BOTTOM_RIGHT">
BÃœG SaÄŸ Alt
</string>
+ <string name="ATTACH_NECK">
+ Boyun
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ Avatar Merkezi
+ </string>
<string name="CursorPos">
Satır [LINE], Sütun [COLUMN]
</string>
@@ -2994,6 +3024,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
<string name="Hip Width">
Kalça Genişliği
</string>
+ <string name="Hover">
+ Ãœzerine getir
+ </string>
<string name="In">
İçeri
</string>
@@ -5088,4 +5121,7 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="logging_calls_enabled_log_empty">
Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
</string>
+ <string name="loading_chat_logs">
+ Yükleniyor...
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 1193243c7ec..2dfb35fa545 100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -9,6 +9,8 @@
</floater.string>
<floater.string name="AboutPosition">
ä½ çš„æ–¹ä½æ˜¯ [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地å€å：[REGION]，主機：<nolink>[HOSTNAME]</nolink> ([HOSTIP])
+第二人生 URL：<nolink>[SLURL]</nolink>
+（全域å標：[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]）
[SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
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 59751a3a469..c103ea938fc 100755
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="編輯內容物權é™">
+<floater name="floaterbulkperms" title="調整內容物權é™">
<floater.string name="nothing_to_modify_text">
é¸æ“‡æœªåŒ…å«å¯ç·¨è¼¯çš„內容物。
</floater.string>
@@ -24,7 +24,7 @@
<button label="√ 全部" name="check_all"/>
<button label="清除" label_selected="無" name="check_none"/>
<text name="newperms">
- 新內容物權é™
+ 調整內容物權é™ï¼š
</text>
<text name="GroupLabel">
群組：
@@ -40,6 +40,7 @@
<check_box label="修改" name="next_owner_modify"/>
<check_box label="æšåº¨" name="next_owner_copy"/>
<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個所有人å¯è´ˆé€æˆ–轉售這個物件"/>
- <button label="確定" name="apply"/>
+ <button label="確定" name="ok"/>
+ <button label="套用" name="apply"/>
<button label="å–消" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_goto_line.xml b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
new file mode 100644
index 00000000000..e0215aef8a8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="å‰å¾€æŸè¡Œæ•¸">
+ <button label="確定" label_selected="確定" name="goto_btn"/>
+ <text name="txt">
+ å‰å¾€æŸè¡Œæ•¸
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index d63c5507db7..864af2e592c 100755
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -34,13 +34,11 @@
<layout_panel name="body_panel">
<layout_stack name="im_panels">
<layout_panel name="right_part_holder">
- <panel name="trnsAndChat_panel">
- <layout_stack name="translate_and_chat_stack">
- <layout_panel name="translate_chat_checkbox_lp">
- <check_box label="ç¿»è¯èŠå¤©å…§å®¹" name="translate_chat_checkbox"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="translate_and_chat_stack">
+ <layout_panel name="translate_chat_checkbox_lp">
+ <check_box label="ç¿»è¯èŠå¤©å…§å®¹" name="translate_chat_checkbox"/>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index d0978b8b010..be009b54d88 100755
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
<text name="show_label">
顯示：
</text>
- <check_box label="測試" name="show_world"/>
+ <check_box label="世界" name="show_world"/>
<check_box label="僅é™å¯ç§»å‹•çš„" name="show_world_movables_only"/>
<check_box label="導航網é¢" name="show_navmesh"/>
<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index 885c4b9addb..41b34096272 100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -11,7 +11,9 @@
<menu_item_call label="å‡çµ" name="Freeze..."/>
<menu_item_call label="踢出" name="Eject..."/>
<menu_item_call label="æ質除錯" name="Debug..."/>
+ <menu_item_call label="å‚¾å° XML" name="Dump XML"/>
<menu_item_call label="放大" name="Zoom In"/>
<menu_item_call label="支付" name="Pay..."/>
<menu_item_call label="物件檔案" name="Object Inspect"/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index c14a98c64be..eb1bad0ca27 100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -12,5 +12,7 @@
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
<menu_item_call label="æ質除錯" name="Debug..."/>
+ <menu_item_call label="å‚¾å° XML" name="Dump XML"/>
<menu_item_call label="丟棄" name="Drop"/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index 1d024647487..dc035bafa03 100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -11,6 +11,8 @@
<menu_item_call label="å‡çµ" name="Freeze..."/>
<menu_item_call label="踢出" name="Eject..."/>
<menu_item_call label="æ質除錯" name="Debug..."/>
+ <menu_item_call label="å‚¾å° XML" name="Dump XML"/>
<menu_item_call label="放大" name="Zoom In"/>
<menu_item_call label="支付" name="Pay..."/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index 32757bbff63..68d0600141b 100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -29,4 +29,6 @@
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
<menu_item_call label="æ質除錯" name="Debug..."/>
+ <menu_item_call label="å‚¾å° XML" name="Dump XML"/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
index 507255d0c04..adfeefc337c 100644
--- a/indra/newview/skins/default/xui/zh/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -3,6 +3,7 @@
<menu_item_call label="關閉交談" name="close_conversation"/>
<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+ <menu_item_call label="關閉所é¸" name="close_selected_conversations"/>
<menu_item_call label="察看檔案" name="view_profile"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="發出瞬間傳é€é‚€è«‹" name="offer_teleport"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
index a87ab77dd08..3ad9c0ab31e 100755
--- a/indra/newview/skins/default/xui/zh/menu_land.xml
+++ b/indra/newview/skins/default/xui/zh/menu_land.xml
@@ -6,4 +6,5 @@
<menu_item_call label="購買通行權" name="Land Buy Pass"/>
<menu_item_call label="å»ºé€ " name="Create"/>
<menu_item_call label="編輯地形" name="Edit Terrain"/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index c327b132a11..1d3d771efbe 100755
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -18,7 +18,13 @@
<menu_item_call label="顯示 TOS" name="TOS"/>
<menu_item_call label="顯示嚴é‡è¨Šæ¯" name="Critical"/>
<menu_item_call label="網é 內容浮動視窗除錯測試" name="Web Content Floater Debug Test"/>
- <menu label="è¨å®šè¨˜éŒ„細節" name="Set Logging Level"/>
+ <menu label="è¨å®šè¨˜éŒ„細節" name="Set Logging Level">
+ <menu_item_check label="除錯" name="Debug"/>
+ <menu_item_check label="資訊" name="Info"/>
+ <menu_item_check label="è¦å‘Š" name="Warning"/>
+ <menu_item_check label="錯誤" name="Error"/>
+ <menu_item_check label="ç„¡" name="None"/>
+ </menu>
<menu_item_check label="é¡¯ç¤ºç¶²æ ¼æŒ‘é¸å™¨" name="Show Grid Picker"/>
<menu_item_call label="顯示通知控制å°" name="Show Notifications Console"/>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_mute_particle.xml b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
new file mode 100644
index 00000000000..fbde9b435d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 4282c1e1317..f6657d876e9 100755
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -3,13 +3,13 @@
<menu_item_call label="觸碰" name="Object Touch"/>
<menu_item_call label="編輯" name="Edit..."/>
<menu_item_call label="å»ºé€ " name="Build"/>
- <menu_item_call label="在è¯çµé›†è£¡é¡¯ç¤º" name="show_in_linksets"/>
- <menu_item_call label="在角色ä¸é¡¯ç¤º" name="show_in_characters"/>
<menu_item_call label="打開" name="Open"/>
<menu_item_call label="å在這裡" name="Object Sit"/>
<menu_item_call label="èµ·ç«‹" name="Object Stand Up"/>
<menu_item_call label="物件檔案" name="Object Inspect"/>
<menu_item_call label="放大" name="Zoom In"/>
+ <menu_item_call label="在è¯çµé›†è£¡é¡¯ç¤º" name="show_in_linksets"/>
+ <menu_item_call label="在角色ä¸é¡¯ç¤º" name="show_in_characters"/>
<context_menu label="穿上" name="Put On">
<menu_item_call label="穿上" name="Wear"/>
<menu_item_call label="æ·»åŠ " name="Add"/>
@@ -26,4 +26,5 @@
<menu_item_call label="支付" name="Pay..."/>
<menu_item_call label="購買" name="Buy..."/>
<menu_item_call label="刪除" name="Delete"/>
+ <menu_item_call label="å°éŽ–ç²’å所有人" name="Mute Particle"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 72629822d4b..752634dc6b2 100755
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -3,6 +3,7 @@
<menu_item_call label="察看檔案" name="show_agent"/>
<menu_item_call label="é€å‡º IM..." name="send_im"/>
<menu_item_call label="åŠ ç‚ºæœ‹å‹..." name="add_friend"/>
+ <menu_item_call label="移除朋å‹â€¦" name="remove_friend"/>
<menu_item_call label="覆製å稱到剪貼簿" name="url_copy_label"/>
<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index 9f3a9d58ffd..ac366f92efc 100755
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Url Popup">
<menu_item_call label="物件檔案..." name="show_object"/>
+ <menu_item_call label="å°éŽ–…" name="block_object"/>
<menu_item_call label="顯示在地圖上" name="show_on_map"/>
<menu_item_call label="瞬間傳é€åˆ°ç‰©ä»¶ä½ç½®" name="teleport_to_object"/>
<menu_item_call label="覆製物件å稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index d4844b191b5..b267bda2bbe 100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,7 +16,10 @@
<menu_item_call label="åœæ¢æˆ‘身上的動作" name="Stop Animating My Avatar"/>
<menu_item_call label="行走 / è·‘æ¥ / 飛行…" name="Walk / run / fly"/>
</menu>
- <menu label="狀態" name="Status"/>
+ <menu label="狀態" name="Status">
+ <menu_item_check label="離開" name="Away"/>
+ <menu_item_check label="請勿打擾" name="Do Not Disturb"/>
+ </menu>
<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -30,6 +33,7 @@
<menu_item_check label="交談……" name="Conversations"/>
<menu_item_check label="附近的èŠå¤©â€¦â€¦" name="Nearby Chat"/>
<menu_item_check label="說話" name="Speak"/>
+ <menu_item_check label="交談記錄…" name="Conversation Log..."/>
<menu label="語音變è²" name="VoiceMorphing">
<menu_item_check label="沒有變è²æ•ˆæžœ" name="NoVoiceMorphing"/>
<menu_item_check label="é 覽……" name="Preview"/>
@@ -40,6 +44,7 @@
<menu_item_check label="群組" name="My Groups"/>
<menu_item_check label="附近的人群" name="Active Speakers"/>
<menu_item_call label="å°éŽ–清單" name="Block List"/>
+ <menu_item_check label="請勿打擾" name="Do Not Disturb"/>
</menu>
<menu label="世界" name="World">
<menu_item_call label="å°‡æ¤è™•è¨˜ç‚ºåœ°æ¨™" name="Create Landmark Here"/>
@@ -108,6 +113,7 @@
<menu_item_call label="包括下一部ä½" name="Include Next Part"/>
<menu_item_call label="包括上一部ä½" name="Include Previous Part"/>
</menu>
+ <menu_item_call label="è¯çµé›†â€¦" name="pathfinding_linkset_menu_item"/>
<menu_item_call label="èšç„¦æ–¼æ‰€é¸éƒ¨ä½" name="Focus on Selection"/>
<menu_item_call label="縮放至所é¸éƒ¨ä½" name="Zoom to Selection"/>
<menu label="物件" name="Object">
@@ -277,6 +283,7 @@
<menu_item_check label="隨機變動幀率" name="Randomize Framerate"/>
<menu_item_check label="定期出ç¾æ…¢å¹€çŽ‡" name="Periodic Slow Frame"/>
<menu_item_check label="ç•«é¢æ¸¬è©¦" name="Frame Test"/>
+ <menu_item_call label="幀特性" name="Frame Profile"/>
</menu>
<menu label="呈åƒçš„元資料" name="Render Metadata">
<menu_item_check label="外框箱" name="Bounding Boxes"/>
@@ -311,9 +318,10 @@
<menu_item_check label="軸" name="Axes"/>
<menu_item_check label="切線基礎" name="Tangent Basis"/>
<menu_item_call label="å·²é¸å–æ質資訊基礎" name="Selected Texture Info Basis"/>
+ <menu_item_call label="所é¸æ料資訊" name="Selected Material Info"/>
<menu_item_check label="線框" name="Wireframe"/>
<menu_item_check label="物件導å‘çš„é®è”½" name="Object-Object Occlusion"/>
- <menu_item_check label="光線和陰影" name="Advanced Lighting Model"/>
+ <menu_item_check label="進階照明模型" name="Advanced Lighting Model"/>
<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
<menu_item_check label="å±å¹•ç©ºé–“環境光é®è”½å’Œé™°å½±å¹³æ»‘技術" name="SSAO and Shadow Smoothing"/>
<menu_item_check label="GL 除錯" name="Debug GL"/>
@@ -323,7 +331,6 @@
<menu_item_check label="動作æ質" name="Animation Textures"/>
<menu_item_check label="關閉æ質" name="Disable Textures"/>
<menu_item_check label="全解æžåº¦æ質" name="Rull Res Textures"/>
- <menu_item_check label="æ質圖集（實驗性質）" name="Texture Atlas"/>
<menu_item_check label="使附著燈光呈åƒ" name="Render Attached Lights"/>
<menu_item_check label="使附著例å效果呈åƒ" name="Render Attached Particles"/>
<menu_item_check label="åœæ‡¸ç™¼å…‰ç‰©ä»¶" name="Hover Glow Objects"/>
@@ -359,7 +366,6 @@
<menu_item_call label="傾å°ç„¦é»žå®¹å™¨" name="Dump Focus Holder"/>
<menu_item_call label="列å°æ‰€é¸ç‰©ä»¶è³‡è¨Š" name="Print Selected Object Info"/>
<menu_item_call label="列å°ç”¨æˆ¶è³‡è¨Š" name="Print Agent Info"/>
- <menu_item_call label="計憶體狀態" name="Memory Stats"/>
<menu_item_check label="地å€é™¤éŒ¯æŽ§åˆ¶å°" name="Region Debug Console"/>
<menu_item_check label="除錯 SelectMgr" name="Debug SelectMgr"/>
<menu_item_check label="除錯點按動作" name="Debug Clicks"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 59be26d43bf..864f20fc158 100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -210,6 +210,14 @@
ä½ ä»è¦æ–°å¢žé€™é …能力給「[ROLE_NAME]ã€ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å¦" yestext="是"/>
</notification>
+ <notification name="EjectGroupMemberWarning">
+ ä½ å³å°‡æŠŠ [AVATAR_NAME] 踢出群組。
+ <usetemplate ignoretext="確定將æŸäººè¸¢å‡ºç¾¤çµ„" name="okcancelignore" notext="å–消" yestext="踢出"/>
+ </notification>
+ <notification name="EjectGroupMembersWarning">
+ ä½ å³å°‡æŠŠ [COUNT] 個人踢出群組。
+ <usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="å–消" yestext="踢出"/>
+ </notification>
<notification name="AttachmentDrop">
ä½ å³å°‡å¸é™¤ä½ 的附件。
ä½ ç¢ºå®šä½ è¦ç¹¼çºŒï¼Ÿ
@@ -1470,13 +1478,43 @@ SHA1 指紋：[MD5_DIGEST]
</notification>
<notification name="RequiredUpdateDownloadedVerboseDialog">
我們已下載了一個必è¦çš„軟體更新。
-版本：[VERSION]
+[VERSION] 版本 [[INFO_URL] 關於æ¤æ›´æ–°çš„資訊]
æˆ‘é–€å¿…é ˆé‡æ–°å•Ÿå‹• [APP_NAME] 以安è£æ›´æ–°ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
<notification name="RequiredUpdateDownloadedDialog">
æˆ‘é–€å¿…é ˆé‡æ–°å•Ÿå‹• [APP_NAME] 以安è£æ›´æ–°ã€‚
+[[INFO_URL] 關於æ¤æ›´æ–°çš„資訊]
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundTip">
+ æˆ‘å€‘å·²ç‚ºä½ çš„ [APP_NAME] 軟體下載了更新。
+版本：[VERSION]
+原本試驗性質的ç€è¦½å™¨å·²è¢« [NEW_CHANNEL] ç€è¦½å™¨å–代，
+åƒè¦‹[[INFO_URL] æ¤æ›´æ–°ç‰ˆçš„詳情]
+ <usetemplate name="okcancelbuttons" notext="ç¨å€™..." yestext="ç«‹å³å®‰è£ä¸¦é‡æ–°å•Ÿå‹• [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelDownloadBackgroundDialog">
+ æˆ‘å€‘å·²ç‚ºä½ çš„ [APP_NAME] 軟體下載了更新。
+版本：[VERSION]
+原本試驗性質的ç€è¦½å™¨å·²è¢« [NEW_CHANNEL] ç€è¦½å™¨å–代，
+åƒè¦‹[[INFO_URL] 介紹æ¤æ›´æ–°ç‰ˆçš„資訊]
+ <usetemplate name="okcancelbuttons" notext="ç¨å€™â€¦" yestext="ç«‹å³å®‰è£ä¸¦é‡æ–°å•Ÿå‹• [APP_NAME]"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+ 我們已下載了一個必è¦çš„軟體更新。
+版本：[VERSION]
+原本試驗性質的ç€è¦½å™¨å·²è¢« [NEW_CHANNEL] ç€è¦½å™¨å–代，
+åƒè¦‹[[INFO_URL] 介紹æ¤æ›´æ–°ç‰ˆçš„資訊]
+
+æˆ‘å€‘å¿…é ˆé‡æ–°å•Ÿå‹• [APP_NAME] 以便安è£æ›´æ–°ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
+ <notification name="OtherChannelRequiredUpdateDownloadedDialog">
+ æˆ‘å€‘å¿…é ˆé‡æ–°å•Ÿå‹• [APP_NAME] 以便安è£æ›´æ–°ã€‚
+原本試驗性質的ç€è¦½å™¨å·²è¢« [NEW_CHANNEL] ç€è¦½å™¨å–代，
+åƒè¦‹[[INFO_URL] 介紹æ¤æ›´æ–°ç‰ˆçš„資訊]
<usetemplate name="okbutton" yestext="確定"/>
</notification>
<notification name="DeedObjectToGroup">
@@ -1527,6 +1565,10 @@ SHA1 指紋：[MD5_DIGEST]
是å¦è¦é›¢é–‹ç¾¤çµ„？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="OwnerCannotLeaveGroup">
+ 無法離開群組。 ä½ æ˜¯æ¤ç¾¤çµ„僅å˜çš„所有人，ä¸å¾—離開群組。 請先把所有人è·éŠœæŒ‡æ´¾çµ¦å¦ä¸€äººã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="ConfirmKick">
ä½ ç¢ºå®šè¦è¸¢å‡ºé€™ç¶²æ ¼å…§çš„全部居民？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="踢出全部居民"/>
@@ -2386,9 +2428,7 @@ SHA1 指紋：[MD5_DIGEST]
ï¼ˆä½ é‚„å¯ä»¥ç›´æŽ¥æŒ‰å…©ä¸‹é‚£å€‹åœ°æ¨™ï¼Œæˆ–æŒ‰æ»‘é¼ å³éµï¼Œé¸æ“‡ã€Œçž¬é–“傳é€ã€ã€‚）
</notification>
<notification name="TeleportToPerson">
- è¦è¯çµ¡å¦‚「[NAME]ã€çš„任何一ä½å±…民，請點按「人群ã€æŒ‰éˆ•ï¼Œå¾žæ‰“開的視窗ä¸é¸æ“‡ä¸€ä½å±…民，å†é»žæŒ‰è¦–窗底下的「IMã€ã€‚
-
- ï¼ˆä½ é‚„å¯ä»¥å¾žæ¸…單直接按兩下åå—ï¼Œæˆ–æŒ‰æ»‘é¼ å³éµï¼Œé¸æ“‡ã€ŒIMã€ã€‚）
+ è¦å’ŒæŸäººç§ä¸‹äº¤è«‡ï¼Œè«‹å³éµé»žæŒ‰åŒ–身，å†é»žæŒ‰é¸å–®çš„「IMã€ã€‚
</notification>
<notification name="CantSelectLandFromMultipleRegions">
無法é¸æ“‡è¶…出伺æœå™¨é‚Šç•Œçš„土地。
@@ -2762,6 +2802,15 @@ SHA1 指紋：[MD5_DIGEST]
<button name="Deny" text="拒絕"/>
</form>
</notification>
+ <notification name="UnknownScriptQuestion">
+ ç”± '[NAME]' 所æ“有的物件 '<nolink>[OBJECTNAME]</nolink>' æ£è«‹æ±‚æŸé …執行時期腳本權é™ï¼Œä½†æœ¬ç€è¦½å™¨ç„¡æ³•è¾¨è˜è©²æ¬Šé™ï¼Œæ•…ä¸å…准。
+
+欲准許æ¤æ¬Šé™ï¼Œè«‹å¾ž [DOWNLOADURL] 下載並更新為最新版ç€è¦½å™¨ã€‚
+ <form name="form">
+ <button name="Deny" text="確定"/>
+ <button name="Mute" text="å°éŽ–"/>
+ </form>
+ </notification>
<notification name="ScriptDialog">
[NAME] çš„ '<nolink>[TITLE]</nolink>'
[MESSAGE]
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 5f7aca387a6..da5918d5534 100755
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -49,6 +49,9 @@
<menu_button name="plus_btn" tool_tip="åŠ å…¥ç¾¤çµ„/創立新群組"/>
<dnd_button name="minus_btn" tool_tip="離開所é¸ç¾¤çµ„"/>
</panel>
+ <text name="groupcount">
+ ä½ ç›®å‰å±¬æ–¼ [COUNT] 個群組，å¯å†åŠ å…¥ [REMAINING] 個。
+ </text>
</panel>
<panel label="最近" name="recent_panel">
<panel label="bottom_panel" name="recent_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index e700e35516d..b5cdddc252f 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="æ–‡å—èŠå¤©" name="chat">
- <panel>
- <check_box initial_value="true" label="èŠå¤©æ™‚æ’放打å—動作" name="play_typing_animation"/>
+ <panel name="general_chat_settings">
+ <check_box initial_value="true" label="èŠå¤©æ™‚呈ç¾æ‰“å—動作" name="play_typing_animation"/>
<check_box label="當我離線時將收到的 IM 訊æ¯éƒµå¯„給我" name="send_im_to_email"/>
- <check_box label="åªæœ‰æˆ‘的朋å‹å’Œç¾¤çµ„å¯ä»¥ IM 或與我通話。" name="voice_call_friends_only_check"/>
+ <check_box label="åªå…許我的朋å‹å’Œç¾¤çµ„與我通話或 IM 給我" name="voice_call_friends_only_check"/>
<text name="font_size">
- å—型尺寸：
+ å—型大å°ï¼š
</text>
<combo_box name="chat_font_size">
<item label="å°" name="Small" value="0"/>
@@ -14,10 +14,7 @@
</combo_box>
<check_box label="èŠå¤©æ³¡æ³¡" name="bubble_text_chat"/>
</panel>
- <panel>
- <text name="notifications">
- 通知
- </text>
+ <panel name="im_notification_settings">
<text name="friend_ims">
æœ‹å‹ IM：
</text>
@@ -25,8 +22,9 @@
<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
<item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
- <item label="ç„¡" name="None" value="ç„¡"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_friend_im"/>
<text name="non_friend_ims">
éžæœ‹å‹ IM：
</text>
@@ -34,8 +32,9 @@
<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
<item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
- <item label="ç„¡" name="None" value="ç„¡"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_non_friend_im"/>
<text name="conference_ims">
多方交談 IM：
</text>
@@ -43,8 +42,9 @@
<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
<item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
- <item label="ç„¡" name="None" value="ç„¡"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_conference_im"/>
<text name="group_chat">
群組èŠå¤©ï¼š
</text>
@@ -52,8 +52,9 @@
<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
<item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
- <item label="ç„¡" name="None" value="ç„¡"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_group_chat_im"/>
<text name="nearby_chat">
附近的èŠå¤©ï¼š
</text>
@@ -61,13 +62,24 @@
<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
<item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
- <item label="ç„¡" name="None" value="ç„¡"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
+ </combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_nearby_chat_im"/>
+ <text name="object_ims">
+ 來自物件的 IM：
+ </text>
+ <combo_box name="ObjectIMOptions">
+ <item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+ <item label="以çªé¡¯å¼è¦–窗顯示訊æ¯" name="PopUpMessage" value="toast"/>
+ <item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+ <item label="無動作" name="NoAction" value="noaction"/>
</combo_box>
+ <check_box label="æ’放è²éŸ³" name="play_sound_object_im"/>
<text name="notifications_alert">
è‹¥è¦æš«æ™‚åœæ¢æ‰€æœ‰é€šçŸ¥ï¼Œè«‹è¨å®šã€Œæºé€š > 請勿打擾ã€ã€‚
</text>
</panel>
- <panel>
+ <panel name="play_sound_settings">
<text name="play_sound">
æ’放è²éŸ³ï¼š
</text>
@@ -76,9 +88,9 @@
<check_box label="瞬間傳é€é‚€è«‹" name="teleport_offer"/>
<check_box label="收ç´ç‰©å“è´ˆé€" name="inventory_offer"/>
</panel>
- <panel>
- <button label="清空記錄……" name="clear_log"/>
- <button label="刪除交談內容記錄……" name="delete_transcripts"/>
+ <panel name="log_settings">
+ <button label="清空記錄…" name="clear_log"/>
+ <button label="刪除交談內容記錄…" name="delete_transcripts"/>
<button label="ç€è¦½â€¦" label_selected="ç€è¦½" name="log_path_button"/>
</panel>
<button label="ç¿»è¯â€¦" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 3948a489920..2311eb99a75 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
<check_box initial_value="true" label="本地光線" name="LocalLights"/>
<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉æ¤ä¸€é¸é …å¯èƒ½é¿å…部分顯示å¡é©…動程å¼æ毀當機"/>
<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
- <check_box initial_value="true" label="光線和陰影" name="UseLightShaders"/>
+ <check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
<check_box initial_value="true" label="環境光é®è”½" name="UseSSAO"/>
<check_box initial_value="true" label="景深" name="UseDoF"/>
<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index a607a7c33b9..0fcc49b2034 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
<combo_box.item label="自動安è£" name="Install_automatically"/>
<combo_box.item label="手動下載åŠå®‰è£" name="Install_manual"/>
</combo_box>
+ <check_box label="願æ„在更新時æ¶å…ˆè©¦ç”¨é‡‹å‡ºå€™é¸ç‰ˆ" name="update_willing_to_test"/>
<text name="Proxy Settings:">
代ç†ä¼ºæœå™¨è¨å®šï¼š
</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 29e9a35869f..198e59be7be 100755
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -34,6 +34,7 @@
<menu_item_call label="å…¨é¸" name="Select All"/>
<menu_item_call label="å–消é¸æ“‡" name="Deselect"/>
<menu_item_call label="æœå°‹ / å–代..." name="Search / Replace..."/>
+ <menu_item_call label="å‰å¾€æŸè¡Œæ•¸â€¦" name="Go to line..."/>
</menu>
<menu label="幫助" name="Help">
<menu_item_call label="幫助..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
new file mode 100644
index 00000000000..5ea6d818c73
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?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>
+ <color_swatch label="" name="colorswatch" tool_tip="點按以開啟é¡è‰²æŒ‘é¸å™¨"/>
+ <text name="color trans">
+ é€æ˜Žåº¦ %
+ </text>
+ <text name="glow label">
+ 光暈
+ </text>
+ <check_box label="全亮" name="checkbox fullbright"/>
+ <combo_box name="combobox matmedia">
+ <combo_box.item label="ææ–™" name="Materials"/>
+ <combo_box.item label="媒體" name="Media"/>
+ </combo_box>
+ <combo_box name="combobox mattype">
+ <combo_box.item label="æ質（漫å射圖）" name="Texture (diffuse)"/>
+ <combo_box.item label="凹凸度（æ£äº¤ï¼‰" name="Bumpiness (normal)"/>
+ <combo_box.item label="閃亮度（é¡å光）" name="Shininess (specular)"/>
+ </combo_box>
+ <texture_picker label="æ質" name="texture control" tool_tip="點按以挑é¸åœ–片"/>
+ <text name="label alphamode">
+ åŠé€æ˜Žæ¨¡å¼
+ </text>
+ <combo_box name="combobox alphamode">
+ <combo_box.item label="ç„¡" name="None"/>
+ <combo_box.item label="åŠé€æ˜Žæ”™æ··" name="Alpha blending"/>
+ <combo_box.item label="åŠé€æ˜Žé®ç½©" name="Alpha masking"/>
+ <combo_box.item label="自發光é®ç½©" name="Emissive mask"/>
+ </combo_box>
+ <text name="label maskcutoff">
+ é®ç½©æˆªæ–·å€¼
+ </text>
+ <texture_picker label="æ質" name="bumpytexture control" tool_tip="點按以挑é¸åœ–片"/>
+ <text name="label bumpiness">
+ 凹凸度
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_box.item label="ç„¡" name="None"/>
+ <combo_box.item label="亮度" name="Brightness"/>
+ <combo_box.item label="暗度" name="Darkness"/>
+ <combo_box.item label="木紋" name="woodgrain"/>
+ <combo_box.item label="樹皮" name="bark"/>
+ <combo_box.item label="磚" name="bricks"/>
+ <combo_box.item label="æ ¼å" name="checker"/>
+ <combo_box.item label="æ··å‡åœŸ" name="concrete"/>
+ <combo_box.item label="粗花磚" name="crustytile"/>
+ <combo_box.item label="石磚" name="cutstone"/>
+ <combo_box.item label="圓盤" name="discs"/>
+ <combo_box.item label="碎石" name="gravel"/>
+ <combo_box.item label="培養皿" name="petridish"/>
+ <combo_box.item label="å´é‚Šç‰‡" name="siding"/>
+ <combo_box.item label="çŸ³ç£šæ ¼" name="stonetile"/>
+ <combo_box.item label="彩色沙岩" name="stucco"/>
+ <combo_box.item label="å¸é™„" name="suction"/>
+ <combo_box.item label="編織" name="weave"/>
+ </combo_box>
+ <texture_picker label="æ質" name="shinytexture control" tool_tip="點按以挑é¸åœ–片"/>
+ <text name="label shininess">
+ 閃亮度
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_box.item label="ç„¡" name="None"/>
+ <combo_box.item label="低" name="Low"/>
+ <combo_box.item label="ä¸" name="Medium"/>
+ <combo_box.item label="高" name="High"/>
+ </combo_box>
+ <text name="label glossiness">
+ 光滑度
+ </text>
+ <text name="label environment">
+ 環境
+ </text>
+ <text name="label shinycolor">
+ é¡è‰²
+ </text>
+ <color_swatch label="" name="shinycolorswatch" tool_tip="點按以開啟é¡è‰²æŒ‘é¸å™¨"/>
+ <text name="media_info">
+ 所é¸åª’體如有 URL，置於æ¤
+ </text>
+ <button label="é¸æ“‡â€¦" name="add_media" tool_tip="æ·»åŠ åª’é«”"/>
+ <button label="移除" name="delete_media" tool_tip="刪除這個媒體æ質"/>
+ <button label="å°é½Š" label_selected="å°é½Šåª’é«”" name="button align" tool_tip="å°é½Šåª’é«”æè³ªï¼ˆé ˆå…ˆè¼‰å…¥ï¼‰"/>
+ <text name="tex gen">
+ æ˜ å°„æ–¹å¼
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_box.item label="é è¨" name="Default"/>
+ <combo_box.item label="å¹³é¢" name="Planar"/>
+ </combo_box>
+ <spinner label="水平刻度" name="TexScaleU"/>
+ <spinner label="垂直刻度" name="TexScaleV"/>
+ <spinner label="æ¯å…¬å°ºé‡è¦†æ¬¡æ•¸" name="rptctrl"/>
+ <spinner label="旋轉角度" name="TexRot"/>
+ <spinner label="æ°´å¹³åè·" name="TexOffsetU"/>
+ <spinner label="åž‚ç›´åè·" name="TexOffsetV"/>
+ <spinner label="水平刻度" name="bumpyScaleU"/>
+ <spinner label="垂直刻度" name="bumpyScaleV"/>
+ <spinner label="旋轉角度" name="bumpyRot"/>
+ <spinner label="æ°´å¹³åè·" name="bumpyOffsetU"/>
+ <spinner label="åž‚ç›´åè·" name="bumpyOffsetV"/>
+ <spinner label="水平刻度" name="shinyScaleU"/>
+ <spinner label="垂直刻度" name="shinyScaleV"/>
+ <spinner label="旋轉角度" name="shinyRot"/>
+ <spinner label="æ°´å¹³åè·" name="shinyOffsetU"/>
+ <spinner label="åž‚ç›´åè·" name="shinyOffsetV"/>
+ <check_box initial_value="false" label="å°é½Šå¹³é¢" name="checkbox planar align" 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 767bcecde75..9587981444a 100755
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -25,7 +25,7 @@
</action_set>
<action_set description="這些能力包括å¯æ›´æ”¹åœ°æ®µå稱和發佈è¨å®šã€è¨å®šæ˜¯å¦å…¬é–‹åˆ°æœå°‹çµæžœã€è¨å®šç™»é™¸åœ°é»žå’Œçž¬é–“傳é€ç¹žè·¯é¸é …。" name="Parcel Identity">
<action description="切æ›ã€Œå°‡åœ°é»žé¡¯ç¤ºåœ¨æœå°‹çµæžœã€è¨å®šï¼Œä¸¦é¸å®šé¡žåˆ¥" longdescription="切æ›ã€Œå°‡åœ°é»žé¡¯ç¤ºåœ¨æœå°‹çµæžœã€è¨å®šï¼Œä¸¦åœ¨ã€ŒåœŸåœ°è³‡æ–™ã€> é¸é …é 籤è¨å®šåœ°æ®µé¡žåˆ¥ã€‚" name="land find places" value="17"/>
- <action description="更改地段å稱ã€æ述，和「將地點顯示在æœå°‹çµæžœã€è¨å®šã€‚" longdescription="更改地段å稱ã€æ述，和「將地點顯示在æœå°‹çµæžœã€è¨å®šã€‚ 這å¯åœ¨ã€ŒåœŸåœ°è³‡æ–™ã€> é¸é …é 籤完æˆã€‚" name="land change identity" value="18"/>
+ <action description="更改地段å稱ã€æè¿°ã€ã€Œé©åº¦æˆäººå…§å®¹ã€è¨å®š" longdescription="更改地段å稱ã€æè¿°ã€ã€Œé©åº¦æˆäººå…§å®¹ã€è¨å®šã€‚ 這å¯åœ¨ã€ŒåœŸåœ°è³‡æ–™ã€> é¸é …é 籤完æˆã€‚" name="land change identity" value="18"/>
<action description="è¨å®šç™»é™¸åœ°é»žå’Œçž¬é–“傳é€ç¹žè·¯è¨å®šã€‚" longdescription="åœ¨ç¾¤çµ„æ‰€æœ‰çš„åœ°æ®µä¸Šï¼Œèº«è² å…·æ¤èƒ½åŠ›çš„æˆå“¡ï¼Œå¯ä»¥è¨å®šäººå€‘瞬間傳é€é€²ä¾†æ™‚的登陸地點，和瞬間傳é€çš„繞路é¸é …。 這å¯åœ¨ã€ŒåœŸåœ°è³‡æ–™ã€> é¸é …é 籤完æˆã€‚" name="land set landing point" value="19"/>
</action_set>
<action_set description="這些能力包括有權更改地段é¸é …，例如「新建物件ã€ã€ã€Œç·¨è¼¯åœ°å½¢ã€ï¼Œå’ŒéŸ³æ¨‚ã€åª’é«”è¨å®šç‰ã€‚" name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 31713ac2816..d9fa105ef49 100755
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -139,6 +139,9 @@
<string name="create_account_url">
http://join.secondlife.com/?sourceid=[sourceid]
</string>
+ <string name="ViewerDownloadURL">
+ http://secondlife.com/download
+ </string>
<string name="LoginFailedViewerNotPermitted">
ä½ ç›®å‰æ‰€ç”¨çš„ Viewer 已經無法å†é€²å…¥ç¬¬äºŒäººç”Ÿã€‚ 請到這個é é¢ä¸‹è¼‰æœ€æ–° Viewer：
http://secondlife.com/download
@@ -443,6 +446,9 @@ http://secondlife.com/viewer-access-faq
<string name="SLappAgentRequestFriend">
交å‹è¦æ±‚
</string>
+ <string name="SLappAgentRemoveFriend">
+ 移除朋å‹
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
關閉（⌘W）
</string>
@@ -830,6 +836,9 @@ http://secondlife.com/viewer-access-faq
<string name="multiple_textures">
多個
</string>
+ <string name="use_texture">
+ 使用æ質
+ </string>
<string name="texture_loading">
載入ä¸...
</string>
@@ -929,6 +938,21 @@ http://secondlife.com/viewer-access-faq
<string name="TeleportYourAgent">
瞬間傳é€ä½ 本人
</string>
+ <string name="JoinAnExperience">
+ åŠ å…¥é«”é©—
+ </string>
+ <string name="SilentlyManageEstateAccess">
+ 管ç†é ˜å‡ºå…¥è¨±å¯å單時，ä¸é¡¯ç¤ºè¦ç¤º
+ </string>
+ <string name="OverrideYourAnimations">
+ 替æ›ä½ é è¨çš„動作
+ </string>
+ <string name="ScriptReturnObjects">
+ ç‚ºä½ é€è¿”物件
+ </string>
+ <string name="UnknownScriptPermission">
+ （未知）ï¼
+ </string>
<string name="SIM_ACCESS_PG">
一般普級
</string>
@@ -1960,6 +1984,12 @@ http://secondlife.com/viewer-access-faq
<string name="ATTACH_HUD_BOTTOM_RIGHT">
æ“¡é 顯示å³ä¸‹
</string>
+ <string name="ATTACH_NECK">
+ é ¸éƒ¨
+ </string>
+ <string name="ATTACH_AVATAR_CENTER">
+ 化身ä¸å¿ƒ
+ </string>
<string name="CursorPos">
橫行 [LINE]，縱列 [COLUMN]
</string>
@@ -2989,6 +3019,9 @@ http://secondlife.com/viewer-access-faq
<string name="Hip Width">
腰寬
</string>
+ <string name="Hover">
+ åœæ‡¸
+ </string>
<string name="In">
å‘å…§
</string>
@@ -5085,4 +5118,7 @@ http://secondlife.com/viewer-access-faq
<string name="logging_calls_enabled_log_empty">
ç›®å‰æ²’有交談記錄。 åœ¨ä½ è¯çµ¡æŸäººæˆ–æŸäººè¯çµ¡ä½ 之後，這裡將留å˜è¨˜éŒ„。
</string>
+ <string name="loading_chat_logs">
+ 載入ä¸â€¦
+ </string>
</strings>
--
GitLab