diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-01 18:10:43 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-01 18:10:43 +0300 |
| commit | e1566bb1f0659707fb8494282f6359dcb7dbf175 (patch) | |
| tree | 9e8ff877af0d293267b07d1e3cf770a1b221661d /indra/newview/skins | |
| parent | 4d84caed36006e3f3e7d0468335456fe7d034e94 (diff) | |
| parent | 070311d5ccc111e44775b12a95e8ccb9434cd147 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins')
132 files changed, 864 insertions, 347 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index ece406f9b1..a59db1420f 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -306,7 +306,7 @@ initial_value="true" layout="topleft" left="135" - name="event_mature_chk" + name="events_mature_chk" top_pad="3" width="22" /> <icon @@ -328,7 +328,7 @@ top_delta="2" left_pad="3" layout="topleft" - name="mature_label" + name="events_mature_label" width="66"> Moderate </text> @@ -339,7 +339,7 @@ height="16" layout="topleft" left="135" - name="event_adult_chk" + name="events_adult_chk" top_pad="3" width="22" /> <icon @@ -361,7 +361,7 @@ top_delta="2" left_pad="3" layout="topleft" - name="adult_label" + name="events_adult_label" width="66"> Adult </text> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 362fdd606a..0fc945126b 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -189,8 +189,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap left="0"> <layout_panel auto_resize="true" - background_visible="true" - bg_alpha_color="Black" + background_visible="false" layout="topleft" height="154" name="add_button_and_combobox" diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 60a0095d5f..58d3dbcc37 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -14,131 +14,82 @@ border="false"> <tab_container follows="all" - height="509" + height="539" layout="topleft" - left="7" + left="5" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" top="8" - width="312"> + width="315"> <panel class="outfits_list" filename="panel_outfits_list.xml" - height="490" + height="520" name="outfitslist_tab" background_visible="true" help_topic="my_outfits_tab" follows="all" label="MY OUTFITS" layout="topleft" - width="312" /> + width="315" /> <panel background_visible="true" bg_alpha_color="DkGray" class="panel_wearing" + filename="panel_outfits_wearing.xml" follows="all" - height="490" + height="520" help_topic="now_wearing_tab" label="WEARING" layout="topleft" name="cof_tab" - width="312"> - <wearable_items_list - allow_select="true" - follows="all" - height="490" - keep_one_selected="true" - left="3" - multi_select="true" - name="cof_items_list" - standalone="false" - top="0" - translate="false" - width="307" - worn_indication_enabled="false" - /> - </panel> + width="315" /> </tab_container> - <panel - background_visible="true" - follows="bottom|left|right" - height="57" - layout="topleft" - left="9" - top_pad="-1" - visible="true" - name="bottom_panel" - width="310"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="25" - image_hover_unselected="Toolbar_Left_Over" - image_overlay="OptionsMenu_Off" - image_selected="Toolbar_Left_Selected" - image_unselected="Toolbar_Left_Off" - layout="topleft" - left="1" - name="options_gear_btn" - top="1" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_icon" - width="241" - /> - <button - follows="bottom|right" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="TrashItem_Off" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="trash_btn" - tool_tip="Delete selected outfit" - width="31"/> - <button - follows="bottom|left" - height="23" - label="Save As" - left="0" - layout="topleft" - name="save_btn" - top_pad="6" - width="155" /> - <button - follows="bottom|left" - height="23" - name="save_flyout_btn" - label="" + <panel + background_visible="true" + follows="bottom|left|right" + height="27" layout="topleft" - left_pad="-20" - tab_stop="false" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> - <button - follows="bottom|left|right" - height="23" - label="Wear" - layout="topleft" - name="wear_btn" - left_pad="3" - tool_tip="Wear selected outfit" - width="152" /> - </panel> - + left="9" + top_pad="1" + visible="true" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + height="23" + label="Save As" + left="0" + layout="topleft" + name="save_btn" + top_pad="0" + width="155" /> + <button + follows="bottom|left" + height="23" + name="save_flyout_btn" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + <button + follows="bottom|left|right" + height="23" + label="Wear" + layout="topleft" + name="wear_btn" + left_pad="3" + tool_tip="Wear selected outfit" + width="152" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml index aea4e939df..62b23aa74c 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml @@ -4,7 +4,7 @@ bg_alpha_color="DkGray" border="false" follows="all" - height="400" + height="430" name="Outfits" layout="topleft" left="0" @@ -23,6 +23,50 @@ left="3" name="outfits_accordion" top="0" - width="307"> + width="309"> </accordion> + <panel + background_visible="true" + follows="bottom|left|right" + height="28" + layout="topleft" + left="4" + top_pad="0" + visible="true" + name="bottom_panel" + width="312"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="243"/> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="trash_btn" + tool_tip="Delete selected outfit" + width="31"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml new file mode 100644 index 0000000000..2fbbf6610c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="DkGray" + follows="all" + height="430" + layout="topleft" + left="0" + name="Wearing" + top="0" + width="312"> + <wearable_items_list + follows="all" + height="400" + layout="topleft" + left="3" + multi_select="true" + name="cof_items_list" + standalone="false" + top="0" + width="309" + worn_indication_enabled="false" /> + <panel + background_visible="true" + follows="bottom|left|right" + height="28" + layout="topleft" + left="4" + name="bottom_panel" + top_pad="0" + width="312"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + tool_tip="Show additional options" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="274" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 02ea661da3..37d60f1671 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -7,7 +7,7 @@ icon_maturity_general="Parcel_PG_Light" icon_maturity_adult="Parcel_R_Light" icon_maturity_moderate="Parcel_M_Light" - maturity_help_topic="TODO" + maturity_help_topic="maturity_rating" add_landmark_image_enabled="Favorite_Star_Active" add_landmark_image_disabled="Favorite_Star_Off" add_landmark_image_hover="Favorite_Star_Over" diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index 7588380148..73e947f1f7 100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml @@ -24,6 +24,9 @@ <floater.string name="mini_map_northwest"> NO </floater.string> + <floater.string name="mini_map_caption"> + MINIMAPA + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml index 44179d6b28..cf1b3bbbbd 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Gesto: [NAME] </floater.string> - <text name="name_text"> - Nombre: - </text> <text name="desc_label"> Descripción: </text> @@ -53,13 +50,15 @@ <button label="Arriba" name="up_btn"/> <button label="Abajo" name="down_btn"/> <button label="Quitar" name="delete_btn"/> - <text left="230" name="options_text" width="200"/> + <text left="230" name="options_text" width="200"> + (opciones) + </text> <radio_group name="animation_trigger_type"> <radio_item label="Empezar" name="start"/> <radio_item label="Parar" name="stop"/> </radio_group> <check_box bottom_delta="34" label="hasta que las animaciones estén hechas" name="wait_anim_check"/> - <check_box bottom_delta="-30" label="tiempo en segundos" name="wait_time_check"/> + <check_box bottom_delta="-30" label="tiempo en segundos:" name="wait_time_check"/> <line_editor left_delta="130" name="wait_time_editor"/> <text name="help_label"> Todos los pasos suceden a la vez, a menos que añadas pasos de espera. diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml index 5106749f1c..eafc623ea9 100644 --- a/indra/newview/skins/default/xui/es/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml @@ -1,23 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="Foto"> +<floater name="Snapshot" title="VISTA PREVIA DE LA FOTO"> <floater.string name="unknown"> desconocido </floater.string> + <radio_group label="Tipo de foto" name="snapshot_type_radio"> + <radio_item label="Correo-e" name="postcard"/> + <radio_item label="Mi inventario ([AMOUNT] L$)" name="texture"/> + <radio_item label="Guardar en mi ordenador" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] kB + </text> <button label="Actualizar la foto" name="new_snapshot_btn"/> - <line_editor label="Descripción" name="description"/> - <panel name="panel_snapshot_main"> - <button label="Compartir foto" name="share"/> - <button label="Guardar foto" name="save"/> - <button label="Configurar como imagen del perfil" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Compartir en Internet" name="share_to_web"/> - <button label="Foto por correo" name="share_to_email"/> - <button label="Atrás" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="Guardar en mi inventario" name="save_to_inventory"/> - <button label="Guardar en mi ordenador" name="save_to_computer"/> - <button label="Atrás" name="cancel_save"/> - </panel> + <button label="Enviar" name="send_btn"/> + <button label="Ahorro ([AMOUNT] L$)" name="upload_btn"/> + <flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo"> + <flyout_button.item label="Guardar" name="save_item"/> + <flyout_button.item label="Guardar como..." name="saveas_item"/> + </flyout_button> + <button label="Más" name="more_btn" tool_tip="Opciones avanzadas"/> + <button label="Menos" name="less_btn" tool_tip="Opciones avanzadas"/> + <button label="Cancelar" name="discard_btn"/> + <text name="type_label2"> + Tamaño + </text> + <text name="format_label"> + Formato + </text> + <combo_box label="Resolución" name="postcard_size_combo"> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="Personalizado" name="Custom"/> + </combo_box> + <combo_box label="Resolución" name="texture_size_combo"> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="Pequeña (128x128)" name="Small(128x128)"/> + <combo_box.item label="Mediana (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> + <combo_box.item label="Personalizado" name="Custom"/> + </combo_box> + <combo_box label="Resolución" name="local_size_combo"> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="Personalizado" name="Custom"/> + </combo_box> + <combo_box label="Formato" name="local_format_combo"> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> + </combo_box> + <spinner label="Ancho" name="snapshot_width"/> + <spinner label="Altura" name="snapshot_height"/> + <check_box label="Mantener las proporciones" name="keep_aspect_check"/> + <slider label="Calidad de la imagen" name="image_quality_slider"/> + <text name="layer_type_label"> + Captura: + </text> + <combo_box label="Capas de imagen" name="layer_types"> + <combo_box.item label="Colores" name="Colors"/> + <combo_box.item label="Profundidad" name="Depth"/> + </combo_box> + <check_box label="Interfaz" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> + <check_box label="Mantener abierto después de guardar" name="keep_open_check"/> + <check_box label="Congelar la toma (pantalla completa)" name="freeze_frame_check"/> + <check_box label="Actualizar automáticamente" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml index c1b7222aad..5ef4347958 100644 --- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ"> +<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ"> <string name="no_voice_effect"> (Sin transformación de voz) </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> (¡Nuevo!) </string> + <text name="preview_text"> + Para probarla + </text> <text name="status_text"> - Para probar un efecto de transformación de voz, pulsa el botón Grabar, graba un breve fragmento de voz y pulsa cualquiera de las transformaciones de voz de la lista para escuchar cómo suena. - -Para volver a conectarte al chat de voz, cierra esta ventana. + Graba una muestra y pulsa en una voz para escuchar cómo suena. </text> - <button label="Grabar muestra" name="record_btn" tool_tip="Graba una muestra de tu voz."/> + <button label="Grabar" name="record_btn" tool_tip="Graba una muestra de tu voz."/> <button label="Parar" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL] Obtener transformación de voz] + [[URL] Suscríbete ahora] </text> <scroll_list name="voice_effect_list" tool_tip="Graba una muestra de tu voz y pulsa en un efecto para ver cómo suena."> - <scroll_list.columns label="Transformación de voz" name="name"/> + <scroll_list.columns label="Nombre de la voz" name="name"/> <scroll_list.columns label="Caduca" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml index afac8d7fe9..dc4efa1ce8 100644 --- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Tocar" name="Attachment Object Touch"/> <menu_item_call label="Editar" name="Edit..."/> <menu_item_call label="Quitar" name="Detach"/> - <menu_item_call label="Soltar" name="Drop"/> <menu_item_call label="Levantarme" name="Stand Up"/> <menu_item_call label="Cambiar vestuario" name="Change Outfit"/> + <menu_item_call label="Editar mi vestuario" name="Edit Outfit"/> + <menu_item_call label="Editar mi anatomía" name="Edit My Shape"/> <menu_item_call label="Mis amigos" name="Friends..."/> <menu_item_call label="Mis grupos" name="Groups..."/> <menu_item_call label="Mi perfil" name="Profile..."/> <menu_item_call label="Depurar las texturas" name="Debug..."/> + <menu_item_call label="Soltar" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml index e674d6fa11..4136082a62 100644 --- a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="Ponerme - Añadir al vestuario actual" name="wear_add"/> <menu_item_call label="Quitarme - Quitar del vestuario actual" name="take_off"/> <menu_item_call label="Editar el vestuario" name="edit"/> - <menu_item_call label="Renombrar" name="rename"/> + <menu_item_call label="Renombrar el vestuario" name="rename"/> <menu_item_call label="Borrar el vestuario" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml new file mode 100644 index 0000000000..2125fd51b2 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Mostrar las coordenadas" name="Show Coordinates"/> + <menu_item_check label="Mostrar las propiedades de la parcela" name="Show Parcel Properties"/> + <menu_item_call label="Hito" name="Landmark"/> + <menu_item_call label="Copiar" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index f56ab00bf6..66c0bf9311 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -177,6 +177,7 @@ <menu_item_check label="Buscar" name="Search"/> <menu_item_call label="Recuperar las teclas" name="Release Keys"/> <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/> + <menu_item_check label="Mostrar el menú Avanzado - acceso directo antiguo" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Correr siempre" name="Always Run"/> <menu_item_check label="Volar" name="Fly"/> <menu_item_call label="Cerrar la ventana" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml index d5f106ff96..96fc3a1e68 100644 --- a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Ponerme" name="wear"/> + <menu_item_call label="Reemplazar" name="wear"/> <menu_item_call label="Añadir" name="wear_add"/> <menu_item_call label="Quitarme / Quitar" name="take_off_or_detach"/> <menu_item_call label="Quitar" name="detach"/> diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml new file mode 100644 index 0000000000..5f68e1687f --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Wearing"> + <menu_item_call label="Editar el vestuario" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml new file mode 100644 index 0000000000..56f4afda9b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Wearing"> + <menu_item_call label="Editar el vestuario" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 1ec29d6029..06422a252d 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -614,8 +614,7 @@ Podría ser [VALIDS] No se puede codificar el archivo: [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - No se pueden leer los datos protegidos, por lo que se están restaurando. - Esto puede deberse a un cambio de configuración de la red. + No se pueden rellenar el nombre de usuario y la contraseña. Esto puede deberse a un cambio de configuración de la red. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml index de764d8025..8f4e0101aa 100644 --- a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="No tienes permiso para editar."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Editar esta anatomía"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml index de764d8025..959b83d658 100644 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> + <button name="btn_delete" tool_tip="Quitar del vestuario"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="No tienes permiso para editar."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Editar este artículo"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml index 91d90a5660..d1d7d8ec82 100644 --- a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="Quitar del vestuario"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml index 6af84de0c7..bc3046978c 100644 --- a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="dummy_clothing_item"> <text name="item_name" value="..."/> + <panel name="btn_add_panel"> + <button name="btn_add" tool_tip="Añadir más elementos de este tipo"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml index 176f122dc4..09321f7b91 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> Tatuaje: </string> + <labeled_back_button label="Guardar" name="back_btn" tool_tip="Regresar a Editar el vestuario"/> <text name="edit_wearable_title" value="Modificando la anatomía"/> <panel label="Camisa" name="wearable_type_panel"> <text name="description_text" value="Anatomía:"/> @@ -102,6 +103,6 @@ </panel> <panel name="button_panel"> <button label="Guardar como" name="save_as_button"/> - <button label="Revertir" name="revert_button"/> + <button label="Deshacer los cambios" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index c4f17ab6dc..a0f7433d7d 100644 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml @@ -48,7 +48,7 @@ Deja el cursor sobre las opciones para ver más ayuda. <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Si la opción Cuota de entrada está marcada, los nuevos miembros han de pagar esta cuota para entrar al grupo." width="60"/> <combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es 'mature'." width="150"> <combo_item name="select_mature"> - - Elige la Calificación - + - Selecciona el nivel de calificación - </combo_item> <combo_box.item label="Contenido 'Mature'" name="mature"/> <combo_box.item label="Contenido 'PG'" name="pg"/> diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml index 31648e8e80..ca8b77b49f 100644 --- a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="Todos"/> <string name="Filter.Clothes/Body" value="Ropas/Cuerpo"/> <string name="Filter.Objects" value="Objetos"/> - <string name="Filter.Custom" value="Filtro personalizado"/> + <string name="Filter.Clothing" value="Ropa"/> + <string name="Filter.Bodyparts" value="Partes del cuerpo"/> + <string name="replace_body_part" value="Pulsa para sustituir tu anatomía actual"/> <text name="title" value="Editar el vestuario"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -25,7 +27,7 @@ <layout_panel label="Panel de control de los MI" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="Añadir más..." name="show_add_wearables_btn"/> + <button label="Añadir más..." name="show_add_wearables_btn" tool_tip="Abrir/Cerrar"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="Filtrar artículos del inventario" name="look_item_filter"/> @@ -36,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="Guardar" name="save_btn"/> - <button label="Revertir" name="revert_btn"/> + <button label="Deshacer los cambios" name="revert_btn" tool_tip="Volver a la última versión guardada"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml index 7691a680a1..75defd97cf 100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Ver más opciones"/> - <dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/> + <dnd_button name="trash_btn" tool_tip="Eliminar el vestuario seleccionado"/> <button label="Guardar como" name="save_btn"/> <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml index 183c007a0c..feebf197c4 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml @@ -49,10 +49,7 @@ m </text> <slider label="Núm. máx. de partículas:" name="MaxParticleCount"/> - <slider label="Distancia de dibujo máxima del avatar:" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="N.º máximo de avatares no impostores:" name="MaxNumberAvatarDrawn"/> <slider label="Calidad de procesamiento:" name="RenderPostProcess"/> <text name="MeshDetailText"> Detalle de la malla: diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml index 2cc36b7cae..94a0428941 100644 --- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/es/panel_voice_effect.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_voice_effect"> <string name="no_voice_effect"> - Sin transformación de voz + Transformación de voz desactivada </string> <string name="preview_voice_effects"> Probar transformación de voz ▶ @@ -9,7 +9,7 @@ <string name="get_voice_effects"> Obtener transformación de voz ▶ </string> - <combo_box name="voice_effect" tool_tip="Selecciona un efecto de transformación de voz para cambiar tu voz."> - <combo_box.item label="Sin transformación de voz" name="no_voice_effect"/> + <combo_box name="voice_effect" tool_tip="Selecciona una transformación de voz para cambiar tu voz"> + <combo_box.item label="Transformación de voz desactivada" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml index db5d47c11e..bdef89c392 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml @@ -3,12 +3,14 @@ <string name="No Outfit" value="No hay vestuario"/> <string name="Unsaved Changes" value="Cambios sin guardar"/> <string name="Now Wearing" value="Llevas puesto..."/> + <string name="Changing outfits" value="Cambiar de vestuario"/> <panel name="panel_currentlook"> <button label="F" name="editappearance_btn"/> <button label="O" name="openoutfit_btn"/> <text name="currentlook_status"> (Estado) </text> + <button label="" name="edit_outfit_btn" tool_tip="Editar este vestuario"/> </panel> <filter_editor label="Filtrar los vestuarios" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml index 0d2eb0ac35..d647f36125 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Perfil del objeto"> +<panel name="item properties" title="Perfil del elemento"> <panel.string name="unknown"> (desconocidas) </panel.string> @@ -15,7 +15,7 @@ <panel.string name="acquiredDate"> [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] </panel.string> - <text name="title" value="Perfil del objeto"/> + <text name="title" value="Perfil del elemento"/> <text name="where" value="(Inventario)"/> <panel label=""> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 6bd9ceb6ef..1697b29718 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -297,6 +297,9 @@ <string name="ReleaseNotes"> Notas de la versión </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> Cargando... </string> @@ -843,6 +846,9 @@ <string name="invalid"> inválido/a </string> + <string name="none"> + ninguno + </string> <string name="shirt_not_worn"> Camisa no puesta </string> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index ff49fd4536..5c71e50282 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -223,7 +223,7 @@ ou divisé. Facteur Bonus Objets : [BONUS] </text> <text name="Simulator primitive usage:"> - Utilisation des prims : + Utilisation des primitives : </text> <text left="214" name="objects_available" width="230"> [COUNT] sur [MAX] ([AVAILABLE] disponibles) diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index ae319949e3..cd013f6c0e 100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml @@ -27,6 +27,9 @@ <floater.string name="ToolTipMsg"> [AGENT][REGION](Double-cliquez pour ouvrir la carte) </floater.string> + <floater.string name="mini_map_caption"> + MINI-CARTE + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml index 1d164ac661..4fa91b87ef 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Geste : [NAME] </floater.string> - <text name="name_text"> - Nom : - </text> <text name="desc_label"> Description : </text> @@ -53,12 +50,15 @@ <button label="Haut" name="up_btn"/> <button label="Bas" name="down_btn"/> <button label="Supprimer" name="delete_btn"/> + <text name="options_text"> + (options) + </text> <radio_group name="animation_trigger_type"> <radio_item label="Lancer" name="start"/> <radio_item label="Arrêter" name="stop"/> </radio_group> <check_box label="jusqu'à la fin des animations" name="wait_anim_check"/> - <check_box label="temps (sec)" name="wait_time_check"/> + <check_box label="temps (sec) :" name="wait_time_check"/> <line_editor left_delta="130" name="wait_time_editor"/> <text name="help_label"> Toutes les étapes ont lieu en même temps si vous n'ajoutez pas d'étapes d'attente. diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml index 033ee7443c..6f81bf68b1 100644 --- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml @@ -1,23 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="Photo" width="247"> +<floater name="Snapshot" title="APERÇU DE LA PHOTO" width="247"> <floater.string name="unknown"> inconnu </floater.string> + <radio_group label="Type de photo" name="snapshot_type_radio"> + <radio_item label="E-mail" name="postcard"/> + <radio_item label="Mon inventaire ([AMOUNT] L$)" name="texture"/> + <radio_item label="Enregistrer sur mon ordinateur" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] Ko + </text> <button label="Rafraîchir" name="new_snapshot_btn"/> - <line_editor label="Description" name="description"/> - <panel name="panel_snapshot_main"> - <button label="Partager" name="share"/> - <button label="Enregistrer" name="save"/> - <button label="Image de profil" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Partage Web" name="share_to_web"/> - <button label="Envoi par e-mail" name="share_to_email"/> - <button label="Précédent" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="Dans mon inventaire" name="save_to_inventory"/> - <button label="Sur mon ordinateur" name="save_to_computer"/> - <button label="Précédent" name="cancel_save"/> - </panel> + <button label="Envoyer" name="send_btn"/> + <button label="Enregistrer ([AMOUNT] L$)" name="upload_btn"/> + <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l'image sous forme de fichier"> + <flyout_button.item label="Enregistrer" name="save_item"/> + <flyout_button.item label="Enregistrer sous..." name="saveas_item"/> + </flyout_button> + <button label="Plus" name="more_btn" tool_tip="Options avancées"/> + <button label="Moins" name="less_btn" tool_tip="Options avancées"/> + <button label="Annuler" name="discard_btn"/> + <text name="type_label2"> + Taille + </text> + <text name="format_label"> + Format + </text> + <combo_box label="Résolution" name="postcard_size_combo"> + <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/> + <combo_box.item label="640 x 480" name="640x480"/> + <combo_box.item label="800 x 600" name="800x600"/> + <combo_box.item label="1 024 x 768" name="1024x768"/> + <combo_box.item label="Personnalisée" name="Custom"/> + </combo_box> + <combo_box label="Résolution" name="texture_size_combo"> + <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/> + <combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/> + <combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/> + <combo_box.item label="Personnalisée" name="Custom"/> + </combo_box> + <combo_box label="Résolution" name="local_size_combo"> + <combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/> + <combo_box.item label="320 x 240" name="320x240"/> + <combo_box.item label="640 x 480" name="640x480"/> + <combo_box.item label="800 x 600" name="800x600"/> + <combo_box.item label="1 024 x 768" name="1024x768"/> + <combo_box.item label="1 280 x 1 024" name="1280x1024"/> + <combo_box.item label="1 600 x 1 200" name="1600x1200"/> + <combo_box.item label="Personnalisée" name="Custom"/> + </combo_box> + <combo_box label="Format" name="local_format_combo"> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> + </combo_box> + <spinner label="Largeur" name="snapshot_width"/> + <spinner label="Hauteur" name="snapshot_height"/> + <check_box label="Contraindre les proportions" name="keep_aspect_check"/> + <slider label="Qualité de l'image" name="image_quality_slider"/> + <text name="layer_type_label"> + Capturer : + </text> + <combo_box label="Couches d'images" name="layer_types"> + <combo_box.item label="Couleurs" name="Colors"/> + <combo_box.item label="Profondeur" name="Depth"/> + </combo_box> + <check_box label="Interface" name="ui_check"/> + <check_box label="HUD" name="hud_check"/> + <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/> + <check_box label="Arrêt sur image (plein écran)" name="freeze_frame_check"/> + <check_box label="Actualisation automatique" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml index d7f0ff7f6b..56cb654440 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX"> +<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX"> <string name="no_voice_effect"> (Aucun effet de voix) </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> (Nouveau !) </string> + <text name="preview_text"> + Aperçu + </text> <text name="status_text"> - Pour obtenir un aperçu des effets, enregistrez un court extrait de votre voix en cliquant sur le bouton ci-dessous, puis cliquez sur l'une des entrées de la liste. Vous entendrez alors le son de votre voix transformée. - -Pour vous reconnecter au chat vocal près de vous, fermez cette fenêtre. + Enregistrez un extrait et cliquez sur un effet pour obtenir un aperçu. </text> - <button label="Enregistrer un extrait" name="record_btn" tool_tip="Enregistrez un extrait de votre voix."/> + <button label="Enregistrer" name="record_btn" tool_tip="Enregistrez un extrait de votre voix."/> <button label="Arrêter" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL] Obtenir un effet de voix] + [[URL] S'abonner] </text> <scroll_list name="voice_effect_list" tool_tip="Enregistrez un extrait de votre voix, puis cliquez sur un effet pour obtenir un aperçu."> - <scroll_list.columns label="Effet de voix" name="name"/> + <scroll_list.columns label="Nom de l'effet" name="name"/> <scroll_list.columns label="Date d'expiration" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml index ff87d90d4d..3f6cd85685 100644 --- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Toucher" name="Attachment Object Touch"/> <menu_item_call label="Éditer" name="Edit..."/> <menu_item_call label="Détacher" name="Detach"/> - <menu_item_call label="Lâcher" name="Drop"/> <menu_item_call label="Me lever" name="Stand Up"/> <menu_item_call label="Changer de tenue" name="Change Outfit"/> + <menu_item_call label="Modifier ma tenue" name="Edit Outfit"/> + <menu_item_call label="Modifier ma silhouette" name="Edit My Shape"/> <menu_item_call label="Mes amis" name="Friends..."/> <menu_item_call label="Mes groupes" name="Groups..."/> <menu_item_call label="Mon profil" name="Profile..."/> <menu_item_call label="Déboguer les textures" name="Debug..."/> + <menu_item_call label="Lâcher" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml index a68715108f..2a7f618e07 100644 --- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="Porter - Ajouter à la tenue actuelle" name="wear_add"/> <menu_item_call label="Enlever - Supprimer de la tenue actuelle" name="take_off"/> <menu_item_call label="Modifier la tenue" name="edit"/> - <menu_item_call label="Renommer" name="rename"/> + <menu_item_call label="Renommer la tenue" name="rename"/> <menu_item_call label="Supprimer la tenue" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml new file mode 100644 index 0000000000..dc68f40fe7 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Afficher les coordonnées" name="Show Coordinates"/> + <menu_item_check label="Afficher les propriétés de la parcelle" name="Show Parcel Properties"/> + <menu_item_call label="Repère" name="Landmark"/> + <menu_item_call label="Copier" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 0976f0c72a..ec9bee9a64 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -177,6 +177,7 @@ <menu_item_check label="Rechercher" name="Search"/> <menu_item_call label="Relâcher les touches" name="Release Keys"/> <menu_item_call label="Taille de l'interface par défaut" name="Set UI Size to Default"/> + <menu_item_check label="Afficher le menu Avancé - raccourci existant" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Toujours courir" name="Always Run"/> <menu_item_check label="Voler" name="Fly"/> <menu_item_call label="Fermer la fenêtre" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml index 207ba79148..39e8ca2173 100644 --- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Porter" name="wear"/> + <menu_item_call label="Remplacer" name="wear"/> <menu_item_call label="Ajouter" name="wear_add"/> <menu_item_call label="Enlever / Détacher" name="take_off_or_detach"/> <menu_item_call label="Détacher" name="detach"/> diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml new file mode 100644 index 0000000000..d5330c2417 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Wearing"> + <menu_item_call label="Modifier la tenue" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml new file mode 100644 index 0000000000..b99f751fae --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Wearing"> + <menu_item_call label="Modifier la tenue" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 32f779f538..7b34778936 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -614,8 +614,7 @@ Assurez-vous que le fichier a l'extension correcte. Impossible d'encoder le fichier : [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - Impossible de lire vos données protégées ; elles sont en cours de réinitialisation. - Cette situation peut se produire lorsque vous changez la configuration du réseau. + Impossible de renseigner votre nom d'utilisateur et mot de passe. Cette situation peut se produire lorsque vous changez la configuration du réseau. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml index de764d8025..377f85368f 100644 --- a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Vous ne disposez pas de droits de modification."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Modifier cette silhouette"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml index de764d8025..b23cb91c6f 100644 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> + <button name="btn_delete" tool_tip="Enlever de la tenue"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Vous ne disposez pas de droits de modification."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Modifier cet article à porter"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml index 91d90a5660..e1fa769f2f 100644 --- a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="Enlever de la tenue"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml index 6af84de0c7..bc0edda5b6 100644 --- a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="dummy_clothing_item"> <text name="item_name" value="..."/> + <panel name="btn_add_panel"> + <button name="btn_add" tool_tip="Ajouter plus d'articles de ce type"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index 60c46a9f2e..4b1572b052 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> Tatouage : </string> + <labeled_back_button label="Enregistrer" name="back_btn" tool_tip="Revenir à Modifier la tenue"/> <text name="edit_wearable_title" value="Modification de la silhouette"/> <panel label="Chemise" name="wearable_type_panel"> <text name="description_text" value="Silhouette :"/> @@ -102,6 +103,6 @@ </panel> <panel name="button_panel"> <button label="Enregistrer sous" name="save_as_button"/> - <button label="Rétablir" name="revert_button" width="130"/> + <button label="Annuler les modifications" name="revert_button" width="130"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml index 20cb5bd974..ec6d995274 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml @@ -48,7 +48,7 @@ Faites glisser le pointeur de la souris sur les options pour en savoir plus. <spinner label="L$" name="spin_enrollment_fee" tool_tip="Les nouveaux membres doivent payer ces frais pour rejoindre le groupe quand l'option Frais d'inscription est cochée."/> <combo_box name="group_mature_check" tool_tip="Définit si votre groupe contient des informations de type Modéré" width="195"> <combo_item name="select_mature"> - - Catégorie d'accès - + - Sélectionner une catégorie de contenu - </combo_item> <combo_box.item label="Contenu Modéré" name="mature"/> <combo_box.item label="Contenu Général" name="pg"/> diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml index 0764cfb6e7..b17803eaad 100644 --- a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="Tout"/> <string name="Filter.Clothes/Body" value="Habits/Corps"/> <string name="Filter.Objects" value="Objets"/> - <string name="Filter.Custom" value="Filtre personnalisé"/> + <string name="Filter.Clothing" value="Habits"/> + <string name="Filter.Bodyparts" value="Parties du corps"/> + <string name="replace_body_part" value="Cliquer pour remplacer la silhouette existante"/> <text name="title" value="Modifier la tenue"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -25,7 +27,7 @@ <layout_panel label="Panneau de contrôle IM" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="Ajouter plus..." name="show_add_wearables_btn"/> + <button label="Ajouter plus..." name="show_add_wearables_btn" tool_tip="Ouvrir/Fermer"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="Filtrer ce qui peut être porté dans l'inventaire" name="look_item_filter"/> @@ -36,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="Enregistrer" name="save_btn"/> - <button label="Rétablir" name="revert_btn"/> + <button label="Annuler les modifications" name="revert_btn" tool_tip="Rétablir la dernière version enregistrée"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml index 22e6adfb89..d241b07ad8 100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> - <dnd_button name="trash_btn" tool_tip="Supprimer l'objet sélectionné"/> + <dnd_button name="trash_btn" tool_tip="Supprimer la tenue sélectionnée"/> <button label="Enregistrer sous" name="save_btn"/> <button label="Porter" name="wear_btn" tool_tip="Porter la tenue sélectionnée"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml index c7caf5c2ff..12813e115f 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml @@ -49,10 +49,7 @@ m </text> <slider label="Nombre de particules max. :" label_width="147" name="MaxParticleCount"/> - <slider label="Limite d'affichage max des avatars :" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="Nb max d'avatars non éloignés en 2D :" name="MaxNumberAvatarDrawn"/> <slider label="Qualité post-traitement :" name="RenderPostProcess"/> <text name="MeshDetailText"> Détails des rendus : diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml index 01734295f2..a134854706 100644 --- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_voice_effect"> <string name="no_voice_effect"> - Aucun effet de voix + Effet de voix désactivé </string> <string name="preview_voice_effects"> Aperçu des effets de voix ▶ @@ -9,7 +9,7 @@ <string name="get_voice_effects"> Obtenir un effet de voix ▶ </string> - <combo_box name="voice_effect" tool_tip="Sélectionnez un effet pour modifier le son de votre voix."> - <combo_box.item label="Aucun effet de voix" name="no_voice_effect"/> + <combo_box name="voice_effect" tool_tip="Sélectionner un effet pour modifier le son de votre voix"> + <combo_box.item label="Effet de voix désactivé" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml index 69cb6cd53d..5e1ac55a97 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml @@ -3,6 +3,7 @@ <string name="No Outfit" value="Aucune tenue"/> <string name="Unsaved Changes" value="Modifications non enregistrées"/> <string name="Now Wearing" value="Vous portez désormais..."/> + <string name="Changing outfits" value="Changement de tenue"/> <panel name="panel_currentlook"> <button label="M" name="editappearance_btn"/> <button label="O" name="openoutfit_btn"/> @@ -12,6 +13,7 @@ <text name="currentlook_name"> Ma tenue avec un nom très long comme ORIGNAL </text> + <button label="" name="edit_outfit_btn" tool_tip="Modifier cette tenue"/> </panel> <filter_editor label="Filtrer les tenues" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml index 31a0534b2d..297cdd2839 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Profil de l'objet"> +<panel name="item properties" title="Profil de l'article"> <panel.string name="unknown"> (inconnu) </panel.string> @@ -15,7 +15,7 @@ <panel.string name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <text name="title" value="Profil de l'objet"/> + <text name="title" value="Profil de l'article"/> <text name="where" value="(inventaire)"/> <panel label=""> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index d95cfaedb4..95e081b574 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -309,6 +309,9 @@ <string name="ReleaseNotes"> Notes de version </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> Chargement... </string> @@ -864,6 +867,9 @@ <string name="invalid"> non valide </string> + <string name="none"> + aucun + </string> <string name="shirt_not_worn"> Chemise non portée </string> diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index 942b79b7d3..c9a004be9f 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -222,7 +222,7 @@ o suddivisa. Fattore bonus degli oggetti della regione: [BONUS] </text> <text name="Simulator primitive usage:"> - Uso dei Prim: + Uso delle primitive: </text> <text left="214" name="objects_available" width="230"> [COUNT] dei [MAX] ([AVAILABLE] dsponibili) diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml index d1e9c98e79..ca537efba9 100644 --- a/indra/newview/skins/default/xui/it/floater_map.xml +++ b/indra/newview/skins/default/xui/it/floater_map.xml @@ -24,6 +24,9 @@ <floater.string name="mini_map_northwest"> NO </floater.string> + <floater.string name="mini_map_caption"> + MINI MAPPA + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml index 4e926cedc9..cc9d42b3cb 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Gesture: [NAME] </floater.string> - <text name="name_text"> - Nome: - </text> <text name="desc_label"> Descrizione: </text> @@ -53,12 +50,15 @@ <button label="Su" name="up_btn"/> <button label="Giù" name="down_btn"/> <button label="Elimina" name="delete_btn"/> + <text name="options_text"> + (opzioni) + </text> <radio_group name="animation_trigger_type"> <radio_item label="Attiva" name="start"/> <radio_item label="Ferma" name="stop"/> </radio_group> <check_box label="finché le animazioni sono eseguite" left="226" name="wait_anim_check"/> - <check_box label="tempo in secondi" name="wait_time_check"/> + <check_box label="durata in secondi:" name="wait_time_check"/> <line_editor left_delta="114" name="wait_time_editor"/> <text name="help_label"> Tutte le fasi avvengono contemporaneamente, a meno che non aggiungi fasi di attesa. diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml index d2ba980f62..5bff19e8d7 100644 --- a/indra/newview/skins/default/xui/it/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml @@ -1,23 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="Istantanea" width="247"> +<floater name="Snapshot" title="ANTEPRIMA FOTOGRAFIA" width="247"> <floater.string name="unknown"> sconosciuto </floater.string> + <radio_group label="Tipo di fotografia" name="snapshot_type_radio"> + <radio_item label="E-mail" name="postcard"/> + <radio_item label="Il mio inventario (L$[AMOUNT])" name="texture"/> + <radio_item label="Salva sul mio computer" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] KB + </text> <button label="Aggiorna la fotografia" name="new_snapshot_btn"/> - <line_editor label="Descrizione" name="description"/> - <panel name="panel_snapshot_main"> - <button label="Condividi foto" name="share"/> - <button label="Salva foto" name="save"/> - <button label="Imposta come foto del profilo" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Condividi su Web" name="share_to_web"/> - <button label="Invia foto via e-mail" name="share_to_email"/> - <button label="Indietro" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="Salva nell'inventario" name="save_to_inventory"/> - <button label="Salva sul mio computer" name="save_to_computer"/> - <button label="Indietro" name="cancel_save"/> - </panel> + <button label="Invia" name="send_btn"/> + <button label="Salva ([AMOUNT] L$)" name="upload_btn"/> + <flyout_button label="Salva" name="save_btn" tool_tip="Salva immagine come file"> + <flyout_button.item label="Salva" name="save_item"/> + <flyout_button.item label="Salva con nome..." name="saveas_item"/> + </flyout_button> + <button label="Altro" name="more_btn" tool_tip="Opzioni Avanzate"/> + <button label="Meno" name="less_btn" tool_tip="Opzioni Avanzate"/> + <button label="Annulla" name="discard_btn"/> + <text name="type_label2"> + Dimensioni + </text> + <text name="format_label"> + Formato + </text> + <combo_box label="Risoluzione" name="postcard_size_combo"> + <combo_box.item label="Finestra attuale" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="Personalizza" name="Custom"/> + </combo_box> + <combo_box label="Risoluzione" name="texture_size_combo"> + <combo_box.item label="Finestra attuale" name="CurrentWindow"/> + <combo_box.item label="Piccola (128x128)" name="Small(128x128)"/> + <combo_box.item label="Media (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> + <combo_box.item label="Personalizza" name="Custom"/> + </combo_box> + <combo_box label="Risoluzione" name="local_size_combo"> + <combo_box.item label="Finestra attuale" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="Personalizza" name="Custom"/> + </combo_box> + <combo_box label="Formato" name="local_format_combo"> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> + </combo_box> + <spinner label="Larghezza" name="snapshot_width"/> + <spinner label="Altezza" name="snapshot_height"/> + <check_box label="Mantieni le proporzioni" name="keep_aspect_check"/> + <slider label="Qualità dell'immagine" name="image_quality_slider"/> + <text name="layer_type_label"> + Cattura: + </text> + <combo_box label="Layer dell'immagine" name="layer_types"> + <combo_box.item label="Colori" name="Colors"/> + <combo_box.item label="Profondità" name="Depth"/> + </combo_box> + <check_box label="Interfaccia" name="ui_check"/> + <check_box label="HUD" name="hud_check"/> + <check_box label="Tieni aperta dopo il salvataggio" name="keep_open_check"/> + <check_box label="Congela il frame (tutto schermo)" name="freeze_frame_check"/> + <check_box label="Aggiornamento automatico" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml index 202be752c9..4c440c45b6 100644 --- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE"> +<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE"> <string name="no_voice_effect"> (Nessuna manipolazione voce) </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> (Nuovo!) </string> + <text name="preview_text"> + Per l'anteprima + </text> <text name="status_text"> - Per ascoltare un'anteprima degli effetti di manipolazione della voce, clicca sul pulsante Registra per registrare un campione di voce, quindi fai clic su uno degli effetti per ascoltare il risultato. - -Per ricollegarti alla voce nei dintorni, chiudi la finestra. + Registra un campione di voce, quindi fai clic su un effetto per ascoltare il risultato. </text> - <button label="Registra campione" name="record_btn" tool_tip="Registra un campione della tua voce."/> + <button label="Registra" name="record_btn" tool_tip="Registra un campione della tua voce."/> <button label="Ferma" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL] Ottieni manipolazione voce] + [[URL] Subscribe Now] </text> <scroll_list name="voice_effect_list" tool_tip="Registra un campione della tua voce, quindi fai clic su uno degli effetti per un'anteprima del risultato."> - <scroll_list.columns label="Manipolazione voce" name="name"/> + <scroll_list.columns label="Nome effetto" name="name"/> <scroll_list.columns label="Scade il" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml index c480a2fe0e..fe5464b156 100644 --- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Tocca" name="Attachment Object Touch"/> <menu_item_call label="Modifica" name="Edit..."/> <menu_item_call label="Stacca" name="Detach"/> - <menu_item_call label="Lascia" name="Drop"/> <menu_item_call label="Alzati" name="Stand Up"/> <menu_item_call label="Cambia vestiario" name="Change Outfit"/> + <menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/> + <menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/> <menu_item_call label="I miei amici..." name="Friends..."/> <menu_item_call label="I miei gruppi" name="Groups..."/> <menu_item_call label="Il mio profilo" name="Profile..."/> <menu_item_call label="Debug delle texture" name="Debug..."/> + <menu_item_call label="Lascia" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml index 4e0caf832c..8166cf20ed 100644 --- a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="Indossa - Aggiungi al vestiario attuale" name="wear_add"/> <menu_item_call label="Togli - Rimuovi dal vestiario attuale" name="take_off"/> <menu_item_call label="Modifica vestiario" name="edit"/> - <menu_item_call label="Modifica nome" name="rename"/> + <menu_item_call label="Cambia nome del vestiario" name="rename"/> <menu_item_call label="Elimina vestito" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml new file mode 100644 index 0000000000..0beb9314de --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Mostra le coordinate" name="Show Coordinates"/> + <menu_item_check label="Mostra proprietà del lotto" name="Show Parcel Properties"/> + <menu_item_call label="Punto di riferimento" name="Landmark"/> + <menu_item_call label="Copia" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 693f4f158e..6290b79211 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -177,6 +177,7 @@ <menu_item_check label="Cerca" name="Search"/> <menu_item_call label="Rilascia tasti" name="Release Keys"/> <menu_item_call label="Imposta dimensioni dell'interfaccia sui valori predefiniti" name="Set UI Size to Default"/> + <menu_item_check label="Mostra menu Avanzato - tasti di scelta rapida esistenti" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Corri sempre" name="Always Run"/> <menu_item_check label="Vola" name="Fly"/> <menu_item_call label="Chiudi finestra" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml index 79ef188993..0173e8a66a 100644 --- a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Indossa" name="wear"/> + <menu_item_call label="Sostituisci" name="wear"/> <menu_item_call label="Aggiungi" name="wear_add"/> <menu_item_call label="Togli / Stacca" name="take_off_or_detach"/> <menu_item_call label="Stacca" name="detach"/> diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml new file mode 100644 index 0000000000..40eea8f03c --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Wearing"> + <menu_item_call label="Modifica vestiario" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml new file mode 100644 index 0000000000..48ff0a2160 --- /dev/null +++ b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Wearing"> + <menu_item_call label="Modifica vestiario" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 9f1472fc6f..67c5e29caf 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -613,8 +613,7 @@ Attese [VALIDS] Impossibile codificare il file: [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - Poiché non è possibile leggere i dati protetti, ora verranno ripristinati. - Ciò può succedere alla modifica delle impostazioni di rete. + Impossibile inserire nome utente e password. Ciò può succedere alla modifica delle impostazioni di rete. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml index de764d8025..b44c4c29e6 100644 --- a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Non hai diritti di modifica"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Modifica figura"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml index de764d8025..7667e95663 100644 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> + <button name="btn_delete" tool_tip="Rimuovi dal vestiario"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Non hai diritti di modifica"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Modifica questo capo"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml index 91d90a5660..cbcaa0689a 100644 --- a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="Rimuovi dal vestiario"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml index 6af84de0c7..eb3af5f2a5 100644 --- a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="dummy_clothing_item"> <text name="item_name" value="..."/> + <panel name="btn_add_panel"> + <button name="btn_add" tool_tip="Aggiungi altri capi di questo tipo"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml index 5eaae828d8..19456281bb 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> Tatuaggio: </string> + <labeled_back_button label="Salva" name="back_btn" tool_tip="Torna alla modifica del vestiario"/> <text name="edit_wearable_title" value="Modifica della figura corporea"/> <panel label="Camicia" name="wearable_type_panel"> <text name="description_text" value="Figura corporea:"/> @@ -102,6 +103,6 @@ </panel> <panel name="button_panel"> <button label="Salva con nome" name="save_as_button"/> - <button label="Ripristina" name="revert_button"/> + <button label="Annulla modifiche" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml index 57168096d5..54f03dfa65 100644 --- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="Tutto"/> <string name="Filter.Clothes/Body" value="Abiti/corpo"/> <string name="Filter.Objects" value="Oggetti"/> - <string name="Filter.Custom" value="Filtro personalizzato"/> + <string name="Filter.Clothing" value="Vestiario"/> + <string name="Filter.Bodyparts" value="Parti del corpo"/> + <string name="replace_body_part" value="Fai clic per sostituire la forma corporea esistente"/> <text name="title" value="Modifica vestiario"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -25,7 +27,7 @@ <layout_panel label="Pannello di controllo IM" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="Aggiungi altri..." name="show_add_wearables_btn"/> + <button label="Aggiungi altri..." name="show_add_wearables_btn" tool_tip="Apri/chiudi"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="Filtra capi da indossare dell'inventario" name="look_item_filter"/> @@ -36,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="Salva" name="save_btn"/> - <button label="Ripristina" name="revert_btn"/> + <button label="Annulla modifiche" name="revert_btn" tool_tip="Ripristina l'ultima versione salvata"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml index 8f8f7a25f4..7027e9d733 100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> - <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> + <dnd_button name="trash_btn" tool_tip="Elimina il vestiario selezionato"/> <button label="Salva con nome" name="save_btn"/> <button label="Indossa" name="wear_btn" tool_tip="Indossa il vestiario selezionato"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml index 37857473aa..71980695b6 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml @@ -49,10 +49,7 @@ m </text> <slider label="Conteggio massimo particelle:" name="MaxParticleCount"/> - <slider label="Distanza visual. max avatar:" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="N. max di avatar non impostori:" name="MaxNumberAvatarDrawn"/> <slider label="Qualità in post-produzione:" name="RenderPostProcess"/> <text name="MeshDetailText"> Dettagli reticolo: diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml index 78ce1ff24a..b43f766e5e 100644 --- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/it/panel_voice_effect.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_voice_effect"> <string name="no_voice_effect"> - Nessuna manipolazione voce + Disattiva manipolazione voce </string> <string name="preview_voice_effects"> Anteprima manipolazione voce ▶ @@ -9,7 +9,7 @@ <string name="get_voice_effects"> Ottieni manipolazione voce ▶ </string> - <combo_box name="voice_effect" tool_tip="Scegli un effetto di manipolazione per modificare il suono della tua voce."> - <combo_box.item label="Nessuna manipolazione voce" name="no_voice_effect"/> + <combo_box name="voice_effect" tool_tip="Scegli un effetto di manipolazione per modificare il suono della tua voce"> + <combo_box.item label="Disattiva manipolazione voce" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml index df25772ffb..220a6f84af 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml @@ -3,12 +3,14 @@ <string name="No Outfit" value="Nessun vestiario"/> <string name="Unsaved Changes" value="Modifiche non salvate"/> <string name="Now Wearing" value="Abbigliamento attuale..."/> + <string name="Changing outfits" value="Cambio vestiti"/> <panel name="panel_currentlook"> <button label="M" name="editappearance_btn"/> <button label="A" name="openoutfit_btn"/> <text name="currentlook_status"> (Stato) </text> + <button label="" name="edit_outfit_btn" tool_tip="Modifica questo vestiario"/> </panel> <filter_editor label="Filtri per il vestiario" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml index e1ad1452ff..9886cbcf04 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Profilo dell'oggetto"> +<panel name="item properties" title="Profilo articolo"> <panel.string name="unknown"> (sconosciuto) </panel.string> @@ -15,7 +15,7 @@ <panel.string name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <text name="title" value="Profilo dell'oggetto"/> + <text name="title" value="Profilo articolo"/> <text name="where" value="(Inventario)"/> <panel label=""> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index d601c27d28..03747abb59 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -303,6 +303,9 @@ <string name="ReleaseNotes"> Note sulla versione </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> In caricamento... </string> @@ -849,6 +852,9 @@ <string name="invalid"> non valido </string> + <string name="none"> + nessuno + </string> <string name="shirt_not_worn"> Camicia non indossata </string> diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 79e211c31e..0676e86703 100644 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml @@ -27,6 +27,9 @@ <floater.string name="ToolTipMsg"> [AGENT][REGION] （ダブルクリックで地図を開きます） </floater.string> + <floater.string name="mini_map_caption"> + ミニマップ + </floater.string> <text label="北" name="floater_map_north" text="北"> 北 </text> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml index 64c577b879..88e67862c8 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> ジェスチャー： [NAME] </floater.string> - <text name="name_text"> - 名前： - </text> <text name="desc_label"> 説明： </text> @@ -53,12 +50,15 @@ <button label="上" name="up_btn"/> <button label="下" name="down_btn"/> <button label="削除" name="delete_btn"/> + <text name="options_text"> + （オプション） + </text> <radio_group name="animation_trigger_type"> <radio_item label="開始" name="start"/> <radio_item label="停止" name="stop"/> </radio_group> <check_box label="アニメーションが完了するまで" name="wait_anim_check"/> - <check_box label="秒表示の時間" name="wait_time_check"/> + <check_box label="時間（秒）：" name="wait_time_check"/> <text name="help_label"> 待機ステップを入れない限りは、すべてのステップが同時に起こります。 </text> diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index c6e315fe48..05a10f9f6d 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -1,23 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="スナップショット"> +<floater name="Snapshot" title="スナップショットのプレビュー"> <floater.string name="unknown"> 不明 </floater.string> + <radio_group label="スナップショットの種類" name="snapshot_type_radio"> + <radio_item label="メール" name="postcard"/> + <radio_item label="持ち物（L$[AMOUNT]）" name="texture"/> + <radio_item label="コンピューターに保存" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] キロバイト + </text> <button label="スナップショットを更新" name="new_snapshot_btn"/> - <line_editor label="説明" name="description"/> - <panel name="panel_snapshot_main"> - <button label="共有" name="share"/> - <button label="保存" name="save"/> - <button label="プロフィールに設定" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Web で共有" name="share_to_web"/> - <button label="スナップショットをメール" name="share_to_email"/> - <button label="戻る" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="「持ち物」に保存" name="save_to_inventory"/> - <button label="コンピューターに保存" name="save_to_computer"/> - <button label="戻る" name="cancel_save"/> - </panel> + <button label="送信" name="send_btn"/> + <button label="保存（L$[AMOUNT]）" name="upload_btn"/> + <flyout_button label="保存" name="save_btn" tool_tip="画像をファイルに保存"> + <flyout_button.item label="保存" name="save_item"/> + <flyout_button.item label="別名で保存..." name="saveas_item"/> + </flyout_button> + <button label="詳細" name="more_btn" tool_tip="詳しい設定"/> + <button label="簡易" name="less_btn" tool_tip="詳しい設定"/> + <button label="取り消し" name="discard_btn"/> + <text name="type_label2"> + サイズ + </text> + <text name="format_label"> + 書式 + </text> + <combo_box label="解像度" name="postcard_size_combo"> + <combo_box.item label="現在のウィンドウ" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="カスタム" name="Custom"/> + </combo_box> + <combo_box label="解像度" name="texture_size_combo"> + <combo_box.item label="現在のウィンドウ" name="CurrentWindow"/> + <combo_box.item label="小（128x128）" name="Small(128x128)"/> + <combo_box.item label="中（256x256）" name="Medium(256x256)"/> + <combo_box.item label="大（512x512）" name="Large(512x512)"/> + <combo_box.item label="カスタム" name="Custom"/> + </combo_box> + <combo_box label="解像度" name="local_size_combo"> + <combo_box.item label="現在のウィンドウ" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="カスタム" name="Custom"/> + </combo_box> + <combo_box label="書式" name="local_format_combo"> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> + </combo_box> + <spinner label="幅" name="snapshot_width"/> + <spinner label="高さ" name="snapshot_height"/> + <check_box label="縦横比の固定" name="keep_aspect_check"/> + <slider label="画質" name="image_quality_slider"/> + <text name="layer_type_label"> + キャプチャ： + </text> + <combo_box label="画像レイヤー" name="layer_types"> + <combo_box.item label="色" name="Colors"/> + <combo_box.item label="深度" name="Depth"/> + </combo_box> + <check_box label="インターフェース" name="ui_check"/> + <check_box label="HUD" name="hud_check"/> + <check_box label="保存後もこのまま" name="keep_open_check"/> + <check_box label="画面全体を静止" name="freeze_frame_check"/> + <check_box label="自動更新" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml index dd7294718c..4557815129 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー"> +<floater label="場所" name="voice_effects" title="ボイスモーフィング"> <string name="no_voice_effect"> （ボイスモーフィングなし） </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> （新登場！） </string> + <text name="preview_text"> + プレビュー + </text> <text name="status_text"> - ボイスモーフィングをプレビューしてエフェクトを確かめるには、録音ボタンを押してご自分の声を少し録音してから、リストにあるボイスモーフィングを1つクリックします。 - -このウインドウを閉じると、「近くのボイスチャット」に再接続されます。 + 声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。 </text> - <button label="声を録音" name="record_btn" tool_tip="あなたの声を録音します。"/> + <button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/> <button label="停止" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL]ボイスモーフィングを取得] + [[URL] 今すぐ申し込む] </text> <scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。"> - <scroll_list.columns label="ボイスモーフィング" name="name"/> + <scroll_list.columns label="ボイス名" name="name"/> <scroll_list.columns label="有効期限" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml index 48200cb53f..6b1319e584 100644 --- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="触る" name="Attachment Object Touch"/> <menu_item_call label="編集" name="Edit..."/> <menu_item_call label="取り外す" name="Detach"/> - <menu_item_call label="下に落とす" name="Drop"/> <menu_item_call label="立ち上がる" name="Stand Up"/> <menu_item_call label="アウトフィットを変更" name="Change Outfit"/> + <menu_item_call label="アウトフィットの編集" name="Edit Outfit"/> + <menu_item_call label="シェイプの編集" name="Edit My Shape"/> <menu_item_call label="フレンド" name="Friends..."/> <menu_item_call label="グループ" name="Groups..."/> <menu_item_call label="プロフィール" name="Profile..."/> <menu_item_call label="テクスチャのデバッグ" name="Debug..."/> + <menu_item_call label="下に落とす" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml index 8f4b61b702..9491c22f31 100644 --- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/> <menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/> <menu_item_call label="アウトフィットの編集" name="edit"/> - <menu_item_call label="名前の変更" name="rename"/> + <menu_item_call label="アウトフィットの名前を変更する" name="rename"/> <menu_item_call label="アウトフィットを削除する" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml new file mode 100644 index 0000000000..1a67a2a8f7 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="座標を表示" name="Show Coordinates"/> + <menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/> + <menu_item_call label="ランドマーク" name="Landmark"/> + <menu_item_call label="コピー" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 1573177914..7c4912fa07 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -178,6 +178,7 @@ <menu_item_check label="検索" name="Search"/> <menu_item_call label="キーをリリース" name="Release Keys"/> <menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/> + <menu_item_check label="アドバンスメニューを表示 - レガシーのショートカット" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="常に走る" name="Always Run"/> <menu_item_check label="飛行する" name="Fly"/> <menu_item_call label="ウィンドウを閉じる" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml index 0d8049bc0a..13bfb09f5f 100644 --- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="着る" name="wear"/> + <menu_item_call label="交換" name="wear"/> <menu_item_call label="追加" name="wear_add"/> <menu_item_call label="取り外す" name="take_off_or_detach"/> <menu_item_call label="取り外す" name="detach"/> diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml new file mode 100644 index 0000000000..f79b59ee05 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Wearing"> + <menu_item_call label="アウトフットの編集" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml new file mode 100644 index 0000000000..1336df94b0 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Wearing"> + <menu_item_call label="アウトフットの編集" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 42f8ccbb32..e1c434b6b3 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -638,8 +638,7 @@ L$ が不足しているのでこのグループに参加することができ 次のファイルのエンコードができません： [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - 保護されているデータを読みとることが出来ないためリセットされます。 - ネットワーク設定を変更すると起こることがあります。 + ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml index de764d8025..95a5a26d4e 100644 --- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="これを編集する権限がありません"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="このシェイプを編集"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml index de764d8025..158b2fa6ac 100644 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> + <button name="btn_delete" tool_tip="アウトフィットから取り除く"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="これを編集する権限がありません"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="この着用物を編集"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml index 91d90a5660..a1e30283ee 100644 --- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="アウトフィットから取り除く"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml index 6af84de0c7..0395d4edd8 100644 --- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="dummy_clothing_item"> <text name="item_name" value="..."/> + <panel name="btn_add_panel"> + <button name="btn_add" tool_tip="この種類のアイテムを追加する"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml index d63f047728..426f738b33 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> タトゥ： </string> + <labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る"/> <text name="edit_wearable_title" value="シェイプを編集中"/> <panel label="シャツ" name="wearable_type_panel"> <text name="description_text" value="シェイプ："/> @@ -102,6 +103,6 @@ </panel> <panel name="button_panel"> <button label="別名で保存" name="save_as_button"/> - <button label="元に戻す" name="revert_button"/> + <button label="変更を元に戻す" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index bfe69cbdd9..a1bfb67823 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml @@ -48,7 +48,7 @@ <spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/> <combo_box name="group_mature_check" tool_tip="あなたのグループに「Moderate」にレート設定された情報があるかどうかを設定します"> <combo_item name="select_mature"> - - レーティングの選択 - + - レーティング区分を指定 - </combo_item> <combo_box.item label="「Moderate」コンテンツ" name="mature"/> <combo_box.item label="「General」コンテンツ" name="pg"/> diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml index 30b2c078d5..48b17e4818 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="すべて"/> <string name="Filter.Clothes/Body" value="衣類/身体"/> <string name="Filter.Objects" value="オブジェクト"/> - <string name="Filter.Custom" value="フィルターのカスタマイズ"/> + <string name="Filter.Clothing" value="衣類"/> + <string name="Filter.Bodyparts" value="身体部位"/> + <string name="replace_body_part" value="クリックして既存のシェイプと置き換える"/> <text name="title" value="アウトフットの編集"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -25,7 +27,7 @@ <layout_panel label="IM コントロールパネル" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="さらに追加..." name="show_add_wearables_btn"/> + <button label="さらに追加..." name="show_add_wearables_btn" tool_tip="開く／閉じる"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="持ち物の着用物をフィルター" name="look_item_filter"/> @@ -36,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="保存" name="save_btn"/> - <button label="元に戻す" name="revert_btn"/> + <button label="変更を元に戻す" name="revert_btn" tool_tip="前回保存された状態に戻す"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml index 27bb224c18..9588cf529a 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="その他のオプションを表示します"/> - <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/> + <dnd_button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/> <button label="別名で保存" name="save_btn"/> <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用します"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml index 75de773366..8a50581075 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml @@ -49,10 +49,7 @@ m </text> <slider label="最大パーティクル数：" name="MaxParticleCount"/> - <slider label="アバター最大描画距離：" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="簡略化せずに描画するアバターの最大数：" name="MaxNumberAvatarDrawn"/> <slider label="ポストプロセス品質：" name="RenderPostProcess"/> <text name="MeshDetailText"> メッシュ詳細： diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml index d787d6ff23..530f0fb59d 100644 --- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml @@ -9,7 +9,7 @@ <string name="get_voice_effects"> ボイスモーフィングを取得 ▶ </string> - <combo_box name="voice_effect" tool_tip="ボイスモーフィング効果を選択して、音声を変更します。"> + <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択して音声を変更"> <combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml index c453699c57..30cef9ccc0 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml @@ -3,6 +3,7 @@ <string name="No Outfit" value="アウトフィットなし"/> <string name="Unsaved Changes" value="保存されていない変更"/> <string name="Now Wearing" value="着用しています..."/> + <string name="Changing outfits" value="アウトフィットの変更"/> <panel name="panel_currentlook"> <button label="E" name="editappearance_btn"/> <button label="O" name="openoutfit_btn"/> @@ -12,6 +13,7 @@ <text name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> + <button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/> </panel> <filter_editor label="アウトフィットをフィルター" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml index c6a13fa212..584524e3b1 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="オブジェクトのプロフィール"> +<panel name="item properties" title="アイテムのプロフィール"> <panel.string name="unknown"> （不明） </panel.string> @@ -15,7 +15,7 @@ <panel.string name="acquiredDate"> [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] </panel.string> - <text name="title" value="オブジェクトのプロフィール"/> + <text name="title" value="アイテムのプロフィール"/> <text name="where" value="（持ち物）"/> <panel label=""> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 8948722bf3..bf8541a73d 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -309,6 +309,9 @@ <string name="ReleaseNotes"> リリースノート </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> ローディング... </string> @@ -864,6 +867,9 @@ <string name="invalid"> 無効 </string> + <string name="none"> + なし + </string> <string name="shirt_not_worn"> シャツ未着用 </string> diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index f8e4e76752..6f09a5e383 100644 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml @@ -24,6 +24,9 @@ <floater.string name="mini_map_northwest"> NO </floater.string> + <floater.string name="mini_map_caption"> + MINIMAPA + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index 48f27f1968..364638780a 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Gesto: [NAME] </floater.string> - <text name="name_text"> - Nome: - </text> <text name="desc_label"> Descrição: </text> @@ -54,12 +51,15 @@ <button label="P/ cima" left_delta="-13" name="up_btn" width="114"/> <button label="P/ baixo" name="down_btn" width="114"/> <button label="Remover" left_delta="13" name="delete_btn" width="84"/> + <text name="options_text"> + (opções) + </text> <radio_group name="animation_trigger_type"> <radio_item label="OK" name="start"/> <radio_item label="Pare" name="stop"/> </radio_group> <check_box bottom_delta="34" label="até que as animações estejam concluídas" name="wait_anim_check"/> - <check_box bottom_delta="-30" label="tempo em segundos" name="wait_time_check"/> + <check_box bottom_delta="-30" label="segundos:" name="wait_time_check"/> <line_editor left_delta="130" name="wait_time_editor"/> <text name="help_label"> Se não incluir etapas de espera, todas as etapas ocorrem ao mesmo tempo. diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml index 1d86b0d413..d62fe3dd20 100644 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml @@ -1,23 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="Foto"> +<floater name="Snapshot" title="VISUALIZAR FOTO"> <floater.string name="unknown"> desconhecido </floater.string> + <radio_group label="Tipo de foto" name="snapshot_type_radio"> + <radio_item label="Email" name="postcard"/> + <radio_item label="Meu inventário (L$[AMOUNT])" name="texture"/> + <radio_item label="Salvar no meu PC" name="local"/> + </radio_group> + <text name="file_size_label"> + [TAMANHO] KB + </text> <button label="Atualizar a foto" name="new_snapshot_btn"/> - <line_editor label="Descrição" name="description"/> - <panel name="panel_snapshot_main"> - <button label="Compartilhar foto" name="share"/> - <button label="Salvar foto" name="save"/> - <button label="Usar como foto do perfil" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Compartilhar na web" name="share_to_web"/> - <button label="Enviar foto por email" name="share_to_email"/> - <button label="Atrás" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="Salvar no meu inventário" name="save_to_inventory"/> - <button label="Salvar no meu PC" name="save_to_computer"/> - <button label="Atrás" name="cancel_save"/> - </panel> + <button label="Enviar" name="send_btn"/> + <button label="Economize (L$[AMOUNT])" name="upload_btn"/> + <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo"> + <flyout_button.item label="Salvar" name="save_item"/> + <flyout_button.item label="Salvar como..." name="saveas_item"/> + </flyout_button> + <button label="Mais" name="more_btn" tool_tip="Opções avançadas"/> + <button label="Menos" name="less_btn" tool_tip="Opções avançadas"/> + <button label="Cancelar" name="discard_btn"/> + <text name="type_label2"> + Tamanho + </text> + <text name="format_label"> + Formato + </text> + <combo_box label="Resolução" name="postcard_size_combo"> + <combo_box.item label="Janela atual" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="Customizado" name="Custom"/> + </combo_box> + <combo_box label="Resolução" name="texture_size_combo"> + <combo_box.item label="Janela atual" name="CurrentWindow"/> + <combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/> + <combo_box.item label="Médio (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> + <combo_box.item label="Customizado" name="Custom"/> + </combo_box> + <combo_box label="Resolução" name="local_size_combo"> + <combo_box.item label="Janela atual" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="Customizado" name="Custom"/> + </combo_box> + <combo_box label="Formato" name="local_format_combo"> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> + </combo_box> + <spinner label="Largura" name="snapshot_width"/> + <spinner label="Altura" name="snapshot_height"/> + <check_box label="Limitar proproções" name="keep_aspect_check"/> + <slider label="Qualidade da imagem" name="image_quality_slider"/> + <text name="layer_type_label"> + Capturar: + </text> + <combo_box label="Camadas da imagem" name="layer_types"> + <combo_box.item label="Cores" name="Colors"/> + <combo_box.item label="Profundidade" name="Depth"/> + </combo_box> + <check_box label="Interface" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> + <check_box label="Deixar aberto depois de salvo" name="keep_open_check"/> + <check_box label="Gerar quadro (tela inteira)" name="freeze_frame_check"/> + <check_box label="Atualizar" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml index 4bc8575588..b9f9677833 100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="voice_effects" title="CHECAR DISTORÇÃO DE VOZ"> +<floater label="Lugares" name="voice_effects" title="DISTORCENDO VOZ"> <string name="no_voice_effect"> (Não distorcer voz) </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> (Novo!) </string> + <text name="preview_text"> + Visualizar + </text> <text name="status_text"> - Para ouvir um efeito de Distorção de voz, clique no botão Gravar, grave alguns instantes de voz, depois clique em Distorcer voz na lista para ouvir o resultado. - -Para reconectar à Voz local, basta fechar esta janela. + Grave uma amostra da sua voz, depois clique em um efeito para ouvir o resultado. </text> - <button label="Gravar amostra" name="record_btn" tool_tip="Grave uma amostra da sua voz."/> + <button label="Gravar" name="record_btn" tool_tip="Grave uma amostra da sua voz."/> <button label="Parar" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL] Distorcer voz] + [[URL] Assine agora] </text> <scroll_list name="voice_effect_list" tool_tip="Grave sua voz por alguns instantes, depois clique num efeito para ouvir a distorção."> - <scroll_list.columns label="Distorcer voz" name="name"/> + <scroll_list.columns label="Nome da voz" name="name"/> <scroll_list.columns label="Vence em" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml index 5cb1b211cf..65070f821a 100644 --- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Tocar" name="Attachment Object Touch"/> <menu_item_call label="Editar" name="Edit..."/> <menu_item_call label="Tirar" name="Detach"/> - <menu_item_call label="Largar" name="Drop"/> <menu_item_call label="Ficar de pé" name="Stand Up"/> <menu_item_call label="Trocar de look" name="Change Outfit"/> + <menu_item_call label="Editar meu look" name="Edit Outfit"/> + <menu_item_call label="Editar meu corpo" name="Edit My Shape"/> <menu_item_call label="Meus amigos" name="Friends..."/> <menu_item_call label="Meus grupos" name="Groups..."/> <menu_item_call label="Meu perfil" name="Profile..."/> <menu_item_call label="Depurar texturas" name="Debug..."/> + <menu_item_call label="Largar" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml index 7c30e8ac55..8db5e405b3 100644 --- a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="Vestir - Sem tirar look atual" name="wear_add"/> <menu_item_call label="Tirar - Tirar do look atual" name="take_off"/> <menu_item_call label="Editar look" name="edit"/> - <menu_item_call label="Renomear" name="rename"/> + <menu_item_call label="Renomear look" name="rename"/> <menu_item_call label="Excluir visual" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml new file mode 100644 index 0000000000..d9347950b1 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Mostrar coordenadas" name="Show Coordinates"/> + <menu_item_check label="Mostrar as propriedades do terreno" name="Show Parcel Properties"/> + <menu_item_call label="Marco" name="Landmark"/> + <menu_item_call label="Copiar" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 5a5a418370..d9ff847647 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -177,6 +177,7 @@ <menu_item_check label="Busca" name="Search"/> <menu_item_call label="Soltar objeto" name="Release Keys"/> <menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/> + <menu_item_check label="Mostrar menu avançado - atalho antigo" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Correr sempre" name="Always Run"/> <menu_item_check label="Voar" name="Fly"/> <menu_item_call label="Fechar janela" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml index dbf942796c..1874837d65 100644 --- a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Vestir" name="wear"/> + <menu_item_call label="Trocar" name="wear"/> <menu_item_call label="Adicionar" name="wear_add"/> <menu_item_call label="Tirar / Separar" name="take_off_or_detach"/> <menu_item_call label="Separar" name="detach"/> diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml new file mode 100644 index 0000000000..c0387f491a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Wearing"> + <menu_item_call label="Editar look" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml new file mode 100644 index 0000000000..5b62d9578c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Wearing"> + <menu_item_call label="Editar look" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 4a738bf0ea..1e517a5dc5 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -609,8 +609,7 @@ Esperada [VALIDS] Impossível codificar o arquivo: [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - Não foi possível fazer a leitura dos dados protegidos, redefinindo. - Isso pode ocorrer após mudanças na configuração da rede. + Não podemos preencher seu nome e senha. Isso pode ocorrer após mudanças na configuração da rede <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml index de764d8025..87a2e1674d 100644 --- a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Você não está autorizado a editar isso."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Editar esta forma"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml index de764d8025..4b45a49f74 100644 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="wearable_item"> + <button name="btn_delete" tool_tip="Tirar do look"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Você não está autorizado a editar isso."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Editar este acessório"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml index 91d90a5660..7ca5e23981 100644 --- a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="Tirar do look"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml index 6af84de0c7..3dfb5a0a16 100644 --- a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="dummy_clothing_item"> <text name="item_name" value="..."/> + <panel name="btn_add_panel"> + <button name="btn_add" tool_tip="Adicionar mais itens deste tipo"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml index e921dd1bea..9890d26d35 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> Tatuagem: </string> + <labeled_back_button label="Salvar" name="back_btn" tool_tip="Voltar à edição de look"/> <text name="edit_wearable_title" value="Editando forma"/> <panel label="Camisa" name="wearable_type_panel"> <text name="description_text" value="Forma:"/> @@ -102,6 +103,6 @@ </panel> <panel name="button_panel"> <button label="Salvar como" name="save_as_button"/> - <button label="Reverter" name="revert_button"/> + <button label="Desfazer mudanças" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index 6060f23bba..b634ec3f64 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml @@ -48,7 +48,7 @@ Para obter mais ajuda, passe o mouse sobre as opções. <spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção 'Taxa de associação' estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/> <combo_box name="group_mature_check" tool_tip="Define se os dados do seu grupo são conteúdo moderado." width="170"> <combo_item name="select_mature"> - - Selecione Maduro - + - Selecione o nível de maturidade - </combo_item> <combo_box.item label="Conteúdo Mature" name="mature"/> <combo_box.item label="Conteúdo PG" name="pg"/> diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml index bbf5b397c3..74aec1cbd2 100644 --- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="Tudo"/> <string name="Filter.Clothes/Body" value="Roupas/Corpo"/> <string name="Filter.Objects" value="Objects"/> - <string name="Filter.Custom" value="Filtro personalizado"/> + <string name="Filter.Clothing" value="Vestuário"/> + <string name="Filter.Bodyparts" value="Corpo"/> + <string name="replace_body_part" value="Clique para substituir sua forma atual"/> <text name="title" value="Editar look"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -25,7 +27,7 @@ <layout_panel label="Painel de controle de MIs" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="Adicionar mais..." name="show_add_wearables_btn"/> + <button label="Adicionar mais..." name="show_add_wearables_btn" tool_tip="Abrir/Fechar"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="Filtrar itens de vestuário" name="look_item_filter"/> @@ -36,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="Salvar" name="save_btn"/> - <button label="Reverter" name="revert_btn"/> + <button label="Desfazer mudanças" name="revert_btn" tool_tip="Voltar à versão salva anterior"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml index 10ef2a332f..f4b680fd8f 100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> - <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/> + <dnd_button name="trash_btn" tool_tip="Excluir look selecionado"/> <button label="Salvar como" name="save_btn"/> <button label="Vestir" name="wear_btn" tool_tip="Vestir look selecionado"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml index ccf213099e..c24cc96d3b 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml @@ -50,10 +50,7 @@ rápido m </text> <slider label="Contador máx. de partículas:" name="MaxParticleCount"/> - <slider label="Distância máx. desenho avatar:" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="Máx. de avatares legítimos:" name="MaxNumberAvatarDrawn"/> <slider label="Qualidade de Pós-processamento:" name="RenderPostProcess"/> <text name="MeshDetailText"> Detalhes de Malha: diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml index 08e89f46f9..1d7878408a 100644 --- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_voice_effect"> <string name="no_voice_effect"> - Não distorcer voz + Distorção de voz desligada </string> <string name="preview_voice_effects"> Checar distorção de voz ▶ @@ -10,6 +10,6 @@ Distorcer voz ▶ </string> <combo_box name="voice_effect" tool_tip="Selecione um efeito de distorção para mudar sua voz."> - <combo_box.item label="Não distorcer voz" name="no_voice_effect"/> + <combo_box.item label="Distorção de voz desligada" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml index f075f45b8f..a5048e63b2 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml @@ -3,12 +3,14 @@ <string name="No Outfit" value="Nenhum"/> <string name="Unsaved Changes" value="Mudanças não salvas"/> <string name="Now Wearing" value="Look atual..."/> + <string name="Changing outfits" value="Mudando de look"/> <panel name="panel_currentlook"> <button label="E" name="editappearance_btn"/> <button label="O" name="openoutfit_btn"/> <text name="currentlook_status"> (Status) </text> + <button label="" name="edit_outfit_btn" tool_tip="Editar este look"/> </panel> <filter_editor label="Filtrar looks" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml index 4fc50bac67..92895b1043 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Perfil do objeto"> +<panel name="item properties" title="Perfil do item"> <panel.string name="unknown"> (desconhecido) </panel.string> @@ -15,7 +15,7 @@ <panel.string name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <text name="title" value="Perfil do objeto"/> + <text name="title" value="Perfil do item"/> <text name="where" value="(Inventário)"/> <panel label=""> <text name="LabelItemNameTitle"> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 80f52dfe46..74ba7888e9 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -297,6 +297,9 @@ <string name="ReleaseNotes"> Notas de versão </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> Carregando... </string> @@ -843,6 +846,9 @@ <string name="invalid"> Inválido </string> + <string name="none"> + nenhum + </string> <string name="shirt_not_worn"> Camisa não vestida </string> |