From b65e54d1028a0cfa42589d7dc590384ceedf5cac Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Fri, 6 Jan 2017 18:43:51 -0800
Subject: [PATCH] INTL-238 FIX translate Viewer Set46 for Repo viewer-lynx
(DRTVWR-428)
---
.../default/xui/de/floater_model_preview.xml | 1 +
.../skins/default/xui/de/floater_pay.xml | 23 ++-
.../default/xui/de/floater_script_queue.xml | 6 +
.../default/xui/de/floater_web_content.xml | 4 +
.../default/xui/de/menu_attachment_other.xml | 1 +
.../default/xui/de/menu_attachment_self.xml | 1 +
.../default/xui/de/menu_avatar_other.xml | 1 +
.../skins/default/xui/de/menu_avatar_self.xml | 1 +
.../skins/default/xui/de/menu_login.xml | 3 +-
.../skins/default/xui/de/menu_object_icon.xml | 1 +
.../skins/default/xui/de/menu_outfit_gear.xml | 5 +
.../xui/de/menu_people_friends_view.xml | 1 +
.../default/xui/de/menu_people_nearby.xml | 2 +
.../xui/de/menu_people_nearby_view.xml | 1 +
.../default/xui/de/menu_url_objectim.xml | 1 +
.../skins/default/xui/de/menu_viewer.xml | 13 +-
.../skins/default/xui/de/menu_wearing_tab.xml | 2 +
.../skins/default/xui/de/mime_types.xml | 10 ++
.../skins/default/xui/de/notifications.xml | 126 ++++++++++++-----
.../xui/de/panel_outfits_inventory.xml | 1 +
.../default/xui/de/panel_outfits_wearing.xml | 9 +-
.../xui/de/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/de/strings.xml | 82 ++++++++++-
.../default/xui/es/floater_model_preview.xml | 1 +
.../skins/default/xui/es/floater_pay.xml | 23 ++-
.../default/xui/es/floater_script_queue.xml | 6 +
.../default/xui/es/floater_web_content.xml | 4 +
.../default/xui/es/menu_attachment_other.xml | 1 +
.../default/xui/es/menu_attachment_self.xml | 1 +
.../default/xui/es/menu_avatar_other.xml | 1 +
.../skins/default/xui/es/menu_avatar_self.xml | 1 +
.../skins/default/xui/es/menu_login.xml | 3 +-
.../skins/default/xui/es/menu_object_icon.xml | 1 +
.../skins/default/xui/es/menu_outfit_gear.xml | 5 +
.../xui/es/menu_people_friends_view.xml | 1 +
.../default/xui/es/menu_people_nearby.xml | 2 +
.../xui/es/menu_people_nearby_view.xml | 1 +
.../default/xui/es/menu_url_objectim.xml | 1 +
.../skins/default/xui/es/menu_viewer.xml | 13 +-
.../skins/default/xui/es/menu_wearing_tab.xml | 2 +
.../skins/default/xui/es/mime_types.xml | 31 +++--
.../skins/default/xui/es/notifications.xml | 129 ++++++++++++-----
.../xui/es/panel_outfits_inventory.xml | 1 +
.../default/xui/es/panel_outfits_wearing.xml | 9 +-
.../xui/es/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/es/strings.xml | 86 +++++++++++-
.../default/xui/fr/floater_model_preview.xml | 1 +
.../skins/default/xui/fr/floater_pay.xml | 23 ++-
.../floater_preferences_graphics_advanced.xml | 2 +-
.../default/xui/fr/floater_script_queue.xml | 6 +
.../default/xui/fr/floater_web_content.xml | 4 +
.../default/xui/fr/menu_attachment_other.xml | 1 +
.../default/xui/fr/menu_attachment_self.xml | 1 +
.../default/xui/fr/menu_avatar_other.xml | 1 +
.../skins/default/xui/fr/menu_avatar_self.xml | 1 +
.../skins/default/xui/fr/menu_login.xml | 3 +-
.../skins/default/xui/fr/menu_object_icon.xml | 1 +
.../skins/default/xui/fr/menu_outfit_gear.xml | 5 +
.../xui/fr/menu_people_friends_view.xml | 1 +
.../default/xui/fr/menu_people_nearby.xml | 2 +
.../xui/fr/menu_people_nearby_view.xml | 1 +
.../default/xui/fr/menu_url_objectim.xml | 1 +
.../skins/default/xui/fr/menu_viewer.xml | 13 +-
.../skins/default/xui/fr/menu_wearing_tab.xml | 2 +
.../skins/default/xui/fr/mime_types.xml | 31 +++--
.../skins/default/xui/fr/notifications.xml | 131 +++++++++++++-----
.../xui/fr/panel_outfits_inventory.xml | 1 +
.../default/xui/fr/panel_outfits_wearing.xml | 9 +-
.../xui/fr/panel_preferences_graphics1.xml | 2 +-
.../xui/fr/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/fr/strings.xml | 84 ++++++++++-
.../default/xui/it/floater_model_preview.xml | 1 +
.../skins/default/xui/it/floater_pay.xml | 23 ++-
.../default/xui/it/floater_script_queue.xml | 6 +
.../default/xui/it/floater_web_content.xml | 4 +
.../default/xui/it/menu_attachment_other.xml | 1 +
.../default/xui/it/menu_attachment_self.xml | 1 +
.../default/xui/it/menu_avatar_other.xml | 1 +
.../skins/default/xui/it/menu_avatar_self.xml | 1 +
.../skins/default/xui/it/menu_login.xml | 3 +-
.../skins/default/xui/it/menu_object_icon.xml | 1 +
.../skins/default/xui/it/menu_outfit_gear.xml | 5 +
.../xui/it/menu_people_friends_view.xml | 1 +
.../default/xui/it/menu_people_nearby.xml | 2 +
.../xui/it/menu_people_nearby_view.xml | 1 +
.../default/xui/it/menu_url_objectim.xml | 1 +
.../skins/default/xui/it/menu_viewer.xml | 13 +-
.../skins/default/xui/it/menu_wearing_tab.xml | 2 +
.../skins/default/xui/it/mime_types.xml | 31 +++--
.../skins/default/xui/it/notifications.xml | 130 ++++++++++++-----
.../xui/it/panel_outfits_inventory.xml | 1 +
.../default/xui/it/panel_outfits_wearing.xml | 9 +-
.../xui/it/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/it/strings.xml | 84 ++++++++++-
.../default/xui/ja/floater_model_preview.xml | 1 +
.../skins/default/xui/ja/floater_pay.xml | 23 ++-
.../default/xui/ja/floater_script_queue.xml | 6 +
.../default/xui/ja/floater_web_content.xml | 4 +
.../default/xui/ja/menu_attachment_other.xml | 1 +
.../default/xui/ja/menu_attachment_self.xml | 1 +
.../default/xui/ja/menu_avatar_other.xml | 1 +
.../skins/default/xui/ja/menu_avatar_self.xml | 1 +
.../skins/default/xui/ja/menu_login.xml | 3 +-
.../skins/default/xui/ja/menu_object_icon.xml | 1 +
.../skins/default/xui/ja/menu_outfit_gear.xml | 5 +
.../xui/ja/menu_people_friends_view.xml | 1 +
.../default/xui/ja/menu_people_nearby.xml | 2 +
.../xui/ja/menu_people_nearby_view.xml | 1 +
.../default/xui/ja/menu_url_objectim.xml | 1 +
.../skins/default/xui/ja/menu_viewer.xml | 13 +-
.../skins/default/xui/ja/menu_wearing_tab.xml | 2 +
.../skins/default/xui/ja/mime_types.xml | 31 +++--
.../skins/default/xui/ja/notifications.xml | 131 +++++++++++++-----
.../xui/ja/panel_outfits_inventory.xml | 3 +-
.../default/xui/ja/panel_outfits_wearing.xml | 9 +-
.../xui/ja/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/ja/strings.xml | 88 +++++++++++-
.../default/xui/pt/floater_model_preview.xml | 1 +
.../skins/default/xui/pt/floater_pay.xml | 23 ++-
.../default/xui/pt/floater_script_queue.xml | 6 +
.../default/xui/pt/floater_web_content.xml | 4 +
.../default/xui/pt/menu_attachment_other.xml | 1 +
.../default/xui/pt/menu_attachment_self.xml | 1 +
.../default/xui/pt/menu_avatar_other.xml | 1 +
.../skins/default/xui/pt/menu_avatar_self.xml | 1 +
.../skins/default/xui/pt/menu_login.xml | 3 +-
.../skins/default/xui/pt/menu_object_icon.xml | 1 +
.../skins/default/xui/pt/menu_outfit_gear.xml | 5 +
.../xui/pt/menu_people_friends_view.xml | 1 +
.../default/xui/pt/menu_people_nearby.xml | 2 +
.../xui/pt/menu_people_nearby_view.xml | 1 +
.../default/xui/pt/menu_url_objectim.xml | 1 +
.../skins/default/xui/pt/menu_viewer.xml | 13 +-
.../skins/default/xui/pt/menu_wearing_tab.xml | 2 +
.../skins/default/xui/pt/mime_types.xml | 31 +++--
.../skins/default/xui/pt/notifications.xml | 127 ++++++++++++-----
.../xui/pt/panel_outfits_inventory.xml | 1 +
.../default/xui/pt/panel_outfits_wearing.xml | 9 +-
.../xui/pt/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/pt/strings.xml | 84 ++++++++++-
.../default/xui/ru/floater_model_preview.xml | 1 +
.../skins/default/xui/ru/floater_pay.xml | 23 ++-
.../default/xui/ru/floater_script_queue.xml | 6 +
.../default/xui/ru/floater_web_content.xml | 4 +
.../default/xui/ru/menu_attachment_other.xml | 1 +
.../default/xui/ru/menu_attachment_self.xml | 1 +
.../default/xui/ru/menu_avatar_other.xml | 1 +
.../skins/default/xui/ru/menu_avatar_self.xml | 1 +
.../skins/default/xui/ru/menu_login.xml | 3 +-
.../skins/default/xui/ru/menu_object_icon.xml | 1 +
.../skins/default/xui/ru/menu_outfit_gear.xml | 5 +
.../xui/ru/menu_people_friends_view.xml | 1 +
.../default/xui/ru/menu_people_nearby.xml | 2 +
.../xui/ru/menu_people_nearby_view.xml | 1 +
.../default/xui/ru/menu_url_objectim.xml | 1 +
.../skins/default/xui/ru/menu_viewer.xml | 13 +-
.../skins/default/xui/ru/menu_wearing_tab.xml | 2 +
.../skins/default/xui/ru/mime_types.xml | 10 ++
.../skins/default/xui/ru/notifications.xml | 127 ++++++++++++-----
.../xui/ru/panel_outfits_inventory.xml | 1 +
.../default/xui/ru/panel_outfits_wearing.xml | 7 +
.../xui/ru/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/ru/strings.xml | 82 ++++++++++-
.../default/xui/tr/floater_model_preview.xml | 1 +
.../skins/default/xui/tr/floater_pay.xml | 23 ++-
.../floater_preferences_graphics_advanced.xml | 2 +-
.../default/xui/tr/floater_script_queue.xml | 6 +
.../default/xui/tr/floater_web_content.xml | 4 +
.../default/xui/tr/menu_attachment_other.xml | 1 +
.../default/xui/tr/menu_attachment_self.xml | 1 +
.../default/xui/tr/menu_avatar_other.xml | 1 +
.../skins/default/xui/tr/menu_avatar_self.xml | 1 +
.../skins/default/xui/tr/menu_login.xml | 3 +-
.../skins/default/xui/tr/menu_object_icon.xml | 1 +
.../skins/default/xui/tr/menu_outfit_gear.xml | 5 +
.../xui/tr/menu_people_friends_view.xml | 1 +
.../default/xui/tr/menu_people_nearby.xml | 2 +
.../xui/tr/menu_people_nearby_view.xml | 1 +
.../default/xui/tr/menu_url_objectim.xml | 1 +
.../skins/default/xui/tr/menu_viewer.xml | 13 +-
.../skins/default/xui/tr/menu_wearing_tab.xml | 2 +
.../skins/default/xui/tr/mime_types.xml | 10 ++
.../skins/default/xui/tr/notifications.xml | 128 ++++++++++++-----
.../xui/tr/panel_outfits_inventory.xml | 1 +
.../default/xui/tr/panel_outfits_wearing.xml | 7 +
.../xui/tr/panel_preferences_graphics1.xml | 2 +-
.../xui/tr/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/tr/strings.xml | 82 ++++++++++-
.../default/xui/zh/floater_model_preview.xml | 1 +
.../skins/default/xui/zh/floater_pay.xml | 23 ++-
.../floater_preferences_graphics_advanced.xml | 2 +-
.../default/xui/zh/floater_script_queue.xml | 6 +
.../default/xui/zh/floater_web_content.xml | 4 +
.../default/xui/zh/menu_attachment_other.xml | 1 +
.../default/xui/zh/menu_attachment_self.xml | 1 +
.../default/xui/zh/menu_avatar_other.xml | 1 +
.../skins/default/xui/zh/menu_avatar_self.xml | 1 +
.../skins/default/xui/zh/menu_login.xml | 3 +-
.../skins/default/xui/zh/menu_object_icon.xml | 1 +
.../skins/default/xui/zh/menu_outfit_gear.xml | 5 +
.../xui/zh/menu_people_friends_view.xml | 1 +
.../default/xui/zh/menu_people_nearby.xml | 2 +
.../xui/zh/menu_people_nearby_view.xml | 1 +
.../default/xui/zh/menu_url_objectim.xml | 1 +
.../skins/default/xui/zh/menu_viewer.xml | 13 +-
.../skins/default/xui/zh/menu_wearing_tab.xml | 2 +
.../skins/default/xui/zh/mime_types.xml | 10 ++
.../skins/default/xui/zh/notifications.xml | 129 ++++++++++++-----
.../xui/zh/panel_outfits_inventory.xml | 1 +
.../default/xui/zh/panel_outfits_wearing.xml | 7 +
.../xui/zh/panel_preferences_graphics1.xml | 2 +-
.../xui/zh/panel_preferences_setup.xml | 1 +
.../newview/skins/default/xui/zh/strings.xml | 84 ++++++++++-
213 files changed, 2255 insertions(+), 564 deletions(-)
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index f06e856966e..337fee8cb1b 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Skingewicht einschließen" name="upload_skin"/>
<check_box label="Gelenkpositionen einschließen" name="upload_joints"/>
+ <check_box label="Skala sperren, wenn Gelenkposition definiert ist" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Z-Offset (Avatar anheben oder senken):
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index 1882f5150b5..b9e253a6683 100644
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">Gruppe bezahlen</string>
- <string name="payee_resident">Einwohner bezahlen</string>
- <text name="paying_text">Sie zahlen:</text>
- <text left="130" name="payee_name">Extrem langen Namen testen, um zu prüfen, ob er abgeschnitten wird</text>
+ <string name="payee_group">
+ Gruppe bezahlen
+ </string>
+ <string name="payee_resident">
+ Einwohner bezahlen
+ </string>
+ <text name="paying_text">
+ Sie zahlen:
+ </text>
+ <text left="130" name="payee_name">
+ Extrem langen Namen testen, um zu prüfen, ob er abgeschnitten wird
+ </text>
+ <text name="payment_message_label">
+ Beschreibung (optional):
+ </text>
<panel label="Suchen" name="PatternsPanel">
<button label="L$ 1 zahlen" label_selected="L$ 1 zahlen" name="fastpay 1"/>
<button label="L$ 5 zahlen" label_selected="L$ 5 zahlen" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="L$ 20 zahlen" label_selected="L$ 20 zahlen" name="fastpay 20"/>
</panel>
<panel label="Suchen" name="InputPanel">
- <text name="amount text">Anderer Betrag:</text>
+ <text name="amount text">
+ Anderer Betrag:
+ </text>
<button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
index f267fe4b7c8..d11ce83a3e9 100644
--- a/indra/newview/skins/default/xui/de/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Läuft nicht
</floater.string>
+ <floater.string name="Timeout">
+ Timeout: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Inventar wird geladen für: [OBJECT_NAME]
+ </floater.string>
<button label="Schließen" label_selected="Schließen" left="215" name="close" width="72"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
index 6ab119eeab2..c5c6eb969f6 100644
--- a/indra/newview/skins/default/xui/de/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/de/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
<button name="popexternal" tool_tip="Aktuelle URL im Desktop-Browser öffnen"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Webtests Homepage"/>
+ <button name="VLC Plugin Test" tool_tip="MPEG4-Videotest"/>
+ </layout_panel>
</layout_stack>
</floater>
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 ba1b36db06a..e0f0ea72ed0 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Anrufen" name="Call"/>
<menu_item_call label="In Gruppe einladen" name="Invite..."/>
<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
+ <menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorieren" name="Avatar Mute"/>
<menu_item_call label="Melden" name="abuse"/>
<menu_item_call label="Einfrieren" name="Freeze..."/>
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 cd24e6ad3f5..f477b78b38b 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
<menu_item_call label="Schwebehöhe" name="Hover Height"/>
<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
+ <menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
<menu_item_call label="Meine Freunde" name="Friends..."/>
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
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 447655cde7b..9c24dc21991 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Anrufen" name="Call"/>
<menu_item_call label="In Gruppe einladen" name="Invite..."/>
<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
+ <menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorieren" name="Avatar Mute"/>
<menu_item_call label="Melden" name="abuse"/>
<menu_item_call label="Einfrieren" name="Freeze..."/>
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 f4a3cc17b89..9b6e267b425 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
<menu_item_call label="Schwebehöhe" name="Hover Height"/>
<menu_item_call label="Skelett zurücksetzen" name="Reset Skeleton"/>
+ <menu_item_call label="Skelett und Animationen zurücksetzen" name="Reset Skeleton And Animations"/>
<menu_item_call label="Meine Freunde" name="Friends..."/>
<menu_item_call label="Meine Gruppen" name="Groups..."/>
<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 2dc4c1d687a..ff21f079432 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="Debug-Menü anzeigen" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">
<menu_item_call label="Debug-Einstellungen anzeigen" name="Debug Settings"/>
- <menu_item_call label="UI/Farb-Einstellungen" name="UI/Color Settings"/>
<menu_item_call label="XUI-Editor" name="UI Preview Tool"/>
<menu label="UI-Tests" name="UI Tests"/>
<menu_item_call label="Fenstergröße einstellen..." name="Set Window Size..."/>
<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_item_call label="Medienbrowser" name="Media Browser"/>
<menu label="Protokollierungsstufe festlegen" name="Set Logging Level">
<menu_item_check label="Debug" name="Debug"/>
<menu_item_check label="Info" name="Info"/>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index f92fa0f82b7..f2f3dddd0ba 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Objektprofil..." name="Object Profile"/>
<menu_item_call label="Ignorieren..." name="Block"/>
+ <menu_item_call label="Freischalten" name="Unblock"/>
<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index 0cf3c09882b..211cc5c54e2 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Anziehen - Aktuelles Outfit ersetzen" name="wear"/>
<menu_item_call label="Anziehen - Aktuelles Outfit hinzufügen" name="wear_add"/>
<menu_item_call label="Ausziehen - Aus aktuellem Outfit entfernen" name="take_off"/>
+ <menu_item_call label="Foto hochladen (10 L$)" name="upload_photo"/>
+ <menu_item_call label="Foto auswählen" name="select_photo"/>
+ <menu_item_call label="Schnappschuss aufnehmen" name="take_snapshot"/>
+ <menu_item_call label="Foto entfernen" name="remove_photo"/>
<menu label="Neue Kleider" name="New Clothes">
<menu_item_call label="Neues Hemd" name="New Shirt"/>
<menu_item_call label="Neue Hose" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Alle Ordner schließen" name="collapse"/>
<menu_item_call label="Outfit neu benennen" name="rename"/>
<menu_item_call label="Outfit löschen" name="delete_outfit"/>
+ <menu_item_check label="Ordner immer nach Namen sortieren" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
index da4890fe96c..d6c4d419fa6 100644
--- a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Nach Status sortieren" name="sort_status"/>
<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
+ <menu_item_check label="Benutzernamen ausblenden" name="view_usernames"/>
<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index cdbb3ae917c..40914b6f68d 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="Freigeben" name="share"/>
<menu_item_call label="Bezahlen" name="pay"/>
<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
+ <menu_item_call label="Einfrieren" name="freeze"/>
+ <menu_item_call label="Hinauswerfen" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
index d38ec650376..61cc4fe0987 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
<menu_item_check label="Karte anzeigen" name="view_map"/>
+ <menu_item_check label="Benutzernamen ausblenden" name="view_usernames"/>
</toggleable_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 fc01ea84447..95fe97407bd 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Freischalten" name="unblock_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 319162db34d..db57e416611 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="Verknüpfung" name="Link"/>
<menu_item_call label="Verknüpfung auflösen" name="Unlink"/>
<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
- <menu label="Verknüpfte Teile auswählen" name="Select Linked Parts">
- <menu_item_call label="Nächstes Teil auswählen" name="Select Next Part"/>
- <menu_item_call label="Vorheriges Teil auswählen" name="Select Previous Part"/>
- <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 label="Elemente auswählen" name="Select Elements">
+ <menu_item_call label="Nächsten Teil oder nächste Fläche auswählen" name="Select Next Part or Face"/>
+ <menu_item_call label="Vorherigen Teil oder vorherige Fläche auswählen" name="Select Previous Part or Face"/>
+ <menu_item_call label="Nächsten Teil oder nächste Fläche einschließen" name="Include Next Part or Face"/>
+ <menu_item_call label="Vorherigen Teil oder vorherige Fläche einschließen" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
@@ -368,8 +368,7 @@
<menu_item_call label="Regionsobjekt-Cache ausgeben" name="Dump Region Object Cache"/>
</menu>
<menu label="UI" name="UI">
- <menu_item_call label="Test Medienbrowser" name="Web Browser Test"/>
- <menu_item_call label="Webinhaltsbrowser" name="Web Content Browser"/>
+ <menu_item_call label="Medienbrowser" name="Media Browser"/>
<menu_item_call label="SelectMgr ausgeben" name="Dump SelectMgr"/>
<menu_item_call label="Inventarinfo ausgeben" name="Dump Inventory"/>
<menu_item_call label="Timer ausgeben" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
index 695451a1056..61002b3dad2 100644
--- a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Ausziehen" name="take_off"/>
<menu_item_call label="Abnehmen" name="detach"/>
<menu_item_call label="Outfit bearbeiten" name="edit"/>
+ <menu_item_call label="Bearbeiten" name="edit_item"/>
+ <menu_item_call label="Original anzeigen" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index ee05e47a635..8728a577378 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -57,6 +57,11 @@
Echtzeit-Streaming
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ Von LibVLC unterstützte Medien
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Keine -
@@ -202,6 +207,11 @@
Video (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Film
+ </label>
+ </mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
Video (QuickTime)
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 0af00ab7059..25e013ed907 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -336,6 +336,9 @@ Wenn diese Rolle nicht mehr diese Fähigkeiten haben soll, deaktivieren Sie sie
Sie sind dabei, [COUNT] Mitglieder aus der Gruppe zu verbannen.
<usetemplate ignoretext="Verbannen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verbannen"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ Manchen Einwohnern wurde keine Einladung gesendet, weil sie aus der Gruppe ausgeschlossen sind.
+ </notification>
<notification name="AttachmentDrop">
Sie möchten Ihren Anhang wirklich fallen lassen?
Möchten Sie fortfahren?
@@ -464,6 +467,12 @@ Um Medien nur auf einer Fläche einzufügen, wählen Sie „Oberfläche auswähl
<notification name="ErrorEncodingSnapshot">
Fehler beim Erstellen des Fotos!
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Es kostet L$[COST], um ein Foto in Ihrem Inventar zu speichern. Sie können entweder L$ kaufen oder das Foto auf Ihrem Computer speichern.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Es kostet L$[COST], um eine Textur in Ihrem Inventar zu speichern. Sie können entweder L$ kaufen oder das Foto auf Ihrem Computer speichern.
+ </notification>
<notification name="ErrorUploadingPostcard">
Ein Foto konnte aus folgendem Grund nicht gesendet werden: [REASON]
</notification>
@@ -582,6 +591,10 @@ Hinweis: Der Cache wird dabei gelöscht/geleert.
Notizkarte löschen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ Möchten Sie den vorherigen Screenshot für Ihren Bericht verwenden?
+ <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Speichern der Geste fehlgeschlagen.
Die Geste besteht aus zu vielen Schritten.
@@ -642,30 +655,12 @@ Weitere Informationen finden Sie auf [_URL].
</url>
<usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/>
</notification>
- <notification name="IntelOldDriver">
- Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
- Unter [_URL] nach aktualisierten Treibern suchen?
- <url name="url">
- http://www.intel.com/p/de_DE/support/detect/graphics
- </url>
- <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
- </notification>
- <notification name="AMDOldDriver">
- Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
- Unter [_URL] nach aktualisierten Treibern suchen?
- <url name="url">
- http://support.amd.com/de/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
- </notification>
- <notification name="NVIDIAOldDriver">
+ <notification name="OldGPUDriver">
Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
- Unter [_URL] nach aktualisierten Treibern suchen?
+ Unter [URL] nach aktualisierten Treibern suchen?
<url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=de-de
+ [URL]
</url>
<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
</notification>
@@ -756,6 +751,9 @@ Verschieben Sie alle betreffenden Objekte in dieselbe Region.
</url>
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ Sie können keinen weiteren Eintrag zur Liste der ignorierten Einwohner hinzufügen, weil der Höchstwert ([MUTE_LIMIT] Einträge) erreicht ist.
+ </notification>
<notification name="UnableToLinkObjects">
Verknüpfung dieser [COUNT] Objekte nicht möglich.
Sie können maximal [MAX] Objekte verknüpfen.
@@ -1393,6 +1391,11 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
</notification>
<notification name="AgentComplexity">
Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Avatarkomplexität] ist [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Warnung anzeigen, wenn sich die Komplexität meines Avatars ändert" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON]; dies wirkt sich wahrscheinlich negativ auf die Leistung aus.
+ <usetemplate ignoretext="Warnung anzeigen, wenn die Komplexität meines HUD zu hoch ist" name="notifyignore"/>
</notification>
<notification name="FirstRun">
Installation von [APP_NAME] vollständig abgeschlossen.
@@ -1485,6 +1488,10 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
Alle Einwohner in dieser Region nach Hause teleportieren?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Wenn Sie den Objektbonus heruntersetzen, nachdem in einer Region Bauwerke errichtet wurden, können Objekte möglicherweise zurückgegeben oder gelöscht werden. Möchten Sie den Objektbonus wirklich ändern?
+ <usetemplate ignoretext="Änderung des Objektbonusfaktors bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
Möchten Sie wirklich alle Objekte zurückgeben, die [USER_NAME] gehören?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1532,6 +1539,9 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
<notification name="OwnerCanNotBeDenied">
Der Eigentümer des Grundbesitzes kann nicht zur Liste der „Verbannten Einwohner“ hinzugefügt werden.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Verbannter Einwohner kann nicht zur Grundbesitzverwalterliste hinzugefügt werden.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Das Aussehen lässt sich erst ändern, wenn Kleider und Form/Gestalt geladen sind.
</notification>
@@ -1703,6 +1713,10 @@ Wenn Sie die neuesten Features und Fixes ausprobieren möchten, gehen Sie zur Se
Möchten Sie Ihren Internetbrowser öffnen, um diesen Inhalt anzuzeigen?
<usetemplate ignoretext="Meinen Browser starten, um eine Webseite anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ Der UI-Größenfaktor des Systems hat sich seit der letzten Ausführung geändert. Möchten Sie die Seite mit den UI-Größeneinstellungen öffnen?
+ <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihr Konto zu verwalten?
<usetemplate ignoretext="Meinen Browser starten, um mein Konto zu verwalten" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
@@ -1742,10 +1756,17 @@ Wenn Sie die neuesten Features und Fixes ausprobieren möchten, gehen Sie zur Se
Diese Gruppe verlassen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ Sie haben die Gruppe „[group_name]“ verlassen.
+ </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="GroupDepartError">
+ Sie können die Gruppe nicht verlassen,
+ <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"/>
@@ -2145,6 +2166,10 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
Zu viele Prims wurden ausgewählt. Bitte wählen Sie höchstens [MAX_PRIM_COUNT] Prims aus und versuchen Sie es erneut.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Zu viele Skripts in den Objekten ausgewählt. Bitte wählen Sie weniger Objekte aus und versuchen Sie es erneut.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Problem beim Import des Grundbesitzvertrags.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2314,6 +2339,10 @@ Inventarobjekt(e) verschieben?
Zahlung fehlgeschlagen: Objekt nicht gefunden.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Zahlung gestoppt: Der bezahlte Preis stimmt nicht mit den für dieses Objekt definierten Zahlungsschaltflächen überein.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Sie haben keine Berechtigung zum Kopieren von Elementen in diesem Objekt.
</notification>
@@ -2349,6 +2378,11 @@ Diese Aktion kann nicht rückgängig gemacht werden.
Dies ist eine große Auswahl mit Linksets. Wenn Sie die Verknüpfung auflösen, kann sie möglicherweise nicht erneut hergestellt werden. Als Vorsichtsmaßnahme empfiehlt es sich, Kopien von Linksets in Ihr Inventar aufzunehmen.
<usetemplate ignoretext="Auflösen der Verknüpfung eines Linksets bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verknüpfung auflösen"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Vielen Dank, dass Sie uns über dieses Problem informiert haben.
+Wir untersuchen Ihre Meldung, um zu bestimmen, ob ein Missbrauch vorliegt, und werden dann die entsprechende Maßnahme ergreifen.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Wählen Sie eine Missbrauchskategorie aus.
Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.
@@ -2776,6 +2810,10 @@ Fliegen ist hier nicht möglich.
<notification name="PathfindingDirty">
Diese Region weist ausstehende Pathfinding-Änderungen auf. Wenn Sie Baurechte besitzen, können Sie die Region durch Klicken auf die Schaltfläche „Region neu formen“ neu formen.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ Diese Region weist ausstehende Pathfinding-Änderungen auf. Wenn Sie Baurechte besitzen, können Sie die Region durch Klicken auf die Schaltfläche „Region neu formen“ neu formen.
+ <usetemplate name="okbutton" yestext="Region neu formen"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
</notification>
@@ -3284,10 +3322,12 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
</notification>
<notification name="AppearanceToXMLFailed">
Fehler beim Speichern des Erscheinungsbilds als XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Fehler beim Löschen der Voreinstellung [NAME].
+ </notification>
+ <notification name="PresetNotSaved">
+ Fehler beim Speichern der Voreinstellung [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Fehler beim Löschen der Voreinstellung [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
Hilfethema für dieses Element wurde nicht gefunden.
@@ -3495,13 +3535,6 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
<notification name="ForceQuitDueToLowMemory">
SL wird wegen Speichermangel in 30 Sekunden beendet.
</notification>
- <notification name="PopupAttempt">
- Ein Popup konnte nicht geöffnet werden.
- <form name="form">
- <ignore name="ignore" text="Alle Popups aktivieren"/>
- <button name="open" text="Popup-Fenster öffnen"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
SOCKS 5-Proxy „[HOST]:[PORT]“ hat Verbindungsverbindung abgewiesen, da laut Regelsatz nicht zulässig.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3876,6 +3909,9 @@ Warten Sie kurz und versuchen Sie es noch einmal.
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ Kopiervorgang fehlgeschlagen, da Sie keinen Zugriff auf diese Parzelle haben.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
@@ -3891,6 +3927,10 @@ Warten Sie kurz und versuchen Sie es noch einmal.
<notification name="NoPermModifyObject">
Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Zu viele Objekte mit umfangreichem Inventar ausgewählt. Bitte wählen Sie weniger Objekte aus und versuchen Sie es erneut.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
</notification>
@@ -3927,6 +3967,12 @@ Warten Sie kurz und versuchen Sie es noch einmal.
<notification name="CantSaveModifyAttachment">
Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Ihre Anhänge enthalten zu viele Inventarobjekte. Sie können keine weiteren hinzufügen.
+ </notification>
+ <notification name="IllegalAttachment">
+ Der Anhang hat einen nicht vorhandenen Punkt auf dem Avatar angefordert. Der Anhang wurde stattdessen auf der Brust angebracht.
+ </notification>
<notification name="TooManyScripts">
Zu viele Skripts.
</notification>
@@ -4019,6 +4065,12 @@ Warten Sie kurz und versuchen Sie es noch einmal.
<notification name="TeleportedByObjectUnknownUser">
Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
</notification>
+ <notification name="StandDeniedByObject">
+ „[OBJECT_NAME]“ lässt zur Zeit nicht zu, dass Sie stehen.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ „[OBJECT_NAME]“ lässt zur Zeit nicht zu, dass Sie sich woanders hinsetzen.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
</notification>
@@ -4100,9 +4152,6 @@ Warten Sie kurz und versuchen Sie es noch einmal.
<notification name="CantAttachNotEnoughScriptResources">
Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
</notification>
- <notification name="IllegalAttachment">
- Der Anhang hat einen nicht vorhandenen Punkt auf dem Avatar angefordert. Der Anhang wurde stattdessen auf der Brust angebracht.
- </notification>
<notification name="CantDropItemTrialUser">
Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
</notification>
@@ -4318,6 +4367,9 @@ Wählen Sie eine kleinere Landfläche aus.
<notification name="CantTransfterMoneyRegionDisabled">
Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Zahlung konnte aufgrund der Systembelastung nicht durchgeführt werden.
+ </notification>
<notification name="CantPayNoAgent">
Nicht ersichtlich, wer bezahlt werden muss.
</notification>
@@ -4353,4 +4405,8 @@ Wählen Sie eine kleinere Landfläche aus.
Chatverlaufsdatei ist noch mit vorheriger Operation beschäftigt. Versuchen Sie es in ein paar Minuten noch einmal oder chatten Sie mit einer anderen Person.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
index d5158b2d971..365269d95e0 100644
--- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Ausgewählte Objekte tragen
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="OUTFIT-GALERIE" name="outfit_gallery_tab"/>
<panel label="MEINE OUTFITS" name="outfitslist_tab"/>
<panel label="AKTUELLES OUTFIT" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
index 27141796a85..10c31d334c4 100644
--- a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Keine Anhänge getragen.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="Tragbare Objekte"/>
+ <accordion_tab name="tab_temp_attachments" title="Temporäre Anhänge"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+ <menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
</panel>
</panel>
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 dc456e2281c..4414bbfae7b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Ich werde Updates manuell herunterladen und installieren" name="Install_manual"/>
</combo_box>
<check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
+ <check_box label="Versionshinweise nach der Aktualisierung anzeigen" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Proxy-Einstellungen:
</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index ea3dcf25d73..4a2cbcc81f8 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -61,10 +61,23 @@ Grafikkarte: [GRAPHICS_CARD]
<string name="AboutDriver">
Windows-Grafiktreiberversion: [GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
OpenGL-Version: [OPENGL_VERSION]
-
-J2C-Decoderversion: [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Fenstergröße: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Schriftgrößenanpassung [FONT_SIZE_ADJUSTMENT] Pt
+UI-Skalierung: [UI_SCALE]
+Sichtweite: [DRAW_DISTANCE] m
+Bandbreite: [NET_BANDWITH] kbit/s
+LOD-Faktor: [LOD_FACTOR]
+Darstellungsqualität: [RENDER_QUALITY] / 7
+Erweitertes Beleuchtungsmodell: [GPU_SHADERS]
+Texturspeicher: [TEXTURE_MEMORY] MB
+Erstellungszeit VFS (Cache): [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ J2C-Decoderversion: [J2C_VERSION]
Audiotreiberversion: [AUDIO_DRIVER_VERSION]
LLCEFLib/CEF-Version: [LLCEFLIB_VERSION]
LibVLC-Version: [LIBVLC_VERSION]
@@ -73,6 +86,9 @@ Voice-Server-Version: [VOICE_VERSION]
<string name="AboutTraffic">
Paketverlust: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]Â %)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Fehler beim Abrufen der URL für die Server-Versionshinweise.
</string>
@@ -1090,6 +1106,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="TeleportYourAgent">
Sie teleportieren
</string>
+ <string name="ForceSitAvatar">
+ Ihren Avatar zwingen, sich zu setzen
+ </string>
<string name="NotConnected">
Nicht verbunden
</string>
@@ -1938,6 +1957,27 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="av_render_anyone">
Sie sind u. U. für niemanden in Ihrer Nähe sichtbar.
</string>
+ <string name="hud_description_total">
+ Ihr HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (getragen von [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] beansprucht viel Texturspeicher
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] enthält zu viele ressourcenintensive Objekte und Texturen
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] enthält viele große Texturen
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] enthält zu viele Objekte
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] enthält zu viele Texturen
+ </string>
<string name="AgeYearsA">
[COUNT] Jahr
</string>
@@ -2097,6 +2137,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="ObjectOutOfRange">
Skript (Objekt außerhalb des Bereichs)
</string>
+ <string name="ScriptWasDeleted">
+ Skript (aus Inventar gelöscht)
+ </string>
<string name="GodToolsObjectOwnedBy">
Objekt [OBJECT], Besitzer [OWNER]
</string>
@@ -2709,6 +2752,15 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
<string name="Play Media">
Medien Abspielen/Pausieren
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=de-de
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/de/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Beim Parsen der Befehlszeile wurde ein Fehler festgestellt.
Weitere Informationen: http://wiki.secondlife.com/wiki/Client_parameters (EN)
@@ -4484,12 +4536,18 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
<string name="paid_you_ldollars">
[NAME] hat Ihnen [REASON] [AMOUNT]Â L$ bezahlt.
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] hat Ihnen [AMOUNT] L$ bezahlt: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] hat Ihnen [AMOUNT]Â L$ bezahlt.
</string>
<string name="you_paid_ldollars">
Sie haben [REASON] [AMOUNT] L$ an [NAME] bezahlt.
</string>
+ <string name="you_paid_ldollars_gift">
+ Sie haben [NAME] [AMOUNT] L$ bezahlt: [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Sie haben [AMOUNT] L$ bezahlt.
</string>
@@ -4502,6 +4560,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
<string name="you_paid_failure_ldollars">
Sie haben [NAME] [AMOUNT] L$ [REASON] nicht bezahlt.
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ Sie haben [NAME] [AMOUNT] L$ nicht bezahlt: [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
Sie haben [AMOUNT] L$ nicht bezahlt.
</string>
@@ -4828,6 +4889,15 @@ Missbrauchsbericht
<string name="texture_load_dimensions_error">
Bilder, die größer sind als [WIDTH]*[HEIGHT] können nicht geladen werden
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ Max. Fotogröße für Outfit ist [WIDTH]*[HEIGHT]. Bitte verkleinern Sie das Bild oder verwenden Sie ein anderes.
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ Max. Fotogröße für Outfit ist [WIDTH]*[HEIGHT]. Bitte wählen Sie eine andere Textur aus.
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Fotoabmessungen können nicht bestätigt werden. Bitte warten Sie, bis die Fotogröße im Auswahlfenster angezeigt wird.
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.
@@ -5332,6 +5402,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="Command_Profile_Label">
Profil
</string>
+ <string name="Command_Report_Abuse_Label">
+ Missbrauch melden
+ </string>
<string name="Command_Search_Label">
Suchen
</string>
@@ -5422,6 +5495,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="Command_Profile_Tooltip">
Ihr Profil bearbeiten oder anzeigen
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Missbrauch melden
+ </string>
<string name="Command_Search_Tooltip">
Orte, Veranstaltungen, Leute finden
</string>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index a5229cd48c8..a269add08a8 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Incluir el peso de la piel" name="upload_skin"/>
<check_box label="Incluir posturas de las articulaciones" name="upload_joints"/>
+ <check_box label="Bloquear la escala si está definida la posición de la articulación" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Desplazamiento Z (subir o bajar el avatar):
</text>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index 567f9804461..61a898adad1 100644
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">Pagar al grupo</string>
- <string name="payee_resident">Pagar al residente</string>
- <text name="paying_text">Vas a pagar:</text>
- <text left="115" name="payee_name">Nombre de prueba demasiado largo para comprobar la función de recorte</text>
+ <string name="payee_group">
+ Pagar al grupo
+ </string>
+ <string name="payee_resident">
+ Pagar al residente
+ </string>
+ <text name="paying_text">
+ Vas a pagar:
+ </text>
+ <text left="115" name="payee_name">
+ Nombre de prueba demasiado largo para comprobar la función de recorte
+ </text>
+ <text name="payment_message_label">
+ Descripción (opcional):
+ </text>
<panel label="Buscar" name="PatternsPanel">
<button label="Pagar 1 L$" label_selected="Pagar 1 L$" name="fastpay 1"/>
<button label="Pagar 5 L$" label_selected="Pagar 5 L$" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="Pagar 20 L$" label_selected="Pagar 20 L$" name="fastpay 20"/>
</panel>
<panel label="Buscar" name="InputPanel">
- <text name="amount text">Otra cantidad:</text>
+ <text name="amount text">
+ Otra cantidad:
+ </text>
<button label="Pagar" label_selected="Pagar" name="pay btn"/>
<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
index 39c84103c49..2dbc59e9032 100644
--- a/indra/newview/skins/default/xui/es/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Sin ejecutarse
</floater.string>
+ <floater.string name="Timeout">
+ Tiempo de espera: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Cargando inventario de: [OBJECT_NAME]
+ </floater.string>
<button label="Cerrar" label_selected="Cerrar" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml
index 5e02fad2dd9..3f3e2bb01e2 100644
--- a/indra/newview/skins/default/xui/es/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/es/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Navegación segura"/>
<button name="popexternal" tool_tip="Abrir URL actual en tu navegador de escritorio"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Página principal de pruebas web"/>
+ <button name="VLC Plugin Test" tool_tip="Prueba de vÃdeo MPEG4"/>
+ </layout_panel>
</layout_stack>
</floater>
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 c92583cfc30..f1394dad058 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Llamada" name="Call"/>
<menu_item_call label="Invitar al grupo" name="Invite..."/>
<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorar" name="Avatar Mute"/>
<menu_item_call label="Denunciar" name="abuse"/>
<menu_item_call label="Congelar" name="Freeze..."/>
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 a4d09a44ab2..7805db3ab4e 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Editar mi anatomÃa" name="Edit My Shape"/>
<menu_item_call label="Altura del avatar" name="Hover Height"/>
<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
<menu_item_call label="Mis amigos" name="Friends..."/>
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
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 e5aef039119..80f16d3e829 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Llamada" name="Call"/>
<menu_item_call label="Invitar al grupo" name="Invite..."/>
<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorar" name="Avatar Mute"/>
<menu_item_call label="Denunciar" name="abuse"/>
<menu_item_call label="Congelar" name="Freeze..."/>
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 ab149662172..bdb4771d172 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Editar mi anatomÃa" name="Edit My Shape"/>
<menu_item_call label="Altura del avatar" name="Hover Height"/>
<menu_item_call label="Restablecer esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Restablecer esqueleto y animaciones" name="Reset Skeleton And Animations"/>
<menu_item_call label="Mis amigos" name="Friends..."/>
<menu_item_call label="Mis grupos" name="Groups..."/>
<menu_item_call label="Mi perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 44e8f3ffeb3..d9f8f23576b 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -20,12 +20,11 @@
<menu_item_check label="Mostrar el menú 'Debug'" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">
<menu_item_call label="Mostrar las configuraciones del depurador" name="Debug Settings"/>
- <menu_item_call label="Configuraciones del Visor/Color" name="UI/Color Settings"/>
<menu label="Pruebas de la interfaz" name="UI Tests"/>
<menu_item_call label="Definir el tamaño de la ventana..." name="Set Window Size..."/>
<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_item_call label="Navegador de medios" name="Media Browser"/>
<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"/>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index a99c889bb06..f80eb4db74d 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
<menu_item_call label="Ignorar..." name="Block"/>
+ <menu_item_call label="No ignorar" name="Unblock"/>
<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>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 56e64c729f7..b3f2b789d78 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Ponerme - Reemplazar el vestuario actual" name="wear"/>
<menu_item_call label="Ponerme - Añadir al vestuario actual" name="wear_add"/>
<menu_item_call label="Quitarme - Quitar del vestuario actual" name="take_off"/>
+ <menu_item_call label="Subir una foto (10 L$)" name="upload_photo"/>
+ <menu_item_call label="Seleccionar foto" name="select_photo"/>
+ <menu_item_call label="Hacer una foto" name="take_snapshot"/>
+ <menu_item_call label="Quitar foto" name="remove_photo"/>
<menu label="Ropas nuevas" name="New Clothes">
<menu_item_call label="Camisa nueva" name="New Shirt"/>
<menu_item_call label="Pantalón nuevo" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
<menu_item_call label="Renombrar el vestuario" name="rename"/>
<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
+ <menu_item_check label="Ordenar las carpetas siempre alfabéticamente" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
index ad896c1b74e..75a5aa3cadf 100644
--- a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Ordenar por estatus" name="sort_status"/>
<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
+ <menu_item_check label="Ocultar nombres de usuario" name="view_usernames"/>
<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index 09bb119d5ad..9e9f2b81917 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="Compartir" name="share"/>
<menu_item_call label="Pagar" name="pay"/>
<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
+ <menu_item_call label="Congelar" name="freeze"/>
+ <menu_item_call label="Expulsar" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
index c2fb360dd1c..c51047f04a8 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
<menu_item_check label="Ver mapa" name="view_map"/>
+ <menu_item_check label="Ocultar nombres de usuario" name="view_usernames"/>
</toggleable_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 c3c8439ea2a..51803e93c55 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Desbloquear" name="unblock_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 07c358615c2..c4986821f17 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="Enlazar" name="Link"/>
<menu_item_call label="Desenlazar" name="Unlink"/>
<menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/>
- <menu label="Seleccionar las partes enlazadas" name="Select Linked Parts">
- <menu_item_call label="Seleccionar la parte siguiente" name="Select Next Part"/>
- <menu_item_call label="Seleccionar la parte previa" name="Select Previous Part"/>
- <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 label="Seleccionar elementos" name="Select Elements">
+ <menu_item_call label="Seleccionar la parte o cara siguiente" name="Select Next Part or Face"/>
+ <menu_item_call label="Seleccionar la parte o cara anterior" name="Select Previous Part or Face"/>
+ <menu_item_call label="Incluir la parte o cara siguiente" name="Include Next Part or Face"/>
+ <menu_item_call label="Incluir la parte o cara anterior" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
@@ -332,8 +332,7 @@
<menu_item_call label="Volcar la caché de objetos de la región" name="Dump Region Object Cache"/>
</menu>
<menu label="UI" name="UI">
- <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="Navegador de medios" name="Media Browser"/>
<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
<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/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
index 64fd7ce4cf7..637a14cf5b5 100644
--- a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Quitarme" name="take_off"/>
<menu_item_call label="Quitar" name="detach"/>
<menu_item_call label="Editar el vestuario" name="edit"/>
+ <menu_item_call label="Editar" name="edit_item"/>
+ <menu_item_call label="Mostrar original" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml
index eb212344ce0..74e447c7074 100644
--- a/indra/newview/skins/default/xui/es/mime_types.xml
+++ b/indra/newview/skins/default/xui/es/mime_types.xml
@@ -22,14 +22,6 @@
Ver la pelÃcula
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- No hay contenido
- </label>
- <tooltip name="none_tooltip">
- Aquà no hay contenido multimedia
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Imagen
@@ -52,11 +44,24 @@
Escuchar el audio de esta localización
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ No hay contenido
+ </label>
+ <tooltip name="none_tooltip">
+ Aquà no hay contenido multimedia
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Real Time Streaming
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ Medios compatibles con LibVLC
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Ninguno -
@@ -127,11 +132,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
@@ -207,6 +207,11 @@
PelÃcula (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ PelÃcula
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
PelÃcula (QuickTime)
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index a67e4108146..d6e686df423 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -326,6 +326,9 @@ Si no quieres que este rol siga teniendo dichas capacidades, deshabilÃtalas inm
Te dispones a expulsar a [COUNT] miembros del grupo.
<usetemplate ignoretext="Confirma la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Prohibir el acceso"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ No se ha enviado una invitación a algunos residentes porque están expulsados del grupo.
+ </notification>
<notification name="AttachmentDrop">
Vas a soltar tu anexado.
¿Estás seguro de que quieres continuar?
@@ -454,6 +457,12 @@ debes estar dentro de ella.
<notification name="ErrorEncodingSnapshot">
Error al codificar la foto.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Necesitas [COST] L$ para guardar una foto en el inventario. Puedes comprar L$ o bien guardar la foto en tu equipo.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Necesitas [COST] L$ para guardar una textura en el inventario. Puedes comprar L$ o bien guardar la foto en tu equipo.
+ </notification>
<notification name="ErrorUploadingPostcard">
Hubo un problema al enviar la foto por la siguiente razón: [REASON]
</notification>
@@ -570,6 +579,10 @@ o hacer una puja?
¿Deseas borrar la nota?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ ¿Deseas incluir la foto anterior en la denuncia?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Fallo al guardar el gesto.
Este gesto tiene demasiados pasos.
@@ -630,30 +643,12 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range&
</url>
<usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="SÃ"/>
</notification>
- <notification name="IntelOldDriver">
- Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
- ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
- <url name="url">
- http://www.intel.com/p/es_XL/support/detect/graphics
- </url>
- <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="SÃ"/>
- </notification>
- <notification name="AMDOldDriver">
- Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
- ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
- <url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="SÃ"/>
- </notification>
- <notification name="NVIDIAOldDriver">
+ <notification name="OldGPUDriver">
Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
- ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+ ¿Deseas visitar [URL] para buscar controladores actualizados?
<url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=es
+ [URL]
</url>
<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="SÃ"/>
</notification>
@@ -746,6 +741,9 @@ misma región.
</url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ No se puede añadir una entrada nueva a la lista de bloqueados porque has alcanzado el lÃmite de [MUTE_LIMIT] entradas.
+ </notification>
<notification name="UnableToLinkObjects">
No se pudo enlazar estos [COUNT] objetos.
Puedes enlazar [MAX] objetos como máximo.
@@ -1383,6 +1381,11 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
</notification>
<notification name="AgentComplexity">
La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad de tu avatar] es [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Advertirme cuando cambie la complejidad de mi avatar" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], es probable que afecte negativamente al rendimiento.
+ <usetemplate ignoretext="Avisarme si la complejidad de mi HUD es excesiva" name="notifyignore"/>
</notification>
<notification name="FirstRun">
Se ha completado la instalación de [SECOND_LIFE].
@@ -1475,6 +1478,10 @@ Por favor, selecciona sólo uno y vuelve a intentarlo.
¿Teleportar a tu base a todos los residentes en esta región?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Si disminuyes el plus de objetos cuando ya se han establecido construcciones en una región, algunos objetos se podrÃan eliminar o devolver. ¿Estás seguro de que quieres cambiar el plus de objetos?
+ <usetemplate ignoretext="Confirmar el cambio del factor de plus del objeto" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
+ </notification>
<notification name="EstateObjectReturn">
¿Estás seguro de que quieres devolver los objetos propiedad de
[USER_NAME] ?
@@ -1523,6 +1530,9 @@ Se superan en [NUM_EXCESS] los [MAX_AGENTS] permitidos en [LIST_TYPE].
<notification name="OwnerCanNotBeDenied">
No se puede añadir a la lista de residentes no admitidos al propietario del estado.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ No se puede añadir un residente expulsado a la lista de administradores de estado.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
No puedes cambiar la apariencia hasta que no se carguen la ropa y la forma.
</notification>
@@ -1697,6 +1707,10 @@ Si estás impaciente por probar las nuevas funciones y correcciones, lee la pág
¿Quieres abrir tu navegador para ver este contenido?
<usetemplate ignoretext="Abrir mi navegador para ver una página web" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ El factor de tamaño de IU del sistema ha cambiado desde la última ejecución. ¿Deseas abrir la página de ajustes de tamaño de la IU?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/>
+ </notification>
<notification name="WebLaunchJoinNow">
¿Ir al [http://secondlife.com/account/ Panel de Control] para administrar tu cuenta?
<usetemplate ignoretext="Abrir mi navegador para administrar mi cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -1736,10 +1750,17 @@ Si estás impaciente por probar las nuevas funciones y correcciones, lee la pág
¿Deseas abandonar el grupo?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ Has abandonado el grupo '[group_name]'.
+ </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="GroupDepartError">
+ No se puede abandonar el grupo.
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </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"/>
@@ -2140,6 +2161,10 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
Hay demasiados prims seleccionados. Por favor, selecciona [MAX_PRIM_COUNT] o menos y vuelve a intentarlo
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Los objetos seleccionados tienen demasiados scripts. Selecciona menos objetos y repite la operación
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Hay problemas al importar el contrato del estado.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2308,6 +2333,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
Error en el pago: no se encuentra el objeto.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Pago suspendido: el precio pagado no coincide con ninguno de los botones de pago asociados a este objeto.
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
En este objeto, no hay Ãtems que estés autorizado a copiar.
</notification>
@@ -2343,6 +2372,12 @@ Esta acción no se puede deshacer.
La selección es grande y contiene linksets. Si la desenlazas, quizás no puedas volver establecer los vÃnculos. Puede ser conveniente guardar copias de los linksets como medida de precaución.
<usetemplate ignoretext="Confirmar que desenlazas un linkset" name="okcancelignore" notext="Cancelar" yestext="Desenlazar"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Gracias por informarnos de este asunto.
+Comprobaremos si tu denuncia contiene posibles transgresiones
+y tomaremos las medidas oportunas.
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, elige una categorÃa para esta denuncia de infracción.
Seleccionar una categorÃa nos ayuda a clasificar y procesar las denuncias de infracciones.
@@ -2770,6 +2805,10 @@ Aquà no puedes volar.
<notification name="PathfindingDirty">
La región contiene cambios de pathfinding pendientes. Si tienes derechos de construcción, puedes recargarla pulsando el botón “Recargar regiónâ€.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ La región contiene cambios de pathfinding pendientes. Si tienes derechos de construcción, puedes recargarla pulsando el botón “Recargar regiónâ€.
+ <usetemplate name="okbutton" yestext="Recargar la región"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
</notification>
@@ -3269,11 +3308,13 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
El aspecto se ha guardado como XML en [PATH]
</notification>
<notification name="AppearanceToXMLFailed">
- Error al guardar el aspecto como XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Error al eliminar el valor predefinido [NAME].
+ Error al guardar el aspecto en XML.
+ </notification>
+ <notification name="PresetNotSaved">
+ Error al guardar el valor predefinido [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Error al eliminar el valor predefinido [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
No se ha podido encontrar un tema de ayuda para este elemento.
@@ -3480,13 +3521,6 @@ Al ocultar el botón Hablar se desactiva la función de voz.
<notification name="ForceQuitDueToLowMemory">
SL saldrá en 30 segundos porque no hay memoria suficiente.
</notification>
- <notification name="PopupAttempt">
- Se ha impedido que se abriera una ventana emergente.
- <form name="form">
- <ignore name="ignore" text="Permitir todas las ventanas emergentes"/>
- <button name="open" text="Abrir ventana emergente"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
El proxy SOCKS 5 "[HOST]:[PORT]" ha rechazado la conexión, no está permitida por el juego de reglas.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3861,6 +3895,9 @@ Prueba otra vez dentro de un minuto.
No se puede mover el objeto '[OBJECT_NAME]' a
[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ Error al copiar: no tienes acceso a esa parcela.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
No se puede mover el objeto '[OBJECT_NAME]' a
[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
@@ -3876,6 +3913,10 @@ Prueba otra vez dentro de un minuto.
<notification name="NoPermModifyObject">
No tienes permiso para modificar ese objeto
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Están seleccionados demasiados objetos con un inventario grande. Selecciona menos objetos y repite la operación.
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
No se puede habilitar la fÃsica para un objeto que contribuye al navmesh.
</notification>
@@ -3912,6 +3953,12 @@ Prueba otra vez dentro de un minuto.
<notification name="CantSaveModifyAttachment">
No se puede guardar en el contenido del objeto: se modificarÃan los permisos de anexo.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ El inventario de tus anexos ya es excesivo, por lo que no se puede añadir más.
+ </notification>
+ <notification name="IllegalAttachment">
+ El anexo ha solicitado un punto que no existe en el avatar. Por tanto, se ha anexado al pecho.
+ </notification>
<notification name="TooManyScripts">
Demasiados scripts.
</notification>
@@ -4004,6 +4051,12 @@ Prueba otra vez dentro de un minuto.
<notification name="TeleportedByObjectUnknownUser">
Has sido teleportado por el objeto '[OBJECT_NAME]' cuyo propietario es un usuario desconocido.
</notification>
+ <notification name="StandDeniedByObject">
+ '[OBJECT_NAME]' no te permite ponerte de pie en este momento.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ '[OBJECT_NAME]' no te permite cambiar de asiento en este momento.
+ </notification>
<notification name="CantCreateObjectRegionFull">
No se puede crear el objeto solicitado. La región está llena.
</notification>
@@ -4085,9 +4138,6 @@ Prueba otra vez dentro de un minuto.
<notification name="CantAttachNotEnoughScriptResources">
No hay suficientes recursos de script disponibles para anexar el objeto
</notification>
- <notification name="IllegalAttachment">
- El anexo ha solicitado un punto que no existe en el avatar. Por tanto, se ha anexado al pecho.
- </notification>
<notification name="CantDropItemTrialUser">
No se pueden soltar objetos aquÃ; inténtalo en la zona de prueba gratuita.
</notification>
@@ -4303,6 +4353,9 @@ Prueba a seleccionar un terreno más pequeño.
<notification name="CantTransfterMoneyRegionDisabled">
En esta región actualmente no están activadas las transferencias de dinero a los objetos.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ No se puede efectuar el pago por sobrecarga del sistema.
+ </notification>
<notification name="CantPayNoAgent">
No se ha averiguado a quién se debe pagar.
</notification>
@@ -4338,4 +4391,8 @@ Prueba a seleccionar un terreno más pequeño.
El archivo de historial de chat todavÃa está realizando la operación anterior. Repite la operación dentro de unos minutos o inicia un chat con otra persona.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="Aceptar"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
index 1107e72b549..5fff5b07c69 100644
--- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Ponerme Ãtems seleccionados
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="GALERÃA DE VESTUARIO" name="outfit_gallery_tab"/>
<panel label="MIS VESTUARIOS" name="outfitslist_tab"/>
<panel label="PUESTO" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
index 8cea619bd59..508267a327a 100644
--- a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ No tienes puestos anexos.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="ArtÃculos de vestir"/>
+ <accordion_tab name="tab_temp_attachments" title="Anexos temporales"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Ver más opciones"/>
+ <menu_button name="options_gear_btn" tool_tip="Ver más opciones"/>
</panel>
</panel>
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 4fc973614b3..0b3ca03bcc2 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Descargaré e instalaré manualmente las actualizaciones" 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"/>
+ <check_box label="Mostrar las notas de la versión después de la actualización" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Configuración de proxy:
</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index d33a3fd07ca..192d32c2674 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -52,18 +52,34 @@ Tarjeta gráfica: [GRAPHICS_CARD]
<string name="AboutDriver">
Versión de Windows Graphics Driver: [GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
Versión de OpenGL: [OPENGL_VERSION]
-
-Versión de J2C Decoder: [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Tamaño de la ventana: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Ajuste de tamaño de fuente: [FONT_SIZE_ADJUSTMENT]pt
+Ajuste de escala de IU: [UI_SCALE]
+Distancia de dibujo: [DRAW_DISTANCE]m
+Ancho de banda: [NET_BANDWITH]kbit/s
+Factor de LOD: [LOD_FACTOR]
+Calidad de renderizado: [RENDER_QUALITY] / 7
+Modelo de iluminación avanzado: [GPU_SHADERS]
+Memoria de textura: [TEXTURE_MEMORY]MB
+Tiempo de creación de VFS (caché): [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ Versión de J2C Decoder: [J2C_VERSION]
Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
Versión de LLCEFLib/CEF: [LLCEFLIB_VERSION]
-Versión de LibVLC: [LIBVLC_VERSION]
-Versión del servidor de voz: [VOICE_VERSION]
+Versión de LibVLC: [LLCEFLIB_VERSION]
+Versión de Voice Server: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [mes, fecha_hora, slt] [dÃa, fecha_hora, slt] [año, fecha_hora, slt] [hora, fecha_hora, slt]:[min, fecha_hora, slt]:[segundo,fecha_hora,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Error al obtener la URL de las notas de la versión del servidor.
</string>
@@ -1075,6 +1091,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="TeleportYourAgent">
Teleportarte
</string>
+ <string name="ForceSitAvatar">
+ Forzar que el avatar se siente
+ </string>
<string name="AgentNameSubst">
(Tú)
</string>
@@ -1914,6 +1933,27 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="av_render_anyone">
Es posible que ninguno de los que están próximos pueda renderizarte.
</string>
+ <string name="hud_description_total">
+ Tu HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (lo llevas en [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] usa mucha memoria de textura
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] contiene muchas texturas y objetos complicados
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] contiene muchas texturas grandes
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] contiene demasiados objetos
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] contiene demasiadas texturas
+ </string>
<string name="AgeYearsA">
[COUNT] año
</string>
@@ -2073,6 +2113,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
<string name="ObjectOutOfRange">
Script (objeto fuera de rango)
</string>
+ <string name="ScriptWasDeleted">
+ Script (eliminado del inventario)
+ </string>
<string name="GodToolsObjectOwnedBy">
El objeto [OBJECT] es propiedad de [OWNER]
</string>
@@ -2643,6 +2686,15 @@ Se esperaba .wav, .tga, .bmp, .jpg, .jpeg, o .bvh
<string name="Play Media">
Play/Pausa los media
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=es
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Ha habido un error analizando la lÃnea de comando.
Por favor, consulta: http://wiki.secondlife.com/wiki/Client_parameters
@@ -4394,12 +4446,18 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
<string name="paid_you_ldollars">
[NAME] te ha pagado [AMOUNT] L$ [REASON].
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] te ha pagado [AMOUNT] L$: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] te ha pagado [AMOUNT] L$.
</string>
<string name="you_paid_ldollars">
Has pagado [AMOUNT] L$ a [NAME] por [REASON].
</string>
+ <string name="you_paid_ldollars_gift">
+ Has pagado [AMOUNT] L$ a [NAME]: [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Has pagado[AMOUNT] L$
</string>
@@ -4412,6 +4470,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
<string name="you_paid_failure_ldollars">
No has pagado a [NAME] [AMOUNT] L$ [REASON].
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ No has pagado a [NAME] [AMOUNT] L$: [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
No has pagado [AMOUNT] L$.
</string>
@@ -4738,6 +4799,15 @@ Denuncia de infracción
<string name="texture_load_dimensions_error">
No se puede subir imágenes mayores de [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ La foto del vestuario puede tener como máx. un tamaño de [WIDTH]*[HEIGHT]. Cambia el tamaño o utiliza otra imagen
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ La foto del vestuario puede tener como máx. un tamaño de [WIDTH]*[HEIGHT]. Selecciona otra textura
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ No se pueden verificar las dimensiones de la foto. Espera hasta que aparezca el tamaño de la foto en el selector
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Parece que hay algún problema que ha escapado a nuestros controles.
@@ -5242,6 +5312,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Command_Profile_Label">
Perfil
</string>
+ <string name="Command_Report_Abuse_Label">
+ Denunciar una infracción
+ </string>
<string name="Command_Search_Label">
Buscar
</string>
@@ -5332,6 +5405,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Command_Profile_Tooltip">
Consulta o edita tu perfil
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Denunciar una infracción
+ </string>
<string name="Command_Search_Tooltip">
Buscar lugares, eventos y personas
</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index d3d941ff5c0..4ebc196fd10 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Inclure pondération de la peau :" name="upload_skin"/>
<check_box label="Inclure position des articulations :" name="upload_joints"/>
+ <check_box label="Verrouiller l’échelle si la position des articulations est définie" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Décalage Z (élever/abaisser l'avatar) :
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index bbd20e868ca..190a1f53699 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">Payer le groupe</string>
- <string name="payee_resident">Payer le résident</string>
- <text name="paying_text">Vous payez :</text>
- <text name="payee_name">Test Name That Is Extremely Long To Check Clipping</text>
+ <string name="payee_group">
+ Payer le groupe
+ </string>
+ <string name="payee_resident">
+ Payer le résident
+ </string>
+ <text name="paying_text">
+ Vous payez :
+ </text>
+ <text name="payee_name">
+ Test Name That Is Extremely Long To Check Clipping
+ </text>
+ <text name="payment_message_label">
+ Description (facultative)Â :
+ </text>
<panel label="Rechercher" name="PatternsPanel">
<button label="Payer 1Â L$" label_selected="Payer 1Â L$" name="fastpay 1"/>
<button label="Payer 5Â L$" label_selected="Payer 5Â L$" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="Payer 20Â L$" label_selected="Payer 20Â L$" name="fastpay 20"/>
</panel>
<panel label="Rechercher" name="InputPanel">
- <text name="amount text">Autre montant :</text>
+ <text name="amount text">
+ Autre montant :
+ </text>
<button label="Payer" label_selected="Payer" name="pay btn"/>
<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
index d3c4dcfa272..42cc2e6dac9 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
<text name="AvatarText">
Avatar
</text>
- <slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly baby »"/>
+ <slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « JellyDoll »"/>
<text name="IndirectMaxComplexityText">
0
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index b9a81654576..15cc182ff9f 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Arrêt
</floater.string>
+ <floater.string name="Timeout">
+ Délai : [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Chargement de l’inventaire pour : [OBJECT_NAME]
+ </floater.string>
<button label="Fermer" label_selected="Fermer" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml
index 65dfafe7603..015396b2dd9 100644
--- a/indra/newview/skins/default/xui/fr/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/fr/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Navigation sécurisée"/>
<button name="popexternal" tool_tip="Ouvrir l'URL actuelle dans votre navigateur de bureau"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Tests Web de la page d’accueil"/>
+ <button name="VLC Plugin Test" tool_tip="Test vidéo MPEG4"/>
+ </layout_panel>
</layout_stack>
</floater>
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 fd8112429e7..ae19e78d54a 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Appeler" name="Call"/>
<menu_item_call label="Inviter dans le groupe" name="Invite..."/>
<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
+ <menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorer" name="Avatar Mute"/>
<menu_item_call label="Signaler" name="abuse"/>
<menu_item_call label="Figer" name="Freeze..."/>
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 f3089ad3bb9..f354cf38966 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
<menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
+ <menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
<menu_item_call label="Mes amis" name="Friends..."/>
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
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 b97c4b0f481..2a0ae386058 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Appeler" name="Call"/>
<menu_item_call label="Inviter dans le groupe" name="Invite..."/>
<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
+ <menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
<menu_item_call label="Ignorer" name="Avatar Mute"/>
<menu_item_call label="Signaler" name="abuse"/>
<menu_item_call label="Figer" name="Freeze..."/>
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 a4c1df8cee6..2d0a17832f5 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/>
<menu_item_call label="Hauteur de sustentation" name="Hover Height"/>
<menu_item_call label="Réinitialiser le squelette" name="Reset Skeleton"/>
+ <menu_item_call label="Réinitialiser le squelette et les animations" name="Reset Skeleton And Animations"/>
<menu_item_call label="Mes amis" name="Friends..."/>
<menu_item_call label="Mes groupes" name="Groups..."/>
<menu_item_call label="Mon profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index c425e6cee75..7fd68baf678 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="Afficher le menu de débogage" name="Show Debug Menu"/>
<menu label="Débogage" name="Debug">
<menu_item_call label="Afficher les paramètres de débogage" name="Debug Settings"/>
- <menu_item_call label="Paramètres de couleurs/interface" name="UI/Color Settings"/>
<menu_item_call label="Outil d'aperçu XUI" name="UI Preview Tool"/>
<menu label="Tests de l'interface" name="UI Tests"/>
<menu_item_call label="Définir la taille de la fenêtre..." name="Set Window Size..."/>
<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_item_call label="Navigateur de médias" name="Media Browser"/>
<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"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 7c949301600..5d41ff51038 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Profil de l'objet..." name="Object Profile"/>
<menu_item_call label="Ignorer..." name="Block"/>
+ <menu_item_call label="Ne plus ignorer" name="Unblock"/>
<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>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index 21b19eded63..28ae2f74ad3 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Porter - Remplacer la tenue actuelle" name="wear"/>
<menu_item_call label="Porter - Ajouter à la tenue actuelle" name="wear_add"/>
<menu_item_call label="Enlever - Supprimer de la tenue actuelle" name="take_off"/>
+ <menu_item_call label="Charger la photo (10Â L$)" name="upload_photo"/>
+ <menu_item_call label="Sélectionner une photo" name="select_photo"/>
+ <menu_item_call label="Prendre une photo" name="take_snapshot"/>
+ <menu_item_call label="Supprimer la photo" name="remove_photo"/>
<menu label="Nouveaux habits" name="New Clothes">
<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
<menu_item_call label="Nouveau pantalon" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
<menu_item_call label="Renommer la tenue" name="rename"/>
<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
+ <menu_item_check label="Toujours trier les dossiers par nom" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
index cc81172462f..45cb646b9a8 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Trier par statut" name="sort_status"/>
<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
+ <menu_item_check label="Masquer les noms d’utilisateur" name="view_usernames"/>
<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 6f7d02ef743..cbc3156a8f8 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="Partager" name="share"/>
<menu_item_call label="Payer" name="pay"/>
<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
+ <menu_item_call label="Figer" name="freeze"/>
+ <menu_item_call label="Expulser" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
index 086002dce5e..9da915fcc57 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Trier par distance" name="sort_distance"/>
<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
<menu_item_check label="Afficher la carte" name="view_map"/>
+ <menu_item_check label="Masquer les noms d’utilisateur" name="view_usernames"/>
</toggleable_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 5d745ef5f89..95310dd1f10 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Ne plus ignorer" name="unblock_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 3c9f5c2aa90..d40e979d08e 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="Lien" name="Link"/>
<menu_item_call label="Annuler le lien" name="Unlink"/>
<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
- <menu label="Sélectionner les parties liées" name="Select Linked Parts">
- <menu_item_call label="Sélectionner la partie suivante" name="Select Next Part"/>
- <menu_item_call label="Sélectionner la partie précédente" name="Select Previous Part"/>
- <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 label="Sélectionner des éléments" name="Select Elements">
+ <menu_item_call label="Sélectionner la partie suivante ou le visage" name="Select Next Part or Face"/>
+ <menu_item_call label="Sélectionner la partie précédente ou le visage" name="Select Previous Part or Face"/>
+ <menu_item_call label="Inclure la partie suivante ou le visage" name="Include Next Part or Face"/>
+ <menu_item_call label="Inclure la partie précédente ou le visage" name="Include Previous Part or Face"/>
</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"/>
@@ -368,8 +368,7 @@
<menu_item_call label="Vidage de cache d'objet de la région" name="Dump Region Object Cache"/>
</menu>
<menu label="Interface" name="UI">
- <menu_item_call label="Test du navigateur de médias" name="Web Browser Test"/>
- <menu_item_call label="Navigateur du contenu Web" name="Web Content Browser"/>
+ <menu_item_call label="Navigateur de médias" name="Media Browser"/>
<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
<menu_item_call label="Dump inventaire" name="Dump Inventory"/>
<menu_item_call label="Dump Timers" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
index 4d884455069..5a7193a7cc9 100644
--- a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Enlever" name="take_off"/>
<menu_item_call label="Détacher" name="detach"/>
<menu_item_call label="Modifier la tenue" name="edit"/>
+ <menu_item_call label="Modifier" name="edit_item"/>
+ <menu_item_call label="Afficher l’original" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index 322887fb76a..15b1dc5a23a 100644
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -22,14 +22,6 @@
Jouer le film
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- Aucun contenu
- </label>
- <tooltip name="none_tooltip">
- Aucun média ici
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Image
@@ -52,11 +44,24 @@
Jouer le contenu audio qui se trouve ici
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Aucun contenu
+ </label>
+ <tooltip name="none_tooltip">
+ Aucun média ici
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Flux en temps réel
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ Médias pris en charge par LibVLC
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Aucun -
@@ -127,11 +132,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
@@ -207,6 +207,11 @@
Film (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Film
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Film (Quicktime)
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 2310fc5611d..b7efaad3762 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -329,6 +329,9 @@ Si vous ne voulez plus que ce rôle dispose de ces pouvoirs, désactivez-les imm
Vous allez bannir [COUNT] membres du groupe.
<usetemplate ignoretext="Confirmer le bannissement de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Bannir"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ Il est possible qu’une invitation n’ait pas été envoyée à certains résidents, car ils sont bannis du groupe.
+ </notification>
<notification name="AttachmentDrop">
Vous êtes sur le point d'abandonner l'élément joint.
Voulez-vous vraiment continuer ?
@@ -456,6 +459,12 @@ Pour ne placer le média que sur une seule face, choisissez Sélectionner une fa
<notification name="ErrorEncodingSnapshot">
Erreur d'encodage de la photo.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Il vous faut [COST]Â L$ pour enregistrer une photo dans votre inventaire. Vous pouvez acheter des L$ ou enregistrer la photo sur votre ordinateur.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Il vous faut [COST]Â L$ pour enregistrer une texture dans votre inventaire. Vous pouvez acheter des L$ ou enregistrer la photo sur votre ordinateur.
+ </notification>
<notification name="ErrorUploadingPostcard">
Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]
</notification>
@@ -574,6 +583,10 @@ Remarque : cela videra le cache.
Supprimer la note ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ Voulez-vous utiliser la capture d’écran précédente pour votre rapport ?
+ <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
L'enregistrement du geste a échoué.
Il y a trop d'étapes dans ce geste.
@@ -634,30 +647,12 @@ Consulter [_URL] pour en savoir plus ?
</url>
<usetemplate ignoretext="Mon matériel n'est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
</notification>
- <notification name="IntelOldDriver">
- Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances.
-
- Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ?
- <url name="url">
- http://www.intel.com/p/fr_FR/support/detect/graphics
- </url>
- <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
- </notification>
- <notification name="AMDOldDriver">
- Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances.
-
- Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ?
- <url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances.
+ <notification name="OldGPUDriver">
+ Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d’améliorer considérablement les performances.
- Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ?
+ Visiter la page [URL] pour rechercher d’éventuelles mises à jour de pilotes ?
<url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=fr
+ [URL]
</url>
<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
</notification>
@@ -748,6 +743,9 @@ Aller sur [_URL] pour obtenir des informations sur l'achat de L$ ?
</url>
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ Impossible d’ajouter une nouvelle entrée à la liste des ignorés car vous avez atteint la limite de [MUTE_LIMIT] entrées.
+ </notification>
<notification name="UnableToLinkObjects">
Impossible de lier ces [COUNT] objets.
Vous pouvez lier un maximum de [MAX] objets.
@@ -1374,6 +1372,11 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
</notification>
<notification name="AgentComplexity">
Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité de l'avatar] est [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="M’avertir quand la complexité de mon avatar change" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], cela risque d’avoir un impact négatif sur votre performance.
+ <usetemplate ignoretext="M’avertir quand la complexité de mon HUD est trop élevée" name="notifyignore"/>
</notification>
<notification name="FirstRun">
L'installation de [APP_NAME] est terminée.
@@ -1466,6 +1469,10 @@ Veuillez ne sélectionner qu'un seul objet.
Téléporter tous les résidents de cette région chez eux ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Si vous réduisez le bonus objets après que des constructions ont été établies dans une région, certains objets risquent d’être renvoyés ou supprimés. Voulez-vous vraiment modifier le bonus objets ?
+ <usetemplate ignoretext="Confirmer la modification du facteur Bonus objets" name="okcancelignore" notext="Annuler" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
Etes-vous certain de vouloir renvoyer les objets appartenant à [USER_NAME] ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -1514,6 +1521,9 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
<notification name="OwnerCanNotBeDenied">
Impossible d'ajouter le propriétaire du domaine à la liste des résidents bannis.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Impossible d’ajouter un résident banni à la liste des gérants de domaine.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Impossible de changer d'apparence jusqu'à ce que les habits et la silhouette soient chargés.
</notification>
@@ -1688,6 +1698,10 @@ Si vous êtes impatients de découvrir les dernières fonctionnalités et correc
Voulez-vous ouvrir votre navigateur web système pour afficher ce contenu ?
<usetemplate ignoretext="Ouvrir mon navigateur pour consulter une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ Le facteur de taille de l’interface système a changé depuis la dernière exécution. Voulez-vous ouvrir la page des paramètres d’ajustement de la taille de l’interface ?
+ <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Accéder à votre [http://secondlife.com/account/ Page d'accueil] pour gérer votre compte ?
<usetemplate ignoretext="Lancer mon navigateur pour gérer mon compte" name="okcancelignore" notext="Annuler" yestext="OK"/>
@@ -1727,10 +1741,17 @@ Si vous êtes impatients de découvrir les dernières fonctionnalités et correc
Quitter le groupe ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ Vous avez quitté le groupe « [group_name] ».
+ </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="GroupDepartError">
+ Impossible de quitter le groupe.
+ <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"/>
@@ -2130,6 +2151,10 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
Vous avez sélectionné trop de prims. Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Trop de scripts dans les objets sélectionnés. Sélectionnez moins d’objets et réessayez.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Problème lors de l'importation du règlement du domaine.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2298,6 +2323,10 @@ Déplacer les objets de l'inventaire ?
Échec de paiement : objet introuvable.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Paiement interrompu : le prix payé ne correspond à aucun des boutons de paiement pour cet objet.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Vous n'êtes autorisé à copier aucun élément dans cet objet.
</notification>
@@ -2333,6 +2362,12 @@ Vous ne pouvez pas l'annuler.
C’est une vaste sélection avec des groupes de liens. Si vous annulez les liens, vous risquez de ne pas pouvoir les rétablir. Vous devriez peut-être faire des copies des groupes de liens dans votre inventaire par mesure de précaution.
<usetemplate ignoretext="Confirmer l’annulation des liens d’un groupe de liens" name="okcancelignore" notext="Annuler" yestext="Annuler le lien"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Nous vous remercions d’avoir pris le temps de nous signaler ce problème.
+Nous lirons votre rapport pour identifier toute violation potentielle et prendrons
+les mesures nécessaires.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Veuillez choisir une catégorie pour ce rapport d'infraction.
Le choix d'une catégorie nous permet de traiter les rapports d'infraction plus rapidement.
@@ -2762,6 +2797,10 @@ Vous ne pouvez pas voler ici.
<notification name="PathfindingDirty">
Des modifications de recherche de chemin sont en attente concernant cette région. Si vous disposez de droits de construction, vous pouvez la figer de nouveau en cliquant sur le bouton Refiger la région.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ Des modifications de recherche de chemin sont en attente concernant cette région. Si vous disposez de droits de construction, vous pouvez la figer de nouveau en cliquant sur le bouton Refiger la région.
+ <usetemplate name="okbutton" yestext="Refiger la région"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
La recherche de chemin dynamique n'est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
</notification>
@@ -3268,11 +3307,13 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
L'apparence a été enregistrée en XML vers [PATH]
</notification>
<notification name="AppearanceToXMLFailed">
- Échec d'enregistrement de l'apparence en XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Erreur de suppression du préréglage [NAME].
+ Échec de l’enregistrement de l’apparence au format XML.
+ </notification>
+ <notification name="PresetNotSaved">
+ Erreur d’enregistrement du préréglage [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Erreur de suppression du préréglage [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
Impossible de trouver l'aide.
@@ -3482,13 +3523,6 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
<notification name="ForceQuitDueToLowMemory">
Mémoire insuffisante : fermeture de SL dans 30 secondes.
</notification>
- <notification name="PopupAttempt">
- Impossible d'ouvrir une fenêtre popup.
- <form name="form">
- <ignore name="ignore" text="Activer toutes les fenêtres popup"/>
- <button name="open" text="Ouvrir la fenêtre popup"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
Le proxy SOCKS 5 "[HOST]:[PORT]" a refusé la connexion, non autorisée par le jeu de règles défini.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3862,6 +3896,9 @@ Veuillez réessayer dans une minute.
Impossible de déplacer [OBJECT_NAME] jusqu'Ã
[OBJ_POSITION] dans la région [REGION_NAME] car il n'y a pas suffisamment de ressources pour cet objet sur cette parcelle.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ La copie a échoué car vous n’avez pas accès à cette parcelle.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
Impossible de déplacer [OBJECT_NAME] jusqu'Ã
[OBJ_POSITION] dans la région [REGION_NAME] car l'autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
@@ -3877,6 +3914,10 @@ Veuillez réessayer dans une minute.
<notification name="NoPermModifyObject">
Vous n'êtes pas autorisé à modifier cet objet.
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Trop d’objets avec un inventaire volumineux sont sélectionnés. Sélectionnez moins d’objets et réessayez.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
Impossible d'activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
</notification>
@@ -3913,6 +3954,12 @@ Veuillez réessayer dans une minute.
<notification name="CantSaveModifyAttachment">
Impossible d'enregistrer dans le contenu des objets : cela modifierait les droits d'attache.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Vos éléments attachés contiennent trop d’articles d’inventaire, impossible d’en ajouter plus.
+ </notification>
+ <notification name="IllegalAttachment">
+ La pièce jointe a demandé un point non existant sur l'avatar. Il a été fixé sur la poitrine.
+ </notification>
<notification name="TooManyScripts">
Trop de scripts.
</notification>
@@ -4005,6 +4052,12 @@ Veuillez réessayer dans une minute.
<notification name="TeleportedByObjectUnknownUser">
Vous avez été téléporté par l'objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
</notification>
+ <notification name="StandDeniedByObject">
+ [OBJECT_NAME] ne vous permet pas de vous tenir debout actuellement.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ « [OBJECT_NAME] » ne vous permet pas de changer de place actuellement.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Création de l'objet demandé impossible. La région est pleine.
</notification>
@@ -4086,9 +4139,6 @@ Veuillez réessayer dans une minute.
<notification name="CantAttachNotEnoughScriptResources">
Ressources de script insuffisantes pour attacher cet objet.
</notification>
- <notification name="IllegalAttachment">
- La pièce jointe a demandé un point non existant sur l'avatar. Il a été fixé sur la poitrine.
- </notification>
<notification name="CantDropItemTrialUser">
Vous ne pouvez pas déposer d'objets ici. Essayez la zone de période d'essai gratuite.
</notification>
@@ -4304,6 +4354,9 @@ Veuillez sélectionner un terrain plus petit.
<notification name="CantTransfterMoneyRegionDisabled">
Les transferts d'argent aux objets sont actuellement désactivés dans cette région.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Impossible d’effectuer le paiement à cause de la charge système.
+ </notification>
<notification name="CantPayNoAgent">
Impossible de savoir qui payer.
</notification>
@@ -4339,4 +4392,8 @@ Veuillez sélectionner un terrain plus petit.
Le fichier d'historique des chats est occupé à traiter l'opération précédente. Réessayez dans quelques minutes ou choisissez une autre personne pour le chat.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
index 1bc553c8c0f..05c689dd344 100644
--- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Porter les articles sélectionnés
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="GALERIE DES TENUES" name="outfit_gallery_tab"/>
<panel label="MES TENUES" name="outfitslist_tab"/>
<panel label="PORTÉ" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
index 874bab2daa4..1752f9dfdf6 100644
--- a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Aucun élément attaché porté.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="Articles à porter"/>
+ <accordion_tab name="tab_temp_attachments" title="Éléments attachés temporaires"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Afficher d'autres options"/>
+ <menu_button name="options_gear_btn" tool_tip="Afficher d'autres options"/>
</panel>
</panel>
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 2b1e613fe47..60cdd5df413 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -24,7 +24,7 @@
<text name="BetterText">
Meilleure
</text>
- <slider label="Complexité max. de l'avatar :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly baby »"/>
+ <slider label="Complexité max. de l'avatar :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « JellyDoll »"/>
<text name="IndirectMaxComplexityText">
0
</text>
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 bd21f9782d6..3b819b40c80 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Je téléchargerai et installerai les mises à jour manuellement" name="Install_manual"/>
</combo_box>
<check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
+ <check_box label="Afficher les notes de version après la mise à jour" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Paramètres de proxy :
</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 315fd82d412..40a41b93abb 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -61,18 +61,34 @@ Carte graphique : [GRAPHICS_CARD]
<string name="AboutDriver">
Version Windows Graphics Driver : [GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
Version OpenGLÂ : [OPENGL_VERSION]
-
-Version J2C Decoder : [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Taille de la fenêtre : [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Ajustement de la taille de la police : [FONT_SIZE_ADJUSTMENT] pts
+Échelle de l’interface : [UI_SCALE]
+Limite d’affichage : [DRAW_DISTANCE] m
+Bande passante : [NET_BANDWITH] kbit/s
+Facteur LOD (niveau de détail) : [LOD_FACTOR]
+Qualité de rendu : [RENDER_QUALITY] / 7
+Modèle d’éclairage avancé : [GPU_SHADERS]
+Mémoire textures : [TEXTURE_MEMORY] Mo
+Durée de création VFS (cache) : [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ Version J2C Decoder : [J2C_VERSION]
Version Audio Driver : [AUDIO_DRIVER_VERSION]
Version LLCEFLib/CEFÂ : [LLCEFLIB_VERSION]
-Version LibVLC : [LIBVLC_VERSION]
+Version LibVLCÂ : [LIBVLC_VERSION]
Version serveur vocal : [VOICE_VERSION]
</string>
<string name="AboutTraffic">
Paquets perdus : [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Erreur lors de la récupération de l'URL des notes de version du serveur.
</string>
@@ -1090,6 +1106,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="TeleportYourAgent">
Vous téléporter
</string>
+ <string name="ForceSitAvatar">
+ Forcez votre avatar à s’asseoir
+ </string>
<string name="NotConnected">
Pas connecté(e)
</string>
@@ -1938,6 +1957,27 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="av_render_anyone">
Vous risquez de n’être rendu par aucune des personnes qui vous entourent.
</string>
+ <string name="hud_description_total">
+ Votre HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (porté sur [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] utilise beaucoup de mémoire textures
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] contient beaucoup de textures et d’objets volumineux
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] contient beaucoup de textures volumineuses
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] contient trop d’objets
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] contient trop de textures
+ </string>
<string name="AgeYearsA">
[COUNT] an
</string>
@@ -2097,6 +2137,9 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="ObjectOutOfRange">
Script (objet hors de portée)
</string>
+ <string name="ScriptWasDeleted">
+ Script (supprimé de l’inventaire)
+ </string>
<string name="GodToolsObjectOwnedBy">
Objet [OBJECT] appartenant à [OWNER]
</string>
@@ -2709,6 +2752,15 @@ Veuillez réessayer de vous connecter dans une minute.
<string name="Play Media">
Lire/pauser le média
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/fr_FR/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=fr
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Une erreur est survenue lors de la lecture de la ligne de commande.
Merci de consulter : http://wiki.secondlife.com/wiki/Client_parameters
@@ -4484,12 +4536,18 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
<string name="paid_you_ldollars">
[NAME] vous a payé [AMOUNT] L$ [REASON].
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] vous a payé [AMOUNT] L$ : [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] vous a payé [AMOUNT] L$.
</string>
<string name="you_paid_ldollars">
Vous avez payé à [AMOUNT] L$ [REASON].
</string>
+ <string name="you_paid_ldollars_gift">
+ Vous avez payé à [NAME] [AMOUNT] L$ : [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Vous avez payé [AMOUNT] L$.
</string>
@@ -4502,6 +4560,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
<string name="you_paid_failure_ldollars">
Votre paiement de [AMOUNT] L$ à [NAME] [REASON] a échoué.
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ Votre paiement de [AMOUNT] L$ à [NAME] a échoué : [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
Votre paiement de [AMOUNT] L$ a échoué.
</string>
@@ -4828,6 +4889,15 @@ du rapport d'infraction
<string name="texture_load_dimensions_error">
Impossible de charger des images de taille supérieure à [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ Taille max. de la photo de la tenue : [WIDTH]*[HEIGHT]. Redimensionnez l’image ou utilisez-en une autre.
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ Taille max. de la photo de la tenue : [WIDTH]*[HEIGHT]. Sélectionnez une autre texture.
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Impossible de vérifier les dimensions de la photo. Attendez que la taille de la photo s’affiche dans le sélecteur.
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Malgré nos efforts, une erreur inattendue s'est produite.
@@ -5332,6 +5402,9 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
<string name="Command_Profile_Label">
Profil
</string>
+ <string name="Command_Report_Abuse_Label">
+ Signaler une infraction
+ </string>
<string name="Command_Search_Label">
Recherche
</string>
@@ -5422,6 +5495,9 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles
<string name="Command_Profile_Tooltip">
Modifier ou afficher votre profil
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Signaler une infraction
+ </string>
<string name="Command_Search_Tooltip">
Trouver des lieux, personnes, événements
</string>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index 1fe2659e4b2..95fe4aaf4c2 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Includi peso pelle" name="upload_skin"/>
<check_box label="Includi posizioni giunti" name="upload_joints"/>
+ <check_box label="Blocca scala se è definita la posizione dei giunti" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Spostamento Z (sposta l'avatar in alto o in basso):
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index ef24fc850d6..fc2e7c676c0 100644
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">Paga gruppo</string>
- <string name="payee_resident">Paga residente</string>
- <text name="paying_text">Stai pagando:</text>
- <text left="115" name="payee_name">Nome di test che è troppo lungo per controllare il taglio</text>
+ <string name="payee_group">
+ Paga gruppo
+ </string>
+ <string name="payee_resident">
+ Paga residente
+ </string>
+ <text name="paying_text">
+ Stai pagando:
+ </text>
+ <text left="115" name="payee_name">
+ Nome di test che è troppo lungo per controllare il taglio
+ </text>
+ <text name="payment_message_label">
+ Descrizione (facoltativa):
+ </text>
<panel label="Cerca" name="PatternsPanel">
<button label="Paga 1 L$" label_selected="Paga 1 L$" name="fastpay 1"/>
<button label="Paga 5 L$" label_selected="Paga 5 L$" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="Paga 20 L$" label_selected="Paga 20 L$" name="fastpay 20"/>
</panel>
<panel label="Cerca" name="InputPanel">
- <text name="amount text">Altro importo:</text>
+ <text name="amount text">
+ Altro importo:
+ </text>
<button label="Paga" label_selected="Paga" name="pay btn"/>
<button label="Annulla" label_selected="Annulla" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml
index f4117d30a20..d0d01232833 100644
--- a/indra/newview/skins/default/xui/it/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Non in esecuzione
</floater.string>
+ <floater.string name="Timeout">
+ Timeout: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Caricamento inventario per: [OBJECT_NAME]
+ </floater.string>
<button label="Chiudi" label_selected="Chiudi" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
index 5603e85417a..87bbf07937c 100644
--- a/indra/newview/skins/default/xui/it/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/it/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Navigazione sicura"/>
<button name="popexternal" tool_tip="Apri URL corrente nel browser del computer"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Home page test web"/>
+ <button name="VLC Plugin Test" tool_tip="Test video MPEG4"/>
+ </layout_panel>
</layout_stack>
</floater>
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 5c017a92b5c..18324002987 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Chiama" name="Call"/>
<menu_item_call label="Invita al gruppo" name="Invite..."/>
<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
+ <menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
<menu_item_call label="Blocca" name="Avatar Mute"/>
<menu_item_call label="Segnala" name="abuse"/>
<menu_item_call label="Congela" name="Freeze..."/>
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 b1ca55b093a..f25a289a62c 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
<menu_item_call label="Altezza di volo" name="Hover Height"/>
<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
+ <menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
<menu_item_call label="I miei amici..." name="Friends..."/>
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
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 12e808195e0..f3b4075a29e 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Chiama" name="Call"/>
<menu_item_call label="Invita al gruppo" name="Invite..."/>
<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
+ <menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
<menu_item_call label="Blocca" name="Avatar Mute"/>
<menu_item_call label="Segnala" name="abuse"/>
<menu_item_call label="Congela" name="Freeze..."/>
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 e48449a04ca..85de7f4e307 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
<menu_item_call label="Altezza di volo" name="Hover Height"/>
<menu_item_call label="Ripristina scheletro" name="Reset Skeleton"/>
+ <menu_item_call label="Ripristina scheletro e animazioni" name="Reset Skeleton And Animations"/>
<menu_item_call label="I miei amici..." name="Friends..."/>
<menu_item_call label="I miei gruppi" name="Groups..."/>
<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 33fa25cd38f..3d2a556fe2e 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -20,12 +20,11 @@
<menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">
<menu_item_call label="Mostra impostazioni di debug" name="Debug Settings"/>
- <menu_item_call label="Impostazioni colori interfaccia" name="UI/Color Settings"/>
<menu label="Test interfaccia utente" name="UI Tests"/>
<menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
<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_item_call label="Browser multimedia" name="Media Browser"/>
<menu label="Imposta livello di registrazione" name="Set Logging Level">
<menu_item_check label="Debug" name="Debug"/>
<menu_item_check label="Info" name="Info"/>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 9623775af46..a574757fd04 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
<menu_item_call label="Blocca..." name="Block"/>
+ <menu_item_call label="Sblocca" name="Unblock"/>
<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>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 3ac0c5ce698..62c6d53e1c6 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear"/>
<menu_item_call label="Indossa - Aggiungi al vestiario attuale" name="wear_add"/>
<menu_item_call label="Togli - Rimuovi dal vestiario attuale" name="take_off"/>
+ <menu_item_call label="Carica foto (L$ 10)" name="upload_photo"/>
+ <menu_item_call label="Seleziona foto" name="select_photo"/>
+ <menu_item_call label="Scatta un'istantanea" name="take_snapshot"/>
+ <menu_item_call label="Rimuovi foto" name="remove_photo"/>
<menu label="Nuovi abiti" name="New Clothes">
<menu_item_call label="Nuova camicia" name="New Shirt"/>
<menu_item_call label="Nuovi pantaloni" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
<menu_item_call label="Cambia nome del vestiario" name="rename"/>
<menu_item_call label="Elimina vestito" name="delete_outfit"/>
+ <menu_item_check label="Ordina le cartelle sempre in base al nome" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
index 972e359cfe5..1cfe14b86b0 100644
--- a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
+ <menu_item_check label="Nascondi nomi utenti" name="view_usernames"/>
<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index 1c09b1cfe25..3b9f9c89f81 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="Condividi" name="share"/>
<menu_item_call label="Paga" name="pay"/>
<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
+ <menu_item_call label="Congela" name="freeze"/>
+ <menu_item_call label="Espelli" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
index 223d88fee1c..d0891903f51 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
<menu_item_check label="Mostra mappa" name="view_map"/>
+ <menu_item_check label="Nascondi nomi utenti" name="view_usernames"/>
</toggleable_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 116b6521727..67bc34a5d74 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Sblocca" name="unblock_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 90ea6012590..96f06d5f98a 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="Collegamento" name="Link"/>
<menu_item_call label="Scollega" name="Unlink"/>
<menu_item_check label="Modifica le parti collegate" name="Edit Linked Parts"/>
- <menu label="Seleziona parti collegate" name="Select Linked Parts">
- <menu_item_call label="Seleziona parte successiva" name="Select Next Part"/>
- <menu_item_call label="Seleziona parte precedente" name="Select Previous Part"/>
- <menu_item_call label="Includi parte successiva" name="Include Next Part"/>
- <menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
+ <menu label="Seleziona elementi" name="Select Elements">
+ <menu_item_call label="Seleziona parte o faccia successiva" name="Select Next Part or Face"/>
+ <menu_item_call label="Seleziona parte o faccia precedente" name="Select Previous Part or Face"/>
+ <menu_item_call label="Includi parte o faccia successiva" name="Include Next Part or Face"/>
+ <menu_item_call label="Includi parte o faccia precedente" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="Set collegati..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
@@ -332,8 +332,7 @@
<menu_item_call label="Dump della cache oggetti regione" name="Dump Region Object Cache"/>
</menu>
<menu label="Interfaccia utente" name="UI">
- <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="Browser multimedia" name="Media Browser"/>
<menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/>
<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/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
index 4a5366091f1..ec375e52403 100644
--- a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Togli" name="take_off"/>
<menu_item_call label="Stacca" name="detach"/>
<menu_item_call label="Modifica vestiario" name="edit"/>
+ <menu_item_call label="Modifica" name="edit_item"/>
+ <menu_item_call label="Mostra originale" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml
index df119263b77..7e528b06884 100644
--- a/indra/newview/skins/default/xui/it/mime_types.xml
+++ b/indra/newview/skins/default/xui/it/mime_types.xml
@@ -22,14 +22,6 @@
Riproduci video
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- Nessun contenuto
- </label>
- <tooltip name="none_tooltip">
- Nessun contenuto multimediale qui
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Immagine
@@ -52,11 +44,24 @@
Riproduci l'audio di questo posto
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Nessun contenuto
+ </label>
+ <tooltip name="none_tooltip">
+ Nessun contenuto multimediale qui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Streaming in tempo reale
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ Media supportati da LibVLC
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Nessuno -
@@ -127,11 +132,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
@@ -207,6 +207,11 @@
Video (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Filmato
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Video (QuickTime)
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 3a29e4d32fc..3621b3bc62b 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -330,6 +330,9 @@ Se non desideri che queste abilità siano assegnate a questo ruolo, disattivale
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="GroupBanUserOnBanlist">
+ Ad alcuni residenti non è stato inviato l'invito perché espulsi dal gruppo.
+ </notification>
<notification name="AttachmentDrop">
Stai per abbandonare il tuo accessorio.
Vuoi continuare?
@@ -457,6 +460,12 @@ Per collocare il media su una sola faccia, scegli Seleziona faccia, clicca su un
<notification name="ErrorEncodingSnapshot">
Errore nella codifica della fotografia.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Hai bisogno di L$ [COST] per salvare una foto nel tuo inventario. Puoi acquistare L$ o salvare la foto sul tuo computer.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Hai bisogno di L$ [COST] per salvare una texture nel tuo inventario. Puoi acquistare L$ o salvare la foto sul tuo computer.
+ </notification>
<notification name="ErrorUploadingPostcard">
C'è stato un problema inviando la fotografia per il seguente motivo: [REASON]
</notification>
@@ -572,6 +581,10 @@ Nota: questa operazione cancellerà la cache.
Vuoi eliminare il biglietto?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ Vuoi usare la precedente schermata per il tuo rapporto?
+ <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Il salvataggio della Gesture è fallito.
La gesture ha troppi passi.
@@ -632,30 +645,12 @@ Visitare [_URL] per ulteriori informazioni?
</url>
<usetemplate ignoretext="L'hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/>
</notification>
- <notification name="IntelOldDriver">
- È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
- Visitare [_URL] per cercare un aggiornamento del driver?
- <url name="url">
- http://www.intel.com/p/it_IT/support/detect/graphics
- </url>
- <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
- </notification>
- <notification name="AMDOldDriver">
- È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
- Visitare [_URL] per cercare un aggiornamento del driver?
- <url name="url">
- http://support.amd.com/it/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+ <notification name="OldGPUDriver">
+ È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
- Visitare [_URL] per cercare un aggiornamento del driver?
+ Visitare [URL] per cercare un aggiornamento del driver?
<url name="url">
- http://www.nvidia.it/Download/index.aspx?lang=it
+ [URL]
</url>
<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
</notification>
@@ -747,6 +742,9 @@ Vai su [_URL] per informazioni sull'acquisto di L$?
</url>
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ Impossibile aggiungere il nuovo elemento alla lista dei bloccati perché hai raggiunto il limite di [MUTE_LIMIT] immissioni.
+ </notification>
<notification name="UnableToLinkObjects">
Impossibile unire questi [COUNT] oggetti.
Puoi unire al massimo [MAX] oggetti.
@@ -1379,6 +1377,11 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
</notification>
<notification name="AgentComplexity">
La [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità del tuo avatar] è [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Avvisami in caso di cambiamenti della complessità del mio avatar" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], è probabile che influisca negativamente sulle tue prestazioni.
+ <usetemplate ignoretext="Avvisami quando la complessità del mio HUD è eccessiva" name="notifyignore"/>
</notification>
<notification name="FirstRun">
L'installazione di [APP_NAME] è terminata.
@@ -1470,6 +1473,10 @@ Scegli solo un oggetto e riprova.
Teleporta a casa tutti i residenti in questa regione?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ La riduzione del bonus oggetti dopo aver costruito in una regione può causare la restituzione o l'eliminazione di oggetti. Vuoi comunque cambiare il bonus oggetti?
+ <usetemplate ignoretext="Conferma cambiamento fattore bonus oggetti" name="okcancelignore" notext="Annulla" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
Confermi di voler restituire gli oggetti di proprietà di [USER_NAME] ?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1517,6 +1524,9 @@ Eccede il [MAX_AGENTS] [LIST_TYPE] limite di [NUM_EXCESS].
<notification name="OwnerCanNotBeDenied">
Impossibile aggiungere i proprietari della proprietà immobiliare alla lista dei residenti bloccati.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Impossibile aggiungere il residente espulso alla lista dei gestori delle proprietà .
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Impossibile cambiare l'aspetto fisico finchè gli abiti e i vestiti non sono caricati.
</notification>
@@ -1692,6 +1702,10 @@ Per provare le funzioni e modifiche più recenti, visita la pagina Alternate Vie
Vuoi aprire il browser per vedere questi contenuti?
<usetemplate ignoretext="Lancia il browser per consultare una pagina web" name="okcancelignore" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ Il fattore dimensioni UI del sistema è cambiato rispetto all'ultima sessione. Vuoi aprire la pagina delle impostazioni di regolazione delle dimensioni UI?
+ <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Vuoi andare su [http://secondlife.com/account/ Dashboard] per gestire il tuo account?
<usetemplate ignoretext="Lancia il browser per gestire il mio account" name="okcancelignore" notext="Annulla" yestext="OK"/>
@@ -1731,10 +1745,17 @@ Per provare le funzioni e modifiche più recenti, visita la pagina Alternate Vie
Lasciare il gruppo?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ Hai abbandonato il gruppo "[group_name]".
+ </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="GroupDepartError">
+ Impossibile abbandonare il gruppo.
+ <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"/>
@@ -2135,6 +2156,10 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
Hai selezionato troppi prim. Seleziona non più di [MAX_PRIM_COUNT] prim e riprova
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Troppi script negli oggetti selezionati. Seleziona meno oggetti e riprova.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Problemi nell'importazione del regolamento della proprietà .
<usetemplate name="okbutton" yestext="OK"/>
@@ -2304,6 +2329,10 @@ Trasferisci gli elementi nell'inventario?
Pagamento non riuscito: oggetto non trovato.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Pagamento interrotto: il prezzo pagato non corrisponde a nessuno dei pulsanti di pagamento impostati per questo oggetto.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Non ci sono elementi in questo oggetto che tu possa copiare.
</notification>
@@ -2339,6 +2368,11 @@ Questa azione non può essere ripristinata
Questa è una selezione di grandi dimensioni con set collegati. Se viene scollegata, potrebbe non essere possibile ricollegarla. Come precauzione ti consigliamo di salvare copie dei set collegati nel tuo inventario.
<usetemplate ignoretext="Conferma per scollegare un set collegato" name="okcancelignore" notext="Annulla" yestext="Scollega"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Ti ringraziamo della segnalazione.
+Esamineremo il tuo rapporto e, in caso di violazioni, prenderemo le misure appropriate.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Scegli una categoria per questa segnalazione di abuso.
Scegliere una categoria, ci aiuta a gestire ed elaborare le segnalazioni di abuso.
@@ -2767,6 +2801,10 @@ Qui non puoi volare.
<notification name="PathfindingDirty">
La regione ha modifiche di pathfinding in sospeso. Se hai le autorizzazioni necessarie per la costruzione puoi eseguire il rebake facendo clic sul pulsante “Rebake regioneâ€.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ La regione ha modifiche di pathfinding in sospeso. Se hai le autorizzazioni necessarie per la costruzione, puoi eseguire il rebake facendo clic sul pulsante “Rebake regioneâ€.
+ <usetemplate name="okbutton" yestext="Rebake regione"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
Il pathfinding dinamico non è attivato in questa regione. Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
</notification>
@@ -3273,11 +3311,13 @@ Per sicurezza, verranno bloccati per alcuni secondi.
L'aspetto è stato salvato in XML su [PATH]
</notification>
<notification name="AppearanceToXMLFailed">
- L'aspetto non è stato salvato in XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Errore nella cancellazione del valore predefinito [NAME].
+ Salvataggio aspetto in formato XML non riuscito.
+ </notification>
+ <notification name="PresetNotSaved">
+ Errore durante il salvataggio del valore predefinito [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Errore durante l'eliminazione del valore predefinito [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
Impossibile trovare l'argomento nell'aiuto per questo elemento.
@@ -3487,13 +3527,6 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
<notification name="ForceQuitDueToLowMemory">
SL verrà interrotto tra 30 secondi a causa di spazio di memoria insufficiente.
</notification>
- <notification name="PopupAttempt">
- Non è stato possibile aprire una finestra pop-up.
- <form name="form">
- <ignore name="ignore" text="Attiva tutti i pop-up"/>
- <button name="open" text="Apri finestra pop-up"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
Il proxy SOCKS 5 "[HOST]:[PORT]" ha rifiutato il collegamento, che non è consentito dalle regole.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3868,6 +3901,9 @@ Riprova tra un minuto.
Impossibile muovere l'oggetto '[OBJECT_NAME]' a
[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l'oggetto su questo lotto.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ Copia non riuscita perché non hai accesso a quel lotto.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
Impossibile muovere l'oggetto '[OBJECT_NAME]' a
[OBJ_POSITION] nella regione [REGION_NAME] perché nell'altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
@@ -3883,6 +3919,10 @@ Riprova tra un minuto.
<notification name="NoPermModifyObject">
Non hai l'autorizzazione necessaria per modificare questa immagine
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Selezionati troppi oggetti con tanti elementi di inventario. Seleziona meno oggetti e riprova.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
</notification>
@@ -3919,6 +3959,12 @@ Riprova tra un minuto.
<notification name="CantSaveModifyAttachment">
Impossibile salvare i contenuti dell'oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Gli allegati contengono troppi elementi di inventario e non puoi aggiungerne altri.
+ </notification>
+ <notification name="IllegalAttachment">
+ Il collegamento ha richiesto un punto sull'avatar che non esiste. È stato collegato al petto.
+ </notification>
<notification name="TooManyScripts">
Troppi script.
</notification>
@@ -4011,6 +4057,12 @@ Riprova tra un minuto.
<notification name="TeleportedByObjectUnknownUser">
Sei stato teleportato dall'oggetto '[OBJECT_NAME]' di proprietà di un utente sconosciuto.
</notification>
+ <notification name="StandDeniedByObject">
+ Al momento, "[OBJECT_NAME]" non ti permette di stare in piedi.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ Al momento, "[OBJECT_NAME]" non ti permette di cambiare il posto a sedere.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Impossibile creare l'oggetto richiesto. La regione è piena.
</notification>
@@ -4092,9 +4144,6 @@ Riprova tra un minuto.
<notification name="CantAttachNotEnoughScriptResources">
Risorse di script non sufficienti per collegare l'oggetto.
</notification>
- <notification name="IllegalAttachment">
- Il collegamento ha richiesto un punto sull'avatar che non esiste. È stato collegato al petto.
- </notification>
<notification name="CantDropItemTrialUser">
Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
</notification>
@@ -4310,6 +4359,9 @@ Prova a selezionare un pezzo di terreno più piccolo.
<notification name="CantTransfterMoneyRegionDisabled">
Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Impossibile effettuare il pagamento a causa del carico del sistema.
+ </notification>
<notification name="CantPayNoAgent">
Non si capisce chi deve essere pagato.
</notification>
@@ -4345,4 +4397,8 @@ Prova a selezionare un pezzo di terreno più piccolo.
Il file della cronologia del file sta ancora eseguendo l'operazione precedente. Riprova nuovamente tra qualche minuto oppure chatta con un'altra persona.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
index c7821bc3639..a19fa4eb18c 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Indossa capi selezionati
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="GALLERIA VESTIARIO" name="outfit_gallery_tab"/>
<panel label="I MIEI ABITI" name="outfitslist_tab"/>
<panel label="INDOSSA" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
index 3bbf2446f55..0efed03e650 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Nessun allegato indossato.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="Indossabili"/>
+ <accordion_tab name="tab_temp_attachments" title="Allegati temporanei"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/>
+ <menu_button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/>
</panel>
</panel>
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 093f7fc411d..d34bb7c3a44 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<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"/>
+ <check_box label="Mostra note di release dopo l'aggiornamento" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Impostazioni proxy:
</text>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 279ab99ae35..8246f91d17e 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -58,18 +58,34 @@ Scheda grafica: [GRAPHICS_CARD]
<string name="AboutDriver">
Versione driver Windows per grafica: [GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
Versione OpenGL: [OPENGL_VERSION]
-
-Versione J2C Decoder: [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Dimensione finestra: [WINDOW_WIDTH] x [WINDOW_HEIGHT]
+Regolazione dimensioni carattere: [FONT_SIZE_ADJUSTMENT] punti
+Scala UI: [UI_SCALE]
+Distanza visualizzazione: [DRAW_DISTANCE] m
+Larghezza banda: [NET_BANDWITH] kbit/s
+Fattore livello di dettaglio: [LOD_FACTOR]
+Qualità di rendering: [RENDER_QUALITY] / 7
+Modello illuminazione avanzato: [GPU_SHADERS]
+Memoria texture: [TEXTURE_MEMORY] MB
+Data/ora creazione VFS (cache): [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ Versione J2C Decoder: [J2C_VERSION]
Versione Driver audio: [AUDIO_DRIVER_VERSION]
Versione LLCEFLib/CEF: [LLCEFLIB_VERSION]
Versione LibVLC: [LIBVLC_VERSION]
-Versione server voce: [VOICE_VERSION]
+Versione Server voice: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Errore nel recupero URL note rilascio versione
</string>
@@ -1084,6 +1100,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="TeleportYourAgent">
Teleportarti
</string>
+ <string name="ForceSitAvatar">
+ Forza l'avatar a sedersi
+ </string>
<string name="AgentNameSubst">
(Tu)
</string>
@@ -1923,6 +1942,27 @@ Prova ad accedere nuovamente tra un minuto.
<string name="av_render_anyone">
Tutte le persone vicine a te potrebbero non eseguire il tuo rendering.
</string>
+ <string name="hud_description_total">
+ Il tuo HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (indossato su [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] fa uso di molta memoria texture
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] contiene molti oggetti e texture che occupano una grande quantità di risorse
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] contiene molte texture di grandi dimensioni
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] contiene troppi oggetti
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] contiene troppe texture
+ </string>
<string name="AgeYearsA">
[COUNT] anno
</string>
@@ -2082,6 +2122,9 @@ Prova ad accedere nuovamente tra un minuto.
<string name="ObjectOutOfRange">
Script (oggetto fuori portata)
</string>
+ <string name="ScriptWasDeleted">
+ Script (eliminato da inventario)
+ </string>
<string name="GodToolsObjectOwnedBy">
Oggetto [OBJECT] di proprietà di [OWNER]
</string>
@@ -2652,6 +2695,15 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="Play Media">
Riproduci/Pausa supporto
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=en-us
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Un errore è stato riscontrato analizzando la linea di comando.
Per informazioni: http://wiki.secondlife.com/wiki/Client_parameters
@@ -4397,12 +4449,18 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
<string name="paid_you_ldollars">
[NAME] ti ha inviato un pagamento di L$[AMOUNT] [REASON].
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] ti ha inviato un pagamento di L$ [AMOUNT]: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] ti ha inviato un pagamento di L$[AMOUNT].
</string>
<string name="you_paid_ldollars">
Hai inviato un pagamento di L$[AMOUNT] a [NAME] [REASON].
</string>
+ <string name="you_paid_ldollars_gift">
+ Hai inviato un pagamento di L$ [AMOUNT] a [NAME]: [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Hai pagato L$ [AMOUNT].
</string>
@@ -4415,6 +4473,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
<string name="you_paid_failure_ldollars">
Non hai pagato [NAME] L$[AMOUNT] [REASON].
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ Non hai inviato un pagamento di L$ [AMOUNT] a [NAME]: [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
Non hai pagato L$ [AMOUNT].
</string>
@@ -4741,6 +4802,15 @@ Segnala abuso
<string name="texture_load_dimensions_error">
Impossibile caricare immagini di dimensioni superiori a [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ Le dimensioni massime delle foto di vestiario sono [WIDTH]*[HEIGHT]. Ridimensiona l'immagine o usane un'altra
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ Le dimensioni massime delle foto di vestiario sono [WIDTH]*[HEIGHT]. Seleziona un'altra texture
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Impossibile verificare le dimensioni della foto. Attendi che le dimensioni siano visualizzate nel selettore.
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Nonostante i nostri tentativi, si è verificato un errore imprevisto.
@@ -5245,6 +5315,9 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
<string name="Command_Profile_Label">
Profilo
</string>
+ <string name="Command_Report_Abuse_Label">
+ Segnala abuso
+ </string>
<string name="Command_Search_Label">
Ricerca
</string>
@@ -5335,6 +5408,9 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette.
<string name="Command_Profile_Tooltip">
Modifica o visualizza il tuo profilo
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Segnala abuso
+ </string>
<string name="Command_Search_Tooltip">
Trova luoghi, eventi, persone
</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 108892dd6db..c22aaaf4c41 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="スã‚ンã®é‡ã•ã‚’å«ã‚€" name="upload_skin"/>
<check_box label="ジョイントãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’å«ã‚€" name="upload_joints"/>
+ <check_box label="ジョイントä½ç½®ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã€ã‚¹ã‚±ãƒ¼ãƒ«ã‚’ãƒãƒƒã‚¯" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Z オフセット（アãƒã‚¿ãƒ¼ã‚’上下調整）：
</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 0ca0990bd43..7807fdf7b4d 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">グループã«æ”¯æ‰•ã†</string>
- <string name="payee_resident">ä½äººã«æ”¯æ‰•ã†</string>
- <text name="paying_text">支払ä¸:</text>
- <text name="payee_name">éžå¸¸ã«é•·ã„åå‰ãŒé€”ä¸ã§åˆ‡ã‚Œã¦ã„ãªã„ã‹ã‚’テストã—ã¦ç¢ºèª</text>
+ <string name="payee_group">
+ グループã«æ”¯æ‰•ã†
+ </string>
+ <string name="payee_resident">
+ ä½äººã«æ”¯æ‰•ã†
+ </string>
+ <text name="paying_text">
+ 支払ä¸:
+ </text>
+ <text name="payee_name">
+ éžå¸¸ã«é•·ã„åå‰ãŒé€”ä¸ã§åˆ‡ã‚Œã¦ã„ãªã„ã‹ã‚’テストã—ã¦ç¢ºèª
+ </text>
+ <text name="payment_message_label">
+ 説明（任æ„é …ç›®ï¼‰ï¼š
+ </text>
<panel label="検索" name="PatternsPanel">
<button label="L$ 1 支払ã†" label_selected="L$ 1 支払ã†" name="fastpay 1"/>
<button label="L$ 5 支払ã†" label_selected="L$ 5 支払ã†" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="L$ 20 支払ã†" label_selected="L$ 20 支払ã†" name="fastpay 20"/>
</panel>
<panel label="検索" name="InputPanel">
- <text name="amount text">ãã®ä»–ã®é‡‘é¡:</text>
+ <text name="amount text">
+ ãã®ä»–ã®é‡‘é¡:
+ </text>
<button label="支払ã„" label_selected="支払ã„" name="pay btn"/>
<button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index 97e79fb483f..de0c4469c1f 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
実行ã•ã‚Œã¦ã„ã¾ã›ã‚“
</floater.string>
+ <floater.string name="Timeout">
+ タイムアウト： [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ 次ã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‚’ãƒãƒ¼ãƒ‰ä¸ï¼š [OBJECT_NAME]
+ </floater.string>
<button label="é–‰ã˜ã‚‹" label_selected="é–‰ã˜ã‚‹" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index 48fe8aee78d..d57cd4e297f 100644
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="安全ãªé–²è¦§"/>
<button name="popexternal" tool_tip="ã“ã® URL をブラウザã§é–‹ã"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Web テストã®ãƒ›ãƒ¼ãƒ ページ"/>
+ <button name="VLC Plugin Test" tool_tip="MPEG4 ビデオテスト"/>
+ </layout_panel>
</layout_stack>
</floater>
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 78c36a43927..23357ebbc2b 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="コール" name="Call"/>
<menu_item_call label="グループã«æ‹›å¾…" name="Invite..."/>
<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+ <menu_item_call label="スケルトンã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’リセット" name="Reset Skeleton And Animations"/>
<menu_item_call label="ブãƒãƒƒã‚¯" name="Avatar Mute"/>
<menu_item_call label="å ±å‘Š" name="abuse"/>
<menu_item_call label="フリーズ" name="Freeze..."/>
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 ba46f91504b..fa1137c7c58 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="シェイプã®ç·¨é›†" name="Edit My Shape"/>
<menu_item_call label="ホãƒãƒ¼é«˜ã•" name="Hover Height"/>
<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+ <menu_item_call label="スケルトンã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’リセット" name="Reset Skeleton And Animations"/>
<menu_item_call label="フレンド" name="Friends..."/>
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile..."/>
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 b7e05378663..1902c9b359f 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="コール" name="Call"/>
<menu_item_call label="グループã«æ‹›å¾…" name="Invite..."/>
<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+ <menu_item_call label="スケルトンã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’リセット" name="Reset Skeleton And Animations"/>
<menu_item_call label="ブãƒãƒƒã‚¯" name="Avatar Mute"/>
<menu_item_call label="å ±å‘Š" name="abuse"/>
<menu_item_call label="フリーズ" name="Freeze..."/>
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 a3847ed555f..b0a619bcb09 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
<menu_item_call label="ホãƒãƒ¼é«˜ã•" name="Hover Height"/>
<menu_item_call label="スケルトンをリセット" name="Reset Skeleton"/>
+ <menu_item_call label="スケルトンã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’リセット" name="Reset Skeleton And Animations"/>
<menu_item_call label="フレンド" name="Friends..."/>
<menu_item_call label="グループ" name="Groups..."/>
<menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index abf7bce067f..71f36b17be5 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="デãƒãƒƒã‚°ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã™ã‚‹" name="Show Debug Menu"/>
<menu label="デãƒãƒƒã‚°" name="Debug">
<menu_item_call label="デãƒãƒƒã‚°è¨å®šã‚’表示" name="Debug Settings"/>
- <menu_item_call label="UI/色ã®è¨å®š" name="UI/Color Settings"/>
<menu_item_call label="XUI プレビューツール" name="UI Preview Tool"/>
<menu label="UI テスト" name="UI Tests"/>
<menu_item_call label="ウィンドウã®ã‚µã‚¤ã‚ºã‚’è¨å®š..." name="Set Window Size..."/>
<menu_item_call label="利用è¦ç´„を表示" name="TOS"/>
<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
- <menu_item_call label="Web コンテンツフãƒãƒ¼ã‚¿ãƒ¼ã®ãƒ‡ãƒãƒƒã‚°ãƒ†ã‚¹ãƒˆ" name="Web Content Floater Debug Test"/>
+ <menu_item_call label="メディアブラウザ" name="Media Browser"/>
<menu label="ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’è¨å®š" name="Set Logging Level">
<menu_item_check label="デãƒãƒƒã‚°" name="Debug"/>
<menu_item_check label="æƒ…å ±" name="Info"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 6448e9244ec..7b55a64eefa 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«..." name="Object Profile"/>
<menu_item_call label="ブãƒãƒƒã‚¯..." name="Block"/>
+ <menu_item_call label="ブãƒãƒƒã‚¯è§£é™¤" name="Unblock"/>
<menu_item_call label="地図ã«è¡¨ç¤º" name="show_on_map"/>
<menu_item_call label="オブジェクトã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 1969ae2a102..5e02fd3b8f3 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="ç€ã‚‹ - ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‚’入れ替ãˆã‚‹" name="wear"/>
<menu_item_call label="ç€ã‚‹ - ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã«è¿½åŠ ã™ã‚‹" name="wear_add"/>
<menu_item_call label="å–り外㙠- ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‹ã‚‰å–り除ã" name="take_off"/>
+ <menu_item_call label="写真をアップãƒãƒ¼ãƒ‰ï¼ˆL$10）" name="upload_photo"/>
+ <menu_item_call label="写真をé¸æŠž" name="select_photo"/>
+ <menu_item_call label="スナップショットを撮る" name="take_snapshot"/>
+ <menu_item_call label="写真を削除" name="remove_photo"/>
<menu label="衣類" name="New Clothes">
<menu_item_call label="シャツ" name="New Shirt"/>
<menu_item_call label="パンツ" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="フォルダをã™ã¹ã¦é–‰ã˜ã‚‹" name="collapse"/>
<menu_item_call label="アウトフィットã®åå‰ã‚’変更ã™ã‚‹" name="rename"/>
<menu_item_call label="アウトフィットを削除ã™ã‚‹" name="delete_outfit"/>
+ <menu_item_check label="フォルダを常ã«åå‰é †ã«ä¸¦ã¹ã‚‹" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
index b95d11fdbdc..f290bec652b 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="オンライン状æ³ã§ä¸¦ã¹æ›¿ãˆ" name="sort_status"/>
<menu_item_check label="人ã®ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º" name="view_icons"/>
<menu_item_check label="与ãˆã‚‰ã‚ŒãŸæ¨©é™ã‚’表示" name="view_permissions"/>
+ <menu_item_check label="ユーザーåã‚’éžè¡¨ç¤º" name="view_usernames"/>
<menu_item_check label="会話ãƒã‚°ã‚’表示..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 972ab767bf4..87f1d26ca43 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="共有" name="share"/>
<menu_item_call label="支払ã„" name="pay"/>
<menu_item_check label="ブãƒãƒƒã‚¯ãƒ»ãƒ–ãƒãƒƒã‚¯è§£é™¤" name="block_unblock"/>
+ <menu_item_call label="フリーズ" name="freeze"/>
+ <menu_item_call label="追放" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
index b7cccc4396d..9330a8e4848 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="è·é›¢ã§ä¸¦ã¹æ›¿ãˆ" name="sort_distance"/>
<menu_item_check label="人ã®ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º" name="view_icons"/>
<menu_item_check label="地図を表示" name="view_map"/>
+ <menu_item_check label="ユーザーåã‚’éžè¡¨ç¤º" name="view_usernames"/>
</toggleable_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 a02ca8415d3..96f8b3f7b1b 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<context_menu name="Url Popup">
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«..." name="show_object"/>
<menu_item_call label="ブãƒãƒƒã‚¯..." name="block_object"/>
+ <menu_item_call label="ブãƒãƒƒã‚¯è§£é™¤" name="unblock_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 c2ae77bef21..e0834eb12d8 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="リンク" name="Link"/>
<menu_item_call label="リンクを外ã™" name="Unlink"/>
<menu_item_check label="リンクã—ãŸéƒ¨åˆ†ã‚’編集" name="Edit Linked Parts"/>
- <menu label="リンクã—ãŸéƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Linked Parts">
- <menu_item_call label="次ã®éƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Next Part"/>
- <menu_item_call label="å‰å›žã®éƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Previous Part"/>
- <menu_item_call label="次ã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Next Part"/>
- <menu_item_call label="å‰å›žã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Previous Part"/>
+ <menu label="è¦ç´ ã‚’é¸æŠž" name="Select Elements">
+ <menu_item_call label="次ã®ãƒ‘ーツã¾ãŸã¯é¢ã‚’é¸æŠž" name="Select Next Part or Face"/>
+ <menu_item_call label="å‰ã®ãƒ‘ーツã¾ãŸã¯é¢ã‚’é¸æŠž" name="Select Previous Part or Face"/>
+ <menu_item_call label="次ã®ãƒ‘ーツã¾ãŸã¯é¢ã‚’å«ã‚ã‚‹" name="Include Next Part or Face"/>
+ <menu_item_call label="å‰ã®ãƒ‘ーツã¾ãŸã¯é¢ã‚’å«ã‚ã‚‹" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="リンクセット..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã«ç„¦ç‚¹ã‚’åˆã‚ã›ã‚‹" name="Focus on Selection"/>
@@ -368,8 +368,7 @@
<menu_item_call label="リージョンオブジェクトã®ã‚ャッシュをダンプ" name="Dump Region Object Cache"/>
</menu>
<menu label="UI" name="UI">
- <menu_item_call label="メディアブラウザã®ãƒ†ã‚¹ãƒˆ" name="Web Browser Test"/>
- <menu_item_call label="Web コンテンツブラウザ" name="Web Content Browser"/>
+ <menu_item_call label="メディアブラウザ" name="Media Browser"/>
<menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/>
<menu_item_call label="インベントリã®å‡ºåŠ›" name="Dump Inventory"/>
<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 9effed1f42b..bf8e72e4572 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="å–り外ã™" name="take_off"/>
<menu_item_call label="å–り外ã™" name="detach"/>
<menu_item_call label="アウトフットã®ç·¨é›†" name="edit"/>
+ <menu_item_call label="編集" name="edit_item"/>
+ <menu_item_call label="オリジナルを表示" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index bfc8d0b7244..6de9244b402 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -22,14 +22,6 @@
ムービーå†ç”Ÿ
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- コンテンツãªã—
- </label>
- <tooltip name="none_tooltip">
- ã“ã“ã«ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
ç”»åƒ
@@ -52,11 +44,24 @@
ã“ã“ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿã™ã‚‹
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ コンテンツãªã—
+ </label>
+ <tooltip name="none_tooltip">
+ ã“ã“ã«ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
リアルタイム・ストリーミング
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ LibVLC 対応メディア
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
-- ãªã— --
@@ -127,11 +132,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
オーディオ (MIDI)
@@ -207,6 +207,11 @@
ムービー (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ ムービー
+ </label>
+ </mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
ムービー (QuickTime)
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 54e5f29621b..00d9b3ca5c5 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -337,6 +337,9 @@
[COUNT] åã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’グループã‹ã‚‰è¿½æ”¾ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚
<usetemplate ignoretext="グループã‹ã‚‰ã®è¤‡æ•°ã®ãƒ¡ãƒ³ãƒãƒ¼ã®è¿½æ”¾ã‚’確èªã—ã¾ã™" name="okcancelignore" notext="å–り消ã—" yestext="ç¦æ¢"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ 一部ã®ä½äººãŒã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰è¿½æ”¾ã•ã‚ŒãŸãŸã‚ã€æ‹›å¾…状ãŒé€ã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚
+ </notification>
<notification name="AttachmentDrop">
アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«ç½®ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚
続ã‘ã¾ã™ã‹ï¼Ÿ
@@ -475,6 +478,12 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
<notification name="ErrorEncodingSnapshot">
スナップショットã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰åŒ–ã§ã‚¨ãƒ©ãƒ¼ãŒå‡ºã¾ã—ãŸï¼
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ インベントリã«å†™çœŸã‚’ä¿å˜ã™ã‚‹ã«ã¯ L$[COST] ãŒå¿…è¦ã§ã™ã€‚L$ を購入ã™ã‚‹ã‹ã€ä»£ã‚ã‚Šã«å†™çœŸã‚’ã£ã‚³ãƒ³ãƒ”ュータã«ä¿å˜ã§ãã¾ã™ã€‚
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ インベントリã«ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’ä¿å˜ã™ã‚‹ã«ã¯ L$[COST] ãŒå¿…è¦ã§ã™ã€‚L$ を購入ã™ã‚‹ã‹ã€ä»£ã‚ã‚Šã«å†™çœŸã‚’コンピュータã«ä¿å˜ã§ãã¾ã™ã€‚
+ </notification>
<notification name="ErrorUploadingPostcard">
次ã®ç†ç”±ã§ã€ã‚¹ãƒŠãƒƒãƒ—ショットã®é€ä¿¡æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸï¼š [REASON]
</notification>
@@ -593,6 +602,10 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
ノートカードを削除ã—ã¾ã™ã‹?
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ 以å‰ã®ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚·ãƒ§ãƒƒãƒˆã‚’レãƒãƒ¼ãƒˆã«ä½¿ç”¨ã—ã¾ã™ã‹?
+ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
ジェスãƒãƒ£ãƒ¼ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
ステップãŒå¤šã™ãŽã¾ã™ã€‚
@@ -653,32 +666,14 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
</url>
<usetemplate ignoretext="使用ä¸ã®ã‚³ãƒ³ãƒ”ューターã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
</notification>
- <notification name="IntelOldDriver">
- ãŠãらããŠä½¿ã„ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒãƒƒãƒ—用ã®æ–°ã—ã„ドライãƒãŒå…¥æ‰‹å¯èƒ½ã§ã™ã€‚グラフィックドライãƒã‚’æ›´æ–°ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€ãƒ‘フォーマンスãŒå¤§å¹…ã«å‘上ã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚
-
-[_URL] ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦æ›´æ–°ç‰ˆã®ãƒ‰ãƒ©ã‚¤ãƒãŒã‚ã‚‹ã‹ã©ã†ã‹ã‚’確èªã—ã¾ã™ã‹ï¼Ÿ
- <url name="url">
- http://www.intel.com/p/ja_JP/support/detect/graphics
- </url>
- <usetemplate ignoretext="使用ã—ã¦ã„るグラフィックドライãƒãŒå¤ã„å ´åˆ" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
- </notification>
- <notification name="AMDOldDriver">
- ãŠä½¿ã„ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒãƒƒãƒ—ã«ã¯æœ€æ–°ã®ãƒ‰ãƒ©ã‚¤ãƒãŒå˜åœ¨ã™ã‚‹ã‚ˆã†ã§ã™ã€‚グラフィックドライãƒã‚’æ›´æ–°ã™ã‚‹ã¨ã€ãƒ‘フォーマンスãŒå¤§å¹…ã«æ”¹å–„ã•ã‚Œã¾ã™ã€‚
-
-[_URL] ã¸ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã€ãƒ‰ãƒ©ã‚¤ãƒãƒ¼ã‚’æ›´æ–°ã—ã¾ã™ã‹ã€‚
- <url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="自分ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒ‰ãƒ©ã‚¤ãƒãŒæ—§ããªã‚Šã¾ã—ãŸã€‚" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- ãŠä½¿ã„ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒãƒƒãƒ—ã«ã¯æœ€æ–°ã®ãƒ‰ãƒ©ã‚¤ãƒãŒå˜åœ¨ã™ã‚‹ã‚ˆã†ã§ã™ã€‚グラフィックドライãƒã‚’æ›´æ–°ã™ã‚‹ã¨ã€ãƒ‘フォーマンスãŒå¤§å¹…ã«æ”¹å–„ã•ã‚Œã¾ã™ã€‚
+ <notification name="OldGPUDriver">
+ グラフィックスãƒãƒƒãƒ—ã«æœ€æ–°ã®ãƒ‰ãƒ©ã‚¤ãƒãŒã‚ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚グラフィックドライãƒã‚’æ›´æ–°ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€å¤§å¹…ã«ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ã€‚
-[_URL] ã¸ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã€ãƒ‰ãƒ©ã‚¤ãƒãƒ¼ã‚’æ›´æ–°ã—ã¾ã™ã‹ã€‚
+ ドライãƒã®æ›´æ–°ã‚’確èªã™ã‚‹ãŸã‚ã« [URL] ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã‹?
<url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=en-us
+ [URL]
</url>
- <usetemplate ignoretext="自分ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒ‰ãƒ©ã‚¤ãƒãŒæ—§ããªã‚Šã¾ã—ãŸã€‚" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
+ <usetemplate ignoretext="使用ä¸ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒ‰ãƒ©ã‚¤ãƒãŒå¤ããªã£ã¦ã„ã¾ã™" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
</notification>
<notification name="UnknownGPU">
ãŠä½¿ã„ã®ã‚·ã‚¹ãƒ†ãƒ ã«ã¯ã€[APP_NAME] ãŒèªè˜ã§ããªã„グラフィックカードãŒæ載ã•ã‚Œã¦ã„ã¾ã™ã€‚
@@ -767,6 +762,9 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
</url>
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ [MUTE_LIMIT] エントリã®åˆ¶é™ã«é”ã—ãŸãŸã‚ã€ãƒ–ãƒãƒƒã‚¯ãƒªã‚¹ãƒˆã«æ–°ã—ã„ã‚¨ãƒ³ãƒˆãƒªã‚’è¿½åŠ ã§ãã¾ã›ã‚“。
+ </notification>
<notification name="UnableToLinkObjects">
[COUNT] 個ã®ã‚ªãƒ–ジェクトをリンクã§ãã¾ã›ã‚“。
リンクã§ãã‚‹ã®ã¯æœ€å¤§ [MAX] 個ã§ã™ã€‚
@@ -1408,6 +1406,11 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries ã‚’å‚ç…§ã—ã¦ã
</notification>
<notification name="AgentComplexity">
ã‚ãªãŸã® [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] 㯠[AGENT_COMPLEXITY] ã§ã™ã€‚
+ <usetemplate ignoretext="ã‚¢ãƒã‚¿ãƒ¼ã®è¤‡é›‘ã•ã®å¤‰æ›´ã«ã¤ã„ã¦è¦å‘Šã™ã‚‹" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON]ã€ãƒ‘フォーマンスã«æ‚ªå½±éŸ¿ã‚’与ãˆã‚‹æã‚ŒãŒã‚ã‚Šã¾ã™ã€‚
+ <usetemplate ignoretext="HUD ãŒè¤‡é›‘ã™ãŽã‚‹å ´åˆã¯ãŠçŸ¥ã‚‰ã›ãã ã•ã„" name="notifyignore"/>
</notification>
<notification name="FirstRun">
[APP_NAME] ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå®Œäº†ã—ã¾ã—ãŸã€‚
@@ -1501,6 +1504,10 @@ SHA1 フィンガープリント： [MD5_DIGEST]
ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„ã‚‹å…¨ã¦ã®ä½äººã‚’ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ 地域（リージョン）内ã§ãƒ“ルドãŒç¢ºç«‹ã•ã‚ŒãŸå¾Œã«ã‚ªãƒ–ジェクトボーナスを下ã’ã‚‹ã¨ã€ã‚ªãƒ–ジェクトãŒè¿”ã•ã‚ŒãŸã‚Šã€å‰Šé™¤ã•ã‚ŒãŸã‚Šã—ã¾ã™ã€‚本当ã«ã‚ªãƒ–ジェクトボーナスを変更ã—ã¾ã™ã‹?
+ <usetemplate ignoretext="オブジェクトボーナス係数ã®å¤‰æ›´ã‚’確èª" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
[USER_NAME] ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクトを返å´ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/>
@@ -1549,6 +1556,9 @@ SHA1 フィンガープリント： [MD5_DIGEST]
<notification name="OwnerCanNotBeDenied">
ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã‚’ä¸å‹•ç”£ã®ã€Œç¦æ¢ä½äººã€ãƒªã‚¹ãƒˆã«è¿½åŠ ã§ãã¾ã›ã‚“。
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ 追放ã•ã‚ŒãŸä½äººã‚’ä¸å‹•ç”£ç®¡ç†è€…リストã«è¿½åŠ ã§ãã¾ã›ã‚“。
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
衣類ãŠã‚ˆã³ã‚·ã‚§ã‚¤ãƒ—ãŒèªã¿è¾¼ã¾ã‚Œã‚‹ã¾ã§ã¯ã€å®¹å§¿ã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“。
</notification>
@@ -1720,6 +1730,10 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
Web ブラウザを開ã„ã¦ã“ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„を表示ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate ignoretext="ブラウザを起動ã—㦠Web ページを見るã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ å‰å›žå®Ÿè¡Œæ™‚ã‹ã‚‰ã‚·ã‚¹ãƒ†ãƒ UI サイズ係数ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚UI サイズ調整è¨å®šãƒšãƒ¼ã‚¸ã‚’é–‹ãã¾ã™ã‹?
+ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
[http://jp.secondlife.com/account/ マイアカウント] ページã«ç§»å‹•ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’管ç†ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’管ç†ã™ã‚‹ã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="OK"/>
@@ -1761,10 +1775,17 @@ http://secondlife.com/download ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰
グループã‹ã‚‰è„±é€€ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ グループ '[group_name]' を抜ã‘ã¾ã—ãŸã€‚
+ </notification>
<notification name="OwnerCannotLeaveGroup">
グループを抜ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。グループã®æœ€å¾Œã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã‚ã‚‹ãŸã‚ã€ã‚°ãƒ«ãƒ¼ãƒ—を抜ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。最åˆã«ã€åˆ¥ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’オーナーã®å½¹å‰²ã«å‰²ã‚Šå½“ã¦ã¦ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupDepartError">
+ グループを抜ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
本当ã«ä½äººå…¨å“¡ã‚’グリッドã‹ã‚‰è¿½ã„出ã—ã¾ã™ã‹ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="ä½äººå…¨å“¡ã‚’追ã„出ã™"/>
@@ -2165,6 +2186,10 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã
é¸æŠžã—ãŸãƒ—リムãŒå¤šã™ãŽã¾ã™ã€‚ [MAX_PRIM_COUNT] 個é¸æŠžã™ã‚‹ã‹ã€ãƒ—リム数を減らã—ã¦ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ スクリプト内ã§é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトãŒå¤šã™ãŽã¾ã™ã€‚é¸æŠžã™ã‚‹ã‚ªãƒ–ジェクトを減らã—ã¦ã€ã‚‚ã†ä¸€åº¦ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
ä¸å‹•ç”£ç´„款ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆæ™‚ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
<usetemplate name="okbutton" yestext="OK"/>
@@ -2337,6 +2362,10 @@ L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™
支払ã„ãŒå¤±æ•—ã—ã¾ã—ãŸï¼š オブジェクトãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ 支払ã„ãŒåœæ¢ã•ã‚Œã¾ã—ãŸï¼š 支払ã‚ã‚ŒãŸä¾¡æ ¼ãŒã“ã®ã‚ªãƒ–ジェクトã«è¨å®šã•ã‚ŒãŸæ”¯æ‰•ã„ボタンã®ã©ã‚Œã¨ã‚‚一致ã—ã¾ã›ã‚“。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
ã“ã®ã‚ªãƒ–ジェクトã«ã¯ã€ã‚ãªãŸãŒã‚³ãƒ”ーã§ãるアイテムã¯ã‚ã‚Šã¾ã›ã‚“。
</notification>
@@ -2372,6 +2401,12 @@ L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™
ã“ã‚Œã¯ã€ãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã«ã‚ˆã‚‹åºƒç¯„囲ã®é¸æŠžã§ã™ã€‚リンクを解除ã™ã‚‹ã¨ã€ã‚‚ã†ä¸€åº¦ãƒªãƒ³ã‚¯ã§ããªããªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ãã®ã‚ˆã†ãªå ´åˆã«å‚™ãˆã¦ã€ãƒªãƒ³ã‚¯ã‚»ãƒƒãƒˆã‚’自分ã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã§ãã¾ã™ã€‚
<usetemplate ignoretext="リンクセットã®ãƒªãƒ³ã‚¯ã‚’解除ã™ã‚‹ã¨ãã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="リンクを外ã™"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ ã“ã®å•é¡Œã®ã”å ±å‘Šã«ãŠæ™‚間を割ã„ã¦ã„ãŸã ãã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚
+ãŠçŸ¥ã‚‰ã›ã„ãŸã ã„ãŸå†…容ã«ã¤ã„ã¦é•åãŒãªã„ã‹ç¢ºèªã—ã€é©åˆ‡ã«
+対処ã„ãŸã—ã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
å«ŒãŒã‚‰ã›å ±å‘Šã®ã‚«ãƒ†ã‚´ãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„。
カテゴリをé¸æŠžã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€å«ŒãŒã‚‰ã›å ±å‘Šã®å‡¦ç†ã‚„ä¿ç®¡ã«å¤§å¤‰å½¹ç«‹ã¡ã¾ã™ã€‚
@@ -2806,6 +2841,10 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<notification name="PathfindingDirty">
ã“ã®å€¤åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«ã¯ã€ä¿ç•™ä¸ã®ãƒ‘スファインディングã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™ã€‚制作権ãŒã‚ã‚‹å ´åˆã¯ã€ã€Œåœ°åŸŸã®å†æ§‹ç¯‰ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ã€åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã‚’å†æ§‹ç¯‰ã§ãã¾ã™ã€‚
</notification>
+ <notification name="PathfindingDirtyRebake">
+ ã“ã®å€¤åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«ã¯ã€ä¿ç•™ä¸ã®ãƒ‘スファインディングã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™ã€‚制作権ãŒã‚ã‚‹å ´åˆã¯ã€ã€Œåœ°åŸŸã®å†æ§‹ç¯‰ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ã€åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã‚’å†æ§‹ç¯‰ã§ãã¾ã™ã€‚
+ <usetemplate name="okbutton" yestext="地域ã®å†æ§‹ç¯‰"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã§ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒ‘スファインディングãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã›ã‚“。パスファインディング LSL 呼ã³å‡ºã—を使用ã™ã‚‹ã‚¹ã‚¯ãƒªãƒ—ト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトãŒã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã§ã¯å‹•ä½œã§ãã¾ã›ã‚“。
</notification>
@@ -3310,10 +3349,12 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
</notification>
<notification name="AppearanceToXMLFailed">
外観を XML ã«ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-プリセット [NAME] ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼ã€‚
+ </notification>
+ <notification name="PresetNotSaved">
+ プリセット [NAME] ã®ä¿å˜ã‚¨ãƒ©ãƒ¼ã€‚
+ </notification>
+ <notification name="PresetNotDeleted">
+ プリセット [NAME] ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼ã€‚
</notification>
<notification name="UnableToFindHelpTopic">
ヘルプトピックãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
@@ -3523,13 +3564,6 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="ForceQuitDueToLowMemory">
メモリä¸è¶³ã®ãŸã‚ 30 秒以内㫠SL ã¯çµ‚了ã—ã¾ã™ã€‚
</notification>
- <notification name="PopupAttempt">
- ãƒãƒƒãƒ—アップãŒãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¾ã—ãŸã€‚
- <form name="form">
- <ignore name="ignore" text="å…¨ã¦ã®ãƒãƒƒãƒ—アップを有効ã«ã™ã‚‹"/>
- <button name="open" text="ãƒãƒƒãƒ—アップウィンドウを開ã"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
ルールセットã«ã‚ˆã£ã¦è¨±å¯ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€SOCKS 5 プãƒã‚ã‚· "[HOST]:[PORT]" ãŒæŽ¥ç¶šã‚’拒絶ã—ã¾ã—ãŸã€‚
<usetemplate name="okbutton" yestext="OK"/>
@@ -3900,6 +3934,9 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="CantMoveObjectParcelResources">
ã“ã®åŒºç”»ã§ã“ã®ã‚ªãƒ–ジェクトã®ãƒªã‚½ãƒ¼ã‚¹ãŒä¸è¶³ã—ã¦ã„ã‚‹ãŸã‚ã€ã‚ªãƒ–ジェクト '[OBJECT_NAME]' をリージョン [REGION_NAME] 内㮠[OBJ_POSITION] ã«ç§»å‹•ã§ãã¾ã›ã‚“。
</notification>
+ <notification name="NoParcelPermsNoObject">
+ ãã®åŒºç”»ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒãªã„ãŸã‚ã€ã‚³ãƒ”ーãŒå¤±æ•—ã—ã¾ã—ãŸã€‚
+ </notification>
<notification name="CantMoveObjectRegionVersion">
オブジェクト '[OBJECT_NAME]' をリージョン [REGION_NAME] 内㮠[OBJ_POSITION] ã«ç§»å‹•ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。他ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã€ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®å¢ƒç•Œã‚’ã¾ãŸã„ã ã“ã®ã‚ªãƒ–ジェクトをå—ä¿¡ã™ã‚‹ã“ã¨ãŒã§ããªã„å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’実行ã—ã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚
</notification>
@@ -3913,6 +3950,10 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="NoPermModifyObject">
ãã®ã‚ªãƒ–ジェクトを変更ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ 大ããªã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‚’æŒã¤ã‚ªãƒ–ジェクトã®é¸æŠžãŒå¤šã™ãŽã¾ã™ã€‚é¸æŠžã™ã‚‹ã‚ªãƒ–ジェクトを減らã—ã¦ã€ã‚‚ã†ä¸€åº¦ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
ナビメッシュã«è²¢çŒ®ã™ã‚‹ã‚ªãƒ–ジェクトã«å¯¾ã—ã¦ç‰©ç†ã‚’有効ã«ã§ãã¾ã›ã‚“。
</notification>
@@ -3949,6 +3990,12 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="CantSaveModifyAttachment">
オブジェクトã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã«ä¿å˜ã§ãã¾ã›ã‚“。ã“ã®ãŸã‚ã€ã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆã®æ¨©é™ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ ã”使用ã®ã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆã«å«ã¾ã‚Œã‚‹ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªãŒå¤šã™ãŽã‚‹ãŸã‚ã€ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã‚’è¿½åŠ ã§ãã¾ã›ã‚“。
+ </notification>
+ <notification name="IllegalAttachment">
+ 添付ファイルã¯ã‚¢ãƒã‚¿ãƒ¼ã®å˜åœ¨ã—ãªã„点をè¦æ±‚ã—ã¾ã—ãŸã€‚代ã‚ã‚Šã«èƒ¸ã«æ·»ä»˜ã•ã‚Œã¦ã„ã¾ã—ãŸã€‚
+ </notification>
<notification name="TooManyScripts">
スクリプトãŒå¤šã™ãŽã¾ã™ã€‚
</notification>
@@ -4041,6 +4088,12 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="TeleportedByObjectUnknownUser">
ä¸æ˜Žãªãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクト '[OBJECT_NAME]' ã«ã‚ˆã£ã¦ã€ã‚ãªãŸã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚
</notification>
+ <notification name="StandDeniedByObject">
+ '[OBJECT_NAME]' ã¯ã“ã®æ™‚点ã§ã‚ãªãŸãŒç«‹ã¤ã“ã¨ã‚’許å¯ã—ã¾ã›ã‚“。
+ </notification>
+ <notification name="ResitDeniedByObject">
+ '[OBJECT_NAME]' ã¯ã“ã®æ™‚点ã§ã‚ãªãŸãŒå¸ã‚’変更ã™ã‚‹ã“ã¨ã‚’許å¯ã—ã¾ã›ã‚“。
+ </notification>
<notification name="CantCreateObjectRegionFull">
リクエストã•ã‚ŒãŸã‚ªãƒ–ジェクトを作æˆã§ãã¾ã›ã‚“。リージョンãŒåŸ‹ã¾ã£ã¦ã„ã¾ã™ã€‚
</notification>
@@ -4122,9 +4175,6 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="CantAttachNotEnoughScriptResources">
オブジェクトã®ç€ç”¨ã«ä½¿ç”¨ã§ãるスクリプトリソースãŒè¶³ã‚Šã¾ã›ã‚“。
</notification>
- <notification name="IllegalAttachment">
- 添付ファイルã¯ã‚¢ãƒã‚¿ãƒ¼ã®å˜åœ¨ã—ãªã„点をè¦æ±‚ã—ã¾ã—ãŸã€‚代ã‚ã‚Šã«èƒ¸ã«æ·»ä»˜ã•ã‚Œã¦ã„ã¾ã—ãŸã€‚
- </notification>
<notification name="CantDropItemTrialUser">
オブジェクトをã“ã“ã«ãƒ‰ãƒãƒƒãƒ—ã§ãã¾ã›ã‚“ã€‚ãƒ•ãƒªãƒ¼ãƒˆãƒ©ã‚¤ã‚¢ãƒ«é ˜åŸŸã‚’ãŠè©¦ã—ãã ã•ã„。
</notification>
@@ -4340,6 +4390,9 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
<notification name="CantTransfterMoneyRegionDisabled">
オブジェクトã¸ã®é€é‡‘ã¯ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ç¾åœ¨ç„¡åŠ¹ã«ã•ã‚Œã¦ã„ã¾ã™ã€‚
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ システムãƒãƒ¼ãƒ‰ã«ã‚ˆã‚Šã€æ”¯æ‰•ã„を実行ã§ãã¾ã›ã‚“。
+ </notification>
<notification name="CantPayNoAgent">
支払ã„ã®ç›¸æ‰‹ã‚’把æ¡ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
</notification>
@@ -4375,4 +4428,8 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
ãƒãƒ£ãƒƒãƒˆå±¥æ´ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‰ã®æ“作ã§ãƒ“ジーã§ã™ã€‚2ã€3 分経ã£ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã™ã‹ã€åˆ¥ã®äººã¨ã®ãƒãƒ£ãƒƒãƒˆã‚’é¸æŠžã—ã¦ãã ã•ã„。
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 93df0ba2bd4..8633bfb2ad7 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="ã‚‚ã®" name="Outfits">
<panel.string name="wear_outfit_tooltip">
é¸æŠžã—ãŸã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‚’ç€ç”¨ã™ã‚‹
@@ -7,6 +7,7 @@
é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’ç€ç”¨
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="アウトフィットギャラリー" name="outfit_gallery_tab"/>
<panel label="マイ アウトフィット" name="outfitslist_tab"/>
<panel label="ç€ç”¨ä¸" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index fd03e6b89e3..a6fbaae58d2 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ ç€ç”¨ã—ã¦ã„るアタッãƒãƒ¡ãƒ³ãƒˆã¯ã‚ã‚Šã¾ã›ã‚“。
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="ç€ç”¨ç‰©"/>
+ <accordion_tab name="tab_temp_attachments" title="一時的ãªã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆ"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/>
+ <menu_button name="options_gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/>
</panel>
</panel>
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 be823938a24..4c40ba7f7b6 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="更新を手動ã§ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã™" name="Install_manual"/>
</combo_box>
<check_box label="release candidate ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™" name="update_willing_to_test"/>
+ <check_box label="更新後ã«ãƒªãƒªãƒ¼ã‚¹ãƒŽãƒ¼ãƒˆã‚’表示ã™ã‚‹" name="update_show_release_notes"/>
<text name="Proxy Settings:">
プãƒã‚ã‚·è¨å®šï¼š
</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 2fbe19cd662..586b8ab2d35 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -61,18 +61,34 @@ OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OS_VERSION]
<string name="AboutDriver">
Windows グラフィックドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
OpenGL ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OPENGL_VERSION]
-
-J2C デコーダãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ ウィンドウサイズ： [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+フォントサイズã®èª¿æ•´ï¼š [FONT_SIZE_ADJUSTMENT]pt
+UI スケーリング： [UI_SCALE]
+æç”»è·é›¢ï¼š[DRAW_DISTANCE]m
+帯域幅：[NET_BANDWITH]kbit/s
+LOD 係数： [LOD_FACTOR]
+表示å“質： [RENDER_QUALITY] / 7
+高度ãªãƒ©ã‚¤ãƒ†ã‚£ãƒ³ã‚°ãƒ¢ãƒ‡ãƒ«ï¼š [GPU_SHADERS]
+テクスãƒãƒ£ãƒ¡ãƒ¢ãƒªï¼š [TEXTURE_MEMORY]MB
+VFS（ã‚ャッシュ）作æˆæ™‚間： [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ J2C デコーダãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[J2C_VERSION]
オーディオドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[AUDIO_DRIVER_VERSION]
-LLCEFLib/CEF ãƒãƒ¼ã‚¸ãƒ§ãƒ³: [LLCEFLIB_VERSION]
-LibVLC ãƒãƒ¼ã‚¸ãƒ§ãƒ³: [LIBVLC_VERSION]
-ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [VOICE_VERSION]
+LLCEFLib/CEF ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [LLCEFLIB_VERSION]
+LibVLC ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [LIBVLC_VERSION]
+ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[VOICE_VERSION]
</string>
<string name="AboutTraffic">
パケットãƒã‚¹ï¼š[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
サーãƒãƒ¼ã®ãƒªãƒªãƒ¼ã‚¹ãƒŽãƒ¼ãƒˆã® URL ã‚’å–å¾—ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
</string>
@@ -1090,6 +1106,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="TeleportYourAgent">
ã‚ãªãŸã‚’テレãƒãƒ¼ãƒˆ
</string>
+ <string name="ForceSitAvatar">
+ ã‚¢ãƒã‚¿ãƒ¼ã‚’強制的ã«åº§ã‚‰ã›ã‚‹
+ </string>
<string name="NotConnected">
接続ã•ã‚Œã¦ã„ã¾ã›ã‚“
</string>
@@ -1938,6 +1957,27 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="av_render_anyone">
ã‚ãªãŸã®ã¾ã‚ã‚Šã®èª°ã«ã‚‚ã‚ãªãŸãŒè¦‹ãˆãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
</string>
+ <string name="hud_description_total">
+ ã”利用㮠HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME]（[JNT_NAME] ã«è£…ç€ä¸ï¼‰
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] ã¯ãŸãã•ã‚“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¡ãƒ¢ãƒªã‚’使用ã—ã¾ã™
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] ã«ã¯é«˜ä¾¡ãªã‚ªãƒ–ジェクトやテクスãƒãƒ£ãŒãŸãã•ã‚“å«ã¾ã‚Œã¦ã„ã¾ã™
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] ã¯å¤§ããªãƒ†ã‚¯ã‚¹ãƒãƒ£ãŒãŸãã•ã‚“å«ã¾ã‚Œã¦ã„ã¾ã™
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] ã«å«ã¾ã‚Œã‚‹ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã¾ã™
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] ã«å«ã¾ã‚Œã‚‹ãƒ†ã‚¯ã‚¹ãƒãƒ£ãŒå¤šã™ãŽã¾ã™
+ </string>
<string name="AgeYearsA">
[COUNT] å¹´
</string>
@@ -2097,6 +2137,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="ObjectOutOfRange">
スクリプト（オブジェクトãŒç¯„囲外ã«ã‚ã‚Šã¾ã™ï¼‰
</string>
+ <string name="ScriptWasDeleted">
+ スクリプト（インベントリã‹ã‚‰å‰Šé™¤æ¸ˆã¿ï¼‰
+ </string>
<string name="GodToolsObjectOwnedBy">
[OWNER] 所有ã®ã‚ªãƒ–ジェクト「[OBJECT]ã€
</string>
@@ -2709,6 +2752,15 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。
<string name="Play Media">
メディアをå†ç”Ÿ/一時åœæ¢
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=en-us
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
コマンドラインã«ã‚¨ãƒ©ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚
リンク先をå‚ç…§ã—ã¦ãã ã•ã„： http://wiki.secondlife.com/wiki/Client_parameters
@@ -4484,12 +4536,18 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="paid_you_ldollars">
[NAME] 㯠[REASON] ã®ãŸã‚ã« L$[AMOUNT] を支払ã„ã¾ã—ãŸã€‚
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] 㯠L$[AMOUNT] 支払ã„ã¾ã—ãŸï¼š[REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] 㯠L$[AMOUNT] を支払ã„ã¾ã—ãŸã€‚
</string>
<string name="you_paid_ldollars">
[NAME] ã« L$ [AMOUNT] を支払ã„ã¾ã—ãŸï¼š[REASON]
</string>
+ <string name="you_paid_ldollars_gift">
+ [NAME] ã« L$ [AMOUNT] を支払ã„ã¾ã—ãŸï¼š[REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
L$ [AMOUNT] を支払ã„ã¾ã—ãŸã€‚
</string>
@@ -4502,6 +4560,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="you_paid_failure_ldollars">
[NAME] ã« [REASON] ã®ä»£é‡‘ L$ [AMOUNT] を支払ãˆã¾ã›ã‚“ã§ã—ãŸã€‚
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ [NAME] ã« L$ [AMOUNT] を支払ãˆã¾ã›ã‚“ã§ã—ãŸï¼š[REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
L$ [AMOUNT] を支払ãˆã¾ã›ã‚“ã§ã—ãŸã€‚
</string>
@@ -4828,6 +4889,15 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="texture_load_dimensions_error">
[WIDTH]*[HEIGHT] 以上ã®ç”»åƒã¯èªã¿è¾¼ã‚ã¾ã›ã‚“
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ 最大アウトフィット写真サイズ㯠[WIDTH]*[HEIGHT] ã§ã™ã€‚ç”»åƒã®ã‚µã‚¤ã‚ºã‚’調整ã™ã‚‹ã‹ã€åˆ¥ã®ç”»åƒã‚’使用ã—ã¦ãã ã•ã„
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ 最大アウトフィット写真サイズ㯠[WIDTH]*[HEIGHT] ã§ã™ã€‚別ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’é¸æŠžã—ã¦ãã ã•ã„
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ 写真ã®å¯¸æ³•ã‚’確èªã§ãã¾ã›ã‚“。写真サイズãŒãƒ”ッカーã«è¡¨ç¤ºã•ã‚Œã‚‹ã¾ã§ãŠå¾…ã¡ãã ã•ã„
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
大変申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€äºˆæœŸã—ãªã„å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
@@ -5332,6 +5402,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="Command_Profile_Label">
プãƒãƒ•ã‚£ãƒ¼ãƒ«
</string>
+ <string name="Command_Report_Abuse_Label">
+ å«ŒãŒã‚‰ã›ã®å ±å‘Š
+ </string>
<string name="Command_Search_Label">
検索
</string>
@@ -5422,6 +5495,9 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã
<string name="Command_Profile_Tooltip">
プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’編集・表示
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ å«ŒãŒã‚‰ã›ã®å ±å‘Š
+ </string>
<string name="Command_Search_Tooltip">
å ´æ‰€ã€ã‚¤ãƒ™ãƒ³ãƒˆã€äººã‚’検索
</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index 35cee93ad1d..70ba647d301 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Incluir peso da pele" name="upload_skin"/>
<check_box label="Incluir posições de junções" name="upload_joints"/>
+ <check_box label="Travar escala se posição de articulação estiver definida" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Desvio Z (subir ou baixar avatar):
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index 77e814b5755..21cb91dc962 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <string name="payee_group">Pagar grupo</string>
- <string name="payee_resident">Pagar residente</string>
- <text name="paying_text">Você está pagando:</text>
- <text name="payee_name">Test Name That Is Extremely Long To Check Clipping</text>
+ <string name="payee_group">
+ Pagar grupo
+ </string>
+ <string name="payee_resident">
+ Pagar residente
+ </string>
+ <text name="paying_text">
+ Você está pagando:
+ </text>
+ <text name="payee_name">
+ Test Name That Is Extremely Long To Check Clipping
+ </text>
+ <text name="payment_message_label">
+ Descrição (opcional):
+ </text>
<panel label="Buscar" name="PatternsPanel">
<button label="Pagar L$ 1" label_selected="Pagar L$ 1" name="fastpay 1"/>
<button label="Pagar L$ 5" label_selected="Pagar L$ 5" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="Pagar L$ 20" label_selected="Pagar L$ 20" name="fastpay 20"/>
</panel>
<panel label="Buscar" name="InputPanel">
- <text name="amount text">Outro valor:</text>
+ <text name="amount text">
+ Outro valor:
+ </text>
<button label="Pagar" label_selected="Pagar" name="pay btn"/>
<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
index 5fb6dd1c351..b9fc9d4713a 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Inerte
</floater.string>
+ <floater.string name="Timeout">
+ Limite de tempo: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Carregando inventário de: [OBJECT_NAME]
+ </floater.string>
<button label="Fechar" label_selected="Fechar" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml
index 5101579c6f2..2b22d3ec3cb 100644
--- a/indra/newview/skins/default/xui/pt/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/pt/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Navegação segura"/>
<button name="popexternal" tool_tip="Abrir a URL atual no navegador do seu computador"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Página inicial de testes de Web"/>
+ <button name="VLC Plugin Test" tool_tip="Teste de vÃdeo MPEG4"/>
+ </layout_panel>
</layout_stack>
</floater>
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 760197cfb99..d991c89f61d 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Ligar" name="Call"/>
<menu_item_call label="Convidar para entrar no grupo" name="Invite..."/>
<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Redefinir esqueleto e animações" name="Reset Skeleton And Animations"/>
<menu_item_call label="Bloquear" name="Avatar Mute"/>
<menu_item_call label="Denunciar" name="abuse"/>
<menu_item_call label="Congelar" name="Freeze..."/>
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 766c8b97549..e2403fa86f7 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
<menu_item_call label="Altura de foco" name="Hover Height"/>
<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Redefinir esqueleto e animações" name="Reset Skeleton And Animations"/>
<menu_item_call label="Meus amigos" name="Friends..."/>
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
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 170525cbe6d..cba849cd05a 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Ligar" name="Call"/>
<menu_item_call label="Convidar para entrar no grupo" name="Invite..."/>
<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Redefinir esqueleto e animações" name="Reset Skeleton And Animations"/>
<menu_item_call label="Bloquear" name="Avatar Mute"/>
<menu_item_call label="Denunciar" name="abuse"/>
<menu_item_call label="Congelar" name="Freeze..."/>
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 e826a57b46d..50a1996d62e 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
<menu_item_call label="Altura de foco" name="Hover Height"/>
<menu_item_call label="Redefinir esqueleto" name="Reset Skeleton"/>
+ <menu_item_call label="Redefinir esqueleto e animações" name="Reset Skeleton And Animations"/>
<menu_item_call label="Meus amigos" name="Friends..."/>
<menu_item_call label="Meus grupos" name="Groups..."/>
<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index a65dfddb051..44cfae236b1 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -20,12 +20,11 @@
<menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">
<menu_item_call label="Mostrar configurações" name="Debug Settings"/>
- <menu_item_call label="Configurações da interface e cor" name="UI/Color Settings"/>
<menu label="Testes de UI" name="UI Tests"/>
<menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/>
<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_item_call label="Navegador de MÃdia" name="Media Browser"/>
<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"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index df224a88fa2..c6a1ca72f2d 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
<menu_item_call label="Bloquear..." name="Block"/>
+ <menu_item_call label="Desbloquear" name="Unblock"/>
<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>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 3602bdaac42..ccf65ae5664 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Vestir - Substituir look atual" name="wear"/>
<menu_item_call label="Vestir - Adicionar ao look atual" name="wear_add"/>
<menu_item_call label="Tirar - Tirar do look atual" name="take_off"/>
+ <menu_item_call label="Carregar foto (L$Â 10)" name="upload_photo"/>
+ <menu_item_call label="Selecionar foto" name="select_photo"/>
+ <menu_item_call label="Tirar uma foto" name="take_snapshot"/>
+ <menu_item_call label="Remover foto" name="remove_photo"/>
<menu label="Roupas novas" name="New Clothes">
<menu_item_call label="Nova camisa" name="New Shirt"/>
<menu_item_call label="Novas calças" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Recolher todas as pastas" name="collapse"/>
<menu_item_call label="Renomear look" name="rename"/>
<menu_item_call label="Excluir visual" name="delete_outfit"/>
+ <menu_item_check label="Sempre ordenar pastas por nome" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
index 46caeae3105..35315abfe67 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Ordenar por status" name="sort_status"/>
<menu_item_check label="Exibir Ãcones de pessoas" name="view_icons"/>
<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
+ <menu_item_check label="Ocultar nomes de usuários" name="view_usernames"/>
<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 51464fed68f..bd8afae1b5d 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="Compartilhar" name="share"/>
<menu_item_call label="Pagar" name="pay"/>
<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
+ <menu_item_call label="Congelar" name="freeze"/>
+ <menu_item_call label="Expulsar" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
index bce015e732c..2c49f5e2fd0 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Ordenar por distância" name="sort_distance"/>
<menu_item_check label="Exibir Ãcones de pessoas" name="view_icons"/>
<menu_item_check label="Exibir mapa" name="view_map"/>
+ <menu_item_check label="Ocultar nomes de usuários" name="view_usernames"/>
</toggleable_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 2cd0f52ef31..0ebb358b12f 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Desbloquear" name="unblock_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 7bdcb74a54c..6964941f0ae 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -113,11 +113,11 @@
<menu_item_call label="Link" name="Link"/>
<menu_item_call label="Desconectar links" name="Unlink"/>
<menu_item_check label="Editar partes linkadas" name="Edit Linked Parts"/>
- <menu label="Selecionar partes conectadas" name="Select Linked Parts">
- <menu_item_call label="Selecionar próxima parte" name="Select Next Part"/>
- <menu_item_call label="Selecionar parte anterior" name="Select Previous Part"/>
- <menu_item_call label="Incluir próxima parte" name="Include Next Part"/>
- <menu_item_call label="Incluir parte anterior" name="Include Previous Part"/>
+ <menu label="Selecionar elementos" name="Select Elements">
+ <menu_item_call label="Selecionar próxima parte ou face" name="Select Next Part or Face"/>
+ <menu_item_call label="Selecionar parte anterior ou face" name="Select Previous Part or Face"/>
+ <menu_item_call label="Incluir próxima parte ou face" name="Include Next Part or Face"/>
+ <menu_item_call label="Incluir parte anterior ou face" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Enfocar seleção" name="Focus on Selection"/>
@@ -332,8 +332,7 @@
<menu_item_call label="Descartar cache do objeto de região" name="Dump Region Object Cache"/>
</menu>
<menu label="Interface" name="UI">
- <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="Navegador de MÃdia" name="Media Browser"/>
<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
<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/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
index 4e6e52ebc70..42aa3862154 100644
--- a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Tirar" name="take_off"/>
<menu_item_call label="Tirar" name="detach"/>
<menu_item_call label="Editar look" name="edit"/>
+ <menu_item_call label="Editar" name="edit_item"/>
+ <menu_item_call label="Mostrar original" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
index be387088bd8..54902f165bc 100644
--- a/indra/newview/skins/default/xui/pt/mime_types.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -22,14 +22,6 @@
Iniciar filme
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- Sem conteúdo
- </label>
- <tooltip name="none_tooltip">
- Sem mÃdia aqui
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Imagem
@@ -52,11 +44,24 @@
Iniciar áudio disponÃvel neste local
</playtip>
</widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Sem conteúdo
+ </label>
+ <tooltip name="none_tooltip">
+ Sem mÃdia aqui
+ </tooltip>
+ </widgetset>
<scheme name="rtsp">
<label name="rtsp_label">
Transmissão em tempo real
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ MÃdia com suporte a LibVLC
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Nenhum -
@@ -127,11 +132,6 @@
Macromedia Director
</label>
</mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Ãudio (MIDI)
@@ -207,6 +207,11 @@
Filme (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Filme
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Filme (QuickTime)
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index bb428ad5a55..53a418a1d8c 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -329,6 +329,9 @@ Se você não quiser que essas funções sejam concedidas a esse cargo, desative
Você está prestes a banir [COUNT] membros do grupo.
<usetemplate ignoretext="Confirmar banimento de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Banir"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ Alguns residentes não receberam convite porque foram banidos do grupo.
+ </notification>
<notification name="AttachmentDrop">
Você está prestes a largar seu anexo.
Tem certeza de que quer prosseguir?
@@ -455,6 +458,12 @@ Para colocar a mÃdia em só uma face, selecione Selecionar face e clique na fac
<notification name="ErrorEncodingSnapshot">
Erro ao codificar a foto.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Você precisa de L$ [COST] para salvar uma foto em seu inventário. Você pode comprar L$ ou salvar a foto em seu computador.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Você precisa de L$ [COST] para salvar uma textura em seu inventário. Você pode comprar L$ ou salvar a foto em seu computador.
+ </notification>
<notification name="ErrorUploadingPostcard">
Houve um problema ao enviar a foto devido à seguinte razão: [REASON]
</notification>
@@ -569,6 +578,10 @@ Nota: Este procedimento limpa o cache.
Excluir nota?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ Você deseja usar a captura de tela anterior em seu relatório?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Falha ao salvar Gesto.
Este gesto possui muitos passos.
@@ -629,30 +642,12 @@ Consultar [_URL] para mais informações?
</url>
<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
</notification>
- <notification name="IntelOldDriver">
- Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
- Visitar [_URL] para verificar se há atualizações do driver?
- <url name="url">
- http://www.intel.com/p/pt_BR/support/detect/graphics
- </url>
- <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
- </notification>
- <notification name="AMDOldDriver">
+ <notification name="OldGPUDriver">
Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
- Visitar [_URL] para verificar se há atualizações do driver?
+ Visitar [URL] para verificar se há atualizações do driver?
<url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
- Visitar [_URL] para verificar se há atualizações do driver?
- <url name="url">
- http://www.nvidia.com.br/Download/index.aspx?lang=br
+ [URL]
</url>
<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
</notification>
@@ -743,6 +738,9 @@ Para mais informações sobre como comprar L$, consulte [_URL].
</url>
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir até a página"/>
</notification>
+ <notification name="MuteLimitReached">
+ Não foi possÃvel adicionar uma nova entrada à lista de bloqueados porque você atingiu o limite de [MUTE_LIMIT] entradas.
+ </notification>
<notification name="UnableToLinkObjects">
Não é possÃvel unir estes [COUNT] objetos.
Você pode unir um máximo de [MAX] objetos.
@@ -1372,6 +1370,11 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
</notification>
<notification name="AgentComplexity">
Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] é [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Avise-me se a complexidade do meu avatar for alterada" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], provavelmente afetará negativamente seu desempenho.
+ <usetemplate ignoretext="Avise-me quando a complexidade do meu HUD estiver muito alta" name="notifyignore"/>
</notification>
<notification name="FirstRun">
A instalação do [APP_NAME] está pronta.
@@ -1462,6 +1465,10 @@ Isso é realmente útil apenas para depuração.
Teletransportar para o inÃcio todos os residentes nesta região?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Reduzir o bônus do objeto depois que as construções tiverem sido estabelecidas em uma região pode fazer com que os objetos sejam devolvidos ou excluÃdos. Tem certeza de que deseja alterar o bônus do objeto?
+ <usetemplate ignoretext="Confirmar alteração do fator de bônus de objeto" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
Você tem certeza que deseja retornar os objetos pertencentes a [USER_NAME] ?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -1509,6 +1516,9 @@ Ultrapassa o limite de [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
<notification name="OwnerCanNotBeDenied">
Não é possÃvel adicionar o dono da propriedade na lista de residentes banidos.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Não foi possÃvel adicionar residentes banidos à lista de gerentes de propriedades.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Não é possÃvel alterar a aparência até que as roupas e formas estejam carregadas.
</notification>
@@ -1683,6 +1693,10 @@ Se você estiver muito ansioso para experimentar os novos recursos e correções
Abrir uma janela do navegador para ver essas informações?
<usetemplate ignoretext="Abrir o navegador para acessar uma página na web" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ O fator de tamanho da interface do sistema foi alterado desde a última execução. Deseja abrir a página de configurações de ajuste de tamanho da interface?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Deseja abrir o [http://secondlife.com/account/ Painel] para gerenciar sua conta?
<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -1721,10 +1735,17 @@ Se você estiver muito ansioso para experimentar os novos recursos e correções
Você é atualmente um membro do grupo
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/>
</notification>
+ <notification name="GroupDepart">
+ Você deixou o grupo '[group_name]'.
+ </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="GroupDepartError">
+ Não foi possÃvel deixar o grupo.
+ <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"/>
@@ -2123,6 +2144,10 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
Muitos prims foram selecionados. Selecione [MAX_PRIM_COUNT] ou menos prims, e tente de novo
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Muitos scripts nos objetos selecionados. Selecione menos objetos e tente novamente.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Problemas encontrados ao importar o Corretor da propriedade.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2291,6 +2316,10 @@ Mover para o inventário o(s) item(s)?
Falha no pagamento: objeto não encontrado.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Pagamento interrompido: o valor pago não corresponde aos botões de pagamento definidos para esse objeto.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Não há itens neste objeto que você está autorizado a copiar.
</notification>
@@ -2326,6 +2355,12 @@ Não é possÃvel desfazer essa ação.
Essa é uma seleção ampla com linksets. Se você desvinculá-la, pode não ser possÃvel vinculá-la novamente. Como precaução, pode ser interessante fazer cópias dos linksets no seu inventário.
<usetemplate ignoretext="Confirmar quando desvincular um linkset" name="okcancelignore" notext="Cancelar" yestext="Desvincular"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Obrigado por nos informar sobre esse problema.
+Nós analisaremos seu relatório em busca de possÃveis violações e
+tomaremos as medidas cabÃveis.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, selecione uma categoria para a reportagem deste abuso.
A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de abuso.
@@ -2751,6 +2786,10 @@ Logo, não é possÃvel voar aqui.
<notification name="PathfindingDirty">
A região possui alterações de pathfinding pendentes. Se você possui direitos de construção, poderá recarregar a região clicando no botão “Recarregar regiãoâ€.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ A região possui alterações de pathfinding pendentes. Se você possui direitos de construção, poderá recarregar a região clicando no botão “Recarregar regiãoâ€.
+ <usetemplate name="okbutton" yestext="Recarregar região"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
O pathfinding dinâmico não está habilitado nesta região. Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
</notification>
@@ -3258,10 +3297,12 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
</notification>
<notification name="AppearanceToXMLFailed">
Falha ao salvar a aparência como XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Erro ao excluir a predefinição [NAME].
+ </notification>
+ <notification name="PresetNotSaved">
+ Erro ao salvar predefinição [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Erro ao excluir a predefinição [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
Nenhum tópico de ajuda foi encontrado com relação a este elemento.
@@ -3469,13 +3510,6 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
<notification name="ForceQuitDueToLowMemory">
O SL será encerrado em 30 segundos devido falta de memória.
</notification>
- <notification name="PopupAttempt">
- Um pop-up foi bloqueado.
- <form name="form">
- <ignore name="ignore" text="Ativar todos os pop-ups"/>
- <button name="open" text="Abrir pop-up"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
O proxy SOCKS 5 "[HOST]:[PORT]" recusou a conexão, não permitida pelo conjunto de regras.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3850,6 +3884,9 @@ Tente novamente em instantes.
Não é possÃvel mover '[OBJECT_NAME]' para
[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ A cópia falhou porque você não tem acesso a esse lote.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
Não é possÃvel mover '[OBJECT_NAME]' para
[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
@@ -3865,6 +3902,10 @@ Tente novamente em instantes.
<notification name="NoPermModifyObject">
Você não está autorizado a modificar este objeto
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Há muitos objetos com inventário grande selecionados. Selecione menos objetos e tente novamente.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
Não é possÃvel ativar propriedades fÃsicas para um objeto que contribui para o navmesh.
</notification>
@@ -3901,6 +3942,12 @@ Tente novamente em instantes.
<notification name="CantSaveModifyAttachment">
Não é possÃvel salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Seus anexos têm muitos itens de inventário. Não é possÃvel adicionar mais itens.
+ </notification>
+ <notification name="IllegalAttachment">
+ O anexo solicitou um ponto não existente no avatar. Ele foi anexado ao peito.
+ </notification>
<notification name="TooManyScripts">
Muitos scripts.
</notification>
@@ -3993,6 +4040,12 @@ Tente novamente em instantes.
<notification name="TeleportedByObjectUnknownUser">
Você foi teletransportado pelo objeto '[OBJECT_NAME]' de propriedade de um usuário desconhecido.
</notification>
+ <notification name="StandDeniedByObject">
+ '[OBJECT_NAME]' não permite que você fique de pé no momento.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ '[OBJECT_NAME]' não permite que você altere seu assento no momento.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Não foi possÃvel criar o objeto solicitado. A região está cheia.
</notification>
@@ -4074,9 +4127,6 @@ Tente novamente em instantes.
<notification name="CantAttachNotEnoughScriptResources">
Não há recursos de script disponÃveis suficientes para anexar objeto!
</notification>
- <notification name="IllegalAttachment">
- O anexo solicitou um ponto não existente no avatar. Ele foi anexado ao peito.
- </notification>
<notification name="CantDropItemTrialUser">
Não é possÃvel largar objetos aqui. Tente a área de Avaliação grátis.
</notification>
@@ -4292,6 +4342,9 @@ Tente selecionar uma quantidade menor de terreno.
<notification name="CantTransfterMoneyRegionDisabled">
Transferências de dinheiro para objetos estão desativadas para esta região no momento.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Não foi possÃvel fazer o pagamento devido a uma sobrecarga do sistema.
+ </notification>
<notification name="CantPayNoAgent">
Não foi possÃvel descobrir a quem pagar.
</notification>
@@ -4327,4 +4380,8 @@ Tente selecionar uma quantidade menor de terreno.
O arquivo de histórico de bate-papo está ocupado com uma operação anterior. Tente novamente em alguns minutos ou selecione outra pessoa para bater papo.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
index 816a9bc46ef..8d055f476ee 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Vestir itens selecionados
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="GALERIA DE LOOKS" name="outfit_gallery_tab"/>
<panel label="MEUS LOOKS" name="outfitslist_tab"/>
<panel label="EM USO" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
index 9224ec47420..87bb04ff591 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Nenhum anexo vestido.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="Itens de vestuário"/>
+ <accordion_tab name="tab_temp_attachments" title="Anexos temporários"/>
+ </accordion>
<panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+ <menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
</panel>
</panel>
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 6308d133bba..c6f6bba320a 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Baixarei e instalarei as atualizações manualmente" name="Install_manual"/>
</combo_box>
<check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
+ <check_box label="Mostrar notas de versão após atualização" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Configurações de proxy:
</text>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 72a48485a3e..207b4e70970 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -52,18 +52,34 @@ Placa gráfica: [GRAPHICS_CARD]
<string name="AboutDriver">
Versão do driver de vÃdeo Windows: [GRAPHICS_CARD_VENDOR]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
Versão do OpenGL: [OPENGL_VERSION]
-
-Versão do J2C Decoder: [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Tamanho da janela: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Ajuste do tamanho de fonte: [FONT_SIZE_ADJUSTMENT]pt
+Escala de interface: [UI_SCALE]
+Dist. máxima: [DRAW_DISTANCE]m
+Largura de banda: [NET_BANDWITH]kbit/s
+Fator LOD: [LOD_FACTOR]
+Qualidade de renderização: [RENDER_QUALITY] / 7
+Modelo de iluminação avançado: [GPU_SHADERS]
+Memória de textura: [TEXTURE_MEMORY]MB
+Tempo de criação de VFS (cache): [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ Versão do J2C Decoder: [J2C_VERSION]
Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
Versão de LLCEFLib/CEF: [LLCEFLIB_VERSION]
-Versão de LibVLC: [LIBVLC_VERSION]
+Versão da LibVLC: [LIBVLC_VERSION]
Versão do servidor de voz: [VOICE_VERSION]
</string>
<string name="AboutTraffic">
Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Erro ao obter URL de notas de versão do servidor.
</string>
@@ -1039,6 +1055,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="TeleportYourAgent">
Teletransportá-lo
</string>
+ <string name="ForceSitAvatar">
+ Forçar o avatar a sentar
+ </string>
<string name="AgentNameSubst">
(Você)
</string>
@@ -1878,6 +1897,27 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="av_render_anyone">
Sua renderização pode não acontecer para ninguém ao seu redor.
</string>
+ <string name="hud_description_total">
+ Seu HUD
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (vestido em [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] usa muita memória de textura
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] contém muitos objetos e texturas que utilizam o máximo de recursos
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] contém muitas texturas grandes
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] contém muitos objetos
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] contém muitas texturas
+ </string>
<string name="AgeYearsA">
[COUNT] ano
</string>
@@ -2037,6 +2077,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
<string name="ObjectOutOfRange">
Script (objeto fora de alcance)
</string>
+ <string name="ScriptWasDeleted">
+ Script (excluÃdo do inventário)
+ </string>
<string name="GodToolsObjectOwnedBy">
Objeto [OBJECT] de propriedade de [OWNER]
</string>
@@ -2607,6 +2650,15 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="Play Media">
Tocar/Pausar mÃdia
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com.br/Download/index.aspx?lang=br
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Um erro foi encontrado analisando a linha de comando.
Consulte: http://wiki.secondlife.com/wiki/Client_parameters
@@ -4354,12 +4406,18 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="paid_you_ldollars">
[NAME] lhe pagou L$ [AMOUNT] [REASON].
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] lhe pagou L$ [AMOUNT]: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] lhe pagou L$ [AMOUNT]
</string>
<string name="you_paid_ldollars">
Você pagou L$[AMOUNT] por [REASON] a [NAME].
</string>
+ <string name="you_paid_ldollars_gift">
+ Você pagou L$[AMOUNT] a [NAME]: [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Você acaba de pagar L$[AMOUNT].
</string>
@@ -4372,6 +4430,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="you_paid_failure_ldollars">
Você não pagou L$[AMOUNT] a [NAME] referentes a [REASON].
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ Você não pagou L$[AMOUNT] a [NAME]: [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
Você não pagou L$[AMOUNT].
</string>
@@ -4698,6 +4759,15 @@ Denunciar abuso
<string name="texture_load_dimensions_error">
A imagem excede o limite [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ O tamanho máx. do look é [WIDTH]*[HEIGHT]. Redimensione ou use outra imagem
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ O tamanho máx. do look é [WIDTH]*[HEIGHT]. Selecione outra textura
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Não foi possÃvel confirmar as dimensões da foto. Aguarde até que o tamanho da foto seja exibido no seletor
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Aconteceu algo inesperado, apesar de termos tentado impedir isso.
@@ -5202,6 +5272,9 @@ Tente colocar o caminho do editor entre aspas.
<string name="Command_Profile_Label">
Perfil
</string>
+ <string name="Command_Report_Abuse_Label">
+ Relatar abuso
+ </string>
<string name="Command_Search_Label">
Buscar
</string>
@@ -5292,6 +5365,9 @@ Tente colocar o caminho do editor entre aspas.
<string name="Command_Profile_Tooltip">
Edite ou visualize seu perfil
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Relatar abuso
+ </string>
<string name="Command_Search_Tooltip">
Encontre lugares, eventos, pessoas
</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
index d660dd97b5f..94aa7218560 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Включить Ð²ÐµÑ ÐºÐ¾Ð¶Ð¸" name="upload_skin"/>
<check_box label="Включить Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑуÑтавов" name="upload_joints"/>
+ <check_box label="ФикÑировать маÑштаб, еÑли определено положение ÑуÑтава" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Смещение по Z (поднÑÑ‚ÑŒ или опуÑтить аватар):
</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml
index 0a269b9e000..990ebb873f1 100644
--- a/indra/newview/skins/default/xui/ru/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">Заплатить группе</string>
- <string name="payee_resident">Заплатить жителю</string>
- <text name="paying_text">Вы платите:</text>
- <text name="payee_name">Слишком длинное теÑтовое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ обрезаниÑ</text>
+ <string name="payee_group">
+ Заплатить группе
+ </string>
+ <string name="payee_resident">
+ Заплатить жителю
+ </string>
+ <text name="paying_text">
+ Вы платите:
+ </text>
+ <text name="payee_name">
+ Слишком длинное теÑтовое Ð¸Ð¼Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ обрезаниÑ
+ </text>
+ <text name="payment_message_label">
+ ОпиÑание (не обÑзательно):
+ </text>
<panel label="ПоиÑк" name="PatternsPanel">
<button label="Оплатить L$ 1" label_selected="Оплатить L$ 1" name="fastpay 1"/>
<button label="Оплатить L$ 5" label_selected="Оплатить L$ 5" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="Оплатить L$ 20" label_selected="Оплатить L$ 20" name="fastpay 20"/>
</panel>
<panel label="ПоиÑк" name="InputPanel">
- <text name="amount text">Ð”Ñ€ÑƒÐ³Ð°Ñ Ñумма:</text>
+ <text name="amount text">
+ Ð”Ñ€ÑƒÐ³Ð°Ñ Ñумма:
+ </text>
<button label="Оплатить" label_selected="Оплатить" name="pay btn"/>
<button label="Отмена" label_selected="Отмена" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
index 4f2e389b19f..90c1f2f49ce 100644
--- a/indra/newview/skins/default/xui/ru/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Ðе запущен
</floater.string>
+ <floater.string name="Timeout">
+ Задержка: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Загрузка Ð¸Ð½Ð²ÐµÐ½Ñ‚Ð°Ñ€Ñ Ð´Ð»Ñ: [OBJECT_NAME]
+ </floater.string>
<button label="Закрыть" label_selected="Закрыть" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml
index 403ab0ef5dc..d572a54b5ba 100644
--- a/indra/newview/skins/default/xui/ru/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ru/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="БезопаÑный проÑмотр"/>
<button name="popexternal" tool_tip="Открыть текущий URL-Ð°Ð´Ñ€ÐµÑ Ð² вашем браузере"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ñтраница веб-теÑтированиÑ"/>
+ <button name="VLC Plugin Test" tool_tip="ТеÑÑ‚ видео MPEG4"/>
+ </layout_panel>
</layout_stack>
</floater>
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 b7ffb0e9fc7..63b0698c6b6 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Звонок" name="Call"/>
<menu_item_call label="ПриглаÑить в группу" name="Invite..."/>
<menu_item_call label="Ð¡Ð±Ñ€Ð¾Ñ Ñкелета" name="Reset Skeleton"/>
+ <menu_item_call label="ВоÑÑтановить Ñкелет и анимации" name="Reset Skeleton And Animations"/>
<menu_item_call label="Заблокировать" name="Avatar Mute"/>
<menu_item_call label="ПожаловатьÑÑ" name="abuse"/>
<menu_item_call label="Заморозить" name="Freeze..."/>
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 eb38371e285..f33ef1d4ee5 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
<menu_item_call label="Ð’Ñ‹Ñота парениÑ" name="Hover Height"/>
<menu_item_call label="Ð¡Ð±Ñ€Ð¾Ñ Ñкелета" name="Reset Skeleton"/>
+ <menu_item_call label="ВоÑÑтановить Ñкелет и анимации" name="Reset Skeleton And Animations"/>
<menu_item_call label="Мои друзьÑ" name="Friends..."/>
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
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 cffb4bbe7b6..de35264055f 100644
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Звонок" name="Call"/>
<menu_item_call label="ПриглаÑить в группу" name="Invite..."/>
<menu_item_call label="Ð¡Ð±Ñ€Ð¾Ñ Ñкелета" name="Reset Skeleton"/>
+ <menu_item_call label="ВоÑÑтановить Ñкелет и анимации" name="Reset Skeleton And Animations"/>
<menu_item_call label="Заблокировать" name="Avatar Mute"/>
<menu_item_call label="ПожаловатьÑÑ" name="abuse"/>
<menu_item_call label="Заморозить" name="Freeze..."/>
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 97e2a8b295f..cd75551b5d2 100644
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Изменить фигуру" name="Edit My Shape"/>
<menu_item_call label="Ð’Ñ‹Ñота парениÑ" name="Hover Height"/>
<menu_item_call label="Ð¡Ð±Ñ€Ð¾Ñ Ñкелета" name="Reset Skeleton"/>
+ <menu_item_call label="ВоÑÑтановить Ñкелет и анимации" name="Reset Skeleton And Animations"/>
<menu_item_call label="Мои друзьÑ" name="Friends..."/>
<menu_item_call label="Мои группы" name="Groups..."/>
<menu_item_call label="Мой профиль" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 2deab04d81d..2d1fe282421 100644
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="Показать меню отладки" name="Show Debug Menu"/>
<menu label="Отладка" name="Debug">
<menu_item_call label="ÐаÑтройки отладки" name="Debug Settings"/>
- <menu_item_call label="ÐаÑтройки интерфейÑа/цвета" name="UI/Color Settings"/>
<menu_item_call label="ПроÑмотр XUI" name="UI Preview Tool"/>
<menu label="ТеÑÑ‚ UI" name="UI Tests"/>
<menu_item_call label="Задать размер окна..." name="Set Window Size..."/>
<menu_item_call label="Показать лицензионное Ñоглашение" name="TOS"/>
<menu_item_call label="Показать Ñообщение об ошибке" name="Critical"/>
- <menu_item_call label="ТеÑÑ‚ отладки плавающего окна Ñ Ð²ÐµÐ±-контентом" name="Web Content Floater Debug Test"/>
+ <menu_item_call label="Медиа-браузер" name="Media Browser"/>
<menu label="Уровень журнала" name="Set Logging Level">
<menu_item_check label="Отладка" name="Debug"/>
<menu_item_check label="ИнформациÑ" name="Info"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 0c50abcfbdf..bb97fb2ef75 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Профиль объекта..." name="Object Profile"/>
<menu_item_call label="Блокировать..." name="Block"/>
+ <menu_item_call label="Разблокировать" name="Unblock"/>
<menu_item_call label="Показать на карте" name="show_on_map"/>
<menu_item_call label="Телепорт в меÑтоположение объекта" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index d379a172166..24d780ba1c6 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Ðадеть – Заменить текущий коÑтюм" name="wear"/>
<menu_item_call label="Ðадеть – Добавить к текущему коÑтюму" name="wear_add"/>
<menu_item_call label="СнÑÑ‚ÑŒ – Убрать из текущего коÑтюма" name="take_off"/>
+ <menu_item_call label="Загрузить фото (L$10)" name="upload_photo"/>
+ <menu_item_call label="Выбрать фото" name="select_photo"/>
+ <menu_item_call label="Сделать Ñнимок" name="take_snapshot"/>
+ <menu_item_call label="Удалить фото" name="remove_photo"/>
<menu label="ÐÐ¾Ð²Ð°Ñ Ð¾Ð´ÐµÐ¶Ð´Ð°" name="New Clothes">
<menu_item_call label="ÐÐ¾Ð²Ð°Ñ Ñ€ÑƒÐ±Ð°ÑˆÐºÐ°" name="New Shirt"/>
<menu_item_call label="Ðовые брюки" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Закрыть вÑе папки" name="collapse"/>
<menu_item_call label="Переименовать коÑтюм" name="rename"/>
<menu_item_call label="Удалить коÑтюм" name="delete_outfit"/>
+ <menu_item_check label="Ð’Ñегда Ñортировать папки по имени" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
index 7b2dba05396..fd04810dff9 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Сортировать по ÑтатуÑу" name="sort_status"/>
<menu_item_check label="Показывать значки людей" name="view_icons"/>
<menu_item_check label="Показывать разрешенные дейÑтвиÑ" name="view_permissions"/>
+ <menu_item_check label="Скрывать имена пользователей" name="view_usernames"/>
<menu_item_check label="ПоÑмотреть журнал разговора..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index d05b7e7d012..952e9b1687e 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="ПоделитьÑÑ" name="share"/>
<menu_item_call label="Заплатить" name="pay"/>
<menu_item_check label="Черный ÑпиÑок" name="block_unblock"/>
+ <menu_item_call label="Заморозить" name="freeze"/>
+ <menu_item_call label="Выкинуть" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
index 2bc353ad583..0e949cedff1 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Сортировать по раÑÑтоÑнию" name="sort_distance"/>
<menu_item_check label="Показывать значки людей" name="view_icons"/>
<menu_item_check label="Смотреть карту" name="view_map"/>
+ <menu_item_check label="Скрывать имена пользователей" name="view_usernames"/>
</toggleable_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 4f5361b2e36..1b77770e1c4 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<context_menu name="Url Popup">
<menu_item_call label="Профиль объекта..." name="show_object"/>
<menu_item_call label="Блокировать..." name="block_object"/>
+ <menu_item_call label="Разблокировать" name="unblock_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 6158363e5d5..e5e484173d1 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -111,11 +111,11 @@
<menu_item_call label="Объединить" name="Link"/>
<menu_item_call label="Разъединить" name="Unlink"/>
<menu_item_check label="Редактировать объединенные чаÑти" name="Edit Linked Parts"/>
- <menu label="Выбрать объединенные чаÑти" name="Select Linked Parts">
- <menu_item_call label="Выбрать Ñледующую" name="Select Next Part"/>
- <menu_item_call label="Выбрать предыдущую" name="Select Previous Part"/>
- <menu_item_call label="Включить Ñледующую" name="Include Next Part"/>
- <menu_item_call label="Включить предыдущую" name="Include Previous Part"/>
+ <menu label="Выберите Ñлементы" name="Select Elements">
+ <menu_item_call label="Выбрать Ñледующую чаÑÑ‚ÑŒ или лицо" name="Select Next Part or Face"/>
+ <menu_item_call label="Выбрать предыдущую чаÑÑ‚ÑŒ или лицо" name="Select Previous Part or Face"/>
+ <menu_item_call label="Включить Ñледующую чаÑÑ‚ÑŒ или лицо" name="Include Next Part or Face"/>
+ <menu_item_call label="Включить предыдущую чаÑÑ‚ÑŒ или лицо" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="Ðаборы ÑвÑзей..." name="pathfinding_linkset_menu_item"/>
<menu_item_call label="Ð¤Ð¾ÐºÑƒÑ Ð½Ð° выбранном" name="Focus on Selection"/>
@@ -365,8 +365,7 @@
<menu_item_call label="Вывод кÑша региональных объектов" name="Dump Region Object Cache"/>
</menu>
<menu label="Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" name="UI">
- <menu_item_call label="Проверка медиабраузера" name="Web Browser Test"/>
- <menu_item_call label="Браузер Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра веб-контента" name="Web Content Browser"/>
+ <menu_item_call label="Браузер Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра медиа" name="Media Browser"/>
<menu_item_call label="Вывод SelectMgr" name="Dump SelectMgr"/>
<menu_item_call label="Вывод инвентарÑ" name="Dump Inventory"/>
<menu_item_call label="Вывод таймеров" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
index f178b39c774..1e32090c2af 100644
--- a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="СнÑÑ‚ÑŒ" name="take_off"/>
<menu_item_call label="ОтÑоединить" name="detach"/>
<menu_item_call label="Изменить коÑтюм" name="edit"/>
+ <menu_item_call label="Изменить" name="edit_item"/>
+ <menu_item_call label="Показать оригинал" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
index 9b120f2f408..9c3ce00c5e7 100644
--- a/indra/newview/skins/default/xui/ru/mime_types.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types.xml
@@ -57,6 +57,11 @@
Поток RealTime
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ Медиа Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ LibVLC
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Ðичего -
@@ -202,6 +207,11 @@
Видео (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Видео
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Видео (QuickTime)
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 5e7c2ed7d06..50931fc9b86 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -330,6 +330,9 @@
Ð’Ñ‹ ÑобираетеÑÑŒ запретить [COUNT] учаÑтникам доÑтуп в группу.
<usetemplate ignoretext="Подтвердите запрет доÑтупа учаÑтникам в группу" name="okcancelignore" notext="Отмена" yestext="Бан"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ Ðекоторым резидентам не отправлено приглашение, так как они иÑключены из группы.
+ </notification>
<notification name="AttachmentDrop">
Ð’Ñ‹ ÑобираетеÑÑŒ ÑброÑить Ñвое приÑоединение.
Продолжить?
@@ -457,6 +460,12 @@
<notification name="ErrorEncodingSnapshot">
Ошибка при кодировке Ñнимка.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ ТребуетÑÑ L$[COST] Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ‚Ð¾ в вашем инвентаре. Купите L$ или Ñохраните фото на компьютере.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ ТребуетÑÑ L$[COST] Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑтуры в вашем инвентаре. Купите L$ или Ñохраните фото на компьютере.
+ </notification>
<notification name="ErrorUploadingPostcard">
Ошибка при отправке Ñнимка по Ñледующей причине: [REASON]
</notification>
@@ -575,6 +584,10 @@
Удалить заметку?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ ИÑпользовать Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ отчета предыдущий Ñнимок Ñкрана?
+ <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Ðе удалоÑÑŒ Ñохранить жеÑÑ‚.
ЖеÑÑ‚ Ñодержит Ñлишком много Ñтапов.
@@ -635,30 +648,12 @@
</url>
<usetemplate ignoretext="Оборудование моего компьютера не поддерживаетÑÑ" name="okcancelignore" notext="Ðет" yestext="Да"/>
</notification>
- <notification name="IntelOldDriver">
- Возможно, Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ видеокарты имеетÑÑ Ð±Ð¾Ð»ÐµÐµ новый драйвер. Обновление драйвера может ÑущеÑтвенно повыÑить быÑтродейÑтвие.
-
- Проверить наличие Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° по адреÑу [_URL]?
- <url name="url">
- http://www.intel.com/p/ru_RU/support/detect/graphics
- </url>
- <usetemplate ignoretext="Мой графичеÑкий драйвер уÑтарел" name="okcancelignore" notext="Ðет" yestext="Да"/>
- </notification>
- <notification name="AMDOldDriver">
+ <notification name="OldGPUDriver">
Возможно, Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ видеокарты имеетÑÑ Ð±Ð¾Ð»ÐµÐµ новый драйвер. Обновление драйвера может ÑущеÑтвенно повыÑить быÑтродейÑтвие.
- Проверить наличие Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° по адреÑу [_URL]?
+ Проверить наличие Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° по адреÑу [URL]?
<url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Мой графичеÑкий драйвер уÑтарел" name="okcancelignore" notext="Ðет" yestext="Да"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- Возможно, Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ видеокарты имеетÑÑ Ð±Ð¾Ð»ÐµÐµ новый драйвер. Обновление драйвера может ÑущеÑтвенно повыÑить быÑтродейÑтвие.
-
- Проверить наличие Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° по адреÑу [_URL]?
- <url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+ [URL]
</url>
<usetemplate ignoretext="Мой графичеÑкий драйвер уÑтарел" name="okcancelignore" notext="Ðет" yestext="Да"/>
</notification>
@@ -749,6 +744,9 @@
</url>
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="MuteLimitReached">
+ Ðевозможно добавить новый пункт в ÑпиÑок заблокированных: доÑтигнуто предельное чиÑло пунктов [MUTE_LIMIT].
+ </notification>
<notification name="UnableToLinkObjects">
Ðевозможно объединить Ñти [COUNT] объектов.
Можно объединÑÑ‚ÑŒ не более [MAX] объектов.
@@ -1379,6 +1377,11 @@
</notification>
<notification name="AgentComplexity">
Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 ÑложноÑÑ‚ÑŒ аватара]: [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Предупреждать Ð¼ÐµÐ½Ñ Ð¾Ð± изменении ÑложноÑти аватара" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], возможно, отрицательно влиÑет на быÑтродейÑтвие.
+ <usetemplate ignoretext="Предупреждать о чрезмерной ÑложноÑти данных в игре" name="notifyignore"/>
</notification>
<notification name="FirstRun">
УÑтановка [APP_NAME] завершена.
@@ -1470,6 +1473,10 @@
Телепортировать вÑех жителей в Ñтом регионе домой?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Снижение бонуÑа за объекты поÑле ÑÐ¾Ð¾Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñтроек в регионе может вызвать возврат или удаление объектов. ДейÑтвительно изменить Ð±Ð¾Ð½ÑƒÑ Ð·Ð° объекты?
+ <usetemplate ignoretext="Подтвердите изменение бонуÑного Ð¼Ð½Ð¾Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²" name="okcancelignore" notext="Отмена" yestext="OK"/>
+ </notification>
<notification name="EstateObjectReturn">
Ð’Ñ‹ дейÑтвительно хотите вернуть объекты, принадлежащие [USER_NAME]?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -1517,6 +1524,9 @@
<notification name="OwnerCanNotBeDenied">
ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ землевладельца в ÑпиÑок забаненных жителей его же земли.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Ðевозможно добавить заблокированного Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð² ÑпиÑок менеджеров землевладениÑ.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ внешноÑÑ‚ÑŒ, пока загружаютÑÑ Ð¾Ð´ÐµÐ¶Ð´Ð° и фигура.
</notification>
@@ -1691,6 +1701,10 @@ http://secondlife.com/download.
Открыть браузер Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñтого контента?
<usetemplate ignoretext="ЗапуÑтить браузер Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра веб-Ñтраницы" name="okcancelignore" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ Со времени поÑледнего запуÑка изменилÑÑ ÑиÑтемный коÑффициент размера интерфейÑа. Открыть Ñтраницу наÑтроек размера интерфейÑа?
+ <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Перейти на [http://secondlife.com/account/ информационную панель] Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐ¸Ð¼ аккаунтом?
<usetemplate ignoretext="ЗапуÑтить браузер Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð¼" name="okcancelignore" notext="Отмена" yestext="OK"/>
@@ -1730,10 +1744,17 @@ http://secondlife.com/download.
Хотите покинуть группу?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
+ <notification name="GroupDepart">
+ Вы покинули группу «[group_name]».
+ </notification>
<notification name="OwnerCannotLeaveGroup">
Ðевозможно покинуть группу. Ð’Ñ‹ не можете покинуть группу, так как вы ее поÑледний владелец. Сначала назначьте владельцем другого учаÑтника.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="GroupDepartError">
+ Ðевозможно покинуть группу.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ConfirmKick">
Ð’Ñ‹ ДЕЙСТВИТЕЛЬÐО хотите выброÑить вÑех жителей Ñ Ñетки?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="ВыброÑить вÑех жителей"/>
@@ -2131,6 +2152,10 @@ http://secondlife.com/download.
Выбрано Ñлишком много примитивов. Выберите [MAX_PRIM_COUNT] или меньше примитивов и повторите попытку.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Ð’ выбранных объектах Ñлишком много Ñкриптов. Выберите меньше объектов и повторите попытку.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Проблема при импорте ÑÐ¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð¾ землевладении.
<usetemplate name="okbutton" yestext="OK"/>
@@ -2298,6 +2323,10 @@ http://secondlife.com/download.
Ðе удалоÑÑŒ выполнить оплату: объект не найден.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Платеж оÑтановлен: ÑƒÐ¿Ð»Ð°Ñ‡ÐµÐ½Ð½Ð°Ñ Ñумма не ÑоответÑтвует ни одной из кнопок оплаты, заданных Ð´Ð»Ñ Ñтого объекта.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Ð’ Ñтом объекте нет вещей, которые вам разрешено копировать.
</notification>
@@ -2333,6 +2362,12 @@ http://secondlife.com/download.
Ðто большое выделение Ñ Ð½Ð°Ð±Ð¾Ñ€Ð°Ð¼Ð¸ ÑвÑзей. ЕÑли разъединить его, повторное Ñоединение может отказатьÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¼. Ð’ качеÑтве меры предоÑторожноÑти попробуйте Ñкопировать наборы ÑвÑзей в инвентарь.
<usetemplate ignoretext="Подтверждать при разъединении набора ÑвÑзей" name="okcancelignore" notext="Отмена" yestext="Разъединить"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ СпаÑибо за информирование об Ñтой проблеме.
+Мы проверим возможные Ð½Ð°Ñ€ÑƒÑˆÐµÐ½Ð¸Ñ ÑоглаÑно вашему отчету и примем
+ÑоответÑтвующие меры.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Выберите категорию Ð´Ð»Ñ Ñтого ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ нарушении.
Категории облегчают региÑтрацию и обработку уведомлений.
@@ -2762,6 +2797,10 @@ http://secondlife.com/download.
<notification name="PathfindingDirty">
Ð’ регионе еÑÑ‚ÑŒ незавершенные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка пути. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ права на ÑтроительÑтво, воÑÑтановите регион, нажав кнопку «ВоÑÑтановить регион».
</notification>
+ <notification name="PathfindingDirtyRebake">
+ Ð’ регионе еÑÑ‚ÑŒ незавершенные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка пути. ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ права на ÑтроительÑтво, воÑÑтановите регион, нажав кнопку «ВоÑÑтановить регион».
+ <usetemplate name="okbutton" yestext="ВоÑÑтановить регион"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
Ð’ Ñтом регионе не разрешен динамичеÑкий поиÑк пути. Возможны Ð½Ð°Ñ€ÑƒÑˆÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñкриптовых объектов Ñ Ð¸Ñпользованием вызовов LSL поиÑка пути.
</notification>
@@ -3269,10 +3308,12 @@ http://secondlife.com/download.
</notification>
<notification name="AppearanceToXMLFailed">
Ðе удалоÑÑŒ Ñохранить внешноÑÑ‚ÑŒ в XML.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-Ошибка при удалении преÑета [NAME].
+ </notification>
+ <notification name="PresetNotSaved">
+ Ошибка при Ñохранении преÑета [NAME].
+ </notification>
+ <notification name="PresetNotDeleted">
+ Ошибка при удалении преÑета [NAME].
</notification>
<notification name="UnableToFindHelpTopic">
Ðевозможно найти раздел Ñправки Ð´Ð»Ñ Ñтого Ñлемента.
@@ -3482,13 +3523,6 @@ http://secondlife.com/download.
<notification name="ForceQuitDueToLowMemory">
Через 30 Ñекунд Second Life завершит работу: нехватка памÑти.
</notification>
- <notification name="PopupAttempt">
- Ð’Ñплывающее окно Ð½ÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ.
- <form name="form">
- <ignore name="ignore" text="Разрешить вÑе вÑплывающие окна"/>
- <button name="open" text="Открыть вÑплывающее окно"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
ПрокÑи SOCKS 5 "[HOST]:[PORT]" отклонил попытку подключениÑ; не разрешено набором правил.
<usetemplate name="okbutton" yestext="OK"/>
@@ -3862,6 +3896,9 @@ http://secondlife.com/download.
ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить объект «[OBJECT_NAME]» в позицию
«[OBJ_POSITION]» региона [REGION_NAME]: на Ñтом учаÑтке недоÑтаточно реÑурÑов Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ объекта.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ Ðе удалоÑÑŒ Ñкопировать: у Ð²Ð°Ñ Ð½ÐµÑ‚ доÑтупа к Ñтому учаÑтку.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить объект «[OBJECT_NAME]» в позицию
[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает ÑÑ‚Ð°Ñ€Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ ÑимулÑтора, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ поддерживает прием Ñтого объекта через границу регионов.
@@ -3877,6 +3914,10 @@ http://secondlife.com/download.
<notification name="NoPermModifyObject">
У Ð²Ð°Ñ Ð½ÐµÑ‚ прав на изменение Ñтого объекта
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Выбрано Ñлишком много объектов Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ инвентарем. Выберите меньше объектов и повторите попытку.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
ÐÐµÐ»ÑŒÐ·Ñ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ физику Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°, который отноÑитÑÑ Ðº навигационной Ñетке.
</notification>
@@ -3913,6 +3954,12 @@ http://secondlife.com/download.
<notification name="CantSaveModifyAttachment">
ÐÐµÐ»ÑŒÐ·Ñ Ñохранить в Ñодержимом объекта: Ñто приведет к изменению разрешений прикрепленного объекта.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Прикрепленные объекты Ñодержат Ñлишком много инвентарÑ. Добавление невозможно.
+ </notification>
+ <notification name="IllegalAttachment">
+ ПрикреплÑемый объект потребовал неÑущеÑтвующей точки на аватаре. Он был прикреплен к груди.
+ </notification>
<notification name="TooManyScripts">
Слишком много Ñкриптов.
</notification>
@@ -4005,6 +4052,12 @@ http://secondlife.com/download.
<notification name="TeleportedByObjectUnknownUser">
Ð’Ñ‹ были телепортированы объектом «[OBJECT_NAME]», владелец неизвеÑтен.
</notification>
+ <notification name="StandDeniedByObject">
+ «[OBJECT_NAME]» не позволит вам ÑтоÑÑ‚ÑŒ в Ñто времÑ.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ «[OBJECT_NAME]» не позволит вам ÑÐµÐ¹Ñ‡Ð°Ñ Ñменить меÑто.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Ðевозможно Ñоздать запрошенный объект. Регион уже заполнен.
</notification>
@@ -4086,9 +4139,6 @@ http://secondlife.com/download.
<notification name="CantAttachNotEnoughScriptResources">
ÐедоÑтаточно Ñвободных реÑурÑов Ñкриптинга Ð´Ð»Ñ Ð¿Ñ€Ð¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°!
</notification>
- <notification name="IllegalAttachment">
- ПрикреплÑемый объект потребовал неÑущеÑтвующей точки на аватаре. Он был прикреплен к груди.
- </notification>
<notification name="CantDropItemTrialUser">
ЗдеÑÑŒ Ð½ÐµÐ»ÑŒÐ·Ñ ÑбраÑывать объекты; перейдите в беÑплатную облаÑÑ‚ÑŒ Ð´Ð»Ñ Ð³Ð¾Ñтей.
</notification>
@@ -4304,6 +4354,9 @@ http://secondlife.com/download.
<notification name="CantTransfterMoneyRegionDisabled">
Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð² Ñтом регионе запрещен перевод денег на объекты.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Ðевозможно произвеÑти платеж из-за нагрузки на ÑиÑтему.
+ </notification>
<notification name="CantPayNoAgent">
ÐепонÑтно, кому платить.
</notification>
@@ -4339,4 +4392,8 @@ http://secondlife.com/download.
Файл журнала чата занÑÑ‚ предыдущей операцией. Повторите попытку через неÑколько минут или выберите чат Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ лицом.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
index 4d0e13fca2c..2c02df23c06 100644
--- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Ðадеть выбранные вещи
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="ГÐЛЕРЕЯ КОСТЮМОВ" name="outfit_gallery_tab"/>
<panel label="МОИ КОСТЮМЫ" name="outfitslist_tab"/>
<panel label="ÐÐДЕТО" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
index 7ed6bf35c04..748903b3df3 100644
--- a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Ðет прикрепленных объектов.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="ÐоÑимые вещи"/>
+ <accordion_tab name="tab_temp_attachments" title="Временные прикрепленные объекты"/>
+ </accordion>
<panel name="bottom_panel">
<menu_button name="options_gear_btn" tool_tip="Показать дополнительные параметры"/>
</panel>
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 fd13abbe270..e1b185e8efa 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Я буду загружать и уÑтанавливать Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ" name="Install_manual"/>
</combo_box>
<check_box label="УÑтанавливать бета-верÑии" name="update_willing_to_test"/>
+ <check_box label="Показать заметки о выпуÑке поÑле обновлениÑ" name="update_show_release_notes"/>
<text name="Proxy Settings:">
ÐаÑтройки прокÑи-Ñервера:
</text>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 138afe9ac94..e44d63b3b97 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -61,10 +61,23 @@ SLURL: <nolink>[SLURL]</nolink>
<string name="AboutDriver">
ВерÑÐ¸Ñ Ð³Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑкого драйвера Windows: [GRAPHICS_DRIVER_VERSION]
</string>
- <string name="AboutLibs">
+ <string name="AboutOGL">
ВерÑÐ¸Ñ OpenGL: [OPENGL_VERSION]
-
-ВерÑÐ¸Ñ Ð´ÐµÐºÐ¾Ð´ÐµÑ€Ð° J2C: [J2C_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Размер окна: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+ÐšÐ¾Ñ€Ñ€ÐµÐºÑ†Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð° шрифта: [FONT_SIZE_ADJUSTMENT]pt
+МаÑштаб интерфейÑа: [UI_SCALE]
+ДальноÑÑ‚ÑŒ отриÑовки: [DRAW_DISTANCE] м
+Ширина канала: [NET_BANDWITH] кбит/Ñ
+КоÑффициент детализации: [LOD_FACTOR]
+КачеÑтво визуализации: [RENDER_QUALITY] / 7
+РаÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ оÑвещениÑ: [GPU_SHADERS]
+ПамÑÑ‚ÑŒ текÑтур: [TEXTURE_MEMORY] МБ
+Ð’Ñ€ÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ VFS (кÑш): [VFS_TIME]
+ </string>
+ <string name="AboutLibs">
+ ВерÑÐ¸Ñ Ð´ÐµÐºÐ¾Ð´ÐµÑ€Ð° J2C: [J2C_VERSION]
ВерÑÐ¸Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° звука: [AUDIO_DRIVER_VERSION]
ВерÑÐ¸Ñ LLCEFLib/CEF: [LLCEFLIB_VERSION]
ВерÑÐ¸Ñ LibVLC: [LIBVLC_VERSION]
@@ -73,6 +86,9 @@ SLURL: <nolink>[SLURL]</nolink>
<string name="AboutTraffic">
ПотерÑно пакетов: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Ошибка при получении URL-адреÑа заметок о выпуÑке Ñервера.
</string>
@@ -1087,6 +1103,9 @@ support@secondlife.com.
<string name="TeleportYourAgent">
Телепортировать ваÑ
</string>
+ <string name="ForceSitAvatar">
+ ЗаÑтавьте аватар ÑеÑÑ‚ÑŒ
+ </string>
<string name="NotConnected">
Ðет подключениÑ
</string>
@@ -1935,6 +1954,27 @@ support@secondlife.com.
<string name="av_render_anyone">
Ðикто из окружающих учаÑтников не может отриÑовать ваÑ.
</string>
+ <string name="hud_description_total">
+ Ваши данные в игре
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] (ноÑитÑÑ Ð½Ð° [JNT_NAME])
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] иÑпользует большой объем памÑти текÑтур
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] Ñодержит много объемиÑÑ‚Ñ‹Ñ… объектов и текÑтур
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] Ñодержит много больших текÑтур
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] Ñодержит Ñлишком много объектов
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] Ñодержит Ñлишком много текÑтур
+ </string>
<string name="AgeYearsA">
[COUNT] год
</string>
@@ -2094,6 +2134,9 @@ support@secondlife.com.
<string name="ObjectOutOfRange">
Скрипт (объект вне облаÑти)
</string>
+ <string name="ScriptWasDeleted">
+ Скрипт (удален из инвентарÑ)
+ </string>
<string name="GodToolsObjectOwnedBy">
Объект [OBJECT] Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ [OWNER]
</string>
@@ -2706,6 +2749,15 @@ support@secondlife.com.
<string name="Play Media">
Мультимедиа – воÑпроизведение/пауза
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Ошибка при анализе командной Ñтроки.
См.: http://wiki.secondlife.com/wiki/Client_parameters
@@ -4478,12 +4530,18 @@ support@secondlife.com.
<string name="paid_you_ldollars">
Житель [NAME] заплатил вам L$[AMOUNT] за [REASON].
</string>
+ <string name="paid_you_ldollars_gift">
+ Пользователь [NAME] заплатил вам L$[AMOUNT]: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
Житель [NAME] заплатил вам L$[AMOUNT].
</string>
<string name="you_paid_ldollars">
Вы заплатили жителю [NAME] L$[AMOUNT] за [REASON].
</string>
+ <string name="you_paid_ldollars_gift">
+ Вы заплатили пользователю [NAME] L$[AMOUNT]: [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
Вы заплатили L$[AMOUNT].
</string>
@@ -4496,6 +4554,9 @@ support@secondlife.com.
<string name="you_paid_failure_ldollars">
Ð’Ñ‹ не Ñмогли заплатить пользователю [NAME] L$[AMOUNT]: [REASON].
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ Ð’Ñ‹ не Ñмогли заплатить пользователю [NAME] L$[AMOUNT]: [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
Ð’Ñ‹ не Ñмогли заплатить L$[AMOUNT]
</string>
@@ -4822,6 +4883,15 @@ support@secondlife.com.
<string name="texture_load_dimensions_error">
ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ изображениÑ, размер которых превышает [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ МакÑимальный размер фото коÑтюма [WIDTH]*[HEIGHT]. Измените размер или иÑпользуйте другое изображение
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ МакÑимальный размер фото коÑтюма [WIDTH]*[HEIGHT]. Выберите другую текÑтуру.
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Ðевозможно проверить размеры фото. Подождите, пока размеры фото не будут показаны в окне выбора
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
ÐеÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° наши уÑилиÑ, что-то неожиданно пошло не так.
@@ -5338,6 +5408,9 @@ support@secondlife.com.
<string name="Command_Profile_Label">
Профиль
</string>
+ <string name="Command_Report_Abuse_Label">
+ Жалоба
+ </string>
<string name="Command_Search_Label">
ПоиÑк
</string>
@@ -5428,6 +5501,9 @@ support@secondlife.com.
<string name="Command_Profile_Tooltip">
Редактирование или проÑмотр вашего профилÑ
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Жалоба
+ </string>
<string name="Command_Search_Tooltip">
ПоиÑк меÑÑ‚, Ñобытий, людей
</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
index 29a56bae7e9..3c00b67c50f 100644
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="Dış katman ağırlığını dahil et" name="upload_skin"/>
<check_box label="Eklem konumlarını dahil et" name="upload_joints"/>
+ <check_box label="Eklem konumu tanımlandıysa ölçeği kilitle" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Z kayması (avatarı kaldırmak veya indirmek için):
</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml
index 63334db9109..8ed8c895efc 100644
--- a/indra/newview/skins/default/xui/tr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">Gruba Öde</string>
- <string name="payee_resident">Sakine Öde</string>
- <text name="paying_text">Ödeyeceğiniz miktar:</text>
- <text name="payee_name">Kırpmayı Kontrol İçin Test Adı Çok Uzun</text>
+ <string name="payee_group">
+ Gruba Öde
+ </string>
+ <string name="payee_resident">
+ Sakine Öde
+ </string>
+ <text name="paying_text">
+ Ödeyeceğiniz miktar:
+ </text>
+ <text name="payee_name">
+ Kırpmayı Kontrol İçin Test Adı Çok Uzun
+ </text>
+ <text name="payment_message_label">
+ Açıklama (isteğe bağlı):
+ </text>
<panel label="Ara" name="PatternsPanel">
<button label="1 L$ Öde" label_selected="1 L$ Öde" name="fastpay 1"/>
<button label="5 L$ Öde" label_selected="5 L$ Öde" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="20 L$ Öde" label_selected="20 L$ Öde" name="fastpay 20"/>
</panel>
<panel label="Ara" name="InputPanel">
- <text name="amount text">DiÄŸer bir tutar:</text>
+ <text name="amount text">
+ DiÄŸer bir tutar:
+ </text>
<button label="Öde" label_selected="Öde" name="pay btn"/>
<button label="Ä°ptal" label_selected="Ä°ptal" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
index 867e15a3caf..72c897ad47f 100644
--- a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
<text name="AvatarText">
Avatar
</text>
- <slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın hangi noktadan itibaren JellyDolll olarak çizileceğini kontrol eder"/>
+ <slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın ne zaman JellyDoll olarak çizileceğini belirler"/>
<text name="IndirectMaxComplexityText">
0
</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
index c1d98b717ad..9004ad2e73b 100644
--- a/indra/newview/skins/default/xui/tr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
Çalışmıyor
</floater.string>
+ <floater.string name="Timeout">
+ Zaman aşımı: [OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ Şu öğe için envanter yükleniyor: [OBJECT_NAME]
+ </floater.string>
<button label="Kapat" label_selected="Kapat" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml
index 93491b80fbe..dd5f18e2ad2 100644
--- a/indra/newview/skins/default/xui/tr/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/tr/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="Güvenli Tarama"/>
<button name="popexternal" tool_tip="Mevcut URL'yi masaüstü tarayıcıda aç"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="Web testleri ana sayfası"/>
+ <button name="VLC Plugin Test" tool_tip="MPEG4 Video Testi"/>
+ </layout_panel>
</layout_stack>
</floater>
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 d09174dcc09..cef661dbf42 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Ara" name="Call"/>
<menu_item_call label="Gruba Davet Et" name="Invite..."/>
<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
+ <menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
<menu_item_call label="Engelle" name="Avatar Mute"/>
<menu_item_call label="Raporla" name="abuse"/>
<menu_item_call label="Dondur" name="Freeze..."/>
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 9027f09d8eb..fd166ddd68e 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
+ <menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
<menu_item_call label="Arkadaşlarım" name="Friends..."/>
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
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 9e95b3033a5..87b0d3b7eb3 100644
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Ara" name="Call"/>
<menu_item_call label="Gruba Davet Et" name="Invite..."/>
<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
+ <menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
<menu_item_call label="Engelle" name="Avatar Mute"/>
<menu_item_call label="Raporla" name="abuse"/>
<menu_item_call label="Dondur" name="Freeze..."/>
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 30787334785..d60d894ed87 100644
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="Şeklimi Düzenle" name="Edit My Shape"/>
<menu_item_call label="Konum Yüksekliği" name="Hover Height"/>
<menu_item_call label="İskeleti Sıfırla" name="Reset Skeleton"/>
+ <menu_item_call label="İskeleti ve Animasyonları Sıfırla" name="Reset Skeleton And Animations"/>
<menu_item_call label="Arkadaşlarım" name="Friends..."/>
<menu_item_call label="Gruplarım" name="Groups..."/>
<menu_item_call label="Profilim" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
index a9406357786..60f81c32378 100644
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="Hata Ayıklama Menüsünü Göster" name="Show Debug Menu"/>
<menu label="Hata ayıkla" name="Debug">
<menu_item_call label="Hata Ayıklama Ayarlarını Göster" name="Debug Settings"/>
- <menu_item_call label="KA/Renk Ayarları" name="UI/Color Settings"/>
<menu_item_call label="XKA Önizleme Aracı" name="UI Preview Tool"/>
<menu label="KA Testleri" name="UI Tests"/>
<menu_item_call label="Pencere Büyüklüğünü Ayarla..." name="Set Window Size..."/>
<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_item_call label="Ortam Tarayıcı" name="Media Browser"/>
<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"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 3d5c68d9d3d..57a44f02eac 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="Nesne Profili..." name="Object Profile"/>
<menu_item_call label="Engelle..." name="Block"/>
+ <menu_item_call label="Engellemeyi Kaldır" name="Unblock"/>
<menu_item_call label="Haritada Göster" name="show_on_map"/>
<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index 674041e9c9b..1b73032a5d3 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="Giysi - Mevcut Dış Görünümü Değiştir" name="wear"/>
<menu_item_call label="Giysi - Mevcut Dış Görünüme Ekle" name="wear_add"/>
<menu_item_call label="Çıkar - Mevcut Dış Görünümden Kaldır" name="take_off"/>
+ <menu_item_call label="Karşıya Fotoğraf Yükleyin (10 L$)" name="upload_photo"/>
+ <menu_item_call label="Fotoğraf Seçin" name="select_photo"/>
+ <menu_item_call label="Anlık Görüntü Al" name="take_snapshot"/>
+ <menu_item_call label="Fotoğrafı Kaldır" name="remove_photo"/>
<menu label="Yeni Giysiler" name="New Clothes">
<menu_item_call label="Yeni Gömlek" name="New Shirt"/>
<menu_item_call label="Yeni Pantolon" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
+ <menu_item_check label="Klasörleri Her Zaman Ada Göre Sırala" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
index 609584d6a60..65e5cd2ba6a 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
+ <menu_item_check label="Kullanıcı adlarını gizle" name="view_usernames"/>
<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index 2d61461c919..d7f61dd2cdb 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="PaylaÅŸ" name="share"/>
<menu_item_call label="Öde" name="pay"/>
<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
+ <menu_item_call label="Dondur" name="freeze"/>
+ <menu_item_call label="Çıkar" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
index 59ea7c145f6..5c1fe095244 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
<menu_item_check label="Haritayı Göster" name="view_map"/>
+ <menu_item_check label="Kullanıcı adlarını gizle" name="view_usernames"/>
</toggleable_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 ae686696057..211ff6dcbfc 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<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="Engellemeyi Kaldır" name="unblock_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 39636f2ebfc..f55bb3fbad4 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -111,11 +111,11 @@
<menu_item_call label="BaÄŸla" name="Link"/>
<menu_item_call label="BaÄŸlnty. Kopar" name="Unlink"/>
<menu_item_check label="Bağlantılı Parçaları Düzenle" name="Edit Linked Parts"/>
- <menu label="Bağlantılı Parçaları Seç" name="Select Linked Parts">
- <menu_item_call label="Sonraki Parçayı Seç" name="Select Next Part"/>
- <menu_item_call label="Önceki Parçayı Seç" name="Select Previous Part"/>
- <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 label="Öğeleri Seçin" name="Select Elements">
+ <menu_item_call label="Sonraki Parçayı veya Yüzü Seçin" name="Select Next Part or Face"/>
+ <menu_item_call label="Önceki Parçayı veya Yüzü Seçin" name="Select Previous Part or Face"/>
+ <menu_item_call label="Sonraki Parçayı veya Yüzü Dahil Et" name="Include Next Part or Face"/>
+ <menu_item_call label="Önceki Parçayı veya Yüzü Dahil Et" name="Include Previous Part or Face"/>
</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"/>
@@ -366,8 +366,7 @@
<menu_item_call label="Bölge Nesne Önbelleğinin Dökümünü Al" name="Dump Region Object Cache"/>
</menu>
<menu label="KA" name="UI">
- <menu_item_call label="Ortam Tarayıcı Testi" name="Web Browser Test"/>
- <menu_item_call label="Web İçerik Tarayıcısı" name="Web Content Browser"/>
+ <menu_item_call label="Ortam Tarayıcı" name="Media Browser"/>
<menu_item_call label="SelectMgr'i Dökümünü Al" name="Dump SelectMgr"/>
<menu_item_call label="Envanterin Dökümünü Al" name="Dump Inventory"/>
<menu_item_call label="Zamanlayıcıların Dökümünü Al" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
index 97965465598..1db95c17e1f 100644
--- a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="Çıkar" name="take_off"/>
<menu_item_call label="Ayır" name="detach"/>
<menu_item_call label="Dış Görünümü Düzenle" name="edit"/>
+ <menu_item_call label="Düzenle" name="edit_item"/>
+ <menu_item_call label="Orijinali Göster" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml
index fa554d34fc7..5b13b0059af 100644
--- a/indra/newview/skins/default/xui/tr/mime_types.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types.xml
@@ -57,6 +57,11 @@
Gerçek Zamanlı Akış
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ LibVLC destekli ortam
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- Hiçbiri -
@@ -202,6 +207,11 @@
Film (MP4)
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ Film
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
Film (QuickTime)
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index fb38486a9e3..0f222d49cc4 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -330,6 +330,9 @@ Bu yeteneklerin artık bu rolde bulunmasını istemiyorsanız, onları hemen dev
[COUNT] üyeyi grubun yasaklı listesine eklemek üzeresiniz.
<usetemplate ignoretext="Gruptan birden çok üyenin yasaklanmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Yasakla"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ Bazı sakinlere, gruptan çıkartıldıkları için davetiye gönderilmedi.
+ </notification>
<notification name="AttachmentDrop">
Aksesuarınızı çıkarmak üzeresiniz.
Devam etmek istediÄŸinize emin misiniz?
@@ -457,6 +460,12 @@ Ortamı sadece bir yüze yerleştirmek için, Yüz Seç'i seçin ve ardınd
<notification name="ErrorEncodingSnapshot">
Anlık görüntü kodlanırken hata oluştu.
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ Envanterinize bir fotoğraf kaydedebilmek için [COST] L$ paraya ihtiyacınız var. L$ satın alabilir veya bunun yerine fotoğrafı bilgisayarınıza kaydedebilirsiniz.
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ Envanterinize bir doku kaydedebilmek için [COST] L$ paraya ihtiyacınız var. L$ satın alabilir veya bunun yerine fotoğrafı bilgisayarınıza kaydedebilirsiniz.
+ </notification>
<notification name="ErrorUploadingPostcard">
Aşağıdaki nedenden dolayı, anlık görüntü gönderilirken bir sorun oluştu: [REASON]
</notification>
@@ -575,6 +584,10 @@ Not: Bu işlem önbelleği temizleyecek.
Not kartı silinsin mi?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ Raporunuz için önceki anlık görüntüyü kullanmak ister misiniz?
+ <usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
Mimik kaydedilemedi.
Bu mimikte çok fazla adım var.
@@ -635,30 +648,12 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
</url>
<usetemplate ignoretext="Bilgisayar donanımım desteklenmiyor" name="okcancelignore" notext="Hayır" yestext="Evet"/>
</notification>
- <notification name="IntelOldDriver">
- Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
- Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
- <url name="url">
- http://www.intel.com/p/en_US/support/detect/graphics
- </url>
- <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
- </notification>
- <notification name="AMDOldDriver">
+ <notification name="OldGPUDriver">
Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
- Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+ Sürücü güncellemesi olup olmadığına bakmak için [URL] adresini ziyaret etmek ister misiniz?
<url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
- </notification>
- <notification name="NVIDIAOldDriver">
- Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
- Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
- <url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=en-us
+ [URL]
</url>
<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
</notification>
@@ -749,6 +744,9 @@ L$ satın alma ile ilgili bilgi edinmek için [_URL] adresine gidilsin mi?
</url>
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
+ <notification name="MuteLimitReached">
+ [MUTE_LIMIT] giriş limitine ulaştığınız için, engelleme listesine yeni giriş eklenemiyor.
+ </notification>
<notification name="UnableToLinkObjects">
Bu [COUNT] nesne birbirine bağlanamıyor.
En fazla [MAX] nesneyi birbirine baÄŸlayabilirsiniz.
@@ -1379,6 +1377,11 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
</notification>
<notification name="AgentComplexity">
[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] düzeyiniz [AGENT_COMPLEXITY].
+ <usetemplate ignoretext="Avatar karmaşıklık seviyem değişince beni uyar" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON], büyük olasılıkla performansınızı olumsuz etkiliyor.
+ <usetemplate ignoretext="BÜG karmaşıklık seviyem çok yükselince beni uyar" name="notifyignore"/>
</notification>
<notification name="FirstRun">
[APP_NAME] yüklemesi tamamlandı.
@@ -1470,6 +1473,10 @@ Lütfen sadece bir nesne seçin ve tekrar deneyin.
Bu bölgedeki tüm Sakinler ana konumlarına ışınlansın mı?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ Bir bölgede binalar inşa edildikten sonra nesne bonusunun azaltılması nesnelerin iade edilmesine veya silinmesine neden olabilir. Nesne bonusunu değiştirmek istediğinize emin misiniz?
+ <usetemplate ignoretext="Nesne bonusu faktörünü değiştirmeyi doğrulayın" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+ </notification>
<notification name="EstateObjectReturn">
[USER_NAME] kullanıcısının sahip olduğu tüm nesneleri iade etmek istediğinize emin misiniz?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
@@ -1517,6 +1524,9 @@ Lütfen sadece bir nesne seçin ve tekrar deneyin.
<notification name="OwnerCanNotBeDenied">
Gayrimenkul sahibi, gayrimenkulün 'Yasaklı Sakin' listesine eklenemez.
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ Engellenmiş sakin, gayrimenkul yöneticisi listesine eklenemez.
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Giysi ve şekil yüklenene kadar görünüm değiştirilemez.
</notification>
@@ -1691,6 +1701,10 @@ En yeni özellikleri ve düzeltmeleri görmek için sabırsızlanıyorsanız Alt
Bu içeriği görüntülemek için Web tarayıcınızı açmak istiyor musunuz?
<usetemplate ignoretext="Bir web sayfasını görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ Sistem kullanıcı arayüzü faktörü son çalıştırmadan bu yana değişti. Kullanıcı arayüzü büyüklük değiştirme ayarları sayfasını açmak istiyor musunuz?
+ <usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
+ </notification>
<notification name="WebLaunchJoinNow">
Hesabınızı yönetmek için [http://secondlife.com/account/ Kontrol Paneli] adresine gidilsin mi?
<usetemplate ignoretext="Hesabımı yönetmek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/>
@@ -1730,10 +1744,17 @@ En yeni özellikleri ve düzeltmeleri görmek için sabırsızlanıyorsanız Alt
Gruptan ayrılmak istiyor musunuz?
<usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/>
</notification>
+ <notification name="GroupDepart">
+ "[group_name]" grubundan ayrıldınız.
+ </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="GroupDepartError">
+ Gruptan ayrılınamıyor.
+ <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"/>
@@ -2131,6 +2152,10 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
Çok fazla prim seçilmiş. Lütfen [MAX_PRIM_COUNT] ya da daha az prim seçin ve tekrar deneyin
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ Seçili nesnelerde çok fazla komut dosyası var. Lütfen daha az nesne seçip tekrar deneyin
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
Gayrimenkul sözleşmesi içeriye aktarılırken problem oluştu.
<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2298,6 +2323,10 @@ Envanter öğesi/öğeleri taşınsın mı?
Ödeme başarısız: nesne bulunamadı.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ Ödeme durduruldu: Ödenen fiyat, bu nesne için belirtilen ödeme düğmelerinden hiçbiriyle eşleşmiyor
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
Bu nesne içinde kopyalama izniniz olan bir öğe yok.
</notification>
@@ -2333,6 +2362,11 @@ Bu eylemi geri alamazsınız.
Bu, geniş bir bağlantı kümeleri seçimi. Bağlantıyı kaldırırsanız tekrar bağlayamayabilirsiniz. Tedbiren, envanterinizdeki bağlantı kümelerinin bir kopyasını almayı isteyebilirsiniz.
<usetemplate ignoretext="Bir bağlantı kümesinin bağının kaldırılmasını onayla" name="okcancelignore" notext="İptal" yestext="Bağlantıyı Kopar"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ Bu konuyu bize bildirmek için zaman ayırdığınız için teşekkür ederiz.
+Raporunuzda olası ihlalleri inceleyip gerekli önlemleri alacağız.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
Lütfen bu kötüye kullanım bildirimi için bir kategori seçin.
Kategori seçimi, kötüye kullanım bildirimlerini dosyalamamıza ve işleme almamıza yardımcı olmaktadır.
@@ -2762,6 +2796,10 @@ Burada uçamazsınız.
<notification name="PathfindingDirty">
Bu bölgede bekleyen yol bulma değişiklikleri var. Eğer oluşturma haklarına sahipseniz, “Bölgeyi yeniden kaydet†düğmesine tıklayarak bölgeyi yeniden kaydedebilirsiniz.
</notification>
+ <notification name="PathfindingDirtyRebake">
+ Bu bölgede bekleyen yol bulma değişiklikleri var. Eğer oluşturma haklarına sahipseniz, “Bölgeyi yeniden kaydet†düğmesine tıklayarak bölgeyi yeniden kaydedebilirsiniz.
+ <usetemplate name="okbutton" yestext="Bölgeyi yeniden kaydet"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
Bu bölgede dinamik yol bulma etkin değil. Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
</notification>
@@ -3268,11 +3306,13 @@ Güvenliğiniz için birkaç saniye engellenecek.
Görünüm XML olarak [PATH] konumuna kaydedildi
</notification>
<notification name="AppearanceToXMLFailed">
- Görünüm XML olarak kaydedilemedi.
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-[NAME] ön ayarı silinirken hata oluştu.
+ Görünüm XML'e kaydedilemedi.
+ </notification>
+ <notification name="PresetNotSaved">
+ Ön ayar ([NAME]) kaydedilirken hata oluştu.
+ </notification>
+ <notification name="PresetNotDeleted">
+ Ön ayar ([NAME]) silinirken hata oluştu.
</notification>
<notification name="UnableToFindHelpTopic">
Bu öğe için yardım başlığı bulunamıyor.
@@ -3482,13 +3522,6 @@ Görünümünüzü döndürmek için dünya üzerindeki herhangi bir yeri tıkla
<notification name="ForceQuitDueToLowMemory">
Yetersiz bellek nedeniyle SL 30 saniye içerisinde kapanacak.
</notification>
- <notification name="PopupAttempt">
- Açılır bir pencerenin açılması engellendi.
- <form name="form">
- <ignore name="ignore" text="Tüm açılır pencerelere izin ver"/>
- <button name="open" text="Açılır pencereyi aç"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
SOCKS 5 proxy'si "[HOST]:[PORT]" bağlantıyı reddetti; kural kümesi izin vermiyor.
<usetemplate name="okbutton" yestext="Tamam"/>
@@ -3859,6 +3892,9 @@ Lütfen bir dakika sonra tekrar deneyin.
<notification name="CantMoveObjectParcelResources">
[REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
</notification>
+ <notification name="NoParcelPermsNoObject">
+ Bu parsele erişiminiz olmadığı için kopyalama işlemi yapılamadı.
+ </notification>
<notification name="CantMoveObjectRegionVersion">
[REGION_NAME] bölgesinde '[OBJECT_NAME]' nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
</notification>
@@ -3871,6 +3907,10 @@ Lütfen bir dakika sonra tekrar deneyin.
<notification name="NoPermModifyObject">
Bu nesneyi deÄŸiÅŸtirme izniniz yok
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ Büyük envanterli çok fazla nesne seçildi. Lütfen daha az nesne seçip tekrar deneyin.
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
Navmesh'e katkıda bulunan bir nesne için fizik etkinleştirilemez.
</notification>
@@ -3907,6 +3947,12 @@ Lütfen bir dakika sonra tekrar deneyin.
<notification name="CantSaveModifyAttachment">
Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ Aksesuarlarınızda çok fazla envanter olduğu için daha fazlası eklenemiyor.
+ </notification>
+ <notification name="IllegalAttachment">
+ Aksesuar avatarda var olmayan bir noktaya karşılık geliyor. Bunun yerine göğüs kısmına eklendi.
+ </notification>
<notification name="TooManyScripts">
Çok fazla komut dosyası.
</notification>
@@ -3999,6 +4045,12 @@ Lütfen bir dakika sonra tekrar deneyin.
<notification name="TeleportedByObjectUnknownUser">
Bilinmeyen bir sahibi olan '[OBJECT_NAME]' nesnesi tarafından ışınlandınız.
</notification>
+ <notification name="StandDeniedByObject">
+ "[OBJECT_NAME]" şu anda durmanıza izin vermeyecek.
+ </notification>
+ <notification name="ResitDeniedByObject">
+ "[OBJECT_NAME]" ÅŸu anda koltuÄŸunuzu deÄŸiÅŸtirmenize izin vermeyecek.
+ </notification>
<notification name="CantCreateObjectRegionFull">
Talep edilen nesne oluşturulamıyor. Bölge dolu.
</notification>
@@ -4080,9 +4132,6 @@ Lütfen bir dakika sonra tekrar deneyin.
<notification name="CantAttachNotEnoughScriptResources">
Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
</notification>
- <notification name="IllegalAttachment">
- Aksesuar avatarda var olmayan bir noktaya karşılık geliyor. Bunun yerine göğüs kısmına eklendi.
- </notification>
<notification name="CantDropItemTrialUser">
Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
</notification>
@@ -4298,6 +4347,9 @@ Daha küçük bir arazi parçası seçmeyi deneyin.
<notification name="CantTransfterMoneyRegionDisabled">
Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ Sistem yüklemesi nedeniyle, ödeme yapılamıyor.
+ </notification>
<notification name="CantPayNoAgent">
Kime ödeme yapılacağı belirlenemedi.
</notification>
@@ -4333,4 +4385,8 @@ Daha küçük bir arazi parçası seçmeyi deneyin.
Sohbet geçmişi dosyası önceki işlemi gerçekleştirmekle meşgul. Lütfen bir kaç dakika sonra tekrar deneyin veya başka bir kişiyle sohbet etmeyi deneyin.
<usetemplate name="okbutton" yestext="Tamam"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="Tamam"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
index 550f7ebf105..c7d3d0dfed4 100644
--- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
Seçilen öğeleri giy
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="DIŞ GÖRÜNÜM GALERİSİ" name="outfit_gallery_tab"/>
<panel label="DIŞ GÖRÜNÜMLERİM" name="outfitslist_tab"/>
<panel label="GÄ°YÄ°LEN" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
index 462926738f6..e5a6d83166d 100644
--- a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ Giyilen aksesuar yok.
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="Giyilebilir Öğeler"/>
+ <accordion_tab name="tab_temp_attachments" title="Geçici aksesuarlar"/>
+ </accordion>
<panel name="bottom_panel">
<menu_button name="options_gear_btn" tool_tip="İlave seçenekleri göster"/>
</panel>
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 9cfa7d61f4e..235a90a2450 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -24,7 +24,7 @@
<text name="BetterText">
Daha iyi
</text>
- <slider label="Avatarın Maksimum Karmaşıklığı:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın hangi noktadan itibaren JellyDolll olarak çizileceğini kontrol eder"/>
+ <slider label="Avatarın Maksimum Karmaşıklığı:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık bir avatarın ne zaman JellyDoll olarak çizileceğini belirler"/>
<text name="IndirectMaxComplexityText">
0
</text>
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 8f74c8ef7e7..39a7ce99737 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="Güncellemeleri manuel olarak indirip yükleyeceğim" name="Install_manual"/>
</combo_box>
<check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
+ <check_box label="Güncellemeden sonra Sürüm Notlarını göster" name="update_show_release_notes"/>
<text name="Proxy Settings:">
Proxy Ayarları:
</text>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index cc1856bb7d2..7b4bf1fca63 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -61,10 +61,23 @@ Grafik Kartı: [GRAPHICS_CARD]
<string name="AboutDriver">
Windows Grafik Sürücüsü Sürümü: [GRAPHICS_DRIVER_VERSION]
</string>
+ <string name="AboutOGL">
+ OpenGL Sürümü: [OPENGL_VERSION]
+ </string>
+ <string name="AboutSettings">
+ Pencere büyüklüğü: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
+Font Büyüklüğü Ayarı: [FONT_SIZE_ADJUSTMENT] pt
+Kullanıcı Arayüzü Ölçekleme: [UI_SCALE]
+Çizme mesafesi: [DRAW_DISTANCE] m
+Bant geniÅŸliÄŸi: [NET_BANDWITH] kbit/sn
+Ayrıntı seviyesi faktörü: [LOD_FACTOR]
+Ä°ÅŸleme kalitesi: [RENDER_QUALITY] / 7
+Gelişmiş Aydınlatma Modeli: [GPU_SHADERS]
+Doku belleÄŸi: [TEXTURE_MEMORY]MB
+VFS (önbellek) oluşturma zamanı: [VFS_TIME]
+ </string>
<string name="AboutLibs">
- OpenGL Sürümü [OPENGL_VERSION]
-
-J2C Kod Çözücü Sürümü: [J2C_VERSION]
+ J2C Kod Çözücü Sürümü: [J2C_VERSION]
Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION]
LLCEFLib/CEF Sürümü: [LLCEFLIB_VERSION]
LibVLC Sürümü: [LIBVLC_VERSION]
@@ -73,6 +86,9 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
<string name="AboutTraffic">
Kaybolan Paketler: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
Sunucu sürümü notları URL'si alınırken hata oluştu.
</string>
@@ -1087,6 +1103,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="TeleportYourAgent">
Sizi ışınlama
</string>
+ <string name="ForceSitAvatar">
+ Avatarınızı oturmaya zorlayın
+ </string>
<string name="NotConnected">
Bağlı Değil
</string>
@@ -1935,6 +1954,27 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="av_render_anyone">
Çevrenizdeki kimse sizi işleyemeyebilir.
</string>
+ <string name="hud_description_total">
+ BÃœG'niz
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME] ([JNT_NAME] üzerinde)
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS] yüksek miktarda doku belleği kullanıyor
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS] çok sayıda pahalı nesne ve doku içeriyor
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] çok sayıda büyük doku içeriyor
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS] çok fazla nesne içeriyor
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS] çok fazla doku içeriyor
+ </string>
<string name="AgeYearsA">
[COUNT] yıl
</string>
@@ -2094,6 +2134,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="ObjectOutOfRange">
Komut dosyası (nesne kapsam dışı)
</string>
+ <string name="ScriptWasDeleted">
+ Komut Dosyası (envanterden silindi)
+ </string>
<string name="GodToolsObjectOwnedBy">
[OWNER] mülkiyetindeki [OBJECT] nesnesi
</string>
@@ -2706,6 +2749,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
<string name="Play Media">
Ortamı Oynat/Durdur
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=en-us
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
Komut satırı ayrıştırılırken bir hata oluştu.
Lütfen bakınız: http://wiki.secondlife.com/wiki/Client_parameters
@@ -4481,12 +4533,18 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
<string name="paid_you_ldollars">
[NAME] size [REASON] L$[AMOUNT] ödedi.
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME] size [AMOUNT] L$ ödedi: [REASON]
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] size L$[AMOUNT] ödedi.
</string>
<string name="you_paid_ldollars">
[NAME]'e [REASON] L$[AMOUNT] ödediniz.
</string>
+ <string name="you_paid_ldollars_gift">
+ [NAME] adlı kullanıcıya [AMOUNT] L$ ödediniz. [REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
L$[AMOUNT] ödediniz.
</string>
@@ -4499,6 +4557,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
<string name="you_paid_failure_ldollars">
[REASON] [NAME]'e L$[AMOUNT] ödeyemediniz.
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ [NAME] adlı kullanıcıya [AMOUNT] L$ ödeyemediniz. [REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
L$[AMOUNT] ödeyemediniz.
</string>
@@ -4823,6 +4884,15 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
<string name="texture_load_dimensions_error">
[WIDTH]*[HEIGHT] çözünürlüğünden büyük görüntüler yüklenemez
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ Maksimum dış görünüm fotoğrafı büyüklüğü: [WIDTH]*[HEIGHT]. Lütfen büyüklüğü değiştirin veya başka bir görüntü kullanın
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ Maksimum dış görünüm fotoğrafı büyüklüğü: [WIDTH]*[HEIGHT]. Lütfen başka bir doku seçin
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ Fotoğraf boyutları doğrulanamıyor. Fotoğraf boyutu seçicide görüntülenene kadar lütfen bekleyin
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
Tüm çabalarımıza rağmen beklenmeyen bir hata meydana geldi.
@@ -5339,6 +5409,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="Command_Profile_Label">
Profil
</string>
+ <string name="Command_Report_Abuse_Label">
+ Kötüye Kullanımı Bildir
+ </string>
<string name="Command_Search_Label">
Ara
</string>
@@ -5429,6 +5502,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
<string name="Command_Profile_Tooltip">
Profilinizi düzenleyin veya görüntüleyin
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ Kötüye Kullanımı Bildir
+ </string>
<string name="Command_Search_Tooltip">
Yerler, etkinlikler ve kiÅŸiler bulmak
</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 817b1af88dc..4223b76d909 100644
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -245,6 +245,7 @@
</text>
<check_box label="包å«è¡¨çš®é‡é‡" name="upload_skin"/>
<check_box label="包å«æŽ¥é»žä½ç½®" name="upload_joints"/>
+ <check_box label="若接點ä½ç½®å·²å®šç¾©ï¼Œå°±éŽ–ä½æ¯”例" name="lock_scale_if_joint_position"/>
<text name="pelvis_offset_label">
Z åè·ï¼ˆå‡é«˜æˆ–é™ä½ŽåŒ–身）：
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index 026ead95743..5eb0fe5362d 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money">
- <string name="payee_group">支付群組</string>
- <string name="payee_resident">支付居民</string>
- <text name="paying_text">ä½ æ£åœ¨æ”¯ä»˜ï¼š</text>
- <text name="payee_name">測試一個長度éžå¸¸éžå¸¸éžå¸¸é•·çš„å稱，檢查是å¦è¢«åˆ‡æ–·</text>
+ <string name="payee_group">
+ 支付群組
+ </string>
+ <string name="payee_resident">
+ 支付居民
+ </string>
+ <text name="paying_text">
+ ä½ æ£åœ¨æ”¯ä»˜ï¼š
+ </text>
+ <text name="payee_name">
+ 測試一個長度éžå¸¸éžå¸¸éžå¸¸é•·çš„å稱，檢查是å¦è¢«åˆ‡æ–·
+ </text>
+ <text name="payment_message_label">
+ 說明（å¯ç•™ç©ºï¼‰ï¼š
+ </text>
<panel label="æœå°‹" name="PatternsPanel">
<button label="支付 L$ 1" label_selected="支付 L$ 1" name="fastpay 1"/>
<button label="支付 L$ 5" label_selected="支付 L$ 5" name="fastpay 5"/>
@@ -11,7 +22,9 @@
<button label="支付 L$ 20" label_selected="支付 L$ 20" name="fastpay 20"/>
</panel>
<panel label="æœå°‹" name="InputPanel">
- <text name="amount text">其他金é¡ï¼š</text>
+ <text name="amount text">
+ 其他金é¡ï¼š
+ </text>
<button label="支付" label_selected="支付" name="pay btn"/>
<button label="å–消" label_selected="å–消" name="cancel btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
index 2a00bb61721..bbc16dd7e52 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -15,7 +15,7 @@
<text name="AvatarText">
化身
</text>
- <slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈åƒç‚º JellyDoll"/>
+ <slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈åƒç‚ºã€ŒJellyDollã€"/>
<text name="IndirectMaxComplexityText">
0
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index 7c253aa74c5..22af0dc5859 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
@@ -15,5 +15,11 @@
<floater.string name="NotRunning">
éžåŸ·è¡Œä¸
</floater.string>
+ <floater.string name="Timeout">
+ 逾時：[OBJECT_NAME]
+ </floater.string>
+ <floater.string name="LoadingObjInv">
+ æ£è¼‰å…¥ä»¥ä¸‹ç‰©é …的收ç´å€ï¼š[OBJECT_NAME]
+ </floater.string>
<button label="關閉" label_selected="關閉" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index be6bf8bb276..5b7bcd99162 100644
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
@@ -10,5 +10,9 @@
<icon name="media_secure_lock_flag" tool_tip="åŠ å¯†çš„ç€è¦½"/>
<button name="popexternal" tool_tip="åœ¨ä½ çš„æ¡Œé¢ç€è¦½å™¨ä¸é–‹å•Ÿç›®å‰çš„ URL ä½å€"/>
</layout_panel>
+ <layout_panel name="debug_controls">
+ <button name="web_test_home_page" tool_tip="網路測試主é "/>
+ <button name="VLC Plugin Test" tool_tip="MPEG4影片測試"/>
+ </layout_panel>
</layout_stack>
</floater>
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 69bc4e7632d..f104caeeafd 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="通話" name="Call"/>
<menu_item_call label="é‚€è«‹åŠ å…¥ç¾¤çµ„" name="Invite..."/>
<menu_item_call label="é‡è¨éª¨æž¶" name="Reset Skeleton"/>
+ <menu_item_call label="é‡è¨éª¨æž¶å’Œå‹•ä½œ" name="Reset Skeleton And Animations"/>
<menu_item_call label="å°éŽ–" name="Avatar Mute"/>
<menu_item_call label="å›žå ±" name="abuse"/>
<menu_item_call label="å‡çµ" name="Freeze..."/>
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 cf56d7c86bf..040ec94aad3 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -10,6 +10,7 @@
<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
<menu_item_call label="懸浮高度" name="Hover Height"/>
<menu_item_call label="é‡è¨éª¨æž¶" name="Reset Skeleton"/>
+ <menu_item_call label="é‡è¨éª¨æž¶å’Œå‹•ä½œ" name="Reset Skeleton And Animations"/>
<menu_item_call label="我的朋å‹" name="Friends..."/>
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
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 b58ec1d8cb7..2e9ef8bcf1a 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -7,6 +7,7 @@
<menu_item_call label="通話" name="Call"/>
<menu_item_call label="é‚€è«‹åŠ å…¥ç¾¤çµ„" name="Invite..."/>
<menu_item_call label="é‡è¨éª¨æž¶" name="Reset Skeleton"/>
+ <menu_item_call label="é‡è¨éª¨æž¶å’Œå‹•ä½œ" name="Reset Skeleton And Animations"/>
<menu_item_call label="å°éŽ–" name="Avatar Mute"/>
<menu_item_call label="å›žå ±" name="abuse"/>
<menu_item_call label="å‡çµ" name="Freeze..."/>
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 e2ddb573070..bad17a11b8b 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -27,6 +27,7 @@
<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
<menu_item_call label="懸浮高度" name="Hover Height"/>
<menu_item_call label="é‡è¨éª¨æž¶" name="Reset Skeleton"/>
+ <menu_item_call label="é‡è¨éª¨æž¶å’Œå‹•ä½œ" name="Reset Skeleton And Animations"/>
<menu_item_call label="我的朋å‹" name="Friends..."/>
<menu_item_call label="我的群組" name="Groups..."/>
<menu_item_call label="我的個人檔案" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index 7ef9240e830..8dd89db7bac 100644
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -20,13 +20,12 @@
<menu_item_check label="顯示除錯é¸å–®" name="Show Debug Menu"/>
<menu label="除錯" name="Debug">
<menu_item_call label="顯示除錯è¨å®š" name="Debug Settings"/>
- <menu_item_call label="UI / é¡è‰² è¨å®š" name="UI/Color Settings"/>
<menu_item_call label="XUI é 覽工具" name="UI Preview Tool"/>
<menu label="UI 測試" name="UI Tests"/>
<menu_item_call label="è¨å®šè¦–窗大å°..." name="Set Window Size..."/>
<menu_item_call label="顯示 TOS" name="TOS"/>
<menu_item_call label="顯示嚴é‡è¨Šæ¯" name="Critical"/>
- <menu_item_call label="網é 內容浮動視窗除錯測試" name="Web Content Floater Debug Test"/>
+ <menu_item_call label="媒體ç€è¦½å™¨" name="Media Browser"/>
<menu label="è¨å®šè¨˜éŒ„細節" name="Set Logging Level">
<menu_item_check label="除錯" name="Debug"/>
<menu_item_check label="資訊" name="Info"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index 9655732f2e0..d0a3457ae86 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,6 +2,7 @@
<menu name="Object Icon Menu">
<menu_item_call label="物件檔案..." name="Object Profile"/>
<menu_item_call label="å°éŽ–…" name="Block"/>
+ <menu_item_call label="解除å°éŽ–" name="Unblock"/>
<menu_item_call label="顯示在地圖上" name="show_on_map"/>
<menu_item_call label="瞬間傳é€åˆ°ç‰©ä»¶ä½ç½®" name="teleport_to_object"/>
</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 258d0d6b20e..124598a0982 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -3,6 +3,10 @@
<menu_item_call label="穿上 ï¼ å–代目å‰è£æ‰®" name="wear"/>
<menu_item_call label="穿上 ï¼ æ·»åŠ åˆ°ç›®å‰è£æ‰®" name="wear_add"/>
<menu_item_call label="脫下 ï¼ ç”±ç›®å‰è£æ‰®ç§»é™¤" name="take_off"/>
+ <menu_item_call label="上傳相片(L$10)" name="upload_photo"/>
+ <menu_item_call label="é¸æ“‡ç›¸ç‰‡" name="select_photo"/>
+ <menu_item_call label="æ‹æ”å¿«ç…§" name="take_snapshot"/>
+ <menu_item_call label="移除相片" name="remove_photo"/>
<menu label="æ–°è¡£æœ" name="New Clothes">
<menu_item_call label="新襯衫" name="New Shirt"/>
<menu_item_call label="新褲å" name="New Pants"/>
@@ -27,4 +31,5 @@
<menu_item_call label="摺疊全部資料夾" name="collapse"/>
<menu_item_call label="è£æ‰®æ›´å" name="rename"/>
<menu_item_call label="刪除è£æ‰®" name="delete_outfit"/>
+ <menu_item_check label="總是由å稱排åºè³‡æ–™å¤¾" name="sort_folders_by_name"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
index 4251238fd95..9e27520d368 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -4,5 +4,6 @@
<menu_item_check label="ä¾ç‹€æ…‹æŽ’åº" name="sort_status"/>
<menu_item_check label="察看人群圖示" name="view_icons"/>
<menu_item_check label="察看許å¯æ¬Šé™" name="view_permissions"/>
+ <menu_item_check label="éš±è—使用者å稱" name="view_usernames"/>
<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index d25adaf8fb5..4ad755c0283 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -13,4 +13,6 @@
<menu_item_call label="分享" name="share"/>
<menu_item_call label="支付" name="pay"/>
<menu_item_check label="å°éŽ–/ä¸å†å°éŽ–" name="block_unblock"/>
+ <menu_item_call label="å‡çµ" name="freeze"/>
+ <menu_item_call label="踢出" name="eject"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
index 9bc56384726..9c82e204976 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -5,4 +5,5 @@
<menu_item_check label="ä¾è·é›¢æŽ’åº" name="sort_distance"/>
<menu_item_check label="察看人群圖示" name="view_icons"/>
<menu_item_check label="察看地圖" name="view_map"/>
+ <menu_item_check label="éš±è—使用者å稱" name="view_usernames"/>
</toggleable_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 ac366f92efc..c830e5554b4 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -2,6 +2,7 @@
<context_menu name="Url Popup">
<menu_item_call label="物件檔案..." name="show_object"/>
<menu_item_call label="å°éŽ–…" name="block_object"/>
+ <menu_item_call label="解除å°éŽ–" name="unblock_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 f2971491ac5..38686460503 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -111,11 +111,11 @@
<menu_item_call label="è¯çµ" name="Link"/>
<menu_item_call label="å–消è¯çµ" name="Unlink"/>
<menu_item_check label="編輯è¯çµéƒ¨ä½" name="Edit Linked Parts"/>
- <menu label="é¸æ“‡è¯çµéƒ¨ä½" name="Select Linked Parts">
- <menu_item_call label="é¸æ“‡ä¸‹ä¸€éƒ¨ä½" name="Select Next Part"/>
- <menu_item_call label="é¸æ“‡ä¸Šä¸€éƒ¨ä½" name="Select Previous Part"/>
- <menu_item_call label="包括下一部ä½" name="Include Next Part"/>
- <menu_item_call label="包括上一部ä½" name="Include Previous Part"/>
+ <menu label="é¸æ“‡å…ƒç´ " name="Select Elements">
+ <menu_item_call label="é¸æ“‡ä¸‹ä¸€éƒ¨ä½æˆ–臉" name="Select Next Part or Face"/>
+ <menu_item_call label="é¸æ“‡ä¸Šä¸€éƒ¨ä½æˆ–臉" name="Select Previous Part or Face"/>
+ <menu_item_call label="包括下一部ä½æˆ–臉" name="Include Next Part or Face"/>
+ <menu_item_call label="包括上一部ä½æˆ–臉" name="Include Previous Part or Face"/>
</menu>
<menu_item_call label="è¯çµé›†â€¦" name="pathfinding_linkset_menu_item"/>
<menu_item_call label="èšç„¦æ–¼æ‰€é¸éƒ¨ä½" name="Focus on Selection"/>
@@ -366,8 +366,7 @@
<menu_item_call label="傾å°åœ°å€ç‰©ä»¶å¿«å–" name="Dump Region Object Cache"/>
</menu>
<menu label="使用者界é¢" name="UI">
- <menu_item_call label="媒體ç€è¦½å™¨æ¸¬è©¦" name="Web Browser Test"/>
- <menu_item_call label="網é 內容ç€è¦½å™¨" name="Web Content Browser"/>
+ <menu_item_call label="媒體ç€è¦½å™¨" name="Media Browser"/>
<menu_item_call label="å‚¾å° SelectMgr" name="Dump SelectMgr"/>
<menu_item_call label="傾å°æ”¶ç´å€" name="Dump Inventory"/>
<menu_item_call label="傾å°ç¢¼éŒ¶" name="Dump Timers"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
index c7d2853995f..dc9adcbd25f 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
@@ -3,4 +3,6 @@
<menu_item_call label="脫下" name="take_off"/>
<menu_item_call label="å¸ä¸‹" name="detach"/>
<menu_item_call label="編輯è£æ‰®" name="edit"/>
+ <menu_item_call label="編輯" name="edit_item"/>
+ <menu_item_call label="顯示原件" name="show_original"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 8967475abb2..f4b68227784 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -57,6 +57,11 @@
å³æ™‚串æµ
</label>
</scheme>
+ <scheme name="libvlc">
+ <label name="libvlc_label">
+ LibVLC支æŒçš„媒體
+ </label>
+ </scheme>
<mimetype name="blank">
<label name="blank_label">
- ç„¡ -
@@ -202,6 +207,11 @@
è¦–é »ï¼ˆMP4）
</label>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="video/octet-stream">
+ 影片
+ </label>
+ </mimetype>
<mimetype name="video/quicktime">
<label name="video/quicktime_label">
è¦–é »ï¼ˆQuickTime）
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 463afab1c09..5c794afd65f 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -330,6 +330,9 @@
ä½ å³å°‡ç¦æ¢[COUNT]個人留在群組。
<usetemplate ignoretext="確定è¦ç¦æ¢å¤šåæˆå“¡çºŒç•™æ¤ç¾¤çµ„" name="okcancelignore" notext="å–消" yestext="ç¦æ¢"/>
</notification>
+ <notification name="GroupBanUserOnBanlist">
+ æœ‰äº›å±…æ°‘å› ç‚ºè¢«å°éŽ–所以沒有收到邀請。
+ </notification>
<notification name="AttachmentDrop">
ä½ å³å°‡å¸é™¤ä½ 的附件。
ä½ ç¢ºå®šä½ è¦ç¹¼çºŒï¼Ÿ
@@ -457,6 +460,12 @@
<notification name="ErrorEncodingSnapshot">
為快照編碼時出錯。
</notification>
+ <notification name="ErrorPhotoCannotAfford">
+ ä½ éœ€è¦L$[COST]æ‰èƒ½æŠŠç…§ç‰‡å˜å…¥ä½ 的收ç´å€ã€‚ ä½ å¯ä»¥è³¼è²·L$，或者ä¸å˜å…¥æ”¶ç´å€ï¼Œè€ŒæŠŠç›¸ç‰‡å˜åˆ°ä½ 的電腦。
+ </notification>
+ <notification name="ErrorTextureCannotAfford">
+ ä½ éœ€è¦L$[COST]æ‰èƒ½æŠŠæ質å˜å…¥ä½ 的收ç´å€ã€‚ ä½ å¯ä»¥è³¼è²·L$，或者ä¸å˜å…¥æ”¶ç´å€ï¼Œè€ŒæŠŠç›¸ç‰‡å˜åˆ°ä½ 的電腦。
+ </notification>
<notification name="ErrorUploadingPostcard">
發é€å¿«ç…§æ™‚出å•é¡Œï¼ŒåŽŸå› ：[REASON]
</notification>
@@ -575,6 +584,10 @@
刪除記事å¡ï¼Ÿ
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="LoadPreviousReportScreenshot">
+ ä½ è¦ä½¿ç”¨ä¹‹å‰çš„èž¢å¹•æˆªåœ–ä¾†èˆ‰å ±å—Žï¼Ÿ
+ <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
+ </notification>
<notification name="GestureSaveFailedTooManySteps">
姿勢儲å˜å¤±æ•—。
這個姿勢æ¥é©Ÿå¤ªå¤šã€‚
@@ -635,32 +648,14 @@
</url>
<usetemplate ignoretext="我的電腦硬體並ä¸æ”¯æ´" name="okcancelignore" notext="å¦" yestext="是"/>
</notification>
- <notification name="IntelOldDriver">
- ä½ çš„é¡¯ç¤ºå¡å¾ˆå¯èƒ½æœ‰æ–°ç‰ˆçš„驅動程å¼ã€‚ 更新顯示驅動程å¼æœƒå¤§å¹…改善性能。
-
- å‰å¾€ [_URL] 察看是å¦æœ‰æ–°ç‰ˆé©…動程å¼ï¼Ÿ
- <url name="url">
- http://www.intel.com/p/en_US/support/detect/graphics
- </url>
- <usetemplate ignoretext="我的顯示驅動程å¼å¤ªè€èˆŠ" name="okcancelignore" notext="å¦" yestext="是"/>
- </notification>
- <notification name="AMDOldDriver">
- ä½ çš„é¡¯ç¤ºå¡å¾ˆå¯èƒ½æœ‰æ–°ç‰ˆçš„驅動程å¼ã€‚ 更新顯示驅動程å¼æœƒå¤§å¹…改善性能。
-
- å‰å¾€ [_URL] 察看是å¦æœ‰æ–°ç‰ˆé©…動程å¼ï¼Ÿ
- <url name="url">
- http://support.amd.com/us/Pages/AMDSupportHub.aspx
- </url>
- <usetemplate ignoretext="我的顯示驅動程å¼å¤ªè€èˆŠ" name="okcancelignore" notext="å¦" yestext="是"/>
- </notification>
- <notification name="NVIDIAOldDriver">
+ <notification name="OldGPUDriver">
ä½ çš„é¡¯ç¤ºå¡å¾ˆå¯èƒ½æœ‰æ–°ç‰ˆçš„驅動程å¼ã€‚ 更新顯示驅動程å¼æœƒå¤§å¹…改善性能。
- å‰å¾€ [_URL] 察看是å¦æœ‰æ–°ç‰ˆé©…動程å¼ï¼Ÿ
+ å‰å¾€[URL]察看是å¦æœ‰æ–°ç‰ˆé©…動程å¼ï¼Ÿ
<url name="url">
- http://www.nvidia.com/Download/index.aspx?lang=tw
+ [URL]
</url>
- <usetemplate ignoretext="我的顯示驅動程å¼å¤ªè€èˆŠ" name="okcancelignore" notext="å¦" yestext="是"/>
+ <usetemplate ignoretext="我的顯示驅動程å¼å¤ªè€èˆŠ" name="okcancelignore" notext="å–消" yestext="是"/>
</notification>
<notification name="UnknownGPU">
ä½ çš„ç³»çµ±å«æœ‰ä¸€å€‹ [APP_NAME] 無法辨èªçš„顯åƒå¡ã€‚
@@ -749,6 +744,9 @@
</url>
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="MuteLimitReached">
+ å°éŽ–清單åé¡ç„¡æ³•å¢žåŠ ï¼Œå› ç‚ºä½ å·²é”[MUTE_LIMIT]å的上é™ã€‚
+ </notification>
<notification name="UnableToLinkObjects">
無法è¯çµé€™ [COUNT] 個物件。
ä½ æœ€å¤šå¯ä»¥è¯çµ [MAX] 個物件。
@@ -1372,6 +1370,11 @@
</notification>
<notification name="AgentComplexity">
ä½ çš„[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 化身複雜度]是[AGENT_COMPLEXITY]。
+ <usetemplate ignoretext="發出è¦å‘Šï¼Œå‘ŠçŸ¥æˆ‘化身複雜度有了改變" name="notifyignore"/>
+ </notification>
+ <notification name="HUDComplexityWarning">
+ [HUD_REASON]，å¯èƒ½è² é¢å½±éŸ¿ä½ 的性能。
+ <usetemplate ignoretext="è¦å‘Šæˆ‘HUD的複雜度是å¦å¯èƒ½éŽé«˜" name="notifyignore"/>
</notification>
<notification name="FirstRun">
[APP_NAME] 安è£å®Œæˆã€‚
@@ -1463,6 +1466,10 @@ SHA1 指紋：[MD5_DIGEST]
確定è¦å¼·åˆ¶çž¬é–“傳é€é€™åœ°å€æ‰€æœ‰å±…民回家？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="ChangeObjectBonusFactor">
+ 在地å€å…§å®Œæˆå»ºè£½å¾Œå†é™ä½Žç‰©ä»¶è² è·å€æ•¸ï¼Œå¯èƒ½å°Žè‡´ç‰©ä»¶è¢«é€è¿”或刪除。 繼續è¦è®Šæ›´ç‰©ä»¶è² è·å€æ•¸ï¼Ÿ
+ <usetemplate ignoretext="ç¢ºå®šè®Šæ›´ç‰©ä»¶è² è·å€æ•¸" name="okcancelignore" notext="å–消" yestext="確定"/>
+ </notification>
<notification name="EstateObjectReturn">
ä½ ç¢ºå®šè¦é€è¿” [USER_NAME] 所æ“有的物件？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
@@ -1510,6 +1517,9 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="OwnerCanNotBeDenied">
ç„¡æ³•æ·»åŠ é ˜åœ°æ‰€æœ‰äººåˆ°é ˜åœ°çš„ '被å°éŽ–çš„å±…æ°‘' åå–®ä¸ã€‚
</notification>
+ <notification name="ProblemAddingEstateManagerBanned">
+ 無法把被å°éŽ–çš„å±…æ°‘åŠ å…¥é ˜åœ°çš„ç®¡ç†äººå單。
+ </notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
無法變更外觀，直到æœè£èˆ‡é«”形下載完畢。
</notification>
@@ -1681,6 +1691,10 @@ SHA1 指紋：[MD5_DIGEST]
ä½ ç¢ºå®šè¦é–‹å•Ÿç¶²é ç€è¦½å™¨åŽ»å¯Ÿçœ‹é€™å€‹å…§å®¹ï¼Ÿ
<usetemplate ignoretext="啟動我的網é ç€è¦½å™¨åŽ»å¯Ÿçœ‹ç¶²é " name="okcancelignore" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="SystemUIScaleFactorChanged">
+ 系統使用者介é¢çš„尺寸å€æ•¸è‡ªå¾žä¸Šæ¬¡åŸ·è¡Œå¾Œå·²ç¶“改變。 ä½ æƒ³è¦é–‹å•Ÿä½¿ç”¨è€…介é¢å°ºå¯¸èª¿æ•´çš„è¨å®šé 嗎？
+ <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
+ </notification>
<notification name="WebLaunchJoinNow">
å‰å¾€ä½ çš„[http://secondlife.com/account/ 塗鴉牆]以進行管ç†ä½ 的帳戶？
<usetemplate ignoretext="啟動我的ç€è¦½å™¨ä»¥ç®¡ç†æˆ‘的帳戶" name="okcancelignore" notext="å–消" yestext="確定"/>
@@ -1720,10 +1734,17 @@ SHA1 指紋：[MD5_DIGEST]
是å¦è¦é›¢é–‹ç¾¤çµ„？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/>
</notification>
+ <notification name="GroupDepart">
+ ä½ å·²ç¶“é›¢é–‹ã€Œ[group_name]ã€ç¾¤çµ„。
+ </notification>
<notification name="OwnerCannotLeaveGroup">
無法離開群組。 ä½ æ˜¯æ¤ç¾¤çµ„僅å˜çš„所有人，ä¸å¾—離開群組。 請先把所有人è·éŠœæŒ‡æ´¾çµ¦å¦ä¸€äººã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="GroupDepartError">
+ 無法離開群組。
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="ConfirmKick">
ä½ ç¢ºå®šè¦è¸¢å‡ºé€™ç¶²æ ¼å…§çš„全部居民？
<usetemplate name="okcancelbuttons" notext="å–消" yestext="踢出全部居民"/>
@@ -2121,6 +2142,10 @@ SHA1 指紋：[MD5_DIGEST]
é¸æ“‡äº†å¤ªå¤šé …的幾何元件。 請至多é¸æ“‡ [MAX_PRIM_COUNT] é …å¹¾ä½•å…ƒä»¶ï¼Œå†è©¦ä¸€æ¬¡ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="TooManyScriptsSelected">
+ é¸å–的物件腳本太多。 請減少é¸å–的物件數，å†è©¦ä¸€æ¬¡ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="ProblemImportingEstateCovenant">
åŒ¯å…¥é ˜åœ°å¥‘ç´„æ™‚å‡ºå•é¡Œã€‚
<usetemplate name="okbutton" yestext="確定"/>
@@ -2288,6 +2313,10 @@ SHA1 指紋：[MD5_DIGEST]
付款失敗：找ä¸åˆ°ç‰©ä»¶ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="PaymentBlockedButtonMismatch">
+ 付款ä¸æ¢ï¼šæ‰€ä»˜åƒ¹æ ¼èˆ‡æ¤ç‰©ä»¶è¨å®šçš„任何付款按鈕皆ä¸ç›¸ç¬¦ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="OpenObjectCannotCopy">
這物件ä¸æ²’æœ‰ä»»ä½•å‡†è¨±ä½ è¤‡è£½çš„ç‰©é …ã€‚
</notification>
@@ -2323,6 +2352,12 @@ SHA1 指紋：[MD5_DIGEST]
這是一組包å«è¯çµé›†çš„巨大é¸å–é …ã€‚ ä¸€æ—¦ä½ å–消它的è¯çµï¼Œå¾ˆå¯èƒ½ä¸èƒ½å†é‡æ–°è¯çµã€‚ 為防è¬ä¸€ï¼Œå»ºè°ä½ 把è¯çµé›†è¤‡è£½åˆ°æ”¶ç´å€ã€‚
<usetemplate ignoretext="å–消è¯çµé›†è¯çµæ™‚，跟我確èª" name="okcancelignore" notext="å–消" yestext="å–消è¯çµ"/>
</notification>
+ <notification name="HelpReportAbuseConfirm">
+ è¬è¬ä½ 撥冗æå ±å•é¡Œã€‚
+æˆ‘å€‘æœƒæŸ¥æ ¸ä½ çš„èˆ‰å ±å…§å®¹æ±ºå®šæœ‰ç„¡é•è¦æƒ…事，並
+採å–é©ç•¶è¡Œå‹•ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="HelpReportAbuseSelectCategory">
è«‹é¸æ“‡é©åˆé€™æ¬¡é•è¦èˆ‰å ±çš„類別。
é¸å°é¡žåˆ¥å¯ä»¥å¹«åŠ©æˆ‘們æ¸é¡žä¸¦è™•ç†é•è¦èˆ‰å ±ã€‚
@@ -2751,6 +2786,10 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="PathfindingDirty">
這地å€çš„尋徑功能有所變更，待儲å˜ã€‚ å¦‚æžœä½ æœ‰å»ºè£½æ¬Šï¼Œä½ å¯ä»¥é»žæŒ‰ã€Œé‡æ–°ç”¢å‡ºåœ°å€ã€æŒ‰éˆ•é‡æ–°ç”¢å‡ºåœ°å€ã€‚
</notification>
+ <notification name="PathfindingDirtyRebake">
+ 這地å€çš„尋徑功能有所變更，待儲å˜ã€‚ å¦‚æžœä½ æœ‰å»ºè£½æ¬Šï¼Œä½ å¯ä»¥é»žæŒ‰ã€Œé‡æ–°ç”¢å‡ºåœ°å€ã€æŒ‰éˆ•é‡æ–°ç”¢å‡ºåœ°å€ã€‚
+ <usetemplate name="okbutton" yestext="é‡æ–°ç”¢å‡ºåœ°å€"/>
+ </notification>
<notification name="DynamicPathfindingDisabled">
這地å€ä¸¦æœªå•Ÿç”¨å‹•æ…‹å°‹å¾‘。 使用尋徑 LSL 呼å«çš„帶腳本物件，在æ¤åœ°å€å¯èƒ½ç„¡æ³•æ£å¸¸é‹ä½œã€‚
</notification>
@@ -3258,10 +3297,12 @@ SHA1 指紋：[MD5_DIGEST]
</notification>
<notification name="AppearanceToXMLFailed">
將外觀å˜ç‚ºXML失敗。
- icon="notifytip.tga"
- name="PresetNotDeleted"
- type="notifytip">
-刪除é è¨å稱[NAME]時出錯。
+ </notification>
+ <notification name="PresetNotSaved">
+ 儲å˜é è¨å稱[NAME]時出錯。
+ </notification>
+ <notification name="PresetNotDeleted">
+ 刪除é è¨å稱[NAME]時出錯。
</notification>
<notification name="UnableToFindHelpTopic">
找ä¸åˆ°é€™å€‹å…ƒä»¶çš„幫助主題。
@@ -3471,13 +3512,6 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="ForceQuitDueToLowMemory">
記憶體ä¸è¶³ï¼Œç¬¬äºŒäººç”Ÿå°‡æ–¼ 30 秒後關閉離開。
</notification>
- <notification name="PopupAttempt">
- 一個çªé¡¯å¼è¦–窗開啟時被阻擋。
- <form name="form">
- <ignore name="ignore" text="啟用全部的çªé¡¯å¼è¦–窗"/>
- <button name="open" text="é–‹å•Ÿçªé¡¯å¼è¦–窗"/>
- </form>
- </notification>
<notification name="SOCKS_NOT_PERMITTED">
SOCKS 5 代ç†ä¼ºæœå™¨ "[HOST]:[PORT]" 拒絕連通，è¦å‰‡é›†ä¸å…許。
<usetemplate name="okbutton" yestext="確定"/>
@@ -3852,6 +3886,9 @@ SHA1 指紋：[MD5_DIGEST]
無法移動 '[OBJECT_NAME]' 物件到
[REGION_NAME] 地å€çš„ [OBJ_POSITION]ï¼Œå› ç‚ºæ¤åœ°æ®µè³‡æºä¸è¶³å®¹ç´æ¤ç‰©ä»¶ã€‚
</notification>
+ <notification name="NoParcelPermsNoObject">
+ è¤‡è£½å¤±æ•—ï¼Œå› çˆ²ä½ ç„¡æ¬Šå‡ºå…¥è©²åœ°æ®µã€‚
+ </notification>
<notification name="CantMoveObjectRegionVersion">
無法移動 '[OBJECT_NAME]' 物件到
[REGION_NAME] 地å€çš„ [OBJ_POSITION]ï¼Œå› ç‚ºè©²åœ°å€æ‰€åŸ·è¡Œçš„軟體版本éŽèˆŠï¼Œä¸æ”¯æ´è·¨åœ°å€æŽ¥å—這個物件。
@@ -3867,6 +3904,10 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="NoPermModifyObject">
ä½ ç„¡æ¬Šè®Šæ›´è©²ç‰©ä»¶
</notification>
+ <notification name="TooMuchObjectInventorySelected">
+ é¸å–的物件包å«å¤ªå¤šå¤§çš„收ç´å€ã€‚ 請減少é¸å–的物件數，å†è©¦ä¸€æ¬¡ã€‚
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
<notification name="CantEnablePhysObjContributesToNav">
å°å°Žèˆªç¶²é¢æœ‰è²¢ç»çš„物件，無法啟用物ç†ã€‚
</notification>
@@ -3903,6 +3944,12 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="CantSaveModifyAttachment">
無法儲å˜åˆ°ç‰©ä»¶å…§å®¹ï¼šé€™éº¼åšå°‡ä¿®æ”¹é™„件的權é™ã€‚
</notification>
+ <notification name="AttachmentHasTooMuchInventory">
+ ä½ çš„é™„ä»¶å·²ç¶“åŒ…å«å¤ªå¤šæ”¶ç´å€å…§å®¹ï¼Œä¸èƒ½å†å¢žåŠ 。
+ </notification>
+ <notification name="IllegalAttachment">
+ 這個附件è¦æ±‚了化身上ä¸å˜åœ¨çš„點。 å› æ¤å·²å°‡è©²é™„件附著到胸部。
+ </notification>
<notification name="TooManyScripts">
腳本太多。
</notification>
@@ -3995,6 +4042,12 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="TeleportedByObjectUnknownUser">
ä½ å·²æˆåŠŸè¢«æŸæœªçŸ¥ç”¨æˆ¶æ“有的物件 '[OBJECT_NAME]' 瞬間傳é€ã€‚
</notification>
+ <notification name="StandDeniedByObject">
+ 「[OBJECT_NAME]ã€å°‡ä½¿ä½ 無法在æ¤æ™‚站立。
+ </notification>
+ <notification name="ResitDeniedByObject">
+ 「[OBJECT_NAME]ã€æ¤æ™‚無法å…è¨±ä½ æ”¹è®Šåº§ä½ã€‚
+ </notification>
<notification name="CantCreateObjectRegionFull">
無法建立è¦æ±‚的物件。 地å€å·²æ»¿è¼‰ã€‚
</notification>
@@ -4076,9 +4129,6 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="CantAttachNotEnoughScriptResources">
腳本資æºä¸è¶³ï¼Œç„¡æ³•é™„著物件ï¼
</notification>
- <notification name="IllegalAttachment">
- 這個附件è¦æ±‚了化身上ä¸å˜åœ¨çš„點。 å› æ¤å·²å°‡è©²é™„件附著到胸部。
- </notification>
<notification name="CantDropItemTrialUser">
ä½ ç„¡æ³•åœ¨æ¤å¸é™¤ç‰©ä»¶ï¼Œè«‹åˆ°ã€Œè‡ªç”±å˜—試ã€å€åŸŸå†è©¦ã€‚
</notification>
@@ -4294,6 +4344,9 @@ SHA1 指紋：[MD5_DIGEST]
<notification name="CantTransfterMoneyRegionDisabled">
æ¤åœ°å€ç›®å‰æœªå•Ÿç”¨è½‰ç§»é‡‘錢給物件的功能。
</notification>
+ <notification name="DroppedMoneyTransferRequest">
+ ç³»çµ±è² è·å¤ªé‡ï¼Œç„¡æ³•é€²è¡Œä»˜æ¬¾ã€‚
+ </notification>
<notification name="CantPayNoAgent">
無法決定付款給誰。
</notification>
@@ -4329,4 +4382,8 @@ SHA1 指紋：[MD5_DIGEST]
èŠå¤©ç´€éŒ„檔案還在處ç†å‰ä¸€å€‹å‹•ä½œã€‚ è«‹ç¨å€™å†è©¦ï¼Œæˆ–è«‹æ›ä¸€å€‹èŠå¤©å°è±¡ã€‚
<usetemplate name="okbutton" yestext="確定"/>
</notification>
+ <notification name="OutfitPhotoLoadError">
+ [REASON]
+ <usetemplate name="okbutton" yestext="確定"/>
+ </notification>
</notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index 8dd93543c00..9b9a79a509f 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
@@ -7,6 +7,7 @@
穿上所é¸æ“‡çš„物件
</panel.string>
<tab_container name="appearance_tabs">
+ <panel label="è£æ‰®é™³åˆ—" name="outfit_gallery_tab"/>
<panel label="我的è£æ‰®" name="outfitslist_tab"/>
<panel label="ç›®å‰ç©¿è‘—" name="cof_tab"/>
</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
index 693cdcdeca7..e3c62cfccf3 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Wearing">
+ <panel.string name="no_attachments">
+ 未穿著任何附件。
+ </panel.string>
+ <accordion name="wearables_accordion">
+ <accordion_tab name="tab_wearables" title="å¯ç©¿è£æ‰®"/>
+ <accordion_tab name="tab_temp_attachments" title="暫時附件"/>
+ </accordion>
<panel name="bottom_panel">
<menu_button name="options_gear_btn" tool_tip="顯示é¡å¤–é¸é …"/>
</panel>
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 b5c36668f64..4eef6249107 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -24,7 +24,7 @@
<text name="BetterText">
最佳
</text>
- <slider label="化身最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈åƒç‚º JellyDoll"/>
+ <slider label="化身最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈åƒç‚ºã€ŒJellyDollã€"/>
<text name="IndirectMaxComplexityText">
0
</text>
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 942bd27140f..bdf980218cb 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -30,6 +30,7 @@
<combo_box.item label="讓我自己手動下載並安è£" name="Install_manual"/>
</combo_box>
<check_box label="願æ„在更新時æ¶å…ˆè©¦ç”¨é‡‹å‡ºå€™é¸ç‰ˆ" name="update_willing_to_test"/>
+ <check_box label="更新後顯示發行記事" name="update_show_release_notes"/>
<text name="Proxy Settings:">
代ç†ä¼ºæœå™¨è¨å®šï¼š
</text>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index bac15c12d07..ec08c9f91e3 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -61,18 +61,34 @@
<string name="AboutDriver">
Windows 顯示驅動程å¼ç‰ˆæœ¬ï¼š[GRAPHICS_DRIVER_VERSION]
</string>
+ <string name="AboutOGL">
+ OpenGL版本：[OPENGL_VERSION]
+ </string>
+ <string name="AboutSettings">
+ 視窗大å°ï¼š[WINDOW_WIDTH]x[WINDOW_HEIGHT]
+å—體大å°èª¿æ•´ï¼š[FONT_SIZE_ADJUSTMENT]點
+使用者介é¢æ¯”例：[UI_SCALE]
+æ繪è·é›¢ï¼š[DRAW_DISTANCE]公尺
+é »å¯¬ï¼š[NET_BANDWITH]åƒä½å…ƒ/秒
+細節層次率：[LOD_FACTOR]
+呈åƒå“質：[RENDER_QUALITY] / 7
+進階照明模型：[GPU_SHADERS]
+æ質記憶體：[TEXTURE_MEMORY]MB
+VFS（快å–）建立時間：[VFS_TIME]
+ </string>
<string name="AboutLibs">
- OpenGL 版本：[OPENGL_VERSION]
-
-J2C 解碼器版本： [J2C_VERSION]
+ J2C 解碼器版本： [J2C_VERSION]
音效驅動程å¼ç‰ˆæœ¬ï¼š [AUDIO_DRIVER_VERSION]
LLCEFLib/CEF版本：[LLCEFLIB_VERSION]
-LibVLC版本: [LIBVLC_VERSION]
+LibVLC版本：[LIBVLC_VERSION]N]
語音伺æœå™¨ç‰ˆæœ¬ï¼š [VOICE_VERSION]
</string>
<string name="AboutTraffic">
å°åŒ…丟失：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</string>
+ <string name="AboutTime">
+ [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]
+ </string>
<string name="ErrorFetchingServerReleaseNotesURL">
æ“·å–伺æœå™¨ç‰ˆæœ¬èªªæ˜Ž URL 時出錯。
</string>
@@ -1082,6 +1098,9 @@ http://secondlife.com/viewer-access-faq
<string name="TeleportYourAgent">
瞬間傳é€ä½ 本人
</string>
+ <string name="ForceSitAvatar">
+ å¼·è¿«ä½ çš„åŒ–èº«å下
+ </string>
<string name="NotConnected">
未è¯æŽ¥
</string>
@@ -1930,6 +1949,27 @@ http://secondlife.com/viewer-access-faq
<string name="av_render_anyone">
ä½ æ怕ä¸èƒ½å‘ˆåƒçµ¦ä½ 周é的任何人。
</string>
+ <string name="hud_description_total">
+ ä½ çš„æ“¡é 顯示
+ </string>
+ <string name="hud_name_with_joint">
+ [OBJ_NAME]（穿戴於[JNT_NAME]）
+ </string>
+ <string name="hud_render_memory_warning">
+ [HUD_DETAILS]使用了很多æ質記憶體
+ </string>
+ <string name="hud_render_cost_warning">
+ [HUD_DETAILS]包å«å¾ˆå¤šè€—用性能的物件和æ質
+ </string>
+ <string name="hud_render_heavy_textures_warning">
+ [HUD_DETAILS] 包å«å¾ˆå¤šå¤§çš„æ質
+ </string>
+ <string name="hud_render_cramped_warning">
+ [HUD_DETAILS]包å«éŽå¤šç‰©ä»¶
+ </string>
+ <string name="hud_render_textures_warning">
+ [HUD_DETAILS]包å«å¤ªå¤šæ質
+ </string>
<string name="AgeYearsA">
[COUNT] å¹´
</string>
@@ -2089,6 +2129,9 @@ http://secondlife.com/viewer-access-faq
<string name="ObjectOutOfRange">
腳本（物件超出範åœï¼‰
</string>
+ <string name="ScriptWasDeleted">
+ 腳本（已從收ç´å€åˆªé™¤ï¼‰
+ </string>
<string name="GodToolsObjectOwnedBy">
物件 [OBJECT] 為 [OWNER] 所æ“有
</string>
@@ -2701,6 +2744,15 @@ http://secondlife.com/viewer-access-faq
<string name="Play Media">
æ’放/æš«åœåª’é«”
</string>
+ <string name="IntelDriverPage">
+ http://www.intel.com/p/en_US/support/detect/graphics
+ </string>
+ <string name="NvidiaDriverPage">
+ http://www.nvidia.com/Download/index.aspx?lang=tw
+ </string>
+ <string name="AMDDriverPage">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </string>
<string name="MBCmdLineError">
解æžå‘½ä»¤åˆ—時發ç¾éŒ¯èª¤ã€‚
è«‹åƒé–±ï¼š http://wiki.secondlife.com/wiki/Client_parameters
@@ -4476,12 +4528,18 @@ http://secondlife.com/viewer-access-faq
<string name="paid_you_ldollars">
[NAME] æ”¯ä»˜ä½ L$[AMOUNT]（[REASON]）。
</string>
+ <string name="paid_you_ldollars_gift">
+ [NAME]æ”¯ä»˜ä½ L$[AMOUNT]：（[REASON]）
+ </string>
<string name="paid_you_ldollars_no_reason">
[NAME] æ”¯ä»˜ä½ L$[AMOUNT]。
</string>
<string name="you_paid_ldollars">
ä½ æ”¯ä»˜ L$[AMOUNT] 給 [NAME]（[REASON]）。
</string>
+ <string name="you_paid_ldollars_gift">
+ ä½ æ”¯ä»˜L$[AMOUNT]給[NAME]：[REASON]
+ </string>
<string name="you_paid_ldollars_no_info">
ä½ æ”¯ä»˜äº† L$[AMOUNT]。
</string>
@@ -4494,6 +4552,9 @@ http://secondlife.com/viewer-access-faq
<string name="you_paid_failure_ldollars">
ä½ æ”¯ä»˜ L$[AMOUNT] 給 [NAME] 時出錯：[REASON]。
</string>
+ <string name="you_paid_failure_ldollars_gift">
+ ä½ æ”¯ä»˜L$[AMOUNT]給[NAME]時出錯：[REASON]
+ </string>
<string name="you_paid_failure_ldollars_no_info">
ä½ æ”¯ä»˜ L$[AMOUNT] 時出錯。
</string>
@@ -4820,6 +4881,15 @@ http://secondlife.com/viewer-access-faq
<string name="texture_load_dimensions_error">
無法載入圖åƒå¤§æ–¼ [WIDTH]*[HEIGHT]
</string>
+ <string name="outfit_photo_load_dimensions_error">
+ è£æ‰®çš„最大照片大å°æ˜¯[WIDTH]*[HEIGHT]。 請變更尺寸或使用å¦ä¸€å€‹åœ–åƒ
+ </string>
+ <string name="outfit_photo_select_dimensions_error">
+ è£æ‰®çš„最大照片大å°æ˜¯[WIDTH]*[HEIGHT]。 è«‹é¸æ“‡å¦ä¸€å€‹æ質
+ </string>
+ <string name="outfit_photo_verify_dimensions_error">
+ 無法驗è‰ç›¸ç‰‡å°ºå¯¸ã€‚ è«‹ç‰æŒ‘é¸å™¨é¡¯ç¤ºç›¸ç‰‡å°ºå¯¸å†è©¦
+ </string>
<string name="words_separator" value=","/>
<string name="server_is_down">
儘管我們努力é¿å…，還是發生æ„料外的錯誤。
@@ -5336,6 +5406,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Profile_Label">
檔案
</string>
+ <string name="Command_Report_Abuse_Label">
+ é•è¦èˆ‰å ±
+ </string>
<string name="Command_Search_Label">
æœå°‹
</string>
@@ -5426,6 +5499,9 @@ http://secondlife.com/viewer-access-faq
<string name="Command_Profile_Tooltip">
ç·¨è¼¯æˆ–å¯Ÿçœ‹ä½ çš„å°æª”案
</string>
+ <string name="Command_Report_Abuse_Tooltip">
+ é•è¦èˆ‰å ±
+ </string>
<string name="Command_Search_Tooltip">
尋找地點ã€æ´»å‹•ã€å…¶ä»–人
</string>
--
GitLab