diff options
Diffstat (limited to 'indra/newview/skins/default')
31 files changed, 118 insertions, 46 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 2a8eaf26ec..a113c5cf78 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="Hilfe" name="Help"> <menu_item_call label="Anweisungen..." name="How To"/> + <menu_item_call label="Kurzanleitung" name="Quickstart"/> <menu_item_call label="Knowledge Base" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Community-Foren" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 60e4fb19a7..b8ddc63b93 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Cache: </text> - <spinner label="Cache-Größe (64 – 9.984 MB)" name="cachesizespinner"/> + <spinner label="Cache-Größe (256 – 9.984 MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index 1a55dc2e2c..dddb258ed9 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -16,6 +16,10 @@ '[TEXT]' not found </floater.string> <floater.string + name="not_found_text"> + Resident wasn't found. + </floater.string> + <floater.string name="no_one_near"> No one near </floater.string> diff --git a/indra/newview/skins/default/xui/en/floater_grid_status.xml b/indra/newview/skins/default/xui/en/floater_grid_status.xml index b97bd8056d..bf78204282 100644 --- a/indra/newview/skins/default/xui/en/floater_grid_status.xml +++ b/indra/newview/skins/default/xui/en/floater_grid_status.xml @@ -12,7 +12,6 @@ save_rect="true" save_visibility="true" title="" - initial_mime_type="text/html" width="780" tab_stop="true" filename="floater_web_content.xml"/> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 519d3e043c..1b4992b4ca 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="440" + height="468" layout="topleft" name="Inventory Finder" help_topic="inventory_finder" @@ -245,11 +245,36 @@ layout="topleft" left="10" name="horiz_separator" - top_pad="8" + top_pad="10" width="260"/> <check_box height="16" - top="324" + label="Created by me" + layout="topleft" + left="8" + name="check_created_by_me" + top_delta="8" + width="130" /> + <check_box + height="16" + label="Created by others" + layout="topleft" + left_pad="0" + name="check_created_by_others" + top_delta="0" + width="70" /> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="10" + name="horiz_separator2" + top_pad="10" + width="260"/> + <check_box + height="16" + top="352" label="Since Logoff" layout="topleft" left_delta="0" @@ -265,7 +290,7 @@ layout="topleft" left_delta="0" name="- OR -" - top="342" + top="370" width="144"> - OR - </text> @@ -273,7 +298,7 @@ height="16" layout="topleft" name="date_search_direction" - top="360" + top="388" left="8" width="270"> <radio_item @@ -343,6 +368,6 @@ layout="topleft" name="Close" right="-6" - top="406" + top="434" width="76" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 4473ce0cda..fe9ffba6cd 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -10,7 +10,6 @@ help_topic="floater_web_content" save_rect="true" title="" - initial_mime_type="text/html" width="780"> <layout_stack bottom="775" diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index ec9f947338..5b45364127 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -569,6 +569,14 @@ function="Inventory.DoToSelected" parameter="copy_uuid" /> </menu_item_call> + <menu_item_call + label="Show in Main Panel" + layout="topleft" + name="Show in Main Panel"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="show_in_main_panel" /> + </menu_item_call> <menu_item_separator layout="topleft" name="Copy Separator" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a4963edecb..002dfd3ab9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6589,6 +6589,13 @@ Although you're very nice, you can't add yourself as a friend. <notification icon="notifytip.tga" + name="AddSelfRenderExceptions" + type="notifytip"> +You can't add yourself to the rendering exceptions list. + </notification> + + <notification + icon="notifytip.tga" name="UploadingAuctionSnapshot" type="notifytip"> Uploading in-world and web site snapshots... diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml index 3e3271b181..656171ff96 100644 --- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml @@ -18,15 +18,7 @@ left="5" height="25" width="25" - visible="false" - speaker.name="speaker_p2p" - speaker.width="20" - speaker.height="25" - speaker.left="25" - speaker.top="25" - speaker.auto_update="true" - speaker.draw_border="false" - speaker.visible="false"> + visible="false"> </chiclet_script> <chiclet_offer name="inv_offer_chiclet" @@ -36,15 +28,7 @@ left="5" height="25" width="25" - visible="false" - speaker.name="speaker_p2p" - speaker.width="20" - speaker.height="25" - speaker.left="25" - speaker.top="25" - speaker.auto_update="true" - speaker.draw_border="false" - speaker.visible="false"> + visible="false"> </chiclet_offer> <text type="string" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 0a85477bf4..df70398599 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -41,13 +41,37 @@ text_pad_left="10" follows="left|top|right" height="23" - label="Filter Inventory" + label="Enter search text" layout="topleft" left="10" max_length_chars="300" name="inventory search editor" top="18" - width="303" /> + width="208" /> + <combo_box + height="23" + layout="topleft" + left_pad="4" + name="search_type" + follows="top|right" + width="90"> + <item + label="Name" + name="Name" + value="search_by_name"/> + <item + label="Creator" + name="Creator" + value="search_by_creator"/> + <item + label="Description" + name="Description" + value="search_by_description"/> + <item + label="UUID" + name="UUID" + value="search_by_UUID"/> + </combo_box> <tab_container follows="all" halign="center" @@ -92,6 +116,20 @@ name="Recent Items" show_item_link_overlays="true" width="290" /> + <inventory_panel + name="Worn Items" + label="WORN" + show_empty_message="false" + follows="all" + layout="topleft" + width="290" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + border="false" + bevel_style="none" + scroll.reserve_scroll_corner="false"> + </inventory_panel> </tab_container> <layout_stack animate="false" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index e844a15118..2316beeb36 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -193,7 +193,7 @@ follows="left|top" height="16" increment="1" - initial_val="256" + initial_value="256" label="" label_width="0" left_delta="68" @@ -213,7 +213,7 @@ follows="left|top" height="16" increment="1" - initial_val="256" + initial_value="256" label="" label_width="0" left_delta="20" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 0cd56af6d7..4f0bb9d3b7 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -32,12 +32,12 @@ height="23" increment="64" initial_value="1024" - label="Cache size (64 - 9984MB)" + label="Cache size (256 - 9984MB)" label_width="150" layout="topleft" left="80" max_val="9984" - min_val="64" + min_val="256" top_pad="10" name="cachesizespinner" width="200" /> @@ -87,7 +87,7 @@ height="23" layout="topleft" left="80" - max_length="4096" + max_length_bytes="4096" name="cache_location" top_pad="5" width="205" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 78f771cd51..9e7023d2f2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="true" - has_border="true" height="408" label="Text Chat" layout="topleft" @@ -541,7 +540,7 @@ height="23" layout="topleft" left_pad="55" - max_length="4096" + max_length_bytes="4096" name="log_path_string" top_delta="-5" width="185"> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 99aab42db8..1e6fa7b2c7 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="Ayuda" name="Help"> <menu_item_call label="Cómo..." name="How To"/> + <menu_item_call label="Guía rápida" name="Quickstart"/> <menu_item_call label="Base de Conocimientos" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Foros comunitarios" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index efa003c17e..4cb816a120 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Caché: </text> - <spinner label="Tamaño de la caché (64 - 9984 MB)" name="cachesizespinner"/> + <spinner label="Tamaño de la caché (256 - 9984 MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 7cbd969ca0..2c7b27860d 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -78,7 +78,7 @@ Versión de Voice Server: [VOICE_VERSION] Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) </string> <string name="AboutTime"> - [mes, fecha_hora, slt] [día, fecha_hora, slt] [año, fecha_hora, slt] [hora, fecha_hora, slt]:[min, fecha_hora, slt]:[segundo,fecha_hora,slt] + [month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt] </string> <string name="ErrorFetchingServerReleaseNotesURL"> Error al obtener la URL de las notas de la versión del servidor. diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 98a69aa043..b59eee2539 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="Aide" name="Help"> <menu_item_call label="Aide rapide..." name="How To"/> + <menu_item_call label="Démarrage rapide" name="Quickstart"/> <menu_item_call label="Base de connaissances" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Forums de la communauté" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index f61dc5aa35..b96cb6dc49 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Cache : </text> - <spinner label="Taille du cache (64 - 9984 Mo)" name="cachesizespinner"/> + <spinner label="Taille du cache (256 - 9984 Mo)" name="cachesizespinner"/> <text name="text_box5"> Mo </text> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 216af0e458..4e438c3c23 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="Aiuto" name="Help"> <menu_item_call label="Istruzioni..." name="How To"/> + <menu_item_call label="Guida introduttiva" name="Quickstart"/> <menu_item_call label="Base di conoscenza" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Forum della comunità" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index 85cbfb92ef..87cee345fa 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Cache: </text> - <spinner label="Dimensione cache (64 - 9984 MB)" name="cachesizespinner"/> + <spinner label="Dimensione cache (256 - 9984 MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index a8be8e7616..c7525478eb 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="ヘルプ" name="Help"> <menu_item_call label="ハウツー..." name="How To"/> + <menu_item_call label="クイックスタート" name="Quickstart"/> <menu_item_call label="ナレッジベース" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="コミュニティフォーラム" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index 62b8daeb4e..266809f4da 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> キャッシュ： </text> - <spinner label="キャッシュサイズ（64～9,984MB）" name="cachesizespinner"/> + <spinner label="キャッシュサイズ（256～9,984MB）" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml index cc85ec20f6..4609b2f916 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml @@ -3,7 +3,7 @@ <text name="Cache:"> Pamięć podręczna: </text> - <spinner label="Rozmiar (64 - 9984 MB)" name="cachesizespinner" /> + <spinner label="Rozmiar (256 - 9984 MB)" name="cachesizespinner" /> <button label="Wyczyść" label_selected="Wyczyść" name="clear_cache" /> <text name="Cache location"> Położenie buforu pamięci podręcznej: diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 542734eb22..4d132447d8 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -173,6 +173,7 @@ </menu> <menu label="Ajuda" name="Help"> <menu_item_call label="Como..." name="How To"/> + <menu_item_call label="Início rápido" name="Quickstart"/> <menu_item_call label="Base de conhecimento" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Fóruns da comunidade" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index 15340a9a5f..56065d95a3 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Cache: </text> - <spinner label="Cache (64 - 9984 MB)" name="cachesizespinner"/> + <spinner label="Cache (256 - 9984 MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index e0d8861225..8ac457dea4 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -170,6 +170,7 @@ </menu> <menu label="Справка" name="Help"> <menu_item_call label="Инструкции..." name="How To"/> + <menu_item_call label="Краткое руководство" name="Quickstart"/> <menu_item_call label="База знаний" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Форумы сообщества" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml index 88bcc22414..03295084dc 100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Кэш: </text> - <spinner label="Размер кэша (64 - 9984 МБ)" name="cachesizespinner"/> + <spinner label="Размер кэша (256 - 9984 МБ)" name="cachesizespinner"/> <text name="text_box5"> МБ </text> diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index ef001a8687..e6e5a037ac 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -171,6 +171,7 @@ </menu> <menu label="Yardım" name="Help"> <menu_item_call label="Nasıl yapılır..." name="How To"/> + <menu_item_call label="Hızlı Başlangıç" name="Quickstart"/> <menu_item_call label="Bilgi Bankası" name="Knowledge Base"/> <menu_item_call label="Wiki" name="Wiki"/> <menu_item_call label="Topluluk Forumları" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml index c3ac198d08..f8aa17f0c6 100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> Önbellek: </text> - <spinner label="Önbellek boyutu (64-9984 MB)" name="cachesizespinner"/> + <spinner label="Önbellek boyutu (256-9984 MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index a58e1bb0fa..ede9942f69 100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -171,6 +171,7 @@ </menu> <menu label="幫助" name="Help"> <menu_item_call label="簡易教學…" name="How To"/> + <menu_item_call label="快速上手" name="Quickstart"/> <menu_item_call label="知識庫" name="Knowledge Base"/> <menu_item_call label="維基" name="Wiki"/> <menu_item_call label="社群論壇" name="Community Forums"/> diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml index 170cdddb8c..47f1069254 100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml @@ -6,7 +6,7 @@ <text name="Cache:"> 快取： </text> - <spinner label="快取大小 (64 - 9984MB)" name="cachesizespinner"/> + <spinner label="快取大小 (256 - 9984MB)" name="cachesizespinner"/> <text name="text_box5"> MB </text> |