From 1655887f30e40ea390b6dca9f64ac5e84309be05 Mon Sep 17 00:00:00 2001 From: eli <none@none> Date: Tue, 3 Jun 2014 16:27:47 -0700 Subject: [PATCH] FIX INTL-142 translations for Viewer Set40 --- .../xui/de/floater_region_restarting.xml | 23 +++++++ .../xui/de/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/de/floater_stats.xml | 44 +++++++++---- .../skins/default/xui/de/menu_avatar_icon.xml | 1 + .../skins/default/xui/de/menu_inventory.xml | 1 + .../skins/default/xui/de/menu_login.xml | 10 ++- .../xui/de/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/de/menu_viewer.xml | 18 ++--- .../skins/default/xui/de/notifications.xml | 41 ++++++++---- .../xui/de/panel_group_info_sidetray.xml | 2 +- .../default/xui/de/panel_group_roles.xml | 1 + .../default/xui/de/panel_region_debug.xml | 9 +-- .../default/xui/de/panel_region_general.xml | 2 +- .../default/xui/de/sidepanel_inventory.xml | 4 +- .../newview/skins/default/xui/de/strings.xml | 66 +++++++++++++++++-- .../xui/es/floater_region_restarting.xml | 23 +++++++ .../xui/es/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/es/floater_stats.xml | 43 ++++++++---- .../skins/default/xui/es/menu_avatar_icon.xml | 1 + .../skins/default/xui/es/menu_inventory.xml | 1 + .../skins/default/xui/es/menu_login.xml | 10 ++- .../xui/es/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/es/menu_viewer.xml | 18 ++--- .../skins/default/xui/es/notifications.xml | 43 ++++++++---- .../xui/es/panel_group_info_sidetray.xml | 2 +- .../default/xui/es/panel_group_roles.xml | 1 + .../default/xui/es/panel_region_debug.xml | 9 +-- .../default/xui/es/panel_region_general.xml | 2 +- .../default/xui/es/sidepanel_inventory.xml | 6 +- .../newview/skins/default/xui/es/strings.xml | 66 +++++++++++++++++-- .../xui/fr/floater_region_restarting.xml | 23 +++++++ .../xui/fr/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/fr/floater_stats.xml | 40 ++++++++--- .../skins/default/xui/fr/menu_avatar_icon.xml | 1 + .../skins/default/xui/fr/menu_inventory.xml | 1 + .../skins/default/xui/fr/menu_login.xml | 10 ++- .../xui/fr/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/fr/menu_viewer.xml | 18 ++--- .../skins/default/xui/fr/notifications.xml | 41 ++++++++---- .../xui/fr/panel_group_info_sidetray.xml | 2 +- .../default/xui/fr/panel_group_roles.xml | 1 + .../default/xui/fr/panel_region_debug.xml | 9 +-- .../default/xui/fr/panel_region_general.xml | 2 +- .../default/xui/fr/sidepanel_inventory.xml | 6 +- .../newview/skins/default/xui/fr/strings.xml | 66 +++++++++++++++++-- .../xui/it/floater_region_restarting.xml | 23 +++++++ .../xui/it/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/it/floater_stats.xml | 43 ++++++++---- .../skins/default/xui/it/menu_avatar_icon.xml | 1 + .../skins/default/xui/it/menu_inventory.xml | 1 + .../skins/default/xui/it/menu_login.xml | 10 ++- .../xui/it/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/it/menu_viewer.xml | 18 ++--- .../skins/default/xui/it/notifications.xml | 43 ++++++++---- .../xui/it/panel_group_info_sidetray.xml | 2 +- .../default/xui/it/panel_group_roles.xml | 1 + .../default/xui/it/panel_region_debug.xml | 9 +-- .../default/xui/it/panel_region_general.xml | 2 +- .../default/xui/it/sidepanel_inventory.xml | 2 +- .../newview/skins/default/xui/it/strings.xml | 66 +++++++++++++++++-- .../xui/ja/floater_region_restarting.xml | 23 +++++++ .../xui/ja/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/ja/floater_stats.xml | 44 +++++++++---- .../skins/default/xui/ja/menu_avatar_icon.xml | 1 + .../skins/default/xui/ja/menu_inventory.xml | 1 + .../skins/default/xui/ja/menu_login.xml | 10 ++- .../xui/ja/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/ja/menu_viewer.xml | 18 ++--- .../skins/default/xui/ja/notifications.xml | 39 +++++++---- .../xui/ja/panel_group_info_sidetray.xml | 4 +- .../default/xui/ja/panel_group_roles.xml | 1 + .../default/xui/ja/panel_region_debug.xml | 9 +-- .../default/xui/ja/panel_region_general.xml | 2 +- .../default/xui/ja/sidepanel_inventory.xml | 6 +- .../newview/skins/default/xui/ja/strings.xml | 65 ++++++++++++++++-- .../xui/pt/floater_region_restarting.xml | 23 +++++++ .../xui/pt/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/pt/floater_stats.xml | 43 ++++++++---- .../skins/default/xui/pt/menu_avatar_icon.xml | 1 + .../skins/default/xui/pt/menu_inventory.xml | 1 + .../skins/default/xui/pt/menu_login.xml | 10 ++- .../xui/pt/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/pt/menu_viewer.xml | 18 ++--- .../skins/default/xui/pt/notifications.xml | 51 +++++++++----- .../xui/pt/panel_group_info_sidetray.xml | 2 +- .../default/xui/pt/panel_group_roles.xml | 3 +- .../default/xui/pt/panel_region_debug.xml | 9 +-- .../default/xui/pt/panel_region_general.xml | 2 +- .../default/xui/pt/sidepanel_inventory.xml | 2 +- .../newview/skins/default/xui/pt/strings.xml | 66 +++++++++++++++++-- .../xui/ru/floater_region_restarting.xml | 23 +++++++ .../xui/ru/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/ru/floater_stats.xml | 40 ++++++++--- .../skins/default/xui/ru/menu_avatar_icon.xml | 1 + .../skins/default/xui/ru/menu_inventory.xml | 1 + .../skins/default/xui/ru/menu_login.xml | 10 ++- .../xui/ru/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/ru/menu_viewer.xml | 17 +++-- .../skins/default/xui/ru/notifications.xml | 37 +++++++---- .../xui/ru/panel_group_info_sidetray.xml | 2 +- .../default/xui/ru/panel_group_roles.xml | 1 + .../default/xui/ru/panel_region_debug.xml | 3 +- .../default/xui/ru/panel_region_general.xml | 2 +- .../default/xui/ru/sidepanel_inventory.xml | 8 +-- .../newview/skins/default/xui/ru/strings.xml | 66 +++++++++++++++++-- .../xui/tr/floater_region_restarting.xml | 23 +++++++ .../xui/tr/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/tr/floater_stats.xml | 44 +++++++++---- .../skins/default/xui/tr/menu_avatar_icon.xml | 1 + .../skins/default/xui/tr/menu_inventory.xml | 1 + .../skins/default/xui/tr/menu_login.xml | 10 ++- .../xui/tr/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/tr/menu_viewer.xml | 18 ++--- .../skins/default/xui/tr/notifications.xml | 39 +++++++---- .../xui/tr/panel_group_info_sidetray.xml | 2 +- .../default/xui/tr/panel_group_roles.xml | 1 + .../default/xui/tr/panel_region_debug.xml | 3 +- .../default/xui/tr/panel_region_general.xml | 2 +- .../newview/skins/default/xui/tr/strings.xml | 66 +++++++++++++++++-- .../xui/zh/floater_region_restarting.xml | 23 +++++++ .../xui/zh/floater_scene_load_stats.xml | 64 ++++++++++++++++++ .../skins/default/xui/zh/floater_stats.xml | 44 +++++++++---- .../skins/default/xui/zh/menu_avatar_icon.xml | 1 + .../skins/default/xui/zh/menu_inventory.xml | 1 + .../skins/default/xui/zh/menu_login.xml | 10 ++- .../xui/zh/menu_teleport_history_item.xml | 2 +- .../skins/default/xui/zh/menu_viewer.xml | 18 ++--- .../skins/default/xui/zh/notifications.xml | 39 +++++++---- .../xui/zh/panel_group_info_sidetray.xml | 2 +- .../default/xui/zh/panel_group_roles.xml | 1 + .../default/xui/zh/panel_region_debug.xml | 3 +- .../default/xui/zh/panel_region_general.xml | 2 +- .../default/xui/zh/sidepanel_inventory.xml | 6 +- .../newview/skins/default/xui/zh/strings.xml | 63 +++++++++++++++++- 134 files changed, 2136 insertions(+), 434 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/de/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/es/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/es/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/it/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/it/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_region_restarting.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml diff --git a/indra/newview/skins/default/xui/de/floater_region_restarting.xml b/indra/newview/skins/default/xui/de/floater_region_restarting.xml new file mode 100644 index 00000000000..890391c5084 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="REGION WIRD NEU GESTARTET"> + <string name="RegionName"> + Die Region, in der Sie sich gerade befinden ([NAME]), wird gleich neu gestartet. + +Wenn Sie in dieser Region bleiben, werden Sie abgemeldet. + </string> + <string name="RestartSeconds"> + Sekunden bis Neustart +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + Die Region, in der Sie sich gerade befinden (-längster Regionsname-), wird gleich neu gestartet. + +Wenn Sie in dieser Region bleiben, werden Sie abgemeldet. + </text> + <text name="restart_seconds"> + Sekunden bis Neustart + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml new file mode 100644 index 00000000000..dff462a5947 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="STATISTIKEN ZUM LADEN VON SZENEN"> + <button label="Anhalten" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Standard" name="basic"> + <stat_bar label="Frame-Pixel-Differenz" name="frame difference"/> + <stat_bar label="Empfangene UDP-Daten" name="bandwidth"/> + <stat_bar label="Paketverlust" name="packet_loss"/> + </stat_view> + <stat_view label="Erweitert" name="advanced"> + <stat_view label="Darstellung" name="render"> + <stat_bar label="Objektanzahl" name="objs"/> + <stat_bar label="Neue Objekte" name="newobjs"/> + <stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/> + </stat_view> + <stat_view label="Textur" name="texture"> + <stat_bar label="Cache-Trefferrate" name="texture_cache_hits"/> + <stat_bar label="Cache-Leselatenz" name="texture_cache_read_latency"/> + <stat_bar label="Anzahl" name="numimagesstat"/> + <stat_bar label="Rohanzahl" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Netzwerk" name="network"> + <stat_bar label="Paketeingang" name="packetsinstat"/> + <stat_bar label="Paketausgang" name="packetsoutstat"/> + <stat_bar label="Objekte" name="objectdatareceived"/> + <stat_bar label="Textur" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Ebenen" name="layersdatareceived"/> + <stat_bar label="Tatsächlicher Eingang" name="messagedatain"/> + <stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/> + <stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulator" name="sim"> + <stat_bar label="Objekte" name="simobjects"/> + <stat_bar label="Aktive Objekte" name="simactiveobjects"/> + <stat_bar label="Aktive Skripts" name="simactivescripts"/> + <stat_bar label="Paketeingang" name="siminpps"/> + <stat_bar label="Paketausgang" name="simoutpps"/> + <stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/> + <stat_bar label="Ausstehende Uploads" name="simpendinguploads"/> + <stat_bar label="Gesamtanzahl nicht bestätigter Bytes" name="simtotalunackedbytes"/> + <stat_view label="Zeit (ms)" name="simperf"> + <stat_bar label="Gesamt-Framezeit" name="simframemsec"/> + <stat_bar label="Nettozeit" name="simnetmsec"/> + <stat_bar label="Physikzeit" name="simsimphysicsmsec"/> + <stat_bar label="Simulationszeit" name="simsimothermsec"/> + <stat_bar label="Agentenzeit" name="simagentmsec"/> + <stat_bar label="Bilderzeit" name="simimagesmsec"/> + <stat_bar label="Skriptzeit" name="simscriptmsec"/> + <stat_bar label="Verbleib. Zeit" name="simsparemsec"/> + <stat_view label="Zeitdetails (ms)" name="timedetails"> + <stat_bar label="Physikschritt" name="simsimphysicsstepmsec"/> + <stat_bar label="Phys. Formen aktualisieren" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Physik – andere" name="simsimphysicsothermsec"/> + <stat_bar label="Schlafzeit" name="simsleepmsec"/> + <stat_bar label="Pump IO" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml index f3239f73c74..f4a9acddecf 100755 --- a/indra/newview/skins/default/xui/de/floater_stats.xml +++ b/indra/newview/skins/default/xui/de/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view" width="280"> <stat_view label="Basic" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Bandbreite" name="bandwidth"/> + <stat_bar label="Empfangene UDP-Daten" name="bandwidth"/> <stat_bar label="Paketverlust" name="packet_loss"/> <stat_bar label="Ping Sim" name="ping"/> </stat_view> <stat_view label="Erweitert" name="advanced"> <stat_view label="Darstellung" name="render"> - <stat_bar label="Pro Frame gezeichnete KTris" name="ktrisframe"/> - <stat_bar label="Pro Sek. gezeichnete KTris" name="ktrissec"/> + <stat_bar label="KTris pro Frame" name="ktrisframe"/> + <stat_bar label="KTris pro Sekunden" name="ktrissec"/> <stat_bar label="Objektanzahl" name="objs"/> <stat_bar label="Neue Objekte" name="newobjs"/> <stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/> + <stat_bar label="Durchgeführte Okklusionsabfragen" name="occlusion_queries"/> + <stat_bar label="Okkludierte Objekte" name="occluded"/> + <stat_bar label="Nicht okkludierte Objekte" name="unoccluded"/> </stat_view> <stat_view label="Textur" name="texture"> <stat_bar label="Cache-Trefferrate" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Rohsp" name="rawmemstat"/> <stat_bar label="Zugeteilter Sp" name="glboundmemstat"/> </stat_view> + <stat_view label="Speichernutzung" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="UI" name="LLView"/> + <stat_bar label="Schriftarten" name="LLFontFreetype"/> + <stat_bar label="Inventar" name="LLInventoryObject"/> + <stat_bar label="Viewer-Objekte" name="LLViewerObject"/> + <stat_bar label="Octree-Gruppendaten" name="LLViewerOctreeGroup"/> + <stat_bar label="Octree-Daten" name="LLViewerOctreeEntry"/> + <stat_bar label="Viewer-Objekt-Cache" name="LLVOCacheEntry"/> + <stat_bar label="Zeichnungsobjekte" name="LLDrawable"/> + <stat_bar label="Gesichtsdaten" name="LLFace"/> + <stat_bar label="Zeichnungsinfos" name="LLDrawInfo"/> + <stat_bar label="Texturdaten" name="LLTexture"/> + <stat_bar label="Bilddaten" name="LLImage"/> + <stat_bar label="GL-Bilddaten" name="LLImageGL"/> + <stat_bar label="Vertex-Buffer" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Netzwerk" name="network"> <stat_bar label="Paketeingang" name="packetsinstat"/> <stat_bar label="Paketausgang" name="packetsoutstat"/> - <stat_bar label="Objekte" name="objectkbitstat"/> - <stat_bar label="Textur" name="texturekbitstat"/> - <stat_bar label="Bestand" name="assetkbitstat"/> - <stat_bar label="Ebenen" name="layerskbitstat"/> - <stat_bar label="Tatsächlicher Eingang" name="actualinkbitstat"/> - <stat_bar label="Tatsächlicher Ausgang" name="actualoutkbitstat"/> + <stat_bar label="Objekte" name="objectdatareceived"/> + <stat_bar label="Textur" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Ebenen" name="layersdatareceived"/> + <stat_bar label="Tatsächlicher Eingang" name="messagedatain"/> + <stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/> <stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="Paketausgang" name="simoutpps"/> <stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/> <stat_bar label="Ausstehende Uploads" name="simpendinguploads"/> - <stat_bar label="Gesamtanzahl „Unacked" Bytes" name="simtotalunackedbytes"/> - <stat_view label="Zeit (ms)" name="simperf"> + <stat_bar label="Gesamtmenge unbestätigter Daten" name="simtotalunackedbytes"/> + <stat_view label="Zeit" name="simperf"> <stat_bar label="Gesamtzeit Frame" name="simframemsec"/> <stat_bar label="Netto-Zeit" name="simnetmsec"/> <stat_bar label="Physik-Zeit" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="Bilder-Zeit" name="simimagesmsec"/> <stat_bar label="Skript-Zeit" name="simscriptmsec"/> <stat_bar label="Verbleib. Zeit" name="simsparemsec"/> - <stat_view label="Zeitdetails (ms)" name="timedetails"> + <stat_view label="Zeitdetails" name="timedetails"> <stat_bar label="Physik-Schritt" name="simsimphysicsstepmsec"/> <stat_bar label="Phys. Formen aktualisieren" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Physik – andere" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml index c036cf5515e..ad47f1d37d5 100755 --- a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Profil anzeigen" name="Show Profile"/> <menu_item_call label="IM senden..." name="Send IM"/> + <menu_item_call label="Teleport anfordern" name="Request Teleport"/> <menu_item_call label="Freund hinzufügen..." name="Add Friend"/> <menu_item_call label="Freund entfernen..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index cd2fca313e5..d838f736f88 100755 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="Wiedergeben/Abspielen" name="Sound Play"/> <menu_item_call label="SLurl kopieren" name="url_copy"/> <menu_item_call label="Landmarken-Info" name="About Landmark"/> + <menu_item_call label="Auf Karte anzeigen" name="show_on_map"/> <menu_item_call label="Inworld abspielen" name="Animation Play"/> <menu_item_call label="Lokal abspielen" name="Animation Audition"/> <menu_item_call label="Instant Message senden" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml index 62358cc5a88..329ea20179c 100755 --- a/indra/newview/skins/default/xui/de/menu_login.xml +++ b/indra/newview/skins/default/xui/de/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="[APP_NAME] schließen" name="Quit"/> </menu> <menu label="Hilfe" name="Help"> - <menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/> + <menu_item_call label="Anweisungen..." name="How To"/> + <menu_item_call label="Kurzanleitung" name="Quickstart"/> + <menu_item_call label="Knowledge Base" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Community-Foren" name="Community Forums"/> + <menu_item_call label="Support-Portal" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/> + <menu_item_call label="Fehler melden" name="Report Bug"/> <menu_item_call label="INFO ÃœBER [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Debug-Menü anzeigen" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml index ff8fb0b1819..1d7e3059c05 100755 --- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teleportieren" name="Teleport"/> <menu_item_call label="Weitere Informationen" name="More Information"/> - <menu_item_call label="In Zwischenablage kopieren" name="CopyToClipboard"/> + <menu_item_call label="SLurl kopieren" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index be5d4891d71..8e15e128a6e 100755 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -72,11 +72,11 @@ <menu_item_check label="Menü „Erweitert“" name="Show Advanced Menu"/> </menu> <menu label="Sonne" name="Sun"> - <menu_item_call label="Sonnenaufgang" name="Sunrise"/> - <menu_item_call label="Mittag" name="Noon"/> - <menu_item_call label="Sonnenuntergang" name="Sunset"/> - <menu_item_call label="Mitternacht" name="Midnight"/> - <menu_item_call label="Regionseinstellungen verwenden" name="Use Region Settings"/> + <menu_item_check label="Sonnenaufgang" name="Sunrise"/> + <menu_item_check label="Mittag" name="Noon"/> + <menu_item_check label="Sonnenuntergang" name="Sunset"/> + <menu_item_check label="Mitternacht" name="Midnight"/> + <menu_item_check label="Regionseinstellungen verwenden" name="Use Region Settings"/> </menu> <menu label="Umwelt-Editor" name="Environment Editor"> <menu_item_call label="Umwelt-Einstellungen..." name="Environment Settings"/> @@ -165,8 +165,6 @@ </menu> <menu label="Hilfe" name="Help"> <menu_item_call label="Anweisungen..." name="How To"/> - <menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/> - <menu_item_call label="Benutzerhandbuch" name="User’s guide"/> <menu_item_call label="Knowledge Base" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Community-Foren" name="Community Forums"/> @@ -188,6 +186,7 @@ <menu label="Performance Tools" name="Performance Tools"> <menu_item_call label="Lag-Anzeige" name="Lag Meter"/> <menu_item_check label="Statistikleiste" name="Statistics Bar"/> + <menu_item_call label="Statistiken zum Laden von Szenen" name="Scene Load Statistics"/> <menu_item_check label="Zuggewicht für Avatare anzeigen" name="Avatar Rendering Cost"/> </menu> <menu label="Hervorhebung und Sichtbarkeit" name="Highlighting and Visibility"> @@ -250,6 +249,7 @@ <menu_item_check label="Schnelle Timer" name="Fast Timers"/> <menu_item_check label="Speicher" name="Memory"/> <menu_item_check label="Szenestatistiken" name="Scene Statistics"/> + <menu_item_check label="Monitor zum Laden von Szenen" name="Scene Loading Monitor"/> <menu_item_call label="Debug-Konsole für Texturabruffehler" name="Texture Fetch Debug Console"/> <menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/> <menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/> @@ -286,6 +286,7 @@ <menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/> <menu_item_check label="Frame-Test" name="Frame Test"/> <menu_item_call label="Rahmenprofil" name="Frame Profile"/> + <menu_item_call label="Benchmark" name="Benchmark"/> </menu> <menu label="Metadaten darstellen" name="Render Metadata"> <menu_item_check label="Bonding Boxes" name="Bounding Boxes"/> @@ -304,6 +305,7 @@ <menu_item_check label="Konstruktionswarteschlange" name="Build Queue"/> <menu_item_check label="Lichter" name="Lights"/> <menu_item_check label="Gelenkpunkte" name="Collision Skeleton"/> + <menu_item_check label="Gelenke" name="Joints"/> <menu_item_check label="Raycast" name="Raycast"/> <menu_item_check label="Windvektoren" name="Wind Vectors"/> <menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/> @@ -336,6 +338,7 @@ <menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/> <menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/> <menu_item_check label="Leucht-Objekte schweben lassen" name="Hover Glow Objects"/> + <menu_item_call label="Cache sofort leeren" name="Cache Clear"/> </menu> <menu label="Netzwerk" name="Network"> <menu_item_check label="Agent pausieren" name="AgentPause"/> @@ -368,7 +371,6 @@ <menu_item_call label="Fokus ausgeben" name="Dump Focus Holder"/> <menu_item_call label="Ausgewählte Objektinfo drucken" name="Print Selected Object Info"/> <menu_item_call label="Agent-Info drucken" name="Print Agent Info"/> - <menu_item_check label="Regions-Debug-Konsole" name="Region Debug Console"/> <menu_item_check label="Fehler in SelectMgr beseitigen" name="Debug SelectMgr"/> <menu_item_check label="Fehler in Klicks beseitigen" name="Debug Clicks"/> <menu_item_check label="Debug-Ansichten" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index b3ae98f6333..c728402e898 100755 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -114,13 +114,13 @@ Weitere Informationen finden Sie im [[MARKETPLACE_IMPORTS_URL] Fehlerprotokoll]. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Ãœbertragung fehlgeschlagen + Ãœbertragung fehlgeschlagen mit Fehler „[ERROR_CODE]“ Aufgrund eines System- oder Netzwerkfehlers wurden keine Ordner an den Marktplatz übertragen. Versuchen Sie es später erneut. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Marktplatzinitialisierung fehlgeschlagen + Marktplatzinitialisierung fehlgeschlagen mit Fehler „[ERROR_CODE]“ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschlagen. Versuchen Sie es später erneut. <usetemplate name="okbutton" yestext="OK"/> @@ -1744,6 +1744,10 @@ womit Sie die Höchstgrenze von [LIMIT] überschreiten. Sind Sie sicher, dass Sie zu <nolink>[LOCATION]</nolink> teleportieren möchten? <usetemplate ignoretext="Bestätigen, dass ich zu einer Landmarke teleportieren möchte" name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/> </notification> + <notification name="TeleportViaSLAPP"> + Möchten Sie wirklich zu <nolink>[LOCATION]</nolink> teleportieren? + <usetemplate ignoretext="Bestätigen, dass ich via SLAPP teleportieren möchte" name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/> + </notification> <notification name="TeleportToPick"> Nach [PICK] teleportieren? <usetemplate ignoretext="Bestätigen, dass ich zu einer Position in Auswahl teleportieren möchte" name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/> @@ -1954,6 +1958,9 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas <notification name="ProblemAddingEstateManager"> Es gibt Probleme beim Hinzufügen eines neuen Grundbesitzverwalters. Bei mindestens einem Grundbesitz ist die Verwalterliste voll. </notification> + <notification name="ProblemAddingEstateBanManager"> + Grundbesitzer oder Grundstücksverwalter kann nicht auf die Bannliste gesetzt werden. + </notification> <notification name="ProblemAddingEstateGeneric"> Problem beim Hinzufügen zu dieser Grundbesitzliste. Bei mindestens einem Grundbesitz ist die Liste voll. </notification> @@ -3038,13 +3045,13 @@ Details finden Sie in der Protokolldatei. Regionsfähigkeit „[CAPABILITY]“ konnte nicht abgerufen werden. </notification> <notification name="ShareItemsConfirmation"> - Möchten Sie wirklich die folgenden Objekte: + Möchten Sie wirklich die folgenden Artikel: <nolink>[ITEMS]</nolink> -für folgende Einwohner freigeben: +mit den folgenden Einwohnern teilen: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3056,7 +3063,7 @@ Möchten Sie wirklich die folgenden Artikel: mit den folgenden Einwohnern teilen: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ItemsShared"> @@ -3510,10 +3517,6 @@ Warten Sie kurz und versuchen Sie es noch einmal. <notification name="EjectComingSoon"> Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen. </notification> - <notification name="NoEnterServerFull"> - Sie können diese Region nicht betreten, da -der Server voll ist. - </notification> <notification name="SaveBackToInvDisabled"> Erneutes Speichern im Inventar ist deaktiviert. </notification> @@ -3703,6 +3706,9 @@ der Server voll ist. <notification name="LinkFailedTooMuchPhysics"> Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + Das Objekt „[OBJECT_NAME]“ auf [SLURL] kann Grundstücksverwalter nicht nach Hause teleportieren. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert </notification> @@ -3893,13 +3899,18 @@ der Server voll ist. Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus. + Land kann nicht geteilt werden. +Mehr als eine Parzelle ist ausgewählt. +Wählen Sie eine kleinere Landfläche aus. </notification> <notification name="CantDivideLandCantFindParcel"> - Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -> „Fehler melden“... + Land kann nicht geteilt werden. +Parzelle kann nicht gefunden werden. +Bitte melden Sie den Fehler über „Hilfe“ -> „Fehler melden“. </notification> <notification name="CantDivideLandWholeParcelSelected"> - Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus. + Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt. +Wählen Sie eine kleinere Landfläche aus. </notification> <notification name="LandHasBeenDivided"> Land wurde geteilt. @@ -4039,4 +4050,8 @@ der Server voll ist. Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt. <usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml index bf4d44af526..1775394ecd7 100755 --- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Allgemein"/> - <accordion_tab name="group_roles_tab" title="Rollen"/> + <accordion_tab name="group_roles_tab" title="Rollen und Mitglieder"/> <accordion_tab name="group_notices_tab" title="Mitteilungen"/> <accordion_tab name="group_land_tab" title="Land/Kapital"/> </accordion> diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index f297d32a91c..20f61817a3c 100755 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml @@ -21,6 +21,7 @@ um mehrere Mitglieder auszuwählen. <name_list.columns label="Mitglied" name="name" relative_width="0.30"/> <name_list.columns label="Ãœbereignung" name="donated" relative_width="0.33"/> <name_list.columns label="Status" name="online"/> + <name_list.columns label="Titel" name="title"/> </name_list> <button label="Einladen" name="member_invite"/> <button label="Hinauswerfen" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml index a03a0b8b7b4..d4b0ed907e5 100755 --- a/indra/newview/skins/default/xui/de/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml @@ -7,11 +7,8 @@ unbekannt </text> <check_box label="Skripts deaktivieren" name="disable_scripts_check" tool_tip="Skripts in dieser Region deaktivieren"/> - <button label="?" name="disable_scripts_help"/> <check_box label="Kollisionen deaktivieren" name="disable_collisions_check" tool_tip="Nicht-Avatar-Kollisionen in dieser Region deaktivieren"/> - <button label="?" name="disable_collisions_help"/> <check_box label="Physik deaktivieren" name="disable_physics_check" tool_tip="Physik in dieser Region deaktivieren"/> - <button label="?" name="disable_physics_help"/> <button label="Ãœbernehmen" name="apply_btn"/> <text name="objret_text_lbl" width="110"> Objekt zurückgeben @@ -31,10 +28,8 @@ <check_box label="In jeder Region auf diesem Grundbesitz" name="return_estate_wide" tool_tip="Es werden die Objekte in allen Regionen dieses Grundbesitzes zurückgegeben"/> <button label="Zurückgeben" name="return_btn" width="90"/> <button label="Top-Kollisionsobjekte..." name="top_colliders_btn" tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen"/> - <button label="?" name="top_colliders_help"/> - <button label="Top-Skripts..." name="top_scripts_btn" tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um Skripts auszuführen."/> - <button label="?" name="top_scripts_help"/> <button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/> - <button label="?" name="restart_help"/> + <button label="Top-Skripts..." name="top_scripts_btn" tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um Skripts auszuführen."/> <button label="Neustart abbrechen" name="cancel_restart_btn" tool_tip="Regionsneustart abbrechen"/> + <button label="Regions-Debug-Konsole" name="region_debug_console_btn" tool_tip="Regions-Debug-Konsole öffnen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml index f383be992b9..6324e900291 100755 --- a/indra/newview/skins/default/xui/de/panel_region_general.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Terraformen blockieren" name="block_terraform_check"/> <check_box label="Fliegen blockieren" name="block_fly_check"/> + <check_box label="Ãœberfliegen von Parzellen blockieren" name="block_fly_over_check" tool_tip="Zugangsprüfungen nach oben ausdehnen, um Ãœberfliegen einer Parzelle zu verhindern"/> <check_box label="Schaden zulassen" name="allow_damage_check"/> <check_box label="Stoßen beschränken" name="restrict_pushobject"/> <check_box label="Landwiederverkauf zulassen" name="allow_land_resell_check"/> <check_box label="Landumverteilung zulassen" name="allow_parcel_changes_check"/> <check_box label="Landanzeige in Suche blockieren" name="block_parcel_search_check" tool_tip="Diese Region und ihre Parzellen in Suchergebnissen anzeigen"/> - <check_box label="Netzobjekte zulassen" name="mesh_rez_enabled_check" tool_tip="Anderen das Rezzen von Netzobjekten in dieser Region gestatten"/> <spinner label="Avatar-Limit" name="agent_limit_spin"/> <spinner label="Objektbonus" name="object_bonus_spin"/> <text label="Inhaltseinstufung" name="access_text"> diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index 2585c5dc90c..94c3c752540 100755 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml @@ -28,12 +28,12 @@ <button label="Profil" name="info_btn" tool_tip="Objektprofil anzeigen"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/> + <button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/> </layout_panel> <layout_panel name="shop_btn_lp"> <button label="Einkaufen" name="shop_btn" tool_tip="Marktplatz-Webseite öffnen"/> <button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/> - <button label="Wiedergeben" name="play_btn"/> + <button label="Spielen" name="play_btn"/> <button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 082febd7096..95657ba14e2 100755 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -37,6 +37,45 @@ <string name="StartupRequireDriverUpdate"> Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber. </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + Kompiliert mit [COMPILER], Version [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU: [CPU] +Speicher: [MEMORY_MB] MB +Betriebssystemversion: [OS_VERSION] +Grafikkartenhersteller: [GRAPHICS_CARD_VENDOR] +Grafikkarte: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Windows-Grafiktreiberversion: [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + OpenGL-Version: [OPENGL_VERSION] + +libcurl-Version: [LIBCURL_VERSION] +J2C-Decoderversion: [J2C_VERSION] +Audiotreiberversion: [AUDIO_DRIVER_VERSION] +Qt-Webkit-Version: [QT_WEBKIT_VERSION] +Voice-Server-Version: [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + Paketverlust: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1] %) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + Fehler beim Abrufen der URL für die Server-Versionshinweise. + </string> <string name="ProgressRestoring"> Wird wiederhergestellt... </string> @@ -937,15 +976,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="ControlYourCamera"> Kamerasteuerung </string> + <string name="TeleportYourAgent"> + Sie teleportieren + </string> <string name="NotConnected"> Nicht verbunden </string> <string name="AgentNameSubst"> (Sie) </string> - <string name="TeleportYourAgent"> - Sie teleportieren - </string> <string name="JoinAnExperience"> Bei einem Erlebnis mitmachen </string> @@ -1267,8 +1306,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="InventoryNoTexture"> Sie haben keine Kopie dieser Textur in Ihrem Inventar. </string> - <string name="Unconstrained">keines</string> - <string name="InventoryInboxNoItems"> + <string name="InventoryInboxNoItems"> Einkäufe aus dem Marktplatz erscheinen hier. Sie können diese dann zur Verwendung in Ihr Inventar ziehen. </string> <string name="MarketplaceURL"> @@ -1300,6 +1338,18 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="InventoryOutboxNoItems"> Ziehen Sie Ordner in dien Bereich und klicken Sie auf „In Marktplatz übertragen“, um sie im [[MARKETPLACE_DASHBOARD_URL] Marktplatz] zum Verkauf anzubieten. </string> + <string name="InventoryOutboxInitializingTitle"> + Marktplatz wird initialisiert. + </string> + <string name="InventoryOutboxInitializing"> + Wir greifen auf Ihr Konto im [[MARKETPLACE_CREATE_STORE_URL] Marktplatz-Laden] zu. + </string> + <string name="InventoryOutboxErrorTitle"> + Marktplatzfehler. + </string> + <string name="InventoryOutboxError"> + Der [[MARKETPLACE_CREATE_STORE_URL] Marktplatz-Laden] gibt Fehler zurück. + </string> <string name="Marketplace Error None"> Keine Fehler </string> @@ -1327,6 +1377,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="Open landmarks"> Landmarken öffnen </string> + <string name="Unconstrained"> + Variabel + </string> <string name="no_transfer" value=" (kein Transferieren)"/> <string name="no_modify" value=" (kein Bearbeiten)"/> <string name="no_copy" value=" (kein Kopieren)"/> @@ -1727,6 +1780,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="CompileQueueDownloadedCompiling"> Heruntergeladen, wird kompiliert </string> + <string name="CompileQueueServiceUnavailable"> + Kein Skriptkompilierungsdienst verfügbar + </string> <string name="CompileQueueScriptNotFound"> Skript wurde auf Server nicht gefunden. </string> diff --git a/indra/newview/skins/default/xui/es/floater_region_restarting.xml b/indra/newview/skins/default/xui/es/floater_region_restarting.xml new file mode 100644 index 00000000000..d55c8eff175 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="REGIÓN REINICIANDO"> + <string name="RegionName"> + La región en la que te encuentras ([NAME]) se va a reiniciar. + +Si permaneces en esta región serás desconectado. + </string> + <string name="RestartSeconds"> + Segundos hasta el reinicio +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + La región en la que te encuentras (-el nombre de región más largo-) se va a reiniciar. + +Si permaneces en esta región serás desconectado. + </text> + <text name="restart_seconds"> + Segundos hasta el reinicio + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml new file mode 100644 index 00000000000..f625d5257c1 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="ESTADÃSTICAS DE CARGA DE ESCENA"> + <button label="Pausa" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Básica" name="basic"> + <stat_bar label="Diferencia de pÃxeles de fotograma" name="frame difference"/> + <stat_bar label="Datos de UDP recibidos" name="bandwidth"/> + <stat_bar label="Pérdida de paquetes" name="packet_loss"/> + </stat_view> + <stat_view label="Avanzado" name="advanced"> + <stat_view label="Renderización" name="render"> + <stat_bar label="Objetos en total" name="objs"/> + <stat_bar label="Objetos nuevos" name="newobjs"/> + <stat_bar label="Ãndice de aciertos de caché de objetos" name="object_cache_hits"/> + </stat_view> + <stat_view label="Textura" name="texture"> + <stat_bar label="Ãndice de aciertos de caché" name="texture_cache_hits"/> + <stat_bar label="Latencia de lectura de caché" name="texture_cache_read_latency"/> + <stat_bar label="Número" name="numimagesstat"/> + <stat_bar label="Raw: número" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Red" name="network"> + <stat_bar label="Paquetes salientes" name="packetsinstat"/> + <stat_bar label="Paquetes entrantes" name="packetsoutstat"/> + <stat_bar label="Objetos" name="objectdatareceived"/> + <stat_bar label="Textura" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Capas" name="layersdatareceived"/> + <stat_bar label="Entrando ahora" name="messagedatain"/> + <stat_bar label="Saliendo ahora" name="messagedataout"/> + <stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulador" name="sim"> + <stat_bar label="Objetos" name="simobjects"/> + <stat_bar label="Objetos activos" name="simactiveobjects"/> + <stat_bar label="Scripts activos" name="simactivescripts"/> + <stat_bar label="Paquetes salientes" name="siminpps"/> + <stat_bar label="Paquetes entrantes" name="simoutpps"/> + <stat_bar label="Descargas pendientes" name="simpendingdownloads"/> + <stat_bar label="Subidas pendientes" name="simpendinguploads"/> + <stat_bar label="Total de bytes no reconocidos" name="simtotalunackedbytes"/> + <stat_view label="Tiempo (ms)" name="simperf"> + <stat_bar label="Tiempo total de los frames" name="simframemsec"/> + <stat_bar label="Tiempo de red" name="simnetmsec"/> + <stat_bar label="Physics Time" name="simsimphysicsmsec"/> + <stat_bar label="Tiempo de la simulación" name="simsimothermsec"/> + <stat_bar label="Tiempo de los agentes" name="simagentmsec"/> + <stat_bar label="Tiempo de las imágenes" name="simimagesmsec"/> + <stat_bar label="Tiempo de los scripts" name="simscriptmsec"/> + <stat_bar label="Tiempo libre" name="simsparemsec"/> + <stat_view label="Datos de tiempo (ms)" name="timedetails"> + <stat_bar label="Paso de fÃsica" name="simsimphysicsstepmsec"/> + <stat_bar label="Actualizar formas fÃsicas" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Otros (FÃsica)" name="simsimphysicsothermsec"/> + <stat_bar label="Tiempo de suspensión" name="simsleepmsec"/> + <stat_bar label="Bombea E/S" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml index 00601920f2c..7ecf5fafae2 100755 --- a/indra/newview/skins/default/xui/es/floater_stats.xml +++ b/indra/newview/skins/default/xui/es/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="Básico" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Ancho de banda" name="bandwidth"/> + <stat_bar label="Datos de UDP recibidos" name="bandwidth"/> <stat_bar label="Pérdida de paquetes" name="packet_loss"/> <stat_bar label="Ping del Sim" name="ping"/> </stat_view> <stat_view label="Avanzado" name="advanced"> <stat_view label="Renderización" name="render"> - <stat_bar label="KTris generados por fotograma" name="ktrisframe"/> - <stat_bar label="KTris generados por segundo" name="ktrissec"/> + <stat_bar label="KTris por fotograma" name="ktrisframe"/> + <stat_bar label="KTris por segundo" name="ktrissec"/> <stat_bar label="Objetos en total" name="objs"/> <stat_bar label="Objetos nuevos" name="newobjs"/> <stat_bar label="Ãndice de aciertos de caché de objetos" name="object_cache_hits"/> + <stat_bar label="Consultas de oclusión realizadas" name="occlusion_queries"/> + <stat_bar label="Objetos ocluidos" name="occluded"/> + <stat_bar label="Objeto no ocluido" name="unoccluded"/> </stat_view> <stat_view label="Textura" name="texture"> <stat_bar label="Ãndice de aciertos de caché" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Raw Mem" name="rawmemstat"/> <stat_bar label="Bound Mem" name="glboundmemstat"/> </stat_view> + <stat_view label="Memoria utilizada" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="UI" name="LLView"/> + <stat_bar label="Fuentes" name="LLFontFreetype"/> + <stat_bar label="Inventario" name="LLInventoryObject"/> + <stat_bar label="Objetos del visor" name="LLViewerObject"/> + <stat_bar label="Datos de grupo de árbol octal" name="LLViewerOctreeGroup"/> + <stat_bar label="Datos de árbol octal" name="LLViewerOctreeEntry"/> + <stat_bar label="Caché de objetos del visor" name="LLVOCacheEntry"/> + <stat_bar label="Objetos dibujables" name="LLDrawable"/> + <stat_bar label="Datos de cara" name="LLFace"/> + <stat_bar label="Información de dibujo" name="LLDrawInfo"/> + <stat_bar label="Datos de textura" name="LLTexture"/> + <stat_bar label="Datos de imagen" name="LLImage"/> + <stat_bar label="Datos de imagen GL" name="LLImageGL"/> + <stat_bar label="Memorias intermedias de vértice" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Red" name="network"> <stat_bar label="Paquetes salientes" name="packetsinstat"/> <stat_bar label="Paquetes entrantes" name="packetsoutstat"/> - <stat_bar label="Objetos" name="objectkbitstat"/> - <stat_bar label="Textura" name="texturekbitstat"/> - <stat_bar label="Asset" name="assetkbitstat"/> - <stat_bar label="Capas" name="layerskbitstat"/> - <stat_bar label="Entrando ahora" name="actualinkbitstat"/> - <stat_bar label="Saliendo ahora" name="actualoutkbitstat"/> + <stat_bar label="Objetos" name="objectdatareceived"/> + <stat_bar label="Textura" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Capas" name="layersdatareceived"/> + <stat_bar label="Entrando ahora" name="messagedatain"/> + <stat_bar label="Saliendo ahora" name="messagedataout"/> <stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -53,7 +73,8 @@ <stat_bar label="Pasos de silueta omitidos" name="simsimskippedsilhouettesteps"/> <stat_bar label="Personajes actualizados" name="simsimpctsteppedcharacters"/> </stat_view> - <stat_view label="Tiempo (ms)" name="simperf"> + <stat_bar label="Total de datos no reconocidos" name="simtotalunackedbytes"/> + <stat_view label="Tiempo" name="simperf"> <stat_bar label="Tiempo total de los frames" name="simframemsec"/> <stat_bar label="Tiempo de red" name="simnetmsec"/> <stat_bar label="Physics Time" name="simsimphysicsmsec"/> @@ -62,7 +83,7 @@ <stat_bar label="Tiempo de las imágenes" name="simimagesmsec"/> <stat_bar label="Tiempo de los scripts" name="simscriptmsec"/> <stat_bar label="Tiempo libre" name="simsparemsec"/> - <stat_view label="Datos de tiempo (ms)" name="timedetails"> + <stat_view label="Detalles de tiempo" name="timedetails"> <stat_bar label="Paso de fÃsica" name="simsimphysicsstepmsec"/> <stat_bar label="Actualizar formas fÃsicas" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Otros (FÃsica)" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml index fe7331a1083..e3299b0a6b5 100755 --- a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Ver el perfil" name="Show Profile"/> <menu_item_call label="Enviar un MI..." name="Send IM"/> + <menu_item_call label="Petición de teleporte" name="Request Teleport"/> <menu_item_call label="Añadir como amigo..." name="Add Friend"/> <menu_item_call label="Quitar de los amigos..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index 803d3f1331a..cd5bc7917de 100755 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -69,6 +69,7 @@ <menu_item_call label="Escuchar" name="Sound Play"/> <menu_item_call label="Copiar la SLurl" name="url_copy"/> <menu_item_call label="Acerca del hito" name="About Landmark"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> <menu_item_call label="Escuchar en el mundo" name="Animation Play"/> <menu_item_call label="Ejecutarla para usted" name="Animation Audition"/> <menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml index 2286d0527a5..336572f0cb4 100755 --- a/indra/newview/skins/default/xui/es/menu_login.xml +++ b/indra/newview/skins/default/xui/es/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="Salir de [APP_NAME]" name="Quit"/> </menu> <menu label="Ayuda" name="Help"> - <menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Cómo..." name="How To"/> + <menu_item_call label="GuÃa rápida" name="Quickstart"/> + <menu_item_call label="Base de Conocimientos" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Foros comunitarios" name="Community Forums"/> + <menu_item_call label="Portal de soporte" name="Support portal"/> + <menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/> + <menu_item_call label="Informar de un fallo" name="Report Bug"/> <menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Mostrar el menú 'Debug'" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml index c482907812c..1ff555b7272 100755 --- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teleportar" name="Teleport"/> <menu_item_call label="Más información" name="More Information"/> - <menu_item_call label="Copiar al portapapeles" name="CopyToClipboard"/> + <menu_item_call label="Copiar la SLurl" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index e4fe871683b..d5208f3d8f3 100755 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -71,11 +71,11 @@ <menu_item_check label="Menú Avanzado" name="Show Advanced Menu"/> </menu> <menu label="Sol" name="Sun"> - <menu_item_call label="Amanecer" name="Sunrise"/> - <menu_item_call label="MediodÃa" name="Noon"/> - <menu_item_call label="Atardecer" name="Sunset"/> - <menu_item_call label="Medianoche" name="Midnight"/> - <menu_item_call label="Usar configuración de región" name="Use Region Settings"/> + <menu_item_check label="Amanecer" name="Sunrise"/> + <menu_item_check label="MediodÃa" name="Noon"/> + <menu_item_check label="Atardecer" name="Sunset"/> + <menu_item_check label="Medianoche" name="Midnight"/> + <menu_item_check label="Usar configuración de región" name="Use Region Settings"/> </menu> <menu label="Editor de entorno" name="Environment Editor"> <menu_item_call label="Configuración del entorno..." name="Environment Settings"/> @@ -164,8 +164,6 @@ </menu> <menu label="Ayuda" name="Help"> <menu_item_call label="Cómo..." name="How To"/> - <menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="GuÃa del usuario" name="User’s guide"/> <menu_item_call label="Base de Conocimientos" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Foros comunitarios" name="Community Forums"/> @@ -187,6 +185,7 @@ <menu label="Herramientas de rendimiento" name="Performance Tools"> <menu_item_call label="Medidor de lag" name="Lag Meter"/> <menu_item_check label="EstadÃsticas" name="Statistics Bar"/> + <menu_item_call label="EstadÃsticas de carga de escenas" name="Scene Load Statistics"/> <menu_item_check label="Mostrar el peso del dibujo de los avatares" name="Avatar Rendering Cost"/> </menu> <menu label="Realzado y Visibilidad" name="Highlighting and Visibility"> @@ -248,6 +247,7 @@ <menu_item_check label="Fast Timers" name="Fast Timers"/> <menu_item_check label="Memory" name="Memory"/> <menu_item_check label="Datos de la escena" name="Scene Statistics"/> + <menu_item_check label="Monitor de carga de escenas" name="Scene Loading Monitor"/> <menu_item_call label="Consola de depuración de obtención de texturas" name="Texture Fetch Debug Console"/> <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/> <menu_item_check label="Camera" name="Camera"/> @@ -279,6 +279,7 @@ <menu_item_check label="Randomize Framerate" name="Randomize Framerate"/> <menu_item_check label="Frame Test" name="Frame Test"/> <menu_item_call label="Perfil del fotograma" name="Frame Profile"/> + <menu_item_call label="Criterio de referencia" name="Benchmark"/> </menu> <menu label="Render Metadata" name="Render Metadata"> <menu_item_check label="Normales" name="Normals"/> @@ -286,6 +287,7 @@ <menu_item_check label="Actualizar el tipo" name="Update Type"/> <menu_item_check label="Información sobre el nivel de detalle" name="LOD Info"/> <menu_item_check label="Crear cola" name="Build Queue"/> + <menu_item_check label="Articulaciones" name="Joints"/> <menu_item_check label="Vectores de viento" name="Wind Vectors"/> <menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/> <menu_item_check label="Bytes de adjunto" name="attachment bytes"/> @@ -311,6 +313,7 @@ <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> + <menu_item_call label="Limpiar caché inmediatamente" name="Cache Clear"/> </menu> <menu label="Red" name="Network"> <menu_item_check label="Pause Avatar" name="AgentPause"/> @@ -326,7 +329,6 @@ <menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/> <menu_item_call label="Navegador de contenido web" name="Web Content Browser"/> <menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/> - <menu_item_check label="Consola de depuración de región" name="Region Debug Console"/> <menu_item_check label="Debug Clicks" name="Debug Clicks"/> <menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/> </menu> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index d4451ad2510..ae421cdfd02 100755 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -114,15 +114,15 @@ Puedes consultar más información en el [[MARKETPLACE_IMPORTS_URL] registro de <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Error de transferencia + Error de la transferencia: '[ERROR_CODE]' -No se han enviado carpetas al Mercado a causa de un error del sistema o de la red. Vuelve a intentarlo más tarde. +No se han enviado carpetas al Mercado a causa de un error del sistema o de la red. Vuelve a intentarlo más tarde. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Error al inicializar el mercado + Error de inicialización del Mercado: '[ERROR_CODE]' -La inicialización del mercado ha fallado por un error del sistema o de la red. Vuelve a intentarlo más tarde. +La inicialización del mercado ha fallado por un error del sistema o de la red. Vuelve a intentarlo más tarde. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CompileQueueSaveText"> @@ -1739,6 +1739,10 @@ excediendo el lÃmite de [LIMIT]. ¿Seguro que quieres teleportarte a <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Confirmar que quiero teleportarme a un hito" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> </notification> + <notification name="TeleportViaSLAPP"> + ¿Seguro que quieres teleportarte a <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Confirmar el teleporte mediante SLAPP" name="okcancelignore" notext="Cancelar" yestext="Teleportarte"/> + </notification> <notification name="TeleportToPick"> ¿Teleportarte a [PICK]? <usetemplate ignoretext="Confirmar el teleporte a una localización de los Destacados" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> @@ -1949,6 +1953,9 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se <notification name="ProblemAddingEstateManager"> Hay problemas al añadir un administrador nuevo del estado. Uno o más estados deben de tener llena la lista de administradores. </notification> + <notification name="ProblemAddingEstateBanManager"> + No se puede añadir el administrador o propietario de un estado a la lista de expulsados. + </notification> <notification name="ProblemAddingEstateGeneric"> Hay problemas al añadir a la lista del estado. Uno o más estados deben de tener llena la lista. </notification> @@ -3028,9 +3035,9 @@ Consulta los detalles en el archivo de registro. <nolink>[ITEMS]</nolink> -Con los siguientes residentes: +Con los siguientes Residentes: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3042,7 +3049,7 @@ Con los siguientes residentes: Con los siguientes Residentes: -[RESIDENTS] +<nolink>[RESIDENTES]</nolink> <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> </notification> <notification name="ItemsShared"> @@ -3495,10 +3502,6 @@ Prueba otra vez dentro de un minuto. <notification name="EjectComingSoon"> Te han expulsado de aquà y tienes [EJECT_TIME] segundos para salir. </notification> - <notification name="NoEnterServerFull"> - No puedes entrar en esta región porque -el servidor está lleno. - </notification> <notification name="SaveBackToInvDisabled"> Se ha deshabilitado Devolver el objeto a mi inventario. </notification> @@ -3688,6 +3691,9 @@ el servidor está lleno. <notification name="LinkFailedTooMuchPhysics"> El objeto utiliza una cantidad excesiva de recursos de fÃsica; se ha desactivado su dinámica. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + El objeto '[OBJECT_NAME]' de [SLURL] no puede teleportar a los administradores del estado a la base. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Has sido teleportado al origen por el objeto '[OBJECT_NAME]' de la parcela '[PARCEL_NAME]' </notification> @@ -3878,13 +3884,18 @@ el servidor está lleno. La selección no contiene suficientes parcelas alquiladas para unirlas. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño. + No se puede dividir el terreno. +Hay varias parcelas seleccionadas. +Prueba a seleccionar un terreno más pequeño. </notification> <notification name="CantDivideLandCantFindParcel"> - No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvÃsanos con Ayuda -> Notificar fallo... + No se puede dividir el terreno. +No se encuentra la parcela. +NotifÃcalo con Ayuda -> Informar de un fallo... </notification> <notification name="CantDivideLandWholeParcelSelected"> - No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño. + No se puede dividir el terreno. Esta seleccionada una parcela completa. +Prueba a seleccionar un terreno más pequeño. </notification> <notification name="LandHasBeenDivided"> El terreno se ha dividido. @@ -4024,4 +4035,8 @@ el servidor está lleno. No se pueden mover los archivos. Ruta anterior restaurada. <usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml index 09c4eec4d92..18eaa834da8 100755 --- a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="General"/> - <accordion_tab name="group_roles_tab" title="Roles"/> + <accordion_tab name="group_roles_tab" title="Miembros y Roles"/> <accordion_tab name="group_notices_tab" title="Avisos"/> <accordion_tab name="group_land_tab" title="Terreno/Bienes"/> </accordion> diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 390b4e2e9d4..ced40cca434 100755 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml @@ -20,6 +20,7 @@ Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada u <name_list.columns label="Miembro" name="name"/> <name_list.columns label="Donaciones" name="donated"/> <name_list.columns label="Estatus" name="online"/> + <name_list.columns label="Cargo" name="title"/> </name_list> <button label="Invitar" name="member_invite"/> <button label="Expulsar" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml index 71bdba1a25f..f6676967f56 100755 --- a/indra/newview/skins/default/xui/es/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml @@ -7,11 +7,8 @@ desconocida </text> <check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/> - <button label="?" left="215" name="disable_scripts_help"/> <check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/> - <button label="?" left="215" name="disable_collisions_help"/> <check_box label="Desactivar las propiedades fÃsicas" name="disable_physics_check" tool_tip="Desactiva toda la fÃsica en esta región"/> - <button label="?" left="215" name="disable_physics_help"/> <button label="Aplicar" name="apply_btn"/> <text name="objret_text_lbl" width="130"> Devolver el objeto @@ -31,10 +28,8 @@ <check_box label="En cada región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/> <button label="Devolver" name="return_btn"/> <button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales" width="280"/> - <button label="?" left="297" name="top_colliders_help"/> - <button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts" width="280"/> - <button label="?" left="297" name="top_scripts_help"/> <button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/> - <button label="?" name="restart_help"/> + <button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts" width="280"/> <button label="Cancelar reinicio" name="cancel_restart_btn" tool_tip="Cancelar el reinicio de región"/> + <button label="Consola de depuración de región" name="region_debug_console_btn" tool_tip="Abrir consola de depuración de región"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml index 453d1fe43c8..82149e1c7c3 100755 --- a/indra/newview/skins/default/xui/es/panel_region_general.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="No permitir modificar el terreno" name="block_terraform_check"/> <check_box label="Prohibir volar" name="block_fly_check"/> + <check_box label="Bloquear el vuelo sobre parcelas" name="block_fly_over_check" tool_tip="Extender las comprobaciones de acceso en vertical para impedir el vuelo sobre una parcela"/> <check_box label="Permitir el daño" name="allow_damage_check"/> <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/> <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/> <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/> <check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/> - <check_box label="Permitir objetos de red" name="mesh_rez_enabled_check" tool_tip="Permitir que los usuarios creen objetos de red en esta región"/> <spinner label="Nº máximo de avatares" label_width="120" name="agent_limit_spin" width="180"/> <spinner label="Plus de objetos" label_width="120" name="object_bonus_spin" width="180"/> <text label="Calificación" name="access_text"> diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml index 9ce14c856f3..1e25a4a4a26 100755 --- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml @@ -14,7 +14,7 @@ <text name="inbox_fresh_new_count"> [NUM] nuevos </text> - <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <panel name="inbox_inventory_placeholder_panel" tool_tip="Arrastra y coloca los artÃculos en tu inventario para poder utilizarlos"> <text name="inbox_inventory_placeholder"> Aquà se entregarán las compras realizadas en el mercado. </text> @@ -33,8 +33,8 @@ <layout_panel name="shop_btn_lp"> <button label="Comprar" name="shop_btn" tool_tip="Abrir la página web del mercado"/> <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/> - <button label="Play" name="play_btn"/> - <button label="Teleporte" name="teleport_btn" tool_tip="Teleportar a la zona elegida"/> + <button label="Jugar" name="play_btn"/> + <button label="Teleportarte" name="teleport_btn" tool_tip="Teleportar a la zona elegida"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 2b91c542ada..544a70028b5 100755 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -28,6 +28,45 @@ <string name="StartupRequireDriverUpdate"> Error de inicialización de gráficos. Actualiza tu controlador de gráficos. </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + Compilado con [COMPILER], versión [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU: [CPU] +Memoria: [MEMORY_MB] MB +Versión del Sistema Operativo: [OS_VERSION] +Fabricante de la tarjeta gráfica: [GRAPHICS_CARD_VENDOR] +Tarjeta gráfica: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Versión de Windows Graphics Driver: [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + Versión de OpenGL: [OPENGL_VERSION] + +Versión de libcurl: [LIBCURL_VERSION] +Versión de J2C Decoder: [J2C_VERSION] +Versión de Audio Driver: [AUDIO_DRIVER_VERSION] +Versión de Qt Webkit: [QT_WEBKIT_VERSION] +Versión del servidor de voz: [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + Error al obtener la URL de las notas de la versión del servidor. + </string> <string name="ProgressRestoring"> Restaurando... </string> @@ -922,12 +961,12 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="ControlYourCamera"> Controlar su cámara </string> - <string name="AgentNameSubst"> - (Tú) - </string> <string name="TeleportYourAgent"> Teleportarte </string> + <string name="AgentNameSubst"> + (Tú) + </string> <string name="JoinAnExperience"> Únete a una experiencia </string> @@ -1252,8 +1291,7 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="InventoryInboxNoItems"> Aquà aparecerán algunos de los objetos que recibas, como los regalos Premium. Después puedes arrastrarlos a tu inventario. </string> - <string name="Unconstrained">Sin restricciones</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1282,6 +1320,18 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="InventoryOutboxNoItems"> Arrastra carpetas a esta sección y pulsa en "Enviar al Mercado" para incluirlas en la lista de venta del [[MARKETPLACE_DASHBOARD_URL] Mercado]. </string> + <string name="InventoryOutboxInitializingTitle"> + Inicializando el Mercado. + </string> + <string name="InventoryOutboxInitializing"> + Estamos accediendo a tu cuenta de la [[MARKETPLACE_CREATE_STORE_URL] tienda del Mercado]. + </string> + <string name="InventoryOutboxErrorTitle"> + Errores del Mercado. + </string> + <string name="InventoryOutboxError"> + La [[MARKETPLACE_CREATE_STORE_URL] tienda del Mercado] devuelve errores. + </string> <string name="Marketplace Error None"> Sin errores </string> @@ -1309,6 +1359,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="Open landmarks"> Abrir hitos </string> + <string name="Unconstrained"> + Sin restricciones + </string> <string name="no_transfer" value="(no transferible)"/> <string name="no_modify" value="(no modificable)"/> <string name="no_copy" value="(no copiable)"/> @@ -1703,6 +1756,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="CompileQueueDownloadedCompiling"> Descargado, compilándolo </string> + <string name="CompileQueueServiceUnavailable"> + El servicio de compilación de scripts no está disponible + </string> <string name="CompileQueueScriptNotFound"> No se encuentra el script en el servidor. </string> diff --git a/indra/newview/skins/default/xui/fr/floater_region_restarting.xml b/indra/newview/skins/default/xui/fr/floater_region_restarting.xml new file mode 100644 index 00000000000..3a56a83c22e --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="REDÉMARRAGE DE LA RÉGION"> + <string name="RegionName"> + La région dans laquelle vous vous trouvez actuellement ([NAME]) est sur le point de redémarrer. + +Si vous restez dans cette région, vous serez déconnecté(e). + </string> + <string name="RestartSeconds"> + Secondes avant le redémarrage +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + La région dans laquelle vous vous trouvez actuellement (-le nom de région le plus long-) est sur le point de redémarrer. + +Si vous restez dans cette région, vous serez déconnecté(e). + </text> + <text name="restart_seconds"> + Secondes avant le redémarrage + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml new file mode 100644 index 00000000000..62830054bf1 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="STATISTIQUES DE CHARGEMENT DE SCÈNE"> + <button label="Pauser" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Basique" name="basic"> + <stat_bar label="Différence en pixels entre les images" name="frame difference"/> + <stat_bar label="Données UDP reçues" name="bandwidth"/> + <stat_bar label="Perte de paquets" name="packet_loss"/> + </stat_view> + <stat_view label="Avancé" name="advanced"> + <stat_view label="Rendu" name="render"> + <stat_bar label="Total des objets" name="objs"/> + <stat_bar label="Nouveaux objets" name="newobjs"/> + <stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/> + </stat_view> + <stat_view label="Texture" name="texture"> + <stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/> + <stat_bar label="Latence de lecture du cache" name="texture_cache_read_latency"/> + <stat_bar label="Nombre" name="numimagesstat"/> + <stat_bar label="Nombre brut" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Réseau" name="network"> + <stat_bar label="Paquets en entrée" name="packetsinstat"/> + <stat_bar label="Paquets en sortie" name="packetsoutstat"/> + <stat_bar label="Objets" name="objectdatareceived"/> + <stat_bar label="Texture" name="texturedatareceived"/> + <stat_bar label="Actif" name="assetudpdatareceived"/> + <stat_bar label="Couches" name="layersdatareceived"/> + <stat_bar label="Arrivés" name="messagedatain"/> + <stat_bar label="Sortis" name="messagedataout"/> + <stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulateur" name="sim"> + <stat_bar label="Objets" name="simobjects"/> + <stat_bar label="Objets actifs" name="simactiveobjects"/> + <stat_bar label="Scripts actifs" name="simactivescripts"/> + <stat_bar label="Paquets en entrée" name="siminpps"/> + <stat_bar label="Paquets en sortie" name="simoutpps"/> + <stat_bar label="Téléchargements en attente" name="simpendingdownloads"/> + <stat_bar label="Chargements en attente" name="simpendinguploads"/> + <stat_bar label="Total d'octets non reconnus" name="simtotalunackedbytes"/> + <stat_view label="Temps (ms)" name="simperf"> + <stat_bar label="Durée totale de l'image" name="simframemsec"/> + <stat_bar label="Durée nette" name="simnetmsec"/> + <stat_bar label="Durée physique" name="simsimphysicsmsec"/> + <stat_bar label="Durée de la simulation" name="simsimothermsec"/> + <stat_bar label="Durée des avatars" name="simagentmsec"/> + <stat_bar label="Durée des images" name="simimagesmsec"/> + <stat_bar label="Durée des scripts" name="simscriptmsec"/> + <stat_bar label="Temps d'inactivité" name="simsparemsec"/> + <stat_view label="Détails de la durée (ms)" name="timedetails"> + <stat_bar label="Étape propr. physiques" name="simsimphysicsstepmsec"/> + <stat_bar label="Mettre à jour les formes phys" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Propriétés physiques Autre" name="simsimphysicsothermsec"/> + <stat_bar label="Temps de sommeil" name="simsleepmsec"/> + <stat_bar label="ES pompe" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index d6bd1879565..5cad6258ec1 100755 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml @@ -4,7 +4,7 @@ <container_view name="statistics_view"> <stat_view label="De base" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Bande passante" name="bandwidth"/> + <stat_bar label="Données UDP reçues" name="bandwidth"/> <stat_bar label="Perte de paquets" name="packet_loss"/> <stat_bar label="Ping sim" name="ping"/> </stat_view> @@ -15,6 +15,9 @@ <stat_bar label="Objets totaux" name="objs"/> <stat_bar label="Nouveaux objets" name="newobjs"/> <stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/> + <stat_bar label="Requêtes d'occlusion effectuées" name="occlusion_queries"/> + <stat_bar label="Objets occlus" name="occluded"/> + <stat_bar label="Objets non occlus" name="unoccluded"/> </stat_view> <stat_view label="Texture" name="texture"> <stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Mém brute" name="rawmemstat"/> <stat_bar label="Mém liée" name="glboundmemstat"/> </stat_view> + <stat_view label="Utilisation de la mémoire" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="Interface" name="LLView"/> + <stat_bar label="Polices" name="LLFontFreetype"/> + <stat_bar label="Inventaire" name="LLInventoryObject"/> + <stat_bar label="Objets du client" name="LLViewerObject"/> + <stat_bar label="Données de groupe Octree" name="LLViewerOctreeGroup"/> + <stat_bar label="Données Octree" name="LLViewerOctreeEntry"/> + <stat_bar label="Cache des objets du client" name="LLVOCacheEntry"/> + <stat_bar label="Dessinables" name="LLDrawable"/> + <stat_bar label="Données de visage" name="LLFace"/> + <stat_bar label="Informations de tracé" name="LLDrawInfo"/> + <stat_bar label="Données de texture" name="LLTexture"/> + <stat_bar label="Données d'image" name="LLImage"/> + <stat_bar label="Données d'image GL" name="LLImageGL"/> + <stat_bar label="Tampon des sommets" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Réseau" name="network"> <stat_bar label="Paquets en entrée" name="packetsinstat"/> <stat_bar label="Paquets en sortie" name="packetsoutstat"/> - <stat_bar label="Objets" name="objectkbitstat"/> - <stat_bar label="Texture" name="texturekbitstat"/> - <stat_bar label="Actif" name="assetkbitstat"/> - <stat_bar label="Couches" name="layerskbitstat"/> - <stat_bar label="Arrivés" name="actualinkbitstat"/> - <stat_bar label="Sortis" name="actualoutkbitstat"/> + <stat_bar label="Objets" name="objectdatareceived"/> + <stat_bar label="Texture" name="texturedatareceived"/> + <stat_bar label="Actif" name="assetudpdatareceived"/> + <stat_bar label="Couches" name="layersdatareceived"/> + <stat_bar label="Arrivés" name="messagedatain"/> + <stat_bar label="Sortis" name="messagedataout"/> <stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="Paquets en sortie" name="simoutpps"/> <stat_bar label="Téléchargements en attente" name="simpendingdownloads"/> <stat_bar label="Chargements en attente" name="simpendinguploads"/> - <stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/> - <stat_view label="Temps (ms)" name="simperf"> + <stat_bar label="Total de données non reconnues" name="simtotalunackedbytes"/> + <stat_view label="Durée" name="simperf"> <stat_bar label="Durée totale de l'image" name="simframemsec"/> <stat_bar label="Durée nette" name="simnetmsec"/> <stat_bar label="Durée sim (physique)" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="Durée des images" name="simimagesmsec"/> <stat_bar label="Durée des scripts" name="simscriptmsec"/> <stat_bar label="Temps d'inactivité" name="simsparemsec"/> - <stat_view label="Détails Temps (ms)" name="timedetails"> + <stat_view label="Détails de la durée" name="timedetails"> <stat_bar label="Etape propr. physiques" name="simsimphysicsstepmsec"/> <stat_bar label="Mettre à jour les formes phys" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Propriétés physiques Autre" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml index 3bac25c79b8..072ac0a6aef 100755 --- a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Voir le profil" name="Show Profile"/> <menu_item_call label="Envoyer IM..." name="Send IM"/> + <menu_item_call label="Demander téléportation" name="Request Teleport"/> <menu_item_call label="Devenir amis..." name="Add Friend"/> <menu_item_call label="Supprimer cet ami..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 627d3068c3d..87b11bdaa57 100755 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="Jouer" name="Sound Play"/> <menu_item_call label="Copier la SLurl" name="url_copy"/> <menu_item_call label="À propos du repère" name="About Landmark"/> + <menu_item_call label="Voir sur la carte" name="show_on_map"/> <menu_item_call label="Jouer dans Second Life" name="Animation Play"/> <menu_item_call label="Jouer localement" name="Animation Audition"/> <menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index 7b1e106474f..5e9969627dd 100755 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="Quitter [APP_NAME]" name="Quit"/> </menu> <menu label="Aide" name="Help"> - <menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Aide rapide..." name="How To"/> + <menu_item_call label="Démarrage rapide" name="Quickstart"/> + <menu_item_call label="Base de connaissances" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Forums de la communauté" name="Community Forums"/> + <menu_item_call label="Portail d'assistance" name="Support portal"/> + <menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/> + <menu_item_call label="Signaler un bug" name="Report Bug"/> <menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Afficher le menu de débogage" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml index fb4582dbce3..ba8ed9b3f84 100755 --- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Téléporter" name="Teleport"/> <menu_item_call label="Plus d'informations" name="More Information"/> - <menu_item_call label="Copier dans le presse-papiers" name="CopyToClipboard"/> + <menu_item_call label="Copier la SLurl" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 5d0026ace00..4ff834420e1 100755 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -72,11 +72,11 @@ <menu_item_check label="Menu Avancé" name="Show Advanced Menu"/> </menu> <menu label="Luminosité" name="Sun"> - <menu_item_call label="Aube" name="Sunrise"/> - <menu_item_call label="Milieu de journée" name="Noon"/> - <menu_item_call label="Coucher de soleil" name="Sunset"/> - <menu_item_call label="Minuit" name="Midnight"/> - <menu_item_call label="Utiliser les réglages de la région" name="Use Region Settings"/> + <menu_item_check label="Aube" name="Sunrise"/> + <menu_item_check label="Milieu de journée" name="Noon"/> + <menu_item_check label="Coucher de soleil" name="Sunset"/> + <menu_item_check label="Minuit" name="Midnight"/> + <menu_item_check label="Utiliser les réglages de la région" name="Use Region Settings"/> </menu> <menu label="Éditeur d'environnement" name="Environment Editor"> <menu_item_call label="Paramètres d'environnement..." name="Environment Settings"/> @@ -165,8 +165,6 @@ </menu> <menu label="Aide" name="Help"> <menu_item_call label="Aide rapide..." name="How To"/> - <menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Guide de l'utilisateur" name="User’s guide"/> <menu_item_call label="Base de connaissances" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Forums de la communauté" name="Community Forums"/> @@ -188,6 +186,7 @@ <menu label="Outils de performance" name="Performance Tools"> <menu_item_call label="Mesure du lag" name="Lag Meter"/> <menu_item_check label="Barre de statistiques" name="Statistics Bar"/> + <menu_item_call label="Statistiques de chargement de scène" name="Scene Load Statistics"/> <menu_item_check label="Afficher le poids de dessin pour les avatars" name="Avatar Rendering Cost"/> </menu> <menu label="Surbrillance et visibilité" name="Highlighting and Visibility"> @@ -250,6 +249,7 @@ <menu_item_check label="Chronos" name="Fast Timers"/> <menu_item_check label="Mémoire" name="Memory"/> <menu_item_check label="Statistiques de la scène" name="Scene Statistics"/> + <menu_item_check label="Moniteur de chargement de scène" name="Scene Loading Monitor"/> <menu_item_call label="Console de débogage de la récupération des textures" name="Texture Fetch Debug Console"/> <menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/> <menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/> @@ -286,6 +286,7 @@ <menu_item_check label="Cadre lent périodique" name="Periodic Slow Frame"/> <menu_item_check label="Test cadre" name="Frame Test"/> <menu_item_call label="Profil du cadre" name="Frame Profile"/> + <menu_item_call label="Référence" name="Benchmark"/> </menu> <menu label="Métadonnées de rendu" name="Render Metadata"> <menu_item_check label="Cadres" name="Bounding Boxes"/> @@ -304,6 +305,7 @@ <menu_item_check label="File d'attente pour la construction" name="Build Queue"/> <menu_item_check label="Lumières" name="Lights"/> <menu_item_check label="Squelette de collision" name="Collision Skeleton"/> + <menu_item_check label="Articulations" name="Joints"/> <menu_item_check label="Rayons" name="Raycast"/> <menu_item_check label="Vecteurs de vent" name="Wind Vectors"/> <menu_item_check label="Complexité du rendu" name="rendercomplexity"/> @@ -336,6 +338,7 @@ <menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/> <menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/> <menu_item_check label="Objets en surbrillance avec le pointeur" name="Hover Glow Objects"/> + <menu_item_call label="Vider le cache immédiatement" name="Cache Clear"/> </menu> <menu label="Réseau" name="Network"> <menu_item_check label="Pauser l'avatar" name="AgentPause"/> @@ -368,7 +371,6 @@ <menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/> <menu_item_call label="Imprimer les infos sur l'objet sélectionné" name="Print Selected Object Info"/> <menu_item_call label="Imprimer les infos sur l'avatar" name="Print Agent Info"/> - <menu_item_check label="Console de débogage de région" name="Region Debug Console"/> <menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/> <menu_item_check label="Débogage clics" name="Debug Clicks"/> <menu_item_check label="Débogage des vues" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index c295a6f5a7e..af46d34b614 100755 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -114,15 +114,15 @@ Pour plus d'informations, consultez le [[MARKETPLACE_IMPORTS_URL] journal d <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Échec de transfert + Échec du transfert avec l'erreur « [ERROR_CODE] » -Aucun dossier n'a été envoyé vers la Place du marché en raison d'une erreur système ou réseau. Veuillez réessayer ultérieurement. +Aucun dossier n'a été envoyé vers la Place du marché en raison d'une erreur système ou réseau. Réessayez ultérieurement. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Échec d'initialisation de la Place du marché + Échec de l'initialisation de la Place du marché avec l'erreur « [ERROR_CODE] » -L'initialisation de la Place du marché a échoué en raison d'une erreur système ou réseau. Veuillez réessayer ultérieurement. +L'initialisation de la Place du marché a échoué en raison d'une erreur système ou réseau. Réessayez ultérieurement. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CompileQueueSaveText"> @@ -1729,6 +1729,10 @@ or ce nombre dépasse la limite autorisée fixée à [LIMIT]. Souhaitez-vous vraiment vous téléporter vers <nolink>[LOCATION]</nolink> ? <usetemplate ignoretext="Confirmer que je veux me téléporter à un repère" name="okcancelignore" notext="Annuler" yestext="Téléporter"/> </notification> + <notification name="TeleportViaSLAPP"> + Voulez-vous vraiment vous téléporter jusqu'à <nolink>[LOCATION]</nolink> ? + <usetemplate ignoretext="Confirmer que je veux me téléporter en utilisant SLAPP" name="okcancelignore" notext="Annuler" yestext="Téléporter"/> + </notification> <notification name="TeleportToPick"> Vous téléporter vers [PICK] ? <usetemplate ignoretext="Confirmer que je veux me téléporter à un endroit dans mes Favoris" name="okcancelignore" notext="Annuler" yestext="Téléporter"/> @@ -1939,6 +1943,9 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po <notification name="ProblemAddingEstateManager"> Problèmes lors de l'ajout d'un nouveau gérant de domaine. Il est possible qu'au moins un des domaines ait une liste de gérants complète. </notification> + <notification name="ProblemAddingEstateBanManager"> + Impossible d'ajouter le propriétaire ou le gérant du domaine à la liste des résidents bannis. + </notification> <notification name="ProblemAddingEstateGeneric"> Problème lors de l'ajout à la liste de ce domaine. Il est possible qu'au moins un des domaines ait une liste complète. </notification> @@ -3029,7 +3036,7 @@ Voir le fichier journal pour plus de détails. avec les résidents suivants : -[RESIDENTS] ? +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3041,7 +3048,7 @@ Voulez-vous vraiment partager les articles suivants : avec les résidents suivants : -[RESIDENTS] ? +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Ok"/> </notification> <notification name="ItemsShared"> @@ -3496,10 +3503,6 @@ Veuillez réessayer dans une minute. <notification name="EjectComingSoon"> Votre présence ici n'est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir. </notification> - <notification name="NoEnterServerFull"> - Vous ne pouvez pas pénétrer dans cette région car -le serveur est plein. - </notification> <notification name="SaveBackToInvDisabled"> Le réenregistrement dans l'inventaire a été désactivé. </notification> @@ -3689,6 +3692,9 @@ le serveur est plein. <notification name="LinkFailedTooMuchPhysics"> Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + L'objet « [OBJECT_NAME] » à [SLURL] ne peut pas téléporter les gérants de domaines chez eux. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Vous avez été téléporté chez vous par l'objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME]. </notification> @@ -3879,13 +3885,18 @@ le serveur est plein. Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit. + Division du terrain impossible. +Plusieurs parcelles sont sélectionnées. +Veuillez sélectionner un terrain plus petit. </notification> <notification name="CantDivideLandCantFindParcel"> - Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -> Signaler un bug... + Division du terrain impossible. +Parcelle introuvable. +Veuillez utiliser Aide > Signaler un bug pour signaler le problème... </notification> <notification name="CantDivideLandWholeParcelSelected"> - Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit. + Division du terrain impossible. La parcelle entière est sélectionnée. +Veuillez sélectionner un terrain plus petit. </notification> <notification name="LandHasBeenDivided"> Le terrain a été divisé. @@ -4025,4 +4036,8 @@ le serveur est plein. Impossible de déplacer les fichiers. Chemin précédent rétabli. <usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml index 047cd692e80..7c3b852de12 100755 --- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Général"/> - <accordion_tab name="group_roles_tab" title="Rôles"/> + <accordion_tab name="group_roles_tab" title="Rôles et membres"/> <accordion_tab name="group_notices_tab" title="Notices"/> <accordion_tab name="group_land_tab" title="Terrain/Actifs"/> </accordion> diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 0bd2e0bdab7..71ee70d68b3 100755 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml @@ -20,6 +20,7 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to <name_list.columns label="Membre" name="name"/> <name_list.columns label="Donation" name="donated"/> <name_list.columns label="Statut" name="online"/> + <name_list.columns label="Titre" name="title"/> </name_list> <button label="Inviter" name="member_invite"/> <button label="Expulser" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml index 98ae250215e..d21695e9aad 100755 --- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml @@ -7,11 +7,8 @@ (inconnue) </text> <check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactiver tous les scripts dans cette région"/> - <button label="?" name="disable_scripts_help"/> <check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/> - <button label="?" name="disable_collisions_help"/> <check_box label="Désactiver la physique" name="disable_physics_check" tool_tip="Désactiver tous les effets liés à la physique dans cette région"/> - <button label="?" name="disable_physics_help"/> <button bottom_delta="-38" label="Appliquer" name="apply_btn"/> <text bottom_delta="-42" name="objret_text_lbl" width="260"> Renvoi de l'objet @@ -31,10 +28,8 @@ <check_box label="Dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/> <button label="Renvoyer" name="return_btn"/> <button label="Collisions les plus consommatrices" name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/> - <button label="?" left="337" name="top_colliders_help"/> - <button label="Scripts les plus consommateurs" name="top_scripts_btn" tool_tip="Liste des objets passant le plus de temps à exécuter des scripts" width="320"/> - <button label="?" left="337" name="top_scripts_help"/> <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/> - <button label="?" left="177" name="restart_help"/> + <button label="Scripts les plus consommateurs" name="top_scripts_btn" tool_tip="Liste des objets passant le plus de temps à exécuter des scripts" width="320"/> <button label="Annuler le redémarrage" name="cancel_restart_btn" tool_tip="Annuler le redémarrage de la région." width="160"/> + <button label="Console de débogage de région" name="region_debug_console_btn" tool_tip="Ouvrir la console de débogage de région"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index 234d3160695..e9dcd6ab5ab 100755 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Interdire le terraformage" name="block_terraform_check"/> <check_box label="Interdire le vol" name="block_fly_check"/> + <check_box label="Bloquer le survol des parcelles" name="block_fly_over_check" tool_tip="Étendre les vérifications d'accès vers le haut pour empêcher le survol d'une parcelle"/> <check_box label="Autoriser les dégâts" name="allow_damage_check"/> <check_box label="Interdire les bousculades" name="restrict_pushobject"/> <check_box label="Autoriser la revente de terrain" name="allow_land_resell_check"/> <check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/> <check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/> - <check_box label="Autoriser les objets de maillage" name="mesh_rez_enabled_check" tool_tip="Laisser les gens rezzer des objets de maillage dans cette région."/> <spinner label="Nombre maximum d'avatars" label_width="160" name="agent_limit_spin" width="240"/> <spinner label="Bonus objet" label_width="160" name="object_bonus_spin" width="240"/> <text label="Maturité" name="access_text"> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index ec7dd8c095d..372d61263fa 100755 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml @@ -31,10 +31,10 @@ <button label="Partager" name="share_btn" tool_tip="Partager un article de l'inventaire"/> </layout_panel> <layout_panel name="shop_btn_lp"> - <button label="Acheter" name="shop_btn" tool_tip="Accéder à la place du marché sur le Web"/> + <button label="Faire des achats" name="shop_btn" tool_tip="Accéder à la Place du marché sur le Web"/> <button label="Porter" name="wear_btn" tool_tip="Porter la tenue sélectionnée"/> - <button label="Lire" name="play_btn"/> - <button label="Téléportation" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> + <button label="Jouer" name="play_btn"/> + <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index b8721420cb3..46fcbe005fb 100755 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -37,6 +37,45 @@ <string name="StartupRequireDriverUpdate"> Échec d'initialisation des graphiques. Veuillez mettre votre pilote graphique à jour. </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [Notes de version]] + </string> + <string name="AboutCompiler"> + Compilé avec [COMPILER] version [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL : <nolink>[SLURL]</nolink> +(coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU : [CPU] +Mémoire : [MEMORY_MB] Mo +Version OS : [OS_VERSION] +Distributeur de cartes graphiques : [GRAPHICS_CARD_VENDOR] +Carte graphique : [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Version Windows Graphics Driver : [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + Version OpenGL : [OPENGL_VERSION] + +Version libcurl : [LIBCURL_VERSION] +Version J2C Decoder : [J2C_VERSION] +Version Audio Driver : [AUDIO_DRIVER_VERSION] +Version Qt Webkit : [QT_WEBKIT_VERSION] +Version serveur vocal : [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + Paquets perdus : [PACKETS_LOST,nombre,0]/[PACKETS_IN,nombre,0] ([PACKETS_PCT,nombre,1]%) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + Erreur lors de la récupération de l'URL des notes de version du serveur. + </string> <string name="ProgressRestoring"> Restauration... </string> @@ -937,15 +976,15 @@ Veuillez réessayer de vous connecter dans une minute. <string name="ControlYourCamera"> Contrôler votre caméra </string> + <string name="TeleportYourAgent"> + Vous téléporter + </string> <string name="NotConnected"> Pas connecté(e) </string> <string name="AgentNameSubst"> (Vous) </string> - <string name="TeleportYourAgent"> - Vous téléporter - </string> <string name="JoinAnExperience"> Rejoindre une expérience </string> @@ -1270,8 +1309,7 @@ Veuillez réessayer de vous connecter dans une minute. <string name="InventoryInboxNoItems"> Les achats que vous avez effectués sur la Place du marché s'affichent ici. Vous pouvez alors les faire glisser vers votre inventaire afin de les utiliser. </string> - <string name="Unconstrained">Sans contraintes</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1300,6 +1338,18 @@ Veuillez réessayer de vous connecter dans une minute. <string name="InventoryOutboxNoItems"> Pour mettre des dossiers en vente sur la [[MARKETPLACE_DASHBOARD_URL] Place du marché], faites-les glisser vers cette zone et cliquez sur "Envoyer vers la Place du marché". </string> + <string name="InventoryOutboxInitializingTitle"> + Initialisation de la Place du marché... + </string> + <string name="InventoryOutboxInitializing"> + Nous sommes en train d'accéder à votre compte dans la [[MARKETPLACE_CREATE_STORE_URL] boutique de la Place du marché]. + </string> + <string name="InventoryOutboxErrorTitle"> + Erreurs de la Place du marché. + </string> + <string name="InventoryOutboxError"> + La [[MARKETPLACE_CREATE_STORE_URL] boutique de la Place du marché] renvoie des erreurs. + </string> <string name="Marketplace Error None"> Aucune erreur </string> @@ -1327,6 +1377,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="Open landmarks"> Ouvrir les repères </string> + <string name="Unconstrained"> + Sans contraintes + </string> <string name="no_transfer" value=" (pas de transfert)"/> <string name="no_modify" value=" (pas de modification)"/> <string name="no_copy" value=" (pas de copie)"/> @@ -1727,6 +1780,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="CompileQueueDownloadedCompiling"> Téléchargé, compilation en cours </string> + <string name="CompileQueueServiceUnavailable"> + Service de compilation de script indisponible. + </string> <string name="CompileQueueScriptNotFound"> Script introuvable sur le serveur. </string> diff --git a/indra/newview/skins/default/xui/it/floater_region_restarting.xml b/indra/newview/skins/default/xui/it/floater_region_restarting.xml new file mode 100644 index 00000000000..d4497288e09 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="RIAVVIO REGIONE IN CORSO"> + <string name="RegionName"> + La regione in cui ti trovi ([NAME]) verrà riavviata tra breve. + +Se rimani in questa regione verrai scollegato da Second Life. + </string> + <string name="RestartSeconds"> + Secondi prima del riavvio +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + La regione in cui ti trovi (il nome di regione più lungo) verrà riavviata tra breve. + +Se rimani in questa regione verrai scollegato da Second Life. + </text> + <text name="restart_seconds"> + Secondi prima del riavvio + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml new file mode 100644 index 00000000000..ca18812eb71 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="STATISTICHE CARICAMENTO SCENA"> + <button label="In pausa" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Di base" name="basic"> + <stat_bar label="Differenza pixel tra fotogrammi" name="frame difference"/> + <stat_bar label="Dati UDP ricevuti" name="bandwidth"/> + <stat_bar label="Perdita pacchetti" name="packet_loss"/> + </stat_view> + <stat_view label="Avanzata" name="advanced"> + <stat_view label="Render" name="render"> + <stat_bar label="Totale oggetti" name="objs"/> + <stat_bar label="Nuovi oggetti" name="newobjs"/> + <stat_bar label="Hit rate della cache per l'oggetto" name="object_cache_hits"/> + </stat_view> + <stat_view label="Texture" name="texture"> + <stat_bar label="Hit rate della cache" name="texture_cache_hits"/> + <stat_bar label="Latenza di lettura della cache" name="texture_cache_read_latency"/> + <stat_bar label="Conteggio" name="numimagesstat"/> + <stat_bar label="Conteggio grezzo" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Rete" name="network"> + <stat_bar label="Pacchetti in ingresso" name="packetsinstat"/> + <stat_bar label="Pacchetti in uscita" name="packetsoutstat"/> + <stat_bar label="Oggetti" name="objectdatareceived"/> + <stat_bar label="Texture" name="texturedatareceived"/> + <stat_bar label="Risorsa" name="assetudpdatareceived"/> + <stat_bar label="Livelli" name="layersdatareceived"/> + <stat_bar label="Effettivi in ingresso" name="messagedatain"/> + <stat_bar label="Effettivi in uscita" name="messagedataout"/> + <stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulatore" name="sim"> + <stat_bar label="Oggetti" name="simobjects"/> + <stat_bar label="Oggetti attivi" name="simactiveobjects"/> + <stat_bar label="Script attivi" name="simactivescripts"/> + <stat_bar label="Pacchetti in ingresso" name="siminpps"/> + <stat_bar label="Pacchetti in uscita" name="simoutpps"/> + <stat_bar label="Download in attesa" name="simpendingdownloads"/> + <stat_bar label="Caricamenti in attesa" name="simpendinguploads"/> + <stat_bar label="Numero totale byte non confermati (Unacked)" name="simtotalunackedbytes"/> + <stat_view label="Tempo (ms)" name="simperf"> + <stat_bar label="Tempo totale Frame" name="simframemsec"/> + <stat_bar label="Tempo netto" name="simnetmsec"/> + <stat_bar label="Tempo motore fisico" name="simsimphysicsmsec"/> + <stat_bar label="Tempo simulazione" name="simsimothermsec"/> + <stat_bar label="Tempo agente" name="simagentmsec"/> + <stat_bar label="Tempo immagini" name="simimagesmsec"/> + <stat_bar label="Tempo script" name="simscriptmsec"/> + <stat_bar label="Tempo libero" name="simsparemsec"/> + <stat_view label="Dettagli tempo (ms)" name="timedetails"> + <stat_bar label="Passaggio fisica" name="simsimphysicsstepmsec"/> + <stat_bar label="Aggiorna forme fisica" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Altro fisica" name="simsimphysicsothermsec"/> + <stat_bar label="Tempo pausa" name="simsleepmsec"/> + <stat_bar label="IO pompa" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml index 825b2ce57a1..1d850516b7d 100755 --- a/indra/newview/skins/default/xui/it/floater_stats.xml +++ b/indra/newview/skins/default/xui/it/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="Di base" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Larghezza banda" name="bandwidth"/> + <stat_bar label="Dati UDP ricevuti" name="bandwidth"/> <stat_bar label="Perdita pacchetti" name="packet_loss"/> <stat_bar label="Tempo Ping Sim" name="ping"/> </stat_view> <stat_view label="Avanzata" name="advanced"> <stat_view label="Render" name="render"> - <stat_bar label="KTris disegnato per fotogramma" name="ktrisframe"/> - <stat_bar label="KTris disegnato per secondo" name="ktrissec"/> + <stat_bar label="KTris per fotogramma" name="ktrisframe"/> + <stat_bar label="KTris per secondo" name="ktrissec"/> <stat_bar label="Totale oggetti" name="objs"/> <stat_bar label="Nuovi oggetti" name="newobjs"/> <stat_bar label="Hit rate della cache per l'oggetto" name="object_cache_hits"/> + <stat_bar label="Occlusion query eseguite" name="occlusion_queries"/> + <stat_bar label="Oggetti in occlusion" name="occluded"/> + <stat_bar label="Oggetti non in occlusion" name="unoccluded"/> </stat_view> <stat_view label="Texture" name="texture"> <stat_bar label="Hit rate della cache" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Memoria complessiva" name="rawmemstat"/> <stat_bar label="Memoria impegnata" name="glboundmemstat"/> </stat_view> + <stat_view label="Utilizzo memoria" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="Interfaccia utente" name="LLView"/> + <stat_bar label="Font" name="LLFontFreetype"/> + <stat_bar label="Inventario" name="LLInventoryObject"/> + <stat_bar label="Oggetti Viewer" name="LLViewerObject"/> + <stat_bar label="Dati gruppo octree" name="LLViewerOctreeGroup"/> + <stat_bar label="Dati octree" name="LLViewerOctreeEntry"/> + <stat_bar label="Cache oggetti Viewer" name="LLVOCacheEntry"/> + <stat_bar label="Disegnabili" name="LLDrawable"/> + <stat_bar label="Dati viso" name="LLFace"/> + <stat_bar label="Info disegno" name="LLDrawInfo"/> + <stat_bar label="Dati texture" name="LLTexture"/> + <stat_bar label="Dati immagine" name="LLImage"/> + <stat_bar label="Dati immagine GL" name="LLImageGL"/> + <stat_bar label="Buffer vertici" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Rete" name="network"> <stat_bar label="Pacchetti in ingresso" name="packetsinstat"/> <stat_bar label="Pacchetti in uscita" name="packetsoutstat"/> - <stat_bar label="Oggetti" name="objectkbitstat"/> - <stat_bar label="Texture" name="texturekbitstat"/> - <stat_bar label="Risorse server" name="assetkbitstat"/> - <stat_bar label="Layer" name="layerskbitstat"/> - <stat_bar label="Effettivi in ingresso" name="actualinkbitstat"/> - <stat_bar label="Effettivi in uscita" name="actualoutkbitstat"/> + <stat_bar label="Oggetti" name="objectdatareceived"/> + <stat_bar label="Texture" name="texturedatareceived"/> + <stat_bar label="Risorsa" name="assetudpdatareceived"/> + <stat_bar label="Livelli" name="layersdatareceived"/> + <stat_bar label="Effettivi in ingresso" name="messagedatain"/> + <stat_bar label="Effettivi in uscita" name="messagedataout"/> <stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -53,7 +73,8 @@ <stat_bar label="Passaggi silhouette saltati" name="simsimskippedsilhouettesteps"/> <stat_bar label="Personaggi aggiornati" name="simsimpctsteppedcharacters"/> </stat_view> - <stat_view label="Tempo (ms)" name="simperf"> + <stat_bar label="Totale dati non confermati (unacked)" name="simtotalunackedbytes"/> + <stat_view label="Orario" name="simperf"> <stat_bar label="Tempo totale Frame" name="simframemsec"/> <stat_bar label="Tempo netto" name="simnetmsec"/> <stat_bar label="Tempo motore fisico" name="simsimphysicsmsec"/> @@ -62,7 +83,7 @@ <stat_bar label="Tempo immagini" name="simimagesmsec"/> <stat_bar label="Tempo script" name="simscriptmsec"/> <stat_bar label="Tempo libero" name="simsparemsec"/> - <stat_view label="Dettagli tempo (ms)" name="timedetails"> + <stat_view label="Dettagli orario" name="timedetails"> <stat_bar label="Passaggio fisica" name="simsimphysicsstepmsec"/> <stat_bar label="Aggiorna forme fisica" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Altro fisica" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml index b93b6953008..215eb836c85 100755 --- a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Vedi profilo" name="Show Profile"/> <menu_item_call label="Manda IM..." name="Send IM"/> + <menu_item_call label="Richiedi teleport" name="Request Teleport"/> <menu_item_call label="Aggiungi come amico..." name="Add Friend"/> <menu_item_call label="Togli amicizia..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml index b31e35771df..c8042f4253a 100755 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="Esegui" name="Sound Play"/> <menu_item_call label="Copia SLurl" name="url_copy"/> <menu_item_call label="Informazioni sul punto di riferimento" name="About Landmark"/> + <menu_item_call label="Mostra sulla mappa" name="show_on_map"/> <menu_item_call label="Riproduci in Second Life" name="Animation Play"/> <menu_item_call label="Esegui localmente" name="Animation Audition"/> <menu_item_call label="Invia un Instant Message" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml index 35053ec4990..126089aa6af 100755 --- a/indra/newview/skins/default/xui/it/menu_login.xml +++ b/indra/newview/skins/default/xui/it/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="Esci da [APP_NAME]" name="Quit"/> </menu> <menu label="Aiuto" name="Help"> - <menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Istruzioni..." name="How To"/> + <menu_item_call label="Guida introduttiva" name="Quickstart"/> + <menu_item_call label="Base di conoscenza" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Forum della comunità " name="Community Forums"/> + <menu_item_call label="Portale assistenza" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/> + <menu_item_call label="Segnala bug" name="Report Bug"/> <menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml index 81053fbd659..31236895fa1 100755 --- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teleport" name="Teleport"/> <menu_item_call label="Maggiori informazioni" name="More Information"/> - <menu_item_call label="Copia negli appunti" name="CopyToClipboard"/> + <menu_item_call label="Copia SLurl" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 52247d6c9cf..3e6589927d7 100755 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -72,11 +72,11 @@ <menu_item_check label="Menu Avanzato" name="Show Advanced Menu"/> </menu> <menu label="Sole" name="Sun"> - <menu_item_call label="Alba" name="Sunrise"/> - <menu_item_call label="Mezzogiorno" name="Noon"/> - <menu_item_call label="Tramonto" name="Sunset"/> - <menu_item_call label="Mezzanotte" name="Midnight"/> - <menu_item_call label="Usa impostazioni regione" name="Use Region Settings"/> + <menu_item_check label="Alba" name="Sunrise"/> + <menu_item_check label="Mezzogiorno" name="Noon"/> + <menu_item_check label="Tramonto" name="Sunset"/> + <menu_item_check label="Mezzanotte" name="Midnight"/> + <menu_item_check label="Usa impostazioni regione" name="Use Region Settings"/> </menu> <menu label="Editor ambiente" name="Environment Editor"> <menu_item_call label="Impostazioni ambiente..." name="Environment Settings"/> @@ -165,8 +165,6 @@ </menu> <menu label="Aiuto" name="Help"> <menu_item_call label="Istruzioni..." name="How To"/> - <menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Guida dell'utente" name="User’s guide"/> <menu_item_call label="Base di conoscenza" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Forum della comunità " name="Community Forums"/> @@ -188,6 +186,7 @@ <menu label="Strumenti di performance" name="Performance Tools"> <menu_item_call label="Misuratore lag" name="Lag Meter"/> <menu_item_check label="Barra statistiche" name="Statistics Bar"/> + <menu_item_call label="Statistiche caricamento scena" name="Scene Load Statistics"/> <menu_item_check label="Mostra peso visualizzazione per avatar" name="Avatar Rendering Cost"/> </menu> <menu label="Evidenziazione e visibilità " name="Highlighting and Visibility"> @@ -249,6 +248,7 @@ <menu_item_check label="Timer veloci" name="Fast Timers"/> <menu_item_check label="Memoria" name="Memory"/> <menu_item_check label="Statistiche scena" name="Scene Statistics"/> + <menu_item_check label="Monitoraggio caricamento scena" name="Scene Loading Monitor"/> <menu_item_call label="Console di debug recupero texture" name="Texture Fetch Debug Console"/> <menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/> <menu_item_check label="Fotocamera" name="Camera"/> @@ -280,6 +280,7 @@ <menu_item_check label="Veloc. di visualizzazione casuale" name="Randomize Framerate"/> <menu_item_check label="Test frame" name="Frame Test"/> <menu_item_call label="Profilo frame" name="Frame Profile"/> + <menu_item_call label="Benchmark" name="Benchmark"/> </menu> <menu label="Render Metadata" name="Render Metadata"> <menu_item_check label="Normali" name="Normals"/> @@ -287,6 +288,7 @@ <menu_item_check label="Aggiorna tipo" name="Update Type"/> <menu_item_check label="Info livello dettaglio" name="LOD Info"/> <menu_item_check label="Crea coda" name="Build Queue"/> + <menu_item_check label="Giunti" name="Joints"/> <menu_item_check label="Vettori vento" name="Wind Vectors"/> <menu_item_check label="Complessità rendering" name="rendercomplexity"/> <menu_item_check label="Byte collegamento" name="attachment bytes"/> @@ -312,6 +314,7 @@ <menu_item_check label="Rendering delle luci unite" name="Render Attached Lights"/> <menu_item_check label="Rendering particelle unite" name="Render Attached Particles"/> <menu_item_check label="Gli oggetti brillano quando sono sotto il cursore" name="Hover Glow Objects"/> + <menu_item_call label="Pulisci cache immediatamente" name="Cache Clear"/> </menu> <menu label="Rete" name="Network"> <menu_item_check label="Metti in pausa" name="AgentPause"/> @@ -327,7 +330,6 @@ <menu_item_call label="Test browser multimedia" name="Web Browser Test"/> <menu_item_call label="Browser contenuto Web" name="Web Content Browser"/> <menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/> - <menu_item_check label="Console di debug regione" name="Region Debug Console"/> <menu_item_check label="Debug clic" name="Debug Clicks"/> <menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/> </menu> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 96b8c96595b..45c89ecd7a1 100755 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -114,13 +114,13 @@ Per ulteriori informazioni consulta il [[MARKETPLACE_IMPORTS_URL] registro error <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Trasferimento non riuscito + Trasferimento non riuscito, errore '[ERROR_CODE]' Nessuna cartella è stata inviata a Marketplace, a causa di un errore di sistema o di rete. Riprova più tardi. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Inizializzazione Marketplace non riuscita + Inizializzazione Marketplace non riuscita, errore '[ERROR_CODE]' L'inizializzazione con il Marketplace non ha avuto successo a causa di un errore di sistema o di rete. Riprova più tardi. <usetemplate name="okbutton" yestext="OK"/> @@ -1734,6 +1734,10 @@ più del limite [LIMIT]. Sei sicuro di volere il teleport a <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Conferma il teleport verso un punto di riferimento" name="okcancelignore" notext="Annulla" yestext="Teleportati"/> </notification> + <notification name="TeleportViaSLAPP"> + Sei sicuro di volere il teleport a <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Confermo di voler usare il teleport tramite SLAPP" name="okcancelignore" notext="Annulla" yestext="Teleport"/> + </notification> <notification name="TeleportToPick"> Teleport a [PICK]? <usetemplate ignoretext="Conferma che voglio il teleport verso l'ubicazione nei Luoghi preferiti" name="okcancelignore" notext="Annulla" yestext="Teleport"/> @@ -1944,6 +1948,9 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server. <notification name="ProblemAddingEstateManager"> Si sono riscontrati problemi nell'aggiungere un nuovo manager della proprietà . Una o più proprietà potrebbero avere la lista dei manager piena. </notification> + <notification name="ProblemAddingEstateBanManager"> + Impossibile aggiungere il gestore o il proprietario della proprietà alla lista degli espulsi. + </notification> <notification name="ProblemAddingEstateGeneric"> Si sono riscontrati problemi nell'aggiunta a questo elenco della proprietà . Una o più proprietà potrebbe avere una lista piena. </notification> @@ -3028,13 +3035,13 @@ Per informazioni dettagliate, vedi il file del registro. Non è stata ottenuta la capacità della regione '[CAPABILITY]'. </notification> <notification name="ShareItemsConfirmation"> - Sei sicuro di volere condividere gli oggetti + Sei sicuro di volere condividere gli oggetti seguenti: -<nolink>[MSG]</nolink> +<nolink>[ITEMS]</nolink> -Con i seguenti residenti? +Con i seguenti residenti: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3046,7 +3053,7 @@ Sei sicuro di volere condividere gli oggetti seguenti: Con i seguenti residenti: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Ok"/> </notification> <notification name="ItemsShared"> @@ -3502,10 +3509,6 @@ Riprova tra un minuto. <notification name="EjectComingSoon"> Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene. </notification> - <notification name="NoEnterServerFull"> - Non puoi entrare in questa regione perché -il server è pieno. - </notification> <notification name="SaveBackToInvDisabled"> Opzione Salva nell'inventario disattivata </notification> @@ -3695,6 +3698,9 @@ il server è pieno. <notification name="LinkFailedTooMuchPhysics"> L'oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + L'oggetto '[OBJECT_NAME]' a [SLURL] non può eseguire il teleport del gestore della proprietà alla sua casa. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Sei stato teleportato nella posizione iniziale dall'oggetto '[OBJECT_NAME]' del lotto '[PARCEL_NAME]' </notification> @@ -3885,13 +3891,18 @@ il server è pieno. Non sono stati selezionati abbastanza lotti affittati da collegare. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola. + Impossibile suddividere il terreno. +È stato selezionato più di un lotto. +Prova a selezionare un pezzo di terreno più piccolo. </notification> <notification name="CantDivideLandCantFindParcel"> - impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -> Segnala bug... + Impossibile suddividere il terreno. +Lotto non trovato. +Invia una segnalazione con Aiuto -> Segnala Bug... </notification> <notification name="CantDivideLandWholeParcelSelected"> - Impossibile suddividere il terreno. È stato selezionato l'intero lotto.\nProva a selezionare un pezzo di terreno più piccolo. + Impossibile suddividere il terreno. È stato selezionato un intero lotto. +Prova a selezionare un pezzo di terreno più piccolo. </notification> <notification name="LandHasBeenDivided"> Il terreno è stato diviso. @@ -4031,4 +4042,8 @@ il server è pieno. Impossibile spostare i file. Il percorso precedente è stato ripristinato. <usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml index 34ee3c2dca1..138edc3a266 100755 --- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Generale"/> - <accordion_tab name="group_roles_tab" title="Ruoli"/> + <accordion_tab name="group_roles_tab" title="Ruoli e membri"/> <accordion_tab name="group_notices_tab" title="Avvisi"/> <accordion_tab name="group_land_tab" title="Terra/Beni"/> </accordion> diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml index 478b35e628c..79e9cd73d26 100755 --- a/indra/newview/skins/default/xui/it/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml @@ -21,6 +21,7 @@ cliccando sui loro nomi. <name_list.columns label="Socio" name="name"/> <name_list.columns label="Donazioni" name="donated"/> <name_list.columns label="Stato" name="online"/> + <name_list.columns label="Titolo" name="title"/> </name_list> <button label="Invita" name="member_invite"/> <button label="Espelli" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml index aba60d03aab..88c056bf5e8 100755 --- a/indra/newview/skins/default/xui/it/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml @@ -7,11 +7,8 @@ sconosciuta </text> <check_box label="Disabilita gli script" name="disable_scripts_check" tool_tip="Disabilita tutti gli script in questa regione"/> - <button label="?" name="disable_scripts_help"/> <check_box label="Disabilita le collisioni" name="disable_collisions_check" tool_tip="Disabilita tutte le collisioni non di avatar in questa regione"/> - <button label="?" name="disable_collisions_help"/> <check_box label="Disabilita la fisica" name="disable_physics_check" tool_tip="Disabilita tutta la fisica dei corpi in questa regione"/> - <button label="?" name="disable_physics_help"/> <button label="Applica" name="apply_btn"/> <text name="objret_text_lbl" width="130"> Restituisci oggetti @@ -31,10 +28,8 @@ <check_box label="In tutte le regioni di questa proprietà " name="return_estate_wide" tool_tip="Restituisci tutti gli oggetti nelle varie regioni che costituiscono l'insieme dei possedimenti terrieri"/> <button label="Restituisci" name="return_btn"/> <button label="Visualizza l'elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni" width="280"/> - <button label="?" left="297" name="top_colliders_help"/> - <button label="Visualizza l'elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script" width="280"/> - <button label="?" left="297" name="top_scripts_help"/> <button label="Riavvia la regione" name="restart_btn" tool_tip="Dai 2 minuti di tempo massimo e fai riavviare la regione"/> - <button label="?" name="restart_help"/> + <button label="Visualizza l'elenco degli script più pesanti..." name="top_scripts_btn" tool_tip="Elenco degli oggetti che impiegano più tempo a far girare gli script" width="280"/> <button label="Annulla riavvio" name="cancel_restart_btn" tool_tip="Annulla riavvio regione"/> + <button label="Console di debug regione" name="region_debug_console_btn" tool_tip="Apri console di debug regione"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml index c550e005ae9..3e2f593d2f7 100755 --- a/indra/newview/skins/default/xui/it/panel_region_general.xml +++ b/indra/newview/skins/default/xui/it/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Proibisci la modifica del terreno" name="block_terraform_check"/> <check_box label="Impedisci il volo" name="block_fly_check"/> + <check_box label="Blocca il volo sul lotto" name="block_fly_over_check" tool_tip="Espandi il controllo dell'accesso in alto per impedire il volo sopra un lotto"/> <check_box label="Abilita i danni" name="allow_damage_check"/> <check_box label="Limita gli urti" name="restrict_pushobject"/> <check_box label="Abilita la rivendita del terreno" name="allow_land_resell_check"/> <check_box label="Abilita unione/suddivisione del terreno" name="allow_parcel_changes_check"/> <check_box label="Proibisci che il terreno appaia nelle ricerche" name="block_parcel_search_check" tool_tip="Permetti che le persone vedano questa regione e le sue suddivisioni nei risultati delle ricerche"/> - <check_box label="Consenti oggetti con reticolo" name="mesh_rez_enabled_check" tool_tip="Permetti alle persone di rezzare oggetti con reticolo su questa regione"/> <spinner label="Limite massimo di avatar" label_width="135" name="agent_limit_spin" width="190"/> <spinner label="Bonus di oggetti" label_width="135" name="object_bonus_spin" width="190"/> <text label="Maturità " name="access_text" width="120"> diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml index 907857bf5a2..2f00a023bb8 100755 --- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml @@ -33,7 +33,7 @@ <layout_panel name="shop_btn_lp"> <button label="Acquisti" name="shop_btn" tool_tip="Apri pagina web di Marketplace"/> <button label="Indossa" name="wear_btn" tool_tip="Indossa il vestiario selezionato"/> - <button label="Riproduci" name="play_btn"/> + <button label="Gioca" name="play_btn"/> <button label="Teleport" name="teleport_btn" tool_tip="Teleport alla zona selezionata"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 86d7f75b834..3835907f011 100755 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -34,6 +34,45 @@ <string name="StartupRequireDriverUpdate"> Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica! </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + Generato con [COMPILER] versione [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU: [CPU] +Memoria: [MEMORY_MB] MB +Versione sistema operativo: [OS_VERSION] +Venditore scheda grafica: [GRAPHICS_CARD_VENDOR] +Scheda grafica: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Versione driver Windows per grafica: [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + Versione OpenGL: [OPENGL_VERSION] + +Versione libcurl: [LIBCURL_VERSION] +Versione J2C Decoder: [J2C_VERSION] +Versione Driver audio: [AUDIO_DRIVER_VERSION] +Versione Qt Webkit: [QT_WEBKIT_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="ErrorFetchingServerReleaseNotesURL"> + Errore nel recupero URL note rilascio versione + </string> <string name="ProgressRestoring"> Ripristino in corso... </string> @@ -931,12 +970,12 @@ Prova ad accedere nuovamente tra un minuto. <string name="ControlYourCamera"> Controllare la tua fotocamera </string> - <string name="AgentNameSubst"> - (Tu) - </string> <string name="TeleportYourAgent"> Teleportarti </string> + <string name="AgentNameSubst"> + (Tu) + </string> <string name="JoinAnExperience"> Partecipa a un'esperienza </string> @@ -1261,8 +1300,7 @@ Prova ad accedere nuovamente tra un minuto. <string name="InventoryInboxNoItems"> Gli acquissti dal mercato verranno mostrati qui. Potrai quindi trascinarli nel tuo inventario per usarli. </string> - <string name="Unconstrained">Libero</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1291,6 +1329,18 @@ Prova ad accedere nuovamente tra un minuto. <string name="InventoryOutboxNoItems"> Trascina le cartelle in questa area e clicca su "Invia a Marketplace" per metterle in vendita su [[MARKETPLACE_DASHBOARD_URL] Marketplace]. </string> + <string name="InventoryOutboxInitializingTitle"> + Inizializzazione Marketplace.in corso + </string> + <string name="InventoryOutboxInitializing"> + Stiamo eseguendo l'accesso al tuo account sul [[MARKETPLACE_CREATE_STORE_URL] negozio Marketplace]. + </string> + <string name="InventoryOutboxErrorTitle"> + Errori in Marketplace. + </string> + <string name="InventoryOutboxError"> + Il [[MARKETPLACE_CREATE_STORE_URL] negozio nel Marketplace] ha riportato errori. + </string> <string name="Marketplace Error None"> Nessun errore </string> @@ -1318,6 +1368,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="Open landmarks"> Apri luoghi di riferimento </string> + <string name="Unconstrained"> + Libero + </string> <string name="no_transfer" value="(nessun trasferimento)"/> <string name="no_modify" value="(nessuna modifica)"/> <string name="no_copy" value="(nessuna copia)"/> @@ -1712,6 +1765,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="CompileQueueDownloadedCompiling"> Scaricato, in compilazione </string> + <string name="CompileQueueServiceUnavailable"> + Il servizio di compilazione degli script non è disponibile + </string> <string name="CompileQueueScriptNotFound"> Script non trovato sul server. </string> diff --git a/indra/newview/skins/default/xui/ja/floater_region_restarting.xml b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml new file mode 100644 index 00000000000..e9ba9d230d7 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="リージョンã®å†èµ·å‹•"> + <string name="RegionName"> + 今 ([NAME]) ãŒã„るリージョンをå†èµ·å‹•ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + +ã“ã®ã¾ã¾ã“ã“ã«ã„ã‚‹ã¨ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¾ã™ã€‚ + </string> + <string name="RestartSeconds"> + å†èµ·å‹•ã¾ã§ã®ç§’æ•° +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + 今 (-最長リージョンå-) ãŒã„るリージョンをå†èµ·å‹•ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + +ã“ã®ã¾ã¾ã“ã“ã«ã„ã‚‹ã¨ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¾ã™ã€‚ + </text> + <text name="restart_seconds"> + å†èµ·å‹•ã¾ã§ã®ç§’æ•° + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml new file mode 100644 index 00000000000..f6edce026f0 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="シーン ãƒãƒ¼ãƒ‰çµ±è¨ˆæƒ…å ±"> + <button label="一時åœæ¢" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="ベーシック" name="basic"> + <stat_bar label="フレームピクセル差" name="frame difference"/> + <stat_bar label="UDP データをå—ã‘å–ã‚Šã¾ã—ãŸ" name="bandwidth"/> + <stat_bar label="パケットãƒã‚¹" name="packet_loss"/> + </stat_view> + <stat_view label="アドãƒãƒ³ã‚¹" name="advanced"> + <stat_view label="æç”»" name="render"> + <stat_bar label="オブジェクトåˆè¨ˆ" name="objs"/> + <stat_bar label="æ–°è¦ã‚ªãƒ–ジェクト" name="newobjs"/> + <stat_bar label="オブジェクト ã‚ャッシュ ヒット率" name="object_cache_hits"/> + </stat_view> + <stat_view label="テクスãƒãƒ£" name="texture"> + <stat_bar label="ã‚ャッシュ ヒット率" name="texture_cache_hits"/> + <stat_bar label="ã‚ャッシュèªã¿è¾¼ã¿é…延" name="texture_cache_read_latency"/> + <stat_bar label="カウント" name="numimagesstat"/> + <stat_bar label="Raw カウント" name="numrawimagesstat"/> + </stat_view> + <stat_view label="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯" name="network"> + <stat_bar label="パケットイン" name="packetsinstat"/> + <stat_bar label="パケットアウト" name="packetsoutstat"/> + <stat_bar label="オブジェクト" name="objectdatareceived"/> + <stat_bar label="テクスãƒãƒ£" name="texturedatareceived"/> + <stat_bar label="資産" name="assetudpdatareceived"/> + <stat_bar label="レイヤー" name="layersdatareceived"/> + <stat_bar label="実際ã®å—ä¿¡" name="messagedatain"/> + <stat_bar label="実際ã®é€ä¿¡" name="messagedataout"/> + <stat_bar label="VFS ä¿ç•™ä¸ã®æ“作" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="シミュレーター" name="sim"> + <stat_bar label="オブジェクト" name="simobjects"/> + <stat_bar label="アクティブãªã‚ªãƒ–ジェクト" name="simactiveobjects"/> + <stat_bar label="アクティブãªã‚¹ã‚¯ãƒªãƒ—ト" name="simactivescripts"/> + <stat_bar label="パケットイン" name="siminpps"/> + <stat_bar label="パケットアウト" name="simoutpps"/> + <stat_bar label="ä¿ç•™ä¸ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰" name="simpendingdownloads"/> + <stat_bar label="ä¿ç•™ä¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰" name="simpendinguploads"/> + <stat_bar label="未é€ä¿¡ãƒã‚¤ãƒˆåˆè¨ˆ" name="simtotalunackedbytes"/> + <stat_view label="時間（ms）" name="simperf"> + <stat_bar label="フレーム時間åˆè¨ˆ" name="simframemsec"/> + <stat_bar label="ç·æ™‚é–“æ•°" name="simnetmsec"/> + <stat_bar label="物ç†çš„作用時間" name="simsimphysicsmsec"/> + <stat_bar label="シミュレーション時間" name="simsimothermsec"/> + <stat_bar label="エージェント時間" name="simagentmsec"/> + <stat_bar label="イメージ時間" name="simimagesmsec"/> + <stat_bar label="スクリプト時間" name="simscriptmsec"/> + <stat_bar label="余暇" name="simsparemsec"/> + <stat_view label="時間ã®è©³ç´°ï¼ˆms）" name="timedetails"> + <stat_bar label="物ç†åŠ¹æžœã®å˜ä½" name="simsimphysicsstepmsec"/> + <stat_bar label="物ç†å½¢çŠ¶ã‚’æ›´æ–°" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="ä»–ã®ç‰©ç†åŠ¹æžœ" name="simsimphysicsothermsec"/> + <stat_bar label="スリープ時間" name="simsleepmsec"/> + <stat_bar label="ãƒãƒ³ãƒ— I/O" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml index 1922e4841a3..2b3b51f3b75 100755 --- a/indra/newview/skins/default/xui/ja/floater_stats.xml +++ b/indra/newview/skins/default/xui/ja/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="ベーシック" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="帯域幅" name="bandwidth"/> + <stat_bar label="UDP データをå—ã‘å–ã‚Šã¾ã—ãŸ" name="bandwidth"/> <stat_bar label="パケットãƒã‚¹" name="packet_loss"/> <stat_bar label="Pingシム" name="ping"/> </stat_view> <stat_view label="アドãƒãƒ³ã‚¹" name="advanced"> <stat_view label="æç”»" name="render"> - <stat_bar label="フレームã”ã¨ã® KTris æç”»" name="ktrisframe"/> - <stat_bar label="秒ã”ã¨ã® KTris æç”»" name="ktrissec"/> + <stat_bar label="KTris (フレームã”ã¨)" name="ktrisframe"/> + <stat_bar label="KTris (秒ã”ã¨)" name="ktrissec"/> <stat_bar label="オブジェクトåˆè¨ˆ" name="objs"/> <stat_bar label="æ–°è¦ã‚ªãƒ–ジェクト" name="newobjs"/> <stat_bar label="オブジェクトã‚ャッシュヒット率" name="object_cache_hits"/> + <stat_bar label="閉鎖クエリ実行" name="occlusion_queries"/> + <stat_bar label="閉鎖オブジェクト" name="occluded"/> + <stat_bar label="éžé–‰éŽ–オブジェクト" name="unoccluded"/> </stat_view> <stat_view label="テクスãƒãƒ£" name="texture"> <stat_bar label="ã‚ャッシュヒット率" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Raw メモリ" name="rawmemstat"/> <stat_bar label="çµ±åˆãƒ¡ãƒ¢ãƒª" name="glboundmemstat"/> </stat_view> + <stat_view label="メモリ使用é‡" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="UI" name="LLView"/> + <stat_bar label="フォント" name="LLFontFreetype"/> + <stat_bar label="インベントリ" name="LLInventoryObject"/> + <stat_bar label="ビューワ オブジェクト" name="LLViewerObject"/> + <stat_bar label="Octree グループ データ" name="LLViewerOctreeGroup"/> + <stat_bar label="Octree データ" name="LLViewerOctreeEntry"/> + <stat_bar label="ビューワ オブジェクト ã‚ャッシュ" name="LLVOCacheEntry"/> + <stat_bar label="æç”»å¯èƒ½ã‚ªãƒ–ジェクト" name="LLDrawable"/> + <stat_bar label="顔データ" name="LLFace"/> + <stat_bar label="æç”»æƒ…å ±" name="LLDrawInfo"/> + <stat_bar label="テクスãƒãƒ£ データ" name="LLTexture"/> + <stat_bar label="ç”»åƒãƒ‡ãƒ¼ã‚¿" name="LLImage"/> + <stat_bar label="GL ç”»åƒãƒ‡ãƒ¼ã‚¿" name="LLImageGL"/> + <stat_bar label="é ‚ç‚¹ãƒãƒƒãƒ•ã‚¡" name="LLVertexBuffer"/> + </stat_view> <stat_view label="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯" name="network"> <stat_bar label="パケットイン" name="packetsinstat"/> <stat_bar label="パケットアウト" name="packetsoutstat"/> - <stat_bar label="オブジェクト" name="objectkbitstat"/> - <stat_bar label="テクスãƒãƒ£" name="texturekbitstat"/> - <stat_bar label="アセット" name="assetkbitstat"/> - <stat_bar label="レイヤー" name="layerskbitstat"/> - <stat_bar label="実際ã®å—ä¿¡" name="actualinkbitstat"/> - <stat_bar label="実際ã®é€ä¿¡" name="actualoutkbitstat"/> + <stat_bar label="オブジェクト" name="objectdatareceived"/> + <stat_bar label="テクスãƒãƒ£" name="texturedatareceived"/> + <stat_bar label="資産" name="assetudpdatareceived"/> + <stat_bar label="レイヤー" name="layersdatareceived"/> + <stat_bar label="実際ã®å—ä¿¡" name="messagedatain"/> + <stat_bar label="実際ã®é€ä¿¡" name="messagedataout"/> <stat_bar label="VFS ä¿ç•™ä¸ã®æ“作" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="パケットアウト" name="simoutpps"/> <stat_bar label="ä¿ç•™ä¸ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰" name="simpendingdownloads"/> <stat_bar label="ä¿ç•™ä¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰" name="simpendinguploads"/> - <stat_bar label="未é€ä¿¡ãƒã‚¤ãƒˆåˆè¨ˆ" name="simtotalunackedbytes"/> - <stat_view label="時間（ms）" name="simperf"> + <stat_bar label="åˆè¨ˆæœªæ‰¿èªãƒ‡ãƒ¼ã‚¿" name="simtotalunackedbytes"/> + <stat_view label="時間" name="simperf"> <stat_bar label="フレーム時間åˆè¨ˆ" name="simframemsec"/> <stat_bar label="ç·æ™‚é–“æ•°" name="simnetmsec"/> <stat_bar label="物ç†çš„作用時間" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="イメージ時間" name="simimagesmsec"/> <stat_bar label="スクリプト時間" name="simscriptmsec"/> <stat_bar label="余暇" name="simsparemsec"/> - <stat_view label="時間ã®è©³ç´°ï¼ˆms）" name="timedetails"> + <stat_view label="時間ã®è©³ç´°" name="timedetails"> <stat_bar label="物ç†åŠ¹æžœã®å˜ä½" name="simsimphysicsstepmsec"/> <stat_bar label="物ç†å½¢çŠ¶ã‚’æ›´æ–°" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="ä»–ã®ç‰©ç†åŠ¹æžœ" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml index b04f602134d..80ce080e39c 100755 --- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã®è¡¨ç¤º" name="Show Profile"/> <menu_item_call label="IMã‚’é€ä¿¡..." name="Send IM"/> + <menu_item_call label="テレãƒãƒ¼ãƒˆã‚’リクエスト" name="Request Teleport"/> <menu_item_call label="ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’è¿½åŠ ..." name="Add Friend"/> <menu_item_call label="フレンドを削除..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 106b09453ae..8d6c983aa72 100755 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="å†ç”Ÿã™ã‚‹" name="Sound Play"/> <menu_item_call label="SLurl をコピー" name="url_copy"/> <menu_item_call label="ランドマークã®æƒ…å ±" name="About Landmark"/> + <menu_item_call label="地図ã«è¡¨ç¤º" name="show_on_map"/> <menu_item_call label="インワールドã§å†ç”Ÿã™ã‚‹" name="Animation Play"/> <menu_item_call label="ãƒãƒ¼ã‚«ãƒ«ã§å†ç”Ÿã™ã‚‹" name="Animation Audition"/> <menu_item_call label="インスタントメッセージをé€ä¿¡ã™ã‚‹" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml index 3918732fa8e..cd8bd52f91e 100755 --- a/indra/newview/skins/default/xui/ja/menu_login.xml +++ b/indra/newview/skins/default/xui/ja/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="[APP_NAME] を終了" name="Quit"/> </menu> <menu label="ヘルプ" name="Help"> - <menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/> + <menu_item_call label="ãƒã‚¦ãƒ„ー..." name="How To"/> + <menu_item_call label="クイックスタート" name="Quickstart"/> + <menu_item_call label="ナレッジベース" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="コミュニティ フォーラム" name="Community Forums"/> + <menu_item_call label="日本語サãƒãƒ¼ãƒˆãƒšãƒ¼ã‚¸" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] ブãƒã‚°" name="Second Life Blogs"/> + <menu_item_call label="ãƒã‚°ã‚’å ±å‘Šã™ã‚‹" name="Report Bug"/> <menu_item_call label="[APP_NAME] ã«ã¤ã„ã¦" name="About Second Life"/> </menu> <menu_item_check label="デãƒãƒƒã‚°ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã™ã‚‹" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml index 66bc32214fa..61642048b8c 100755 --- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="テレãƒãƒ¼ãƒˆ" name="Teleport"/> <menu_item_call label="ã‚‚ã£ã¨è©³ã—ã" name="More Information"/> - <menu_item_call label="クリップボードã«ã‚³ãƒ”ー" name="CopyToClipboard"/> + <menu_item_call label="SLurl をコピー" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index b1ec62115c6..b151915ae44 100755 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -72,11 +72,11 @@ <menu_item_check label="アドãƒãƒ³ã‚¹ãƒ¡ãƒ‹ãƒ¥ãƒ¼" name="Show Advanced Menu"/> </menu> <menu label="太陽" name="Sun"> - <menu_item_call label="æ—¥ã®å‡º" name="Sunrise"/> - <menu_item_call label="æ£åˆ" name="Noon"/> - <menu_item_call label="日没" name="Sunset"/> - <menu_item_call label="真夜ä¸" name="Midnight"/> - <menu_item_call label="リージョンã®è¨å®šã‚’使用" name="Use Region Settings"/> + <menu_item_check label="æ—¥ã®å‡º" name="Sunrise"/> + <menu_item_check label="æ£åˆ" name="Noon"/> + <menu_item_check label="日没" name="Sunset"/> + <menu_item_check label="真夜ä¸" name="Midnight"/> + <menu_item_check label="リージョンã®è¨å®šã‚’使用" name="Use Region Settings"/> </menu> <menu label="自然環境エディター" name="Environment Editor"> <menu_item_call label="自然環境ã®è¨å®š..." name="Environment Settings"/> @@ -165,8 +165,6 @@ </menu> <menu label="ヘルプ" name="Help"> <menu_item_call label="ãƒã‚¦ãƒ„ー..." name="How To"/> - <menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/> - <menu_item_call label="ユーザーガイド" name="User’s guide"/> <menu_item_call label="ナレッジベース" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="コミュニティフォーラム" name="Community Forums"/> @@ -188,6 +186,7 @@ <menu label="パフォーマンスツール" name="Performance Tools"> <menu_item_call label="ラグ計測器" name="Lag Meter"/> <menu_item_check label="統計ãƒãƒ¼" name="Statistics Bar"/> + <menu_item_call label="シーン ãƒãƒ¼ãƒ‰çµ±è¨ˆæƒ…å ±" name="Scene Load Statistics"/> <menu_item_check label="ã‚¢ãƒã‚¿ãƒ¼ã®æ画ウェイトを表示" name="Avatar Rendering Cost"/> </menu> <menu label="ãƒã‚¤ãƒ©ã‚¤ãƒˆã¨ç›®ã«è¦‹ãˆã‚‹ã‚‚ã®" name="Highlighting and Visibility"> @@ -250,6 +249,7 @@ <menu_item_check label="ファーストタイマー" name="Fast Timers"/> <menu_item_check label="メモリ" name="Memory"/> <menu_item_check label="風景ã®çµ±è¨ˆ" name="Scene Statistics"/> + <menu_item_check label="シーン ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚° モニター" name="Scene Loading Monitor"/> <menu_item_call label="テクスãƒãƒ£å–得デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Texture Fetch Debug Console"/> <menu_item_call label="ãƒªãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’ãƒ‡ãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸" name="Region Info to Debug Console"/> <menu_item_call label="ã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±ã‚’ãƒ‡ãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸" name="Group Info to Debug Console"/> @@ -286,6 +286,7 @@ <menu_item_check label="定期的ã«é…ã„フレームを挿入ã™ã‚‹" name="Periodic Slow Frame"/> <menu_item_check label="フレームテスト" name="Frame Test"/> <menu_item_call label="フレームプãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Frame Profile"/> + <menu_item_call label="ベンãƒãƒžãƒ¼ã‚¯" name="Benchmark"/> </menu> <menu label="メタデータã®ãƒ¬ãƒ³ãƒ€ãƒ¼" name="Render Metadata"> <menu_item_check label="ãƒã‚¦ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ãƒœãƒƒã‚¯ã‚¹" name="Bounding Boxes"/> @@ -304,6 +305,7 @@ <menu_item_check label="制作ã‚ュー" name="Build Queue"/> <menu_item_check label="å…‰" name="Lights"/> <menu_item_check label="骨組ã¿ã®è¡çªåˆ¤å®š" name="Collision Skeleton"/> + <menu_item_check label="ジョイント" name="Joints"/> <menu_item_check label="レイã‚ャスト" name="Raycast"/> <menu_item_check label="風ã®ãƒ™ã‚¯ãƒˆãƒ«" name="Wind Vectors"/> <menu_item_check label="æç”»ã®è©³ç´°åº¦" name="rendercomplexity"/> @@ -336,6 +338,7 @@ <menu_item_check label="装ç€ã•ã‚ŒãŸå…‰æºã‚’æç”»ã™ã‚‹" name="Render Attached Lights"/> <menu_item_check label="å–り付ã‘られãŸãƒ‘ーティクルをæç”»ã™ã‚‹" name="Render Attached Particles"/> <menu_item_check label="マウスオーãƒãƒ¼ã§å¼·èª¿è¡¨ç¤ºã™ã‚‹" name="Hover Glow Objects"/> + <menu_item_call label="ã‚ャッシュをã™ãã«ã‚¯ãƒªã‚¢" name="Cache Clear"/> </menu> <menu label="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯" name="Network"> <menu_item_check label="エージェントを一時åœæ¢ã™ã‚‹" name="AgentPause"/> @@ -368,7 +371,6 @@ <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/> <menu_item_call label="é¸æŠžã—ãŸã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Selected Object Info"/> <menu_item_call label="ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Agent Info"/> - <menu_item_check label="地域デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Region Debug Console"/> <menu_item_check label="SelectMgr ã®ãƒ‡ãƒãƒƒã‚°" name="Debug SelectMgr"/> <menu_item_check label="ダブルクリック" name="Debug Clicks"/> <menu_item_check label="デãƒãƒƒã‚°è¡¨ç¤º" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index f1c916bf533..518f82daaf4 100755 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -113,13 +113,13 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - 転é€ã«å¤±æ•— + '[ERROR_CODE]' エラーã§è»¢é€ã§ãã¾ã›ã‚“ã§ã—㟠システムã¾ãŸã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€ãƒ•ã‚©ãƒ«ãƒ€ã¯ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã«é€ä¿¡ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - マーケットプレイスã®åˆæœŸåŒ–ã«å¤±æ•— + '[ERROR_CODE]' エラーã§ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—㟠システムã¾ãŸã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€ãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> @@ -1768,6 +1768,10 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã ã“ã®ã¾ã¾ <nolink>[LOCATION]</nolink> ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> </notification> + <notification name="TeleportViaSLAPP"> + ã“ã®ã¾ã¾ <nolink>[LOCATION]</nolink> ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="SLAPP ã§ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ã‚’確èª" name="okcancelignore" notext="å–り消ã—" yestext="テレãƒãƒ¼ãƒˆ"/> + </notification> <notification name="TeleportToPick"> [PICK] ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ <usetemplate ignoretext="ピックã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> @@ -1979,6 +1983,9 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name ã‚’å‚ç…§ã—ã¦ãã æ–°ã—ã„ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®è¿½åŠ ã«é–¢ã™ã‚‹å•é¡Œï¼š ã„ãšã‚Œã‹ã®ä¸å‹•ç”£ã®ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ </notification> + <notification name="ProblemAddingEstateBanManager"> + ä¸å‹•ç”£æ‰€æœ‰è€…ã¾ãŸã¯ç®¡ç†è€…ã‚’ç¦æ¢ãƒªã‚¹ãƒˆã«è¿½åŠ ã§ãã¾ã›ã‚“。 + </notification> <notification name="ProblemAddingEstateGeneric"> ä¸å‹•ç”£ãƒªã‚¹ãƒˆã®è¿½åŠ ã«é–¢ã™ã‚‹å•é¡Œï¼š ã„ãšã‚Œã‹ã®ä¸å‹•ç”£ã®ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ @@ -3072,9 +3079,9 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ <nolink>[ITEMS]</nolink> -次ã®ä½äººã¨å…±æœ‰ã—ã¾ã™ã‹ï¼Ÿ +次ã®ä½äººã¨å…±æœ‰ï¼š -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3086,7 +3093,7 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ 次ã®ä½äººã¨å…±æœ‰ï¼š -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="Ok"/> </notification> <notification name="ItemsShared"> @@ -3541,10 +3548,6 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ <notification name="EjectComingSoon"> ã“ã“ã¸ã®å…¥å ´ãŒè¨±å¯ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€[EJECT_TIME] 秒後ã«è¿½æ”¾ã•ã‚Œã¾ã™ã€‚ </notification> - <notification name="NoEnterServerFull"> - サーãƒãƒ¼ãŒåŸ‹ã¾ã£ã¦ã„ã‚‹ãŸã‚〠-ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥å ´ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 - </notification> <notification name="SaveBackToInvDisabled"> 「「æŒã¡ç‰©ã€ã«ä¿å˜ã€ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚ </notification> @@ -3729,6 +3732,9 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ <notification name="LinkFailedTooMuchPhysics"> オブジェクトãŒä½¿ç”¨ã—ã¦ã„る物ç†ãƒªã‚½ãƒ¼ã‚¹ãŒå¤šã™ãŽãŸãŸã‚ã€ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ã‚¹ãŒç„¡åŠ¹ã«ã•ã‚Œã¾ã—ãŸã€‚ </notification> + <notification name="EstateManagerFailedllTeleportHome"> + [SLURL] ã®ã‚ªãƒ–ジェクト '[OBJECT_NAME]' ã§ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®ãƒ›ãƒ¼ãƒ をテレãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“。 + </notification> <notification name="TeleportedHomeByObjectOnParcel"> 区画 '[PARCEL_NAME]' ã®ã‚ªãƒ–ジェクト '[OBJECT_NAME]' ã«ã‚ˆã£ã¦ã€ã‚ãªãŸã¯ãƒ›ãƒ¼ãƒ ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸã€‚ </notification> @@ -3919,13 +3925,18 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ é¸æŠžç¯„囲ã®ãƒªãƒ¼ã‚¹åŒºç”»ã®æ•°ãŒå°‘ãªã„ãŸã‚ã€å‚åŠ ã§ãã¾ã›ã‚“。 </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - 土地を分割ã§ãã¾ã›ã‚“。\n区画ãŒè¤‡æ•°é¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚\nã‚‚ã£ã¨å°ã•ã„土地をé¸æŠžã—ã¦ã¿ã¦ãã ã•ã„。 + 土地を分割ã§ãã¾ã›ã‚“。 +複数ã®åŒºç”»ãŒé¸æŠžã•ã‚Œã¾ã—ãŸã€‚ +å°ã•ã„区画をé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CantDivideLandCantFindParcel"> - 土地を分解ã§ãã¾ã›ã‚“。\n区画ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。\n「Helpã€>「Reprt Bug...ã€ã§ãƒ¬ãƒãƒ¼ãƒˆã‚’è¡Œã£ã¦ãã ã•ã„。 + 土地を分割ã§ãã¾ã›ã‚“。 +区画ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 +「ヘルプ〠-> 「ãƒã‚°ã®å ±å‘Šã€ã§å ±å‘Šã—ã¦ãã ã•ã„。 </notification> <notification name="CantDivideLandWholeParcelSelected"> - 土地を分割ã§ãã¾ã›ã‚“。区画全体をé¸æŠžã—ã¾ã™ã€‚\nå°ã•ã„土地をé¸æŠžã—ã¦ã¿ã¦ãã ã•ã„。 + 土地を分割ã§ãã¾ã›ã‚“。区画全体ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ +å°ã•ã„区画をé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="LandHasBeenDivided"> 土地ãŒåˆ†å‰²ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -4065,4 +4076,8 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ ファイルを移動ã§ãã¾ã›ã‚“。以å‰ã®ãƒ‘スãŒãƒªã‚¹ãƒˆã‚¢ã•ã‚Œã¾ã—ãŸã€‚ <usetemplate ignoretext="ファイルを移動ã§ãã¾ã›ã‚“。以å‰ã®ãƒ‘スãŒãƒªã‚¹ãƒˆã‚¢ã•ã‚Œã¾ã—ãŸã€‚" name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + ãƒãƒ£ãƒƒãƒˆå±¥æ´ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‰ã®æ“作ã§ãƒ“ジーã§ã™ã€‚2ã€3 分経ã£ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã™ã‹ã€åˆ¥ã®äººã¨ã®ãƒãƒ£ãƒƒãƒˆã‚’é¸æŠžã—ã¦ãã ã•ã„。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index 7aa1aec6d0e..ebcb36d950c 100755 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.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="GroupInfo"> <panel.string name="default_needs_apply_text"> ä¿å˜ã—ã¦ã„ãªã„変更ãŒã‚ã‚Šã¾ã™ @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="一般"/> - <accordion_tab name="group_roles_tab" title="役割"/> + <accordion_tab name="group_roles_tab" title="役割 & メンãƒãƒ¼"/> <accordion_tab name="group_notices_tab" title="通知"/> <accordion_tab name="group_land_tab" title="土地・資産"/> </accordion> diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml index d40dedf5669..8ca63988c33 100755 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml @@ -21,6 +21,7 @@ Ctrl ã‚ーを押ã—ãªãŒã‚‰ãƒ¡ãƒ³ãƒãƒ¼åをクリックã™ã‚‹ã¨ <name_list.columns label="メンãƒãƒ¼" name="name"/> <name_list.columns label="寄付" name="donated"/> <name_list.columns label="ステータス" name="online"/> + <name_list.columns label="è·å" name="title"/> </name_list> <button label="招待" name="member_invite"/> <button label="追放" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml index 169da27ce5e..908af3d66a3 100755 --- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml @@ -7,11 +7,8 @@ 未知 </text> <check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="ã“ã®åœ°åŸŸã®ã‚¹ã‚¯ãƒªãƒ—トをã™ã¹ã¦ç„¡åŠ¹ã«ã—ã¾ã™"/> - <button label="?" name="disable_scripts_help"/> <check_box label="è¡çªã‚’無効化" name="disable_collisions_check" tool_tip="ã“ã®åœ°åŸŸã®éžã‚¢ãƒã‚¿ãƒ¼è¡çªã‚’無効ã«ã—ã¾ã™"/> - <button label="?" name="disable_collisions_help"/> <check_box label="物ç†ä½œç”¨ã‚’無効化" name="disable_physics_check" tool_tip="ã“ã®åœ°åŸŸã®ç‰©ç†ä½œç”¨ã‚’ã™ã¹ã¦ç„¡åŠ¹ã«ã—ã¾ã™"/> - <button label="?" name="disable_physics_help"/> <button label="é©ç”¨" name="apply_btn"/> <text name="objret_text_lbl" width="120"> オブジェクトã®è¿”å´ @@ -31,10 +28,8 @@ <check_box label="ã“ã®ä¸å‹•ç”£ã«å±žã™ã‚‹ã™ã¹ã¦ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚‚ã®" name="return_estate_wide" tool_tip="ã“ã®ä¸å‹•ç”£ã«å«ã¾ã‚Œã¦ã„ã‚‹ã™ã¹ã¦ã®åœ°åŸŸã®ã‚ªãƒ–ジェクトを返å´ã—ã¾ã™"/> <button label="è¿”å´" name="return_btn"/> <button label="上部コライダーå–å¾—" name="top_colliders_btn" tool_tip="è¡çªã™ã‚‹å¯èƒ½æ€§ãŒæœ€ã‚‚高ã„オブジェクトã®ãƒªã‚¹ãƒˆ"/> - <button label="?" name="top_colliders_help"/> - <button label="上部スクリプトå–å¾—" name="top_scripts_btn" tool_tip="スクリプトã®å®Ÿè¡Œã«æœ€ã‚‚時間を費やã—ã¦ã„るオブジェクトã®ãƒªã‚¹ãƒˆ"/> - <button label="?" name="top_scripts_help"/> <button label="地域å†èµ·å‹•" name="restart_btn" tool_tip="2分間ã®ã‚«ã‚¦ãƒ³ãƒˆãƒ€ã‚¦ãƒ³å¾Œã€åœ°åŸŸã‚’å†èµ·å‹•ã—ã¾ã™"/> - <button label="?" name="restart_help"/> + <button label="上部スクリプトå–å¾—" name="top_scripts_btn" tool_tip="スクリプトã®å®Ÿè¡Œã«æœ€ã‚‚時間を費やã—ã¦ã„るオブジェクトã®ãƒªã‚¹ãƒˆ"/> <button label="å†èµ·å‹•ã‚’ã‚ャンセル" name="cancel_restart_btn" tool_tip="リージョンã®å†èµ·å‹•ã‚’ã‚ャンセル"/> + <button label="地域デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="region_debug_console_btn" tool_tip="地域デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã‚’é–‹ã"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index 65148cf1eee..d23007dc6b2 100755 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="地形編集をブãƒãƒƒã‚¯" name="block_terraform_check"/> <check_box label="飛行をブãƒãƒƒã‚¯" name="block_fly_check"/> + <check_box label="区画ã®é£›è¡Œã‚’ブãƒãƒƒã‚¯" name="block_fly_over_check" tool_tip="アクセス ãƒã‚§ãƒƒã‚¯ã‚’上方å‘ã«æ‹¡å¤§ã—ã€åŒºç”»ã‚’超ãˆã‚‹é£›è¡Œã‚’防ãŽã¾ã™"/> <check_box label="ダメージを許å¯" name="allow_damage_check"/> <check_box label="プッシュを制é™" name="restrict_pushobject"/> <check_box label="土地ã®å†è²©ã‚’許å¯" name="allow_land_resell_check"/> <check_box label="土地ã®çµ±åˆãƒ»åˆ†å‰²ã‚’許å¯" name="allow_parcel_changes_check"/> <check_box label="土地ã®æ¤œç´¢è¡¨ç¤ºã‚’ブãƒãƒƒã‚¯" name="block_parcel_search_check" tool_tip="検索çµæžœã§ã€ã“ã®åœ°åŸŸã¨åŒºç”»ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã§ã™"/> - <check_box label="メッシュオブジェクトを許å¯" name="mesh_rez_enabled_check" tool_tip="ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ãƒ¡ãƒƒã‚·ãƒ¥ã‚ªãƒ–ジェクト㮠Rez を許å¯ã™ã‚‹"/> <spinner label="ã‚¢ãƒã‚¿ãƒ¼æ•°ä¸Šé™" name="agent_limit_spin"/> <spinner label="物体ボーナス" name="object_bonus_spin"/> <text label="æˆäººæŒ‡å®š" name="access_text"> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index 32e84ce5429..5aa0e86a5b5 100755 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml @@ -28,12 +28,12 @@ <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="info_btn" tool_tip="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示ã™ã‚‹"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="共有" name="share_btn" tool_tip="インベントリã®ã‚¢ã‚¤ãƒ†ãƒ を共有ã™ã‚‹"/> + <button label="共有" name="share_btn" tool_tip="「æŒã¡ç‰©ã€ã®ã‚¢ã‚¤ãƒ†ãƒ を共有ã™ã‚‹"/> </layout_panel> <layout_panel name="shop_btn_lp"> - <button label="店" name="shop_btn" tool_tip="マーケットプレイスã®ã‚µã‚¤ãƒˆã‚’é–‹ã"/> + <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスã®ã‚µã‚¤ãƒˆã‚’é–‹ã"/> <button label="装ç€" name="wear_btn" tool_tip="é¸æŠžã—ãŸã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‚’ç€ç”¨ã™ã‚‹"/> - <button label="プレイ" name="play_btn"/> + <button label="å†ç”Ÿ" name="play_btn"/> <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn" tool_tip="該当ã™ã‚‹ã‚¨ãƒªã‚¢ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 36966d6825c..88fb652399f 100755 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -37,6 +37,44 @@ <string name="StartupRequireDriverUpdate"> グラフィックをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚グラフィックドライãƒã‚’æ›´æ–°ã—ã¦ãã ã•ã„。 </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + コンパイラー [COMPILER] [COMPILER_VERSION] ãƒãƒ¼ã‚¸ãƒ§ãƒ³ + </string> + <string name="AboutPosition"> + ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_LOCAL_0,number,1]ã€[POSITION_LOCAL_1,number,1]ã€[POSITION_LOCAL_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ <nolink>[HOSTNAME]</nolink> ã§ã™ã€‚（[HOSTIP]） +SLURL:<nolink>[SLURL]</nolink> +(ã‚°ãƒãƒ¼ãƒãƒ«åº§æ¨™ [POSITION_0,number,1]ã€[POSITION_1,number,1]ã€[POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU：[CPU] +メモリ：[MEMORY_MB] MB +OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OS_VERSION] +ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰è£½é€ å…ƒï¼š[GRAPHICS_CARD_VENDOR] +グラフィックカード:[GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Windows グラフィックドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + OpenGL ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[OPENGL_VERSION] + +libcurl ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[LIBCURL_VERSION] +J2C デコーダãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[J2C_VERSION] +オーディオドライãƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[AUDIO_DRIVER_VERSION] +Qt Webkit ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š[QT_WEBKIT_VERSION] +ボイスサーãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³:[VOICE_VERSION] + </string> + <string name="AboutTraffic"> + パケットãƒã‚¹ï¼š[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%） + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + サーãƒãƒ¼ã®ãƒªãƒªãƒ¼ã‚¹ãƒŽãƒ¼ãƒˆã® URL ã‚’å–å¾—ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ + </string> <string name="ProgressRestoring"> 復元ä¸ã§ã™... </string> @@ -937,15 +975,15 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="ControlYourCamera"> カメラã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ« </string> + <string name="TeleportYourAgent"> + ã‚ãªãŸã‚’テレãƒãƒ¼ãƒˆ + </string> <string name="NotConnected"> 接続ã•ã‚Œã¦ã„ã¾ã›ã‚“ </string> <string name="AgentNameSubst"> (ã‚ãªãŸ) </string> - <string name="TeleportYourAgent"> - ã‚ãªãŸã‚’テレãƒãƒ¼ãƒˆ - </string> <string name="JoinAnExperience"> 体験ã«å‚åŠ ã™ã‚‹ </string> @@ -1270,8 +1308,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="InventoryInboxNoItems"> マーケットプレイスã§è³¼å…¥ã—ãŸå•†å“ã¯ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ãã®å¾Œã€ã‚¢ã‚¤ãƒ†ãƒ をインベントリã«ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚Œã°ã€ãれらã®ã‚¢ã‚¤ãƒ†ãƒ を使用ã§ãã¾ã™ã€‚ </string> - <string name="Unconstrained">éžæ‹˜æŸ</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1300,6 +1337,18 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="InventoryOutboxNoItems"> [[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]ã«è²©å£²ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ を一覧ã™ã‚‹ã«ã¯ã€ãƒ•ã‚©ãƒ«ãƒ€ã‚’ã“ã®ã‚¨ãƒªã‚¢ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã€ã€Œãƒžãƒ¼ã‚±ãƒƒãƒˆãƒ—レイスã«é€ä¿¡ã€ã‚’クリックã—ã¾ã™ã€‚ </string> + <string name="InventoryOutboxInitializingTitle"> + マーケットプレイスã®åˆæœŸåŒ–。 + </string> + <string name="InventoryOutboxInitializing"> + [[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„ã¾ã™ã€‚ + </string> + <string name="InventoryOutboxErrorTitle"> + マーケットプレイス エラー。 + </string> + <string name="InventoryOutboxError"> + [[MARKETPLACE_CREATE_STORE_URL] マーケットプレイス ストア] ãŒã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¦ã„ã¾ã™ã€‚ + </string> <string name="Marketplace Error None"> エラーãªã— </string> @@ -1327,6 +1376,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="Open landmarks"> ランドマークを開ã </string> + <string name="Unconstrained"> + éžæ‹˜æŸ + </string> <string name="no_transfer" value=" （å†è²©ãƒ»ãƒ—レゼントä¸å¯ï¼‰"/> <string name="no_modify" value=" （編集ä¸å¯ï¼‰"/> <string name="no_copy" value=" （コピーä¸å¯ï¼‰"/> @@ -1727,6 +1779,9 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <string name="CompileQueueDownloadedCompiling"> ダウンãƒãƒ¼ãƒ‰å®Œäº†ã€ã‚³ãƒ³ãƒ‘ã‚¤ãƒ«ä¸ </string> + <string name="CompileQueueServiceUnavailable"> + スクリプト コンパイル サービスを利用ã§ãã¾ã›ã‚“ + </string> <string name="CompileQueueScriptNotFound"> サーãƒãƒ¼ä¸Šã«ã‚¹ã‚¯ãƒªãƒ—トãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 </string> diff --git a/indra/newview/skins/default/xui/pt/floater_region_restarting.xml b/indra/newview/skins/default/xui/pt/floater_region_restarting.xml new file mode 100644 index 00000000000..7fd13c0d756 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="REINICIANDO REGIÃO"> + <string name="RegionName"> + A região na qual você está ([NAME]) está prestes a ser reiniciada. + +Se permanecer aqui, você será desconectado. + </string> + <string name="RestartSeconds"> + Segundos até o reinÃcio +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + A região na qual você está (-Nome mais longo da região-) está prestes a ser reiniciada. + +Se permanecer aqui, você será desconectado. + </text> + <text name="restart_seconds"> + Segundos até o reinÃcio + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml new file mode 100644 index 00000000000..027e1ef3116 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="ESTATÃSTICAS DE CARREGAMENTO DE CENA"> + <button label="Pausar" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Básico" name="basic"> + <stat_bar label="Diferença de frame em pixels" name="frame difference"/> + <stat_bar label="Dados de UDP recebidos" name="bandwidth"/> + <stat_bar label="Bandwidth" name="packet_loss"/> + </stat_view> + <stat_view label="Avançado" name="advanced"> + <stat_view label="Render" name="render"> + <stat_bar label="Total Objects" name="objs"/> + <stat_bar label="New Objects" name="newobjs"/> + <stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/> + </stat_view> + <stat_view label="Textura" name="texture"> + <stat_bar label="Taxa de acertos do cache" name="texture_cache_hits"/> + <stat_bar label="Latência de leitura do cache" name="texture_cache_read_latency"/> + <stat_bar label="Contagem" name="numimagesstat"/> + <stat_bar label="Raw Count" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Network" name="network"> + <stat_bar label="Packets In" name="packetsinstat"/> + <stat_bar label="Packets Out" name="packetsoutstat"/> + <stat_bar label="Objetos" name="objectdatareceived"/> + <stat_bar label="Textura" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Layers" name="layersdatareceived"/> + <stat_bar label="Actual In" name="messagedatain"/> + <stat_bar label="Actual Out" name="messagedataout"/> + <stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulator" name="sim"> + <stat_bar label="Objetos" name="simobjects"/> + <stat_bar label="Active Objects" name="simactiveobjects"/> + <stat_bar label="Active Scripts" name="simactivescripts"/> + <stat_bar label="Packets In" name="siminpps"/> + <stat_bar label="Packets Out" name="simoutpps"/> + <stat_bar label="Pending Downloads" name="simpendingdownloads"/> + <stat_bar label="Pending Uploads" name="simpendinguploads"/> + <stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/> + <stat_view label="Time (ms)" name="simperf"> + <stat_bar label="Total Frame Time" name="simframemsec"/> + <stat_bar label="Net Time" name="simnetmsec"/> + <stat_bar label="Physics Time" name="simsimphysicsmsec"/> + <stat_bar label="Simulation Time" name="simsimothermsec"/> + <stat_bar label="Agent Time" name="simagentmsec"/> + <stat_bar label="Images Time" name="simimagesmsec"/> + <stat_bar label="Script Time" name="simscriptmsec"/> + <stat_bar label="Tempo restante" name="simsparemsec"/> + <stat_view label="Detalhes de tempo (ms)" name="timedetails"> + <stat_bar label="Etapa fÃsica" name="simsimphysicsstepmsec"/> + <stat_bar label="Atualizar formas fÃsicas" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="FÃsica - outros" name="simsimphysicsothermsec"/> + <stat_bar label="Tempo de espera" name="simsleepmsec"/> + <stat_bar label="Bombear ES" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml index be53624145f..ef3307f54a5 100755 --- a/indra/newview/skins/default/xui/pt/floater_stats.xml +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="Básico" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Bandwidth" name="bandwidth"/> + <stat_bar label="Dados de UDP recebidos" name="bandwidth"/> <stat_bar label="Bandwidth" name="packet_loss"/> <stat_bar label="Ping Sim" name="ping"/> </stat_view> <stat_view label="Avançado" name="advanced"> <stat_view label="Render" name="render"> - <stat_bar label="KTris desenhados por quadro" name="ktrisframe"/> - <stat_bar label="KTris desenhados por segundo" name="ktrissec"/> + <stat_bar label="KTris por quadro" name="ktrisframe"/> + <stat_bar label="KTris por segundo" name="ktrissec"/> <stat_bar label="Total Objects" name="objs"/> <stat_bar label="New Objects" name="newobjs"/> <stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/> + <stat_bar label="Consultas de oclusão realizadas" name="occlusion_queries"/> + <stat_bar label="Objetos ocultos" name="occluded"/> + <stat_bar label="Objeto não oculto" name="unoccluded"/> </stat_view> <stat_view label="Texture" name="texture"> <stat_bar label="Taxa de acertos do cache" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Raw Mem" name="rawmemstat"/> <stat_bar label="Bound Mem" name="glboundmemstat"/> </stat_view> + <stat_view label="Uso de memória" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="Interface" name="LLView"/> + <stat_bar label="Fontes" name="LLFontFreetype"/> + <stat_bar label="Inventário" name="LLInventoryObject"/> + <stat_bar label="Objetos do visualizador" name="LLViewerObject"/> + <stat_bar label="Dados do grupo de octrees" name="LLViewerOctreeGroup"/> + <stat_bar label="Dados da octree" name="LLViewerOctreeEntry"/> + <stat_bar label="Cache de objetos do visualizador" name="LLVOCacheEntry"/> + <stat_bar label="Drawables" name="LLDrawable"/> + <stat_bar label="Dados do rosto" name="LLFace"/> + <stat_bar label="Informações de desenho" name="LLDrawInfo"/> + <stat_bar label="Dados de textura" name="LLTexture"/> + <stat_bar label="Dados de imagem" name="LLImage"/> + <stat_bar label="Dados de imagem do GL" name="LLImageGL"/> + <stat_bar label="Buffers do Vertex" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Rede" name="network"> <stat_bar label="Packets In" name="packetsinstat"/> <stat_bar label="Packets Out" name="packetsoutstat"/> - <stat_bar label="Objects" name="objectkbitstat"/> - <stat_bar label="Texture" name="texturekbitstat"/> - <stat_bar label="Asset" name="assetkbitstat"/> - <stat_bar label="Layers" name="layerskbitstat"/> - <stat_bar label="Actual In" name="actualinkbitstat"/> - <stat_bar label="Actual Out" name="actualoutkbitstat"/> + <stat_bar label="Objetos" name="objectdatareceived"/> + <stat_bar label="Textura" name="texturedatareceived"/> + <stat_bar label="Asset" name="assetudpdatareceived"/> + <stat_bar label="Layers" name="layersdatareceived"/> + <stat_bar label="Actual In" name="messagedatain"/> + <stat_bar label="Actual Out" name="messagedataout"/> <stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -53,7 +73,8 @@ <stat_bar label="Etapas de silhueta ignoradas" name="simsimskippedsilhouettesteps"/> <stat_bar label="Personagens atualizados" name="simsimpctsteppedcharacters"/> </stat_view> - <stat_view label="Time (ms)" name="simperf"> + <stat_bar label="Total de dados não reconhecidos" name="simtotalunackedbytes"/> + <stat_view label="Hora" name="simperf"> <stat_bar label="Total Frame Time" name="simframemsec"/> <stat_bar label="Net Time" name="simnetmsec"/> <stat_bar label="Physics Time" name="simsimphysicsmsec"/> @@ -62,7 +83,7 @@ <stat_bar label="Images Time" name="simimagesmsec"/> <stat_bar label="Script Time" name="simscriptmsec"/> <stat_bar label="Tempo restante" name="simsparemsec"/> - <stat_view label="Detalhes de tempo (ms)" name="timedetails"> + <stat_view label="Detalhes de hora" name="timedetails"> <stat_bar label="Etapa fÃsica" name="simsimphysicsstepmsec"/> <stat_bar label="Atualizar formas fÃsicas" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="FÃsica - outros" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml index beba969b7ef..f6211790a87 100755 --- a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Ver perfil" name="Show Profile"/> <menu_item_call label="Enviar MI..." name="Send IM"/> + <menu_item_call label="Solicitar teletransporte" name="Request Teleport"/> <menu_item_call label="Adicionar amigo..." name="Add Friend"/> <menu_item_call label="Remover amigo..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index a3a648eb34c..636b356c8ba 100755 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="Executar som" name="Sound Play"/> <menu_item_call label="Copiar SLurl" name="url_copy"/> <menu_item_call label="Sobre o marco" name="About Landmark"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> <menu_item_call label="Executar animação" name="Animation Play"/> <menu_item_call label="Executar áudio" name="Animation Audition"/> <menu_item_call label="Mandar MI" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index cd840f3137f..29dae6292a5 100755 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="Sair do [APP_NAME]" name="Quit"/> </menu> <menu label="Ajuda" name="Help"> - <menu_item_call label="Ajuda do [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="Como..." name="How To"/> + <menu_item_call label="InÃcio rápido" name="Quickstart"/> + <menu_item_call label="Base de conhecimento" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Fóruns da comunidade" name="Community Forums"/> + <menu_item_call label="Portal de suporte" name="Support portal"/> + <menu_item_call label="NotÃcias do [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/> + <menu_item_call label="Relatar bug" name="Report Bug"/> <menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml index ec1e7a09502..3a2b3a88476 100755 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teletransportar" name="Teleport"/> <menu_item_call label="Mais informações" name="More Information"/> - <menu_item_call label="Copiar" name="CopyToClipboard"/> + <menu_item_call label="Copiar SLurl" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index e6eceb5f2fd..d106c47c64b 100755 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -72,11 +72,11 @@ <menu_item_check label="Menu avançado" name="Show Advanced Menu"/> </menu> <menu label="Sol" name="Sun"> - <menu_item_call label="Amanhecer" name="Sunrise"/> - <menu_item_call label="Meio-dia" name="Noon"/> - <menu_item_call label="Pôr-do-sol" name="Sunset"/> - <menu_item_call label="Meia-noite" name="Midnight"/> - <menu_item_call label="Usar configurações da região" name="Use Region Settings"/> + <menu_item_check label="Amanhecer" name="Sunrise"/> + <menu_item_check label="Meio-dia" name="Noon"/> + <menu_item_check label="Pôr-do-sol" name="Sunset"/> + <menu_item_check label="Meia-noite" name="Midnight"/> + <menu_item_check label="Usar configurações da região" name="Use Region Settings"/> </menu> <menu label="Editor de ambientes" name="Environment Editor"> <menu_item_call label="Configurações do ambiente..." name="Environment Settings"/> @@ -165,8 +165,6 @@ </menu> <menu label="Ajuda" name="Help"> <menu_item_call label="Como..." name="How To"/> - <menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/> - <menu_item_call label="Guia do usuário" name="User’s guide"/> <menu_item_call label="Base de conhecimento" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Fóruns da comunidade" name="Community Forums"/> @@ -188,6 +186,7 @@ <menu label="Ferramentas de desempenho" name="Performance Tools"> <menu_item_call label="Medidor de lag" name="Lag Meter"/> <menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/> + <menu_item_call label="EstatÃsticas de carregamento de cena" name="Scene Load Statistics"/> <menu_item_check label="Mostrar peso do desenho para avatares" name="Avatar Rendering Cost"/> </menu> <menu label="Realces e visibilidade" name="Highlighting and Visibility"> @@ -249,6 +248,7 @@ <menu_item_check label="Tempos" name="Fast Timers"/> <menu_item_check label="Memória" name="Memory"/> <menu_item_check label="EstatÃsticas da cena" name="Scene Statistics"/> + <menu_item_check label="Monitor de carregamento de cena" name="Scene Loading Monitor"/> <menu_item_call label="Painel de depuração de obtenção de textura" name="Texture Fetch Debug Console"/> <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/> <menu_item_check label="Câmera:" name="Camera"/> @@ -280,6 +280,7 @@ <menu_item_check label="Taxa de quadros aleatória" name="Randomize Framerate"/> <menu_item_check label="Frame Test" name="Frame Test"/> <menu_item_call label="Perfil do quadro" name="Frame Profile"/> + <menu_item_call label="Benchmark" name="Benchmark"/> </menu> <menu label="Render Metadata" name="Render Metadata"> <menu_item_check label="Normais" name="Normals"/> @@ -287,6 +288,7 @@ <menu_item_check label="Tipo de atualização" name="Update Type"/> <menu_item_check label="Dados LOD" name="LOD Info"/> <menu_item_check label="Fila de construção" name="Build Queue"/> + <menu_item_check label="Junções" name="Joints"/> <menu_item_check label="Vetores de vento" name="Wind Vectors"/> <menu_item_check label="Renderizar complexidade" name="rendercomplexity"/> <menu_item_check label="Bytes do anexo" name="attachment bytes"/> @@ -312,6 +314,7 @@ <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> <menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/> + <menu_item_call label="Limpar cache imediatamente" name="Cache Clear"/> </menu> <menu label="Rede" name="Network"> <menu_item_check label="Pausar avatar" name="AgentPause"/> @@ -327,7 +330,6 @@ <menu_item_call label="Teste de mÃdia do navegador" name="Web Browser Test"/> <menu_item_call label="Navegador de conteúdo web" name="Web Content Browser"/> <menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/> - <menu_item_check label="Console de depuração de região" name="Region Debug Console"/> <menu_item_check label="Debug Clicks" name="Debug Clicks"/> <menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index d5096ec8586..4e6b0765cba 100755 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -113,15 +113,15 @@ Consulte o [[MARKETPLACE_IMPORTS_URL] log de erros] para mais informações. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Falha de transferência + Falha na transferência com o erro '[ERROR_CODE]' -Nenhuma pasta enviada para o Mercado devido a um erro do sistema ou da rede. Tente novamente mais tarde. +Nenhuma pasta foi enviada ao Marketplace devido a um erro do sistema ou da rede. Tente novamente mais tarde. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Falha na inicialização do Mercado + Falha na inicialização do Marketplace com o erro '[ERROR_CODE]' -Falha na inicialização do mercado devido a um erro do sistema ou da rede. Tente novamente mais tarde. +Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema ou da rede. Tente novamente mais tarde. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CompileQueueSaveText"> @@ -1722,6 +1722,10 @@ Por favor volte mais tarde. Tem certeza de quer ser teletransportado para <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Confirmar se eu quero ser teletransportado para marcos" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> </notification> + <notification name="TeleportViaSLAPP"> + Tem certeza de quer ser teletransportado para <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Confirmo que desejo me teleportar via SLAPP" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> + </notification> <notification name="TeleportToPick"> Teletransportar para [PICK]? <usetemplate ignoretext="Confirmar se eu quero ser teletransportado para Destaques" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> @@ -1932,6 +1936,9 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar. <notification name="ProblemAddingEstateManager"> Problemas em adicionar um novo gerente da propriedade. Uma ou mais propriedades podem ter uma lista de gerentes cheia. </notification> + <notification name="ProblemAddingEstateBanManager"> + Não é possÃvel adicionar proprietários ou gerentes de terreno à lista de bloqueio. + </notification> <notification name="ProblemAddingEstateGeneric"> Problemas em adicionar a esta lista de propriedades. Uma ou mais propriedades podem ter uma lista cheia. </notification> @@ -3012,19 +3019,25 @@ Mais detalhes no log. Não foi possÃvel obter o recurso '[CAPABILITY]' da região. </notification> <notification name="ShareItemsConfirmation"> - Tem certeza de que quer compartilhar os itens abaixo? + Tem certeza de que deseja compartilhar os itens abaixo? <nolink>[ITEMS]</nolink> Com os seguintes residentes: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> - Apenas uma pasta pode ser compartilhada por vez. + É possÃvel compartilhar apenas uma pasta de cada vez. + +Tem certeza de que deseja compartilhar os itens abaixo? + +<nolink>[ITEMS]</nolink> -Tem certeza de que quer compartilhar os itens abaixo? +Com os seguintes residentes: + +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ItemsShared"> @@ -3478,10 +3491,6 @@ Tente novamente em instantes. <notification name="EjectComingSoon"> Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair. </notification> - <notification name="NoEnterServerFull"> - Você não pode entrar nesta região porque -o servidor está cheio. - </notification> <notification name="SaveBackToInvDisabled"> Salvar no inventário foi desativado. </notification> @@ -3671,6 +3680,9 @@ o servidor está cheio. <notification name="LinkFailedTooMuchPhysics"> O objeto usa muitos recursos fÃsicos – sua dinâmica foi desativada. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + O objeto '[OBJECT_NAME]' em [SLURL] não pode teleportar gerentes de terreno de volta para casa. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Você foi teletransportado para seu inÃcio pelo objeto '[OBJECT_NAME]' no lote '[PARCEL_NAME]' </notification> @@ -3861,13 +3873,18 @@ o servidor está cheio. Não há lotes alugados suficientes na seleção para reunir. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - Não é possÃvel dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno. + Não é possÃvel dividir o terreno. +Mais de um lote foi selecionado. +Tente selecionar uma quantidade menor de terreno. </notification> <notification name="CantDivideLandCantFindParcel"> - Não é possÃvel dividir o terreno.\nNão é possÃvel encontrar o lote.\nComunique isso em Ajuda -> Relatar bug... + Não é possÃvel dividir o terreno. +Não é possÃvel encontrar o lote. +Reporte em Ajuda -> Relatar bug... </notification> <notification name="CantDivideLandWholeParcelSelected"> - Não é possÃvel dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno. + Não é possÃvel dividir o terreno. Todo o lote foi selecionado. +Tente selecionar uma quantidade menor de terreno. </notification> <notification name="LandHasBeenDivided"> O terreno foi dividido. @@ -4007,4 +4024,8 @@ o servidor está cheio. Não foi possÃvel mover arquivos. Caminho anterior restaurado. <usetemplate ignoretext="Não foi possÃvel mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml index 30c825723b4..7d8531a482d 100755 --- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Geral"/> - <accordion_tab name="group_roles_tab" title="Cargos"/> + <accordion_tab name="group_roles_tab" title="Funções e membros"/> <accordion_tab name="group_notices_tab" title="Avisos"/> <accordion_tab name="group_land_tab" title="Terrenos/Bens"/> </accordion> diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml index 11a31570d11..84d275a8f26 100755 --- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml @@ -19,8 +19,9 @@ <name_list.columns label="Membro" name="name"/> <name_list.columns label="Doações" name="donated"/> <name_list.columns label="Status" name="online"/> + <name_list.columns label="TÃtulo" name="title"/> </name_list> - <button label="Convidar" name="member_invite" /> + <button label="Convidar" name="member_invite"/> <button label="Ejetar" name="member_eject"/> </panel> <panel label="CARGOS" name="roles_sub_tab"> diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml index be15d40d742..9070563fd05 100755 --- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml @@ -7,11 +7,8 @@ desconhecido </text> <check_box label="Desativar scripts" name="disable_scripts_check" tool_tip="Desativar todos os scripts nesta região"/> - <button label="?" name="disable_scripts_help"/> <check_box label="Desativar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/> - <button label="?" name="disable_collisions_help"/> <check_box label="Desativar fÃsica" name="disable_physics_check" tool_tip="Desativar toda a fÃsÃca nesta região"/> - <button label="?" name="disable_physics_help"/> <button label="Aplicar" name="apply_btn"/> <text name="objret_text_lbl" width="130"> Devolver objeto @@ -31,10 +28,8 @@ <check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Devolver objetos em todas as regiões que constituem esta propriedade"/> <button label="Devolver" name="return_btn"/> <button label="Principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos com maior potencial de colisão" width="280"/> - <button label="?" left="297" name="top_colliders_help"/> - <button label="Principais scripts..." name="top_scripts_btn" tool_tip="Lista de objetos que mais passam tempo executando scripts" width="280"/> - <button label="?" left="297" name="top_scripts_help"/> <button label="Reiniciar a região" name="restart_btn" tool_tip="Após 2 minutos de contagem regressiva, reiniciar a região"/> - <button label="?" name="restart_help"/> + <button label="Principais scripts..." name="top_scripts_btn" tool_tip="Lista de objetos que mais passam tempo executando scripts" width="280"/> <button label="Cancelar reinÃcio" name="cancel_restart_btn" tool_tip="Cancelar reinÃcio da região"/> + <button label="Console de depuração de região" name="region_debug_console_btn" tool_tip="Abrir console de depuração de região"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml index 4be1cd11c00..a0d4579a04a 100755 --- a/indra/newview/skins/default/xui/pt/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Bloquear terraplenagem" name="block_terraform_check"/> <check_box label="Bloquear voos" name="block_fly_check"/> + <check_box label="Bloquear sobrevoo no terreno" name="block_fly_over_check" tool_tip="Estender verificações de acesso para cima para evitar que voem sobre um terreno"/> <check_box label="Permitir dano" name="allow_damage_check"/> <check_box label="Restringir empurrões" name="restrict_pushobject"/> <check_box label="Permitir revenda do terreno" name="allow_land_resell_check"/> <check_box label="Permitir junção/divisão do terreno" name="allow_parcel_changes_check"/> <check_box label="Bloquear exibição do terreno na busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/> - <check_box label="Permitir objetos mesh" name="mesh_rez_enabled_check" tool_tip="Permitir que que outras pessoas renderizem objectos mesh nessa região"/> <spinner label="Limite do agente" name="agent_limit_spin"/> <spinner label="Bônus de objetos" name="object_bonus_spin"/> <text label="Maturidade" name="access_text"> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index c44345323ff..4747d14101a 100755 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml @@ -33,7 +33,7 @@ <layout_panel name="shop_btn_lp"> <button label="Comprar" name="shop_btn" tool_tip="Abrir página do Marketplace"/> <button label="Vestir" name="wear_btn" tool_tip="Vestir visual selecionado"/> - <button label="Tocar" name="play_btn"/> + <button label="Jogar" name="play_btn"/> <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 8436452228e..a5a3f04f78e 100755 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -28,6 +28,45 @@ <string name="StartupRequireDriverUpdate"> Falha na inicialização dos gráficos. Atualize seu driver gráfico! </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [Notas da versão]] + </string> + <string name="AboutCompiler"> + ConstruÃdo com [COMPILER] versão [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU: [CPU] +Memória: [MEMORY_MB] MBs +Versão OS: [OS_VERSION] +Placa de vÃdeo: [GRAPHICS_CARD_VENDOR] +Placa gráfica: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Versão do driver de vÃdeo Windows: [GRAPHICS_CARD_VENDOR] + </string> + <string name="AboutLibs"> + Versão OpenGL: [OPENGL_VERSION] + +Versão libcurl: [LIBCURL_VERSION] +Versão J2C Decoder: [J2C_VERSION] +Versão do driver de áudio: [AUDIO_DRIVER_VERSION] +Versão Qt Webkit: [QT_WEBKIT_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="ErrorFetchingServerReleaseNotesURL"> + Erro ao obter URL de notas de versão do servidor. + </string> <string name="ProgressRestoring"> Restaurando... </string> @@ -886,12 +925,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="ControlYourCamera"> Controle sua camera </string> - <string name="AgentNameSubst"> - (Você) - </string> <string name="TeleportYourAgent"> Teletransportá-lo </string> + <string name="AgentNameSubst"> + (Você) + </string> <string name="JoinAnExperience"> Participar de uma experiência </string> @@ -1216,8 +1255,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="InventoryInboxNoItems"> Suas compras do Marketplace aparecerão aqui. Depois, você poderá arrastá-las para seu inventário para usá-las. </string> - <string name="Unconstrained">Sem limites</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1246,6 +1284,18 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="InventoryOutboxNoItems"> Arraste as pastas para estas áreas e então clique em "Enviar para Mercado" para listar os itens para venda no [[MARKETPLACE_DASHBOARD_URL] Mercado]. </string> + <string name="InventoryOutboxInitializingTitle"> + Inicializando o Marketplace. + </string> + <string name="InventoryOutboxInitializing"> + Estamos acessando sua conta na [loja [MARKETPLACE_CREATE_STORE_URL] do Marketplace]. + </string> + <string name="InventoryOutboxErrorTitle"> + Erros do Marketplace. + </string> + <string name="InventoryOutboxError"> + A loja [[MARKETPLACE_CREATE_STORE_URL] no Marketplace] está retornando erros. + </string> <string name="Marketplace Error None"> Sem erros </string> @@ -1273,6 +1323,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="Open landmarks"> Marcos abertos </string> + <string name="Unconstrained"> + Sem limites + </string> <string name="no_transfer" value="(não transferÃvel)"/> <string name="no_modify" value="(não modificável)"/> <string name="no_copy" value="(não copiável)"/> @@ -1667,6 +1720,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="CompileQueueDownloadedCompiling"> Baixado, agora compilando </string> + <string name="CompileQueueServiceUnavailable"> + Serviço de compilação de scripts não disponÃvel + </string> <string name="CompileQueueScriptNotFound"> Script não encontrado no servidor. </string> diff --git a/indra/newview/skins/default/xui/ru/floater_region_restarting.xml b/indra/newview/skins/default/xui/ru/floater_region_restarting.xml new file mode 100644 index 00000000000..1b4c0e33dcf --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="ПЕРЕЗÐПУСК РЕГИОÐÐ"> + <string name="RegionName"> + Регион, в котором вы находитеÑÑŒ ([NAME]), будет перезапущен. + +ЕÑли вы оÑтанетеÑÑŒ в Ñтом регионе, вы выйдете из ÑиÑтемы. + </string> + <string name="RestartSeconds"> + Секунд до перезапуÑка +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + Регион, в котором вы находитеÑÑŒ (-длинное название региона-), будет перезапущен. + +ЕÑли вы оÑтанетеÑÑŒ в Ñтом регионе, вы выйдете из ÑиÑтемы. + </text> + <text name="restart_seconds"> + Секунд до перезапуÑка + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml new file mode 100644 index 00000000000..a101e626277 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="СТÐТИСТИКРЗÐГРУЗКИ СЦЕÐ"> + <button label="Пауза" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="ОÑновной" name="basic"> + <stat_bar label="Разница в пикÑелах на кадр" name="frame difference"/> + <stat_bar label="Получены данные UDP" name="bandwidth"/> + <stat_bar label="Потери пакетов" name="packet_loss"/> + </stat_view> + <stat_view label="РаÑширенный" name="advanced"> + <stat_view label="ОтриÑовка" name="render"> + <stat_bar label="Ð’Ñего объектов" name="objs"/> + <stat_bar label="Ðовых объектов" name="newobjs"/> + <stat_bar label="ЧаÑтота попаданий в кÑш объектов" name="object_cache_hits"/> + </stat_view> + <stat_view label="ТекÑтура" name="texture"> + <stat_bar label="ЧаÑтота попаданий в кÑш" name="texture_cache_hits"/> + <stat_bar label="Задержка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÐºÑша" name="texture_cache_read_latency"/> + <stat_bar label="Кол-во" name="numimagesstat"/> + <stat_bar label="Ðеобраб. изображений" name="numrawimagesstat"/> + </stat_view> + <stat_view label="Сеть" name="network"> + <stat_bar label="ВходÑщие пакеты" name="packetsinstat"/> + <stat_bar label="ИÑходÑщие пакеты" name="packetsoutstat"/> + <stat_bar label="Объекты" name="objectdatareceived"/> + <stat_bar label="ТекÑтура" name="texturedatareceived"/> + <stat_bar label="Ðктив" name="assetudpdatareceived"/> + <stat_bar label="Слои" name="layersdatareceived"/> + <stat_bar label="ДейÑтвительный ввод" name="messagedatain"/> + <stat_bar label="ДейÑтвительный вывод" name="messagedataout"/> + <stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="СимулÑтор" name="sim"> + <stat_bar label="Объекты" name="simobjects"/> + <stat_bar label="Ðктивные объекты" name="simactiveobjects"/> + <stat_bar label="Ðктивные Ñкрипты" name="simactivescripts"/> + <stat_bar label="ВходÑщие пакеты" name="siminpps"/> + <stat_bar label="ИÑходÑщие пакеты" name="simoutpps"/> + <stat_bar label="Отложенные загрузки" name="simpendingdownloads"/> + <stat_bar label="Отложенные передачи" name="simpendinguploads"/> + <stat_bar label="Общий нераÑпакованный объем (байт)" name="simtotalunackedbytes"/> + <stat_view label="Ð’Ñ€ÐµÐ¼Ñ (мÑ)" name="simperf"> + <stat_bar label="Общее Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ð´Ñ€Ð°" name="simframemsec"/> + <stat_bar label="ЧиÑтое времÑ" name="simnetmsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° физику" name="simsimphysicsmsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° ÑимулÑцию" name="simsimothermsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° клиент" name="simagentmsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° изображениÑ" name="simimagesmsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° Ñкрипт" name="simscriptmsec"/> + <stat_bar label="Резервное времÑ" name="simsparemsec"/> + <stat_view label="Данные времени (мÑ)" name="timedetails"> + <stat_bar label="Шаг физики" name="simsimphysicsstepmsec"/> + <stat_bar label="Обновить физ. формы" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Физика - прочее" name="simsimphysicsothermsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ñна" name="simsleepmsec"/> + <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð²Ð²Ð¾Ð´Ð°/вывода" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml index 46426495dcf..33a14adca92 100755 --- a/indra/newview/skins/default/xui/ru/floater_stats.xml +++ b/indra/newview/skins/default/xui/ru/floater_stats.xml @@ -4,7 +4,7 @@ <container_view name="statistics_view"> <stat_view label="БазоваÑ" name="basic"> <stat_bar label="Кадров/Ñ" name="fps"/> - <stat_bar label="Ширина канала" name="bandwidth"/> + <stat_bar label="Получены данные UDP" name="bandwidth"/> <stat_bar label="Потери пакетов" name="packet_loss"/> <stat_bar label="Пинг" name="ping"/> </stat_view> @@ -15,6 +15,9 @@ <stat_bar label="Ð’Ñего объектов" name="objs"/> <stat_bar label="Ðовых объектов" name="newobjs"/> <stat_bar label="ЧаÑтота попаданий в кÑш объектов" name="object_cache_hits"/> + <stat_bar label="Выполненные запроÑÑ‹ на Ñмыкание" name="occlusion_queries"/> + <stat_bar label="Объекты Ñомкнуты" name="occluded"/> + <stat_bar label="Объект разомкнут" name="unoccluded"/> </stat_view> <stat_view label="ТекÑтура" name="texture"> <stat_bar label="ЧаÑтота попаданий в кÑш" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="ÐÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¿Ð°Ð¼ÑÑ‚ÑŒ" name="rawmemstat"/> <stat_bar label="Ограничение памÑти" name="glboundmemstat"/> </stat_view> + <stat_view label="ИÑпользование памÑти" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" name="LLView"/> + <stat_bar label="Шрифты" name="LLFontFreetype"/> + <stat_bar label="Инвентарь" name="LLInventoryObject"/> + <stat_bar label="Объекты клиента" name="LLViewerObject"/> + <stat_bar label="Данные группы октадеревьев" name="LLViewerOctreeGroup"/> + <stat_bar label="Данные октадерева" name="LLViewerOctreeEntry"/> + <stat_bar label="КÑш объектов клиента" name="LLVOCacheEntry"/> + <stat_bar label="РиÑуемые предметы" name="LLDrawable"/> + <stat_bar label="Данные лица" name="LLFace"/> + <stat_bar label="Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ñ€Ð¸Ñовки" name="LLDrawInfo"/> + <stat_bar label="Данные текÑтуры" name="LLTexture"/> + <stat_bar label="Данные изображениÑ" name="LLImage"/> + <stat_bar label="Данные Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ GL" name="LLImageGL"/> + <stat_bar label="Вершинные буферы" name="LLVertexBuffer"/> + </stat_view> <stat_view label="Сеть" name="network"> <stat_bar label="ВходÑщие пакеты" name="packetsinstat"/> <stat_bar label="ИÑходÑщие пакеты" name="packetsoutstat"/> - <stat_bar label="Объекты" name="objectkbitstat"/> - <stat_bar label="ТекÑтура" name="texturekbitstat"/> - <stat_bar label="Ðктив" name="assetkbitstat"/> - <stat_bar label="Слои" name="layerskbitstat"/> - <stat_bar label="ДейÑтвительный ввод" name="actualinkbitstat"/> - <stat_bar label="ДейÑтвительный вывод" name="actualoutkbitstat"/> + <stat_bar label="Объекты" name="objectdatareceived"/> + <stat_bar label="ТекÑтура" name="texturedatareceived"/> + <stat_bar label="Ðктив" name="assetudpdatareceived"/> + <stat_bar label="Слои" name="layersdatareceived"/> + <stat_bar label="ДейÑтвительный ввод" name="messagedatain"/> + <stat_bar label="ДейÑтвительный вывод" name="messagedataout"/> <stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="ИÑходÑщие пакеты" name="simoutpps"/> <stat_bar label="Отложенные загрузки" name="simpendingdownloads"/> <stat_bar label="Отложенные передачи" name="simpendinguploads"/> - <stat_bar label="Общий нераÑпакованный объем (байт)" name="simtotalunackedbytes"/> - <stat_view label="Ð’Ñ€ÐµÐ¼Ñ (мÑ)" name="simperf"> + <stat_bar label="Общий неподтвержденный объем" name="simtotalunackedbytes"/> + <stat_view label="ВремÑ" name="simperf"> <stat_bar label="Общее Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ð´Ñ€Ð°" name="simframemsec"/> <stat_bar label="ЧиÑтое времÑ" name="simnetmsec"/> <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° физику" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° изображениÑ" name="simimagesmsec"/> <stat_bar label="Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° Ñкрипт" name="simscriptmsec"/> <stat_bar label="Резервное времÑ" name="simsparemsec"/> - <stat_view label="Данные времени (мÑ)" name="timedetails"> + <stat_view label="Данные времени" name="timedetails"> <stat_bar label="Шаг физики" name="simsimphysicsstepmsec"/> <stat_bar label="Обновить физ. формы" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Физика - прочее" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml index ac2b4be0035..049001e8c36 100755 --- a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Открыть профиль" name="Show Profile"/> <menu_item_call label="Отправить Ñообщение..." name="Send IM"/> + <menu_item_call label="Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñ‚ÐµÐ»ÐµÐ¿Ð¾Ñ€Ñ‚Ð°Ñ†Ð¸Ð¸" name="Request Teleport"/> <menu_item_call label="Добавить в друзьÑ..." name="Add Friend"/> <menu_item_call label="Удалить из друзей..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml index 37ee19fc1d3..308549c2548 100755 --- a/indra/newview/skins/default/xui/ru/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="ВоÑпроизвеÑти" name="Sound Play"/> <menu_item_call label="Копировать URL SL" name="url_copy"/> <menu_item_call label="О закладке" name="About Landmark"/> + <menu_item_call label="Показать на карте" name="show_on_map"/> <menu_item_call label="Проиграть Ð´Ð»Ñ Ð²Ñех" name="Animation Play"/> <menu_item_call label="Проиграть Ð´Ð»Ñ ÑебÑ" name="Animation Audition"/> <menu_item_call label="Отправить IM-Ñообщение" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml index 835c4e186e8..885f6195b6e 100755 --- a/indra/newview/skins/default/xui/ru/menu_login.xml +++ b/indra/newview/skins/default/xui/ru/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="Выход из [APP_NAME]" name="Quit"/> </menu> <menu label="Справка" name="Help"> - <menu_item_call label="Справка [SECOND_LIFE]" name="Second Life Help"/> + <menu_item_call label="ИнÑтрукции..." name="How To"/> + <menu_item_call label="Краткое руководÑтво" name="Quickstart"/> + <menu_item_call label="База знаний" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Форумы ÑообщеÑтва" name="Community Forums"/> + <menu_item_call label="Портал поддержки" name="Support portal"/> + <menu_item_call label="ÐовоÑти [SECOND_LIFE]" name="Second Life News"/> + <menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/> + <menu_item_call label="Сообщить об ошибке" name="Report Bug"/> <menu_item_call label="О [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Показать меню отладки" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml index 6a22fd00dc0..f495d27bf39 100755 --- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Телепорт" name="Teleport"/> <menu_item_call label="ИнформациÑ" name="More Information"/> - <menu_item_call label="Копировать в буфер обмена" name="CopyToClipboard"/> + <menu_item_call label="Копировать URL SL" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index fcb7c4e5310..38c31b27b65 100755 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -70,11 +70,11 @@ <menu_item_check label="Меню «Дополнительно»" name="Show Advanced Menu"/> </menu> <menu label="Солнце" name="Sun"> - <menu_item_call label="ВоÑход" name="Sunrise"/> - <menu_item_call label="Полдень" name="Noon"/> - <menu_item_call label="Закат" name="Sunset"/> - <menu_item_call label="Полночь" name="Midnight"/> - <menu_item_call label="ИÑпользовать наÑтройки региона" name="Use Region Settings"/> + <menu_item_check label="ВоÑход" name="Sunrise"/> + <menu_item_check label="Полдень" name="Noon"/> + <menu_item_check label="Закат" name="Sunset"/> + <menu_item_check label="Полночь" name="Midnight"/> + <menu_item_check label="ИÑпользовать наÑтройки региона" name="Use Region Settings"/> </menu> <menu label="Редактор Ñреды" name="Environment Editor"> <menu_item_call label="ÐаÑтройки Ñреды..." name="Environment Settings"/> @@ -162,7 +162,6 @@ </menu> <menu label="Справка" name="Help"> <menu_item_call label="ИнÑтрукции..." name="How To"/> - <menu_item_call label="Справка по [SECOND_LIFE]" name="Second Life Help"/> <menu_item_call label="Жалоба" name="Report Abuse"/> <menu_item_call label="Сообщить об ошибке" name="Report Bug"/> <menu_item_call label="О [APP_NAME]" name="About Second Life"/> @@ -178,6 +177,7 @@ <menu label="ПроизводительноÑÑ‚ÑŒ" name="Performance Tools"> <menu_item_call label="Запаздывание" name="Lag Meter"/> <menu_item_check label="СтатиÑтика" name="Statistics Bar"/> + <menu_item_call label="СтатиÑтика загрузки Ñцен" name="Scene Load Statistics"/> <menu_item_check label="Показать Ð²ÐµÑ Ð¾Ñ‚Ñ€Ð¸Ñовки Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€Ð¾Ð²" name="Avatar Rendering Cost"/> </menu> <menu label="ПодÑветка и видимоÑÑ‚ÑŒ" name="Highlighting and Visibility"> @@ -240,6 +240,7 @@ <menu_item_check label="Оперативные таймеры" name="Fast Timers"/> <menu_item_check label="ПамÑÑ‚ÑŒ" name="Memory"/> <menu_item_check label="СтатиÑтика по Ñцене" name="Scene Statistics"/> + <menu_item_check label="Монитор загрузки Ñцен" name="Scene Loading Monitor"/> <menu_item_call label="КонÑоль отладки Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑтур" name="Texture Fetch Debug Console"/> <menu_item_call label="Данные о регионе на конÑоль отладки" name="Region Info to Debug Console"/> <menu_item_call label="Данны о группе на конÑоль отладки" name="Group Info to Debug Console"/> @@ -276,6 +277,7 @@ <menu_item_check label="ПериодичеÑкое замедление кадров" name="Periodic Slow Frame"/> <menu_item_check label="ТеÑÑ‚ кадров" name="Frame Test"/> <menu_item_call label="Профиль кадра" name="Frame Profile"/> + <menu_item_call label="ТеÑÑ‚" name="Benchmark"/> </menu> <menu label="Визуализировать метаданные" name="Render Metadata"> <menu_item_check label="Рамки" name="Bounding Boxes"/> @@ -294,6 +296,7 @@ <menu_item_check label="Очередь поÑтроителÑ" name="Build Queue"/> <menu_item_check label="ОÑвещение" name="Lights"/> <menu_item_check label="ÐšÐ°Ñ€ÐºÐ°Ñ Ñтолкновений" name="Collision Skeleton"/> + <menu_item_check label="СуÑтавы" name="Joints"/> <menu_item_check label="Лучи" name="Raycast"/> <menu_item_check label="ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚Ñ€Ð°" name="Wind Vectors"/> <menu_item_check label="СложноÑÑ‚ÑŒ визуализации" name="rendercomplexity"/> @@ -326,6 +329,7 @@ <menu_item_check label="Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñоединенных иÑточников Ñвета" name="Render Attached Lights"/> <menu_item_check label="Ð’Ð¸Ð·ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ñоединенных чаÑтиц" name="Render Attached Particles"/> <menu_item_check label="ПарÑщие ÑветÑщиеÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹" name="Hover Glow Objects"/> + <menu_item_call label="Ðемедленно очиÑтить кÑш" name="Cache Clear"/> </menu> <menu label="Сеть" name="Network"> <menu_item_check label="ПриоÑтановить клиент" name="AgentPause"/> @@ -358,7 +362,6 @@ <menu_item_call label="Вывод ÑредÑтва фокуÑировки" name="Dump Focus Holder"/> <menu_item_call label="Печать информации о выбранных объектах" name="Print Selected Object Info"/> <menu_item_call label="Печать информации об агенте" name="Print Agent Info"/> - <menu_item_check label="КонÑоль отладки региона" name="Region Debug Console"/> <menu_item_check label="Отладка SelectMgr" name="Debug SelectMgr"/> <menu_item_check label="Отладка щелчков мышью" name="Debug Clicks"/> <menu_item_check label="Отладка обзора" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 1dc8202b00c..336a97f35a1 100755 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -114,13 +114,13 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxImportFailed"> - Ошибка при передаче + Ðе удалоÑÑŒ передать, ошибка: «[ERROR_CODE]» Папки не отправлены в торговый центр из-за ошибки ÑиÑтемы или Ñети. Повторите попытку позже. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OutboxInitFailed"> - Ошибка инициализации торгового центра + Ðе удалоÑÑŒ инициализировать торговый центр, ошибка: «[ERROR_CODE]» Ðе удалоÑÑŒ инициализировать торговый центр из-за ошибки ÑиÑтемы или Ñети. Повторите попытку позже. <usetemplate name="okbutton" yestext="OK"/> @@ -1731,6 +1731,10 @@ http://secondlife.com/download. Ð’Ñ‹ дейÑтвительно хотите телепортироватьÑÑ Ð² <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Подтверждать телепортацию на закладку" name="okcancelignore" notext="Отмена" yestext="ТелепортациÑ"/> </notification> + <notification name="TeleportViaSLAPP"> + Ð’Ñ‹ дейÑтвительно хотите телепортироватьÑÑ Ð² <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Подтверждать телепортацию через SLAPP" name="okcancelignore" notext="Отмена" yestext="ТелепортациÑ"/> + </notification> <notification name="TeleportToPick"> ТелепортироватьÑÑ Ð² [PICK]? <usetemplate ignoretext="Подтверждать телепортацию на меÑто в подборке" name="okcancelignore" notext="Отмена" yestext="ТелепортациÑ"/> @@ -1940,6 +1944,9 @@ http://secondlife.com/download. <notification name="ProblemAddingEstateManager"> Проблема при добавлении нового менеджера землевладениÑ. Возможно, в одном или неÑкольких землевладениÑÑ… ÑпиÑок менеджеров уже заполнен. </notification> + <notification name="ProblemAddingEstateBanManager"> + Ðевозможно добавить землевладельца или менеджера в ÑпиÑок запрета доÑтупа. + </notification> <notification name="ProblemAddingEstateGeneric"> Проблема при добавлении в Ñтот ÑпиÑок землевладениÑ. Возможно, в одном или неÑкольких землевладениÑÑ… ÑпиÑок уже заполнен. </notification> @@ -3029,7 +3036,7 @@ http://secondlife.com/download. Со Ñледующими жителÑми: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3041,7 +3048,7 @@ http://secondlife.com/download. Со Ñледующими жителÑми: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Отмена" yestext="ОК"/> </notification> <notification name="ItemsShared"> @@ -3497,10 +3504,6 @@ http://secondlife.com/download. <notification name="EjectComingSoon"> Вам запрещено здеÑÑŒ приÑутÑтвовать; у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ [EJECT_TIME] Ñек, чтобы покинуть Ñто меÑто. </notification> - <notification name="NoEnterServerFull"> - Вам нет доÑтупа в Ñтот регион: -Ñерпер переполнен. - </notification> <notification name="SaveBackToInvDisabled"> Сохранение в инвентаре отключено. </notification> @@ -3689,6 +3692,9 @@ http://secondlife.com/download. <notification name="LinkFailedTooMuchPhysics"> Объект иÑпользует Ñлишком много реÑурÑов физики -- динамичеÑкое поведение отключено. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + Объект «[OBJECT_NAME]» по адреÑу [SLURL] не может телепортировать менеджеров землевладений домой. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> Ð’Ñ‹ были телепортированы домой объектом «[OBJECT_NAME]» на учаÑтке «[PARCEL_NAME]» </notification> @@ -3879,13 +3885,18 @@ http://secondlife.com/download. Выбрано недоÑтаточно арендуемых учаÑтков Ð´Ð»Ñ Ð²ÑтуплениÑ. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - ÐÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÑŒ землю.\nВыбрано больше одного учаÑтка.\nВыберите меньшую территорию. + Ðевозможно разделить землю. +Выбрано неÑколько учаÑтков. +Попробуйте выбрать облаÑÑ‚ÑŒ поменьше. </notification> <notification name="CantDivideLandCantFindParcel"> - ÐÐµÐ»ÑŒÐ·Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÑŒ землю.\nÐе удалоÑÑŒ найти учаÑток.\nСообщите об Ñтой неполадке: Справка -> Сообщить об ошибке... + Ðевозможно разделить землю. +Ðе удаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ учаÑток. +Сообщите об Ñтом: Справка -> Сообщить об ошибке... </notification> <notification name="CantDivideLandWholeParcelSelected"> - Ðевозможно разделить землю. Выбран веÑÑŒ учаÑток.\nПопробуйте выбрать территорию поменьше. + Ðевозможно разделить землю. Выбран веÑÑŒ учаÑток. +Попробуйте выбрать облаÑÑ‚ÑŒ поменьше. </notification> <notification name="LandHasBeenDivided"> Ð—ÐµÐ¼Ð»Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð°. @@ -4025,4 +4036,8 @@ http://secondlife.com/download. Ðевозможно перемеÑтить файлы. ВоÑÑтановлен прежний путь. <usetemplate ignoretext="Ðевозможно перемеÑтить файлы. ВоÑÑтановлен прежний путь." name="okignore" yestext="OK"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + Файл журнала чата занÑÑ‚ предыдущей операцией. Повторите попытку через неÑколько минут или выберите чат Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ лицом. + <usetemplate name="okbutton" yestext="OK"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml index d8cf1b47560..16aaa712689 100755 --- a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Общие"/> - <accordion_tab name="group_roles_tab" title="Роли"/> + <accordion_tab name="group_roles_tab" title="Роли и учаÑтники"/> <accordion_tab name="group_notices_tab" title="УведомлениÑ"/> <accordion_tab name="group_land_tab" title="ЗемлÑ/активы"/> </accordion> diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml index c57f21679fa..b497cc55835 100755 --- a/indra/newview/skins/default/xui/ru/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ru/panel_group_roles.xml @@ -21,6 +21,7 @@ <name_list.columns label="УчаÑтник" name="name"/> <name_list.columns label="Вклад" name="donated"/> <name_list.columns label="СтатуÑ" name="online"/> + <name_list.columns label="Роль" name="title"/> </name_list> <button label="ПриглаÑить" name="member_invite"/> <button label="Выкинуть" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml index 4be1e781fab..d294a9e22ef 100755 --- a/indra/newview/skins/default/xui/ru/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_debug.xml @@ -28,7 +28,8 @@ <check_box label="С каждого региона Ñтого землевладениÑ" name="return_estate_wide" tool_tip="ВозвращаютÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹ Ñо вÑех регионов, образующих Ñто землевладение"/> <button label="Возврат" name="return_btn"/> <button label="Самые активные учаÑтники Ñтолкновений..." name="top_colliders_btn" tool_tip="СпиÑок объектов, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÑ‚Ð¾Ð»ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸Ñ Ð½Ð°Ð¸Ð±Ð¾Ð»ÐµÐµ вероÑтны"/> - <button label="СпиÑок лучших Ñкриптов..." name="top_scripts_btn" tool_tip="Объекты, в которых Ñкрипты выполнÑÑŽÑ‚ÑÑ Ð´Ð¾Ð»ÑŒÑˆÐµ вÑего"/> <button label="Перезагрузить регион" name="restart_btn" tool_tip="ОтÑчитать 2 минуты и перезагрузить регион"/> + <button label="СпиÑок лучших Ñкриптов..." name="top_scripts_btn" tool_tip="Объекты, в которых Ñкрипты выполнÑÑŽÑ‚ÑÑ Ð´Ð¾Ð»ÑŒÑˆÐµ вÑего"/> <button label="Отменить перезапуÑк" name="cancel_restart_btn" tool_tip="Отменить перезапуÑк региона"/> + <button label="КонÑоль отладки региона" name="region_debug_console_btn" tool_tip="Открыть конÑоль отладки региона"/> </panel> diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml index 8559be6c9eb..8b4a127d7e0 100755 --- a/indra/newview/skins/default/xui/ru/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Запретить терраформирование" name="block_terraform_check"/> <check_box label="Запретить полеты" name="block_fly_check"/> + <check_box label="Запретить пролет над учаÑтком" name="block_fly_over_check" tool_tip="ПоднÑÑ‚ÑŒ проверку доÑтупа вверх Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð»ÐµÑ‚Ð° над учаÑтком"/> <check_box label="Разрешить повреждениÑ" name="allow_damage_check"/> <check_box label="Запретить толкание" name="restrict_pushobject"/> <check_box label="Разрешить перепродажу земли" name="allow_land_resell_check"/> <check_box label="Разрешить объединение/разделение земли" name="allow_parcel_changes_check"/> <check_box label="Ðе показывать землю в поиÑке" name="block_parcel_search_check" tool_tip="Отображать регион и его учаÑтки в результатах поиÑка"/> - <check_box label="Разрешить меши-объекты" name="mesh_rez_enabled_check" tool_tip="Разрешить жителÑм выкладывать меши в Ñтом регионе"/> <spinner label="Лимит агентов" name="agent_limit_spin"/> <spinner label="Льгота Ð´Ð»Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°" name="object_bonus_spin"/> <text label="ДозволенноÑÑ‚ÑŒ" name="access_text"> diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml index 1741f63074c..725b6800505 100755 --- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml @@ -28,13 +28,13 @@ <button label="Профиль" name="info_btn" tool_tip="Показать профиль объекта"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="ПоделитьÑÑ" name="share_btn" tool_tip="ПоделитьÑÑ Ð²ÐµÑ‰ÑŒÑŽ из инвентарÑ"/> + <button label="ПоделитьÑÑ" name="share_btn" tool_tip="ПоделитьÑÑ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð¼ из инвентарÑ"/> </layout_panel> <layout_panel name="shop_btn_lp"> - <button label="Торговый центр" name="shop_btn" tool_tip="Открыть Ñтраницу торгового центра"/> + <button label="Купить" name="shop_btn" tool_tip="Открыть Ñтраницу торгового центра"/> <button label="Ðадеть" name="wear_btn" tool_tip="Ðадеть выбранный коÑтюм"/> - <button label="Проиграть" name="play_btn"/> - <button label="Телепорт" name="teleport_btn" tool_tip="ТелепортироватьÑÑ Ð² выбранную облаÑÑ‚ÑŒ"/> + <button label="Играть" name="play_btn"/> + <button label="ТелепортациÑ" name="teleport_btn" tool_tip="ТелепортироватьÑÑ Ð² выбранную облаÑÑ‚ÑŒ"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 8faf834f8fc..be5a8d95ebc 100755 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -37,6 +37,45 @@ <string name="StartupRequireDriverUpdate"> Ошибка инициализации графики. Обновите графичеÑкий драйвер! </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + ИÑпользован компилÑтор [COMPILER], верÑÐ¸Ñ [COMPILER_VERSION] + </string> + <string name="AboutPosition"> + Ð’Ñ‹ в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», раÑположенном на <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + ЦП: [CPU] +ПамÑÑ‚ÑŒ: [MEMORY_MB] МБ +ВерÑÐ¸Ñ ÐžÐ¡: [OS_VERSION] +Производитель графичеÑкой платы: [GRAPHICS_CARD_VENDOR] +ГрафичеÑÐºÐ°Ñ Ð¿Ð»Ð°Ñ‚Ð°: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + ВерÑÐ¸Ñ Ð³Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑкого драйвера Windows: [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + ВерÑÐ¸Ñ OpenGL: [OPENGL_VERSION] + +ВерÑÐ¸Ñ libcurl: [LIBCURL_VERSION] +ВерÑÐ¸Ñ Ð´ÐµÐºÐ¾Ð´ÐµÑ€Ð° J2C: [J2C_VERSION] +ВерÑÐ¸Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° звука: [AUDIO_DRIVER_VERSION] +ВерÑÐ¸Ñ Qt Webkit: [QT_WEBKIT_VERSION] +ВерÑÐ¸Ñ Ð³Ð¾Ð»Ð¾Ñового Ñервера: [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + ПотерÑно пакетов: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + Ошибка при получении URL-адреÑа заметок о выпуÑке Ñервера. + </string> <string name="ProgressRestoring"> ВоÑÑтановление... </string> @@ -934,15 +973,15 @@ support@secondlife.com. <string name="ControlYourCamera"> УправлÑÑ‚ÑŒ камерой </string> + <string name="TeleportYourAgent"> + Телепортировать Ð²Ð°Ñ + </string> <string name="NotConnected"> Ðет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ </string> <string name="AgentNameSubst"> (Ð’Ñ‹) </string> - <string name="TeleportYourAgent"> - Телепортировать Ð²Ð°Ñ - </string> <string name="JoinAnExperience"> ПриÑоединитеÑÑŒ </string> @@ -1267,8 +1306,7 @@ support@secondlife.com. <string name="InventoryInboxNoItems"> ЗдеÑÑŒ будут показаны ваши покупки из торгового центра. Их можно будет перетащить в ваш инвентарь Ð´Ð»Ñ Ð¸ÑпользованиÑ. </string> - <string name="Unconstrained">Без ограничениÑ</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1297,6 +1335,18 @@ support@secondlife.com. <string name="InventoryOutboxNoItems"> Перетащите папки в Ñту облаÑÑ‚ÑŒ и щелкните «Отправить в торговый центр», чтобы выÑтавить их на продажу в [[MARKETPLACE_DASHBOARD_URL] Торговом центре]. </string> + <string name="InventoryOutboxInitializingTitle"> + Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð¾Ð³Ð¾ центра. + </string> + <string name="InventoryOutboxInitializing"> + Мы обращаемÑÑ Ðº вашему аккаунту в [[MARKETPLACE_CREATE_STORE_URL] магазине]. + </string> + <string name="InventoryOutboxErrorTitle"> + Ошибки торгового центра. + </string> + <string name="InventoryOutboxError"> + [[MARKETPLACE_CREATE_STORE_URL] Магазин] возвращает ошибки. + </string> <string name="Marketplace Error None"> Ошибок нет </string> @@ -1324,6 +1374,9 @@ support@secondlife.com. <string name="Open landmarks"> Открыть закладки </string> + <string name="Unconstrained"> + Без Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ + </string> <string name="no_transfer" value="(не передаетÑÑ)"/> <string name="no_modify" value="(не изменÑетÑÑ)"/> <string name="no_copy" value="(не копируетÑÑ)"/> @@ -1724,6 +1777,9 @@ support@secondlife.com. <string name="CompileQueueDownloadedCompiling"> Загружено, компилируетÑÑ </string> + <string name="CompileQueueServiceUnavailable"> + Служба ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñкриптов недоÑтупна + </string> <string name="CompileQueueScriptNotFound"> Скрипт не найден на Ñервере. </string> diff --git a/indra/newview/skins/default/xui/tr/floater_region_restarting.xml b/indra/newview/skins/default/xui/tr/floater_region_restarting.xml new file mode 100644 index 00000000000..1f9ead8bdd1 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="BÖLGEYÄ° YENÄ°DEN BAÅžLAT"> + <string name="RegionName"> + Åžu anda içinde bulunduÄŸunuz bölge ([NAME]) yeniden baÅŸlatılmak üzere. + +Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak. + </string> + <string name="RestartSeconds"> + Yeniden baÅŸlatma için kalan süre +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + Åžu anda içinde bulunduÄŸunuz bölge (-Bölgenin uzun adı-) yeniden baÅŸlatılmak üzere. + +Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak. + </text> + <text name="restart_seconds"> + Yeniden baÅŸlatma için kalan süre + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml new file mode 100644 index 00000000000..ae0a94595dd --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="SAHNE YÃœKLEME Ä°STATÄ°STÄ°KLERÄ°"> + <button label="Duraklat" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Temel" name="basic"> + <stat_bar label="Çerçeve Piksel Farkı" name="frame difference"/> + <stat_bar label="UDP Verileri Alındı" name="bandwidth"/> + <stat_bar label="Paket Kaybı" name="packet_loss"/> + </stat_view> + <stat_view label="GeliÅŸmiÅŸ" name="advanced"> + <stat_view label="Ä°ÅŸle" name="render"> + <stat_bar label="Toplam Nesne" name="objs"/> + <stat_bar label="Yeni Nesne" name="newobjs"/> + <stat_bar label="Nesne Önbellek Ä°sabet Oranı" name="object_cache_hits"/> + </stat_view> + <stat_view label="Doku" name="texture"> + <stat_bar label="Önbellek Ä°sabet Oranı" name="texture_cache_hits"/> + <stat_bar label="Önbellek Okuma Gecikme Süresi" name="texture_cache_read_latency"/> + <stat_bar label="Sayım" name="numimagesstat"/> + <stat_bar label="Ham Sayım" name="numrawimagesstat"/> + </stat_view> + <stat_view label="AÄŸ" name="network"> + <stat_bar label="Gelen Paketler" name="packetsinstat"/> + <stat_bar label="Giden Paketler" name="packetsoutstat"/> + <stat_bar label="Nesneler" name="objectdatareceived"/> + <stat_bar label="Doku" name="texturedatareceived"/> + <stat_bar label="Varlık" name="assetudpdatareceived"/> + <stat_bar label="Katmanlar" name="layersdatareceived"/> + <stat_bar label="Gerçekte Gelen" name="messagedatain"/> + <stat_bar label="Gerçekte Giden" name="messagedataout"/> + <stat_bar label="VFS Bekleyen Ä°ÅŸlemler" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simülatör" name="sim"> + <stat_bar label="Nesneler" name="simobjects"/> + <stat_bar label="Etkin Nesneler" name="simactiveobjects"/> + <stat_bar label="Etkin Komut Dosyaları" name="simactivescripts"/> + <stat_bar label="Gelen Paketler" name="siminpps"/> + <stat_bar label="Giden Paketler" name="simoutpps"/> + <stat_bar label="Bekleyen Karşıdan Yüklemeler" name="simpendingdownloads"/> + <stat_bar label="Bekleyen Karşıya Yüklemeler" name="simpendinguploads"/> + <stat_bar label="Toplam BildirilmiÅŸ Bayt" name="simtotalunackedbytes"/> + <stat_view label="Zaman (ms)" name="simperf"> + <stat_bar label="Toplam Çerçeve Süresi" name="simframemsec"/> + <stat_bar label="Net Süre" name="simnetmsec"/> + <stat_bar label="Fizik Süresi" name="simsimphysicsmsec"/> + <stat_bar label="Simülasyon Süresi" name="simsimothermsec"/> + <stat_bar label="Aracı Süresi" name="simagentmsec"/> + <stat_bar label="Görüntü Süresi" name="simimagesmsec"/> + <stat_bar label="Komut Dosyası Süresi" name="simscriptmsec"/> + <stat_bar label="Yedek Zaman" name="simsparemsec"/> + <stat_view label="Zaman Ayrıntıları (ms)" name="timedetails"> + <stat_bar label="Fizik Adımı" name="simsimphysicsstepmsec"/> + <stat_bar label="Fizik Åžekillerini Güncelle" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="Fizik DiÄŸer" name="simsimphysicsothermsec"/> + <stat_bar label="Uyku Zamanı" name="simsleepmsec"/> + <stat_bar label="Pompa GiriÅŸ Çıkış" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml index afce87bdaa3..2c0c33737f7 100755 --- a/indra/newview/skins/default/xui/tr/floater_stats.xml +++ b/indra/newview/skins/default/xui/tr/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="Temel" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Bant geniÅŸliÄŸi" name="bandwidth"/> + <stat_bar label="UDP Verileri Alındı" name="bandwidth"/> <stat_bar label="Paket Kaybı" name="packet_loss"/> <stat_bar label="Sim Pingi" name="ping"/> </stat_view> <stat_view label="GeliÅŸmiÅŸ" name="advanced"> <stat_view label="Ä°ÅŸle" name="render"> - <stat_bar label="Çerçeve Başına Çizilen Üçgenler" name="ktrisframe"/> - <stat_bar label="Saniyede Bir Çizilen Üçgenler" name="ktrissec"/> + <stat_bar label="Çerçeve Başına Üçgenler" name="ktrisframe"/> + <stat_bar label="Saniye Başına Üçgenler" name="ktrissec"/> <stat_bar label="Toplam Nesne" name="objs"/> <stat_bar label="Yeni Nesne" name="newobjs"/> <stat_bar label="Nesne Önbellek Ä°sabet Oranı" name="object_cache_hits"/> + <stat_bar label="GerçekleÅŸtirilen Gölgeleme Sorguları" name="occlusion_queries"/> + <stat_bar label="Gölgelenen Nesneler" name="occluded"/> + <stat_bar label="Gölgelenmeye Nesneler" name="unoccluded"/> </stat_view> <stat_view label="Doku" name="texture"> <stat_bar label="Önbellek Ä°sabet Oranı" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="Ham Bellek" name="rawmemstat"/> <stat_bar label="BaÄŸlı Doku BelleÄŸi" name="glboundmemstat"/> </stat_view> + <stat_view label="Bellek Kullanımı" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="KA" name="LLView"/> + <stat_bar label="Fontlar" name="LLFontFreetype"/> + <stat_bar label="Envanter" name="LLInventoryObject"/> + <stat_bar label="Görüntüleyici Nesneleri" name="LLViewerObject"/> + <stat_bar label="Gölgeleme AÄŸacı Grup Verileri" name="LLViewerOctreeGroup"/> + <stat_bar label="Gölgeleme AÄŸacı Verileri" name="LLViewerOctreeEntry"/> + <stat_bar label="Görüntüleyici Nesne ÖnbelleÄŸi" name="LLVOCacheEntry"/> + <stat_bar label="Çizilebilir nesneler" name="LLDrawable"/> + <stat_bar label="Yüz Verileri" name="LLFace"/> + <stat_bar label="Çizim Bilgileri" name="LLDrawInfo"/> + <stat_bar label="Doku Verileri" name="LLTexture"/> + <stat_bar label="Görüntü Verileri" name="LLImage"/> + <stat_bar label="GL Görüntü Verileri" name="LLImageGL"/> + <stat_bar label="Vertex Tamponları" name="LLVertexBuffer"/> + </stat_view> <stat_view label="AÄŸ" name="network"> <stat_bar label="Gelen Paketler" name="packetsinstat"/> <stat_bar label="Giden Paketler" name="packetsoutstat"/> - <stat_bar label="Nesneler" name="objectkbitstat"/> - <stat_bar label="Doku" name="texturekbitstat"/> - <stat_bar label="Varlık" name="assetkbitstat"/> - <stat_bar label="Katmanlar" name="layerskbitstat"/> - <stat_bar label="Gerçekte Gelen" name="actualinkbitstat"/> - <stat_bar label="Gerçekte Giden" name="actualoutkbitstat"/> + <stat_bar label="Nesneler" name="objectdatareceived"/> + <stat_bar label="Doku" name="texturedatareceived"/> + <stat_bar label="Varlık" name="assetudpdatareceived"/> + <stat_bar label="Katmanlar" name="layersdatareceived"/> + <stat_bar label="Gerçekte Gelen" name="messagedatain"/> + <stat_bar label="Gerçekte Giden" name="messagedataout"/> <stat_bar label="VFS Bekleyen Ä°ÅŸlemler" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="Giden Paketler" name="simoutpps"/> <stat_bar label="Bekleyen Karşıdan Yüklemeler" name="simpendingdownloads"/> <stat_bar label="Bekleyen Karşıya Yüklemeler" name="simpendinguploads"/> - <stat_bar label="Toplam BildirilmiÅŸ Bayt" name="simtotalunackedbytes"/> - <stat_view label="Zaman (ms)" name="simperf"> + <stat_bar label="Toplam BildirilmiÅŸ Veriler" name="simtotalunackedbytes"/> + <stat_view label="Süre" name="simperf"> <stat_bar label="Toplam Çerçeve Süresi" name="simframemsec"/> <stat_bar label="Net Süre" name="simnetmsec"/> <stat_bar label="Fizik Süresi" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="Görüntü Süresi" name="simimagesmsec"/> <stat_bar label="Komut Dosyası Süresi" name="simscriptmsec"/> <stat_bar label="Yedek Zaman" name="simsparemsec"/> - <stat_view label="Zaman Ayrıntıları (ms)" name="timedetails"> + <stat_view label="Zaman Ayrıntıları" name="timedetails"> <stat_bar label="Fizik Adımı" name="simsimphysicsstepmsec"/> <stat_bar label="Fizik Åžekillerini Güncelle" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="Fizik DiÄŸer" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml index d3ef4907356..dc3724cfc82 100755 --- a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="Profili Göster" name="Show Profile"/> <menu_item_call label="AÄ° Gönder..." name="Send IM"/> + <menu_item_call label="Işınlanma Talep Et" name="Request Teleport"/> <menu_item_call label="ArkadaÅŸ Ekle..." name="Add Friend"/> <menu_item_call label="Arkadaşı Çıkar..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml index 51049427af5..7239c4be060 100755 --- a/indra/newview/skins/default/xui/tr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="Oyna" name="Sound Play"/> <menu_item_call label="SLurl'i Kopyala" name="url_copy"/> <menu_item_call label="Yer Ä°mi Hakkında" name="About Landmark"/> + <menu_item_call label="Haritada Göster" name="show_on_map"/> <menu_item_call label="SL Dünyasında Oynat" name="Animation Play"/> <menu_item_call label="Yerel Olarak Oynat" name="Animation Audition"/> <menu_item_call label="Anlık Ä°leti Gönder" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml index 79c95407e8e..ecd29370a5e 100755 --- a/indra/newview/skins/default/xui/tr/menu_login.xml +++ b/indra/newview/skins/default/xui/tr/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="[APP_NAME]'den Çık" name="Quit"/> </menu> <menu label="Yardım" name="Help"> - <menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/> + <menu_item_call label="Nasıl yapılır..." name="How To"/> + <menu_item_call label="Hızlı BaÅŸlangıç" name="Quickstart"/> + <menu_item_call label="Bilgi Bankası" name="Knowledge Base"/> + <menu_item_call label="Wiki" name="Wiki"/> + <menu_item_call label="Topluluk Forumları" name="Community Forums"/> + <menu_item_call label="Destek porteli" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] Haberler" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] Bloklar" name="Second Life Blogs"/> + <menu_item_call label="Hata Bildir" name="Report Bug"/> <menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/> </menu> <menu_item_check label="Hata Ayıklama Menüsünü Göster" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml index 93984162e7f..d7ff807c3d9 100755 --- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Işınla" name="Teleport"/> <menu_item_call label="Ek Bilgi" name="More Information"/> - <menu_item_call label="Panoya Kopyala" name="CopyToClipboard"/> + <menu_item_call label="SLurl'i Kopyala" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index 4236f916361..eabea0cc675 100755 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -70,11 +70,11 @@ <menu_item_check label="GeliÅŸmiÅŸ Menü" name="Show Advanced Menu"/> </menu> <menu label="GüneÅŸ" name="Sun"> - <menu_item_call label="Gün DoÄŸumu" name="Sunrise"/> - <menu_item_call label="Gün Ortası" name="Noon"/> - <menu_item_call label="Gün Batımı" name="Sunset"/> - <menu_item_call label="Gece Yarısı" name="Midnight"/> - <menu_item_call label="Bölge Ayarlarını Kullan" name="Use Region Settings"/> + <menu_item_check label="Gün DoÄŸumu" name="Sunrise"/> + <menu_item_check label="Gün Ortası" name="Noon"/> + <menu_item_check label="Gün Batımı" name="Sunset"/> + <menu_item_check label="Gece Yarısı" name="Midnight"/> + <menu_item_check label="Bölge Ayarlarını Kullan" name="Use Region Settings"/> </menu> <menu label="Ortam Düzenleyici" name="Environment Editor"> <menu_item_call label="Ortam Ayarları..." name="Environment Settings"/> @@ -163,8 +163,6 @@ </menu> <menu label="Yardım" name="Help"> <menu_item_call label="Nasıl yapılır..." name="How To"/> - <menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/> - <menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/> <menu_item_call label="Bilgi Bankası" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Topluluk Forumları" name="Community Forums"/> @@ -186,6 +184,7 @@ <menu label="Performans Araçları" name="Performance Tools"> <menu_item_call label="Gecikme Ölçer" name="Lag Meter"/> <menu_item_check label="Ä°statistik ÇubuÄŸu" name="Statistics Bar"/> + <menu_item_call label="Sahne Yükleme Ä°statistikleri" name="Scene Load Statistics"/> <menu_item_check label="Avatarlar İçin Çizim Ağırlığını Göster" name="Avatar Rendering Cost"/> </menu> <menu label="Vurgulama ve Görünürlük" name="Highlighting and Visibility"> @@ -248,6 +247,7 @@ <menu_item_check label="Hızlı Zamanlayıcılar" name="Fast Timers"/> <menu_item_check label="Bellek" name="Memory"/> <menu_item_check label="Sahne Ä°statistikleri" name="Scene Statistics"/> + <menu_item_check label="Sahne Yükleme Ekranı" name="Scene Loading Monitor"/> <menu_item_call label="Doku Alınması Hata Ayıklama Konsolu" name="Texture Fetch Debug Console"/> <menu_item_call label="Hata Ayıklama Konsoluna giden Bölge Bilgisi" name="Region Info to Debug Console"/> <menu_item_call label="Hata Ayıklama Konsoluna giden Grup Bilgisi" name="Group Info to Debug Console"/> @@ -284,6 +284,7 @@ <menu_item_check label="Düzenli YavaÅŸ Çerçeve" name="Periodic Slow Frame"/> <menu_item_check label="Çerçeve Testi" name="Frame Test"/> <menu_item_call label="Çerçeve Profili..." name="Frame Profile"/> + <menu_item_call label="DeÄŸerlendirme" name="Benchmark"/> </menu> <menu label="Meta Verileri Ä°ÅŸle" name="Render Metadata"> <menu_item_check label="Sınırlama Kutuları" name="Bounding Boxes"/> @@ -302,6 +303,7 @@ <menu_item_check label="Ä°nÅŸa KuyruÄŸu" name="Build Queue"/> <menu_item_check label="Işıklar" name="Lights"/> <menu_item_check label="Çarpışma Ä°skeleti" name="Collision Skeleton"/> + <menu_item_check label="Eklemler" name="Joints"/> <menu_item_check label="Işın Yayını" name="Raycast"/> <menu_item_check label="Rüzgar Vektörleri" name="Wind Vectors"/> <menu_item_check label="Ä°ÅŸleme Karmaşıklığı" name="rendercomplexity"/> @@ -334,6 +336,7 @@ <menu_item_check label="EklenmiÅŸ Işıkları Ä°ÅŸle" name="Render Attached Lights"/> <menu_item_check label="EklenmiÅŸ Parçacıkları Ä°ÅŸle" name="Render Attached Particles"/> <menu_item_check label="Parıldayan Nesneler Ãœzerine Gel" name="Hover Glow Objects"/> + <menu_item_call label="ÖnbelleÄŸi Hemen Temizle" name="Cache Clear"/> </menu> <menu label="AÄŸ" name="Network"> <menu_item_check label="Aracıyı Durdur" name="AgentPause"/> @@ -366,7 +369,6 @@ <menu_item_call label="Odaklayıcı Tutucunun Dökümünü Al" name="Dump Focus Holder"/> <menu_item_call label="Seçilen Nesne Bilgisini Yazdır" name="Print Selected Object Info"/> <menu_item_call label="Aracı Bilgisini Yazdır" name="Print Agent Info"/> - <menu_item_check label="Bölge Hata Ayıklama Konsolu" name="Region Debug Console"/> <menu_item_check label="SelectMgr İçin Hata Ayıklama" name="Debug SelectMgr"/> <menu_item_check label="Tıklamalar İçin Hata Ayıklama" name="Debug Clicks"/> <menu_item_check label="Görünümler için Hata Ayıklama" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 492178ab824..a58abca3ac7 100755 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -114,13 +114,13 @@ Daha fazla bilgi için bkz. [[MARKETPLACE_IMPORTS_URL] hata günlüğü]. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="OutboxImportFailed"> - Aktarım baÅŸarılamadı + Aktarım '[ERROR_CODE]' hatası nedeniyle baÅŸarısız oldu Bir sistem veya aÄŸ hatası nedeniyle Pazaryerine hiçbir klasör gönderilemedi. Daha sonra tekrar deneyin. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="OutboxInitFailed"> - Pazaryeri baÅŸlatılamadı. + Pazaryeri baÅŸlatılması '[ERROR_CODE]' hatası nedeniyle baÅŸarısız oldu Bir sistem veya aÄŸ hatası nedeniyle Pazaryeri baÅŸlatılamadı. Daha sonra tekrar deneyin. <usetemplate name="okbutton" yestext="Tamam"/> @@ -1731,6 +1731,10 @@ Lütfen daha sonra tekrar deneyin. <nolink>[LOCATION]</nolink> konumuna ışınlanmak istediÄŸinize emin misiniz? <usetemplate ignoretext="Bir yer imine ışınlanma istediÄŸimde doÄŸrulama iste" name="okcancelignore" notext="Ä°ptal Et" yestext="Işınla"/> </notification> + <notification name="TeleportViaSLAPP"> + <nolink>[LOCATION]</nolink> konumuna ışınlanmak istediÄŸinize emin misiniz? + <usetemplate ignoretext="SLAPP ile ışınlanma istediÄŸimde doÄŸrulama iste" name="okcancelignore" notext="Ä°ptal" yestext="Işınla"/> + </notification> <notification name="TeleportToPick"> [PICK] konumuna ışınlanılsın mı? <usetemplate ignoretext="Seçme sekmesindeki bir konuma ışınlanma istediÄŸimde doÄŸrulama iste" name="okcancelignore" notext="Ä°ptal Et" yestext="Işınla"/> @@ -1940,6 +1944,9 @@ Binlerce bölgeyi deÄŸiÅŸtirecek ve alan sunucusunu kesintiye uÄŸratacaktır. <notification name="ProblemAddingEstateManager"> Yeni bir gayrimenkul yöneticisi eklenirken problem oluÅŸtu. Bir veya birden fazla gayrimenkulün yönetici listesi dolu olabilir. </notification> + <notification name="ProblemAddingEstateBanManager"> + Gayri menkul sahibi ya da yöneticisi yasaklı listesine eklenemedi. + </notification> <notification name="ProblemAddingEstateGeneric"> Bu gayrimenkul listesine eklenirken problem oluÅŸtu. Bir veya birden fazla gayrimenkulün listesi dolu olabilir. </notification> @@ -3027,9 +3034,9 @@ Ayrıntılar için günlük dosyasına bakın. <nolink>[ITEMS]</nolink> -PaylaÅŸmanın yapılacağı Sakinler: +PaylaÅŸmanın yapılacağı Second Life Sakinleri: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3041,7 +3048,7 @@ AÅŸağıdaki öğeleri paylaÅŸmak istediÄŸinize emin misiniz? PaylaÅŸmanın yapılacağı Second Life Sakinleri: -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="Ä°ptal" yestext="Tamam"/> </notification> <notification name="ItemsShared"> @@ -3496,10 +3503,6 @@ Lütfen bir dakika sonra tekrar deneyin. <notification name="EjectComingSoon"> Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var. </notification> - <notification name="NoEnterServerFull"> - Bu bölgeye giremezsiniz çünkü -sunucu dolu. - </notification> <notification name="SaveBackToInvDisabled"> Envantere Geri Kaydet devre dışı bırakıldı. </notification> @@ -3683,6 +3686,9 @@ sunucu dolu. <notification name="LinkFailedTooMuchPhysics"> Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı. </notification> + <notification name="EstateManagerFailedllTeleportHome"> + [SLURL] adresindeki '[OBJECT_NAME]' nesnesi gayri menkul yöneticilerini ana konuma ışınlayamıyor. + </notification> <notification name="TeleportedHomeByObjectOnParcel"> '[PARCEL_NAME]' parseli üzerindeki '[OBJECT_NAME]' nesnesi tarafından ana konuma ışınlandınız </notification> @@ -3873,13 +3879,18 @@ sunucu dolu. Seçimde birleÅŸtirilecek yeterli sayıda lease edilmiÅŸ parsel yok. </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin. + Arazi bölünemiyor. +Birden fazla parsel seçili. +Daha küçük bir arazi parçası seçmeyi deneyin. </notification> <notification name="CantDivideLandCantFindParcel"> - Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -> Hata Bildir ile bildirin... + Arazi bölünemiyor. +Parsel bulunamıyor. +Lütfen Yardım -> Hata Bildir... sekmesinden hatayı bildirin </notification> <notification name="CantDivideLandWholeParcelSelected"> - Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin. + Arazi bölünemiyor. Tüm parsel seçili. +Daha küçük bir arazi parçası seçmeyi deneyin. </notification> <notification name="LandHasBeenDivided"> Arazi bölündü. @@ -4019,4 +4030,8 @@ sunucu dolu. Dosyalar taşınamıyor. Önceki yol geri yüklendi. <usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + 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> </notifications> diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml index 32f39da4901..e4697eaa21f 100755 --- a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Genel"/> - <accordion_tab name="group_roles_tab" title="Roller"/> + <accordion_tab name="group_roles_tab" title="Roller ve Ãœyeler"/> <accordion_tab name="group_notices_tab" title="Bildirimler"/> <accordion_tab name="group_land_tab" title="Arazi/Varlıklar"/> </accordion> diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml index fb03107da81..ef8b093ddfe 100755 --- a/indra/newview/skins/default/xui/tr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/tr/panel_group_roles.xml @@ -20,6 +20,7 @@ Ctrl tuÅŸuna basıp adlarına tıklayarak birden fazla Ãœye seçebilirsiniz. <name_list.columns label="Ãœye" name="name"/> <name_list.columns label="Bağış" name="donated"/> <name_list.columns label="Durum" name="online"/> + <name_list.columns label="Ãœnvan" name="title"/> </name_list> <button label="Davet Et" name="member_invite"/> <button label="Çıkar" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml index 834ece563f9..74a0a1569ef 100755 --- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml @@ -28,7 +28,8 @@ <check_box label="Bu gayrimenkulu oluÅŸturan bölgelerin tümünde" name="return_estate_wide" tool_tip="Bu gayrimenkulu oluÅŸturan bölgelerin tümündeki nesneler iade edilsin"/> <button label="Ä°ade Et" name="return_btn"/> <button label="En Çok Çarpışanlar..." name="top_colliders_btn" tool_tip="En çok potansiyel çarpışma yaÅŸayan nesnelerin listesi"/> - <button label="En Çok Komut Dsy. ÇalÅŸtr...." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/> <button label="Bölgeyi Yeniden BaÅŸlat" name="restart_btn" tool_tip="2 dakikalık bir geri sayımdan sonra bölgeyi yeniden baÅŸlat"/> + <button label="En Çok Komut Dsy. ÇalÅŸtr...." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/> <button label="Yeniden BaÅŸlatmayı Ä°ptal Et" name="cancel_restart_btn" tool_tip="Bölge yeniden baÅŸlatmasını iptal et"/> + <button label="Bölge Hata Ayıklama Konsolu" name="region_debug_console_btn" tool_tip="Açık Bölge Hata Ayıklama Konsolu"/> </panel> diff --git a/indra/newview/skins/default/xui/tr/panel_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml index 37da0f2ccae..e6abef883d7 100755 --- a/indra/newview/skins/default/xui/tr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="Yer Åžekillendirmeyi Engelle" name="block_terraform_check"/> <check_box label="Uçmayı Engelle" name="block_fly_check"/> + <check_box label="Parselin Ãœzerinde Uçmayı Engelle" name="block_fly_over_check" tool_tip="Bir parselin üzerinden uçulmasını engellemek için onay iÅŸaretlerini yukarı doÄŸru geniÅŸletin"/> <check_box label="Hasara Ä°zin Ver" name="allow_damage_check"/> <check_box label="Ä°tmeyi Kısıtla" name="restrict_pushobject"/> <check_box label="Arazinin Tekrar Satışına Ä°zin Ver" name="allow_land_resell_check"/> <check_box label="Arazinin BirleÅŸmesine/Bölünmesine Ä°zin Ver" name="allow_parcel_changes_check"/> <check_box label="Aramada Arazinin Gösterilmesini Engelle" name="block_parcel_search_check" tool_tip="Arama sonuçlarında bu bölge ve parselleri görünsün"/> - <check_box label="Örgü Nesnelere Ä°zin Ver" name="mesh_rez_enabled_check" tool_tip="Bu bölgede insanların örgü nesneleri oluÅŸturmasına izin verilsin"/> <spinner label="Aracı Limiti" name="agent_limit_spin"/> <spinner label="Nesne Bonusu" name="object_bonus_spin"/> <text label="EriÅŸkinlik" name="access_text"> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 31c5d2d3107..f575b9e608d 100755 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -37,6 +37,45 @@ <string name="StartupRequireDriverUpdate"> Grafik baÅŸlatma baÅŸarılamadı. Lütfen grafik sürücünüzü güncelleÅŸtirin! </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [Sürüm Notları]] + </string> + <string name="AboutCompiler"> + [COMPILER] [COMPILER_VERSION] sürümü ile oluÅŸturuldu + </string> + <string name="AboutPosition"> + <nolink>[HOSTNAME]</nolink> ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız +SLURL: <nolink>[SLURL]</nolink> +(küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU: [CPU] +Bellek: [MEMORY_MB] MB +Ä°ÅŸl. Sis. Sürümü: [OS_VERSION] +Grafik Kartı Ãœreticisi: [GRAPHICS_CARD_VENDOR] +Grafik Kartı: [GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Windows Grafik Sürücüsü Sürümü: [GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + OpenGL Sürümü: [OPENGL_VERSION] + +libcurl Sürümü: [LIBCURL_VERSION] +J2C Kod Çözücü Sürümü: [J2C_VERSION] +Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION] +Qt Web Kit Sürümü: [QT_WEBKIT_VERSION] +Ses Sunucusu Sürümü: [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + Kaybolan Paketler: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + Sunucu sürümü notları URL'si alınırken hata oluÅŸtu. + </string> <string name="ProgressRestoring"> Geri yükleniyor... </string> @@ -934,15 +973,15 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="ControlYourCamera"> Kameranızı kontrol etmek </string> + <string name="TeleportYourAgent"> + Sizi ışınlama + </string> <string name="NotConnected"> BaÄŸlı DeÄŸil </string> <string name="AgentNameSubst"> (Siz) </string> - <string name="TeleportYourAgent"> - Sizi ışınlama - </string> <string name="JoinAnExperience"> Bir tecrübeye katıl </string> @@ -1267,8 +1306,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="InventoryInboxNoItems"> Pazaryerinda satın aldıklarınız burada görünecektir. Bunları kullanmak için envanterinize sürükleyebilirsiniz. </string> - <string name="Unconstrained">Kısıtsız</string> - <string name="MarketplaceURL"> + <string name="MarketplaceURL"> https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ </string> <string name="MarketplaceURL_CreateStore"> @@ -1297,6 +1335,18 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="InventoryOutboxNoItems"> Bu alana klasörleri sürükleyin ve bunları [[MARKETPLACE_DASHBOARD_URL] Pazaryerinde] satılık olarak duyurmak için "Pazaryerine Gönder" üzerine tıklayın. </string> + <string name="InventoryOutboxInitializingTitle"> + Pazaryeri BaÅŸlatılıyor. + </string> + <string name="InventoryOutboxInitializing"> + [[MARKETPLACE_CREATE_STORE_URL] MaÄŸazası] üzerindeki hesabınıza eriÅŸiyoruz. + </string> + <string name="InventoryOutboxErrorTitle"> + Pazaryeri Hataları + </string> + <string name="InventoryOutboxError"> + [[MARKETPLACE_CREATE_STORE_URL] MaÄŸazası] hata döndürüyor. + </string> <string name="Marketplace Error None"> Hata yok </string> @@ -1324,6 +1374,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="Open landmarks"> Açık yer imleri </string> + <string name="Unconstrained"> + Kısıtsız + </string> <string name="no_transfer" value="(aktarım yok)"/> <string name="no_modify" value="(deÄŸiÅŸtirme yok)"/> <string name="no_copy" value="(kopya yok)"/> @@ -1724,6 +1777,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="CompileQueueDownloadedCompiling"> Karşıdan yüklendi, ÅŸimdi derleniyor </string> + <string name="CompileQueueServiceUnavailable"> + Komut dosyası derleme hizmeti kullanılamıyor + </string> <string name="CompileQueueScriptNotFound"> Komut dosyası sunucuda bulunamadı. </string> diff --git a/indra/newview/skins/default/xui/zh/floater_region_restarting.xml b/indra/newview/skins/default/xui/zh/floater_region_restarting.xml new file mode 100644 index 00000000000..afac7da2033 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_region_restarting.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="region_restarting" title="地å€é‡æ–°å•Ÿå‹•ä¸"> + <string name="RegionName"> + ä½ æ‰€åœ¨çš„åœ°å€([NAME])å³å°‡é‡æ–°å•Ÿå‹•ã€‚ + +å¦‚æžœä½ ç¹¼çºŒç•™åœ¨é€™åœ°å€ï¼Œä½ 將會被登出。 + </string> + <string name="RestartSeconds"> + é‡æ–°å•Ÿå‹•å€’數秒數： +[SECONDS] + </string> + <panel name="layout_panel_1"> + <text name="region_name"> + ä½ æ‰€åœ¨çš„åœ°å€(-最長地å€å-)å³å°‡é‡æ–°å•Ÿå‹•ã€‚ + +å¦‚æžœä½ ç¹¼çºŒç•™åœ¨é€™åœ°å€ï¼Œä½ 將會被登出。 + </text> + <text name="restart_seconds"> + é‡æ–°å•Ÿå‹•å€’數秒數： + 32767 + </text> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml new file mode 100644 index 00000000000..1a5c20abeb9 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Scene Load Statistics" title="å ´æ™¯è² è¼‰çµ±è¨ˆè³‡æ–™"> + <button label="æš«åœ" name="playpause"/> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="基本" name="basic"> + <stat_bar label="å¹€åƒç´ å·®" name="frame difference"/> + <stat_bar label="已收到UDP資料" name="bandwidth"/> + <stat_bar label="å°åŒ…æ失" name="packet_loss"/> + </stat_view> + <stat_view label="進階" name="advanced"> + <stat_view label="呈åƒ" name="render"> + <stat_bar label="物件總計" name="objs"/> + <stat_bar label="新物件" name="newobjs"/> + <stat_bar label="物件快å–讀å–率" name="object_cache_hits"/> + </stat_view> + <stat_view label="æ質" name="texture"> + <stat_bar label="å¿«å–讀å–率" name="texture_cache_hits"/> + <stat_bar label="å¿«å–讀å–延é²" name="texture_cache_read_latency"/> + <stat_bar label="計數" name="numimagesstat"/> + <stat_bar label="原始計數" name="numrawimagesstat"/> + </stat_view> + <stat_view label="網路" name="network"> + <stat_bar label="進入å°åŒ…" name="packetsinstat"/> + <stat_bar label="出去å°åŒ…" name="packetsoutstat"/> + <stat_bar label="物件" name="objectdatareceived"/> + <stat_bar label="æ質" name="texturedatareceived"/> + <stat_bar label="資產" name="assetudpdatareceived"/> + <stat_bar label="層次" name="layersdatareceived"/> + <stat_bar label="實入" name="messagedatain"/> + <stat_bar label="實出" name="messagedataout"/> + <stat_bar label="VFS 待行作æ¥" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="模擬器" name="sim"> + <stat_bar label="物件" name="simobjects"/> + <stat_bar label="使用ä¸ç‰©ä»¶" name="simactiveobjects"/> + <stat_bar label="使用ä¸è…³æœ¬" name="simactivescripts"/> + <stat_bar label="進入å°åŒ…" name="siminpps"/> + <stat_bar label="出去å°åŒ…" name="simoutpps"/> + <stat_bar label="擱置下載" name="simpendingdownloads"/> + <stat_bar label="擱置上傳" name="simpendinguploads"/> + <stat_bar label="未承èªçš„總ä½å…ƒçµ„數" name="simtotalunackedbytes"/> + <stat_view label="時間（毫秒）" name="simperf"> + <stat_bar label="總幀時間" name="simframemsec"/> + <stat_bar label="淨時間" name="simnetmsec"/> + <stat_bar label="物ç†æ™‚é–“" name="simsimphysicsmsec"/> + <stat_bar label="模擬時間" name="simsimothermsec"/> + <stat_bar label="用戶時間" name="simagentmsec"/> + <stat_bar label="圖åƒæ™‚é–“" name="simimagesmsec"/> + <stat_bar label="腳本時間" name="simscriptmsec"/> + <stat_bar label="閒置時間" name="simsparemsec"/> + <stat_view label="時間細節（毫秒）" name="timedetails"> + <stat_bar label="物ç†æ¥é©Ÿ" name="simsimphysicsstepmsec"/> + <stat_bar label="更新物ç†å½¢ç‹€" name="simsimphysicsshapeupdatemsec"/> + <stat_bar label="物ç†ï¼ˆå…¶ä»–）" name="simsimphysicsothermsec"/> + <stat_bar label="ç¡çœ 時間" name="simsleepmsec"/> + <stat_bar label="基礎網路輸出入" name="simpumpiomsec"/> + </stat_view> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml index 4af5684ec16..282e61e73d6 100755 --- a/indra/newview/skins/default/xui/zh/floater_stats.xml +++ b/indra/newview/skins/default/xui/zh/floater_stats.xml @@ -4,17 +4,20 @@ <container_view name="statistics_view"> <stat_view label="基本" name="basic"> <stat_bar label="æ¯ç§’幀數" name="fps"/> - <stat_bar label="é »å¯¬" name="bandwidth"/> + <stat_bar label="已收到UDP資料" name="bandwidth"/> <stat_bar label="å°åŒ…æ失" name="packet_loss"/> <stat_bar label="探詢模擬器有無å應" name="ping"/> </stat_view> <stat_view label="進階" name="advanced"> <stat_view label="呈åƒ" name="render"> - <stat_bar label="繪出的 KTris（æ¯å¹€ï¼‰" name="ktrisframe"/> - <stat_bar label="繪出的 KTris（æ¯ç§’）" name="ktrissec"/> + <stat_bar label="KTris（æ¯å¹€ï¼‰" name="ktrisframe"/> + <stat_bar label="KTris（æ¯ç§’）" name="ktrissec"/> <stat_bar label="物件總計" name="objs"/> <stat_bar label="新物件" name="newobjs"/> <stat_bar label="物件快å–讀å–率" name="object_cache_hits"/> + <stat_bar label="已執行é®è”½æŸ¥è©¢" name="occlusion_queries"/> + <stat_bar label="物件已é®è”½" name="occluded"/> + <stat_bar label="物件已解除é®è”½" name="unoccluded"/> </stat_view> <stat_view label="æ質" name="texture"> <stat_bar label="å¿«å–讀å–率" name="texture_cache_hits"/> @@ -26,15 +29,32 @@ <stat_bar label="原始記憶" name="rawmemstat"/> <stat_bar label="ç•Œé™è¨˜æ†¶" name="glboundmemstat"/> </stat_view> + <stat_view label="記憶體使用狀æ³" name="memory"> + <stat_bar label="LLTrace" name="LLTrace"/> + <stat_bar label="使用者界é¢" name="LLView"/> + <stat_bar label="å—åž‹" name="LLFontFreetype"/> + <stat_bar label="收ç´å€" name="LLInventoryObject"/> + <stat_bar label="Viewer物件" name="LLViewerObject"/> + <stat_bar label="å…«å‰æ¨¹ç¾¤è³‡æ–™" name="LLViewerOctreeGroup"/> + <stat_bar label="å…«å‰æ¨¹è³‡æ–™" name="LLViewerOctreeEntry"/> + <stat_bar label="Viewer物件快å–" name="LLVOCacheEntry"/> + <stat_bar label="å¯ç¹ªç‰©ä»¶" name="LLDrawable"/> + <stat_bar label="臉部資料" name="LLFace"/> + <stat_bar label="æ繪資訊" name="LLDrawInfo"/> + <stat_bar label="æ質資料" name="LLTexture"/> + <stat_bar label="圖åƒè³‡æ–™" name="LLImage"/> + <stat_bar label="GL圖åƒè³‡æ–™" name="LLImageGL"/> + <stat_bar label="é ‚é»žç·©è¡" name="LLVertexBuffer"/> + </stat_view> <stat_view label="網路" name="network"> <stat_bar label="進入å°åŒ…" name="packetsinstat"/> <stat_bar label="出去å°åŒ…" name="packetsoutstat"/> - <stat_bar label="物件" name="objectkbitstat"/> - <stat_bar label="æ質" name="texturekbitstat"/> - <stat_bar label="資產" name="assetkbitstat"/> - <stat_bar label="層次" name="layerskbitstat"/> - <stat_bar label="實入" name="actualinkbitstat"/> - <stat_bar label="實出" name="actualoutkbitstat"/> + <stat_bar label="物件" name="objectdatareceived"/> + <stat_bar label="æ質" name="texturedatareceived"/> + <stat_bar label="資產" name="assetudpdatareceived"/> + <stat_bar label="層次" name="layersdatareceived"/> + <stat_bar label="實入" name="messagedatain"/> + <stat_bar label="實出" name="messagedataout"/> <stat_bar label="VFS 待行作æ¥" name="vfspendingoperations"/> </stat_view> </stat_view> @@ -64,8 +84,8 @@ <stat_bar label="出去å°åŒ…" name="simoutpps"/> <stat_bar label="擱置下載" name="simpendingdownloads"/> <stat_bar label="擱置上傳" name="simpendinguploads"/> - <stat_bar label="未承èªçš„總ä½å…ƒçµ„數" name="simtotalunackedbytes"/> - <stat_view label="時間（毫秒）" name="simperf"> + <stat_bar label="未承èªçš„總資料" name="simtotalunackedbytes"/> + <stat_view label="時間" name="simperf"> <stat_bar label="總禎時間" name="simframemsec"/> <stat_bar label="淨時間" name="simnetmsec"/> <stat_bar label="物ç†æ™‚é–“" name="simsimphysicsmsec"/> @@ -74,7 +94,7 @@ <stat_bar label="圖åƒæ™‚é–“" name="simimagesmsec"/> <stat_bar label="腳本時間" name="simscriptmsec"/> <stat_bar label="閒置時間" name="simsparemsec"/> - <stat_view label="時間細節（毫秒）" name="timedetails"> + <stat_view label="時間細節" name="timedetails"> <stat_bar label="物ç†æ¥é©Ÿ" name="simsimphysicsstepmsec"/> <stat_bar label="更新物ç†å½¢ç‹€" name="simsimphysicsshapeupdatemsec"/> <stat_bar label="物ç†ï¼ˆå…¶ä»–）" name="simsimphysicsothermsec"/> diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml index ef0986a13bd..cefb395256a 100755 --- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml @@ -2,6 +2,7 @@ <menu name="Avatar Icon Menu"> <menu_item_call label="察看檔案" name="Show Profile"/> <menu_item_call label="é€å‡º IM..." name="Send IM"/> + <menu_item_call label="è¦æ±‚瞬間傳é€" name="Request Teleport"/> <menu_item_call label="åŠ ç‚ºæœ‹å‹..." name="Add Friend"/> <menu_item_call label="移除朋å‹..." name="Remove Friend"/> </menu> diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml index 7f745ffaa7e..478f9870354 100755 --- a/indra/newview/skins/default/xui/zh/menu_inventory.xml +++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml @@ -70,6 +70,7 @@ <menu_item_call label="æ’放" name="Sound Play"/> <menu_item_call label="覆製 SLurl" name="url_copy"/> <menu_item_call label="æ·»åŠ åœ°æ¨™" name="About Landmark"/> + <menu_item_call label="顯示在地圖上" name="show_on_map"/> <menu_item_call label="在虛擬世界æ’放" name="Animation Play"/> <menu_item_call label="在本地æ’放" name="Animation Audition"/> <menu_item_call label="é€å‡ºå³æ™‚訊æ¯" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml index 1d3d771efbe..4a1e2f43648 100755 --- a/indra/newview/skins/default/xui/zh/menu_login.xml +++ b/indra/newview/skins/default/xui/zh/menu_login.xml @@ -5,7 +5,15 @@ <menu_item_call label="退出 [APP_NAME]" name="Quit"/> </menu> <menu label="幫助" name="Help"> - <menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/> + <menu_item_call label="簡易教å¸â€¦" name="How To"/> + <menu_item_call label="快速上手" name="Quickstart"/> + <menu_item_call label="知è˜åº«" name="Knowledge Base"/> + <menu_item_call label="ç¶åŸº" name="Wiki"/> + <menu_item_call label="社群論壇" name="Community Forums"/> + <menu_item_call label="支æ´å…¥å£" name="Support portal"/> + <menu_item_call label="[SECOND_LIFE] 最新消æ¯" name="Second Life News"/> + <menu_item_call label="[SECOND_LIFE] 部è½æ ¼" name="Second Life Blogs"/> + <menu_item_call label="å›žå ±éŒ¯èª¤" name="Report Bug"/> <menu_item_call label="關於 [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="顯示除錯é¸å–®" name="Show Debug Menu"/> diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml index c636e108ad9..bf609838962 100755 --- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="瞬間傳é€" name="Teleport"/> <menu_item_call label="更多資訊" name="More Information"/> - <menu_item_call label="覆製到剪貼簿" name="CopyToClipboard"/> + <menu_item_call label="覆製 SLurl" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index b267bda2bbe..eb602d8e3bd 100755 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -70,11 +70,11 @@ <menu_item_check label="進階é¸å–®" name="Show Advanced Menu"/> </menu> <menu label="太陽" name="Sun"> - <menu_item_call label="日出" name="Sunrise"/> - <menu_item_call label="ä¸åˆ" name="Noon"/> - <menu_item_call label="æ—¥è½" name="Sunset"/> - <menu_item_call label="åˆå¤œ" name="Midnight"/> - <menu_item_call label="使用地å€è¨å®š" name="Use Region Settings"/> + <menu_item_check label="日出" name="Sunrise"/> + <menu_item_check label="ä¸åˆ" name="Noon"/> + <menu_item_check label="æ—¥è½" name="Sunset"/> + <menu_item_check label="åˆå¤œ" name="Midnight"/> + <menu_item_check label="使用地å€è¨å®š" name="Use Region Settings"/> </menu> <menu label="環境編輯器" name="Environment Editor"> <menu_item_call label="環境è¨å®šâ€¦" name="Environment Settings"/> @@ -163,8 +163,6 @@ </menu> <menu label="幫助" name="Help"> <menu_item_call label="簡易教å¸â€¦" name="How To"/> - <menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/> - <menu_item_call label="使用者指å—" name="User’s guide"/> <menu_item_call label="知è˜åº«" name="Knowledge Base"/> <menu_item_call label="ç¶åŸº" name="Wiki"/> <menu_item_call label="社群論壇" name="Community Forums"/> @@ -186,6 +184,7 @@ <menu label="效能工具" name="Performance Tools"> <menu_item_call label="Lag 測é‡å™¨" name="Lag Meter"/> <menu_item_check label="統計列" name="Statistics Bar"/> + <menu_item_call label="å ´æ™¯è² è¼‰çµ±è¨ˆè³‡æ–™" name="Scene Load Statistics"/> <menu_item_check label="顯示化身的繪製é‡é‡" name="Avatar Rendering Cost"/> </menu> <menu label="高亮顯示與å¯è¦‹åº¦" name="Highlighting and Visibility"> @@ -248,6 +247,7 @@ <menu_item_check label="快速碼錶" name="Fast Timers"/> <menu_item_check label="記憶體" name="Memory"/> <menu_item_check label="å ´æ™¯çµ±è¨ˆè³‡æ–™" name="Scene Statistics"/> + <menu_item_check label="å ´æ™¯è¼‰å…¥ç›£æŽ§å™¨" name="Scene Loading Monitor"/> <menu_item_call label="æ質擷å–除錯控制å°" name="Texture Fetch Debug Console"/> <menu_item_call label="地å€è³‡è¨Šå‚³è‡³é™¤éŒ¯æŽ§åˆ¶å°" name="Region Info to Debug Console"/> <menu_item_call label="群組資訊至除錯控制å°" name="Group Info to Debug Console"/> @@ -284,6 +284,7 @@ <menu_item_check label="定期出ç¾æ…¢å¹€çŽ‡" name="Periodic Slow Frame"/> <menu_item_check label="ç•«é¢æ¸¬è©¦" name="Frame Test"/> <menu_item_call label="幀特性" name="Frame Profile"/> + <menu_item_call label="標竿測試" name="Benchmark"/> </menu> <menu label="呈åƒçš„元資料" name="Render Metadata"> <menu_item_check label="外框箱" name="Bounding Boxes"/> @@ -302,6 +303,7 @@ <menu_item_check label="建製佇列" name="Build Queue"/> <menu_item_check label="燈光" name="Lights"/> <menu_item_check label="碰撞骨架" name="Collision Skeleton"/> + <menu_item_check label="接點" name="Joints"/> <menu_item_check label="光線投射" name="Raycast"/> <menu_item_check label="風力å‘é‡" name="Wind Vectors"/> <menu_item_check label="繪出複雜度" name="rendercomplexity"/> @@ -334,6 +336,7 @@ <menu_item_check label="使附著燈光呈åƒ" name="Render Attached Lights"/> <menu_item_check label="使附著例å效果呈åƒ" name="Render Attached Particles"/> <menu_item_check label="åœæ‡¸ç™¼å…‰ç‰©ä»¶" name="Hover Glow Objects"/> + <menu_item_call label="ç«‹å³æ¸…除快å–" name="Cache Clear"/> </menu> <menu label="網路" name="Network"> <menu_item_check label="æš«åœç”¨æˆ¶" name="AgentPause"/> @@ -366,7 +369,6 @@ <menu_item_call label="傾å°ç„¦é»žå®¹å™¨" name="Dump Focus Holder"/> <menu_item_call label="列å°æ‰€é¸ç‰©ä»¶è³‡è¨Š" name="Print Selected Object Info"/> <menu_item_call label="列å°ç”¨æˆ¶è³‡è¨Š" name="Print Agent Info"/> - <menu_item_check label="地å€é™¤éŒ¯æŽ§åˆ¶å°" name="Region Debug Console"/> <menu_item_check label="除錯 SelectMgr" name="Debug SelectMgr"/> <menu_item_check label="除錯點按動作" name="Debug Clicks"/> <menu_item_check label="視角除錯" name="Debug Views"/> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 864f20fc158..46cbaa60b1d 100755 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -114,15 +114,15 @@ <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="OutboxImportFailed"> - 轉移失敗 + 傳é€å¤±æ•—，錯誤碼 '[ERROR_CODE]' 未將任何資料夾é€å¾€ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集，系統或網路出錯。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚ <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="OutboxInitFailed"> - 第二人生購物市集åˆå§‹åŒ–失敗 + 購物市集åˆå§‹åŒ–失敗，錯誤碼 '[ERROR_CODE]' -第二人生購物市集åˆå§‹åŒ–失敗，系統或網路出錯。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚ +購物市集åˆå§‹åŒ–失敗，系統或網路出錯。 è«‹ç¨å€™å†è©¦ä¸€æ¬¡ã€‚ <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="CompileQueueSaveText"> @@ -1722,6 +1722,10 @@ SHA1 指紋：[MD5_DIGEST] ä½ ç¢ºå®šè¦çž¬é–“傳é€åˆ°<nolink>[LOCATION]</nolink>？ <usetemplate ignoretext="確èªæˆ‘è¦çž¬é–“傳é€åˆ°æŸå€‹åœ°æ¨™" name="okcancelignore" notext="å–消" yestext="瞬間傳é€"/> </notification> + <notification name="TeleportViaSLAPP"> + ä½ ç¢ºå®šè¦çž¬é–“傳é€åˆ°<nolink>[LOCATION]</nolink>？ + <usetemplate ignoretext="確èªæˆ‘è¦é€éŽSLAPP瞬間傳é€" name="okcancelignore" notext="å–消" yestext="瞬間傳é€"/> + </notification> <notification name="TeleportToPick"> 瞬間傳é€åˆ° [PICK]? <usetemplate ignoretext="確èªæˆ‘è¦çž¬é–“傳é€åˆ°ç²¾é¸åœ°é»žçš„所在ä½ç½®" name="okcancelignore" notext="å–消" yestext="瞬間傳é€"/> @@ -1931,6 +1935,9 @@ SHA1 指紋：[MD5_DIGEST] <notification name="ProblemAddingEstateManager"> æ–°å¢žé ˜åœ°ç®¡ç†äººæ™‚出å•é¡Œã€‚ å…¶ä¸ä¸€å€‹é ˜åœ°çš„管ç†äººæ¸…å–®å¯èƒ½å·²ç¶“é¡æ»¿ã€‚ </notification> + <notification name="ProblemAddingEstateBanManager"> + ç„¡æ³•æŠŠé ˜åœ°æ‰€æœ‰äººæˆ–ç®¡ç†å“¡åŠ å…¥é ˜åœ°çš„å°éŽ–åå–®ä¸ã€‚ + </notification> <notification name="ProblemAddingEstateGeneric"> æ–°å¢žåˆ°é€™å€‹é ˜åœ°æ¸…å–®æ™‚å‡ºå•é¡Œã€‚ å…¶ä¸ä¸€å€‹é ˜åœ°çš„清單å¯èƒ½å·²æ»¿ã€‚ </notification> @@ -3019,7 +3026,7 @@ SHA1 指紋：[MD5_DIGEST] 居民： -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/> </notification> <notification name="ShareFolderConfirmation"> @@ -3031,7 +3038,7 @@ SHA1 指紋：[MD5_DIGEST] 居民： -[RESIDENTS] +<nolink>[RESIDENTS]</nolink> <usetemplate name="okcancelbuttons" notext="å–消" yestext="確定"/> </notification> <notification name="ItemsShared"> @@ -3487,10 +3494,6 @@ SHA1 指紋：[MD5_DIGEST] <notification name="EjectComingSoon"> ä½ ä¸å†å…è¨±å¾…åœ¨é€™è£¡ï¼Œå¿…é ˆåœ¨ [EJECT_TIME] 秒內離開。 </notification> - <notification name="NoEnterServerFull"> - ä½ ç„¡æ³•é€²å…¥é€™åœ°å€ï¼Œå› 為 -伺æœå™¨æ»¿è¼‰ã€‚ - </notification> <notification name="SaveBackToInvDisabled"> 「儲å˜å›žæ”¶ç´å€ã€åŠŸèƒ½å·²è¢«åœç”¨ã€‚ </notification> @@ -3680,6 +3683,9 @@ SHA1 指紋：[MD5_DIGEST] <notification name="LinkFailedTooMuchPhysics"> 物件使用了éŽå¤šç‰©ç†è³‡æºï¼Œå…¶å‹•æ…‹ç‰¹æ€§å·²è¢«åœç”¨ã€‚ </notification> + <notification name="EstateManagerFailedllTeleportHome"> + ä½æ–¼[SLURL]的物件'[OBJECT_NAME]'ç„¡æ³•å°‡é ˜åœ°ç®¡ç†å“¡çž¬é–“傳é€å›žå®¶ã€‚ + </notification> <notification name="TeleportedHomeByObjectOnParcel"> ä½ å·²è¢« '[PARCEL_NAME]' 地段的物件 '[OBJECT_NAME]' æˆåŠŸçž¬é–“傳é€å›žå®¶ </notification> @@ -3870,13 +3876,18 @@ SHA1 指紋：[MD5_DIGEST] 未é¸å–è¶³å¤ ç§Ÿç”¨åœ°æ®µï¼Œç„¡æ³•åˆä½µã€‚ </notification> <notification name="CantDivideLandMultipleParcelsSelected"> - 無法分割土地，\nå› ç‚ºä½ é¸å–了多個地段，\n請縮å°æ‰€é¸åœŸåœ°ã€‚ + 無法分割土地。 +é¸å–了超éŽä¸€å€‹åœ°æ®µã€‚ +請試著縮å°æ‰€é¸çš„土地。 </notification> <notification name="CantDivideLandCantFindParcel"> - 無法分割土地。\n找ä¸åˆ°åœ°æ®µã€‚\n請到「幫助 > å›žå ±éŒ¯èª¤â€¦â€¦ã€å›žå ±å•é¡Œ + 無法分割土地。 +找ä¸åˆ°åœ°æ®µã€‚ +請到「幫助->å›žå ±éŒ¯èª¤ã€å›žå ±å•é¡Œ </notification> <notification name="CantDivideLandWholeParcelSelected"> - 無法分割土地。 é¸å–了整個地段。\n請試著縮å°æ‰€é¸çš„土地。 + 無法分割土地。 é¸æ“‡äº†æ•´å€‹åœ°æ®µã€‚ +請試著縮å°æ‰€é¸çš„土地。 </notification> <notification name="LandHasBeenDivided"> 土地分割æˆåŠŸã€‚ @@ -4016,4 +4027,8 @@ SHA1 指紋：[MD5_DIGEST] 無法移動檔案。 å·²æ¢å¾©å‰ä¸€å€‹è·¯å¾‘。 <usetemplate ignoretext="無法移動檔案。 å·²æ¢å¾©å‰ä¸€å€‹è·¯å¾‘。" name="okignore" yestext="確定"/> </notification> + <notification name="ChatHistoryIsBusyAlert"> + èŠå¤©ç´€éŒ„檔案還在處ç†å‰ä¸€å€‹å‹•ä½œã€‚ è«‹ç¨å€™å†è©¦ï¼Œæˆ–è«‹æ›ä¸€å€‹èŠå¤©å°è±¡ã€‚ + <usetemplate name="okbutton" yestext="確定"/> + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml index f979a4c53e8..43e3507961e 100755 --- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml @@ -20,7 +20,7 @@ <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="基本資料"/> - <accordion_tab name="group_roles_tab" title="角色"/> + <accordion_tab name="group_roles_tab" title="角色與æˆå“¡"/> <accordion_tab name="group_notices_tab" title="通知"/> <accordion_tab name="group_land_tab" title="土地 / 資產"/> </accordion> diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml index 59086c3de27..69ee8451dea 100755 --- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml @@ -21,6 +21,7 @@ <name_list.columns label="æˆå“¡" name="name"/> <name_list.columns label="æ款" name="donated"/> <name_list.columns label="狀態" name="online"/> + <name_list.columns label="é 銜" name="title"/> </name_list> <button label="邀請" name="member_invite"/> <button label="踢出" name="member_eject"/> diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml index e5d5e6eaf79..0bb59a7b146 100755 --- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml @@ -28,7 +28,8 @@ <check_box label="æ–¼é€™å€‹é ˜åœ°å…§çš„æ¯ä¸€å€‹åœ°å€" name="return_estate_wide" tool_tip="é€€å›žé€™å€‹é ˜åœ°å…§å…¨éƒ¨åœ°å€ä¸æ¨™è¨˜ç‚ºä»–的物件"/> <button label="退回" name="return_btn"/> <button label="å–得最常碰撞的物件..." name="top_colliders_btn" tool_tip="æ¢åˆ—出目å‰é‹ä½œä¸æœ€å¸¸ç¢°æ’žçš„物件清單"/> - <button label="å–得最耗能腳本..." name="top_scripts_btn" tool_tip="æ¢åˆ—���目å‰é‹ä½œä¸æœ€è€—能的腳本清單"/> <button label="地å€é‡æ–°å•Ÿå‹•" name="restart_btn" tool_tip="給予兩分é˜å€’數計時並é‡æ–°å•Ÿå‹•"/> + <button label="å–得最耗能腳本..." name="top_scripts_btn" tool_tip="æ¢åˆ—���目å‰é‹ä½œä¸æœ€è€—能的腳本清單"/> <button label="å–消é‡æ–°å•Ÿå‹•" name="cancel_restart_btn" tool_tip="å–消地å€é‡æ–°å•Ÿå‹•"/> + <button label="地å€é™¤éŒ¯æŽ§åˆ¶å°" name="region_debug_console_btn" tool_tip="開啟地å€é™¤éŒ¯æŽ§åˆ¶å°"/> </panel> diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml index f6b2c46354c..0ce3b659b21 100755 --- a/indra/newview/skins/default/xui/zh/panel_region_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml @@ -20,12 +20,12 @@ </text> <check_box label="阻æ¢åœŸåœ°è®Šå½¢" name="block_terraform_check"/> <check_box label="阻æ¢é£›è¡Œ" name="block_fly_check"/> + <check_box label="ç¦æ¢é£›è¶Šåœ°æ®µ" name="block_fly_over_check" tool_tip="將出入管制往上空擴大，一併ç¦æ¢é£›è¶Šåœ°æ®µ"/> <check_box label="å…許傷害" name="allow_damage_check"/> <check_box label="é™åˆ¶æŽ¨æ’ž" name="restrict_pushobject"/> <check_box label="å…許土地轉售" name="allow_land_resell_check"/> <check_box label="å…許土地 åˆä½µ/分割" name="allow_parcel_changes_check"/> <check_box label="阻擋土地顯示於æœå°‹ä¸" name="block_parcel_search_check" tool_tip="讓其他人å¯ä»¥åœ¨æœå°‹çµæžœä¸çœ‹åˆ°é€™å€‹åœ°å€èˆ‡å…¶ä¸çš„地段"/> - <check_box label="å…許網é¢ç‰©ä»¶" name="mesh_rez_enabled_check" tool_tip="å…許大家在æ¤åœ°å€ç”¢ç”Ÿç¶²é¢ç‰©ä»¶"/> <spinner label="人數上é™" name="agent_limit_spin"/> <spinner label="物件紅利" name="object_bonus_spin"/> <text label="分級" name="access_text"> diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml index 4034a7154fa..54ea7cab225 100755 --- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml @@ -25,15 +25,15 @@ <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> - <button label="檔案" name="info_btn" tool_tip="顯示物件檔案"/> + <button label="檔案" name="info_btn" tool_tip="顯示物件簡介"/> </layout_panel> <layout_panel name="share_btn_lp"> <button label="分享" name="share_btn" tool_tip="分享一個收ç´å€ç‰©å“"/> </layout_panel> <layout_panel name="shop_btn_lp"> - <button label="購物" name="shop_btn" tool_tip="é–‹å•Ÿ Marketplace 購物市集網é "/> + <button label="購物" name="shop_btn" tool_tip="開啟購物市集網é "/> <button label="穿上" name="wear_btn" tool_tip="穿上所é¸æ“‡çš„è£æ‰®"/> - <button label="æ’放" name="play_btn"/> + <button label="éŠæˆ²" name="play_btn"/> <button label="瞬間傳é€" name="teleport_btn" tool_tip="瞬間傳é€åˆ°æ‰€é¸çš„å€åŸŸ"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index d9fa105ef49..4e636e78161 100755 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -37,6 +37,45 @@ <string name="StartupRequireDriverUpdate"> 顯åƒåˆå§‹åŒ–失敗。 è«‹æ›´æ–°ä½ çš„é¡¯åƒå¡é©…動程å¼ï¼ </string> + <string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </string> + <string name="AboutCompiler"> + 以 [COMPILER_VERSION] 版本 [COMPILER] 建置 + </string> + <string name="AboutPosition"> + ä½ çš„æ–¹ä½æ˜¯ [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地å€å：[REGION]，主機：<nolink>[HOSTNAME]</nolink> ([HOSTIP]) +第二人生URL：<nolink>[SLURL]</nolink> +（全域å標：[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]） +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutSystem"> + CPU：[CPU] +記憶體：[MEMORY_MB] MB +作æ¥ç³»çµ±ç‰ˆæœ¬ï¼š[OS_VERSION] +顯示å¡ä¾›æ‡‰å•†ï¼š[GRAPHICS_CARD_VENDOR] +顯示å¡ï¼š[GRAPHICS_CARD] + </string> + <string name="AboutDriver"> + Windows 顯示驅動程å¼ç‰ˆæœ¬ï¼š[GRAPHICS_DRIVER_VERSION] + </string> + <string name="AboutLibs"> + OpenGL 版本：[OPENGL_VERSION] + +libcurl 版本： [LIBCURL_VERSION] +J2C 解碼器版本： [J2C_VERSION] +音效驅動程å¼ç‰ˆæœ¬ï¼š [AUDIO_DRIVER_VERSION] +Qt Webkit 版本： [QT_WEBKIT_VERSION] +語音伺æœå™¨ç‰ˆæœ¬ï¼š [VOICE_VERSION] + </string> + <string name="AboutTraffic"> + å°åŒ…丟失：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </string> + <string name="ErrorFetchingServerReleaseNotesURL"> + æ“·å–伺æœå™¨ç‰ˆæœ¬èªªæ˜Ž URL 時出錯。 + </string> <string name="ProgressRestoring"> 回å˜ä¸... </string> @@ -929,15 +968,15 @@ http://secondlife.com/viewer-access-faq <string name="ControlYourCamera"> æŽ§åˆ¶ä½ çš„æ”影機 </string> + <string name="TeleportYourAgent"> + 瞬間傳é€ä½ 本人 + </string> <string name="NotConnected"> 未è¯æŽ¥ </string> <string name="AgentNameSubst"> ï¼ˆä½ ï¼‰ </string> - <string name="TeleportYourAgent"> - 瞬間傳é€ä½ 本人 - </string> <string name="JoinAnExperience"> åŠ å…¥é«”é©— </string> @@ -1291,6 +1330,18 @@ http://secondlife.com/viewer-access-faq <string name="InventoryOutboxNoItems"> 將資料夾拖曳到這個å€åŸŸï¼Œå†é»žæŒ‰ã€Œé€å¾€ç¬¬äºŒäººç”Ÿè³¼ç‰©å¸‚集ã€ï¼Œå³å¯åœ¨[[MARKETPLACE_DASHBOARD_URL]第二人生購物市集]登列出售。 </string> + <string name="InventoryOutboxInitializingTitle"> + æ£åœ¨åˆå§‹åŒ–購物市集。 + </string> + <string name="InventoryOutboxInitializing"> + 我們æ£åœ¨æ±‚å–ä½ çš„[[MARKETPLACE_CREATE_STORE_URL] 購物市集商店]帳戶。 + </string> + <string name="InventoryOutboxErrorTitle"> + 購物市集出錯。 + </string> + <string name="InventoryOutboxError"> + [[MARKETPLACE_CREATE_STORE_URL] 購物市集商店]æ£å‚³å›žéŒ¯èª¤ã€‚ + </string> <string name="Marketplace Error None"> 零錯誤 </string> @@ -1318,6 +1369,9 @@ http://secondlife.com/viewer-access-faq <string name="Open landmarks"> 開啟地標 </string> + <string name="Unconstrained"> + ä¸å—é™ + </string> <string name="no_transfer" value="（ç¦æ¢è½‰è®“）"/> <string name="no_modify" value="（ç¦æ¢ä¿®æ”¹ï¼‰"/> <string name="no_copy" value="（ç¦æ¢è¤‡è£½ï¼‰"/> @@ -1718,6 +1772,9 @@ http://secondlife.com/viewer-access-faq <string name="CompileQueueDownloadedCompiling"> 已下載，æ£åœ¨ç·¨è¯ä¸ </string> + <string name="CompileQueueServiceUnavailable"> + 腳本編è¯æœå‹™ç„¡æ³•ä½¿ç”¨ + </string> <string name="CompileQueueScriptNotFound"> 伺æœå™¨ä¸Šæœªç™¼ç¾è…³æœ¬ã€‚ </string> -- GitLab