diff options
| author | Don Kjer <don@lindenlab.com> | 2012-07-13 02:09:57 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-07-13 02:09:57 +0000 |
| commit | 3c9c7036fed46555787ad0dd545f1d8fa180ebb0 (patch) | |
| tree | 10344b99b079cba54905a1980ec8ba4e6c5dca9c /indra | |
| parent | f0e34ebcd61ee998efa681a211545a7335d60c97 (diff) | |
| parent | 254c2703632ef5d7a875597d4907804c63ed8e72 (diff) | |
Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes
Diffstat (limited to 'indra')
75 files changed, 1174 insertions, 205 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 4f4eef0f3d..c69999981c 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1007,7 +1007,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, } } // Add the texture item to the target object's inventory. - hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + if (LLAssetType::AT_TEXTURE == new_item->getType()) + { + hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } + else + { + hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } // TODO: Check to see if adding the item was successful; if not, then // we should return false here. } @@ -1022,7 +1029,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, // *FIX: may want to make sure agent can paint hit_obj. // Add the texture item to the target object's inventory. - hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + if (LLAssetType::AT_TEXTURE == new_item->getType()) + { + hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } + else + { + hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true); + } // Force the object to update its refetch its inventory so it has this texture. hit_obj->fetchInventoryFromServer(); // TODO: Check to see if adding the item was successful; if not, then diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 72fd3c1a4a..67c87a6c63 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2924,27 +2924,39 @@ void LLViewerObject::removeInventory(const LLUUID& item_id) ++mInventorySerialNum; } -void LLViewerObject::updateInventory( - LLViewerInventoryItem* item, - U8 key, - bool is_new) +bool LLViewerObject::isTextureInInventory(LLViewerInventoryItem* item) { - LLMemType mt(LLMemType::MTYPE_OBJECT); + bool result = false; - std::list<LLUUID>::iterator begin = mPendingInventoryItemsIDs.begin(); - std::list<LLUUID>::iterator end = mPendingInventoryItemsIDs.end(); + if (item && LLAssetType::AT_TEXTURE == item->getType()) + { + std::list<LLUUID>::iterator begin = mPendingInventoryItemsIDs.begin(); + std::list<LLUUID>::iterator end = mPendingInventoryItemsIDs.end(); - bool is_fetching = std::find(begin, end, item->getAssetUUID()) != end; - bool is_fetched = getInventoryItemByAsset(item->getAssetUUID()) != NULL; + bool is_fetching = std::find(begin, end, item->getAssetUUID()) != end; + bool is_fetched = getInventoryItemByAsset(item->getAssetUUID()) != NULL; - if (is_fetched || is_fetching) - { - return; + result = is_fetched || is_fetching; } - else + + return result; +} + +void LLViewerObject::updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new) +{ + if (item && !isTextureInInventory(item)) { mPendingInventoryItemsIDs.push_back(item->getAssetUUID()); + updateInventory(item, key, is_new); } +} + +void LLViewerObject::updateInventory( + LLViewerInventoryItem* item, + U8 key, + bool is_new) +{ + LLMemType mt(LLMemType::MTYPE_OBJECT); // This slices the object into what we're concerned about on the // viewer. The simulator will take the permissions and transfer diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index dc102b666f..409108266e 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -432,12 +432,15 @@ public: // manager until we have better iterators. void updateInventory(LLViewerInventoryItem* item, U8 key, bool is_new); void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging. + void updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new); LLInventoryObject* getInventoryObject(const LLUUID& item_id); void getInventoryContents(LLInventoryObject::object_list_t& objects); LLInventoryObject* getInventoryRoot(); LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id); S16 getInventorySerial() const { return mInventorySerialNum; } + bool isTextureInInventory(LLViewerInventoryItem* item); + // These functions does viewer-side only object inventory modifications void updateViewerInventoryAsset( const LLViewerInventoryItem* item, diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml index ca081aafae..fd6c9a0875 100644 --- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml @@ -25,6 +25,10 @@ VBO aktivieren: </text> <check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern. Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/> + <text name="tc label"> + S3TC aktivieren: + </text> + <check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/> <slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/> <spinner label="Nebeldistanzverhältnis:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml index f6dc9fe15d..92d057a4fe 100644 --- a/indra/newview/skins/default/xui/de/floater_stats.xml +++ b/indra/newview/skins/default/xui/de/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="Pro Sek. gezeichnete KTris" 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_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="Zählen" name="numimagesstat"/> <stat_bar label="Rohanzahl" name="numrawimagesstat"/> <stat_bar label="GL Sp" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml index 8944c79c7d..5bb96bebc4 100644 --- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml @@ -1,24 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="TEXTUR AUSWÄHLEN"> - <string name="choose_picture"> + <floater.string name="choose_picture"> Zum Auswählen eines Bildes hier klicken - </string> + </floater.string> + <floater.string name="pick title"> + Auswählen: + </floater.string> <text name="Multiple"> Mehrere Texturen </text> + <radio_group name="mode_selection"> + <radio_item label="Inventar" name="inventory" value="0"/> + <radio_item label="Lokal" name="local" value="1"/> + </radio_group> <text name="unknown"> Größe: [DIMENSIONS] </text> <button label="Standard" label_selected="Standard" name="Default"/> - <button label="Keine" label_selected="Keine" name="None"/> <button label="Leer" label_selected="Leer" name="Blank"/> - <check_box label="Ordner anzeigen" name="show_folders_check"/> - <search_editor label="Texturen filtern" name="inventory search editor"/> - <check_box label="Jetzt übernehmen" name="apply_immediate_check"/> + <button label="Keine" label_selected="Keine" name="None"/> <button label="" label_selected="" name="Pipette"/> - <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> + <filter_editor label="Texturen filtern" name="inventory search editor"/> + <check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/> + <button label="Hinzufügen" label_selected="Hinzufügen" name="l_add_btn"/> + <button label="Entfernen" label_selected="Entfernen" name="l_rem_btn"/> + <button label="Hochladen" label_selected="Hochladen" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Name" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <text name="pick title"> - Auswählen: - </text> + <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> + <check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..0f407cb15c --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Debugger für Texturabruffehler"> + <text name="total_num_fetched_label"> + 1, Gesamtzahl abgerufener Texturen: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Gesamtzahl von Abrufanforderungen: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Gesamtzahl von Cachetreffern: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Gesamtzahl sichtbarer Texturen: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Gesamtzahl von Abrufanforderungen für sichtbare Texturen: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Gesamtmenge abgerufener Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel + </text> + <text name="total_fetched_vis_data_label"> + 7, Gesamtmenge sichtbarer Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, Gesamtmenge dargestellter Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel + </text> + <text name="total_time_cache_read_label"> + 9, Gesamtzeit Cache-Lesezugriffe: [TIME] s + </text> + <text name="total_time_cache_write_label"> + 10, Gesamtzeit Cache-Schreibzugriffe: [TIME] s + </text> + <text name="total_time_decode_label"> + 11, Gesamtzeit Decodierung: [TIME] s + </text> + <text name="total_time_gl_label"> + 12, Gesamtzeit GL-Texturerstellung: [TIME] s + </text> + <text name="total_time_http_label"> + 13, Gesamtzeit HTTP-Abrufe: [TIME] s + </text> + <text name="total_time_fetch_label"> + 14, Gesamtzeit für alle Abrufe: [TIME] s + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Neuabruf sichtbarer Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Neuabruf sichtbarer Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel + </text> + <spinner label="17, Verhältnis Texel/Pixel:" name="texel_pixel_ratio"/> + <button label="Starten" name="start_btn"/> + <button label="Zurücksetzen" name="clear_btn"/> + <button label="Schließen" name="close_btn"/> + <button label="Cache-Lesezugriff" name="cacheread_btn"/> + <button label="Cache-Schreibzugriff" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Decodieren" name="decode_btn"/> + <button label="GL-Textur" name="gl_btn"/> + <button label="Neuabruf sichtbarer Texturen (Cache)" name="refetchviscache_btn"/> + <button label="Neuabruf sichtbarer Texturen (HTTP)" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml index a2a53e0567..6502f002a1 100644 --- a/indra/newview/skins/default/xui/de/floater_window_size.xml +++ b/indra/newview/skins/default/xui/de/floater_window_size.xml @@ -7,10 +7,17 @@ Fenstergröße einstellen: </text> <combo_box name="window_size_combo" tool_tip="Breite x Höhe"> - <combo_box.item label="1000 x 700 (Standard)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + <combo_box.item label="1000 x 700 (Standard)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Festlegen" name="set_btn"/> <button label="Abbrechen" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index d011c7295c..856f91e214 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -227,11 +227,10 @@ <menu_item_check label="Textur" name="Texture Console"/> <menu_item_check label="Fehler beseitigen" name="Debug Console"/> <menu_item_call label="Meldungen" name="Notifications"/> - <menu_item_check label="Texturgröße" name="Texture Size"/> - <menu_item_check label="Texture-Kategorie" name="Texture Category"/> <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_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"/> <menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/> @@ -289,6 +288,12 @@ <menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/> <menu_item_check label="Byte in Anhängen" name="attachment bytes"/> <menu_item_check label="Formen" name="Sculpt"/> + <menu label="Texturdichte" name="Texture Density"> + <menu_item_check label="Keine" name="None"/> + <menu_item_check label="Aktuelle" name="Current"/> + <menu_item_check label="Gewünschte" name="Desired"/> + <menu_item_check label="Volle" name="Full"/> + </menu> </menu> <menu label="Rendering" name="Rendering"> <menu_item_check label="Achsen" name="Axes"/> @@ -306,7 +311,6 @@ <menu_item_check label="Animationstexturen" name="Animation Textures"/> <menu_item_check label="Texturen deaktivieren" name="Disable Textures"/> <menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/> - <menu_item_check label="Texturen prüfen" name="Audit Textures"/> <menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/> <menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/> <menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index ac068fcd4e..f7274d31e1 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -502,6 +502,15 @@ Weitere Informationen finden Sie auf [_URL]. </url> <usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/> </notification> + <notification name="IntelOldDriver"> + Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern. + + Unter [_URL] nach aktualisierten Treibern suchen? + <url name="url"> + http://www.intel.com/p/de_DE/support/detect/graphics + </url> + <usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> <notification name="UnknownGPU"> Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt. Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde. Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen. @@ -2628,16 +2637,12 @@ Ist das OK? </form> </notification> <notification name="ScriptQuestionCaution"> - Das Objekt „<nolink>[OBJECTNAME]</nolink>“, das „[NAME]“ gehört, stellt folgende Anfrage: - -[QUESTIONS] -Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen. - -Anfrage gestatten? + Achtung: Das Objekt „<nolink>[OBJECTNAME]</nolink>“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren. + +Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist. <form name="form"> - <button name="Grant" text="Gewähren"/> + <button name="Grant" text="Uneingeschränkten Zugriff gewähren"/> <button name="Deny" text="Verweigern"/> - <button name="Details" text="Info..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3135,4 +3140,16 @@ Ansonsten können Sie auf der Karte nachsehen und dort Ort suchen, die als „In <global name="You died and have been teleported to your home location"> Sie sind gestorben und wurden zu Ihrem Zuhause teleportiert. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + [FNAME] wurde nicht gefunden und konnte deshalb nicht aktualisiert werden. +Zukünftige Aktualisierungen dieser Datei werden deaktiviert. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [FNAME] konnte auch nach [NRETRIES] Versuchen nicht geöffnet oder decodiert werden und gilt als beschädigt. +Zukünftige Aktualisierungen dieser Datei werden deaktiviert. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Versuch, eine ungültige oder nicht lesbare Bilddatei ([FNAME]) hinzuzufügen, die nicht geöffnet oder decodiert werden konnte. +Versuch abgebrochen. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index d917d33d12..668a7b35bf 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -886,6 +886,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="ScriptQuestionCautionChatDenied"> Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Wenn Sie dem Objekt Zugriff auf Ihr Konto gewähren, kann dieses außerdem: + </string> <string name="ScriptTakeMoney"> Linden-Dollar (L$) von Ihnen nehmen </string> @@ -919,6 +922,9 @@ 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> diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml index b96076836b..c351db5eae 100644 --- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml @@ -25,6 +25,10 @@ Activar VBO: </text> <check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/> + <text name="tc label"> + Activar S3TC: + </text> + <check_box initial_value="verdadero" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas de la memoria de vídeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/> <slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/> <spinner label="Intensidad de la niebla:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml index ba4af2e866..d53ae88126 100644 --- a/indra/newview/skins/default/xui/es/floater_stats.xml +++ b/indra/newview/skins/default/xui/es/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="KTris generados 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_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_bar label="GL Mem" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index ed2787ea60..1e566e3e31 100644 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml @@ -1,24 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="DESTACADO: TEXTURA"> - <string name="choose_picture"> + <floater.string name="choose_picture"> Pulse para elegir una imagen - </string> + </floater.string> + <floater.string name="pick title"> + Elegir: + </floater.string> <text name="Multiple"> Texturas múltiples </text> + <radio_group name="mode_selection"> + <radio_item label="Inventario" name="inventory" value="0"/> + <radio_item label="Local" name="local" value="1"/> + </radio_group> <text name="unknown"> Tamaño: [DIMENSIONS] </text> <button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/> - <button label="Ninguna" label_selected="Ninguna" left="90" name="None"/> <button label="Blanca" label_selected="Blanca" name="Blank"/> - <check_box label="Ver las carpetas" name="show_folders_check"/> - <search_editor label="Filtrar las texturas" name="inventory search editor"/> - <check_box label="Aplicarlo ahora" name="apply_immediate_check"/> + <button label="Ninguna" label_selected="Ninguna" left="90" name="None"/> <button label="" label_selected="" name="Pipette"/> - <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <filter_editor label="Filtrar las texturas" name="inventory search editor"/> + <check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/> + <button label="Añadir" label_selected="Añadir" name="l_add_btn"/> + <button label="Eliminar" label_selected="Eliminar" name="l_rem_btn"/> + <button label="Subir" label_selected="Subir" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Nombre" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <string name="pick title"> - Elegir: - </string> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..29fd2ab2a3 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Depurador de obtención de texturas"> + <text name="total_num_fetched_label"> + 1, Número total de texturas obtenidas: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Número total de solicitudes de obtención: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Número total de aciertos de caché: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Número total de texturas visibles: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Número total de solicitudes de obtención de texturas visibles: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Número total de datos obtenidos: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles + </text> + <text name="total_fetched_vis_data_label"> + 7, Número total de datos visibles: [SIZE1] KB, Datos descodificados: [SIZE2] KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, Número total de datos representados: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles + </text> + <text name="total_time_cache_read_label"> + 9, Tiempo total en lecturas de caché: [TIME] segundos + </text> + <text name="total_time_cache_write_label"> + 10, Tiempo total en escrituras de caché: [TIME] segundos + </text> + <text name="total_time_decode_label"> + 11, Tiempo total en descodificaciones: [TIME] segundos + </text> + <text name="total_time_gl_label"> + 12, Tiempo total en la creación de texturas gl: [TIME] segundos + </text> + <text name="total_time_http_label"> + 13, Tiempo total en obtención de HTTP: [TIME] segundos + </text> + <text name="total_time_fetch_label"> + 14, Tiempo total en obtención completa: [TIME] segundos + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Volviendo a obtener visibles de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles + </text> + <spinner label="17, Proporción de texeles/píxeles:" name="texel_pixel_ratio"/> + <button label="Iniciar" name="start_btn"/> + <button label="Restablecer" name="clear_btn"/> + <button label="Cerrar" name="close_btn"/> + <button label="Lectura de caché" name="cacheread_btn"/> + <button label="Escritura de caché" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Descodificar" name="decode_btn"/> + <button label="Textura GL" name="gl_btn"/> + <button label="Volver a obtener caché de vis." name="refetchviscache_btn"/> + <button label="Volver a obtener HTTP de vis." name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml index f57ce08eac..6c1ad02319 100644 --- a/indra/newview/skins/default/xui/es/floater_window_size.xml +++ b/indra/newview/skins/default/xui/es/floater_window_size.xml @@ -7,10 +7,17 @@ Definir el tamaño de la ventana: </text> <combo_box name="window_size_combo" tool_tip="ancho x alto"> - <combo_box.item label="1000 x 700 (por defecto)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720 p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080 p)" name="item3"/> + <combo_box.item label="1000 x 700 (por defecto)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Configurar" name="set_btn"/> <button label="Cancelar" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 9522d4eac6..740bd35cbb 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -225,11 +225,10 @@ <menu_item_check label="Texture Console" name="Texture Console"/> <menu_item_check label="Debug Console" name="Debug Console"/> <menu_item_call label="Notifications Console" name="Notifications"/> - <menu_item_check label="Texture Size Console" name="Texture Size"/> - <menu_item_check label="Texture Category Console" name="Texture Category"/> <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_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"/> <menu_item_check label="Wind" name="Wind"/> @@ -270,6 +269,12 @@ <menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/> <menu_item_check label="Bytes de adjunto" name="attachment bytes"/> <menu_item_check label="Esculpir" name="Sculpt"/> + <menu label="Densidad de textura" name="Texture Density"> + <menu_item_check label="Ninguna" name="None"/> + <menu_item_check label="Actual" name="Current"/> + <menu_item_check label="Deseada" name="Desired"/> + <menu_item_check label="Completa" name="Full"/> + </menu> </menu> <menu label="Rendering" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index d47c3d7ad8..af7a7b088a 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -490,6 +490,15 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range& </url> <usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="Sí"/> </notification> + <notification name="IntelOldDriver"> + Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento. + + ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados? + <url name="url"> + http://www.intel.com/p/es_XL/support/detect/graphics + </url> + <usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/> + </notification> <notification name="UnknownGPU"> Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce. Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. @@ -2622,33 +2631,23 @@ Del objeto: <nolink>[OBJECTNAME]</nolink>, propietario: [NAME]? </form> </notification> <notification name="ScriptQuestionCaution"> - Un objeto de nombre '<nolink>[OBJECTNAME]</nolink>', propiedad de '[NAME]', quiere: - -[QUESTIONS] -Si no confias en este objeto y en su creador, deberías rehusar esta petición. - -¿Autorizar esta petición? + Atención: El objeto '<nolink>[OBJECTNAME]</nolink>' solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias. + +Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta. <form name="form"> - <button name="Grant" text="Autorizar"/> + <button name="Grant" text="Permitir acceso total"/> <button name="Deny" text="Denegar"/> - <button name="Details" text="Detalles..."/> </form> </notification> <notification name="ScriptDialog"> '<nolink>[TITLE]</nolink>' de [NAME] [MESSAGE] - <form name="form"> - <button name="Mute" text="Ignorar"/> - <button name="Ignore" text="Ignorar"/> - </form> + <form name="form"/> </notification> <notification name="ScriptDialogGroup"> '<nolink>[TITLE]</nolink>' de [GROUPNAME] [MESSAGE] - <form name="form"> - <button name="Mute" text="Ignorar"/> - <button name="Ignore" text="Ignorar"/> - </form> + <form name="form"/> </notification> <notification name="BuyLindenDollarSuccess"> ¡Gracias por tu pago! @@ -3126,4 +3125,16 @@ También puedes buscar en el Mapa lugares marcados como "Puntos de Informac <global name="You died and have been teleported to your home location"> Has muerto y te has teleportado a tu Base. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + [FNAME] no se ha podido actualizar porque el archivo ya no se encuentra. +Desactivando futuras actualizaciones de este archivo. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [FNAME] se ha intentado abrir o descodificar durante [NRETRIES] intentos sin éxito, y ahora se considera roto. +Desactivando futuras actualizaciones de este archivo. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Se ha intentado añadir un archivo de imagen [FNAME] no válido o ilegible, que no se puede abrir ni descodificar. +Intento cancelado. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 67c65c6ce9..adc32ba168 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -871,6 +871,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="ScriptQuestionCautionChatDenied"> A '[OBJECTNAME]', un objeto propiedad de '[OWNERNAME]', localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Si autorizas el acceso a tu cuenta, también permitirás al objeto: + </string> <string name="ScriptTakeMoney"> Cogerle a usted dólares Linden (L$) </string> @@ -904,6 +907,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="ControlYourCamera"> Controlar su cámara </string> + <string name="TeleportYourAgent"> + Teleportarte + </string> <string name="SIM_ACCESS_PG"> General </string> diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml index 2bc76e0c63..098f8fc713 100644 --- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml @@ -25,6 +25,10 @@ Activer le VBO : </text> <check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/> + <text name="tc label"> + Activer S3TC : + </text> + <check_box initial_value="vraie" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d'une certaine qualité de couleur."/> <slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d'être floues."/> <spinner label="Indice du brouillard :" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index 2ce2e6dcd5..56fa062d46 100644 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="KTris par s" name="ktrissec"/> <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_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_bar label="Mém GL" name="gltexmemstat"/> @@ -57,7 +60,7 @@ <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="Durée totale de l'image" name="simframemsec"/> + <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"/> <stat_bar label="Durée sim (autre)" name="simsimothermsec"/> diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml index 381bcceb00..ca0fbd3589 100644 --- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml @@ -1,24 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="CHOISIR : TEXTURE"> - <string name="choose_picture"> + <floater.string name="choose_picture"> Cliquez pour sélectionner une image - </string> + </floater.string> + <floater.string name="pick title"> + Choisir : + </floater.string> <text name="Multiple"> Textures multiples </text> + <radio_group name="mode_selection"> + <radio_item label="Inventaire" name="inventory" value="0"/> + <radio_item label="Local" name="local" value="1"/> + </radio_group> <text name="unknown"> Taille : [DIMENSIONS] </text> <button label="Défaut" label_selected="Défaut" name="Default" width="60"/> - <button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/> <button label="Vierge" label_selected="Vierge" name="Blank" width="60"/> - <check_box label="Afficher les dossiers" name="show_folders_check"/> - <search_editor label="Filtrer les textures" name="inventory search editor"/> - <check_box label="Appliquer maintenant" name="apply_immediate_check"/> + <button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/> <button bottom="-240" label="" label_selected="" name="Pipette"/> - <button label="Annuler" label_selected="Annuler" name="Cancel"/> + <filter_editor label="Filtrer les textures" name="inventory search editor"/> + <check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/> + <button label="Ajouter" label_selected="Ajouter" name="l_add_btn"/> + <button label="Supprimer" label_selected="Supprimer" name="l_rem_btn"/> + <button label="Charger" label_selected="Charger" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Nom" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <string name="pick title"> - Choisir : - </string> + <button label="Annuler" label_selected="Annuler" name="Cancel"/> + <check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..f0cc95319d --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Outil de débogage de la récupération des textures"> + <text name="total_num_fetched_label"> + 1, nombre total de textures récupérées : [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, nombre total de demandes de récupération : [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, nombre total de présences dans le cache : [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, nombre total de textures visibles : [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, nombre total de demandes de récupération de textures visibles : [NUM] + </text> + <text name="total_fetched_data_label"> + 6, nombre total de données récupérées : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels + </text> + <text name="total_fetched_vis_data_label"> + 7, nombre total de données visibles : [SIZE1] Ko, données décodées : [SIZE2] Ko + </text> + <text name="total_fetched_rendered_data_label"> + 8, nombre total de données rendues : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels + </text> + <text name="total_time_cache_read_label"> + 9, durée totale des lectures du cache : [TIME] secondes + </text> + <text name="total_time_cache_write_label"> + 10, durée totale des écritures du cache : [TIME] secondes + </text> + <text name="total_time_decode_label"> + 11, durée totale des décodages : [TIME] secondes + </text> + <text name="total_time_gl_label"> + 12, durée totale de la création de textures GL : [TIME] secondes + </text> + <text name="total_time_http_label"> + 13, durée totale de la récupération HTTP : [TIME] secondes + </text> + <text name="total_time_fetch_label"> + 14, durée totale de la récupération intégrale : [TIME] secondes + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, nouvelle récupération des données visibles du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels + </text> + <text name="total_time_refetch_vis_http_label"> + 16, nouvelle récupération des données visibles de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels + </text> + <spinner label="17, taux de texels/pixels :" name="texel_pixel_ratio"/> + <button label="Démarrer" name="start_btn"/> + <button label="Réinitialiser" name="clear_btn"/> + <button label="Fermer" name="close_btn"/> + <button label="Lecture du cache" name="cacheread_btn"/> + <button label="Écriture du cache" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Décoder" name="decode_btn"/> + <button label="Texture GL" name="gl_btn"/> + <button label="Récupérer à nouveau les données visibles du cache" name="refetchviscache_btn"/> + <button label="Récupérer à nouveau les données visibles de la requête HTTP" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml index cbda4390d8..11c2e439bd 100644 --- a/indra/newview/skins/default/xui/fr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml @@ -7,10 +7,17 @@ Définir la taille de la fenêtre : </text> <combo_box name="window_size_combo" tool_tip="largeur x hauteur"> - <combo_box.item label="1 000 x 700 (défaut)" name="item0"/> - <combo_box.item label="1 024 x 768" name="item1"/> - <combo_box.item label="1 280 x 720 (720 p)" name="item2"/> - <combo_box.item label="1 920 x 1 080 (1 080p)" name="item3"/> + <combo_box.item label="1000 x 700 (par défaut)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Choisir" name="set_btn"/> <button label="Annuler" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 3c3d4f5f69..2a26ed7a70 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -227,11 +227,10 @@ <menu_item_check label="Console de textures" name="Texture Console"/> <menu_item_check label="Console de débogage" name="Debug Console"/> <menu_item_call label="Console de notifications" name="Notifications"/> - <menu_item_check label="Console de tailles de textures" name="Texture Size"/> - <menu_item_check label="Console des catégories de textures" name="Texture Category"/> <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_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"/> <menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/> @@ -289,6 +288,12 @@ <menu_item_check label="Complexité du rendu" name="rendercomplexity"/> <menu_item_check label="Octets d'éléments attachés" name="attachment bytes"/> <menu_item_check label="Sculpture" name="Sculpt"/> + <menu label="Densité des textures" name="Texture Density"> + <menu_item_check label="Aucune" name="None"/> + <menu_item_check label="Actuelle" name="Current"/> + <menu_item_check label="Souhaitée" name="Desired"/> + <menu_item_check label="Complète" name="Full"/> + </menu> </menu> <menu label="Rendu" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> @@ -306,7 +311,6 @@ <menu_item_check label="Textures d'animation" name="Animation Textures"/> <menu_item_check label="Désactiver les textures" name="Disable Textures"/> <menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/> - <menu_item_check label="Audit Textures" name="Audit Textures"/> <menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/> <menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/> <menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 746a4b1d55..0cdfc61e8e 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -494,6 +494,15 @@ Consulter [_URL] pour en savoir plus ? </url> <usetemplate ignoretext="Mon matériel n'est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/> </notification> + <notification name="IntelOldDriver"> + Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d'améliorer considérablement les performances. + + Visiter la page [_URL] pour rechercher d'éventuelles mises à jour de pilotes ? + <url name="url"> + http://www.intel.com/p/fr_FR/support/detect/graphics + </url> + <usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/> + </notification> <notification name="UnknownGPU"> Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas. Cela est souvent le cas avec le nouveau matériel qui n'a pas encore été testé avec [APP_NAME]. Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques. @@ -2614,16 +2623,12 @@ Acceptez-vous ? </form> </notification> <notification name="ScriptQuestionCaution"> - Un objet nommé <nolink>[OBJECTNAME]</nolink>, appartenant à [NAME], aimerait : - -[QUESTIONS] -Si vous n'avez pas confiance en cet objet ni en son créateur, refusez cette requête. - -Accepter cette requête ? + Avertissement : l'objet <nolink>[OBJECTNAME]</nolink> souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable. + +Il est rare qu'une telle demande soit légitime. N'autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l'objet souhaite accéder à votre compte. <form name="form"> - <button name="Grant" text="Accepter"/> + <button name="Grant" text="Permettre un accès total"/> <button name="Deny" text="Refuser"/> - <button name="Details" text="Détails..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3122,4 +3127,15 @@ Sinon, consultez la carte et trouvez les " infohubs ". <global name="You died and have been teleported to your home location"> Vous êtes mort et avez été téléporté à votre domicile. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + Impossible de mettre à jour [FNAME] car le fichier est introuvable. +Désactivation des mises à jour futures de ce fichier... + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [NRETRIES] tentatives d'ouverture ou de décodage de [FNAME] ont échoué. Le fichier est désormais considéré comme endommagé. +Désactivation des mises à jour futures de ce fichier... + </notification> + <notification name="LocalBitmapsVerifyFail"> + Tentative d'ajout d'un fichier image [FNAME] non valide ou illisible n'ayant pas pu être ouvert ou décodé. Tentative annulée. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 8b410128da..0987952c28 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -886,6 +886,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="ScriptQuestionCautionChatDenied"> '[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n'a pas reçu le droit de : [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Si vous autorisez un accès à votre compte, vous autorisez également l'objet à : + </string> <string name="ScriptTakeMoney"> Débiter vos Linden dollars (L$) </string> @@ -919,6 +922,9 @@ 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> diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml index 5d3ae04a4d..edbbc354cf 100644 --- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml @@ -25,6 +25,10 @@ Attiva VBO: </text> <check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance. Ma, su un vecchio hardware, spesso l'implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/> + <text name="tc label"> + Attiva S3TC: + </text> + <check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di ua perdita di qualit' del colore."/> <slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/> <spinner label="Indice della distanza della nebbia:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml index ad6ef6b54b..2241cad711 100644 --- a/indra/newview/skins/default/xui/it/floater_stats.xml +++ b/indra/newview/skins/default/xui/it/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="KTris disegnato 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_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_bar label="Memoria GL" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index 7b77584ba0..e85030087c 100644 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml @@ -1,23 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="PREFERITO: TEXTURE"> - <string name="choose_picture"> + <floater.string name="choose_picture"> Clicca per scegliere l'immagine - </string> + </floater.string> + <floater.string name="pick title"> + Scegli: + </floater.string> <text name="Multiple"> Texture multiple </text> + <radio_group name="mode_selection"> + <radio_item label="Inventario" name="inventory" value="0"/> + <radio_item label="Locale" name="local" value="1"/> + </radio_group> <text name="unknown"> Dimensioni: [DIMENSIONS] </text> <button label="Default" label_selected="Default" name="Default"/> - <button label="Niente" label_selected="Niente" name="None"/> <button label="Vuoto" label_selected="Vuoto" name="Blank"/> - <check_box label="Mostra cartelle" name="show_folders_check"/> - <search_editor label="Filtro texture" name="inventory search editor"/> - <check_box label="Applica adesso" name="apply_immediate_check"/> - <button label="Annulla" label_selected="Annulla" name="Cancel"/> + <button label="Niente" label_selected="Niente" name="None"/> + <filter_editor label="Filtro texture" name="inventory search editor"/> + <check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/> + <button label="Aggiungi" label_selected="Aggiungi" name="l_add_btn"/> + <button label="Rimuovi" label_selected="Rimuovi" name="l_rem_btn"/> + <button label="Carica" label_selected="Carica" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Nome" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <string name="pick title"> - Scegli: - </string> + <button label="Annulla" label_selected="Annulla" name="Cancel"/> + <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..57e65c3456 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Debugger recupero texture"> + <text name="total_num_fetched_label"> + 1, Numero totale di texture recuperate: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Numero totale di richieste di recupero: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Numero totale di recuperi dalla cache: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Numero totale di texture visibili: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Numero totale di richieste di fetching texture visibili: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Numero totale di fetching dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel + </text> + <text name="total_fetched_vis_data_label"> + 7, Numero totale di dati visibili: [SIZE1] KB, Dati decodificati: [SIZE2] KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, Numero totale di rendering dei dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel + </text> + <text name="total_time_cache_read_label"> + 9, Tempo totale letture cache: [TIME] secondi + </text> + <text name="total_time_cache_write_label"> + 10, Tempo totale scrittura cache: [TIME] secondi + </text> + <text name="total_time_decode_label"> + 11, Tempo totale decodifica: [TIME] secondi + </text> + <text name="total_time_gl_label"> + 12, Tempo totale creazione texture gl: [TIME] secondi + </text> + <text name="total_time_http_label"> + 13, Tempo totale fetching HTTP: [TIME] secondi + </text> + <text name="total_time_fetch_label"> + 14, Tempo totale complessivo fetching: [TIME] secondi + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Nuovo fetching elementi visibili dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Nuovo fetching elementi visibili da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels + </text> + <spinner label="17, Rapporto Texel/Pixel:" name="texel_pixel_ratio"/> + <button label="Attiva" name="start_btn"/> + <button label="Reimposta" name="clear_btn"/> + <button label="Chiudi" name="close_btn"/> + <button label="Lettura cache" name="cacheread_btn"/> + <button label="Scrittura cache" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Decodifica" name="decode_btn"/> + <button label="Texture GL" name="gl_btn"/> + <button label="Nuovo fetch visibili cache" name="refetchviscache_btn"/> + <button label="Nuovo fetch visibili HTTP" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml index 036b74b7d9..fef423aefe 100644 --- a/indra/newview/skins/default/xui/it/floater_window_size.xml +++ b/indra/newview/skins/default/xui/it/floater_window_size.xml @@ -7,10 +7,17 @@ Imposta dimensione finestra: </text> <combo_box name="window_size_combo" tool_tip="larghezza x altezza"> - <combo_box.item label="1000 x 700 (default)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + <combo_box.item label="1000 x 700 (predefinito)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Imposta" name="set_btn"/> <button label="Annulla" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 99b7e3c4e6..f94b2f9a9e 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -226,11 +226,10 @@ <menu_item_check label="Console texture" name="Texture Console"/> <menu_item_check label="Console di Debug" name="Debug Console"/> <menu_item_call label="Console notifiche" name="Notifications"/> - <menu_item_check label="Console dimensioni texture" name="Texture Size"/> - <menu_item_check label="Console categoria texture" name="Texture Category"/> <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_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"/> <menu_item_check label="Vento" name="Wind"/> @@ -271,6 +270,12 @@ <menu_item_check label="Complessità rendering" name="rendercomplexity"/> <menu_item_check label="Byte collegamento" name="attachment bytes"/> <menu_item_check label="Scolpisci" name="Sculpt"/> + <menu label="Densità texture" name="Texture Density"> + <menu_item_check label="Nessuna" name="None"/> + <menu_item_check label="Attuale" name="Current"/> + <menu_item_check label="Desiderata" name="Desired"/> + <menu_item_check label="Completa" name="Full"/> + </menu> </menu> <menu label="Rendering" name="Rendering"> <menu_item_check label="Assi" name="Axes"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 0e6fee60d1..9660c8f851 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -492,6 +492,15 @@ Visitare [_URL] per ulteriori informazioni? </url> <usetemplate ignoretext="L'hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/> </notification> + <notification name="IntelOldDriver"> + È probabile che ci sia un driver aggiornato per il processore grafico. L'aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa. + + Visitare [_URL] per cercare un aggiornamento del driver? + <url name="url"> + http://www.intel.com/p/it_IT/support/detect/graphics + </url> + <usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/> + </notification> <notification name="UnknownGPU"> Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce. Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME]. Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche. @@ -2616,16 +2625,12 @@ OK? </form> </notification> <notification name="ScriptQuestionCaution"> - Un oggetto di nome '<nolink>[OBJECTNAME]</nolink>', posseduto da '[NAME]' vorrebbe: - -[QUESTIONS] -Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta. - -Concedi questa richiesta? + Attenzione: L'oggetto '<nolink>[OBJECTNAME]</nolink>' ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l'accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l'account, per un periodo illimitato e senza ulteriori avvisi. + +Raramente questo tipo di richiesta è legittima. Non consentire l'accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account. <form name="form"> - <button name="Grant" text="Accetta"/> + <button name="Grant" text="Consenti accesso totale"/> <button name="Deny" text="Nega"/> - <button name="Details" text="Dettagli..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3124,4 +3129,16 @@ In alternativa, puoi guardare sulla mappa e trovare luoghi segnalati come " <global name="You died and have been teleported to your home location"> Sei deceduto e sei stato teleportato a casa tua. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + [FNAME] non è stato aggiornato perché il file non è stato più trovato. +Gli aggiornamenti futuri per questo file sono disattivati. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [FNAME] non è stato aperto o decodificato dopo [NRETRIES] tentativi, viene considerato danneggiato. +Gli aggiornamenti futuri per questo file sono disattivati. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Tentativo di aggiungere un file immagine [FNAME] non valido o non leggibile che non è stato possibile aprire o decodificare. +Tentativo annullato. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 8529fadd7d..11accb5f08 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -880,6 +880,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="ScriptQuestionCautionChatDenied"> A '[OBJECTNAME]', un oggetto di proprietà di '[OWNERNAME]', situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Se consenti l'accesso al tuo account, consentirai anche all'oggetto di: + </string> <string name="ScriptTakeMoney"> Prendere dollari Linden (L$) da te </string> @@ -913,6 +916,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="ControlYourCamera"> Controllare la tua fotocamera </string> + <string name="TeleportYourAgent"> + Teleportarti + </string> <string name="SIM_ACCESS_PG"> Generale </string> diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml index 1b6558a9eb..c8b8e918e0 100644 --- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml @@ -25,6 +25,10 @@ VBO を有効化： </text> <check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。 しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/> + <text name="tc label"> + S3TC を有効にする： + </text> + <check_box initial_value="true" label="テクスチャ圧縮を有効にする（再起動が必要）" name="texture compression" tool_tip="ビデオメモリ内でテクスチャを圧縮することにより、色の質を多少犠牲にしながら、より高解像度のテクスチャを読み込めるようにします。"/> <slider label="テクスチャメモリ（MB）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。 ビデオカードのメモリに既定。 数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/> <spinner label="フォグの距離比率：" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml index 6a1f34cfd8..da5358f06a 100644 --- a/indra/newview/skins/default/xui/ja/floater_stats.xml +++ b/indra/newview/skins/default/xui/ja/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="秒ごとの KTris 描画" name="ktrissec"/> <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_bar label="GL メモリ" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml index 399cffcce5..55fe840658 100644 --- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml @@ -1,24 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="テクスチャの選択"> - <string name="choose_picture"> + <floater.string name="choose_picture"> クリックして写真を選択 - </string> + </floater.string> + <floater.string name="pick title"> + ピック: + </floater.string> <text name="Multiple"> 複数のテクスチャ </text> + <radio_group name="mode_selection"> + <radio_item label="インベントリ" name="inventory" value="0"/> + <radio_item label="ローカル" name="local" value="1"/> + </radio_group> <text name="unknown"> サイズ： [DIMENSIONS] </text> <button label="デフォルト" label_selected="デフォルト" name="Default"/> - <button label="なし" label_selected="なし" name="None"/> <button label="ブランク" label_selected="ブランク" name="Blank"/> - <check_box label="フォルダを表示" name="show_folders_check"/> - <search_editor label="テクスチャをフィルター" name="inventory search editor"/> - <check_box label="すぐ適用" name="apply_immediate_check"/> + <button label="なし" label_selected="なし" name="None"/> <button label="" label_selected="" name="Pipette"/> - <button label="取り消し" label_selected="取り消し" name="Cancel"/> + <filter_editor label="テクスチャをフィルター" name="inventory search editor"/> + <check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/> + <button label="追加" label_selected="追加" name="l_add_btn"/> + <button label="削除" label_selected="削除" name="l_rem_btn"/> + <button label="アップロード" label_selected="アップロード" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="名前" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <text name="pick title"> - ピック: - </text> + <button label="取り消し" label_selected="取り消し" name="Cancel"/> + <check_box initial_value="true" label="すぐ適用" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..4efdf7d40d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="テクスチャ取得デバッガ"> + <text name="total_num_fetched_label"> + 1, 取得したテクスチャの合計数：[NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, 取得リクエストの合計数：[NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, キャッシュヒットの合計数：[NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, 表示テクスチャの合計数：[NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, 表示テクスチャ取得リクエストの合計数：[NUM] + </text> + <text name="total_fetched_data_label"> + 6, 取得したデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル + </text> + <text name="total_fetched_vis_data_label"> + 7, 表示データの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, レンダリングされたデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル + </text> + <text name="total_time_cache_read_label"> + 9, キャッシュ読み取りの合計時間：[TIME] 秒 + </text> + <text name="total_time_cache_write_label"> + 10, キャッシュ書き込みの合計時間：[TIME] 秒 + </text> + <text name="total_time_decode_label"> + 11, デコードの合計時間：[TIME] 秒 + </text> + <text name="total_time_gl_label"> + 12, glテクスチャ作成の合計時間：[TIME] 秒 + </text> + <text name="total_time_http_label"> + 13, HTTP 取得の合計時間：[TIME] 秒 + </text> + <text name="total_time_fetch_label"> + 14, 取得全体の合計時間：[TIME] 秒 + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, キャッシュから表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル + </text> + <text name="total_time_refetch_vis_http_label"> + 16, HTTP から表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル + </text> + <spinner label="17, テクセル／ピクセルの比率：" name="texel_pixel_ratio"/> + <button label="開始" name="start_btn"/> + <button label="リセット" name="clear_btn"/> + <button label="閉じる" name="close_btn"/> + <button label="キャッシュ読み取り" name="cacheread_btn"/> + <button label="キャッシュ書き込み" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="デコード" name="decode_btn"/> + <button label="GL テクスチャ" name="gl_btn"/> + <button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/> + <button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml index 152a5f4806..416813d6cc 100644 --- a/indra/newview/skins/default/xui/ja/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml @@ -7,10 +7,17 @@ ウィンドウのサイズを設定： </text> <combo_box name="window_size_combo" tool_tip="横幅 x 高さ"> - <combo_box.item label="1000 x 700 （標準）" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 （720p）" name="item2"/> - <combo_box.item label="1920 x 1080 （1080p）" name="item3"/> + <combo_box.item label="1000 x 700 （デフォルト）" name="item1"/> + <combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/> + <combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/> + <combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/> + <combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/> + <combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/> + <combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/> + <combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/> + <combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/> + <combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/> + <combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/> </combo_box> <button label="設定" name="set_btn"/> <button label="キャンセル" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 8496dfb1db..3a398bd985 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -227,11 +227,10 @@ <menu_item_check label="テクスチャのコンソール" name="Texture Console"/> <menu_item_check label="デバッグコンソール" name="Debug Console"/> <menu_item_call label="通知コンソール" name="Notifications"/> - <menu_item_check label="テクスチャサイズのコンソール" name="Texture Size"/> - <menu_item_check label="テクスチャカテゴリのコンソール" name="Texture Category"/> <menu_item_check label="ファーストタイマー" name="Fast Timers"/> <menu_item_check label="メモリ" name="Memory"/> <menu_item_check label="風景の統計" name="Scene Statistics"/> + <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"/> <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/> @@ -289,6 +288,12 @@ <menu_item_check label="描画の詳細度" name="rendercomplexity"/> <menu_item_check label="添付アイテムのバイト数" name="attachment bytes"/> <menu_item_check label="スカルプト" name="Sculpt"/> + <menu label="テクスチャの密度" name="Texture Density"> + <menu_item_check label="なし" name="None"/> + <menu_item_check label="現在" name="Current"/> + <menu_item_check label="望ましい" name="Desired"/> + <menu_item_check label="フル" name="Full"/> + </menu> </menu> <menu label="レンダリング" name="Rendering"> <menu_item_check label="軸" name="Axes"/> @@ -306,7 +311,6 @@ <menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/> <menu_item_check label="テクスチャを無効にする" name="Disable Textures"/> <menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/> - <menu_item_check label="テクスチャの検査" name="Audit Textures"/> <menu_item_check label="テクスチャアトラス（試験段階）" name="Texture Atlas"/> <menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/> <menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 7bf8a7b8be..f35c0f0d14 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -517,6 +517,15 @@ L$ が不足しているのでこのグループに参加することができ </url> <usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/> </notification> + <notification name="IntelOldDriver"> + おそらくお使いのグラフィックチップ用の新しいドライバが入手可能です。グラフィックドライバを更新することにより、パフォーマンスが大幅に向上する場合があります。 + +[_URL] にアクセスして更新版のドライバがあるかどうかを確認しますか？ + <url name="url"> + http://www.intel.com/p/ja_JP/support/detect/graphics + </url> + <usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/> + </notification> <notification name="UnknownGPU"> お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。 問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。 @@ -2663,16 +2672,12 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ </form> </notification> <notification name="ScriptQuestionCaution"> - [NAME] が所有する「<nolink>[OBJECTNAME]</nolink>」 というオブジェクトが、次のことをしようとしています： - -[QUESTIONS] -このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。 - -リクエストを受けますか？ + 警告：オブジェクト '<nolink>[OBJECTNAME]</nolink>' はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。 + +このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。 <form name="form"> - <button name="Grant" text="許可"/> + <button name="Grant" text="トータルアクセスを許可"/> <button name="Deny" text="拒否"/> - <button name="Details" text="詳細..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3180,4 +3185,16 @@ M キーを押して変更します。 <global name="You died and have been teleported to your home location"> 死んでしまったので、ホームにテレポートされました。 </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + [FNAME] は、見つからなかったため、更新できませんでした。 +このファイルに対する今後の更新を無効にします。 + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [FNAME] を開くまたはデコードする試行に失敗しました（試行回数 [NRETRIES] 回）。そのため、このファイルは壊れているものとして処理されました。 +このファイルに対する今後の更新を無効にします。 + </notification> + <notification name="LocalBitmapsVerifyFail"> + 開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。 +この試行はキャンセルされました。 + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 680ef60890..f6b3edc57f 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -886,6 +886,9 @@ support@secondlife.com にお問い合わせください。 <string name="ScriptQuestionCautionChatDenied"> [REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました： [PERMISSIONS] </string> + <string name="AdditionalPermissionsRequestHeader"> + あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます： + </string> <string name="ScriptTakeMoney"> リンデンドル（L$）を支払う </string> @@ -919,6 +922,9 @@ support@secondlife.com にお問い合わせください。 <string name="ControlYourCamera"> カメラのコントロール </string> + <string name="TeleportYourAgent"> + あなたをテレポート + </string> <string name="NotConnected"> 接続されていません </string> diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml index 1bc2bce768..1204fb93e2 100644 --- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml @@ -25,6 +25,10 @@ Habilitar VBO: </text> <check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/> + <text name="tc label"> + Habilitar S3TC: + </text> + <check_box initial_value="true" label="Habilitar compressão de texturas (requer reinício)" name="texture compression" tool_tip="Comprime as texturas na memória de vídeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/> <slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas. O padrão é definido pela memória da placa de vídeo. Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/> <spinner label="Relação de Distância de Nevoeiro:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml index f0a053ebe3..e770c6ac38 100644 --- a/indra/newview/skins/default/xui/pt/floater_stats.xml +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="KTris desenhados 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_view> <stat_view label="Texture" 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="Count" name="numimagesstat"/> <stat_bar label="Raw Count" name="numrawimagesstat"/> <stat_bar label="GL Mem" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml index 144bc0340e..57223beaeb 100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml @@ -1,23 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="texture picker" title="DESTAQUE: TEXTURA"> - <string name="choose_picture"> + <floater.string name="choose_picture"> Clique para escolher uma imagem - </string> + </floater.string> + <floater.string name="pick title"> + Pegar: + </floater.string> <text name="Multiple"> Multiplas texturas </text> + <radio_group name="mode_selection"> + <radio_item label="Inventário" name="inventory" value="0"/> + <radio_item label="Local" name="local" value="1"/> + </radio_group> <text name="unknown"> Tamanho: [DIMENSÕES] </text> <button label="Padrão" label_selected="Padrão" name="Default"/> - <button label="Nenhum" label_selected="Nenhum" name="None"/> <button label="Branco" label_selected="Branco" name="Blank"/> - <check_box label="Exibir pastas" name="show_folders_check"/> - <search_editor label="Filtrar texturas" name="inventory search editor"/> - <check_box label="Applicar agora" name="apply_immediate_check"/> - <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <button label="Nenhum" label_selected="Nenhum" name="None"/> + <filter_editor label="Filtrar texturas" name="inventory search editor"/> + <check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/> + <button label="Adicionar" label_selected="Adicionar" name="l_add_btn"/> + <button label="Remover" label_selected="Remover" name="l_rem_btn"/> + <button label="Enviar" label_selected="Enviar" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Nome" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="OK" label_selected="OK" name="Select"/> - <string name="pick title"> - Pegar: - </string> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <check_box initial_value="true" label="Applicar agora" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..f20d50362e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Depurador de obtenção de textura"> + <text name="total_num_fetched_label"> + 1, Número total de texturas obtidas: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Número total de solicitações de obtenção: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Número total de acertos de cache: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Número total de texturas visíveis: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Número total de solicitações de obtenção de texturas visíveis: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Número total de dados obtidos: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels + </text> + <text name="total_fetched_vis_data_label"> + 7, Número total de dados visíveis: [SIZE1]KB, Dados decodificados: [SIZE2]KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, Número total de dados renderizados: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels + </text> + <text name="total_time_cache_read_label"> + 9, Tempo total de leituras de cache: [TIME] segundos + </text> + <text name="total_time_cache_write_label"> + 10, Tempo total de gravações em cache: [TIME] segundos + </text> + <text name="total_time_decode_label"> + 11, Tempo total das decodificações: [TIME] segundos + </text> + <text name="total_time_gl_label"> + 12, Tempo total de criação de texturas gl: [TIME] segundos + </text> + <text name="total_time_http_label"> + 13, Tempo total de obtenção de HTTP: [TIME] segundos + </text> + <text name="total_time_fetch_label"> + 14, Tempo total de obtenção completa: [TIME] segundos + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Obtendo novamente visíveis do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Obtendo novamente visíveis do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels + </text> + <spinner label="17, Proporção de texel/pixel:" name="texel_pixel_ratio"/> + <button label="Iniciar" name="start_btn"/> + <button label="Redefinir" name="clear_btn"/> + <button label="Fechar" name="close_btn"/> + <button label="Leitura do cache" name="cacheread_btn"/> + <button label="Gravação em cache" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Decodificar" name="decode_btn"/> + <button label="Textura GL" name="gl_btn"/> + <button label="Obter novamente cache visível" name="refetchviscache_btn"/> + <button label="Obter novamente HTTP visível" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml index 6a8ccbd002..7deb799bd7 100644 --- a/indra/newview/skins/default/xui/pt/floater_window_size.xml +++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml @@ -7,10 +7,17 @@ Definir tamanho da janela: </text> <combo_box name="window_size_combo" tool_tip="largura x altura"> - <combo_box.item label="1000 x 700 (padrão)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + <combo_box.item label="1000 x 700 (padrão)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Definir" name="set_btn"/> <button label="Cancelar" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index fd973bf3c2..d93330e6df 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -226,11 +226,10 @@ <menu_item_check label="Painel de textura" name="Texture Console"/> <menu_item_check label="Console de depuração" name="Debug Console"/> <menu_item_call label="Painel de avisos" name="Notifications"/> - <menu_item_check label="Painel de tamanho de textura" name="Texture Size"/> - <menu_item_check label="Painel de texturas" name="Texture Category"/> <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_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"/> <menu_item_check label="Vento" name="Wind"/> @@ -271,6 +270,12 @@ <menu_item_check label="Renderizar complexidade" name="rendercomplexity"/> <menu_item_check label="Bytes do anexo" name="attachment bytes"/> <menu_item_check label="Esculpir" name="Sculpt"/> + <menu label="Densidade da textura" name="Texture Density"> + <menu_item_check label="Nenhuma" name="None"/> + <menu_item_check label="Atual" name="Current"/> + <menu_item_check label="Desejada" name="Desired"/> + <menu_item_check label="Completa" name="Full"/> + </menu> </menu> <menu label="Rendering" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 3b39c0f92c..500a7f0c01 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -489,6 +489,15 @@ Consultar [_URL] para mais informações? </url> <usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> + <notification name="IntelOldDriver"> + Provavelmente, há um driver mais recente para o seu chip gráfico. A atualização dos drivers gráficos pode melhorar significativamente o desempenho. + + Visitar [_URL] para verificar se há atualizações do driver? + <url name="url"> + http://www.intel.com/p/pt_BR/support/detect/graphics + </url> + <usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> <notification name="UnknownGPU"> A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME]. Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. @@ -2596,16 +2605,12 @@ OK? </form> </notification> <notification name="ScriptQuestionCaution"> - Um objeto chamado '<nolink>[OBJECTNAME]</nolink>'', de '[NAME]', gostaria de: - -[QUESTIONS] -Se você não confia nos objetos deste autor, recuse-o. - -Deseja aceitar? + Aviso: O objeto '<nolink>[OBJECTNAME]</nolink>' deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais. + +Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta. <form name="form"> - <button name="Grant" text="Autorizar"/> + <button name="Grant" text="Permitir acesso total"/> <button name="Deny" text="Negar"/> - <button name="Details" text="Detalhes..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3096,4 +3101,16 @@ Outra opção é procurar por lugares com a tag 'Infohub' no mapa. <global name="You died and have been teleported to your home location"> Você morreu e foi reenviado ao seu início. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + Não foi possível atualizar [FNAME], pois o arquivo não pôde ser encontrado. +Desabilitando atualizações futuras deste arquivo. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [FNAME] não pode ser aberto ou decodificado em [NRETRIES] tentativas, e agora é considerado corrompido. +Desabilitando atualizações futuras deste arquivo. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Tentativa de adição de um formato de imagem inválido ou ilegível [FNAME] que não pode ser aberto ou decodificado. +Tentativa cancelada. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 342a52356b..fd8f22f331 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -835,6 +835,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="ScriptQuestionCautionChatDenied"> '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Se você permitir acesso à sua conta, o objeto também poderá: + </string> <string name="ScriptTakeMoney"> Tomar linden dólares (L$) de você </string> @@ -868,6 +871,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para <string name="ControlYourCamera"> Controle sua camera </string> + <string name="TeleportYourAgent"> + Teletransportá-lo + </string> <string name="SIM_ACCESS_PG"> Público geral </string> diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml index 7400f1df3b..43f8c36473 100644 --- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml @@ -25,6 +25,10 @@ Включить VBO: </text> <check_box initial_value="истина" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности. Однако на старом оборудовании это может привести к сбою приложения."/> + <text name="tc label"> + Включить S3TC: + </text> + <check_box initial_value="true" label="Разрешить сжатие текстур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, что позволяет загружать текстуры большего размера за счет некоторого падения качества цвета."/> <slider label="Память для текстур (Мб):" name="GraphicsCardTextureMemory" tool_tip="Количество памяти, отводимое для текстур. По умолчанию равно памяти видеокарты. Уменьшение поможет увеличить производительность, но текстуры могут стать размытыми."/> <spinner label="Дистанция тумана:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml index b1f60c8029..2243c0f385 100644 --- a/indra/newview/skins/default/xui/ru/floater_stats.xml +++ b/indra/newview/skins/default/xui/ru/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="Треугольников в секунду" name="ktrissec"/> <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_bar label="Память GL" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml index d55daea836..f8693b8359 100644 --- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml @@ -9,15 +9,26 @@ <text name="Multiple"> Несколько текстур </text> + <radio_group name="mode_selection"> + <radio_item label="Инвентарь" name="inventory" value="0"/> + <radio_item label="Локально" name="local" value="1"/> + </radio_group> <text name="unknown"> Размер: [DIMENSIONS] </text> <button label="По умолчанию" label_selected="По умолчанию" name="Default"/> - <button label="Нет" label_selected="Нет" name="None"/> <button label="Очистить" label_selected="Очистить" name="Blank"/> - <check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/> + <button label="Нет" label_selected="Нет" name="None"/> <filter_editor label="Фильтровать текстуры" name="inventory search editor"/> <check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/> + <button label="Добавить" label_selected="Добавить" name="l_add_btn"/> + <button label="Удалить" label_selected="Удалить" name="l_rem_btn"/> + <button label="Передать" label_selected="Передать" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Имя" name="unit_name"/> + <column label="ID" name="unit_id_HIDDEN"/> + </scroll_list> <button label="ОК" label_selected="ОК" name="Select"/> <button label="Отмена" label_selected="Отмена" name="Cancel"/> + <check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..034106f24c --- /dev/null +++ b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Отладчик извлечения текстур"> + <text name="total_num_fetched_label"> + 1, Общее количество извлеченных текстур: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Общее количество запросов на извлечение: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Общее количество попаданий в кэш: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Общее количество видимых текстур: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Общее количество запросов на извлечение видимых текстур: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Общий объем извлеченных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов + </text> + <text name="total_fetched_vis_data_label"> + 7, Общий объем видимых данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ + </text> + <text name="total_fetched_rendered_data_label"> + 8, Общий объем визуализированных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов + </text> + <text name="total_time_cache_read_label"> + 9, Общее время чтения из кэша: [TIME] с + </text> + <text name="total_time_cache_write_label"> + 10, Общее время записи в кэш: [TIME] с + </text> + <text name="total_time_decode_label"> + 11, Общее время декодирования: [TIME] с + </text> + <text name="total_time_gl_label"> + 12, Общее время создания текстур: [TIME] с + </text> + <text name="total_time_http_label"> + 13, Общее время HTTP-извлечения: [TIME] с + </text> + <text name="total_time_fetch_label"> + 14, Общее время полного извлечения: [TIME] с + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Повторное извлечение из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Повторное извлечение из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов + </text> + <spinner label="17, Отношение текселы/пикселы" name="texel_pixel_ratio"/> + <button label="Пуск" name="start_btn"/> + <button label="Сброс" name="clear_btn"/> + <button label="Закрыть" name="close_btn"/> + <button label="Чтение кэша" name="cacheread_btn"/> + <button label="Запись в кэш" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Декодировать" name="decode_btn"/> + <button label="Текстура GL" name="gl_btn"/> + <button label="Повторно извлечь из кэша" name="refetchviscache_btn"/> + <button label="Повторно извлечь из HTTP" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml index 24865a6ba5..fbff6a72b2 100644 --- a/indra/newview/skins/default/xui/ru/floater_window_size.xml +++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml @@ -7,10 +7,17 @@ Задать размер окна: </text> <combo_box name="window_size_combo" tool_tip="ширина x высота"> - <combo_box.item label="1000 x 700 (по умолчанию)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + <combo_box.item label="1000 x 700 (по умолчанию)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 WXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 UXGA)" name="item12"/> </combo_box> <button label="Задать" name="set_btn"/> <button label="Отмена" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index 0699314d97..701f097ddb 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -225,11 +225,10 @@ <menu_item_check label="Консоль текстур" name="Texture Console"/> <menu_item_check label="Консоль отладки" name="Debug Console"/> <menu_item_call label="Консоль уведомлений" name="Notifications"/> - <menu_item_check label="Консоль размера текстуры" name="Texture Size"/> - <menu_item_check label="Консоль категории текстуры" name="Texture Category"/> <menu_item_check label="Оперативные таймеры" name="Fast Timers"/> <menu_item_check label="Память" name="Memory"/> <menu_item_check label="Статистика по сцене" name="Scene Statistics"/> + <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"/> <menu_item_call label="Данные о способностях на консоль отладки" name="Capabilities Info to Debug Console"/> @@ -287,6 +286,12 @@ <menu_item_check label="Сложность визуализации" name="rendercomplexity"/> <menu_item_check label="Байты присоединения" name="attachment bytes"/> <menu_item_check label="Лепка" name="Sculpt"/> + <menu label="Плотность текстуры" name="Texture Density"> + <menu_item_check label="Нет" name="None"/> + <menu_item_check label="Текущая" name="Current"/> + <menu_item_check label="Желаемая" name="Desired"/> + <menu_item_check label="Полная" name="Full"/> + </menu> </menu> <menu label="Визуализация" name="Rendering"> <menu_item_check label="Оси" name="Axes"/> @@ -304,7 +309,6 @@ <menu_item_check label="Текстуры анимаций" name="Animation Textures"/> <menu_item_check label="Отключить текстуры" name="Disable Textures"/> <menu_item_check label="Текстуры в полном разрешении" name="Rull Res Textures"/> - <menu_item_check label="Проверить текстуры" name="Audit Textures"/> <menu_item_check label="Атлас текстур (экспериментальная функция)" name="Texture Atlas"/> <menu_item_check label="Визуализация присоединенных источников света" name="Render Attached Lights"/> <menu_item_check label="Визуализация присоединенных частиц" name="Render Attached Particles"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index b4692385d1..97e5ee8c65 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -495,6 +495,15 @@ </url> <usetemplate ignoretext="Оборудование моего компьютера не поддерживается" name="okcancelignore" notext="Нет" yestext="Да"/> </notification> + <notification name="IntelOldDriver"> + Возможно, для вашей видеокарты имеется более новый драйвер. Обновление драйвера может существенно повысить быстродействие. + + Проверить наличие обновления для драйвера по адресу [_URL]? + <url name="url"> + http://www.intel.com/p/ru_RU/support/detect/graphics + </url> + <usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/> + </notification> <notification name="UnknownGPU"> В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать. Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME]. Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики. @@ -2614,16 +2623,12 @@ http://secondlife.com/download. </form> </notification> <notification name="ScriptQuestionCaution"> - Объект «<nolink>[OBJECTNAME]</nolink>», владелец которого – «[NAME]», желает: - -[QUESTIONS] -Если вы не доверяете этому объекту или его создателю, отклоните запрос. - -Принять этот запрос? + Предупреждение. Объект «<nolink>[OBJECTNAME]</nolink>» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения. + +Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту. <form name="form"> - <button name="Grant" text="Принять"/> + <button name="Grant" text="Разрешить полный доступ"/> <button name="Deny" text="Отклонить"/> - <button name="Details" text="Подробности..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3122,4 +3127,16 @@ http://secondlife.com/download. <global name="You died and have been teleported to your home location"> Вы умерли и были телепортированы в ваше домашнее местоположение. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + Не удалось обновить [FNAME]: файл не найден. +Последующее обновление этого файла запрещается. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + Не удалось открыть или декодировать [FNAME] с [NRETRIES] попыток. Этот файл считается поврежденным. +Последующее обновление этого файла запрещается. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Попытка добавить недопустимый или нечитаемый файл изображения [FNAME], который не удалось открыть или декодировать. +Попытка отменена. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 8dbc4f092d..6461e10e2d 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -883,6 +883,9 @@ support@secondlife.com. <string name="ScriptQuestionCautionChatDenied"> Объекту «[OBJECTNAME]», который принадлежит пользователю «[OWNERNAME]» и находится в [REGIONPOS] в регионе «[REGIONNAME]», отказано в разрешении: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Разрешив доступ к своему аккаунту, вы также разрешите объекту: + </string> <string name="ScriptTakeMoney"> У вас берут Linden-деньги </string> @@ -916,6 +919,9 @@ support@secondlife.com. <string name="ControlYourCamera"> Управлять камерой </string> + <string name="TeleportYourAgent"> + Телепортировать вас + </string> <string name="NotConnected"> Нет подключения </string> diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml index 8e056b9b0d..b204389083 100644 --- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml @@ -25,6 +25,10 @@ VBO Etkinleştir: </text> <check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar. Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/> + <text name="tc label"> + S3TC'ü Etkinleştir: + </text> + <check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/> <slider label="Doku Belleği (MB):" name="GraphicsCardTextureMemory" tool_tip="Dokular için tahsis edilecek bellek miktarı. Varsayılan değer video kartı belleğidir. Bu değerin küçültülmesi performansı artırabilir, ama ayrıca dokuları bulanıklaştırabilir."/> <spinner label="Sis Mesafe Oranı:" name="fog"/> <button label="Tamam" label_selected="Tamam" name="OK"/> diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml index 17f1166c46..e3f54fc338 100644 --- a/indra/newview/skins/default/xui/tr/floater_stats.xml +++ b/indra/newview/skins/default/xui/tr/floater_stats.xml @@ -14,8 +14,11 @@ <stat_bar label="Saniyede Bir Çizilen Üç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_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_bar label="GL Belleği" name="gltexmemstat"/> diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml index 4ef789f585..67bf9071b3 100644 --- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml @@ -9,15 +9,26 @@ <text name="Multiple"> Birden çok doku </text> + <radio_group name="mode_selection"> + <radio_item label="Envanter" name="inventory" value="0"/> + <radio_item label="Yerel" name="local" value="1"/> + </radio_group> <text name="unknown"> Büyüklük: [DIMENSIONS] </text> <button label="Varsayılan" label_selected="Varsayılan" name="Default"/> - <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> <button label="Boş" label_selected="Boş" name="Blank"/> - <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> + <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> <filter_editor label="Dokuları Filtrele" name="inventory search editor"/> <check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/> + <button label="Ekle" label_selected="Ekle" name="l_add_btn"/> + <button label="Kaldır" label_selected="Kaldır" name="l_rem_btn"/> + <button label="Karşıya Yükle" label_selected="Karşıya Yükle" name="l_upl_btn"/> + <scroll_list name="l_name_list"> + <column label="Ad" name="unit_name"/> + <column label="Kimlik" name="unit_id_HIDDEN"/> + </scroll_list> <button label="Tamam" label_selected="Tamam" name="Select"/> <button label="İptal" label_selected="İptal" name="Cancel"/> + <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> </floater> diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml new file mode 100644 index 0000000000..a592479b6c --- /dev/null +++ b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="TexFetchDebugger" title="Doku Alımı Hata Ayıklayıcı"> + <text name="total_num_fetched_label"> + 1, Alınan dokuların toplam sayısı: [NUM] + </text> + <text name="total_num_fetching_requests_label"> + 2, Toplam alım talebi sayısı: [NUM] + </text> + <text name="total_num_cache_hits_label"> + 3, Toplam önbellek isabet sayısı: [NUM] + </text> + <text name="total_num_visible_tex_label"> + 4, Görünür dokuların toplam sayısı: [NUM] + </text> + <text name="total_num_visible_tex_fetch_req_label"> + 5, Görünür dokuların alınması için toplam talep sayısı: [NUM] + </text> + <text name="total_fetched_data_label"> + 6, Alınan verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel + </text> + <text name="total_fetched_vis_data_label"> + 7, Görünür verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB + </text> + <text name="total_fetched_rendered_data_label"> + 8, İşlenen verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel + </text> + <text name="total_time_cache_read_label"> + 9, Önbellek okunması için toplam süre: [TIME] saniye + </text> + <text name="total_time_cache_write_label"> + 10, Önbellek yazılması için toplam süre: [TIME] saniye + </text> + <text name="total_time_decode_label"> + 11, Şifre çözülmesi için toplam süre: [TIME] saniye + </text> + <text name="total_time_gl_label"> + 12, GL doku oluşturma için toplam süre: [TIME] saniye + </text> + <text name="total_time_http_label"> + 13, HTTP alımı için toplam süre: [TIME] saniye + </text> + <text name="total_time_fetch_label"> + 14, Tüm alımlar için toplam süre: [TIME] saniye + </text> + <text name="total_time_refetch_vis_cache_label"> + 15, Görünür dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel + </text> + <text name="total_time_refetch_vis_http_label"> + 16, Görünür dokuların HTTP'den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel + </text> + <spinner label="17, Teksel/Piksel Oranı:" name="texel_pixel_ratio"/> + <button label="Başla" name="start_btn"/> + <button label="Sıfırla" name="clear_btn"/> + <button label="Kapat" name="close_btn"/> + <button label="Önbellek Okunması" name="cacheread_btn"/> + <button label="Önbellek Yazılması" name="cachewrite_btn"/> + <button label="HTTP" name="http_btn"/> + <button label="Şifre Çöz" name="decode_btn"/> + <button label="GL Dokusu" name="gl_btn"/> + <button label="Görünür Dokuları Önbellekten Tekrar Al" name="refetchviscache_btn"/> + <button label="Görünür Dokuları HTTP'den Tekrar Al" name="refetchvishttp_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml index acc2cc3376..aff20e7960 100644 --- a/indra/newview/skins/default/xui/tr/floater_window_size.xml +++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml @@ -7,10 +7,17 @@ Pencere büyüklüğünü ayarla: </text> <combo_box name="window_size_combo" tool_tip="genişlik x yükseklik"> - <combo_box.item label="1000 x 700 (varsayılan)" name="item0"/> - <combo_box.item label="1024 x 768" name="item1"/> - <combo_box.item label="1280 x 720 (720p)" name="item2"/> - <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + <combo_box.item label="1000 x 700 (varsayılan)" name="item1"/> + <combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/> + <combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/> + <combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/> + <combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/> + <combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/> + <combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/> + <combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/> + <combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/> + <combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/> + <combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/> </combo_box> <button label="Ayarla" name="set_btn"/> <button label="İptal" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index d7b20bac4b..ea84e7d24b 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -225,11 +225,10 @@ <menu_item_check label="Doku Konsolu" name="Texture Console"/> <menu_item_check label="Hata Ayıklama Konsolu" name="Debug Console"/> <menu_item_call label="Bildirimler Konsolu" name="Notifications"/> - <menu_item_check label="Doku Büyüklüğü Konsolu" name="Texture Size"/> - <menu_item_check label="Doku Kategorisi Konsolu" name="Texture Category"/> <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_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"/> <menu_item_call label="Hata Ayıklama Konsoluna giden Özellikler Bilgisi" name="Capabilities Info to Debug Console"/> @@ -287,6 +286,12 @@ <menu_item_check label="İşleme Karmaşıklığı" name="rendercomplexity"/> <menu_item_check label="Aksesuar Bayt Büyüklüğü" name="attachment bytes"/> <menu_item_check label="Şekillendir" name="Sculpt"/> + <menu label="Doku Yoğunluğu" name="Texture Density"> + <menu_item_check label="Yok" name="None"/> + <menu_item_check label="Mevcut" name="Current"/> + <menu_item_check label="Arzulanan" name="Desired"/> + <menu_item_check label="Tam" name="Full"/> + </menu> </menu> <menu label="İşleme" name="Rendering"> <menu_item_check label="Eksenler" name="Axes"/> @@ -304,7 +309,6 @@ <menu_item_check label="Animasyon Dokuları" name="Animation Textures"/> <menu_item_check label="Dokuları Devre Dışı Bırak" name="Disable Textures"/> <menu_item_check label="Tam Çöz. Dokular" name="Rull Res Textures"/> - <menu_item_check label="Dokuları Denetle" name="Audit Textures"/> <menu_item_check label="Doku Atlas (deneysel)" name="Texture Atlas"/> <menu_item_check label="Eklenmiş Işıkları İşle" name="Render Attached Lights"/> <menu_item_check label="Eklenmiş Parçacıkları İşle" name="Render Attached Particles"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 6681cdac7a..27f0deaf4a 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -495,6 +495,15 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz? </url> <usetemplate ignoretext="Bilgisayar donanımım desteklenmiyor" name="okcancelignore" notext="Hayır" yestext="Evet"/> </notification> + <notification name="IntelOldDriver"> + Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut. Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir. + + Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz? + <url name="url"> + http://www.intel.com/p/en_US/support/detect/graphics + </url> + <usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/> + </notification> <notification name="UnknownGPU"> Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor. Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar. Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir. @@ -2614,16 +2623,12 @@ Kabul ediyor musunuz? </form> </notification> <notification name="ScriptQuestionCaution"> - '[NAME]' adlı kişiye ait '<nolink>[OBJECTNAME]</nolink>' adındaki bir nesne şunu yapmak istiyor: - -[QUESTIONS] -Bu nesneye ya da onu oluşturan kişiye güvenmiyorsanız, bu talebi reddetmelisiniz. - -Talep kabul edilsin mi? + Uyarı: '<nolink>[OBJECTNAME]</nolink>' nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir. + +Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin. <form name="form"> - <button name="Grant" text="Kabul Et"/> + <button name="Grant" text="Tam erişime izin ver"/> <button name="Deny" text="Reddet"/> - <button name="Details" text="Ayrıntılar..."/> </form> </notification> <notification name="ScriptDialog"> @@ -3122,4 +3127,16 @@ Bir araziye sahip değilseniz, Harita'ya bakıp "Bilgi İstasyonu" <global name="You died and have been teleported to your home location"> Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız. </global> + <notification name="LocalBitmapsUpdateFileNotFound"> + [FNAME] güncellenemedi çünkü bu dosya artık bulunamıyor. +Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak. + </notification> + <notification name="LocalBitmapsUpdateFailedFinal"> + [NRETRIES] girişimde [FNAME] açılamadı veya şifresi çözülemedi, bu dosya artık bozuk olarak değerlendiriliyor. +Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak. + </notification> + <notification name="LocalBitmapsVerifyFail"> + Geçersiz veya okunamayan bir görüntü dosyası [FNAME] eklenmeye kalkışıldı, ancak dosya açılamadı veya şifresi çözülemedi. +Girişim iptal edildi. + </notification> </notifications> diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml new file mode 100644 index 0000000000..a2d0237da0 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel label="script_question_panel" name="panel_script_question_toast"> + <panel label="buttons_panel" name="buttons_panel"/> +</panel> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 2a4e2c20a7..a8a691a98e 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -883,6 +883,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. <string name="ScriptQuestionCautionChatDenied"> '[OWNERNAME]' adlı kişiye ait, [REGIONPOS] üzerinde [REGIONNAME] içerisinde bulunan '[OBJECTNAME]' nesnesine şunu yapma izni verilmedi: [PERMISSIONS]. </string> + <string name="AdditionalPermissionsRequestHeader"> + Eğer hesabınıza erişime izin verirseniz, bu nesneye aynı zamanda şunun için izin vermiş olacaksınız: + </string> <string name="ScriptTakeMoney"> Sizden Linden dolar (L$) almak </string> @@ -916,6 +919,9 @@ 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> |