diff options
Diffstat (limited to 'indra/newview/skins/default')
365 files changed, 4000 insertions, 1621 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 592bda63d2..2098ad1a39 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -97,6 +97,9 @@ <!-- UI Definitions --> <color + name="AccordionHeaderTextColor" + reference="LtGray" /> + <color name="AgentChatColor" reference="White" /> <color @@ -678,6 +681,9 @@ name="ScrollbarTrackColor" reference="Black" /> <color + name="SelectedOutfitTextColor" + reference="EmphasisColor" /> + <color name="SilhouetteChildColor" value="0.13 0.42 0.77 1" /> <color diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png Binary files differindex d7e0001dc6..9d091fed44 100644 --- a/indra/newview/skins/default/textures/icons/Shop.png +++ b/indra/newview/skins/default/textures/icons/Shop.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2f258c96e7..a05382aac5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -68,9 +68,9 @@ with the same filename but different name <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" /> - <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" /> - <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" /> - <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" /> + <texture name="BackButton_Off" file_name="icons/back_arrow_off.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> + <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> + <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" /> <texture name="Blank" file_name="Blank.png" preload="false" /> @@ -582,6 +582,10 @@ with the same filename but different name <texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" /> <texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" /> <texture name="scrollbutton_right_in_blue.tga" file_name="widgets/ScrollArrow_Right_Over_Opaque.png" /> + <texture name="scrollbutton_up_out_blue.tga" file_name="widgets/ScrollArrow_Up_Opaque.png" /> + <texture name="scrollbutton_up_in_blue.tga" file_name="widgets/ScrollArrow_Up_Over_Opaque.png" /> + <texture name="scrollbutton_down_out_blue.tga" file_name="widgets/ScrollArrow_Down_Opaque.png" /> + <texture name="scrollbutton_down_in_blue.tga" file_name="widgets/ScrollArrow_Down_Over_Opaque.png" /> <texture name="up_arrow.tga" file_name="up_arrow.png" /> <texture name="down_arrow.tga" file_name="down_arrow.png" /> diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png Binary files differnew file mode 100644 index 0000000000..a396380fb2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png Binary files differnew file mode 100644 index 0000000000..9568dea78a --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png Binary files differnew file mode 100644 index 0000000000..67a7a5568b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png Binary files differnew file mode 100644 index 0000000000..0cc8c4404b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index 053fe4d9d9..a096a87928 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -219,7 +219,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel Region objekt bonus faktor: [BONUS] </text> <text name="Simulator primitive usage:"> - Prim forbrug: + Prim benyttelse: </text> <text name="objects_available"> [COUNT] ud af [MAX] ([AVAILABLE] ledige) diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml index 37e3307960..a1b98ec4ce 100644 --- a/indra/newview/skins/default/xui/da/floater_camera.xml +++ b/indra/newview/skins/default/xui/da/floater_camera.xml @@ -9,35 +9,28 @@ <floater.string name="move_tooltip"> Flyt kamera op og ned, til venstre og højre </floater.string> - <floater.string name="orbit_mode_title"> - Kredsløb + <floater.string name="camera_modes_title"> + Kamera valg </floater.string> <floater.string name="pan_mode_title"> - Panorér + Kredsløb zoom panorering </floater.string> - <floater.string name="avatar_view_mode_title"> + <floater.string name="presets_mode_title"> Forvalg </floater.string> <floater.string name="free_mode_title"> Se objekt </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, til venstre og højre"/> <panel name="zoom" tool_tip="Zoom kamera mod fokus"> + <joystick_rotate name="cam_rotate_stick" tool_tip="Kamera kredser rundt om fokus"/> <slider_bar name="zoom_slider" tool_tip="Zoom kamera mod fokus"/> - </panel> - <joystick_rotate name="cam_rotate_stick" tool_tip="Kreds kamera omkring fokus"/> - <panel name="camera_presets"> - <button name="rear_view" tool_tip="Se bagfra"/> - <button name="group_view" tool_tip="Se som gruppe"/> - <button name="front_view" tool_tip="Se forfra"/> - <button name="mouselook_view" tool_tip="Førsteperson"/> + <joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, venstre og højre"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="Rotér kamera"/> - <button label="" name="pan_btn" tool_tip="Panorér kamera"/> - <button label="" name="avatarview_btn" tool_tip="Forvalg"/> - <button label="" name="freecamera_btn" tool_tip="Se objekt"/> + <button label="" name="presets_btn" tool_tip="Forvalg"/> + <button label="" name="pan_btn" tool_tip="Kredsløb zoom panorering"/> + <button label="" name="avatarview_btn" tool_tip="Kamera valg"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml index 2349174db2..7a3c3e466a 100644 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml @@ -16,7 +16,13 @@ har sluttet sig til stemme chat opkald med en konference chat. </floater.string> <floater.string name="VoiceInviteGroup"> - deltager nu i Stemme chat opkald med denne gruppe [GROUP]. + netop tilsuttet stemme kanal for '[GROUP]'. + </floater.string> + <floater.string name="VoiceInviteQuestionGroup"> + Ønsker du at forlade [CURRENT_CHAT] og tilsutte dig kald med '[GROUP]'? + </floater.string> + <floater.string name="VoiceInviteQuestionDefault"> + Ønsker du at forlade [CURRENT_CHAT] og tilslutte dig denne stemmechat? </floater.string> <text name="question"> Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat? diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index cd6c03058b..c331908c3c 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -24,6 +24,9 @@ <floater.string name="mini_map_northwest"> NV </floater.string> + <floater.string name="mini_map_caption"> + MINIKORT + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index f49fd8c99a..a26f2f95c9 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Bevægelse: [NAME] </floater.string> - <text name="name_text"> - Navn: - </text> <text name="desc_label"> Beskrivelse: </text> @@ -53,12 +50,15 @@ <button label="Op" name="up_btn"/> <button label="Ned" name="down_btn"/> <button label="Fjern" name="delete_btn"/> + <text name="options_text"> + (valg) + </text> <radio_group name="animation_trigger_type"> <radio_item label="Start" name="start"/> <radio_item label="Stop" name="stop"/> </radio_group> <check_box label="Indtil animation er færdig" name="wait_anim_check"/> - <check_box label="tid i sekunder" name="wait_time_check"/> + <check_box label="tid i sekunder:" name="wait_time_check"/> <text name="help_label"> Alle trin vil ske samtidigt, medmindre du tilføjer vente trin. </text> diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 7f7fb8ddf0..926c2429ac 100644 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml @@ -1,16 +1,75 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="Foto"> +<floater name="Snapshot" title="SE FOTO"> <floater.string name="unknown"> ukendt </floater.string> + <radio_group label="foto type" name="snapshot_type_radio"> + <radio_item label="Email" name="postcard"/> + <radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/> + <radio_item label="Gem til min computer" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] KB + </text> <button label="Tag nyt foto" name="new_snapshot_btn"/> - <line_editor label="Beskrivelse" name="description"/> - <button label="Del foto" name="share"/> - <button label="Del på internettet" name="share_to_web"/> - <button label="Gem til beholdning" name="save_to_inventory"/> - <button label="Gem foto" name="save"/> - <button label="Email foto" name="share_to_email"/> - <button label="Gem på computer" name="save_to_computer"/> - <button label="Sæt som profil billede" name="set_profile_pic"/> - <button label="Tilbage" name="cancel"/> + <button label="Send" name="send_btn"/> + <button label="Gem (L$[AMOUNT])" name="upload_btn"/> + <flyout_button label="Gem" name="save_btn" tool_tip="Gem billede til en fil"> + <flyout_button.item label="Gem" name="save_item"/> + <flyout_button.item label="Gem som..." name="saveas_item"/> + </flyout_button> + <button label="Mere" name="more_btn" tool_tip="Avancerede valg"/> + <button label="Mindre" name="less_btn" tool_tip="Avanceret opsætning"/> + <button label="Annullér" name="discard_btn"/> + <text name="type_label2"> + Størrelse + </text> + <text name="format_label"> + Format + </text> + <combo_box label="Opløsning" name="postcard_size_combo"> + <combo_box.item label="Nuværende vindue" 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="Brugerdefineret" name="Custom"/> + </combo_box> + <combo_box label="Opløsning" name="texture_size_combo"> + <combo_box.item label="Nuværende vindue" name="CurrentWindow"/> + <combo_box.item label="Lille (128x128)" name="Small(128x128)"/> + <combo_box.item label="Medium (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Stor (512x512)" name="Large(512x512)"/> + <combo_box.item label="Brugeropsat" name="Custom"/> + </combo_box> + <combo_box label="Opløsning" name="local_size_combo"> + <combo_box.item label="Nuværende vindue" 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="Brugeropsat" 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="Bredde" name="snapshot_width"/> + <spinner label="Højde" name="snapshot_height"/> + <check_box label="Fasthold proportioner" name="keep_aspect_check"/> + <slider label="Billedkvalitet" name="image_quality_slider"/> + <text name="layer_type_label"> + Indfang: + </text> + <combo_box label="Billedlag" name="layer_types"> + <combo_box.item label="Farver" name="Colors"/> + <combo_box.item label="Dybde" name="Depth"/> + </combo_box> + <check_box label="Snitflade" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> + <check_box label="Behold åben efter gem" name="keep_open_check"/> + <check_box label="Frys billede (fuld skærm)" name="freeze_frame_check"/> + <check_box label="Auto-optegn" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml index 05e9eb6cdd..2e59dfd649 100644 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml @@ -19,8 +19,10 @@ <layout_panel name="my_panel"> <text name="user_text" value="Min avatar:"/> </layout_panel> - <layout_panel name="leave_call_btn_panel"> - <button label="Forlad opkald" name="leave_call_btn"/> - </layout_panel> + <layout_stack name="voice_effect_and_leave_call_stack"> + <layout_panel name="leave_call_btn_panel"> + <button label="Forlad opkald" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml new file mode 100644 index 0000000000..86ad251103 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_voice_effect.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Steder" name="voice_effects" title="STEMME MORPH"> + <string name="no_voice_effect"> + (Ingen stemme "morph") + </string> + <string name="active_voice_effect"> + (Aktiv) + </string> + <string name="unsubscribed_voice_effect"> + (Ikke aktiveret) + </string> + <string name="new_voice_effect"> + (Ny!) + </string> + <text name="preview_text"> + For at se + </text> + <text name="status_text"> + Optag en prøve, klik derefter på en stemme for at høre hvordan det vil lyde. + </text> + <button label="Optag" name="record_btn" tool_tip="Optag en stemmeprøve."/> + <button label="Stop" name="record_stop_btn"/> + <text name="voice_morphing_link"> + [[URL] Abonnér nu] + </text> + <scroll_list name="voice_effect_list" tool_tip="Optag en prøve med din stemme og klik på en effekt for at teste."> + <scroll_list.columns label="Stemme navn" name="name"/> + <scroll_list.columns label="Udløber" name="expires"/> + </scroll_list> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 4dec9a9ba7..ca18faa0bb 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -35,11 +35,11 @@ <text name="pg_label"> Generelt </text> - <check_box name="event_mature_chk"/> - <text name="mature_label"> + <check_box name="events_mature_chk"/> + <text name="events_mature_label"> Moderat </text> - <text name="adult_label"> + <text name="events_adult_label"> Voksent </text> </panel> diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml index 8cbcf6cac8..78ccc5b869 100644 --- a/indra/newview/skins/default/xui/da/inspect_object.xml +++ b/indra/newview/skins/default/xui/da/inspect_object.xml @@ -8,8 +8,8 @@ Af [CREATOR] </string> <string name="CreatorAndOwner"> - af [CREATOR] -ejer [OWNER] + Af [CREATOR] +Owner [OWNER] </string> <string name="Price"> L$[AMOUNT] @@ -23,6 +23,13 @@ ejer [OWNER] <string name="Sit"> Sid </string> + <text name="object_name" value="Test objekt navn der reelt er to linier og meget lang"/> + <text name="price_text"> + L$30,000 + </text> + <text name="object_description"> + Dette er en meget lang beskrivelse af et objekt udformet så den fylder mindst 80 karakterer i længden eller endda nærmere 120 på dette sted. Man kan aldrig vide.... + </text> <button label="Køb" name="buy_btn"/> <button label="Betal" name="pay_btn"/> <button label="Tag kopi" name="take_free_copy_btn"/> diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml index bf52e5d57f..e70b7ce33d 100644 --- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Berør" name="Attachment Object Touch"/> <menu_item_call label="Redigér" name="Edit..."/> <menu_item_call label="Tag af" name="Detach"/> - <menu_item_call label="Smid" name="Drop"/> <menu_item_call label="Stå op" name="Stand Up"/> <menu_item_call label="Skift sæt" name="Change Outfit"/> + <menu_item_call label="Redigér mit sæt" name="Edit Outfit"/> + <menu_item_call label="Redigér min figur" name="Edit My Shape"/> <menu_item_call label="Venner" name="Friends..."/> <menu_item_call label="Grupper" name="Groups..."/> <menu_item_call label="Profil" name="Profile..."/> <menu_item_call label="Debug teksturer" name="Debug..."/> + <menu_item_call label="Smid" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml new file mode 100644 index 0000000000..9d7fc0f223 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Attachment"> + <menu_item_call label="Tag af" name="detach"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml new file mode 100644 index 0000000000..0e90d5a3ae --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Body"> + <menu_item_call label="Erstat" name="replace"/> + <menu_item_call label="Redigér" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml new file mode 100644 index 0000000000..73d97cd167 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Clothing"> + <menu_item_call label="Tag af" name="take_off"/> + <menu_item_call label="Flyt et lag op" name="move_up"/> + <menu_item_call label="Flyt et lag ned" name="move_down"/> + <menu_item_call label="Redigér" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml new file mode 100644 index 0000000000..f44369fd84 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_cof_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear COF"> + <menu label="Nyt tøj" name="COF.Gear.New_Clothes"/> + <menu label="Nye kropsdele" name="COF.Geear.New_Body_Parts"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml index 45276adda4..d96a8a8a17 100644 --- a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml @@ -2,4 +2,5 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Vis navigationsbjælke" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Vis favoritbjælke" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Vis min lokation bjælke" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index ff70ec7886..2eafeb3fcc 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml @@ -78,6 +78,7 @@ <menu label="Vedhæft til HUD" name="Attach To HUD"/> <menu_item_call label="Redigér" name="Wearable Edit"/> <menu_item_call label="Tag på" name="Wearable Wear"/> + <menu_item_call label="Tilføj" name="Wearable Add"/> <menu_item_call label="Tag af" name="Take Off"/> <menu_item_call label="--ingen valg--" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml new file mode 100644 index 0000000000..3ed0df9041 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Outfit"> + <menu_item_call label="Tag på - Erstat nuværende sæt" name="wear"/> + <menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/> + <menu label="Nyt tøj" name="New Clothes"> + <menu_item_call label="Ny trøje" name="New Shirt"/> + <menu_item_call label="Nye bukser" name="New Pants"/> + <menu_item_call label="Nye sko" name="New Shoes"/> + <menu_item_call label="Nye strømper" name="New Socks"/> + <menu_item_call label="Ny jakke" name="New Jacket"/> + <menu_item_call label="Ny nederdel" name="New Skirt"/> + <menu_item_call label="Nye handsker" name="New Gloves"/> + <menu_item_call label="Ny undertrøje" name="New Undershirt"/> + <menu_item_call label="Nye underbukser" name="New Underpants"/> + <menu_item_call label="Ny alpha" name="New Alpha"/> + <menu_item_call label="Ny tatovering" name="New Tattoo"/> + </menu> + <menu label="Nye kropsdele" name="New Body Parts"> + <menu_item_call label="Ny figur" name="New Shape"/> + <menu_item_call label="Nyt hud" name="New Skin"/> + <menu_item_call label="Nyt hår" name="New Hair"/> + <menu_item_call label="Nye øjne" name="New Eyes"/> + </menu> + <menu_item_call label="Omdøb sæt" name="rename"/> + <menu_item_call label="Slet sæt" name="delete_outfit"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml new file mode 100644 index 0000000000..d6a6f2724f --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit"> + <menu_item_call label="Tag på - Erstat nuværende sæt" name="wear_replace"/> + <menu_item_call label="Tag på - Tilføj til nuværende sæt" name="wear_add"/> + <menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/> + <menu_item_call label="Redigér sæt" name="edit"/> + <menu_item_call label="Omdøb sæt" name="rename"/> + <menu_item_call label="Slet sæt" name="delete"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml index 3d89715ea8..188229b586 100644 --- a/indra/newview/skins/default/xui/da/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/da/menu_save_outfit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="save_outfit_menu"> <menu_item_call label="Gem" name="save_outfit"/> - <menu_item_call label="Gem som ny" name="save_as_new_outfit"/> + <menu_item_call label="Gem som" name="save_as_new_outfit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml new file mode 100644 index 0000000000..08d1c25d6f --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Vis koordinater" name="Show Coordinates"/> + <menu_item_check label="Vis egenskaber for parcel" name="Show Parcel Properties"/> + <menu_item_call label="Landemærke" name="Landmark"/> + <menu_item_call label="Kopi" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index a061292eb0..0d36a08652 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -9,6 +9,7 @@ <menu_item_check label="Beholdning" name="Inventory"/> <menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/> <menu_item_check label="Mine bevægelser" name="Gestures"/> + <menu_item_check label="Min stemme" name="ShowVoice"/> <menu label="Min status" name="Status"> <menu_item_call label="Væk" name="Set Away"/> <menu_item_call label="Optaget" name="Set Busy"/> @@ -68,6 +69,12 @@ <menu_item_call label="Sammenkæd" name="Link"/> <menu_item_call label="Adskil" name="Unlink"/> <menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/> + <menu label="Vis lænkede dele" name="Select Linked Parts"> + <menu_item_call label="Vælg næste del" name="Select Next Part"/> + <menu_item_call label="Vælg forrige del" name="Select Previous Part"/> + <menu_item_call label="Inkludér næste del" name="Include Next Part"/> + <menu_item_call label="Inkludér forrige del" name="Include Previous Part"/> + </menu> <menu_item_call label="Fokusér på valgte" name="Focus on Selection"/> <menu_item_call label="Zoom til valgte" name="Zoom to Selection"/> <menu label="Objekt" name="Object"> @@ -98,11 +105,11 @@ <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/> <menu_item_call label="Gitter indstillinger" name="Grid Options"/> </menu> - <menu label="Vis lænkede dele" name="Select Linked Parts"> - <menu_item_call label="Vælg næste del" name="Select Next Part"/> - <menu_item_call label="Vælg forrige del" name="Select Previous Part"/> - <menu_item_call label="Inkludér næste del" name="Include Next Part"/> - <menu_item_call label="Inkludér forrige del" name="Include Previous Part"/> + <menu label="Send" name="Upload"> + <menu_item_call label="Billede (L$[COST])..." name="Upload Image"/> + <menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="Mange (L$[COST] pr. fil)..." name="Bulk Upload"/> </menu> </menu> <menu label="Hjælp" name="Help"> @@ -168,6 +175,7 @@ <menu_item_check label="Søg" name="Search"/> <menu_item_call label="Frigør taster" name="Release Keys"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> + <menu_item_check label="Vis avanceret menu" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Løb altid" name="Always Run"/> <menu_item_check label="Flyv" name="Fly"/> <menu_item_call label="Luk vindue" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml new file mode 100644 index 0000000000..6a84c518ee --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit Wearable Context Menu"> + <menu_item_call label="Erstat" name="wear"/> + <menu_item_call label="Tilføj" name="wear_add"/> + <menu_item_call label="Tag af" name="take_off_or_detach"/> + <menu_item_call label="Tag af" name="detach"/> + <context_menu label="Vedhæft til ▶" name="wearable_attach_to"/> + <context_menu label="Vedhæft på HUD ▶" name="wearable_attach_to_hud"/> + <menu_item_call label="Tag af" name="take_off"/> + <menu_item_call label="Redigér" name="edit"/> + <menu_item_call label="Objekt profil" name="object_profile"/> + <menu_item_call label="Vis original" name="show_original"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml new file mode 100644 index 0000000000..39f99ad6aa --- /dev/null +++ b/indra/newview/skins/default/xui/da/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="Redigér sæt" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml new file mode 100644 index 0000000000..878c8bb04d --- /dev/null +++ b/indra/newview/skins/default/xui/da/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="Redigér sæt" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 72a1ab6a29..5ae329033d 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -268,6 +268,11 @@ Grafik kvaliteten sættes til 'lav' for at undgå typiske problemer me Vi anbefaler at opdatere driverne til dit grafikkort. Grafik kvaliteten kan forbedres i indstillinger > Grafik. </notification> + <notification name="CannotCopyWarning"> + Du har ikke rettigheder til at kopiere følgende genstande: +[ITEMS] +og du vil miste dem fra din beholdning hvis du forærer dem væk. Er du sikker på at du vil tilbyde disse genstande? + </notification> <notification name="CannotGiveCategory"> Du har ikke tilladelse til at videreføre den valgte mappe. </notification> @@ -283,8 +288,7 @@ Gå til [_URL] for information om køb af L$? Kunne ikke 'forstå' filen: [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - Vi kan ikke læse dine beskyttede data så de nulstilles. - Dette kan ske hvis du ændrer din netværksopsætning. + Vi kan ikke udfylde dit brugernavn og password. Dette kan ske hvis du ændrer netværksopsætning <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="DoNotSupportBulkAnimationUpload"> @@ -412,6 +416,26 @@ Tilbyd venskab til [NAME]? <button name="Cancel" text="Annullér"/> </form> </notification> + <notification label="Gem" name="SaveWearableAs"> + Gem genstand til beholdning som: + <form name="form"> + <input name="message"> + [DESC] (ny) + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Annullér"/> + </form> + </notification> + <notification label="Omdøb sæt" name="RenameOutfit"> + Nyt navn til sæt: + <form name="form"> + <input name="new_name"> + [NAME] + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Annullér"/> + </form> + </notification> <notification name="ConfirmItemDeleteHasLinks"> Mindst en af genstandene har lænkede genstande der peger på den. Hvis du sletter denne genstand, vil lænkninger ikke virke mere. Det anbefales kraftigt at fjerne lænkninger først. @@ -677,9 +701,9 @@ Gå til 'Knowledge Base' for mere information om indholdsratings. Du har ikke adgang til denne region på grund af din valgte indholdsrating. </notification> <notification name="RegionEntryAccessBlocked_Change"> - Du har ikke adgang til den region, da din indholdsrating ikke tillader dette. + Du har ikke adgang til denne region på grund af din opsætning af indholdsrating. -Klik på "Ændre præference" for at forhøje din indholdsrating for direkte adgang nu. Ved at gøre dette vil du få lov til at søge og få adgang til [REGIONMATURITY] indhold. Hvis du ønsker at ændre denne opsætning senere, kan du gøre dette fra Mig > Indstillinger > Generelt. +For at få adgang til den ønskede region skal du ændre din indholdsrating. Dette vil give dig ret til at søge og får tilgang til indhold af typen [REGIONMATURITY]. For at omgøre ændringer gå til Mig > Indstillinger > Generelt. <form name="form"> <button name="OK" text="Ændre indstillinger"/> <button name="Cancel" text="Luk"/> @@ -1460,6 +1484,21 @@ Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik p <notification name="VoiceLoginRetry"> Vi laver en stemmekanal til dig. Det kan tage op til et minut. </notification> + <notification name="VoiceEffectsExpired"> + En eller flere af dine stemme "morphs" er udløbet. +[[URL] Click here] for at forny dit abbonnement. + </notification> + <notification name="VoiceEffectsExpiredInUse"> + Den aktive stemme "morph" er udløbet og din normale stemme opsætning er genaktiveret. +[[URL] Click here] for at forny dit abbonnement. + </notification> + <notification name="VoiceEffectsWillExpire"> + En eller flere af dine stemme "morphs" vil udløbe om mindre end [INTERVAL] dage. +[[URL] Click here] for at forny dit abbonnement. + </notification> + <notification name="VoiceEffectsNew"> + Nye stemme "morphs" er tilgængelige! + </notification> <notification name="Cannot enter parcel: not a group member"> Kun medlemmer af en bestemt gruppe kan besøge dette område. </notification> @@ -1526,18 +1565,36 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager. Knappen vil blive vist når der er nok plads til den. </notification> <notification name="ShareNotification"> - Træk genstande fra beholdning til en person i beboer vælgeren + Vælg beboere at dele med. + </notification> + <notification name="ShareItemsConfirmation"> + Er du sikker på at du vil dele følgende genstande: + +[ITEMS] + +Med følgende beboere: + +[RESIDENTS] + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Ok"/> + </notification> + <notification name="ItemsShared"> + Genstande er nu delt. </notification> <notification name="DeedToGroupFail"> Dedikering til gruppe fejlede. </notification> <notification name="AvatarRezNotification"> ( [EXISTENCE] sekunder i live ) -Avatar '[NAME]' declouded in [TIME] seconds. +Avatar '[NAME]' var ikke sky mere, efter [TIME] sekunder. </notification> - <notification name="AvatarRezSelfNotification"> - ( [EXISTENCE] sekunder i live ) -Du afsluttede klargøring af dit sæt på [TIME] sekunder. + <notification name="AvatarRezSelfBakedDoneNotification"> + ( [EXISTENCE] seconds alive ) +Du blev færdig med at fremvise dit sæt efter [TIME] sekunder. + </notification> + <notification name="AvatarRezSelfBakedUpdateNotification"> + ( [EXISTENCE] seconds alive ) +Du sendte en opdatering af dit udseende efter [TIME] sekunder. +[STATUS] </notification> <notification name="AvatarRezCloudNotification"> ( [EXISTENCE] sekunder i live ) @@ -1559,10 +1616,32 @@ Avatar '[NAME]' skiftede til udseende modus. ( [EXISTENCE] sekunder i live ) Avatar '[NAME]' har forladt udseende modus. </notification> + <notification name="NoConnect"> + Vi har problemer med at oprette forbindelse via [PROTOCOL] [HOSTID]. +Check venligst din netværks- og firewallsetup. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> + <notification name="NoVoiceConnect"> + Vi har problemer med at oprette forbindelse til din stemme server: + +[HOSTID] + +Stemme kommunikation vil ikke være tilgængelig. +Check venligst din netværks- og firewall setup. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> <notification name="AvatarRezLeftNotification"> ( [EXISTENCE] sekunder i live ) Avatar '[NAME]' forsvandt helt "uploaded". </notification> + <notification name="AvatarRezSelfBakeNotification"> + ( [EXISTENCE] seconds alive ) +Du sendte en [RESOLUTION] tekstur til '[BODYREGION]' efter [TIME] sekunder. + </notification> <notification name="ConfirmLeaveCall"> Er du sikker på at du vil forlade dette opkald? <usetemplate ignoretext="Bekræft før jeg forlader opkald" name="okcancelignore" notext="Nej" yestext="Ja"/> @@ -1574,7 +1653,7 @@ vil have lyden slukket - selv efter de har forladt kaldet. Sluk for alles lyd? - <usetemplate ignoretext="Bekræft før jeg slukker for alle deltageres lyd i gruppe-kald" name="okcancelignore" notext="OK" yestext="Annullér"/> + <usetemplate ignoretext="Bekræft før jeg slukker for alle deltageres lyd i gruppe-kald" name="okcancelignore" notext="Annullér" yestext="Ok"/> </notification> <global name="UnsupportedGLRequirements"> Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter 'multitexture'. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem. diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml index de764d8025..d2ade170d1 100644 --- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/da/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="Du har ikke rettigheder til at redigere"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Rediger denne figur"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml index de764d8025..88b0636e9e 100644 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/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="Fjern fra sæt"/> <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Du har ikke rettigheder til at redigere"/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Redigere denne ting der kan tages på"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml index 91d90a5660..700ad4fa14 100644 --- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/da/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="Fjern fra sæt"/> <text name="item_name" value="..."/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml index 6af84de0c7..dd8d86cfbf 100644 --- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/da/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="Tilføj flere genstande af denne type"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml index 4360fe35f5..7c1ffe5cfa 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <text name="avatar_height"> - [HEIGHT] meter høj - </text> + <string name="meters"> + Meter + </string> + <string name="feet"> + Fod + </string> + <string name="height"> + Højde: + </string> + <text name="avatar_height"/> <panel label="Trøje" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Krop"/> diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml index 8e6990fe31..604c166ef0 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml @@ -72,7 +72,7 @@ <string name="jacket_desc_text"> Jakke: </string> - <string name="skirt_skirt_desc_text"> + <string name="skirt_desc_text"> Nederdel: </string> <string name="gloves_desc_text"> @@ -90,6 +90,7 @@ <string name="tattoo_desc_text"> Tatovering: </string> + <labeled_back_button label="Gem" name="back_btn" tool_tip="Tilbage til redigering"/> <text name="edit_wearable_title" value="Redigerer kropsbygning"/> <panel label="Trøje" name="wearable_type_panel"> <text name="description_text" value="Kropsbygning:"/> @@ -100,13 +101,8 @@ <icon name="male_icon" tool_tip="Mandlig"/> <icon name="female_icon" tool_tip="Kvindelig"/> </panel> - <panel label="gear_buttom_panel" name="gear_buttom_panel"> - <button name="friends_viewsort_btn" tool_tip="Valg"/> - <button name="add_btn" tool_tip="TODO"/> - <button name="del_btn" tool_tip="TODO"/> - </panel> <panel name="button_panel"> <button label="Gem som" name="save_as_button"/> - <button label="Vend tilbage" name="revert_button"/> + <button label="Annullér ændringer" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index 3079a23d20..eccddb55c8 100644 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml @@ -46,7 +46,7 @@ <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når "Tilmeldingsgebyr" er valgt." width="60"/> <combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som 'mature'." width="150"> <combo_item name="select_mature"> - - Vælg Mature - + - Vælg indholdsrating - </combo_item> <combo_box.item label="Mature indhold" name="mature"/> <combo_box.item label="PG indhold" name="pg"/> diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml index 9aa9fd14cc..3890f07324 100644 --- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml @@ -13,7 +13,9 @@ <string name="Filter.All" value="Alle"/> <string name="Filter.Clothes/Body" value="Tøj/Krop"/> <string name="Filter.Objects" value="Objekter"/> - <button label="redigér" name="edit_wearable_btn"/> + <string name="Filter.Clothing" value="Tøj"/> + <string name="Filter.Bodyparts" value="Kropsdele"/> + <string name="replace_body_part" value="Klik for at erstatte din nuværende figur"/> <text name="title" value="Redigér sæt"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -23,23 +25,19 @@ </panel> <layout_stack name="im_panels"> <layout_panel label="IM kontrolpanel" name="outfit_wearables_panel"> - <panel label="bottom_panel" name="edit_panel"/> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <text name="add_to_outfit_label" value="Tilføj til sæt:"/> <layout_stack name="filter_panels"> - <layout_panel label="IM kontrolpanel" name="filter_panel"> - <filter_editor label="Filter" name="look_item_filter"/> + <layout_panel name="add_button_and_combobox"> + <button label="Tilføj mere..." name="show_add_wearables_btn" tool_tip="Åben/Luk"/> + </layout_panel> + <layout_panel name="filter_panel"> + <filter_editor label="Filtrér tøj i beholdning" name="look_item_filter"/> </layout_panel> </layout_stack> - <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> - <button label="F" name="folder_view_btn"/> - <button label="L" name="list_view_btn"/> - </panel> </layout_panel> + <layout_panel name="add_wearables_panel"/> </layout_stack> <panel name="save_revert_button_bar"> <button label="Gem" name="save_btn"/> - <button label="Gendan" name="revert_btn"/> + <button label="Annullér ændringer" name="revert_btn" tool_tip="Vend tilbage til sidst gemte version"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml index 681701aba2..da40bd3c27 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml @@ -6,9 +6,8 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Vis flere muligheder"/> - <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> - <button label="Gem sæt" name="make_outfit_btn" tool_tip="Gem udseende som nyt sæt"/> + <dnd_button name="trash_btn" tool_tip="Slet valgte sæt"/> + <button label="Gem som" name="save_btn"/> <button label="Tag på" name="wear_btn" tool_tip="Tag valgte sæt på"/> - <button label="Redigér sæt" name="edit_current_outfit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index c06176f994..ac15da1717 100644 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml @@ -5,12 +5,12 @@ <filter_editor label="Filtrér mine steder" name="Filter"/> <panel name="button_panel"> <button label="Teleportér" name="teleport_btn" tool_tip="Teleportér til det valgte område"/> - <button label="Kort" name="map_btn"/> + <button label="Kort" name="map_btn" tool_tip="Vis dette område på verdenskortet"/> <button label="Redigér" name="edit_btn" tool_tip="Redigér landemærke information"/> <button label="▼" name="overflow_btn" tool_tip="Vise flere valgmuligheder"/> <button label="Gem" name="save_btn"/> <button label="Annullér" name="cancel_btn"/> <button label="Luk" name="close_btn"/> - <button label="Profil" name="profile_btn"/> + <button label="Profil" name="profile_btn" tool_tip="Vis profil for stedet"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 807d7939b8..b267c75673 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/> <check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/> - <check_box initial_value="1" label="Sidepanel" name="appearance_sidebar_positioning" tool_tip="Benyt automatisk positionering af kamera"/> + <check_box initial_value="sand" label="Sidepanel" name="appearance_sidebar_positioning" tool_tip="Benyt automatisk positionering af kamera"/> <check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/> <check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/> <check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index 586896041d..62214089f5 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -50,10 +50,7 @@ m </text> <slider label="Maks. antal partikler:" name="MaxParticleCount"/> - <slider label="Maks. avatar optegningsafstand:" name="MaxAvatarDrawDistance"/> - <text name="DrawDistanceMeterText3"> - m - </text> + <slider label="Maks. antal mini-avatarer:" name="MaxNumberAvatarDrawn"/> <slider label="Efterbehandlingskvalitet:" name="RenderPostProcess"/> <text name="MeshDetailText"> Netmaske detaljer: diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 08ffafd5a6..8633f12d24 100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml @@ -21,8 +21,10 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/> - <button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/> + <panel name="balance_bg"> + <text name="balance" tool_tip="Min status" value="L$20"/> + <button label="KØB L$" name="buyL" tool_tip="Klik for at købe flere L$"/> + </panel> <text name="TimeText" tool_tip="Nuværende tid (Pacific)"> 24:00 PST </text> diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml new file mode 100644 index 0000000000..50f561ec7f --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_voice_effect.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_voice_effect"> + <string name="no_voice_effect"> + Voice Morphing Off + </string> + <string name="preview_voice_effects"> + Se stemme "morph" ▶ + </string> + <string name="get_voice_effects"> + Hente stemme "morph" ▶ + </string> + <combo_box name="voice_effect" tool_tip="Vælg en stemme "morph" for at ændre din stemme"> + <combo_box.item label="Stemme morph slukket" name="no_voice_effect"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index be049bea38..c5caefe070 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml @@ -3,12 +3,14 @@ <string name="No Outfit" value="Intet sæt"/> <string name="Unsaved Changes" value="Ikke gemte ændringer"/> <string name="Now Wearing" value="Bærer nu..."/> + <string name="Changing outfits" value="Skift sæt"/> <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="Redigér dette sæt"/> </panel> <filter_editor label="Filtrér sæt" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml index 767d74ca3f..64ee3f0428 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml @@ -2,12 +2,12 @@ <panel label="Ting" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="Profil" name="info_btn"/> - <button label="Del" name="share_btn"/> - <button label="Køb ind" name="shop_btn"/> - <button label="Bær" name="wear_btn"/> + <button label="Profil" name="info_btn" tool_tip="Vis objekt profil"/> + <button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/> + <button label="Køb ind" name="shop_btn" tool_tip="Åben hjemmeside for markedsplads"/> + <button label="Bær" name="wear_btn" tool_tip="Tag valgte sæt på"/> <button label="Afspil" name="play_btn"/> - <button label="Teleportér" name="teleport_btn"/> + <button label="Teleportér" name="teleport_btn" tool_tip="Teleport til det valgte område"/> </panel> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index 701a59bade..46f7c74a9a 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Objekt profil"> +<panel name="item properties" title="Profil for genstand"> <panel.string name="unknown"> (ukendt) </panel.string> @@ -15,8 +15,8 @@ <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="Objekt profil"/> - <text name="where" value="(Beholdning)"/> + <text name="title" value="Profil for genstand"/> + <text name="origin" value="(Beholdning)"/> <panel label=""> <text name="LabelItemNameTitle"> Navn: diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 5ceb0612a8..32f37c038e 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -95,7 +95,7 @@ Et ugyldig hostnavn blev brugt for at få adgang til serveren. Check venligst din SLURL eller navnet på hosten. </string> <string name="CertExpired"> - Certifikat returneret fra nettet ser ud til at være udløbet. Check venligst din systemtid eller kontakt administratoren af dette net. + Det certifikat der blev returneret ser ud til at være udløbet. Check venligst din systemtid på computeren. </string> <string name="CertKeyUsage"> Det certifikat der blev returneret af serveren kan ikke benyttes til SSL. Kontakt venligst administrator af dette net. @@ -104,7 +104,7 @@ For mange certifikater i serverens certifikat streng. Kontakt venligst administrator af dette net. </string> <string name="CertInvalidSignature"> - Certifikat signaturen returneret på dette net kan ikke bekræftes. Kontakt venligst administrator af dette net. + Signaturen på certifkat der blev returneret af Second Life serveren kunne ikke bekræftes. </string> <string name="LoginFailedNoNetwork"> Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse. @@ -294,6 +294,9 @@ <string name="ReleaseNotes"> Noter om version </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> Henter... </string> @@ -729,6 +732,12 @@ <string name="land_type_unknown"> (ukendt) </string> + <string name="Estate / Full Region"> + Estate / Hel region + </string> + <string name="Mainland / Full Region"> + Mainland / Hel region + </string> <string name="all_files"> Alle filer </string> @@ -834,6 +843,9 @@ <string name="invalid"> ugyldig </string> + <string name="none"> + ingen + </string> <string name="shirt_not_worn"> Trøje - ikke på </string> @@ -873,6 +885,9 @@ <string name="NewWearable"> Ny [WEARABLE_ITEM] </string> + <string name="CreateNewWearable"> + Opret [WEARABLE_TYPE] + </string> <string name="next"> Næste </string> @@ -1050,7 +1065,7 @@ <string name="InvFolder Gestures"> Bevægelser </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoritter </string> <string name="InvFolder Current Outfit"> @@ -3445,6 +3460,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="session_initialization_timed_out_error"> Initialisering af session er "timed out" </string> + <string name="voice_morphing_url"> + http://secondlife.com/landing/voicemorphing + </string> <string name="paid_you_ldollars"> [NAME] betalte dig L$[AMOUNT] </string> @@ -3615,16 +3633,16 @@ Krænkelsesanmeldelse <string name="Male - Wow"> Mand - Wow </string> - <string name="FeMale - Excuse me"> + <string name="Female - Excuse me"> Kvinde - Undskyld mig </string> - <string name="FeMale - Get lost"> + <string name="Female - Get lost"> Kvinde - Skrid! </string> - <string name="FeMale - Blow kiss"> + <string name="Female - Blow kiss"> Kvinde - Pust et kys </string> - <string name="FeMale - Boo"> + <string name="Female - Boo"> Kvinde - Boo </string> <string name="Female - Bored"> @@ -3657,4 +3675,32 @@ Krænkelsesanmeldelse <string name="texture_load_dimensions_error"> Kan ikke hente billeder større end [WIDTH]*[HEIGHT] </string> + <string name="words_separator" value=","/> + <string name="server_is_down"> + Desværre er noget gået galt. + + Check venligst status.secondlifegrid.net for at se om der skulle være driftsproblemer. + Hvis du bliver ved med at have problemer, check venligst din firewall- og netværksopsætning. + </string> + <string name="dateTimeWeekdaysNames"> + Søndag:Mandag:Tirsdag:Onsdag:Torsdag:Fredag:Lørdag + </string> + <string name="dateTimeWeekdaysShortNames"> + Søn:Man:Tir:Ons:Tor:Fre:Lør + </string> + <string name="dateTimeMonthNames"> + Januar:Februar:Marts:April:Maj:Juni:Juli:August:September:Oktober:November:December + </string> + <string name="dateTimeMonthShortNames"> + Jan:Feb:Mar:Apr:Maj:Jun:Jul:Aug:Sep:Okt:Nov:Dec + </string> + <string name="dateTimeDayFormat"> + [MDAY] + </string> + <string name="dateTimeAM"> + AM + </string> + <string name="dateTimePM"> + PM + </string> </strings> diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 89f9f87043..b18894d478 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -28,8 +28,8 @@ Grafikkarten: [GRAPHICS_CARD] libcurl-Version: [LIBCURL_VERSION] J2C-Decoderversion: [J2C_VERSION] Audio-Treiberversion: [AUDIO_DRIVER_VERSION] -Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox-Version: [VIVOX_VERSION] +Qt Webkit-Version: [QT_WEBKIT_VERSION] +Voice-Serverversion: [VOICE_VERSION] </floater.string> <floater.string name="none"> (keiner) diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index 3026ff64b2..5f00fc4f77 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -62,6 +62,9 @@ <panel.string name="no_selection_text"> Keine Parzelle ausgewählt. </panel.string> + <panel.string name="time_stamp_template"> + [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="Name:"> Name: </text> diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml index 92c0c4a27a..8235eacde0 100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml @@ -3,46 +3,48 @@ <floater.string name="InvalidAvatar"> UNGÜLTIGER AVATAR </floater.string> - <text name="label" width="120"> - Gebackene Texturen - </text> - <text name="composite_label" width="170"> - Zusammengesetzte Texturen - </text> - <button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <texture_picker label="Haare" name="hair-baked"/> - <texture_picker label="Haare" name="hair_grain"/> - <texture_picker label="Alpha: Haare" name="hair_alpha"/> - <texture_picker label="Kopf" name="head-baked"/> - <texture_picker label="Make-Up" name="head_bodypaint"/> - <texture_picker label="Kopf: Alpha" name="head_alpha"/> - <texture_picker label="Kopftattoo" name="head_tattoo"/> - <texture_picker label="Augen" name="eyes-baked"/> - <texture_picker label="Auge" name="eyes_iris"/> - <texture_picker label="Alpha: Augen" name="eyes_alpha"/> - <texture_picker label="Oberkörper" name="upper-baked"/> - <texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint" width= - "140"/> - <texture_picker label="Unterhemd" name="upper_undershirt"/> - <texture_picker label="Handschuhe" name="upper_gloves"/> - <texture_picker label="Hemd" name="upper_shirt"/> - <texture_picker label="Oberjacke" name="upper_jacket"/> - <texture_picker label="Alpha: Oben" name="upper_alpha"/> - <texture_picker label="Obere Tattoos" name="upper_tattoo"/> - <texture_picker label="Unterkörper" name="lower-baked"/> - <texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint" width= - "140"/> - <texture_picker label="Unterhose" name="lower_underpants"/> - <texture_picker label="Socken" name="lower_socks"/> - <texture_picker label="Schuhe" name="lower_shoes"/> - <texture_picker label="Hose" name="lower_pants"/> - <texture_picker label="Jacke" name="lower_jacket"/> - <texture_picker label="Alpha: Unten" name="lower_alpha"/> - <texture_picker label="Untere Tattoos" name="lower_tattoo"/> - <texture_picker label="Rock" name="skirt-baked"/> - <texture_picker label="Rock" name="skirt"/> + <text name="label"> + Gebackene +Texturen + </text> + <text name="composite_label"> + Zusammengesetzte +Texturen + </text> + <button label="IDs an Konsole ausgeben" label_selected="Abladen" name="Dump"/> + <panel name="scroll_content_panel"> + <texture_picker label="Haare" name="hair-baked"/> + <texture_picker label="Haare" name="hair_grain"/> + <texture_picker label="Alpha: Haare" name="hair_alpha"/> + <texture_picker label="Kopf" name="head-baked"/> + <texture_picker label="Make-Up" name="head_bodypaint"/> + <texture_picker label="Kopf: Alpha" name="head_alpha"/> + <texture_picker label="Kopftätowierung" name="head_tattoo"/> + <texture_picker label="Augen" name="eyes-baked"/> + <texture_picker label="Auge" name="eyes_iris"/> + <texture_picker label="Alpha: Augen" name="eyes_alpha"/> + <texture_picker label="Oberkörper" name="upper-baked"/> + <texture_picker label="Oberkörperfarbe" name="upper_bodypaint"/> + <texture_picker label="Unterhemd" name="upper_undershirt"/> + <texture_picker label="Handschuhe" name="upper_gloves"/> + <texture_picker label="Hemd" name="upper_shirt"/> + <texture_picker label="Oberjacke" name="upper_jacket"/> + <texture_picker label="Alpha: Oben" name="upper_alpha"/> + <texture_picker label="Obere Tätowierung" name="upper_tattoo"/> + <texture_picker label="Unterkörper" name="lower-baked"/> + <texture_picker label="Unterkörperfarbe" name="lower_bodypaint"/> + <texture_picker label="Unterhose" name="lower_underpants"/> + <texture_picker label="Socken" name="lower_socks"/> + <texture_picker label="Schuhe" name="lower_shoes"/> + <texture_picker label="Hose" name="lower_pants"/> + <texture_picker label="Jacke" name="lower_jacket"/> + <texture_picker label="Alpha: Unten" name="lower_alpha"/> + <texture_picker label="Untere Tätowierung" name="lower_tattoo"/> + <texture_picker label="Rock" name="skirt-baked"/> + <texture_picker label="Rock" name="skirt"/> + </panel> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml new file mode 100644 index 0000000000..38d3bdd77f --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_buy_currency_html" title="WÄHRUNG KAUFEN"/> diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index a9a3149177..d4358fa8e9 100644 --- a/indra/newview/skins/default/xui/de/floater_map.xml +++ b/indra/newview/skins/default/xui/de/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title="Minikarte"> +<floater name="Map" title=""> <floater.string name="mini_map_north"> N </floater.string> @@ -27,6 +27,9 @@ <floater.string name="ToolTipMsg"> [AGENT][REGION](Karte mit Doppelklick öffnen) </floater.string> + <floater.string name="mini_map_caption"> + MINI-KARTE + </floater.string> <text label="N" name="floater_map_north" text="N"> N </text> diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml index b978322cef..4333392582 100644 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml @@ -6,18 +6,48 @@ <string name="walk_back_tooltip"> Rückwärts gehen (Nach-Unten-Pfeil oder S drücken) </string> + <string name="walk_left_tooltip"> + Nach links gehen (Umschalt + Links-Pfeil oder A drücken) + </string> + <string name="walk_right_tooltip"> + Nach rechts gehen (Umschalt + Rechts-Pfeil oder D drücken) + </string> <string name="run_forward_tooltip"> Vorwärts rennen (Nach-oben-Pfeil oder W drücken) </string> <string name="run_back_tooltip"> Rückwärts rennen (Nach-Unten-Pfeil oder S drücken) </string> + <string name="run_left_tooltip"> + Nach links drehen (Umschalt + Links-Pfeil oder A drücken) + </string> + <string name="run_right_tooltip"> + Nach rechts rennen (Umschalt + Rechts-Pfeil oder D drücken) + </string> <string name="fly_forward_tooltip"> Vorwärts fliegen (Nach-oben-Pfeil oder W drücken) </string> <string name="fly_back_tooltip"> Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken) </string> + <string name="fly_left_tooltip"> + Nach links fliegen (Umschalt + Links-Pfeil oder A drücken) + </string> + <string name="fly_right_tooltip"> + Nach rechts fliegen (Umschalt + Rechts-Pfeil oder D drücken) + </string> + <string name="fly_up_tooltip"> + Nach oben fliegen, „E" drücken + </string> + <string name="fly_down_tooltip"> + Nach unten fliegen, „C" drücken + </string> + <string name="jump_tooltip"> + Hüpfen (E drücken) + </string> + <string name="crouch_tooltip"> + Ducken (C drücken) + </string> <string name="walk_title"> Gehen </string> @@ -28,10 +58,12 @@ Fliegen </string> <panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/> - <button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/> <button label="" label_selected="" name="move up btn" tool_tip="Nach oben fliegen, „E" drücken"/> + <button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/> + <joystick_slide name="move left btn" tool_tip="Nach links gehen (Umschalt + Links-Pfeil oder A drücken)"/> <button label="" label_selected="" name="move down btn" tool_tip="Nach unten fliegen, „C" drücken"/> + <button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/> + <joystick_slide name="move right btn" tool_tip="Nach rechts fliegen (Umschalt + Rechts-Pfeil oder D drücken)"/> <joystick_turn name="forward btn" tool_tip="Vorwärts gehen (Nach-oben-Pfeil oder W drücken)"/> <joystick_turn name="backward btn" tool_tip="Rückwärts gehen (Nach-Unten-Pfeil oder S drücken)"/> </panel> diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml index 48b1f1170c..3a036fc441 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml @@ -24,9 +24,6 @@ <floater.string name="Title"> Gesten: [NAME] </floater.string> - <text name="name_text"> - Name: - </text> <text name="desc_label"> Beschreibung: </text> @@ -36,7 +33,7 @@ <text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht's“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht's sagen“ und die zugehörige Geste wird abgespielt."> Ersetzen mit: </text> - <line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht's“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht's sagen“ und die zugehörige Geste wird abgespielt." left_delta="94" width="160"/> + <line_editor left_delta="94" name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht's“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht's sagen“ und die zugehörige Geste wird abgespielt." width="160"/> <text name="key_label"> Tastenkürzel: </text> @@ -46,19 +43,22 @@ Bibliothek: </text> <scroll_list name="library_list" width="166"/> - <button label="Hinzufügen >>" name="add_btn" left_pad="6" width="94"/> + <button label="Hinzufügen >>" left_pad="6" name="add_btn" width="94"/> <text name="steps_label"> Schritte: </text> <button label="Nach oben" name="up_btn"/> <button label="Nach unten" name="down_btn"/> <button label="Entfernen" name="delete_btn"/> + <text name="options_text"> + (Optionen) + </text> <radio_group name="animation_trigger_type"> <radio_item label="Start" name="start"/> <radio_item label="Stopp" name="stop"/> </radio_group> <check_box label="bis alle Animationen beendet sind" name="wait_anim_check"/> - <check_box label="Zeit in Sekunden" name="wait_time_check"/> + <check_box label="Zeit in Sekunden:" name="wait_time_check"/> <text name="help_label"> Alle Schritte werden gleichzeitig ausgeführt, wenn keine Pausen hinzugefügt wurden. </text> diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml index 62f9e1e9e5..14e666fd22 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml @@ -9,9 +9,6 @@ <floater.string name="Title"> Notizkarte: [NAME] </floater.string> - <floater.string label="Speichern" label_selected="Speichern" name="Save"> - Speichern - </floater.string> <text name="desc txt"> Beschreibung: </text> @@ -19,4 +16,5 @@ Wird geladen... </text_editor> <button label="Speichern" label_selected="Speichern" name="Save"/> + <button label="Löschen" label_selected="Löschen" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml index a656ffb894..c014b8e040 100644 --- a/indra/newview/skins/default/xui/de/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/de/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="FOTO-ANZEIGE"> <floater.string name="unknown"> unbekannt </floater.string> + <radio_group label="Fototyp" name="snapshot_type_radio"> + <radio_item label="Email" name="postcard"/> + <radio_item label="Mein Inventar ([AMOUNT] L$)" name="texture"/> + <radio_item label="Auf meinem Computer speichern" name="local"/> + </radio_group> + <text name="file_size_label"> + [SIZE] KB + </text> <button label="Foto aktualisieren" name="new_snapshot_btn"/> - <line_editor label="Beschreibung" name="description"/> - <panel name="panel_snapshot_main"> - <button label="Foto freigeben" name="share"/> - <button label="Foto speichern" name="save"/> - <button label="Als Profilbild festlegen" name="set_profile_pic"/> - </panel> - <panel name="panel_snapshot_share"> - <button label="Ins Internet stellen" name="share_to_web"/> - <button label="Foto per E-Mail senden" name="share_to_email"/> - <button label="Zurück" name="cancel_share"/> - </panel> - <panel name="panel_snapshot_save"> - <button label="Objekt in meinem Inventar speichern" name="save_to_inventory"/> - <button label="Auf meinem Computer speichern" name="save_to_computer"/> - <button label="Zurück" name="cancel_save"/> - </panel> + <button label="Senden" name="send_btn"/> + <button label="Speichern ([AMOUNT] L$)" name="upload_btn"/> + <flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern"> + <flyout_button.item label="Speichern" name="save_item"/> + <flyout_button.item label="Speichern unter..." name="saveas_item"/> + </flyout_button> + <button label="Mehr" name="more_btn" tool_tip="Erweiterte Optionen"/> + <button label="Weniger" name="less_btn" tool_tip="Erweiterte Optionen"/> + <button label="Abbrechen" name="discard_btn"/> + <text name="type_label2"> + Größe + </text> + <text name="format_label"> + Format + </text> + <combo_box label="Auflösung" name="postcard_size_combo"> + <combo_box.item label="Aktuelles Fenster" 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="Benutzerdefiniert" name="Custom"/> + </combo_box> + <combo_box label="Auflösung" name="texture_size_combo"> + <combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/> + <combo_box.item label="Klein (128x128)" name="Small(128x128)"/> + <combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Groß (512x512)" name="Large(512x512)"/> + <combo_box.item label="Benutzerdefiniert" name="Custom"/> + </combo_box> + <combo_box label="Auflösung" name="local_size_combo"> + <combo_box.item label="Aktuelles Fenster" 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="Benutzerdefiniert" 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="Breite" name="snapshot_width"/> + <spinner label="Größe" name="snapshot_height"/> + <check_box label="Seitenverhältnis beibehalten" name="keep_aspect_check"/> + <slider label="Bildqualität" name="image_quality_slider"/> + <text name="layer_type_label"> + Aufnehmen: + </text> + <combo_box label="Bildlayer" name="layer_types"> + <combo_box.item label="Farben" name="Colors"/> + <combo_box.item label="Tiefe" name="Depth"/> + </combo_box> + <check_box label="Schnittstelle" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> + <check_box label="Nach dem Speichern offen lassen" name="keep_open_check"/> + <check_box label="Frame einfrieren (Vollbild)" name="freeze_frame_check"/> + <check_box label="Automatisch aktualisieren" name="auto_snapshot_check"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index c5c11faf93..12ae9898c3 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -67,8 +67,8 @@ <text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt"> þ: [COUNT] </text> - <check_box name="checkbox uniform"/> - <text name="checkbox uniform label"> + <check_box label="" name="checkbox uniform"/> + <text label="Beide Seiten dehnen" name="checkbox uniform label"> Beide Seiten dehnen </text> <check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/> diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml index 8de0133ead..21d49a32fe 100644 --- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Orte" name="voice_effects" title="VOICE-MORPHING AUSPROBIEREN"> +<floater label="Orte" name="voice_effects" title="VOICE MORPHING"> <string name="no_voice_effect"> (Kein Voice-Morphing) </string> @@ -12,18 +12,19 @@ <string name="new_voice_effect"> (Neu!) </string> + <text name="preview_text"> + Zur Vorschau + </text> <text name="status_text"> - Um die Voice-Morph-Effekte auszuprobieren, einfach auf die Schaltfläche „Aufnahme“ klicken und kurz ins Mikrofon sprechen. Klicken Sie dann auf einen beliebigen Effekt in der Liste, um zu hören, wie der Effekt Ihre Stimme verändert. - -Schließen Sie dieses Fenster, um wieder mit dem Voice-Chat in der Nähe verbunden zu werden. + Nehmen Sie Ihre Stimme auf, klicken Sie dann auf einen Effekt, um den Effekt auf Ihre Stimme anzuwenden. </text> - <button label="Aufnahme" name="record_btn" tool_tip="Nehmen Sie Ihre Stimme auf."/> + <button label="Aufnehmen" name="record_btn" tool_tip="Nehmen Sie Ihre Stimme auf."/> <button label="Stopp" name="record_stop_btn"/> <text name="voice_morphing_link"> - [[URL]Voice-Morphing abonnieren] + [[URL] Jetzt abonnieren] </text> <scroll_list name="voice_effect_list" tool_tip="Nehmen Sie Ihre Stimme auf und klicken Sie dann auf einen Effekt, um diesen auszuprobieren."> - <scroll_list.columns label="Voice-Morphing" name="name"/> + <scroll_list.columns label="Bezeichnung" name="name"/> <scroll_list.columns label="Gültig bis" name="expires"/> </scroll_list> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index fb3a4ba9b5..f54d8c3328 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -39,12 +39,12 @@ <text name="pg_label"> Generell </text> - <check_box label="Mature" name="event_mature_chk"/> - <text name="mature_label"> + <check_box label="Mature" name="events_mature_chk"/> + <text name="events_mature_label"> Moderat </text> - <check_box label="Adult" name="event_adult_chk"/> - <text name="adult_label"> + <check_box label="Adult" name="events_adult_chk"/> + <text name="events_adult_label"> Adult </text> </panel> diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml index 3af69d2f31..a47c633d57 100644 --- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml @@ -3,11 +3,13 @@ <menu_item_call label="Berühren" name="Attachment Object Touch"/> <menu_item_call label="Bearbeiten" name="Edit..."/> <menu_item_call label="Abnehmen" name="Detach"/> - <menu_item_call label="Fallen lassen" name="Drop"/> <menu_item_call label="Aufstehen" name="Stand Up"/> - <menu_item_call label="Mein Aussehen" name="Appearance..."/> + <menu_item_call label="Outfit ändern" name="Change Outfit"/> + <menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/> + <menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/> <menu_item_call label="Meine Freunde" name="Friends..."/> <menu_item_call label="Meine Gruppen" name="Groups..."/> <menu_item_call label="Mein Profil" name="Profile..."/> <menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/> + <menu_item_call label="Fallen lassen" name="Drop"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml index d310d10ea5..160703bcf3 100644 --- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml @@ -20,7 +20,9 @@ <context_menu label="Abnehmen ▶" name="Object Detach"/> <menu_item_call label="Alles abnehmen" name="Detach All"/> </context_menu> - <menu_item_call label="Mein Aussehen" name="Appearance..."/> + <menu_item_call label="Outfit ändern" name="Chenge Outfit"/> + <menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/> + <menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/> <menu_item_call label="Meine Freunde" name="Friends..."/> <menu_item_call label="Meine Gruppen" name="Groups..."/> <menu_item_call label="Mein Profil" name="Profile..."/> diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml index 3f12906adc..6c4308286a 100644 --- a/indra/newview/skins/default/xui/de/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/menu_bottomtray.xml @@ -4,6 +4,11 @@ <menu_item_check label="Schaltfläche Bewegungssteuerung" name="ShowMoveButton"/> <menu_item_check label="Schaltfläche Ansicht" name="ShowCameraButton"/> <menu_item_check label="Schaltfläche Foto" name="ShowSnapshotButton"/> + <menu_item_check label="Schaltfläche „Seitenleiste“" name="ShowSidebarButton"/> + <menu_item_check label="Schaltfläche „Bauen“" name="ShowBuildButton"/> + <menu_item_check label="Schaltfläche „Suchen“" name="ShowSearchButton"/> + <menu_item_check label="Schaltfläche „Karte“" name="ShowWorldMapButton"/> + <menu_item_check label="Schaltfläche „Minikarte“" name="ShowMiniMapButton"/> <menu_item_call label="Ausschneiden" name="NearbyChatBar_Cut"/> <menu_item_call label="Kopieren" name="NearbyChatBar_Copy"/> <menu_item_call label="Einfügen" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml index a74c41bb0c..b28e83c3e3 100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <menu name="Gear Menu"> <menu_item_call label="Aufstehen" name="stand_up"/> - <menu_item_call label="Mein Aussehen" name="my_appearance"/> + <menu_item_call label="Outfit ändern" name="change_outfit"/> <menu_item_call label="Mein Profil" name="my_profile"/> <menu_item_call label="Meine Freunde" name="my_friends"/> <menu_item_call label="Meine Gruppen" name="my_groups"/> diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index f6139a0ea0..dd49ab1c7e 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -54,6 +54,7 @@ <menu_item_call label="Objekt löschen" name="Purge Item"/> <menu_item_call label="Objekt wiederherstellen" name="Restore Item"/> <menu_item_call label="Öffnen" name="Open"/> + <menu_item_call label="Original öffnen" name="Open Original"/> <menu_item_call label="Eigenschaften" name="Properties"/> <menu_item_call label="Umbenennen" name="Rename"/> <menu_item_call label="Asset-UUID kopieren" name="Copy Asset UUID"/> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml index 605dee9b33..32a65c96fc 100644 --- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml @@ -4,6 +4,6 @@ <menu_item_call label="Anziehen - Aktuelles Outfit hinzufügen" name="wear_add"/> <menu_item_call label="Ausziehen - Aus aktuellem Outfit entfernen" name="take_off"/> <menu_item_call label="Outfit bearbeiten" name="edit"/> - <menu_item_call label="Umbenennen" name="rename"/> + <menu_item_call label="Outfit neu benennen" name="rename"/> <menu_item_call label="Outfit löschen" name="delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml index ca0d9f8c2d..d5281f0cb2 100644 --- a/indra/newview/skins/default/xui/de/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml @@ -14,8 +14,8 @@ <context_menu label="Moderator-Optionen >" name="Moderator Options"> <menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/> <menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/> - <menu_item_call label="Alle anderen stummschalten" name="ModerateVoiceMuteOthers"/> <menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Stummschaltung für alle anderen aufheben" name="ModerateVoiceUnMuteOthers"/> + <menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/> + <menu_item_call label="Alle freischalten" name="ModerateVoiceUnmute"/> </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml new file mode 100644 index 0000000000..5b0a724244 --- /dev/null +++ b/indra/newview/skins/default/xui/de/menu_topinfobar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_topinfobar"> + <menu_item_check label="Koordinaten anzeigen" name="Show Coordinates"/> + <menu_item_check label="Parzellen-Eigenschaften anzeigen" name="Show Parcel Properties"/> + <menu_item_call label="Landmarke" name="Landmark"/> + <menu_item_call label="Kopieren" name="Copy"/> +</menu> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 38ef1b0421..b9b6a8ed50 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -7,6 +7,7 @@ </menu_item_call> <menu_item_call label="L$ kaufen" name="Buy and Sell L$"/> <menu_item_call label="Mein Profil" name="Profile"/> + <menu_item_call label="Outfit ändern" name="ChangeOutfit"/> <menu_item_check label="Mein Inventar" name="Inventory"/> <menu_item_check label="Mein Inventar" name="ShowSidetrayInventory"/> <menu_item_check label="Meine Gesten" name="Gestures"/> @@ -169,6 +170,7 @@ <menu_item_check label="Flexible Objekte" name="Flexible Objects"/> </menu> <menu_item_check label="Mehrere Threads ausführen" name="Run Multiple Threads"/> + <menu_item_check label="Plugin Read Thread verwenden" name="Use Plugin Read Thread"/> <menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/> <menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/> <menu label="Tastaturkürzel" name="Shortcuts"> @@ -176,6 +178,7 @@ <menu_item_check label="Suchen" name="Search"/> <menu_item_call label="Tasten freigeben" name="Release Keys"/> <menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/> + <menu_item_check label="Erweitert-Menü anzeigen - veraltetet" name="Show Advanced Menu - legacy shortcut"/> <menu_item_check label="Immer rennen" name="Always Run"/> <menu_item_check label="Fliegen" name="Fly"/> <menu_item_call label="Fenster schließen" name="Close Window"/> diff --git a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml index a4bf75a497..027a68e72e 100644 --- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/de/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="Anziehen" name="wear"/> + <menu_item_call label="Ersetzen" name="wear"/> <menu_item_call label="Hinzufügen" name="wear_add"/> <menu_item_call label="Ausziehen / Abnehmen" name="take_off_or_detach"/> <menu_item_call label="Abnehmen" name="detach"/> diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml new file mode 100644 index 0000000000..d994571f01 --- /dev/null +++ b/indra/newview/skins/default/xui/de/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="Outfit bearbeiten" name="edit"/> +</menu> diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml new file mode 100644 index 0000000000..d690572c8e --- /dev/null +++ b/indra/newview/skins/default/xui/de/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="Outfit bearbeiten" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 408ece9690..fb75f62988 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -333,6 +333,9 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten </url> <usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/> </notification> + <notification name="InvalidCredentialFormat"> + Sie müssen den Vor- und Nachnamen Ihres Avatars in das Feld Benutzername eingeben, und sich dann erneut anmelden. + </notification> <notification name="AddClassified"> Anzeigen werden im Suchverzeichnis im Abschnitt „Anzeigen" und auf [http://secondlife.com/community/classifieds secondlife.com] für eine Woche angezeigt. Füllen Sie Ihre Anzeige aus und klicken Sie auf 'Veröffentlichen...', um sie zum Verzeichnis hinzuzufügen. @@ -618,6 +621,10 @@ Erwartet wurde [VALIDS] <notification name="CannotEncodeFile"> Datei konnte nicht kodiert werden: [FILE] </notification> + <notification name="CorruptedProtectedDataStore"> + Wir können Ihren Benutzernamen und Ihr Kennwort nicht automatisch ausfüllen. Dies kann passieren, wenn Sie die Netzwerkeinstellungen ändern. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CorruptResourceFile"> Ressourcendatei beschädigt: [FILE] </notification> @@ -1003,6 +1010,12 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN? Geben sie einen höheren Betrag ein. </notification> + <notification name="ConfirmItemDeleteHasLinks"> + Mindestens eines Ihrer ausgewählten Objekte verfügt über verknüpfte Objekte. Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr. Wir empfehlen Ihnen daher, diese Verknüpfungen zuerst zu löschen. + +Möchten Sie diese Objekte wirklich löschen? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> + </notification> <notification name="ConfirmObjectDeleteLock"> Mindestens ein ausgewähltes Objekt ist gesperrt. @@ -1153,6 +1166,42 @@ Bitte wählen Sie einen männlichen oder weiblichen Avatar. Sie können sich später noch umentscheiden. <usetemplate name="okcancelbuttons" notext="Weiblich" yestext="Männlich"/> </notification> + <notification name="CantTeleportToGrid"> + Konnte nicht zu [SLURL] teleportieren, da dieser Standort sich auf einem anderen Grid ([GRID]) befindet. Sie befinden sich im Moment auf dem Grid ([CURRENT_GRID]). Bitte schließen Sie Ihren Viewer und versuchen Sie es erneut. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GeneralCertificateError"> + Eine Verbindung zum Server konnte nicht hergestellt werden. +[REASON] + +SubjektName: [SUBJECT_NAME_STRING] +Herausgeber: [ISSUER_NAME_STRING] +Gültig ab: [VALID_FROM] +Gültig bis: [VALID_TO] +MD5 Fingerabdruck: [SHA1_DIGEST] +SHA1 Fingerabdruck: [MD5_DIGEST] +Verwendung: [KEYUSAGE] +Erweiterte Verwendung: [EXTENDEDKEYUSAGE] +Identifikation: [SUBJECTKEYIDENTIFIER] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="TrustCertificateError"> + Die Zertifizierungsautorität für diesen Server ist unbekannt. + +Zertifikatsinformation: +SubjektName: [SUBJECT_NAME_STRING] +Herausgeber: [ISSUER_NAME_STRING] +Gültig ab: [VALID_FROM] +Gültig bis: [VALID_TO] +MD5 Fingerabdruck: [SHA1_DIGEST] +SHA1 Fingerabdruck: [MD5_DIGEST] +Verwendung: [KEYUSAGE] +Erweiterte Verwendung: [EXTENDEDKEYUSAGE] +Identifikation: [SUBJECTKEYIDENTIFIER] + +Möchten Sie dieser Autorität vertrauen? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Vertrauen"/> + </notification> <notification name="NotEnoughCurrency"> [NAME] [PRICE] L$ Sie haben nicht genügend L$, um diese Aktion auszuführen. </notification> @@ -2660,6 +2709,9 @@ Für folgende Einwohner: <notification name="ItemsShared"> Objekte wurden erfolgreich freigegeben. </notification> + <notification name="DeedToGroupFail"> + Übertragung an Gruppe ist fehlgeschlagen. + </notification> <notification name="AvatarRezNotification"> (Seit [EXISTENCE] Sekunden inworld ) Avatar '[NAME]' wurde in [TIME] Sekunden gerezzt. @@ -2673,6 +2725,26 @@ Ihr Outfit wurde in [TIME] Sekunden gebacken. Nach [TIME] Sekunden wurde eine Aktualisierung Ihres Aussehens gesendet. [STATUS] </notification> + <notification name="AvatarRezCloudNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' wird als Wolke angezeigt. + </notification> + <notification name="AvatarRezArrivedNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' wird angezeigt. + </notification> + <notification name="AvatarRezLeftCloudNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' hat nach [TIME] Sekunden als Wolke die Welt verlassen. + </notification> + <notification name="AvatarRezEnteredAppearanceNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' befindet sich im Modus „Aussehen bearbeiten". + </notification> + <notification name="AvatarRezLeftAppearanceNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' hat Modus „Aussehen bearbeiten" verlassen. + </notification> <notification name="NoConnect"> Es gibt Probleme mit der Verbindung mit [PROTOCOL] [HOSTID]. Bitte überprüfen Sie Ihre Netzwerk- und Firewalleinstellungen. @@ -2691,12 +2763,25 @@ Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup. <button name="OK" text="OK"/> </form> </notification> + <notification name="AvatarRezLeftNotification"> + (Seit [EXISTENCE] Sekunden inworld ) +Avatar '[NAME]' hat als vollständig gerezzter Avatar die Welt verlassen. + </notification> <notification name="AvatarRezSelfBakeNotification"> (Seit [EXISTENCE] Sekunden inworld ) Die [RESOLUTION]-gebakene Textur für '[BODYREGION]' wurde in [TIME] Sekunden hochgeladen. </notification> + <notification name="ConfirmLeaveCall"> + Möchten Sie dieses Gespräch wirklich verlassen ? + <usetemplate ignoretext="Bestätigen, bevor ich den Anruf verlasse." name="okcancelignore" notext="Nein" yestext="Ja"/> + </notification> <notification name="ConfirmMuteAll"> - <usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="Abbrechen" yestext="OK"/> + Die von Ihnen ausgewählten Einstellungen werden alle Teilnehmer eines Gruppengespräches stummschalten. +Dies bedeutet, dass alle Einwohner, die später dem Gespräch beitreten, +auch dann stummgeschaltet werden, wenn Sie den Anruf verlassen haben. + +Alle stummschalten? + <usetemplate ignoretext="Bestätigen, bevor alle Teilnehmer in einem Gruppengespräch stummgeschaltet werden." name="okcancelignore" notext="Abbrechen" yestext="OK"/> </notification> <global name="UnsupportedCPU"> - Ihre CPU-Geschwindigkeit entspricht nicht den Mindestanforderungen. diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml new file mode 100644 index 0000000000..799586f021 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml @@ -0,0 +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="Ihnen fehlt die Berechtigung zum Bearbeiten."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Diese Form bearbeiten"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml new file mode 100644 index 0000000000..4d7e65405a --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="clothing_list_button_bar_panel"> + <button label="Austauschen" name="switch_btn"/> + <button label="Einkaufen >" name="bodyparts_shop_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml index 83f67344ca..ea15c88380 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip"> - Schaltet Mikrofon ein/aus - </string> - <string name="VoiceControlBtnToolTip"> - Voice-Chat-Steuerung anzeigen/ausblenden - </string> + <string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/> + <string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> - <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" /> + <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/> </talk_button> </layout_panel> <layout_panel name="gesture_panel"> @@ -24,6 +20,21 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Foto machen"/> </layout_panel> + <layout_panel name="sidebar_btn_panel"> + <button label="Seitenleiste" name="sidebar_btn" tool_tip="Seitenleiste anzeigen/ausblenden"/> + </layout_panel> + <layout_panel name="build_btn_panel"> + <button label="Bauen" name="build_btn" tool_tip="Bauwerkzeuge ein-/ausblenden"/> + </layout_panel> + <layout_panel name="search_btn_panel"> + <button label="Suche" name="search_btn" tool_tip="Suche anzeigen/ausblenden"/> + </layout_panel> + <layout_panel name="world_map_btn_panel"> + <button label="Karte" name="world_map_btn" tool_tip="Karte ein-/ausblenden"/> + </layout_panel> + <layout_panel name="mini_map_btn_panel"> + <button label="Minikarte" name="mini_map_btn" tool_tip="Minikarte ein-/ausblenden"/> + </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="IMs"/> diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml new file mode 100644 index 0000000000..fc45c9ce79 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="clothing_list_button_bar_panel"> + <button label="Hinzufügen +" name="add_btn"/> + <button label="Einkaufen >" name="clothing_shop_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml new file mode 100644 index 0000000000..945acb02d7 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="wearable_item"> + <button name="btn_delete" tool_tip="Von Outfit entfernen"/> + <text name="item_name" value="..."/> + <panel name="btn_lock" tool_tip="Ihnen fehlt die Berechtigung zum Bearbeiten."/> + <panel name="btn_edit_panel"> + <button name="btn_edit" tool_tip="Dieses tragbare Objekt bearbeiten"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml new file mode 100644 index 0000000000..12294a43ce --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="cof_wearables"> + <accordion name="cof_wearables_accordion"> + <accordion_tab name="tab_attachments" title="Anhänge"/> + <accordion_tab name="tab_clothing" title="Kleidung"/> + <accordion_tab name="tab_body_parts" title="Körperteile"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml new file mode 100644 index 0000000000..a27252e23e --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="deletable_wearable_item"> + <button name="btn_delete" tool_tip="Von Outfit entfernen"/> + <text name="item_name" value="..."/> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml new file mode 100644 index 0000000000..b7ad1bdc1b --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml @@ -0,0 +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="Weitere Artikel dieser Art hinzufügen"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml index d04dba7a3b..80d3b29cad 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml @@ -9,6 +9,7 @@ <string name="height"> Höhe: </string> + <text name="avatar_height"/> <panel label="Hemd" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Körper"/> diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml index 12649e9251..830c7b0bb8 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml @@ -4,5 +4,6 @@ <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/> <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/> <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/> + <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml index 7294a0b34f..faeea3a5de 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml @@ -90,12 +90,19 @@ <string name="tattoo_desc_text"> Tätowierung: </string> + <labeled_back_button label="Speichern" name="back_btn" tool_tip="Zurück zu Outfit bearbeiten"/> <text name="edit_wearable_title" value="Form bearbeiten"/> <panel label="Hemd" name="wearable_type_panel"> <text name="description_text" value="Form:"/> + <radio_group name="sex_radio"> + <radio_item label="" name="sex_male" tool_tip="Männlich" value="1"/> + <radio_item label="" name="sex_female" tool_tip="Weiblich" value="0"/> + </radio_group> + <icon name="male_icon" tool_tip="Männlich"/> + <icon name="female_icon" tool_tip="Weiblich"/> </panel> <panel name="button_panel"> <button label="Speichern unter" name="save_as_button"/> - <button label="Zurücksetzen" name="revert_button"/> + <button label="Änderungen rückgängig machen" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index 0c89946987..125bf1436e 100644 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml @@ -6,6 +6,9 @@ <panel.string name="cant_view_group_land_text"> Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen. </panel.string> + <panel.string name="epmty_view_group_land_text"> + Keine Einträge + </panel.string> <panel.string name="cant_view_group_accounting_text"> Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen. </panel.string> diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index cc5664bd97..f45b5ea7af 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -39,6 +39,7 @@ Maximal 200 pro Gruppe täglich <text name="string"> Das Objekt hierhin ziehen und ablegen, um es anzuhängen: </text> + <button label="Inventar" name="open_inventory" tool_tip="Inventar öffnen"/> <button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment" tool_tip="Anhang von Ihrer Benachrichtigung entfernen"/> <button label="Senden" label_selected="Senden" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Ziehen Sie ein Objekt aus Ihrem Inventar auf dieses Feld, um es mit dieser Mitteilung zu versenden. Um das Objekt anhängen zu können, müssen Sie die Erlaubnis zum Kopieren und Übertragen besitzen."/> diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 2a6ea42c73..0f02de866b 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -8,18 +8,15 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="first_name_text"> - Vorname: + <text name="username_text"> + Benutzername: </text> - <line_editor label="Vorname" name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/> - <text name="last_name_text"> - Nachname: - </text> - <line_editor label="Nachname" name="last_name_edit" tool_tip="[SECOND_LIFE] Nachname"/> + <line_editor label="Benutzername" name="username_edit" tool_tip="[SECOND_LIFE]-Benutzername"/> <text name="password_text"> Kennwort: </text> <check_box label="Kennwort merken" name="remember_check"/> + <button label="Anmelden" name="connect_btn"/> <text name="start_location_text"> Hier anfangen: </text> @@ -28,7 +25,6 @@ <combo_box.item label="Mein Zuhause" name="MyHome"/> <combo_box.item label="<Region eingeben>" name="Typeregionname"/> </combo_box> - <button label="Anmelden" name="connect_btn"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index d3eb9ae04c..2f00782ef0 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -9,62 +9,20 @@ <text name="ItemcountText"> Objekte: </text> - <menu_bar name="Inventory Menu"> - <menu label="Datei" name="File"> - <menu_item_call label="Öffnen" name="Open"/> - <menu label="Hochladen" name="upload"> - <menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/> - <menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/> - <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/> - <menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/> - </menu> - <menu_item_call label="Neues Fenster" name="New Window"/> - <menu_item_call label="Filter anzeigen" name="Show Filters"/> - <menu_item_call label="Filter zurücksetzen" name="Reset Current"/> - <menu_item_call label="Alle Ordner schließen" name="Close All Folders"/> - <menu_item_call label="Papierkorb ausleeren" name="Empty Trash"/> - <menu_item_call label="Fundstücke ausleeren" name="Empty Lost And Found"/> - </menu> - <menu label="Erstellen" name="Create"> - <menu_item_call label="Neuer Ordner" name="New Folder"/> - <menu_item_call label="Neues Skript" name="New Script"/> - <menu_item_call label="Neue Notizkarte" name="New Note"/> - <menu_item_call label="Neue Geste" name="New Gesture"/> - <menu label="Neue Kleider" name="New Clothes"> - <menu_item_call label="Neues Hemd" name="New Shirt"/> - <menu_item_call label="Neue Hose" name="New Pants"/> - <menu_item_call label="Neue Schuhe" name="New Shoes"/> - <menu_item_call label="Neue Socken" name="New Socks"/> - <menu_item_call label="Neue Jacke" name="New Jacket"/> - <menu_item_call label="Neuer Rock" name="New Skirt"/> - <menu_item_call label="Neue Handschuhe" name="New Gloves"/> - <menu_item_call label="Neues Unterhemd" name="New Undershirt"/> - <menu_item_call label="Neue Unterhose" name="New Underpants"/> - <menu_item_call label="Neues Alpha" name="New Alpha"/> - <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> - </menu> - <menu label="Neue Körperteile" name="New Body Parts"> - <menu_item_call label="Neue Form/Gestalt" name="New Shape"/> - <menu_item_call label="Neue Haut" name="New Skin"/> - <menu_item_call label="Neues Haar" name="New Hair"/> - <menu_item_call label="Neue Augen" name="New Eyes"/> - </menu> - </menu> - <menu label="Sortieren" name="Sort"> - <menu_item_check label="Nach Name" name="By Name"/> - <menu_item_check label="Nach Datum" name="By Date"/> - <menu_item_check label="Ordner immer nach Namen" name="Folders Always By Name"/> - <menu_item_check label="Systemordner nach oben" name="System Folders To Top"/> - </menu> - </menu_bar> <filter_editor label="Inventar filtern" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="MEIN INVENTAR" name="All Items"/> - <inventory_panel label="AKTUELL" name="Recent Items"/> + <recent_inventory_panel label="AKTUELL" name="Recent Items"/> </tab_container> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> - <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> - </panel> + <layout_stack name="bottom_panel"> + <layout_panel name="options_gear_btn_panel"> + <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> + </layout_panel> + <layout_panel name="add_btn_panel"> + <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> + </layout_panel> + <layout_panel name="trash_btn_panel"> + <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml index 91ba94b3d6..00a79e6bb3 100644 --- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml @@ -2,6 +2,8 @@ <!-- Side tray Outfit Edit panel --> <panel label="Outfit bearbeiten" name="outfit_edit"> <string name="No Outfit" value="Kein Outfit"/> + <string name="unsaved_changes" value="Ungespeicherte Änderungen"/> + <string name="now_editing" value="Wird bearbeitet"/> <panel.string name="not_available"> k.A. </panel.string> @@ -11,7 +13,9 @@ <string name="Filter.All" value="Alle"/> <string name="Filter.Clothes/Body" value="Kleider/Körper"/> <string name="Filter.Objects" value="Objekte"/> - <string name="Filter.Custom" value="Benutzerspezifischer Filter"/> + <string name="Filter.Clothing" value="Kleidung"/> + <string name="Filter.Bodyparts" value="Körperteile"/> + <string name="replace_body_part" value="Klicken, um Ihre aktuelle Form zu ersetzen"/> <text name="title" value="Outfit bearbeiten"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> @@ -23,7 +27,7 @@ <layout_panel label="IM Steuerkonsole" name="outfit_wearables_panel"> <layout_stack name="filter_panels"> <layout_panel name="add_button_and_combobox"> - <button label="Mehr hinzufügen" name="show_add_wearables_btn"/> + <button label="Mehr hinzufügen" name="show_add_wearables_btn" tool_tip="Öffnen/Schließen"/> </layout_panel> <layout_panel name="filter_panel"> <filter_editor label="Tragbare Inventarobjekte filtern" name="look_item_filter"/> @@ -34,6 +38,6 @@ </layout_stack> <panel name="save_revert_button_bar"> <button label="Speichern" name="save_btn"/> - <button label="Zurücksetzen" name="revert_btn"/> + <button label="Änderungen rückgängig machen" name="revert_btn" tool_tip="Zur zuletzt gespeicherten Version zurücksetzen"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml index 8b04cecd68..852efe41d7 100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml @@ -6,7 +6,7 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> + <dnd_button name="trash_btn" tool_tip="Ausgewähltes Outfit löschen"/> <button label="Speichern unter" name="save_btn"/> <button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index 59cc3a8b70..6db4cf76f1 100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -2,9 +2,9 @@ <!-- Side tray panel --> <panel label="Leute" name="people_panel"> <string name="no_recent_people" value="Hier sind keine Leute. Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/search/people Suche] oder die [secondlife:///app/worldmap Karte]."/> - <string name="no_filtered_recent_people" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche]."/> + <string name="no_filtered_recent_people" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]."/> <string name="no_one_near" value="Es ist niemand in der Nähe. Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/search/people Suche] oder die [secondlife:///app/worldmap Karte]."/> - <string name="no_one_filtered_near" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche]."/> + <string name="no_one_filtered_near" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]."/> <string name="no_friends_online" value="Keine Freunde online"/> <string name="no_friends" value="Keine Freunde"/> <string name="no_friends_msg"> @@ -12,11 +12,11 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte]. </string> <string name="no_filtered_friends_msg"> - Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche]. + Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]. </string> <string name="people_filter_label" value="Nach Leuten filtern"/> <string name="groups_filter_label" value="Nach Gruppen filtern"/> - <string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/> + <string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/> <string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/> <filter_editor label="Filter" name="filter_input"/> <tab_container name="tabs"> @@ -55,7 +55,7 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte]. <button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/> <button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/> <button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/> - <button label="Teilen" name="share_btn"/> + <button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/> <button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/> <button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/> <button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 52e616a402..7b6918ae24 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/> <check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/> - <check_box initial_value="true" label="Sidebar" name="appearance_sidebar_positioning" tool_tip="Use automatic camera positioning for sidebar"/> + <check_box initial_value="true" label="Seitenleiste" name="appearance_sidebar_positioning" tool_tip="Automatische Kameraposition für Seitenleiste verwenden"/> <check_box label="Mich im Mouselook anzeigen" name="first_person_avatar_visible"/> <check_box label="Mit Pfeiltasten bewegen" name="arrow_keys_move_avatar_check"/> <check_box label="2-mal-drücken-halten, um zu rennen" name="tap_tap_hold_to_run"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index bf150daf87..5c91b34a21 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -45,7 +45,7 @@ </text> <check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/> <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/> - <check_box label="Kompakten Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> + <check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> <text name="show_ims_in_label"> IMs anzeigen in: </text> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index 16b4598486..7077534719 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -1,19 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Grafik" name="Display panel"> - <text name="WindowSizeLabel"> - Fenstergröße: - </text> - <check_box label="Vollbildmodus verwenden" name="windowed mode"/> - <combo_box left="115" name="windowsize combo"> - <combo_box.item label="640x480" name="640x480"/> - <combo_box.item label="800x600" name="800x600"/> - <combo_box.item label="720x480 (NTSC)" name="720x480"/> - <combo_box.item label="768x576 (PAL)" name="768x576"/> - <combo_box.item label="1024x768" name="1024x768"/> - </combo_box> - <text name="UI Size:"> - UI-Größe: - </text> <text name="QualitySpeed"> Qualität und Geschwindigkeit: </text> @@ -63,6 +49,7 @@ m </text> <slider label="Max. Partikelzahl:" name="MaxParticleCount"/> + <slider label="Max. Anzahl an voll dargestellten Avataren:" name="MaxNumberAvatarDrawn"/> <slider label="Post-Processing-Qualität:" name="RenderPostProcess"/> <text name="MeshDetailText"> Gitterdetails: @@ -98,8 +85,8 @@ Beleuchtungsdetails: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Nur Sonne und Mond" name="SunMoon"/> - <radio_item label="Lokale Lichtquellen" name="LocalLights"/> + <radio_item label="Nur Sonne und Mond" name="SunMoon" value="0"/> + <radio_item label="Lokale Lichtquellen" name="LocalLights" value="1"/> </radio_group> <text name="TerrainDetailText"> Terraindetails: diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml index 363ee013e3..533deb8597 100644 --- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/de/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"> - Kein Voice-Morphing + Voice-Morphing Aus </string> <string name="preview_voice_effects"> Voice-Morphing ausprobieren ▶ @@ -10,6 +10,6 @@ Voice-Morphing abonnieren ▶ </string> <combo_box name="voice_effect" tool_tip="Wählen Sie einen Voice-Morph-Effekt aus, um Ihre Stimme zu verändern."> - <combo_box.item label="Kein Voice-Morphing" name="no_voice_effect"/> + <combo_box.item label="Voice-Morphing Aus" name="no_voice_effect"/> </combo_box> </panel> diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml index 7a280bd7ff..b43067fb95 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Outfits" name="appearance panel"> <string name="No Outfit" value="Kein Outfit"/> + <string name="Unsaved Changes" value="Ungespeicherte Änderungen"/> + <string name="Now Wearing" value="Aktuelles Outfit..."/> + <string name="Changing outfits" value="Outfits ändern"/> <panel name="panel_currentlook"> - <button label="Bearbeiten" name="editappearance_btn"/> - <text name="currentlook_title"> - (nicht gespeichert) + <button label="B" name="editappearance_btn"/> + <button label="Ö" name="openoutfit_btn"/> + <text name="currentlook_status"> + (Status) </text> <text name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> + <button label="" name="edit_outfit_btn" tool_tip="Diese Outfit bearbeiten"/> </panel> <filter_editor label="Outfits filtern" name="Filter"/> - <button label="Anziehen" name="wear_btn"/> - <button label="Neues Outfit" name="newlook_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index 96dd181854..f9bf2fe081 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml @@ -4,7 +4,7 @@ <panel name="button_panel"> <button label="Profil" name="info_btn" tool_tip="Objektprofil anzeigen"/> <button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/> - <button label="Shop" name="shop_btn" tool_tip="Marktplatz-Webseite öffnen"/> + <button label="Einkaufen" name="shop_btn" tool_tip="Marktplatz-Webseite öffnen"/> <button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/> <button label="Wiedergeben" name="play_btn"/> <button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/> diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml index 09935019ab..77b6076809 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml @@ -16,7 +16,7 @@ [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="Objektprofil"/> - <text name="where" value="(Inventar)"/> + <text name="origin" value="(Inventar)"/> <panel label=""> <text name="LabelItemNameTitle"> Name: diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index bc4f20df26..f6ae17239a 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -100,9 +100,21 @@ <string name="LoginDownloadingClothing"> Kleidung wird geladen... </string> + <string name="InvalidCertificate"> + Der Server hat ein ungültiges oder korruptes Zertifikate zurückgegeben. Bitte kontaktieren Sie den Grid-Administrator. + </string> + <string name="CertInvalidHostname"> + Ein ungültiger Hostname wurde verwendet, um auf den Server zuzugreifen. Bitte überprüfen Sie Ihre SLURL oder den Grid-Hostnamen. + </string> <string name="CertExpired"> Das vom Grid ausgegebene Zertifikate ist abgelaufen. Bitte überprüfen Sie Ihre Systemuhr oder kontaktieren Sie Ihren Grid-Administrator. </string> + <string name="CertKeyUsage"> + Das vom Server ausgegebene Zertifikat konnte nicht für SSL verwendet werden. Bitte kontaktieren Sie Ihren Grid-Administrator. + </string> + <string name="CertBasicConstraints"> + In der Zertifikatskette des Servers befanden sich zu viele Zertifikate. Bitte kontaktieren Sie Ihren Grid-Administrator. + </string> <string name="CertInvalidSignature"> Die Zertifikatsunterschrift des Gridservers konnte nicht bestätigt werden. Bitte kontaktieren Sie Ihren Grid-Administrator. </string> @@ -297,6 +309,9 @@ <string name="ReleaseNotes"> Versionshinweise </string> + <string name="RELEASE_NOTES_BASE_URL"> + http://wiki.secondlife.com/wiki/Release_Notes/ + </string> <string name="LoadingData"> Wird geladen... </string> @@ -852,6 +867,45 @@ <string name="invalid"> ungültig </string> + <string name="none"> + keine + </string> + <string name="shirt_not_worn"> + Hemd nicht getragen + </string> + <string name="pants_not_worn"> + Hosen nicht getragen + </string> + <string name="shoes_not_worn"> + Schuhe nicht getragen + </string> + <string name="socks_not_worn"> + Socken nicht getragen + </string> + <string name="jacket_not_worn"> + Jacke nicht getragen + </string> + <string name="gloves_not_worn"> + Handschuhe nicht getragen + </string> + <string name="undershirt_not_worn"> + Unterhemd nicht getragen + </string> + <string name="underpants_not_worn"> + Unterhose nicht getragen + </string> + <string name="skirt_not_worn"> + Rock nicht getragen + </string> + <string name="alpha_not_worn"> + Alpha nicht getragen + </string> + <string name="tattoo_not_worn"> + Tätowierung nicht getragen + </string> + <string name="invalid_not_worn"> + ungültig + </string> <string name="NewWearable"> Neue/r/s [WEARABLE_ITEM] </string> @@ -925,7 +979,10 @@ ESC drücken, um zur Normalansicht zurückzukehren </string> <string name="InventoryNoMatchingItems"> - Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all Suche]. + Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all/[SEARCH_TERM] Suche]. + </string> + <string name="PlacesNoMatchingItems"> + Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/places/[SEARCH_TERM] Suche]. </string> <string name="FavoritesNoMatchingItems"> Landmarke hier hin ziehen, um diese hinzuzufügen. @@ -961,6 +1018,7 @@ <string name="Wave" value=" Winken"/> <string name="HelloAvatar" value=" Hallo Avatar!"/> <string name="ViewAllGestures" value=" Alle anzeigen >>"/> + <string name="GetMoreGestures" value="Mehr >>"/> <string name="Animations" value=" Animationen,"/> <string name="Calling Cards" value=" Visitenkarten,"/> <string name="Clothing" value=" Kleidung,"/> @@ -1037,7 +1095,7 @@ <string name="InvFolder Gestures"> Gesten </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoriten </string> <string name="InvFolder Current Outfit"> @@ -1579,7 +1637,7 @@ Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden. Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden. </string> <string name="MuteByName"> - (nach Namen) + (Nach Namen) </string> <string name="MuteAgent"> (Einwohner) @@ -1590,6 +1648,9 @@ <string name="MuteGroup"> (Gruppe) </string> + <string name="MuteExternal"> + (Extern) + </string> <string name="RegionNoCovenant"> Für diesen Grundbesitz liegt kein Vertrag vor. </string> @@ -3405,6 +3466,15 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="answered_call"> Ihr Anruf wurde entgegengenommen </string> + <string name="you_started_call"> + Sie haben einen Voice-Anruf begonnen + </string> + <string name="you_joined_call"> + Sie sind dem Gespräch beigetreten + </string> + <string name="name_started_call"> + [NAME] hat einen Voice-Anruf begonnen + </string> <string name="ringing-im"> Verbindung wird hergestellt... </string> @@ -3617,6 +3687,57 @@ Missbrauchsbericht <string name="Contents"> Inhalt </string> + <string name="Gesture"> + Gesten + </string> + <string name="Male Gestures"> + Männliche Gesten + </string> + <string name="Female Gestures"> + Weibliche Gesten + </string> + <string name="Other Gestures"> + Andere Gesten + </string> + <string name="Speech Gestures"> + Sprachgesten + </string> + <string name="Common Gestures"> + Häufig verwendete Gesten + </string> + <string name="Male - Excuse me"> + Männlich - Excuse me + </string> + <string name="Male - Get lost"> + Männlich - Get lost + </string> + <string name="Male - Blow kiss"> + Männlich - Kusshand + </string> + <string name="Male - Boo"> + Männlich - Buh + </string> + <string name="Male - Bored"> + Männlich - Gelangweilt + </string> + <string name="Male - Hey"> + Männlich - Hey + </string> + <string name="Male - Laugh"> + Männlich - Lachen + </string> + <string name="Male - Repulsed"> + Männlich - Angewidert + </string> + <string name="Male - Shrug"> + Männlich - Achselzucken + </string> + <string name="Male - Stick tougue out"> + Männlich - Zunge herausstrecken + </string> + <string name="Male - Wow"> + Männlich - Wow + </string> <string name="Female - Excuse me"> Weiblich - Räuspern </string> @@ -3629,6 +3750,27 @@ Missbrauchsbericht <string name="Female - Boo"> Weiblich - Buh </string> + <string name="Female - Bored"> + Weiblich - Gelangweilt + </string> + <string name="Female - Hey"> + Weiblich - Hey + </string> + <string name="Female - Laugh"> + Weiblich - Lachen + </string> + <string name="Female - Repulsed"> + Weiblich - Angewidert + </string> + <string name="Female - Shrug"> + Weiblich - Achselzucken + </string> + <string name="Female - Stick tougue out"> + Weiblich - Zunge herausstrecken + </string> + <string name="Female - Wow"> + Weiblich - Wow + </string> <string name="AvatarBirthDateFormat"> [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] </string> diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index 632564d793..a60e9afab1 100644 --- a/indra/newview/skins/default/xui/en/alert_button.xml +++ b/indra/newview/skins/default/xui/en/alert_button.xml @@ -5,7 +5,7 @@ label_shadow="true" auto_resize="false" image_overlay_alignment="center" - use_ellipses="flse" + use_ellipses="false" pad_right="10" pad_left="10" is_toggle="false" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 33e89d52de..f46f00ff12 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -191,9 +191,10 @@ type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left_pad="2" + valign="center" name="ContentRatingText" top_delta="0" width="250"> @@ -207,7 +208,7 @@ layout="topleft" left="10" name="Owner:" - top_pad="5" + top_pad="1" width="100"> Owner: </text> @@ -730,8 +731,10 @@ Leyla Linden </text> height="16" layout="topleft" left_pad="10" + top_delta="-3" mouse_opaque="false" name="region_maturity_text" + valign="center" width="150"> Adult </text> @@ -744,6 +747,7 @@ Leyla Linden </text> left="10" mouse_opaque="false" name="resellable_lbl" + top_pad="9" width="100"> Resale: </text> @@ -1490,6 +1494,7 @@ Only large parcels can be listed in search. layout="topleft" left="14" name="snapshot_ctrl" + fallback_image="default_land_picture.j2c" tool_tip="Click to choose a picture" width="195" /> <text @@ -1924,6 +1929,8 @@ Only large parcels can be listed in search. left_delta="0" name="public_access" top_pad="5" + label_text.valign="center" + label_text.v_pad="-7" width="278" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 3b4cf2c0b7..116f3c49c5 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -380,6 +380,7 @@ supports [AMOUNT2] objects width="275" /> <texture_picker enabled="false" + fallback_image="default_land_picture.j2c" follows="top|left" height="135" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index d9c9d63c72..887cedc33f 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -266,7 +266,6 @@ layout="topleft" left="6" name="create_event_btn" - picture_style="true" tool_tip="Create Event" width="18" /> <button @@ -280,7 +279,6 @@ left="6" top_pad="-7" name="god_delete_event_btn" - picture_style="true" tool_tip="Delete Event" width="18" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index a0e28f7a42..efd96624ab 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -54,6 +54,9 @@ name="ToolTipMsg"> [AGENT][REGION](Double-click to open Map) </floater.string> + <floater.string name="mini_map_caption"> + MINIMAP + </floater.string> <net_map bg_color="NetMapBackgroundColor" follows="top|left|bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 28616d503b..ec097a8e87 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater border_visible="false" - border_drop_shadow_visible="false" - drop_shadow_visible="false" border="false" bg_opaque_image="Window_Foreground" bg_alpha_image="Window_Background" @@ -26,20 +24,20 @@ save_visibility="true" single_instance="true" width="320"> - <chat_history - allow_html="true" - bg_readonly_color="ChatHistoryBgColor" - bg_writeable_color="ChatHistoryBgColor" - follows="all" - left="5" - top="20" - layout="topleft" - height="275" - name="chat_history" - parse_highlights="true" - text_color="ChatHistoryTextColor" - text_readonly_color="ChatHistoryTextColor" - right_widget_pad="5" - left_widget_pad="0" - width="315" /> + <chat_history + allow_html="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + follows="all" + left="5" + top="20" + layout="topleft" + height="275" + name="chat_history" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + right_widget_pad="5" + left_widget_pad="0" + width="315" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml index 3225843d09..f25c170f33 100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -5,7 +5,6 @@ height="200" layout="topleft" name="publish_classified" - help_topic="price_for_listing" title="Publishing Classified" width="320"> <text @@ -29,8 +28,8 @@ Remember, Classified fees are non-refundable. halign="left" height="23" increment="1" - label_width="70" - label="Price for Ad: " + label_width="45" + label="Price: L$ " v_pad="10" layout="topleft" left="15" @@ -41,27 +40,6 @@ Remember, Classified fees are non-refundable. top_pad="10" tool_tip="Price for listing." width="150" /> - <text - follows="top|left" - font="SansSerif" - height="60" - layout="topleft" - left_pad="5" - top_delta="0" - word_wrap="true" - value="L$" - name="l$_text" /> - <text - follows="top|right" - font="SansSerif" - height="20" - layout="topleft" - left="15" - name="more_info_text" - top_pad="-20" - width="300"> -More info (link to classified help) - </text> <button follows="top|left" height="22" diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index f9dacf0207..b87cb9a433 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -361,8 +361,7 @@ <stat_view name="physicsdetail" label="Physics Details" - show_label="true" - display_children="false"> + show_label="true"> <stat_bar name="physicspinnedtasks" label="Pinned Objects" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 2296d7e681..391a6f99be 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -335,7 +335,6 @@ </combo_box> <button left_pad="0" - image_disabled="ForwardArrow_Disabled" image_selected="ForwardArrow_Press" image_unselected="ForwardArrow_Off" layout="topleft" @@ -1020,7 +1019,7 @@ follows="left|top" allow_text_entry="false" height="23" - intial_value="2" + initial_value="2" max_chars="20" mouse_opaque="true" name="sale type" @@ -2191,8 +2190,6 @@ even though the user gets a free copy. width="60" /> <color_swatch can_apply_immediately="true" - bevel_style="none" - border_style="line" color="0.5 0.5 0.5 1" border.border_thickness="0" follows="left|top" @@ -2227,43 +2224,71 @@ even though the user gets a free copy. name="Light Intensity" top_pad="3" width="128" /> - <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" - increment="0.1" initial_val="0.5" label="FOV" label_width="55" - left="144" max_val="3" min_val="0" mouse_opaque="true" - name="Light FOV" width="120" /> - <spinner - follows="left|top" - height="19" - initial_value="5" - label="Radius" - label_width="70" - layout="topleft" - left="10" - max_val="20" - name="Light Radius" - top_pad="3" - width="128" /> - <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" - increment="0.5" initial_val="0.5" label="Focus" label_width="55" - left="144" max_val="20" min_val="-20" mouse_opaque="true" - name="Light Focus" width="120" /> - <spinner - follows="left|top" - height="19" - increment="0.25" - initial_value="1" - label="Falloff" - label_width="70" - layout="topleft" - left="10" - max_val="2" - name="Light Falloff" - top_pad="3" - width="128" /> - <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" - increment="0.05" initial_val="1" label="Ambiance" label_width="55" - left="144" max_val="1" min_val="0" mouse_opaque="true" - name="Light Ambiance" width="120" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.1" + initial_value="0.5" + label="FOV" + label_width="55" + left="144" + max_val="3" + min_val="0" + mouse_opaque="true" + name="Light FOV" + width="120" /> + <spinner follows="left|top" + height="19" + initial_value="5" + label="Radius" + label_width="70" + layout="topleft" + left="10" + max_val="20" + name="Light Radius" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.5" + initial_value="0.5" + label="Focus" + label_width="55" + left="144" + max_val="20" + min_val="-20" + mouse_opaque="true" + name="Light Focus" + width="120" /> + <spinner follows="left|top" + height="19" + increment="0.25" + initial_value="1" + label="Falloff" + label_width="70" + layout="topleft" + left="10" + max_val="2" + name="Light Falloff" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.05" + initial_value="1" + label="Ambiance" + label_width="55" + left="144" + max_val="1" + min_val="0" + mouse_opaque="true" + name="Light Ambiance" + width="120" /> </panel> <panel border="false" @@ -2288,6 +2313,7 @@ even though the user gets a free copy. <texture_picker can_apply_immediately="true" default_image_name="Default" + fallback_image="locked_image.j2c" follows="left|top" height="80" label="Texture" 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/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index f629eef475..8aeec46ba3 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -36,7 +36,6 @@ Owner [OWNER] top="6" use_ellipses="true" word_wrap="true" - value="Test Object Name That Is actually two lines and Really Long" width="220" /> <text follows="all" @@ -74,7 +73,6 @@ L$30,000 use_ellipses="true" width="220" word_wrap="true"> -This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really? </text> <!-- Overlapping buttons for all default actions. Show "Buy" if for sale, "Sit" if can sit, etc. --> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 72ab6195bc..a1ca910cbb 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -199,7 +199,15 @@ mouse_opaque="false" name="popup_holder" class="popup_holder" - width="1024"/> + width="1024"> + <icon follows="right|bottom" + image_name="Resize_Corner" + right="-1" + name="resize_corner" + width="11" + bottom="-1" + height="11" /> + </panel> <menu_holder top="0" follows="all" height="768" diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index dc51ae8b92..7239b13466 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -44,61 +44,67 @@ <menu_item_call.on_enable function="Attachment.EnableDetach" /> </menu_item_call> - <menu_item_call - enabled="false" - label="Drop" - layout="topleft" - name="Drop"> - <menu_item_call.on_click - function="Attachment.Drop" /> - <menu_item_call.on_enable - function="Attachment.EnableDrop" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - - <menu_item_call - label="Stand Up" - layout="topleft" - name="Stand Up"> - <menu_item_call.on_click - function="Self.StandUp" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableStandUp" /> - </menu_item_call> - <menu_item_call - label="Change Outfit" - name="Change Outfit"> - <menu_item_call.on_click - function="CustomizeAvatar" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call - label="My Friends" - layout="topleft" - name="Friends..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="friends_panel" /> - </menu_item_call> - <menu_item_call - label="My Groups" - layout="topleft" - name="Groups..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="groups_panel" /> - </menu_item_call> - <menu_item_call - label="My Profile" - layout="topleft" - name="Profile..."> - <menu_item_call.on_click - function="ShowAgentProfile" - parameter="agent" /> - </menu_item_call> + <menu_item_separator + layout="topleft" /> + + <menu_item_call +label="Stand Up" +layout="topleft" +name="Stand Up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call> + <menu_item_call + label="Change Outfit" + name="Change Outfit"> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Outfit" +layout="topleft" +name="Edit Outfit"> + <menu_item_call.on_click + function="EditOutfit" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Shape" + layout="topleft" + name="Edit My Shape"> + <menu_item_call.on_click + function="EditShape" /> + <menu_item_call.on_enable + function="Edit.EnableEditShape" /> + </menu_item_call> + <menu_item_call + label="My Friends" + layout="topleft" + name="Friends..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + layout="topleft" + name="Groups..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_call + label="My Profile" + layout="topleft" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> <menu_item_call label="Debug Textures" name="Debug..."> @@ -107,4 +113,16 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Drop" + layout="topleft" + name="Drop"> + <menu_item_call.on_click + function="Attachment.Drop" /> + <menu_item_call.on_enable + function="Attachment.EnableDrop" /> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml index 12ee9b045b..206d49e8c7 100644 --- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml +++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml @@ -13,34 +13,24 @@ parameter="take_off" /> </menu_item_call> <menu_item_call - label="Move Up a Layer" - layout="topleft" - name="move_up"> - <on_click - function="Clothing.MoveUp" /> - <on_enable - function="Clothing.OnEnable" - parameter="move_up" /> - </menu_item_call> - <menu_item_call - label="Move Down a Layer" + label="Edit" layout="topleft" - name="move_down"> + name="edit"> <on_click - function="Clothing.MoveDown" /> + function="Clothing.Edit" /> <on_enable function="Clothing.OnEnable" - parameter="move_down" /> + parameter="edit" /> </menu_item_call> <menu_item_call - label="Edit" + label="Replace" layout="topleft" - name="edit"> + name="replace"> <on_click - function="Clothing.Edit" /> + function="Clothing.Replace" /> <on_enable function="Clothing.OnEnable" - parameter="edit" /> + parameter="replace" /> </menu_item_call> <menu_item_call label="Create New" diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml index 68f3cb532c..fab76c497c 100644 --- a/indra/newview/skins/default/xui/en/menu_edit.xml +++ b/indra/newview/skins/default/xui/en/menu_edit.xml @@ -52,6 +52,7 @@ <menu_item_call label="Delete" name="Delete" + allow_key_repeat="true" shortcut="Del"> <menu_item_call.on_click function="Edit.Delete" /> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 221457ac1f..5c19f1932d 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -606,7 +606,7 @@ </menu_item_call> <menu_item_separator layout="topleft" - name="Attach Separator"/> + name="Wearable And Object Separator"/> <menu_item_call label="Detach From Yourself" layout="topleft" @@ -629,10 +629,10 @@ <menu_item_call label="Wear" layout="topleft" - name="Object Wear"> + name="Wearable And Object Wear"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="attach" /> + parameter="wear" /> </menu_item_call> <menu label="Attach To" @@ -642,9 +642,6 @@ label="Attach To HUD" layout="topleft" name="Attach To HUD" /> - <menu_item_separator - layout="topleft" - name="Wearable Separator"/> <menu_item_call label="Edit" layout="topleft" @@ -654,14 +651,6 @@ parameter="edit" /> </menu_item_call> <menu_item_call - label="Wear" - layout="topleft" - name="Wearable Wear"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="wear" /> - </menu_item_call> - <menu_item_call label="Add" layout="topleft" name="Wearable Add"> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index 62365f7cc2..c394700081 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -81,6 +81,17 @@ function="Inventory.GearDefault.Enable" parameter="save_texture" /> </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share" + visible="true"> + <on_click + function="Inventory.Share" /> + <on_enable + function="Inventory.GearDefault.Enable" + parameter="share" /> + </menu_item_call> <menu_item_call label="Find Original" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 6ca8766e3f..397e61c97a 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -18,7 +18,7 @@ name="Edit..."> <menu_item_call.on_click function="Object.Edit" /> - <menu_item_call.on_visible + <menu_item_call.on_enable function="EnableEdit"/> </menu_item_call> <menu_item_call @@ -26,7 +26,7 @@ name="Build"> <menu_item_call.on_click function="Object.Build" /> - <menu_item_call.on_visible + <menu_item_call.on_enable function="EnableEdit"/> </menu_item_call> <menu_item_call @@ -44,7 +44,7 @@ name="Object Sit"> <menu_item_call.on_click function="Object.SitOrStand" /> - <menu_item_call.on_visible + <menu_item_call.on_enable function="Object.SitVisible" /> <menu_item_call.on_enable function="Object.EnableSitOrStand" @@ -56,7 +56,7 @@ name="Object Stand Up"> <menu_item_call.on_click function="Object.SitOrStand" /> - <menu_item_call.on_visible + <menu_item_call.on_enable function="Object.StandUpVisible" /> <menu_item_call.on_enable function="Object.EnableSitOrStand" diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index 16b33eff89..732b8a788d 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu layout="topleft" + visible="false" name="Gear Outfit"> <menu_item_call label="Wear - Replace Current Outfit" @@ -16,6 +17,16 @@ parameter="wear" /> </menu_item_call> <menu_item_call + label="Wear - Add to Current Outfit" + layout="topleft" + name="wear_add"> + <on_click + function="Gear.WearAdd" /> + <on_enable + function="Gear.OnEnable" + parameter="wear_add" /> + </menu_item_call> + <menu_item_call label="Take Off - Remove from Current Outfit" layout="topleft" name="take_off"> @@ -176,6 +187,19 @@ <menu_item_separator name="sepatator2" /> <menu_item_call + label="Rename Outfit" + layout="topleft" + name="rename"> + <on_click + function="Gear.Rename" /> + <on_enable + function="Gear.OnEnable" + parameter="rename" /> + <on_visible + function="Gear.OnVisible" + parameter="rename" /> + </menu_item_call> + <menu_item_call label="Delete Outfit" layout="topleft" name="delete_outfit"> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml index 9c3151fe07..8c8bb29baf 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml @@ -8,6 +8,9 @@ name="wear_replace"> <on_click function="Outfit.WearReplace" /> + <on_enable + function="Outfit.OnEnable" + parameter="wear_replace" /> <on_visible function="Outfit.OnVisible" parameter="wear_replace" /> diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index efea2ae3e8..c3adbb7904 100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -4,11 +4,18 @@ <menu_item_call label="Replace" layout="topleft" - name="wear"> + name="wear_replace"> <on_click function="Wearable.Wear" /> </menu_item_call> <menu_item_call + label="Wear" + layout="topleft" + name="wear_wear"> + <on_click + function="Wearable.Add" /> + </menu_item_call> + <menu_item_call label="Add" layout="topleft" name="wear_add"> @@ -73,4 +80,10 @@ <on_click function="Wearable.CreateNew" /> </menu_item_call> + <menu_item_call + label="--no options--" + layout="topleft" + name="--no options--" + translate="false"> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml new file mode 100644 index 0000000000..747352cb29 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + visible="false" + name="Gear Wearing"> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Gear.Edit" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml new file mode 100644 index 0000000000..85505f9972 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Wearing"> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Wearing.Edit" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fc24cc00e2..92e71e3b01 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -817,6 +817,17 @@ Delete pick <nolink>[PICK]</nolink>? <notification icon="alertmodal.tga" + name="DeleteOutfits" + type="alertmodal"> + Delete the selected outfit/s? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="PromptGoToEventsPage" type="alertmodal"> Go to the [SECOND_LIFE] events web page? @@ -4963,6 +4974,10 @@ If you want to view streaming media on parcels that support it you should go to persist="true" type="notify"> No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. + <unique> + <context key="[MIME_TYPE]"/> + </unique> + </notification> <notification icon="alertmodal.tga" diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index bdfa928b1d..06bd1e9ff4 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -3,7 +3,7 @@ <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime--> <!-- Non of string values of controls below are visible to user. They are not need to be translated. --> <accordion_tab - display_children="false" + expanded="false" follows="all" height="45" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 4eff5bc48a..4b622691b3 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -503,5 +503,17 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well </button> </chiclet_notification> </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + name="DUMMY2" + top="0" + width="8" /> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 976f6d6cd0..b7fd9773f2 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -46,7 +46,6 @@ image_unselected="BackButton_Off" layout="topleft" name="back_btn" - picture_style="true" left="10" tab_stop="false" top="2" diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml index f016c27b0a..f438e3d42d 100644 --- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -22,24 +22,25 @@ width="311"> <accordion_tab layout="topleft" - name="tab_attachments" - title="Attachments"> + name="tab_clothing" + title="Clothing"> <flat_list_view allow_select="true" follows="all" height="10" item_pad="3" + keep_selection_visible_on_reshape="true" layout="topleft" left="0" multi_select="true" - name="list_attachments" + name="list_clothing" top="0" width="311" /> </accordion_tab> <accordion_tab layout="topleft" - name="tab_clothing" - title="Clothing"> + name="tab_attachments" + title="Attachments"> <flat_list_view allow_select="true" follows="all" @@ -47,10 +48,14 @@ item_pad="3" layout="topleft" left="0" + keep_selection_visible_on_reshape="true" multi_select="true" - name="list_clothing" + name="list_attachments" top="0" - width="311" /> + width="311"> + <flat_list_view.no_items_text + value="No attachments worn" /> + </flat_list_view> </accordion_tab> <accordion_tab layout="topleft" @@ -61,6 +66,7 @@ follows="all" height="10" item_pad="3" + keep_selection_visible_on_reshape="true" layout="topleft" left="0" multi_select="true" diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 6744a7b9c2..cbdd548577 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -30,7 +30,6 @@ image_unselected="BackButton_Off" layout="topleft" name="back_btn" - picture_style="true" left="10" tab_stop="false" top="2" @@ -254,35 +253,6 @@ width="20"/> </icons_combo_box.item> </icons_combo_box> - <text - follows="left|top" - font.style="BOLD" - height="10" - layout="topleft" - left="10" - name="price_for_listing_label" - text_color="white" - top_pad="15" - value="Price for listing:" - width="250" /> - <spinner - decimal_digits="0" - follows="left|top" - halign="left" - height="23" - increment="1" - label_width="20" - label="L$" - v_pad="10" - layout="topleft" - left="10" - value="50" - min_val="50" - max_val="99999" - name="price_for_listing" - top_pad="5" - tool_tip="Price for listing." - width="105" /> <check_box height="16" label="Auto renew each week" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 8afdec690b..e3cf25634b 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -147,6 +147,7 @@ allow_no_texture="true" default_image_name="None" enabled="false" + fallback_image="default_profile_picture.j2c" follows="top|left" height="124" layout="topleft" @@ -203,6 +204,7 @@ allow_no_texture="true" default_image_name="None" enabled="false" + fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 3106ed34ff..484617df34 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -1,428 +1,436 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bevel_style="in" + bevel_style="in" follows="all" height="570" + help_topic="edit_wearable" label="Wearable" layout="topleft" -left="0" - help_topic="edit_wearable" + left="0" name="panel_edit_wearable" - top="0" + top="0" width="333"> - <string - name="edit_shape_title"> - Editing Shape - </string> - <string - name="edit_skin_title"> - Editing Skin - </string> - <string - name="edit_hair_title"> - Editing Hair - </string> - <string - name="edit_eyes_title"> - Editing Eyes - </string> - <string - name="edit_shirt_title"> - Editing Shirt - </string> - <string - name="edit_pants_title"> - Editing Pants - </string> - <string - name="edit_shoes_title"> - Editing Shoes - </string> - <string - name="edit_socks_title"> - Editing Socks - </string> - <string - name="edit_jacket_title"> - Editing Jacket - </string> - <string - name="edit_skirt_title"> - Editing Skirt - </string> - <string - name="edit_gloves_title"> - Editing Gloves - </string> - <string - name="edit_undershirt_title"> - Editing Undershirt - </string> - <string - name="edit_underpants_title"> - Editing Underpants - </string> - <string - name="edit_alpha_title"> - Editing Alpha Mask - </string> - <string - name="edit_tattoo_title"> - Editing Tattoo - </string> - <string - name="shape_desc_text"> - Shape: - </string> - <string - name="skin_desc_text"> - Skin: - </string> - <string - name="hair_desc_text"> - Hair: - </string> - <string - name="eyes_desc_text"> - Eyes: - </string> - <string - name="shirt_desc_text"> - Shirt: - </string> - <string - name="pants_desc_text"> - Pants: - </string> - <string - name="shoes_desc_text"> - Shoes: - </string> - <string - name="socks_desc_text"> - Socks: - </string> - <string - name="jacket_desc_text"> - Jacket: - </string> - <string - name="skirt_desc_text"> - Skirt: - </string> - <string - name="gloves_desc_text"> - Gloves: - </string> - <string - name="undershirt_desc_text"> - Undershirt: - </string> - <string - name="underpants_desc_text"> - Underpants: - </string> - <string - name="alpha_desc_text"> - Alpha Mask: - </string> - <string - name="tattoo_desc_text"> - Tattoo: - </string> - <button + <string + name="edit_shape_title"> + Editing Shape + </string> + <string + name="edit_skin_title"> + Editing Skin + </string> + <string + name="edit_hair_title"> + Editing Hair + </string> + <string + name="edit_eyes_title"> + Editing Eyes + </string> + <string + name="edit_shirt_title"> + Editing Shirt + </string> + <string + name="edit_pants_title"> + Editing Pants + </string> + <string + name="edit_shoes_title"> + Editing Shoes + </string> + <string + name="edit_socks_title"> + Editing Socks + </string> + <string + name="edit_jacket_title"> + Editing Jacket + </string> + <string + name="edit_skirt_title"> + Editing Skirt + </string> + <string + name="edit_gloves_title"> + Editing Gloves + </string> + <string + name="edit_undershirt_title"> + Editing Undershirt + </string> + <string + name="edit_underpants_title"> + Editing Underpants + </string> + <string + name="edit_alpha_title"> + Editing Alpha Mask + </string> + <string + name="edit_tattoo_title"> + Editing Tattoo + </string> + <string + name="shape_desc_text"> + Shape: + </string> + <string + name="skin_desc_text"> + Skin: + </string> + <string + name="hair_desc_text"> + Hair: + </string> + <string + name="eyes_desc_text"> + Eyes: + </string> + <string + name="shirt_desc_text"> + Shirt: + </string> + <string + name="pants_desc_text"> + Pants: + </string> + <string + name="shoes_desc_text"> + Shoes: + </string> + <string + name="socks_desc_text"> + Socks: + </string> + <string + name="jacket_desc_text"> + Jacket: + </string> + <string + name="skirt_desc_text"> + Skirt: + </string> + <string + name="gloves_desc_text"> + Gloves: + </string> + <string + name="undershirt_desc_text"> + Undershirt: + </string> + <string + name="underpants_desc_text"> + Underpants: + </string> + <string + name="alpha_desc_text"> + Alpha Mask: + </string> + <string + name="tattoo_desc_text"> + Tattoo: + </string> + <!-- Default width of the button should be to show it without label. + Button will be extedned in code to show whole label when wearable is being changed. + --> + <labeled_back_button follows="top|left" height="24" - width="30" image_hover_unselected="BackButton_Over" image_pressed="BackButton_Press" image_unselected="BackButton_Off" layout="topleft" - name="back_btn" + label="Save" left="11" - top="3" /> - <text - follows="top|left" - font="SansSerifHugeBold" - height="22" - layout="topleft" - left_pad="8" - name="edit_wearable_title" - text_color="white" - top="3" - value="Editing Shape" - width="270" /> - <panel - border="false" - bg_alpha_color="DkGray2" - bg_opaque_color="DkGray2" - background_visible="true" - background_opaque="true" + name="back_btn" + pad_left="24" + tool_tip="Return to Edit Outfit" + top="3" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="22" + layout="topleft" + left_pad="8" + name="edit_wearable_title" + text_color="white" + top="3" + value="Editing Shape" + use_ellipses="true" + width="274" /> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + border="false" + follows="top|left|right" + height="60" + label="Shirt" + layout="topleft" + left="10" + name="wearable_type_panel" + top_pad="10" + width="313"> + <text follows="top|left|right" - height="60" - label="Shirt" + font="SansSerifSmallBold" + height="16" layout="topleft" - left="10" - name="wearable_type_panel" - top_pad="10" - width="313"> - <text - follows="top|left|right" - font="SansSerifSmallBold" - height="16" - layout="topleft" - left="10" - name="description_text" - text_color="white" - top="10" - value="Shape:" - width="150" /> - <radio_group - control_name="AvatarSex" - follows="left|top|right" - left="210" - height="20" - layout="topleft" - name="sex_radio" - top="5" - width="110"> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left="0" - name="sex_male" - tool_tip="Male" - value="1" - width="40" /> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left_pad="10" - name="sex_female" - tool_tip="Female" - value="0" - width="40" /> - </radio_group> - <!-- graphical labels for the radio buttons above --> - <icon - height="16" - image_name="icons/Male.png" - left="230" - name="male_icon" - tool_tip="Male" - top="7" - width="16" /> - <icon - height="16" - image_name="icons/Female.png" - name="female_icon" - left="280" - tool_tip="Female" - top="7" - width="16" /> - <line_editor + left="10" + name="description_text" + text_color="white" + top="10" + value="Shape:" + width="150" /> + <radio_group + control_name="AvatarSex" + follows="left|top|right" + height="20" + layout="topleft" + left="210" + name="sex_radio" + top="5" + width="110"> + <radio_item + follows="all" + height="16" + label="" + layout="topleft" + left="0" + name="sex_male" + tool_tip="Male" + value="1" + width="40" /> + <radio_item follows="all" - height="23" + height="16" + label="" layout="topleft" - left="10" - max_length="300" - name="description" - prevalidate_callback="ascii" - text_color="black" - top_pad="3" - width="290" /> - </panel> - <panel - follows="all" - height="433" - layout="topleft" - left="0" - name="edit_subpanel_container" - top_pad="2" - width="333"> - <!-- the shape editing panel is taller than the others + left_pad="10" + name="sex_female" + tool_tip="Female" + value="0" + width="40"/> + </radio_group> + <!-- graphical labels for the radio buttons above --> + <icon + height="16" + image_name="icons/Male.png" + layout="topleft" + left="230" + name="male_icon" + tool_tip="Male" + top="7" + width="16" /> + <icon + height="16" + image_name="icons/Female.png" + layout="topleft" + left="280" + name="female_icon" + tool_tip="Female" + top="7" + width="16" /> + <line_editor + follows="all" + height="23" + layout="topleft" + left="10" + max_length="63" + name="description" + prevalidate_callback="ascii" + text_color="black" + top_pad="3" + width="290" /> + </panel> + <panel + follows="all" + height="433" + layout="topleft" + left="0" + name="edit_subpanel_container" + top_pad="2" + width="333"> + <!-- the shape editing panel is taller than the others because it also displays avatar height --> - <panel - filename="panel_edit_shape.xml" - follows="all" - height="433" - layout="topleft" - left="0" - name="edit_shape_panel" - top="0" - visible="false" - width="333" /> - <panel - filename="panel_edit_skin.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_skin_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_hair.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_hair_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_eyes.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_eyes_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_shirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_shirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_pants.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_pants_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_shoes.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_shoes_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_socks.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_socks_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_jacket.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_jacket_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_skirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_skirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_gloves.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_gloves_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_undershirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_undershirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_underpants.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_underpants_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_alpha.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_alpha_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_tattoo.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_tattoo_panel" - top="8" - visible="false" - width="333" /> - </panel> - - <panel - follows="bottom|left|right" - height="23" - layout="topleft" - left="2" - name="button_panel" - top_pad="6" - width="333" > - <button - follows="bottomleft" - layout="topleft" - height="23" - label="Save As" - left="8" - name="save_as_button" - top="0" - width="153" /> - <button - follows="bottomleft" - layout="topleft" - height="23" - label="Revert" - left_pad="7" - name="revert_button" - width="152" /> - </panel> + <panel + filename="panel_edit_shape.xml" + follows="all" + height="433" + layout="topleft" + left="0" + name="edit_shape_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skin.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_skin_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_hair.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_hair_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_eyes.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_eyes_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_shirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_shirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_pants.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_pants_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_shoes.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_shoes_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_socks.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_socks_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_jacket.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_jacket_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_skirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_skirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_gloves.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_gloves_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_undershirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_undershirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_underpants.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_underpants_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_alpha.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_alpha_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_tattoo.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_tattoo_panel" + top="8" + visible="false" + width="333" /> + </panel> + <panel + follows="bottom|left|right" + height="23" + layout="topleft" + left="2" + name="button_panel" + top_pad="6" + width="333"> + <button + follows="bottomleft" + height="23" + label="Save As" + layout="topleft" + left="8" + name="save_as_button" + top="0" + width="153" /> + <button + follows="bottomleft" + height="23" + label="Undo Changes" + layout="topleft" + left_pad="7" + name="revert_button" + width="152" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index e894fc8fb8..4998322d62 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -96,6 +96,7 @@ background_visible="true" follows="all" layout="topleft" auto_resize="true" + height="513" width="313"> <accordion left="0" @@ -105,6 +106,7 @@ background_visible="true" follows="all" layout="topleft" name="groups_accordion" + height="513" width="313"> <accordion_tab expanded="true" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 55fef5aaf7..a0a1e2963a 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -103,7 +103,8 @@ width="310"> <texture_picker enabled="false" - follows="left|top|right" + fallback_image="default_land_picture.j2c" + follows="left|top|right" height="197" layout="topleft" left="11" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 2a53b3e2fa..16529f4064 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -104,8 +104,6 @@ </tab_container> <layout_stack animate="false" - background_visible="true" - bevel_style="none" border_size="0" follows="left|right|bottom" height="25" diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 86713de81b..ed903ba21e 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -83,6 +83,7 @@ allow_no_texture="true" default_image_name="None" enabled="false" + fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 96c76576c0..00b1fdd843 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -113,10 +113,6 @@ <!-- top_delta="0" --> <!-- width="168" /> --> <search_combo_box - bevel_style="none" - border_style="line" - border.border_thickness="0" - commit_on_focus_lost="false" follows="right|top" halign="right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index f5a78fc929..d8675b3512 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - can_resize="true" - can_close="false" bg_opaque_image="Volume_Background" bg_alpha_image="Volume_Background" background_opaque="true" @@ -58,7 +56,6 @@ top_delta="0" left_pad="4" height="22" - min_width="28" width="28"> <button.commit_callback function="MediaListCtrl.GoMediaPrefs" /> 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 c0cab487b3..6f84588140 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -54,6 +54,9 @@ <string name="Filter.Clothing" value="Clothing"/> <string name="Filter.Bodyparts" value="Body parts"/> + <string + name="replace_body_part" + value="Click to replace your existing shape"/> <button follows="top|left" @@ -168,7 +171,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap <layout_panel layout="topleft" height="187" - min_height="100" + min_height="155" name="outfit_wearables_panel" width="313" auto_resize="true" @@ -186,8 +189,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap left="0"> <layout_panel auto_resize="true" - background_visible="true" - bg_alpha_color="DkGray2" + background_visible="false" layout="topleft" height="154" name="add_button_and_combobox" @@ -293,7 +295,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap auto_resize="true" default_tab_group="3" height="450" - min_height="210" + min_height="53" name="add_wearables_panel" width="313" tab_group="2" @@ -315,13 +317,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap background_visible="false" border="false" follows="left|top|right|bottom" - height="442" + height="449" layout="topleft" left="0" mouse_opaque="false" name="folder_view" - top_pad="5" - width="310" + top_pad="0" + width="313" visible="false"/> <panel name="filtered_wearables_panel" @@ -343,7 +345,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap layout="topleft" follows="all" multi_select="true" - width="310" + width="313" height="449" left="0" top="0"/> @@ -379,21 +381,21 @@ It is calculated as border_size + 2*UIResizeBarOverlap <icon follows="bottom|left|right" height="25" - image_name="Toolbar_Right_Off" + image_name="Toolbar_Middle_Off" layout="topleft" left_pad="1" name="dummy_right_icon" - width="246" /> + width="250" /> <button follows="bottom|right" height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="AddItem_Off" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - left_pad="0" - name="shop_btn" + left_pad="1" + name="shop_btn_1" top="1" width="31" /> </panel> @@ -459,18 +461,30 @@ It is calculated as border_size + 2*UIResizeBarOverlap label="" layout="topleft" left_pad="1" - name="add_to_outfit_btn" + name="plus_btn" top="1" width="31" /> <icon follows="bottom|left|right" height="25" - image_name="Toolbar_Right_Off" + image_name="Toolbar_Middle_Off" layout="topleft" left_pad="1" name="dummy_right_icon" - width="184" > + width="154" > </icon> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="shop_btn_2" + top="1" + width="31" /> </panel> <!-- SAVE AND REVERT BUTTONS --> 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 a59070496e..82b69ba8dc 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -12,22 +12,30 @@ min_width="240" width="320" border="false"> + <panel.string + name="wear_outfit_tooltip"> + Wear selected outfit + </panel.string> + <panel.string + name="wear_items_tooltip"> + Wear selected items + </panel.string> <tab_container follows="all" - height="509" + height="539" layout="topleft" - left="7" + left="5" name="appearance_tabs" - tab_min_width="140" + tab_min_width="150" 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" @@ -35,99 +43,60 @@ label="MY OUTFITS" layout="topleft" width="315" /> - <inventory_panel - follows="all" + <panel background_visible="true" - background_opaque="true" - label="WEARING" + bg_alpha_color="DkGray" + class="panel_wearing" + filename="panel_outfits_wearing.xml" + follows="all" + height="520" help_topic="now_wearing_tab" - allow_multi_select="true" - border="false" - left="0" - top="0" - mouse_opaque="true" + label="WEARING" + layout="topleft" name="cof_tab" - start_folder="Current Outfit" - use_label_suffix="true" 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" - /> - <dnd_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" + 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 d0c44c4328..27e23440df 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml @@ -4,24 +4,69 @@ bg_alpha_color="DkGray" border="false" follows="all" - height="400" + height="430" name="Outfits" layout="topleft" left="0" top="0" - width="313"> + width="312"> <accordion background_visible="true" bg_alpha_color="DkGray2" bg_opaque_color="DkGray2" no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]." - no_visible_tabs_text.value="There are no any outfits. Try [secondlife:///app/search/all/ Search]." + no_matched_tabs_text.v_pad="10" + no_visible_tabs_text.value="..." follows="all" height="400" layout="topleft" 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/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index f5228f5d35..1353d401c3 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -95,8 +95,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="313"> <avatar_list allow_select="true" - bg_alpha_color="DkGray2" - bg_opaque_color="DkGray2" follows="all" height="356" ignore_online_status="true" @@ -300,16 +298,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M --> <group_list allow_select="true" - background_visible="true" - bg_alpha_color="DkGray2" - bg_opaque_color="DkGray2" follows="all" height="356" layout="topleft" left="3" name="group_list" - no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" - no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" width="307" /> <panel @@ -386,9 +379,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="313"> <avatar_list allow_select="true" - background_visible="true" - bg_alpha_color="DkGray2" - bg_opaque_color="DkGray2" follows="all" height="356" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 0093a08e15..a815cdf7f0 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -38,7 +38,6 @@ bg_opaque_color="DkGray2" single_expansion="true" width="313"> <accordion_tab - can_resize="false" layout="topleft" height="235" min_height="150" @@ -56,7 +55,6 @@ bg_opaque_color="DkGray2" width="313" /> </accordion_tab> <accordion_tab - can_resize="false" layout="topleft" height="235" name="tab_classifieds" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 55e0184282..35e8075896 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -200,7 +200,8 @@ width="310"> <texture_picker enabled="false" - follows="left|top|right" + fallback_image="default_land_picture.j2c" + follows="left|top|right" height="197" layout="topleft" left="11" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index fca9b4bca1..4ebd4c76f8 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -162,8 +162,9 @@ name="block_list" top_pad="20" width="145"> - <button.commit_callback - function="SideTray.ShowPanel" - parameter="panel_block_list_sidetray" /> + <!--<button.commit_callback + function="SideTray.ShowPanel"--> + <button.commit_callback + function="Pref.BlockList"/> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 6a6b74638d..a931c55dfe 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -83,6 +83,7 @@ allow_no_texture="true" default_image_name="None" enabled="false" + fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" @@ -130,6 +131,7 @@ allow_no_texture="true" default_image_name="None" enabled="false" + fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index 78d64620a5..a8cd380f20 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -12,7 +12,7 @@ layout="topleft" left="12" name="min param text" - text_color="EmphasisColor" + text_color="White" font_shadow="hard" top="120" width="120" /> @@ -22,7 +22,7 @@ layout="topleft" left="155" name="max param text" - text_color="EmphasisColor" + text_color="White" font_shadow="hard" top_delta="0" width="120" /> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 92b4c17247..42f64c3a76 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -31,8 +31,6 @@ can_close="false" can_dock="false" border_visible = "false" - border_drop_shadow_visible = "false" - drop_shadow_visible = "false" border = "false" > <panel diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index d3fb77f135..d8f4297e0c 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -10,7 +10,6 @@ name="topinfo_bar" width="1024"> <button - border="true" follows="left|top" height="16" hover_glow_amount="0.15" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index e189d11d35..02ab0ffee5 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -21,6 +21,9 @@ width="333"> <string name="Now Wearing" value="Now wearing..." /> + <string + name="Changing outfits" + value="Changing outfits" /> <panel background_opaque="true" background_visible="true" @@ -49,16 +52,16 @@ width="333"> visible="false" /> <icon follows="top|left" - height="32" - image_name="TabIcon_Appearance_Off" + height="31" + image_name="Shirt_Large" name="outfit_icon" mouse_opaque="false" visible="true" - left="0" + left="1" top="0" - width="32" /> + width="31" /> <text - font="SansSerifSmallBold" + font="SansSerifSmall" text_color="EmphasisColor" width="300" height="10" @@ -86,15 +89,15 @@ width="333"> </text> <button follows="left|top" - height="23" + height="28" image_overlay="Edit_Wrench" label="" layout="topleft" left="265" name="edit_outfit_btn" tool_tip="Edit this outfit" - top="7" - width="30" /> + top="3" + width="28" /> <loading_indicator follows="left|top" height="24" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index c723a5da42..79421c0e01 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - auto_tile="true" height="570" layout="topleft" name="item properties" help_topic="item_properties" - save_rect="true" - title="Object Profile" + title="Item Profile" width="333"> <panel.string name="unknown"> @@ -28,6 +26,14 @@ 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> + <panel.string + name="origin_inventory"> + (Inventory) + </panel.string> + <panel.string + name="origin_inworld"> + (Inworld) + </panel.string> <icon follows="top|right" height="18" @@ -60,14 +66,14 @@ text_color="LtGray" top="2" use_ellipses="true" - value="Object Profile" + value="Item Profile" width="275" /> <text follows="top|left" height="13" layout="topleft" left="45" - name="where" + name="origin" text_color="LtGray_50" value="(Inventory)" width="150" /> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index e038e104d3..5da449de3d 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - auto_tile="true" height="570" layout="topleft" name="object properties" help_topic="object_properties" - save_rect="true" title="Object Profile" width="333"> <panel.string @@ -87,7 +85,7 @@ left="45" name="where" text_color="LtGray_50" - value="(inworld)" + value="(Inworld)" width="150" /> <panel follows="all" @@ -219,7 +217,6 @@ left_pad="0" top_delta="0" name="button set group" - picture_style="true" tab_stop="false" tool_tip="Choose a group to share this object's permissions" width="10" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 8f05527099..059b645b86 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -137,7 +137,8 @@ <string name="RetrievingData">Retrieving...</string> <string name="ReleaseNotes">Release Notes</string> - <string name="RELEASE_NOTES_BASE_URL">http://wiki.secondlife.com/wiki/Release_Notes/</string> + <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. --> + <string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.secondlife.com/wiki/Release_Notes/</string> <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <string name="LoadingData">Loading...</string> @@ -1813,7 +1814,8 @@ Clears (deletes) the media and all params from the given face. <string name="skirt">Skirt</string> <string name="alpha">Alpha</string> <string name="tattoo">Tattoo</string> - <string name="invalid">invalid</string> + <string name="invalid">invalid</string> + <string name="none">none</string> <!-- Not Worn Wearable Types --> <string name="shirt_not_worn">Shirt not worn</string> @@ -1938,7 +1940,7 @@ Clears (deletes) the media and all params from the given face. <string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string> <string name="InvFolder Animations">Animations</string> <string name="InvFolder Gestures">Gestures</string> - <string name="InvFolder favorite">Favorites</string> + <string name="InvFolder Favorite">Favorites</string> <string name="InvFolder Current Outfit">Current Outfit</string> <string name="InvFolder My Outfits">My Outfits</string> <string name="InvFolder Accessories">Accessories</string> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index 102dc0c16d..6f68c99021 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -9,6 +9,6 @@ header_image_over="Accordion_Over" header_image_pressed="Accordion_Press" header_image_focused="Accordion_Selected" - header_text_color="LtGray" + header_text_color="AccordionHeaderTextColor" font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml new file mode 100644 index 0000000000..50be0ac1a1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inventory_list_item + height="0" + layout="topleft" + left="0" + name="inventory_list_item" + top="0" + width="0"> + <!-- DEFAULT style for inventory list item --> + <default_style + font="SansSerifSmall" + font.style="NORMAL" /> + + <!-- style for inventory list item WORN on avatar --> + <worn_style + font="SansSerifSmall" + font.style="BOLD" + color="EmphasisColor" /> +</inventory_list_item> 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/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index 5d429d5b5b..ce84cfedc0 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <search_combo_box allow_text_entry="true" - list_position="BELOW" + list_position="below" show_text_as_tentative="false" dropdown_button_visible="false" max_chars="256" name="parent" - allow_new_values="true" - background_image="TextField_Search_Off" - background_image_disabled="TextField_Search_Disabled" - background_image_focused="TextField_Search_Active"> + allow_new_values="true"> <combo_editor name="child1" select_on_focus="true" diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index f4dc192bc3..b2da2147c1 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,3 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <textbase clip_partial="false" + halign="left" + valign="top" font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index 787c37e12c..c625407ba2 100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml @@ -9,35 +9,28 @@ <floater.string name="move_tooltip"> Mover la cámara arriba y abajo, izquierda y derecha </floater.string> - <floater.string name="orbit_mode_title"> - Orbital + <floater.string name="camera_modes_title"> + Modos de cámara </floater.string> <floater.string name="pan_mode_title"> - Panorámica + Orbital - Zoom - Panóramica </floater.string> - <floater.string name="avatar_view_mode_title"> - Posición de tu cámara + <floater.string name="presets_mode_title"> + Vistas predefinidas </floater.string> <floater.string name="free_mode_title"> Centrar el objeto </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Mueve la cámara arriba y abajo, a izquierda y derecha"/> <panel name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado"> + <joystick_rotate name="cam_rotate_stick" tool_tip="La cámara gira alrededor del punto de vista"/> <slider_bar name="zoom_slider" tool_tip="Hacer zoom en lo enfocado"/> - </panel> - <joystick_rotate name="cam_rotate_stick" tool_tip="La cámara gira alrededor del punto de vista"/> - <panel name="camera_presets"> - <button name="rear_view" tool_tip="Desde detrás"/> - <button name="group_view" tool_tip="Desde tu hombro"/> - <button name="front_view" tool_tip="De frente"/> - <button name="mouselook_view" tool_tip="Vista subjetiva"/> + <joystick_track name="cam_track_stick" tool_tip="Mueve la cámara arriba y abajo, a izquierda y derecha"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="Cámara orbital"/> - <button label="" name="pan_btn" tool_tip="Cámara panorámica"/> - <button label="" name="avatarview_btn" tool_tip="Posición de tu cámara"/> - <button label="" name="freecamera_btn" tool_tip="Centrar el objeto"/> + <button label="" name="presets_btn" tool_tip="Vistas predefinidas"/> + <button label="" name="pan_btn" tool_tip="Orbital - Zoom - Panóramica"/> + <button label="" name="avatarview_btn" tool_tip="Modos de cámara"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml index 021e5fb6b7..88cfc9575a 100644 --- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml @@ -16,7 +16,13 @@ ha entrado en un chat de voz en multiconferencia. </floater.string> <floater.string name="VoiceInviteGroup"> - ha hecho una llamada de voz al grupo [GROUP]. + acaba de entrar en el canal de voz '[GROUP]'. + </floater.string> + <floater.string name="VoiceInviteQuestionGroup"> + ¿Quieres dejar [CURRENT_CHAT] e incorporarte a la llamada con '[GROUP]'? + </floater.string> + <floater.string name="VoiceInviteQuestionDefault"> + ¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz? </floater.string> <text name="question"> ¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz? 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 151421c244..eafc623ea9 100644 --- a/indra/newview/skins/default/xui/es/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml @@ -1,16 +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"/> - <button label="Compartir la foto" name="share"/> - <button label="Compartir en la web" name="share_to_web"/> - <button label="Guardar en mi inventario" name="save_to_inventory"/> - <button label="Guardar la foto" name="save"/> - <button label="Foto por correo-e" name="share_to_email"/> - <button label="Guardar en mi ordenador" name="save_to_computer"/> - <button label="Usar como imagen del perfil" name="set_profile_pic"/> - <button label="Atrás" name="cancel"/> + <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_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml index 934d14a45c..51adeb4dff 100644 --- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml @@ -19,8 +19,10 @@ <layout_panel name="my_panel"> <text name="user_text" value="Mi avatar:"/> </layout_panel> - <layout_panel name="leave_call_btn_panel"> - <button label="Colgar" name="leave_call_btn"/> - </layout_panel> + <layout_stack name="voice_effect_and_leave_call_stack"> + <layout_panel name="leave_call_btn_panel"> + <button label="Colgar" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </layout_stack> </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 new file mode 100644 index 0000000000..5ef4347958 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ"> + <string name="no_voice_effect"> + (Sin transformación de voz) + </string> + <string name="active_voice_effect"> + (Activo) + </string> + <string name="unsubscribed_voice_effect"> + (Suscripción cancelada) + </string> + <string name="new_voice_effect"> + (¡Nuevo!) + </string> + <text name="preview_text"> + Para probarla + </text> + <text name="status_text"> + Graba una muestra y pulsa en una voz para escuchar cómo suena. + </text> + <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] 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="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/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml index deda5b86c8..3135324816 100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml @@ -35,11 +35,11 @@ <text name="pg_label"> General </text> - <check_box name="event_mature_chk"/> - <text name="mature_label"> + <check_box name="events_mature_chk"/> + <text name="events_mature_label"> Moderado </text> - <text name="adult_label"> + <text name="events_adult_label"> Adulto </text> </panel> diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml index 6a831def07..d608b4a0f7 100644 --- a/indra/newview/skins/default/xui/es/inspect_object.xml +++ b/indra/newview/skins/default/xui/es/inspect_object.xml @@ -8,8 +8,8 @@ Por [CREATOR] </string> <string name="CreatorAndOwner"> - por [CREATOR] -propietario [OWNER] + Por [CREATOR] +Propietario [OWNER] </string> <string name="Price"> [AMOUNT] L$ @@ -23,6 +23,13 @@ propietario [OWNER] <string name="Sit"> Sentarme </string> + <text name="object_name" value="Test Object Name That Is actually two lines and Really Long"/> + <text name="price_text"> + 30.000 L$ + </text> + <text name="object_description"> + This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really? + </text> <button label="Comprar" name="buy_btn"/> <button label="Pagar" name="pay_btn"/> <button label="Coger una copia" name="take_free_copy_btn"/> 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_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml new file mode 100644 index 0000000000..7541530601 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Attachment"> + <menu_item_call label="Quitar" name="detach"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml new file mode 100644 index 0000000000..56b95bdc3b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Body"> + <menu_item_call label="Reemplazar" name="replace"/> + <menu_item_call label="Editar" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml new file mode 100644 index 0000000000..4051f64e14 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Clothing"> + <menu_item_call label="Quitarme" name="take_off"/> + <menu_item_call label="Subir una capa" name="move_up"/> + <menu_item_call label="Bajar una capa" name="move_down"/> + <menu_item_call label="Editar" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml new file mode 100644 index 0000000000..ff8ad0977a --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear COF"> + <menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/> + <menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml index 7fc1af00c5..22a1873234 100644 --- a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml @@ -2,4 +2,5 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Mostrar la barra de navegación" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Mostrar la barra de favoritos" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Mostrar mini-barra de ubicación" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index bbee88f600..8f606aef82 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -81,6 +81,7 @@ <menu label="Anexar como HUD" name="Attach To HUD"/> <menu_item_call label="Editar" name="Wearable Edit"/> <menu_item_call label="Ponerse" name="Wearable Wear"/> + <menu_item_call label="Añadir" name="Wearable Add"/> <menu_item_call label="Quitarse" name="Take Off"/> <menu_item_call label="--sin opciones--" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml new file mode 100644 index 0000000000..39afa5e60b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Outfit"> + <menu_item_call label="Ponerme - Reemplazar el vestuario actual" name="wear"/> + <menu_item_call label="Quitarme - Quitar del vestuario actual" name="take_off"/> + <menu label="Ropas nuevas" name="New Clothes"> + <menu_item_call label="Camisa nueva" name="New Shirt"/> + <menu_item_call label="Pantalón nuevo" name="New Pants"/> + <menu_item_call label="Zapatos nuevos" name="New Shoes"/> + <menu_item_call label="Calcetines nuevos" name="New Socks"/> + <menu_item_call label="Chaqueta nueva" name="New Jacket"/> + <menu_item_call label="Falda nueva" name="New Skirt"/> + <menu_item_call label="Guantes nuevos" name="New Gloves"/> + <menu_item_call label="Camiseta nueva" name="New Undershirt"/> + <menu_item_call label="Ropa interior nueva" name="New Underpants"/> + <menu_item_call label="Nueva Alfa" name="New Alpha"/> + <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + </menu> + <menu label="Nuevas partes del cuerpo" name="New Body Parts"> + <menu_item_call label="Anatomía nueva" name="New Shape"/> + <menu_item_call label="Piel nueva" name="New Skin"/> + <menu_item_call label="Pelo nuevo" name="New Hair"/> + <menu_item_call label="Ojos nuevos" name="New Eyes"/> + </menu> + <menu_item_call label="Renombrar el vestuario" name="rename"/> + <menu_item_call label="Borrar el vestuario" name="delete_outfit"/> +</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 new file mode 100644 index 0000000000..4136082a62 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit"> + <menu_item_call label="Ponerme - Reemplazar el vestuario actual" name="wear_replace"/> + <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 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_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml index f21dd32b80..a04ec75b60 100644 --- a/indra/newview/skins/default/xui/es/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/es/menu_save_outfit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="save_outfit_menu"> <menu_item_call label="Guardar" name="save_outfit"/> - <menu_item_call label="Guardar como nuevo" name="save_as_new_outfit"/> + <menu_item_call label="Guardar como" name="save_as_new_outfit"/> </toggleable_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 1bc3e981ce..66c0bf9311 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -11,6 +11,7 @@ <menu_item_check label="Mi Inventario" name="Inventory"/> <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/> <menu_item_check label="Mis gestos" name="Gestures"/> + <menu_item_check label="Mi voz" name="ShowVoice"/> <menu label="Mi estado" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> <menu_item_call label="Ocupado" name="Set Busy"/> @@ -70,6 +71,12 @@ <menu_item_call label="Enlazar" name="Link"/> <menu_item_call label="Desenlazar" name="Unlink"/> <menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/> + <menu label="Seleccionar las partes enlazadas" name="Select Linked Parts"> + <menu_item_call label="Seleccionar la parte siguiente" name="Select Next Part"/> + <menu_item_call label="Seleccionar la parte previa" name="Select Previous Part"/> + <menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/> + <menu_item_call label="Incluir la parte previa" name="Include Previous Part"/> + </menu> <menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/> <menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/> <menu label="Objeto" name="Object"> @@ -100,11 +107,11 @@ <menu_item_call label="Usar lo seleccionado como cuadrícula" name="Use Selection for Grid"/> <menu_item_call label="Opciones de la cuadrícula" name="Grid Options"/> </menu> - <menu label="Seleccionar las partes enlazadas" name="Select Linked Parts"> - <menu_item_call label="Seleccionar la parte siguiente" name="Select Next Part"/> - <menu_item_call label="Seleccionar la parte previa" name="Select Previous Part"/> - <menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/> - <menu_item_call label="Incluir la parte previa" name="Include Previous Part"/> + <menu label="Subir" name="Upload"> + <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> + <menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/> + <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> + <menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/> </menu> </menu> <menu label="Ayuda" name="Help"> @@ -170,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 new file mode 100644 index 0000000000..96fc3a1e68 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit Wearable Context Menu"> + <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"/> + <context_menu label="Anexar a ▶" name="wearable_attach_to"/> + <context_menu label="Anexar al HUD ▶" name="wearable_attach_to_hud"/> + <menu_item_call label="Quitarme" name="take_off"/> + <menu_item_call label="Editar" name="edit"/> + <menu_item_call label="Perfil del objeto" name="object_profile"/> + <menu_item_call label="Mostrar original" name="show_original"/> +</context_menu> 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 58a74721e1..836e5d9936 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -470,9 +470,8 @@ La calidad gráfica puede ajustarse en Preferencias > Gráficos. En la región [REGION] no se permite modificar el terreno. </notification> <notification name="CannotCopyWarning"> - No tienes permiso para copiar este ítem. -Si lo das, lo perderás de tu inventario. -¿Realmente quieres darlo? + No tienes permiso para copiar los elementos siguientes: +[ITEMS] y, si los das, los perderás del inventario. ¿Seguro que quieres ofrecerlos? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> <notification name="CannotGiveItem"> @@ -615,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"> @@ -947,6 +945,26 @@ no tienes el permiso de comprar terreno para el grupo que tienes activado actual <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification label="Guardar artículo" name="SaveWearableAs"> + Guardar el ítem en mi inventario como: + <form name="form"> + <input name="message"> + [DESC] (nuevo) + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> + <notification label="Renombrar el vestuario" name="RenameOutfit"> + Nombre del nuevo vestuario: + <form name="form"> + <input name="new_name"> + [NAME] + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> <notification name="RemoveFromFriends"> ¿Quieres quitar a [FIRST_NAME] [LAST_NAME] de tu lista de amigos? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> @@ -1569,7 +1587,7 @@ Por favor, comprueba que tienes instalado el último visor, y dirígete a la Bas <notification name="RegionEntryAccessBlocked_Change"> No estás autorizado en esta región por tus preferencias sobre el nivel de calificación. -Pulsa 'Cambiar las preferencias' para incrementar las preferencias del nivel de calificación y obtener acceso inmediato. Esto te permitirá buscar contenidos [REGIONMATURITY] y tener acceso a ellos. Si prefieres cambiar esta opción más adelante, puedes hacerlo desde Yo > Preferencias > General. +Para entrar en la región que deseas, cambia tu preferencia de nivel de calificación. Esto te permitirá buscar contenidos [REGIONMATURITY] y tener acceso a ellos. Para deshacer los cambios, elige Yo > Preferencias > General. <form name="form"> <button name="OK" text="Cambiar las preferencias"/> <button default="true" name="Cancel" text="Cerrar"/> @@ -2581,6 +2599,21 @@ Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar a <notification name="VoiceLoginRetry"> Estamos creando un canal de voz para ti. Se puede tardar hasta un minuto. </notification> + <notification name="VoiceEffectsExpired"> + Una o más de las transformaciones de voz a las que estás suscrito han caducado. +[Pulsa aquí [URL]] para renovar la suscripción. + </notification> + <notification name="VoiceEffectsExpiredInUse"> + La transformación de voz activa ha caducado y se ha aplicado tu configuración de voz normal. +[Pulsa aquí [URL]] para renovar la suscripción. + </notification> + <notification name="VoiceEffectsWillExpire"> + Una o más de tus transformaciones de voz caducarán en menos de [INTERVAL] días. +[Pulsa aquí [URL]] para renovar la suscripción. + </notification> + <notification name="VoiceEffectsNew"> + Están disponibles nuevas transformaciones de voz. + </notification> <notification name="Cannot enter parcel: not a group member"> Sólo los miembros de un grupo determinado pueden visitar esta zona. </notification> @@ -2647,7 +2680,20 @@ Por tu seguridad, serán bloqueadas durante unos segundos. Se mostrará cuando haya suficiente espacio. </notification> <notification name="ShareNotification"> - Arrastrar ítems desde el inventario hasta una persona en el perfil del residente. + Selecciona los residentes con quienes deseas compartir. + </notification> + <notification name="ShareItemsConfirmation"> + ¿Estás seguro de que quieres compartir los elementos siguientes? + +[ITEMS] + +Con los siguientes residentes: + +[RESIDENTS] + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="ItemsShared"> + Los elementos se han compartido correctamente. </notification> <notification name="DeedToGroupFail"> Error de transferencia a grupo. @@ -2656,10 +2702,15 @@ Se mostrará cuando haya suficiente espacio. ( [EXISTENCE] segundos vivo) El avatar '[NAME]' tardó [TIME] segundos en dejar de aparecer como nube. </notification> - <notification name="AvatarRezSelfNotification"> + <notification name="AvatarRezSelfBakedDoneNotification"> ( [EXISTENCE] segundos vivo) Has terminado de texturizar tu vestuario en [TIME] segundos. </notification> + <notification name="AvatarRezSelfBakedUpdateNotification"> + ( [EXISTENCE] segundos vivo) +Has enviado una actualización de tu apariencia después de [TIME] segundos. +[STATUS] + </notification> <notification name="AvatarRezCloudNotification"> ( [EXISTENCE] segundos vivo) El avatar '[NAME]' se convirtió en nube. @@ -2680,10 +2731,32 @@ El avatar '[NAME]' ya está en modo de edición de apariencia. ( [EXISTENCE] segundos vivo) El avatar '[NAME]' desactivó el modo de apariencia. </notification> + <notification name="NoConnect"> + Tenemos problemas de conexión con [PROTOCOL] [HOSTID]. +Comprueba la configuración de la red y del servidor de seguridad. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> + <notification name="NoVoiceConnect"> + Tenemos problemas de conexión con tu servidor de voz: + +[HOSTID] + +No podrás establecer comunicaciones de voz. +Comprueba la configuración de la red y del servidor de seguridad. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> <notification name="AvatarRezLeftNotification"> ( [EXISTENCE] segundos vivo) El avatar '[NAME]' ya estaba totalmente cargado al salir. </notification> + <notification name="AvatarRezSelfBakeNotification"> + ( [EXISTENCE] segundos vivo) +Has cargado una textura obtenida mediante bake de [RESOLUTION] para '[BODYREGION]' después de [TIME] segundos. + </notification> <notification name="ConfirmLeaveCall"> ¿Estás seguro de que deseas salir de esta multiconferencia? <usetemplate ignoretext="Confirma antes de salir de la llamada" name="okcancelignore" notext="No" yestext="Sí"/> @@ -2693,7 +2766,7 @@ El avatar '[NAME]' ya estaba totalmente cargado al salir. Si lo haces, todos los residentes que se unan posteriormente a la llamada también serán silenciados, incluso cuando abandones la conferencia. ¿Deseas silenciar a todos? - <usetemplate ignoretext="Confirma que deseas silenciar a todos los participantes en una multiconferencia." name="okcancelignore" notext="OK" yestext="Cancelar"/> + <usetemplate ignoretext="Confirma que deseas silenciar a todos los participantes en una multiconferencia." name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <global name="UnsupportedCPU"> - La velocidad de tu CPU no cumple los requerimientos mínimos. 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_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml index e64ec9ab7c..368be35ed9 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_shape.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <text name="avatar_height"> - [HEIGHT] metros de alto - </text> + <string name="meters"> + Metros + </string> + <string name="feet"> + Pies + </string> + <string name="height"> + Altura: + </string> + <text name="avatar_height"/> <panel label="Camisa" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Cuerpo"/> 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 8bafe0f29a..09321f7b91 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml @@ -72,7 +72,7 @@ <string name="jacket_desc_text"> Chaqueta: </string> - <string name="skirt_skirt_desc_text"> + <string name="skirt_desc_text"> Falda: </string> <string name="gloves_desc_text"> @@ -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:"/> @@ -100,13 +101,8 @@ <icon name="male_icon" tool_tip="Varón"/> <icon name="female_icon" tool_tip="Mujer"/> </panel> - <panel label="gear_buttom_panel" name="gear_buttom_panel"> - <button name="friends_viewsort_btn" tool_tip="Opciones"/> - <button name="add_btn" tool_tip="TODO"/> - <button name="del_btn" tool_tip="TODO"/> - </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 b7c0e840b2..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"/> - <button label="editar" name="edit_wearable_btn"/> + <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"> @@ -23,23 +25,19 @@ </panel> <layout_stack name="im_panels"> <layout_panel label="Panel de control de los MI" name="outfit_wearables_panel"> - <panel label="bottom_panel" name="edit_panel"/> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <text name="add_to_outfit_label" value="Añadir a vestuario:"/> <layout_stack name="filter_panels"> - <layout_panel label="Panel de control de MI" name="filter_panel"> - <filter_editor label="Filtrar" name="look_item_filter"/> + <layout_panel name="add_button_and_combobox"> + <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"/> </layout_panel> </layout_stack> - <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> - <button label="C" name="folder_view_btn"/> - <button label="L" name="list_view_btn"/> - </panel> </layout_panel> + <layout_panel name="add_wearables_panel"/> </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 4b23094103..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,9 +6,8 @@ </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"/> - <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guardar la apariencia como un vestuario"/> + <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"/> - <button label="Editar el vestuario" name="edit_current_outfit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml index 1970284466..d186a04f4b 100644 --- a/indra/newview/skins/default/xui/es/panel_places.xml +++ b/indra/newview/skins/default/xui/es/panel_places.xml @@ -5,12 +5,12 @@ <filter_editor label="Filtrar mis lugares" name="Filter"/> <panel name="button_panel"> <button label="Teleporte" name="teleport_btn" tool_tip="Teleportar a la zona elegida"/> - <button label="Mapa" name="map_btn"/> + <button label="Mapa" name="map_btn" tool_tip="Mostrar esta zona en el mapa del mundo"/> <button label="Editar" name="edit_btn" tool_tip="Editar la información del hito"/> <button label="▼" name="overflow_btn" tool_tip="Ver más opciones"/> <button label="Guardar" name="save_btn"/> <button label="Cancelar" name="cancel_btn"/> <button label="Cerrar" name="close_btn"/> - <button label="Perfil" name="profile_btn"/> + <button label="Perfil" name="profile_btn" tool_tip="Mostrar el perfil del lugar"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index 6e6d0be81f..d65868c0a8 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Usar el posicionamiento automático de la cámara al entrar en o salir del modo de edición"/> <check_box label="Apariencia" name="appearance_camera_movement" tool_tip="Usar el posicionamiento automático de la cámara mientras se está editando"/> - <check_box label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar el posicionamiento automático de la cámara para la barra lateral"/> + <check_box initial_value="true" label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar el posicionamiento automático de la cámara para la barra lateral"/> <check_box label="Verme en vista subjetiva" name="first_person_avatar_visible"/> <check_box label="Las teclas del cursor siempre para moverme" name="arrow_keys_move_avatar_check"/> <check_box label="Correr siempre: atajo de teclado" name="tap_tap_hold_to_run"/> 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_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index d4404fd9b5..13ed1acf0b 100644 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml @@ -21,8 +21,10 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="Mi saldo"/> - <button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/> + <panel name="balance_bg"> + <text name="balance" tool_tip="Mi saldo" value="20 L$"/> + <button label="COMPRAR L$" name="buyL" tool_tip="Pulsa para comprar más L$"/> + </panel> <text name="TimeText" tool_tip="Hora actual (Pacífico)"> 24:00 AM PST </text> diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml new file mode 100644 index 0000000000..94a0428941 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_voice_effect.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_voice_effect"> + <string name="no_voice_effect"> + Transformación de voz desactivada + </string> + <string name="preview_voice_effects"> + Probar transformación de voz ▶ + </string> + <string name="get_voice_effects"> + Obtener transformación de voz ▶ + </string> + <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_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml index dcaddd8e42..2c22a7ba46 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml @@ -2,12 +2,12 @@ <panel label="Cosas" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="Perfil" name="info_btn"/> - <button label="Compartir" name="share_btn"/> - <button label="Comprar" name="shop_btn"/> - <button label="Ponerme" name="wear_btn"/> + <button label="Perfil" name="info_btn" tool_tip="Mostrar el perfil del objeto"/> + <button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/> + <button label="Comprar" name="shop_btn" tool_tip="Abrir la página web del mercado"/> + <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/> <button label="Play" name="play_btn"/> - <button label="Teleporte" name="teleport_btn"/> + <button label="Teleporte" name="teleport_btn" tool_tip="Teleportar a la zona elegida"/> </panel> </panel> </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..d2c1295c76 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,8 +15,8 @@ <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="where" value="(Inventario)"/> + <text name="title" value="Perfil del elemento"/> + <text name="origin" value="(Inventario)"/> <panel label=""> <text name="LabelItemNameTitle"> Nombre: diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 885e974b3b..717665f4d9 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -95,7 +95,7 @@ El nombre de host utilizado para acceder al servidor no es válido. Comprueba tu SLURL o el nombre de host de la cuadrícula. </string> <string name="CertExpired"> - Parece que el certificado que devolvió la cuadrícula está caducado. Comprueba el reloj del sistema o consulta al administrador de la cuadrícula. + Parece que el certificado que devolvió la cuadrícula está caducado. Comprueba el reloj del sistema o consulta al administrador de la cuadrícula. </string> <string name="CertKeyUsage"> El certificado que devolvió el servidor no puede utilizarse para SSL. Ponte en contacto con el administrador de la cuadrícula. @@ -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> @@ -732,6 +735,12 @@ <string name="land_type_unknown"> (desconocido) </string> + <string name="Estate / Full Region"> + Estado /Región completa + </string> + <string name="Mainland / Full Region"> + Continente / Región completa + </string> <string name="all_files"> Todos los archivos </string> @@ -837,6 +846,9 @@ <string name="invalid"> inválido/a </string> + <string name="none"> + ninguno + </string> <string name="shirt_not_worn"> Camisa no puesta </string> @@ -876,6 +888,9 @@ <string name="NewWearable"> Nuevo [WEARABLE_ITEM] </string> + <string name="CreateNewWearable"> + Crear [WEARABLE_TYPE] + </string> <string name="next"> Siguiente </string> @@ -1053,7 +1068,7 @@ <string name="InvFolder Gestures"> Gestos </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoritos </string> <string name="InvFolder Current Outfit"> @@ -3448,6 +3463,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="session_initialization_timed_out_error"> Se ha agotado el tiempo del inicio de sesión </string> + <string name="voice_morphing_url"> + http://secondlife.com/landing/voicemorphing + </string> <string name="paid_you_ldollars"> [NAME] te ha pagado [AMOUNT] L$ </string> @@ -3618,16 +3636,16 @@ Denuncia de infracción <string name="Male - Wow"> Varón - Admiración </string> - <string name="FeMale - Excuse me"> + <string name="Female - Excuse me"> Mujer - Disculpa </string> - <string name="FeMale - Get lost"> + <string name="Female - Get lost"> Mujer – Déjame en paz </string> - <string name="FeMale - Blow kiss"> + <string name="Female - Blow kiss"> Mujer - Lanzar un beso </string> - <string name="FeMale - Boo"> + <string name="Female - Boo"> Mujer - Abucheo </string> <string name="Female - Bored"> @@ -3660,4 +3678,32 @@ Denuncia de infracción <string name="texture_load_dimensions_error"> No se puede subir imágenes mayores de [WIDTH]*[HEIGHT] </string> + <string name="words_separator" value=","/> + <string name="server_is_down"> + Parece que hay algún problema que ha escapado a nuestros controles. + + Visita status.secondlifegrid.net para ver si hay alguna incidencia conocida que esté afectando al servicio. + Si sigues teniendo problemas, comprueba la configuración de la red y del servidor de seguridad. + </string> + <string name="dateTimeWeekdaysNames"> + Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado + </string> + <string name="dateTimeWeekdaysShortNames"> + Dom:Lun:Mar:Mié:Jue:Vie:Sáb + </string> + <string name="dateTimeMonthNames"> + Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre + </string> + <string name="dateTimeMonthShortNames"> + Ene:Feb:Mar:Abr:May:Jun:Jul:Ago:Sep:Oct:Nov:Dic + </string> + <string name="dateTimeDayFormat"> + [MDAY] + </string> + <string name="dateTimeAM"> + AM + </string> + <string name="dateTimePM"> + PM + </string> </strings> 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_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 558551b649..b0834fe170 100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml @@ -9,35 +9,28 @@ <floater.string name="move_tooltip"> Déplacer la caméra vers le haut et le bas, la gauche et la droite </floater.string> - <floater.string name="orbit_mode_title"> - Faire tourner + <floater.string name="camera_modes_title"> + Modes </floater.string> <floater.string name="pan_mode_title"> - Faire un panoramique + Rotation - Zoom - Panoramique </floater.string> - <floater.string name="avatar_view_mode_title"> + <floater.string name="presets_mode_title"> Préréglages </floater.string> <floater.string name="free_mode_title"> Voir l'objet </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/> <panel name="zoom" tool_tip="Zoomer en direction du point central"> + <joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/> <slider_bar name="zoom_slider" tool_tip="Zoomer en direction du point central"/> - </panel> - <joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/> - <panel name="camera_presets"> - <button name="rear_view" tool_tip="Vue arrière"/> - <button name="group_view" tool_tip="Vue Groupe"/> - <button name="front_view" tool_tip="Vue frontale"/> - <button name="mouselook_view" tool_tip="Vue subjective"/> + <joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/> - <button label="" name="pan_btn" tool_tip="Faire un panoramique"/> - <button label="" name="avatarview_btn" tool_tip="Préréglages"/> - <button label="" name="freecamera_btn" tool_tip="Voir l'objet"/> + <button label="" name="presets_btn" tool_tip="Préréglages"/> + <button label="" name="pan_btn" tool_tip="Rotation - Zoom - Panoramique"/> + <button label="" name="avatarview_btn" tool_tip="Modes"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml index 110c61aedc..43a7424851 100644 --- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml @@ -16,7 +16,13 @@ a rejoint un chat vocal avec conférence. </floater.string> <floater.string name="VoiceInviteGroup"> - a rejoint un chat vocal avec le groupe [GROUP]. + vient de rejoindre le canal vocal [GROUP]. + </floater.string> + <floater.string name="VoiceInviteQuestionGroup"> + Voulez-vous quitter [CURRENT_CHAT] et rejoindre l'appel avec [GROUP] ? + </floater.string> + <floater.string name="VoiceInviteQuestionDefault"> + Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ? </floater.string> <text name="question"> Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ? 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_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml index d79726e8e2..b5ffc8f9c7 100644 --- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml @@ -45,7 +45,7 @@ </combo_box> <button label="Sélectionner" name="sell_to_select_agent" width="100"/> <text name="sell_objects_label"> - 3. Vendez-vous les objets avec ce terrain ? + 3. Vendre les objets avec ce terrain ? </text> <text name="sell_objects_text"> Les objets transférables se trouvant sur la parcelle changeront de propriétaire. diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml index 381a513bda..6f81bf68b1 100644 --- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml @@ -1,16 +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"/> - <button label="Partager" name="share"/> - <button label="Partage Web" name="share_to_web"/> - <button label="Dans mon inventaire" name="save_to_inventory"/> - <button label="Enregistrer" name="save"/> - <button label="Envoi par e-mail" name="share_to_email"/> - <button label="Sur mon ordinateur" name="save_to_computer"/> - <button label="Image de profil" name="set_profile_pic"/> - <button label="Précédent" name="cancel"/> + <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_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index 1a7bc228fa..5c26527ed6 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml @@ -19,8 +19,10 @@ <layout_panel name="my_panel"> <text name="user_text" value="Mon avatar :"/> </layout_panel> - <layout_panel name="leave_call_btn_panel"> - <button label="Quitter l'appel" name="leave_call_btn"/> - </layout_panel> + <layout_stack name="voice_effect_and_leave_call_stack"> + <layout_panel name="leave_call_btn_panel"> + <button label="Quitter l'appel" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </layout_stack> </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 new file mode 100644 index 0000000000..56cb654440 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX"> + <string name="no_voice_effect"> + (Aucun effet de voix) + </string> + <string name="active_voice_effect"> + (Actif) + </string> + <string name="unsubscribed_voice_effect"> + (Pas d'abonnement) + </string> + <string name="new_voice_effect"> + (Nouveau !) + </string> + <text name="preview_text"> + Aperçu + </text> + <text name="status_text"> + Enregistrez un extrait et cliquez sur un effet pour obtenir un aperçu. + </text> + <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] 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="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/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index 4d500857ea..0047a3bb04 100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml @@ -35,11 +35,11 @@ <text name="pg_label"> Général </text> - <check_box initial_value="true" name="event_mature_chk"/> - <text name="mature_label"> + <check_box initial_value="true" name="events_mature_chk"/> + <text name="events_mature_label"> Modéré </text> - <text name="adult_label"> + <text name="events_adult_label"> Adulte </text> </panel> diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml index e50de400fd..b66af7a2bf 100644 --- a/indra/newview/skins/default/xui/fr/inspect_object.xml +++ b/indra/newview/skins/default/xui/fr/inspect_object.xml @@ -8,8 +8,8 @@ Par [CREATOR] </string> <string name="CreatorAndOwner"> - par [CREATOR] -propriétaire [OWNER] + De [CREATOR] +Propriétaire [OWNER] </string> <string name="Price"> [AMOUNT] L$ @@ -23,16 +23,16 @@ propriétaire [OWNER] <string name="Sit"> M'asseoir </string> - <text name="object_name" value="Nom d'objet de test vraiment très long"/> + <text name="object_name" value="Test Object Name That Is actually two lines and Really Long"/> <text name="object_creator"> par secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> <text name="price_text"> - 300 000 L$ + 30 000 L$ </text> <text name="object_description"> - Cette description d'objet est vraiment très longue : elle compte au moins 80 caractères, voire plus de 120, vraiment très très longue. Who knows, really? + This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really? </text> <text name="object_media_url"> http://www.superdupertest.com 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_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml new file mode 100644 index 0000000000..a4ead48b6b --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Attachment"> + <menu_item_call label="Détacher" name="detach"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml new file mode 100644 index 0000000000..4b6907fcc6 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Body"> + <menu_item_call label="Remplacer" name="replace"/> + <menu_item_call label="Modifier" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml new file mode 100644 index 0000000000..c5641c756a --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Clothing"> + <menu_item_call label="Enlever" name="take_off"/> + <menu_item_call label="Couche supérieure" name="move_up"/> + <menu_item_call label="Couche inférieure" name="move_down"/> + <menu_item_call label="Modifier" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml new file mode 100644 index 0000000000..8276d57025 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear COF"> + <menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/> + <menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/> +</menu> diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml index 3a7126fe50..86a2ddd185 100644 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml @@ -2,4 +2,5 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Afficher la barre de navigation" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Afficher la barre des Favoris" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Afficher la mini-barre d'emplacement" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 4b9a05edd6..8b0d726e51 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -81,6 +81,7 @@ <menu label="Attacher au HUD " name="Attach To HUD"/> <menu_item_call label="Éditer" name="Wearable Edit"/> <menu_item_call label="Porter" name="Wearable Wear"/> + <menu_item_call label="Ajouter" name="Wearable Add"/> <menu_item_call label="Enlever" name="Take Off"/> <menu_item_call label="--aucune option--" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml new file mode 100644 index 0000000000..93730c6206 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Outfit"> + <menu_item_call label="Porter - Remplacer la tenue actuelle" name="wear"/> + <menu_item_call label="Enlever - Supprimer de la tenue actuelle" name="take_off"/> + <menu label="Nouveaux habits" name="New Clothes"> + <menu_item_call label="Nouvelle chemise" name="New Shirt"/> + <menu_item_call label="Nouveau pantalon" name="New Pants"/> + <menu_item_call label="Nouvelles chaussures" name="New Shoes"/> + <menu_item_call label="Nouvelles chaussettes" name="New Socks"/> + <menu_item_call label="Nouvelle veste" name="New Jacket"/> + <menu_item_call label="Nouvelle jupe" name="New Skirt"/> + <menu_item_call label="Nouveaux gants" name="New Gloves"/> + <menu_item_call label="Nouveau débardeur" name="New Undershirt"/> + <menu_item_call label="Nouveau caleçon" name="New Underpants"/> + <menu_item_call label="Nouvel alpha" name="New Alpha"/> + <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> + </menu> + <menu label="Nouvelles parties du corps" name="New Body Parts"> + <menu_item_call label="Nouvelle silhouette" name="New Shape"/> + <menu_item_call label="Nouvelle peau" name="New Skin"/> + <menu_item_call label="Nouveaux cheveux" name="New Hair"/> + <menu_item_call label="Nouveaux yeux" name="New Eyes"/> + </menu> + <menu_item_call label="Renommer la tenue" name="rename"/> + <menu_item_call label="Supprimer la tenue" name="delete_outfit"/> +</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 new file mode 100644 index 0000000000..2a7f618e07 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit"> + <menu_item_call label="Porter - Remplacer la tenue actuelle" name="wear_replace"/> + <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 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_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml index fbec933382..f78db411b3 100644 --- a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="save_outfit_menu"> <menu_item_call label="Enregistrer" name="save_outfit"/> - <menu_item_call label="Enregistrer comme nouvelle" name="save_as_new_outfit"/> + <menu_item_call label="Enregistrer sous" name="save_as_new_outfit"/> </toggleable_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 4c7cdefbe8..ec9bee9a64 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -11,6 +11,7 @@ <menu_item_check label="Mon inventaire" name="Inventory"/> <menu_item_check label="Mon inventaire" name="ShowSidetrayInventory"/> <menu_item_check label="Mes gestes" name="Gestures"/> + <menu_item_check label="Ma voix" name="ShowVoice"/> <menu label="Mon statut" name="Status"> <menu_item_call label="Absent" name="Set Away"/> <menu_item_call label="Occupé" name="Set Busy"/> @@ -70,6 +71,12 @@ <menu_item_call label="Lien" name="Link"/> <menu_item_call label="Annuler le lien" name="Unlink"/> <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/> + <menu label="Sélectionner les parties liées" name="Select Linked Parts"> + <menu_item_call label="Sélectionner la partie suivante" name="Select Next Part"/> + <menu_item_call label="Sélectionner la partie précédente" name="Select Previous Part"/> + <menu_item_call label="Inclure la partie suivante" name="Include Next Part"/> + <menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/> + </menu> <menu_item_call label="Point central sur la sélection" name="Focus on Selection"/> <menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/> <menu label="Objet" name="Object"> @@ -100,11 +107,11 @@ <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/> <menu_item_call label="Options de la grille" name="Grid Options"/> </menu> - <menu label="Sélectionner les parties liées" name="Select Linked Parts"> - <menu_item_call label="Sélectionner la partie suivante" name="Select Next Part"/> - <menu_item_call label="Sélectionner la partie précédente" name="Select Previous Part"/> - <menu_item_call label="Inclure la partie suivante" name="Include Next Part"/> - <menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/> + <menu label="Charger" name="Upload"> + <menu_item_call label="Image ([COST] L$)..." name="Upload Image"/> + <menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/> + <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/> + <menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/> </menu> </menu> <menu label="Aide" name="Help"> @@ -170,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 new file mode 100644 index 0000000000..39e8ca2173 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit Wearable Context Menu"> + <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"/> + <context_menu label="Attacher à ▶" name="wearable_attach_to"/> + <context_menu label="Attacher au HUD ▶" name="wearable_attach_to_hud"/> + <menu_item_call label="Enlever" name="take_off"/> + <menu_item_call label="Modifier" name="edit"/> + <menu_item_call label="Profil de l'objet" name="object_profile"/> + <menu_item_call label="Afficher l'original" name="show_original"/> +</context_menu> 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 c910b4a058..363009ec37 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -474,7 +474,9 @@ La qualité des graphiques peut être augmentée à la section Préférences > Le terraformage est interdit dans la région [REGION]. </notification> <notification name="CannotCopyWarning"> - Vous n'êtes pas autorisé à copier cet objet et il disparaîtra de votre inventaire si vous le donnez. Souhaitez-vous vraiment offrir cet objet ? + Vous n'êtes pas autorisé à copier les articles suivants : +[ITEMS]. +Ceux-ci disparaîtront donc de votre inventaire si vous les donnez. Voulez-vous vraiment offrir ces articles ? <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> </notification> <notification name="CannotGiveItem"> @@ -612,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"> @@ -943,6 +944,26 @@ Proposer à [NAME] de devenir votre ami(e) ? <button name="Cancel" text="Annuler"/> </form> </notification> + <notification label="Enregistrer l'article à porter" name="SaveWearableAs"> + Enregistrer l'article dans mon inventaire comme : + <form name="form"> + <input name="message"> + [DESC] (nouv.) + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Annuler"/> + </form> + </notification> + <notification label="Renommer la tenue" name="RenameOutfit"> + Nouveau nom de la tenue : + <form name="form"> + <input name="new_name"> + [NAME] + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Annuler"/> + </form> + </notification> <notification name="RemoveFromFriends"> Voulez-vous supprimer [FIRST_NAME] [LAST_NAME] de votre liste d'amis ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> @@ -1555,7 +1576,7 @@ Souhaitez-vous en savoir plus sur les différentes catégories d'accès ? <notification name="RegionEntryAccessBlocked_Change"> La catégorie de contenu définie dans vos préférences ne vous permet pas de pénétrer dans cette région. -Pour cela, cliquez sur Modifier les préférences afin de spécifier une catégorie plus élevée. Vous pourrez alors rechercher du contenu [REGIONMATURITY] et y accéder. Pour modifier ce paramètre ultérieurement, accédez à Moi > Préférences > Général, le moment voulu. +Pour cela, vous devez modifier votre paramètre de catégorie de contenu. Vous pourrez alors rechercher du contenu [REGIONMATURITY] et y accéder. Pour annuler vos modifications, accédez à Moi > Préférences > Général. <form name="form"> <button name="OK" text="Modifier les préférences"/> <button default="true" name="Cancel" text="Fermer"/> @@ -2573,6 +2594,21 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore <notification name="VoiceLoginRetry"> Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants. </notification> + <notification name="VoiceEffectsExpired"> + Au moins l'un des effets de voix auxquels vous êtes abonné a expiré. +[[URL] Cliquez ici] pour renouveler votre abonnement. + </notification> + <notification name="VoiceEffectsExpiredInUse"> + L'effet de voix actif a expiré. Vos paramètres de voix normaux ont été rétablis. +[[URL] Cliquez ici] pour renouveler votre abonnement. + </notification> + <notification name="VoiceEffectsWillExpire"> + Au moins l'un de vos effets de voix expirera dans moins de [INTERVAL] jours. +[[URL] Cliquez ici] pour renouveler votre abonnement. + </notification> + <notification name="VoiceEffectsNew"> + De nouveaux effets de voix sont disponibles ! + </notification> <notification name="Cannot enter parcel: not a group member"> Seuls les membres d'un certain groupe peuvent visiter cette zone. </notification> @@ -2639,18 +2675,36 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité. Le bouton sera affiché quand il y aura suffisamment de place. </notification> <notification name="ShareNotification"> - Faire glisser des articles de l'inventaire sur une personne dans le sélecteur de résident + Sélectionnez les résidents avec lesquels partager l'élément. + </notification> + <notification name="ShareItemsConfirmation"> + Voulez-vous vraiment partager les articles suivants : + +[ITEMS] + +avec les résidents suivants : + +[RESIDENTS] ? + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Ok"/> + </notification> + <notification name="ItemsShared"> + Articles partagés. </notification> <notification name="DeedToGroupFail"> Échec de cession au groupe. </notification> <notification name="AvatarRezNotification"> ([EXISTENCE] secondes d'existence) -Nuage de l'avatar [NAME] disparu en [TIME] secondes. +Nuage de l'avatar [NAME] disparu au bout de [TIME] secondes. </notification> - <notification name="AvatarRezSelfNotification"> + <notification name="AvatarRezSelfBakedDoneNotification"> ([EXISTENCE] secondes d'existence) -Vous avez terminé de figer votre tenue en [TIME] secondes. +Tenue figée au bout de [TIME] secondes. + </notification> + <notification name="AvatarRezSelfBakedUpdateNotification"> + ([EXISTENCE] secondes d'existence) +Mise à jour de votre apparence transmise au bout de [TIME] secondes. +[STATUS] </notification> <notification name="AvatarRezCloudNotification"> ([EXISTENCE] secondes d'existence) @@ -2672,10 +2726,32 @@ L'avatar [NAME] est entré en mode Apparence. ([EXISTENCE] secondes d'existence) L'avatar [NAME] a quitté le mode Apparence. </notification> + <notification name="NoConnect"> + Problèmes de connexion via [PROTOCOL] [HOSTID]. +Veuillez vérifier la configuration de votre réseau et de votre pare-feu. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> + <notification name="NoVoiceConnect"> + Problèmes de connexion à votre serveur vocal : + +[HOSTID] + +Aucune communication vocale n'est disponible. +Veuillez vérifier la configuration de votre réseau et de votre pare-feu. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> <notification name="AvatarRezLeftNotification"> ([EXISTENCE] secondes d'existence) Départ de l'avatar [NAME] entièrement chargé. </notification> + <notification name="AvatarRezSelfBakeNotification"> + ([EXISTENCE] secondes d'existence) +Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] secondes. + </notification> <notification name="ConfirmLeaveCall"> Voulez-vous vraiment quitter cet appel ? <usetemplate ignoretext="Confirmer avant de quitter l'appel" name="okcancelignore" notext="Non" yestext="Oui"/> @@ -2686,7 +2762,7 @@ Les résidents rejoignant l'appel ultérieurement seront également ignorés, même si vous quittez l'appel. Ignorer les autres ? - <usetemplate ignoretext="Confirmer avant d'ignorer les autres lors d'un appel de groupe" name="okcancelignore" notext="Ok" yestext="Annuler"/> + <usetemplate ignoretext="Confirmer avant d'ignorer les autres lors d'un appel de groupe" name="okcancelignore" notext="Annuler" yestext="Ok"/> </notification> <global name="UnsupportedCPU"> - Votre processeur ne remplit pas les conditions minimum requises. 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_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml index 88f0635d97..6a5f71a36b 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <text name="avatar_height"> - Taille : [HEIGHT] mètres - </text> + <string name="meters"> + mètres + </string> + <string name="feet"> + pieds + </string> + <string name="height"> + Taille : + </string> + <text name="avatar_height"/> <panel label="Chemise" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Corps"/> 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 e0762bd791..4b1572b052 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -72,8 +72,8 @@ <string name="jacket_desc_text"> Veste : </string> - <string name="skirt_skirt_desc_text"> - Jupe : + <string name="skirt_desc_text"> + Jupe : </string> <string name="gloves_desc_text"> Gants : @@ -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 :"/> @@ -100,13 +101,8 @@ <icon name="male_icon" tool_tip="Homme"/> <icon name="female_icon" tool_tip="Femme"/> </panel> - <panel label="gear_buttom_panel" name="gear_buttom_panel"> - <button name="friends_viewsort_btn" tool_tip="Options"/> - <button name="add_btn" tool_tip="TODO"/> - <button name="del_btn" tool_tip="TODO"/> - </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 4c869d05c8..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"/> - <button label="modifier" name="edit_wearable_btn"/> + <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"> @@ -23,23 +25,19 @@ </panel> <layout_stack name="im_panels"> <layout_panel label="Panneau de contrôle IM" name="outfit_wearables_panel"> - <panel label="bottom_panel" name="edit_panel"/> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <text name="add_to_outfit_label" value="Ajouter à la tenue :"/> <layout_stack name="filter_panels"> - <layout_panel label="Panneau de contrôle IM" name="filter_panel"> - <filter_editor label="Filtre" name="look_item_filter"/> + <layout_panel name="add_button_and_combobox"> + <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"/> </layout_panel> </layout_stack> - <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> - <button label="D" name="folder_view_btn"/> - <button label="L" name="list_view_btn"/> - </panel> </layout_panel> + <layout_panel name="add_wearables_panel"/> </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 f4fa3a2838..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,9 +6,8 @@ </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é"/> - <button label="Enregistrer la tenue" name="make_outfit_btn" tool_tip="Enregistrer l'apparence comme tenue"/> + <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"/> - <button label="Modifier tenue" name="edit_current_outfit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index 9990c4612d..efb06cfce9 100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml @@ -5,12 +5,12 @@ <filter_editor label="Filtrer les endroits" name="Filter"/> <panel name="button_panel"> <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> - <button label="Carte" name="map_btn"/> + <button label="Carte" name="map_btn" tool_tip="Afficher la zone correspondante sur la carte du monde"/> <button label="Éditer" name="edit_btn" tool_tip="Modifier les informations du repère"/> <button label="▼" name="overflow_btn" tool_tip="Afficher d'autres options"/> <button label="Enregistrer" name="save_btn"/> <button label="Annuler" name="cancel_btn"/> <button label="Fermer" name="close_btn"/> - <button label="Profil" name="profile_btn"/> + <button label="Profil" name="profile_btn" tool_tip="Afficher le profil de l'endroit"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 6b8e68bd98..9af3a8a5d8 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="Construire/Modifier" name="edit_camera_movement" tool_tip="Utilisez le positionnement automatique de la caméra quand vous accédez au mode de modification et quand vous le quittez"/> <check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra quand je suis en mode Édition"/> - <check_box label="Panneau latéral" name="appearance_sidebar_positioning" tool_tip="Positionnement auto de la caméra pour le panneau latéral"/> + <check_box initial_value="true" label="Panneau latéral" name="appearance_sidebar_positioning" tool_tip="Positionnement auto de la caméra pour le panneau latéral"/> <check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/> <check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/> <check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/> 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_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml index dffb1d4238..3c56fa68e7 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -21,8 +21,10 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/> - <button label="Acheter L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> + <panel name="balance_bg"> + <text name="balance" tool_tip="Mon solde" value="20 L$"/> + <button label="ACHETER L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$"/> + </panel> <text name="TimeText" tool_tip="Heure actuelle (Pacifique)"> 00h00 PST </text> diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml new file mode 100644 index 0000000000..a134854706 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_voice_effect"> + <string name="no_voice_effect"> + Effet de voix désactivé + </string> + <string name="preview_voice_effects"> + Aperçu des effets de voix ▶ + </string> + <string name="get_voice_effects"> + Obtenir un effet de voix ▶ + </string> + <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_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index 893b64d4b2..ebee1af45b 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml @@ -2,12 +2,12 @@ <panel label="Choses" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="Profil" name="info_btn"/> - <button label="Partager" name="share_btn"/> - <button label="Acheter" name="shop_btn"/> - <button label="Porter" name="wear_btn"/> + <button label="Profil" name="info_btn" tool_tip="Afficher le profil de l'objet"/> + <button label="Partager" name="share_btn" tool_tip="Partager un article de l'inventaire"/> + <button label="Acheter" name="shop_btn" tool_tip="Accéder à la place du marché sur le Web"/> + <button label="Porter" name="wear_btn" tool_tip="Porter la tenue sélectionnée"/> <button label="Jouer" name="play_btn"/> - <button label="Téléporter" name="teleport_btn"/> + <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> </panel> </panel> </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..db7e6a9365 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,8 +15,8 @@ <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="where" value="(inventaire)"/> + <text name="title" value="Profil de l'article"/> + <text name="origin" value="(inventaire)"/> <panel label=""> <text name="LabelItemNameTitle"> Nom : diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 15d5847c58..604398a658 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -107,7 +107,7 @@ Nom d'hôte non valide utilisé pour accéder au serveur. Vérifiez votre nom d'hôte de grille ou SLURL. </string> <string name="CertExpired"> - Il semble que le certificat renvoyé par la grille ait expiré. Vérifiez votre horloge système ou contactez l'administrateur de la grille. + Il semble que le certificat renvoyé par la grille ait expiré. Vérifiez votre horloge système ou contactez l'administrateur de la grille. </string> <string name="CertKeyUsage"> Impossible d'utiliser le certificat renvoyé par le serveur pour SSL. Contactez l'administrateur de la grille. @@ -116,7 +116,7 @@ Certificats trop nombreux dans la chaîne des certificats du serveur. Contactez l'administrateur de la grille. </string> <string name="CertInvalidSignature"> - Impossible de vérifier la signature de certificat renvoyée par le serveur de la grille. Contactez l'administrateur de la grille. + Impossible de vérifier la signature de certificat renvoyée par le serveur de la grille. Contactez l'administrateur de la grille. </string> <string name="LoginFailedNoNetwork"> Erreur réseau : impossible d'établir la connexion. Veuillez vérifier votre connexion réseau. @@ -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> @@ -753,6 +756,12 @@ <string name="land_type_unknown"> (inconnu) </string> + <string name="Estate / Full Region"> + Domaine / Région entière + </string> + <string name="Mainland / Full Region"> + Continent / Région entière + </string> <string name="all_files"> Tous fichiers </string> @@ -858,6 +867,9 @@ <string name="invalid"> non valide </string> + <string name="none"> + aucun + </string> <string name="shirt_not_worn"> Chemise non portée </string> @@ -897,6 +909,9 @@ <string name="NewWearable"> Nouv. [WEARABLE_ITEM] </string> + <string name="CreateNewWearable"> + Créer [WEARABLE_TYPE] + </string> <string name="next"> Suivant </string> @@ -1080,7 +1095,7 @@ <string name="InvFolder Gestures"> Gestes </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoris </string> <string name="InvFolder Current Outfit"> @@ -3550,6 +3565,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="session_initialization_timed_out_error"> Expiration du délai d'initialisation de la session </string> + <string name="voice_morphing_url"> + http://secondlife.com/landing/voicemorphing + </string> <string name="paid_you_ldollars"> [NAME] vous a payé [AMOUNT] L$ </string> @@ -3720,16 +3738,16 @@ de l'infraction signalée <string name="Male - Wow"> Homme - Ouah ! </string> - <string name="FeMale - Excuse me"> + <string name="Female - Excuse me"> Femme - Demander pardon </string> - <string name="FeMale - Get lost"> + <string name="Female - Get lost"> Femme - Dire d'aller au diable </string> - <string name="FeMale - Blow kiss"> + <string name="Female - Blow kiss"> Femme - Envoyer un baiser </string> - <string name="FeMale - Boo"> + <string name="Female - Boo"> Femme - Hou ! </string> <string name="Female - Bored"> @@ -3762,4 +3780,32 @@ de l'infraction signalée <string name="texture_load_dimensions_error"> Impossible de charger des images de taille supérieure à [WIDTH]*[HEIGHT] </string> + <string name="words_separator" value=","/> + <string name="server_is_down"> + Malgré nos efforts, une erreur inattendue s'est produite. + + Veuillez vous reporter à status.secondlifegrid.net afin de déterminer si un problème connu existe avec ce service. + Si le problème persiste, vérifiez la configuration de votre réseau et de votre pare-feu. + </string> + <string name="dateTimeWeekdaysNames"> + Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday + </string> + <string name="dateTimeWeekdaysShortNames"> + Sun:Mon:Tue:Wed:Thu:Fri:Sat + </string> + <string name="dateTimeMonthNames"> + January:February:March:April:May:June:July:August:September:October:November:December + </string> + <string name="dateTimeMonthShortNames"> + Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec + </string> + <string name="dateTimeDayFormat"> + [MDAY] + </string> + <string name="dateTimeAM"> + AM + </string> + <string name="dateTimePM"> + PM + </string> </strings> 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/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml index b07daac6fb..a6bd4ffbaf 100644 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml @@ -35,11 +35,11 @@ <text name="pg_label"> Generale </text> - <check_box name="event_mature_chk"/> - <text name="mature_label"> + <check_box name="events_mature_chk"/> + <text name="events_mature_label"> Moderato </text> - <text name="adult_label"> + <text name="events_adult_label"> Adulto </text> </panel> 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..37a19b2e50 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,8 +15,8 @@ <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="where" value="(Inventario)"/> + <text name="title" value="Profilo articolo"/> + <text name="origin" value="(Inventario)"/> <panel label=""> <text name="LabelItemNameTitle"> Nome: diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index d601c27d28..aeaf8098b9 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> @@ -1068,7 +1074,7 @@ <string name="InvFolder Gestures"> Gesture </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Preferiti </string> <string name="InvFolder Current Outfit"> diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 610d4183b3..ec5c2a64a5 100644 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml @@ -9,35 +9,28 @@ <floater.string name="move_tooltip"> カメラを上下左右に移動 </floater.string> - <floater.string name="orbit_mode_title"> - 旋回 + <floater.string name="camera_modes_title"> + カメラモード </floater.string> <floater.string name="pan_mode_title"> - 水平・垂直移動 + 旋回 - ズーム - 水平・垂直移動 </floater.string> - <floater.string name="avatar_view_mode_title"> - 固定 + <floater.string name="presets_mode_title"> + 事前設定の視野 </floater.string> <floater.string name="free_mode_title"> オブジェクトを見る </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/> <panel name="zoom" tool_tip="向いている方法にカメラをズーム"> + <joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/> <slider_bar name="zoom_slider" tool_tip="向いている方向にカメラをズーム"/> - </panel> - <joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/> - <panel name="camera_presets"> - <button name="rear_view" tool_tip="後方視界"/> - <button name="group_view" tool_tip="グループ視界"/> - <button name="front_view" tool_tip="前方視界"/> - <button name="mouselook_view" tool_tip="一人称視界"/> + <joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="カメラを回す"/> - <button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/> - <button label="" name="avatarview_btn" tool_tip="固定"/> - <button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/> + <button label="" name="presets_btn" tool_tip="事前設定の視野"/> + <button label="" name="pan_btn" tool_tip="旋回 - ズーム - 水平・垂直移動"/> + <button label="" name="avatarview_btn" tool_tip="カメラモード"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml index 04013799ec..8e5177d6fe 100644 --- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml @@ -16,7 +16,13 @@ がコンファレンスチャットで、ボイスチャットに参加しました。 </floater.string> <floater.string name="VoiceInviteGroup"> - は [GROUP]. のボイスチャットコールに参加しました。 + '[GROUP]'のボイスチャネルに参加なさいました。 + </floater.string> + <floater.string name="VoiceInviteQuestionGroup"> + [CURRENT_CHAT]を退席して、'[GROUP]'とのチャットに参加しますか？ + </floater.string> + <floater.string name="VoiceInviteQuestionDefault"> + [CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？ </floater.string> <text name="question"> [CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？ 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 9aecbab70f..05a10f9f6d 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -1,16 +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"/> - <button label="共有" name="share"/> - <button label="Web で共有" name="share_to_web"/> - <button label="「持ち物」に保存" name="save_to_inventory"/> - <button label="保存" name="save"/> - <button label="スナップショットをメール" name="share_to_email"/> - <button label="コンピューターに保存" name="save_to_computer"/> - <button label="プロフィールに設定" name="set_profile_pic"/> - <button label="戻る" name="cancel"/> + <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_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml index 5af8f20690..4b95aa544f 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml @@ -19,8 +19,10 @@ <layout_panel name="my_panel"> <text name="user_text" value="マイ アバター："/> </layout_panel> - <layout_panel name="leave_call_btn_panel"> - <button label="コール終了" name="leave_call_btn"/> - </layout_panel> + <layout_stack name="voice_effect_and_leave_call_stack"> + <layout_panel name="leave_call_btn_panel"> + <button label="コール終了" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </layout_stack> </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 new file mode 100644 index 0000000000..4557815129 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="場所" name="voice_effects" title="ボイスモーフィング"> + <string name="no_voice_effect"> + （ボイスモーフィングなし） + </string> + <string name="active_voice_effect"> + （アクティブ） + </string> + <string name="unsubscribed_voice_effect"> + （取消し済み） + </string> + <string name="new_voice_effect"> + （新登場！） + </string> + <text name="preview_text"> + プレビュー + </text> + <text name="status_text"> + 声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。 + </text> + <button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/> + <button label="停止" name="record_stop_btn"/> + <text name="voice_morphing_link"> + [[URL] 今すぐ申し込む] + </text> + <scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。"> + <scroll_list.columns label="ボイス名" name="name"/> + <scroll_list.columns label="有効期限" name="expires"/> + </scroll_list> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index ce9e7d0777..62670251d6 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -39,12 +39,12 @@ <text name="pg_label"> General </text> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> - <text name="mature_label"> + <check_box initial_value="true" label="Mature" name="events_mature_chk"/> + <text name="events_mature_label"> Moderate </text> - <check_box label="Adult" name="event_adult_chk"/> - <text name="adult_label"> + <check_box label="Adult" name="events_adult_chk"/> + <text name="events_adult_label"> Adult </text> </panel> diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml index 842030c39a..e6999ac9b1 100644 --- a/indra/newview/skins/default/xui/ja/inspect_object.xml +++ b/indra/newview/skins/default/xui/ja/inspect_object.xml @@ -8,8 +8,8 @@ 制作者： [CREATOR] </string> <string name="CreatorAndOwner"> - 制作者： [CREATOR] -所有者： [OWNER] + [CREATOR]によるチェック +[OWNER]によるチェック </string> <string name="Price"> L$[AMOUNT] @@ -23,16 +23,16 @@ <string name="Sit"> 座る </string> - <text name="object_name" value="Test Object Name That Is Really Long"/> + <text name="object_name" value="二行にわたる長いオブジェクト名をテスト"/> <text name="object_creator"> by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> <text name="price_text"> - L$300,000 + L$30,000 </text> <text name="object_description"> - This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really? + This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really? </text> <text name="object_media_url"> http://www.superdupertest.com 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_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml new file mode 100644 index 0000000000..e786d02e40 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Attachment"> + <menu_item_call label="取り外す" name="detach"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml new file mode 100644 index 0000000000..eb5faa2545 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Body"> + <menu_item_call label="交換" name="replace"/> + <menu_item_call label="編集" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml new file mode 100644 index 0000000000..9da909fa17 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Clothing"> + <menu_item_call label="取り外す" name="take_off"/> + <menu_item_call label="上のレイヤーに移動" name="move_up"/> + <menu_item_call label="下のレイヤーに移動" name="move_down"/> + <menu_item_call label="編集" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml new file mode 100644 index 0000000000..a071abbd2e --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear COF"> + <menu label="衣類" name="COF.Gear.New_Clothes"/> + <menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/> +</menu> diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml index 09e70b0d1f..3a1ae49700 100644 --- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml @@ -2,4 +2,5 @@ <menu name="hide_navbar_menu"> <menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/> <menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="「場所」のミニフィールドを表示" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 452d0567da..782b9ea5a5 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -81,6 +81,7 @@ <menu label="HUD 装着先" name="Attach To HUD"/> <menu_item_call label="編集" name="Wearable Edit"/> <menu_item_call label="装着" name="Wearable Wear"/> + <menu_item_call label="追加" name="Wearable Add"/> <menu_item_call label="取り外す" name="Take Off"/> <menu_item_call label="－－オプションなし－－" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml new file mode 100644 index 0000000000..e68ed5ccc7 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Outfit"> + <menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear"/> + <menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/> + <menu label="衣類" name="New Clothes"> + <menu_item_call label="シャツ" name="New Shirt"/> + <menu_item_call label="パンツ" name="New Pants"/> + <menu_item_call label="靴" name="New Shoes"/> + <menu_item_call label="靴下" name="New Socks"/> + <menu_item_call label="ジャケット" name="New Jacket"/> + <menu_item_call label="スカート" name="New Skirt"/> + <menu_item_call label="手袋" name="New Gloves"/> + <menu_item_call label="下着（上）" name="New Undershirt"/> + <menu_item_call label="下着（下）" name="New Underpants"/> + <menu_item_call label="アルファ" name="New Alpha"/> + <menu_item_call label="新しいタトゥ" name="New Tattoo"/> + </menu> + <menu label="新しい身体部位" name="New Body Parts"> + <menu_item_call label="新しいシェイプ" name="New Shape"/> + <menu_item_call label="スキン" name="New Skin"/> + <menu_item_call label="髪" name="New Hair"/> + <menu_item_call label="目" name="New Eyes"/> + </menu> + <menu_item_call label="アウトフィットの名前を変更する" name="rename"/> + <menu_item_call label="アウトフィットを削除する" name="delete_outfit"/> +</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 new file mode 100644 index 0000000000..9491c22f31 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit"> + <menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear_replace"/> + <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="delete"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml index 7ebaa6e1c8..6513d9264a 100644 --- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="save_outfit_menu"> <menu_item_call label="保存" name="save_outfit"/> - <menu_item_call label="新規で保存" name="save_as_new_outfit"/> + <menu_item_call label="別名で保存" name="save_as_new_outfit"/> </toggleable_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 f6695d2d13..7c4912fa07 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -11,6 +11,7 @@ <menu_item_check label="持ち物" name="Inventory"/> <menu_item_check label="持ち物" name="ShowSidetrayInventory"/> <menu_item_check label="ジェスチャー" name="Gestures"/> + <menu_item_check label="マイボイス" name="ShowVoice"/> <menu label="ログイン状態" name="Status"> <menu_item_call label="一時退席中" name="Set Away"/> <menu_item_call label="取り込み中" name="Set Busy"/> @@ -70,6 +71,12 @@ <menu_item_call label="リンク" name="Link"/> <menu_item_call label="リンクを外す" name="Unlink"/> <menu_item_check label="リンクした部分を編集" name="Edit Linked Parts"/> + <menu label="リンクした部分を選択する" name="Select Linked Parts"> + <menu_item_call label="次の部分を選択する" name="Select Next Part"/> + <menu_item_call label="前回の部分を選択する" name="Select Previous Part"/> + <menu_item_call label="次の部分を含める" name="Include Next Part"/> + <menu_item_call label="前回の部分を含める" name="Include Previous Part"/> + </menu> <menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/> <menu_item_call label="選択したものをズームする" name="Zoom to Selection"/> <menu label="オブジェクト" name="Object"> @@ -100,11 +107,11 @@ <menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid"/> <menu_item_call label="グリッドオプション" name="Grid Options"/> </menu> - <menu label="リンクした部分を選択する" name="Select Linked Parts"> - <menu_item_call label="次の部分を選択する" name="Select Next Part"/> - <menu_item_call label="前回の部分を選択する" name="Select Previous Part"/> - <menu_item_call label="次の部分を含める" name="Include Next Part"/> - <menu_item_call label="前回の部分を含める" name="Include Previous Part"/> + <menu label="アップロード" name="Upload"> + <menu_item_call label="画像（L$[COST]）..." name="Upload Image"/> + <menu_item_call label="サウンド（L$[COST]）..." name="Upload Sound"/> + <menu_item_call label="アニメーション（L$[COST]）..." name="Upload Animation"/> + <menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/> </menu> </menu> <menu label="ヘルプ" name="Help"> @@ -171,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 new file mode 100644 index 0000000000..13bfb09f5f --- /dev/null +++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml @@ -0,0 +1,13 @@ +<?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_add"/> + <menu_item_call label="取り外す" name="take_off_or_detach"/> + <menu_item_call label="取り外す" name="detach"/> + <context_menu label="装着 ▶" name="wearable_attach_to"/> + <context_menu label="HUDに装着 ▶" name="wearable_attach_to_hud"/> + <menu_item_call label="取り外す" name="take_off"/> + <menu_item_call label="編集" name="edit"/> + <menu_item_call label="オブジェクトのプロフィール" name="object_profile"/> + <menu_item_call label="オリジナルを表示" name="show_original"/> +</context_menu> 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 c82f1198a4..e1c434b6b3 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -497,8 +497,7 @@ L$ が不足しているのでこのグループに参加することができ [REGION] では、地形の変更ができません。 </notification> <notification name="CannotCopyWarning"> - あなたはこのアイテムのコピーを許されていないので、人にあげると「持ち物」からなくなります。 -本当にこれを渡しますか？ + あなたには[ITEMS]というアイテムをコピーする許可がありません。他の住人に提供すると、そのアイテムはあなたの「持ち物」から削除されます。本当にこれらのアイテムを譲りますか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> <notification name="CannotGiveItem"> @@ -639,8 +638,7 @@ L$ が不足しているのでこのグループに参加することができ 次のファイルのエンコードができません： [FILE] </notification> <notification name="CorruptedProtectedDataStore"> - 保護されているデータを読みとることが出来ないためリセットされます。 - ネットワーク設定を変更すると起こることがあります。 + ユーザー名とパスワードを自動入力できません。これはネットワーク設定が変更された場合に起こります <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CorruptResourceFile"> @@ -976,6 +974,26 @@ L$ は返金されません。 <button name="Cancel" text="キャンセル"/> </form> </notification> + <notification label="着用物を保存" name="SaveWearableAs"> + アイテムを別名で持ち物に保存： + <form name="form"> + <input name="message"> + [DESC]（新規） + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="取り消し"/> + </form> + </notification> + <notification label="アウトフィットの名前を変更する" name="RenameOutfit"> + 新しいアウトフィットの名前： + <form name="form"> + <input name="new_name"> + [NAME] + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="取り消し"/> + </form> + </notification> <notification name="RemoveFromFriends"> [FIRST_NAME] [LAST_NAME] をフレンドリストから削除しますか？ <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> @@ -1602,9 +1620,9 @@ SHA1 フィンガープリント： [MD5_DIGEST] あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。 </notification> <notification name="RegionEntryAccessBlocked_Change"> - あなたのレーティング区分設定に基づいて、そのリージョンへは入ることができません。 + レーティング区分に関する設定により、その地域（リージョン）には立ち入れません。 -「設定を変更」をクリックしてレーティング区分の設定を変更すればすぐに入れます。 変更に伴って [REGIONMATURITY] コンテンツの検索やアクセスが可能になります。 あとで設定を変更したい場合は ミー > 環境設定 > 一般 からどうぞ。 +その地域に入るには、あなたのレーティング区分の設定を変更してください。変更すると、[REGIONMATURITY]のコンテンツの検索やアクセスが可能になります。変更内容を元に戻すには、ミー > 環境設定 > 一般を選択してください。 <form name="form"> <button name="OK" text="環境設定の変更"/> <button default="true" name="Cancel" text="閉じる"/> @@ -2634,6 +2652,18 @@ M キーを押して変更します。 <notification name="VoiceLoginRetry"> ボイスチャンネルを作成しています。1 分ほどかかります。 </notification> + <notification name="VoiceEffectsExpired"> + ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。期限を延長・更新するには[[URL]こちらをクリック]してください。 + </notification> + <notification name="VoiceEffectsExpiredInUse"> + ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。期限を延長・更新するには[[URL]こちらをクリック]してください。 + </notification> + <notification name="VoiceEffectsWillExpire"> + ボイスモーフィング効果の1つまたは複数の有効期限が[INTERVAL]日以内に終了します。期限を延長・更新するには[[URL]こちらをクリック]してください。 + </notification> + <notification name="VoiceEffectsNew"> + 新しいボイスモーフィング効果が登場！ + </notification> <notification name="Cannot enter parcel: not a group member"> 特定のグループメンバーのみこのエリアを訪問することができます。 </notification> @@ -2700,18 +2730,36 @@ M キーを押して変更します。 じゅうぶんなスペースができればボタンは表示されます。 </notification> <notification name="ShareNotification"> - 住人選択画面に表示された人に「持ち物」からアイテムをドラッグしてください + 共有する住人を選択します。 + </notification> + <notification name="ShareItemsConfirmation"> + 次のアイテムを共有しますか： + +[ITEMS] + +次の住人と共有しますか： + +[RESIDENTS] + <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> + </notification> + <notification name="ItemsShared"> + アイテムが共有されました。 </notification> <notification name="DeedToGroupFail"> グループへの譲渡に失敗しました。 </notification> <notification name="AvatarRezNotification"> - （ [EXISTENCE] 秒） -アバター「 [NAME] 」が [TIME] 秒で出現します。 + （作成後[EXISTENCE]秒経過） +'[NAME]'というアバターは[TIME]秒後に姿を現わしました。 </notification> - <notification name="AvatarRezSelfNotification"> - （ [EXISTENCE] 秒） -[TIME] 秒でアウトフィットのベーキングが完了しました。 + <notification name="AvatarRezSelfBakedDoneNotification"> + （作成後[EXISTENCE]秒経過） +アウトフィットのベークは[TIME]秒後に完了しました。 + </notification> + <notification name="AvatarRezSelfBakedUpdateNotification"> + （作成後[EXISTENCE]秒経過） +容姿の更新は[TIME]秒後に送信されました。 +[STATUS] </notification> <notification name="AvatarRezCloudNotification"> （ [EXISTENCE] 秒） @@ -2733,10 +2781,32 @@ M キーを押して変更します。 （ [EXISTENCE] 秒） アバター「 NAME 」が容姿編集モードを解除しました。 </notification> + <notification name="NoConnect"> + [PROTOCOL] [HOSTID]を使って接続できません。 +お使いのネットワークやファイアウォールの設定を確認してください。 + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> + <notification name="NoVoiceConnect"> + ボイスサーバーに接続できません： + +[HOSTID] + +ボイスチャットによるコミュニケーションが利用できません。 +お使いのネットワークやファイアウォールの設定を確認してください。 + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> <notification name="AvatarRezLeftNotification"> （ [EXISTENCE] 秒） アバター「 NAME 」が完全に読み込まれました。 </notification> + <notification name="AvatarRezSelfBakeNotification"> + （作成後[EXISTENCE]秒経過） +'[BODYREGION]'の[RESOLUTION]のベークドテクスチャは[TIME]秒後にアップロードされました。 + </notification> <notification name="ConfirmLeaveCall"> このコールから抜けますか？ <usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/> @@ -2747,7 +2817,7 @@ M キーを押して変更します。 ミュートされます。あなたがコールを終了しても他の参加者のミュート状態が続きます。 全員をミュートしますか？ - <usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="Ok" yestext="キャンセル"/> + <usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/> </notification> <global name="UnsupportedCPU"> - あなたの CPU の速度は必須動作環境の条件を満たしていません。 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_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml index 5d3bc79e2f..5a3a949150 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <text name="avatar_height"> - 身長 [HEIGHT] メートル - </text> + <string name="meters"> + メートル + </string> + <string name="feet"> + フィート + </string> + <string name="height"> + 高さ： + </string> + <text name="avatar_height"/> <panel label="シャツ" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="身体"/> 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 5e3342699b..426f738b33 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml @@ -72,7 +72,7 @@ <string name="jacket_desc_text"> ジャケット： </string> - <string name="skirt_skirt_desc_text"> + <string name="skirt_desc_text"> スカート： </string> <string name="gloves_desc_text"> @@ -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="シェイプ："/> @@ -100,13 +101,8 @@ <icon name="male_icon" tool_tip="男性"/> <icon name="female_icon" tool_tip="女性"/> </panel> - <panel label="gear_buttom_panel" name="gear_buttom_panel"> - <button name="friends_viewsort_btn" tool_tip="オプション"/> - <button name="add_btn" tool_tip="TODO"/> - <button name="del_btn" tool_tip="TODO"/> - </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 cf6e6eaae3..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="オブジェクト"/> - <button label="編集" name="edit_wearable_btn"/> + <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"> @@ -23,23 +25,19 @@ </panel> <layout_stack name="im_panels"> <layout_panel label="IM コントロールパネル" name="outfit_wearables_panel"> - <panel label="bottom_panel" name="edit_panel"/> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <text name="add_to_outfit_label" value="アウトフィットに追加："/> <layout_stack name="filter_panels"> - <layout_panel label="IM コントロールパネル" name="filter_panel"> - <filter_editor label="フィルター" name="look_item_filter"/> + <layout_panel name="add_button_and_combobox"> + <button label="さらに追加..." name="show_add_wearables_btn" tool_tip="開く／閉じる"/> + </layout_panel> + <layout_panel name="filter_panel"> + <filter_editor label="持ち物の着用物をフィルター" name="look_item_filter"/> </layout_panel> </layout_stack> - <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> - <button label="F" name="folder_view_btn"/> - <button label="L" name="list_view_btn"/> - </panel> </layout_panel> + <layout_panel name="add_wearables_panel"/> </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 14f0d7d5e0..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,9 +6,8 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="その他のオプションを表示します"/> - <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/> - <button label="アウトフィットを保存する" name="make_outfit_btn" tool_tip="容姿をアウトフィットに保存します" width="140"/> + <dnd_button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/> + <button label="別名で保存" name="save_btn"/> <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用します"/> - <button label="アウトフットの編集" name="edit_current_outfit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index d78a56aa10..c83e3591a7 100644 --- a/indra/newview/skins/default/xui/ja/panel_places.xml +++ b/indra/newview/skins/default/xui/ja/panel_places.xml @@ -5,12 +5,12 @@ <filter_editor label="場所をフィルター" name="Filter"/> <panel name="button_panel"> <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートします"/> - <button label="地図" name="map_btn"/> + <button label="地図" name="map_btn" tool_tip="世界地図に該当するエリアを表示"/> <button label="編集" name="edit_btn" tool_tip="ランドマークの情報を編集します"/> <button label="▼" name="overflow_btn" tool_tip="その他のオプションを表示"/> <button label="保存" name="save_btn"/> <button label="キャンセル" name="cancel_btn"/> <button label="閉じる" name="close_btn"/> - <button label="プロフィール" name="profile_btn"/> + <button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index 732a5df75f..fdf33b5402 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/> <check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/> - <check_box label="サイドバー" name="appearance_sidebar_positioning" tool_tip="サイドバーの切り替え時に自動カメラポジションを使います"/> + <check_box initial_value="true" label="サイドバー" name="appearance_sidebar_positioning" tool_tip="サイドバーの切り替え時に自動カメラポジションを使います"/> <check_box label="一人称視点で表示する" name="first_person_avatar_visible"/> <check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/> <check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/> 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_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml index 8a848f496d..c3a5127981 100644 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml @@ -21,8 +21,10 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="所持金"/> - <button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/> + <panel name="balance_bg"> + <text name="balance" tool_tip="残高" value="L$20"/> + <button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/> + </panel> <text name="TimeText" tool_tip="現在時刻（太平洋）"> 24:00 AM PST </text> diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml new file mode 100644 index 0000000000..530f0fb59d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_voice_effect"> + <string name="no_voice_effect"> + ボイスモーフィングなし + </string> + <string name="preview_voice_effects"> + ボイスモーフィングをプレビュー ▶ + </string> + <string name="get_voice_effects"> + ボイスモーフィングを取得 ▶ + </string> + <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_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index a0f44d9de9..648719b6bd 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml @@ -2,12 +2,12 @@ <panel label="もの" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="プロフィール" name="info_btn"/> - <button label="共有" name="share_btn"/> - <button label="ショッピング" name="shop_btn"/> - <button label="装着" name="wear_btn"/> + <button label="プロフィール" name="info_btn" tool_tip="オブジェクトのプロフィールを表示する"/> + <button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/> + <button label="ショッピング" name="shop_btn" tool_tip="マーケットプレイスのサイトを開く"/> + <button label="装着" name="wear_btn" tool_tip="選択したアウトフィットを着用する"/> <button label="プレイ" name="play_btn"/> - <button label="テレポート" name="teleport_btn"/> + <button label="テレポート" name="teleport_btn" tool_tip="該当するエリアにテレポートする"/> </panel> </panel> </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..b194608181 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,8 +15,8 @@ <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="where" value="（持ち物）"/> + <text name="title" value="アイテムのプロフィール"/> + <text name="origin" 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 d59699552d..619f9fc9ef 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. For example, the strings used in avatar chat bubbles, and strings @@ -107,7 +107,7 @@ 無効なホストネームがサーバーにアクセスしていました。SLURL かグリッドのホストネームをご確認ください。 </string> <string name="CertExpired"> - 証明書の有効期限が切れています。 システムの時計を確認するかグリッド管理者にご連絡ください。 + グリッドが返した証明書は有効期限が終了していると考えられます。お使いのシステムクロックを確認するか、グリッドの管理者にお問い合わせください。 </string> <string name="CertKeyUsage"> SSL 証明書のエラーが発生しました。 グリッド管理者にご連絡ください。 @@ -116,7 +116,7 @@ サーバーの証明書チェーンに証明書が多すぎます。 グリッド管理者にご連絡ください。 </string> <string name="CertInvalidSignature"> - 証明書署名を認証できませんでした。 グリッド管理者にご連絡ください。 + グリッドサーバーが返した証明書の署名を認証できませんでした。グリッドの管理者にお問い合わせください。 </string> <string name="LoginFailedNoNetwork"> ネットワークエラー： 接続を確立できませんでした。お使いのネットワーク接続をご確認ください。 @@ -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> @@ -753,6 +756,12 @@ <string name="land_type_unknown"> （不明） </string> + <string name="Estate / Full Region"> + 不動産 / フルリージョン + </string> + <string name="Mainland / Full Region"> + メインランド / フルリージョン + </string> <string name="all_files"> 全てのファイル </string> @@ -858,6 +867,9 @@ <string name="invalid"> 無効 </string> + <string name="none"> + なし + </string> <string name="shirt_not_worn"> シャツ未着用 </string> @@ -897,6 +909,9 @@ <string name="NewWearable"> 新しい [WEARABLE_ITEM] </string> + <string name="CreateNewWearable"> + [WEARABLE_TYPE]を作成 + </string> <string name="next"> 次へ </string> @@ -1080,7 +1095,7 @@ <string name="InvFolder Gestures"> ジェスチャー </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> お気に入り </string> <string name="InvFolder Current Outfit"> @@ -3550,6 +3565,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="session_initialization_timed_out_error"> セッションの初期化がタイムアウトしました </string> + <string name="voice_morphing_url"> + http://secondlife.com/landing/voicemorphing + </string> <string name="paid_you_ldollars"> [NAME] は L$[AMOUNT] 支払いました </string> @@ -3720,17 +3738,17 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Male - Wow"> 男性 - Wow </string> - <string name="FeMale - Excuse me"> - 女性 - すみません + <string name="Female - Excuse me"> + 女性 – すみません </string> - <string name="FeMale - Get lost"> - 女性 - Get lost + <string name="Female - Get lost"> + 女性 – あっち行ってよ </string> - <string name="FeMale - Blow kiss"> + <string name="Female - Blow kiss"> 女性 - 投げキッス </string> - <string name="FeMale - Boo"> - 女性 - Boo + <string name="Female - Boo"> + 女性 – ワッ！ </string> <string name="Female - Bored"> 女性 - 退屈 @@ -3762,4 +3780,32 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="texture_load_dimensions_error"> [WIDTH]*[HEIGHT] 以上の画像は読み込めません </string> + <string name="words_separator" value=","/> + <string name="server_is_down"> + 大変申し訳ございませんが、予期せぬ問題が発生しました。 + + status.secondlifegrid.netで、サービスに関する既知の問題についてお調べください。 + 問題が引き続き発生する場合は、お使いのネットワークやファイアウォールの設定を確認してください。 + </string> + <string name="dateTimeWeekdaysNames"> + 日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日 + </string> + <string name="dateTimeWeekdaysShortNames"> + 日:月:火:水:木:金:土 + </string> + <string name="dateTimeMonthNames"> + 1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月 + </string> + <string name="dateTimeMonthShortNames"> + 1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月 + </string> + <string name="dateTimeDayFormat"> + [MDAY] + </string> + <string name="dateTimeAM"> + AM + </string> + <string name="dateTimePM"> + PM + </string> </strings> diff --git a/indra/newview/skins/default/xui/nl/floater_world_map.xml b/indra/newview/skins/default/xui/nl/floater_world_map.xml index bc14f92126..2fee2ecf05 100644 --- a/indra/newview/skins/default/xui/nl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/nl/floater_world_map.xml @@ -26,8 +26,8 @@ Evenementen: </text> <check_box label="PG" name="event_chk"/> - <check_box label="Mature" name="event_mature_chk"/> - <check_box label="Adult" name="event_adult_chk"/> + <check_box label="Mature" name="events_mature_chk"/> + <check_box label="Adult" name="events_adult_chk"/> <combo_box label="Online vrienden" name="friend combo" tool_tip="Vriend die op kaart getoond wordt"> <combo_box.item name="item1" label="Online vrienden"/> </combo_box> diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml index ae8d3b89dc..25071b5460 100644 --- a/indra/newview/skins/default/xui/nl/strings.xml +++ b/indra/newview/skins/default/xui/nl/strings.xml @@ -909,7 +909,7 @@ <string name="InvFolder Gestures"> Gebaren </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoriten </string> <string name="InvFolder Current Outfit"> diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 05287ad42a..3e62393e7a 100644 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml @@ -35,11 +35,11 @@ <text name="pg_label"> Ogólne </text> - <check_box name="event_mature_chk"/> - <text name="mature_label"> + <check_box name="events_mature_chk"/> + <text name="events_mature_label"> Moderuj </text> - <text name="adult_label"> + <text name="events_adult_label"> Adult </text> </panel> diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml index 3b038a7102..5f324490c2 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml @@ -16,7 +16,7 @@ [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 Obiektu"/> - <text name="where" value="(Szafa)"/> + <text name="origin" value="(Szafa)"/> <panel label=""> <text name="LabelItemNameTitle"> Nazwa: diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index c72f783a51..f110052f68 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -986,7 +986,7 @@ <string name="InvFolder Gestures"> Gesturki </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Ulubione </string> <string name="InvFolder Current Outfit"> diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index 7989ce66bc..7343bd9aa8 100644 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml @@ -9,35 +9,28 @@ <floater.string name="move_tooltip"> Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita </floater.string> - <floater.string name="orbit_mode_title"> - Órbita + <floater.string name="camera_modes_title"> + Modos de câmera </floater.string> <floater.string name="pan_mode_title"> - Pan + Pan zoom orbital </floater.string> - <floater.string name="avatar_view_mode_title"> - Predefinições + <floater.string name="presets_mode_title"> + Ângulos predefinidos </floater.string> <floater.string name="free_mode_title"> Visualizar objeto </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Move a câmera para cima e para baixo, direita e esquerda"/> <panel name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco"> + <joystick_rotate name="cam_rotate_stick" tool_tip="Girar câmera ao redor do foco"/> <slider_bar name="zoom_slider" tool_tip="Zoom de câmera para focalizar"/> - </panel> - <joystick_rotate name="cam_rotate_stick" tool_tip="Órbita em torno do foco da câmera"/> - <panel name="camera_presets"> - <button name="rear_view" tool_tip="Vista de trás"/> - <button name="group_view" tool_tip="Visualizar grupo"/> - <button name="front_view" tool_tip="Vista frontal"/> - <button name="mouselook_view" tool_tip="Visâo do mouse"/> + <joystick_track name="cam_track_stick" tool_tip="Move a câmera para cima e para baixo, direita e esquerda"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="Câmera orbital"/> - <button label="" name="pan_btn" tool_tip="Câmera Pan"/> - <button label="" name="avatarview_btn" tool_tip="Predefinições"/> - <button label="" name="freecamera_btn" tool_tip="Visualizar objeto"/> + <button label="" name="presets_btn" tool_tip="Ângulos predefinidos"/> + <button label="" name="pan_btn" tool_tip="Pan zoom orbital"/> + <button label="" name="avatarview_btn" tool_tip="Modos de câmera"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml index cdebe533bd..4b9553adfe 100644 --- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml @@ -16,7 +16,13 @@ entrou numa ligação de voz via conferência. </floater.string> <floater.string name="VoiceInviteGroup"> - entrou numa ligação de bate-papo de voz com o grupo [GROUP]. + chegou ao canal de voz do '[GROUP]'. + </floater.string> + <floater.string name="VoiceInviteQuestionGroup"> + Deseja sair do [CURRENT_CHAT] e entrar na ligação de '[GROUP]'? + </floater.string> + <floater.string name="VoiceInviteQuestionDefault"> + Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz? </floater.string> <text name="question"> Sair do [CURRENT_CHAT] e entrar neste bate-papo? 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 b612442195..d62fe3dd20 100644 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml @@ -1,16 +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"/> - <button label="Compartilhar foto" name="share"/> - <button label="Compartilhar na web" name="share_to_web"/> - <button label="Salvar no meu inventário" name="save_to_inventory"/> - <button label="Salvar foto" name="save"/> - <button label="Enviar foto por email" name="share_to_email"/> - <button label="Salvar no meu PC" name="save_to_computer"/> - <button label="Usar como foto do perfil" name="set_profile_pic"/> - <button label="Atrás" name="cancel"/> + <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_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml index 5ef8479b7a..44f08b76b5 100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml @@ -19,8 +19,10 @@ <layout_panel name="my_panel"> <text name="user_text" value="Meu avatar:"/> </layout_panel> - <layout_panel name="leave_call_btn_panel"> - <button label="Desligar" name="leave_call_btn"/> - </layout_panel> + <layout_stack name="voice_effect_and_leave_call_stack"> + <layout_panel name="leave_call_btn_panel"> + <button label="Desligar" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </layout_stack> </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 new file mode 100644 index 0000000000..b9f9677833 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Lugares" name="voice_effects" title="DISTORCENDO VOZ"> + <string name="no_voice_effect"> + (Não distorcer voz) + </string> + <string name="active_voice_effect"> + (Ativo) + </string> + <string name="unsubscribed_voice_effect"> + (Cancelou) + </string> + <string name="new_voice_effect"> + (Novo!) + </string> + <text name="preview_text"> + Visualizar + </text> + <text name="status_text"> + Grave uma amostra da sua voz, depois clique em um efeito para ouvir o resultado. + </text> + <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] 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="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/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 878d0b1973..3952b80269 100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml @@ -39,12 +39,12 @@ <text name="pg_label"> Público geral </text> - <check_box label="Mature" name="event_mature_chk"/> - <text name="mature_label"> + <check_box label="Mature" name="events_mature_chk"/> + <text name="events_mature_label"> Moderado </text> - <check_box label="Adult" name="event_adult_chk"/> - <text name="adult_label"> + <check_box label="Adult" name="events_adult_chk"/> + <text name="events_adult_label"> Adulto </text> </panel> diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml index e9f1ca3a0b..b72de7038d 100644 --- a/indra/newview/skins/default/xui/pt/inspect_object.xml +++ b/indra/newview/skins/default/xui/pt/inspect_object.xml @@ -8,8 +8,8 @@ Autor: [CREATOR] </string> <string name="CreatorAndOwner"> - Autor: [CREATOR] -Proprietário: [OWNER] + Autor [CREATOR] +Proprietário [OWNER] </string> <string name="Price"> L$[AMOUNT] @@ -23,6 +23,13 @@ Proprietário: [OWNER] <string name="Sit"> Sentar </string> + <text name="object_name" value="Test Object Name That Is actually two lines and Really Long"/> + <text name="price_text"> + L$30.000 + </text> + <text name="object_description"> + This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really? + </text> <button label="Comprar" name="buy_btn"/> <button label="Pagar" name="pay_btn"/> <button label="Pegar uma cópia" name="take_free_copy_btn"/> 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_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml new file mode 100644 index 0000000000..527e3af3c9 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Attachment"> + <menu_item_call label="Separar" name="detach"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml new file mode 100644 index 0000000000..704fd226eb --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Body"> + <menu_item_call label="Trocar" name="replace"/> + <menu_item_call label="Editar" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml new file mode 100644 index 0000000000..a58353f14e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="COF Clothing"> + <menu_item_call label="Tirar" name="take_off"/> + <menu_item_call label="Subir um nível" name="move_up"/> + <menu_item_call label="Baixar um nível" name="move_down"/> + <menu_item_call label="Editar" name="edit"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml new file mode 100644 index 0000000000..8716992a5e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear COF"> + <menu label="Roupas novas" name="COF.Gear.New_Clothes"/> + <menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml index 472ca466c9..c2b063193e 100644 --- a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml @@ -2,4 +2,5 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Mostrar barra de navegação" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Mostrar barra de favoritos" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Mostrar minibarra de localização" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index 1b86b37075..aa195e5739 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -81,6 +81,7 @@ <menu label="Anexar ao HUD" name="Attach To HUD"/> <menu_item_call label="Editar" name="Wearable Edit"/> <menu_item_call label="Vestir" name="Wearable Wear"/> + <menu_item_call label="Adicionar" name="Wearable Add"/> <menu_item_call label="Tirar" name="Take Off"/> <menu_item_call label="--Sem opções--" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml new file mode 100644 index 0000000000..eb1c026708 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Gear Outfit"> + <menu_item_call label="Vestir - Substituir look atual" name="wear"/> + <menu_item_call label="Tirar - Tirar do look atual" name="take_off"/> + <menu label="Roupas novas" name="New Clothes"> + <menu_item_call label="Nova camisa" name="New Shirt"/> + <menu_item_call label="Novas calças" name="New Pants"/> + <menu_item_call label="Novos sapatos" name="New Shoes"/> + <menu_item_call label="Novas meias" name="New Socks"/> + <menu_item_call label="Nova blusa" name="New Jacket"/> + <menu_item_call label="Nova saia" name="New Skirt"/> + <menu_item_call label="Novas luvas" name="New Gloves"/> + <menu_item_call label="Nova camiseta" name="New Undershirt"/> + <menu_item_call label="Novas roupa de baixo" name="New Underpants"/> + <menu_item_call label="Novo alpha" name="New Alpha"/> + <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + </menu> + <menu label="Nova parte do corpo" name="New Body Parts"> + <menu_item_call label="Nova silhueta" name="New Shape"/> + <menu_item_call label="Nova pele" name="New Skin"/> + <menu_item_call label="Novo cabelo" name="New Hair"/> + <menu_item_call label="Novos olhos" name="New Eyes"/> + </menu> + <menu_item_call label="Renomear look" name="rename"/> + <menu_item_call label="Excluir visual" name="delete_outfit"/> +</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 new file mode 100644 index 0000000000..8db5e405b3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit"> + <menu_item_call label="Vestir - Substituir look atual" name="wear_replace"/> + <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 look" name="rename"/> + <menu_item_call label="Excluir visual" name="delete"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml index a957708ae4..61c6b9202f 100644 --- a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="save_outfit_menu"> <menu_item_call label="Salvar" name="save_outfit"/> - <menu_item_call label="Salvar como novo" name="save_as_new_outfit"/> + <menu_item_call label="Salvar como" name="save_as_new_outfit"/> </toggleable_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 b091cc2c97..d9ff847647 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -11,6 +11,7 @@ <menu_item_check label="Meu inventário" name="Inventory"/> <menu_item_check label="Meu inventário" name="ShowSidetrayInventory"/> <menu_item_check label="Meus gestos" name="Gestures"/> + <menu_item_check label="Minha voz" name="ShowVoice"/> <menu label="Meu status" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> <menu_item_call label="Ocupado" name="Set Busy"/> @@ -70,6 +71,12 @@ <menu_item_call label="Link" name="Link"/> <menu_item_call label="Desconectar links" name="Unlink"/> <menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/> + <menu label="Selecionar partes conectadas" name="Select Linked Parts"> + <menu_item_call label="Selecionar próxima parte" name="Select Next Part"/> + <menu_item_call label="Selecionar parte anterior" name="Select Previous Part"/> + <menu_item_call label="Incluir próxima parte" name="Include Next Part"/> + <menu_item_call label="Incluir parte anterior" name="Include Previous Part"/> + </menu> <menu_item_call label="Enfocar seleção" name="Focus on Selection"/> <menu_item_call label="Ampliar seleção" name="Zoom to Selection"/> <menu label="Objeto:" name="Object"> @@ -100,11 +107,11 @@ <menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/> <menu_item_call label="Opções de grade" name="Grid Options"/> </menu> - <menu label="Selecionar partes conectadas" name="Select Linked Parts"> - <menu_item_call label="Selecionar próxima parte" name="Select Next Part"/> - <menu_item_call label="Selecionar parte anterior" name="Select Previous Part"/> - <menu_item_call label="Incluir próxima parte" name="Include Next Part"/> - <menu_item_call label="Incluir parte anterior" name="Include Previous Part"/> + <menu label="Upload" name="Upload"> + <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> + <menu_item_call label="Som (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="Volume (L$[COST] por arquivo)..." name="Bulk Upload"/> </menu> </menu> <menu label="Ajuda" name="Help"> @@ -170,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 new file mode 100644 index 0000000000..1874837d65 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Outfit Wearable Context Menu"> + <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"/> + <context_menu label="Colocar em ▶" name="wearable_attach_to"/> + <context_menu label="Anexar ao HUD ▶" name="wearable_attach_to_hud"/> + <menu_item_call label="Tirar" name="take_off"/> + <menu_item_call label="Editar" name="edit"/> + <menu_item_call label="Perfil do objeto" name="object_profile"/> + <menu_item_call label="Mostrar original" name="show_original"/> +</context_menu> 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 e64940ecb1..1e517a5dc5 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -469,7 +469,9 @@ Para aumentar a qualidade do vídeo, vá para Preferências > Vídeo. A região [REGION] não permite ser aplainada. </notification> <notification name="CannotCopyWarning"> - Você não tem permissão para copiar este item e irá perdê-lo do seu inventário se entregá-lo a alguém. Quer realmente oferecer este item? + Você não tem autorização para copiar os itens abaixo: +[ITENS] +ao dá-los, você ficará sem eles no seu inventário. Deseja realmente dar estes itens? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="CannotGiveItem"> @@ -607,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"> @@ -936,6 +937,26 @@ Oferecer amizade para [NAME]? <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification label="Salvar item de vestuário" name="SaveWearableAs"> + Salvar item no meu inventário como: + <form name="form"> + <input name="message"> + [DESC] (novo) + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> + <notification label="Renomear look" name="RenameOutfit"> + Nome do novo look: + <form name="form"> + <input name="new_name"> + [NAME] + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Cancelar"/> + </form> + </notification> <notification name="RemoveFromFriends"> Você quer remover [FIRST_NAME] [LAST_NAME] da sua lista de amigos? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Remover"/> @@ -1545,7 +1566,7 @@ Ir para o Banco de Conhecimento para maiores informações sobre Classificaçõe <notification name="RegionEntryAccessBlocked_Change"> Você não pode entrar nessa região devido à sua seleção de maturidade. -Clique em 'Mudar preferência' para aumentar seu nível de maturidade e ganhar acesso imediato. Você então poderá fazer buscas e acessar conteúdo [REGIONMATURITY]. Para modificar o nível de maturidade, use o menu Eu > Preferências > Gerais. +Para entrar na região desejada, mude o nível de maturidade. Você então poderá fazer buscas e acessar conteúdo [REGIONMATURITY]. Para desfazer qualquer mudança, vá para Eu > Preferências > Geral. <form name="form"> <button name="OK" text="Mudar preferência"/> <button default="true" name="Cancel" text="Fechar"/> @@ -2556,6 +2577,21 @@ Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique <notification name="VoiceLoginRetry"> Estamos criando uma canal de voz para você. Isto pode levar até um minuto. </notification> + <notification name="VoiceEffectsExpired"> + Um ou mais serviços de distorção de voz que você assinou veceu. +[[URL] Clique aqui] para renovar o serviço. + </notification> + <notification name="VoiceEffectsExpiredInUse"> + A Distorção de voz ativa expirou. Suas configurações de voz padrão foram ativadas. +[[URL] Clique aqui] para renovar o serviço. + </notification> + <notification name="VoiceEffectsWillExpire"> + Uma ou mais das suas distorções de voz tem vencimento em menos de [INTERVAL] dias. +[[URL] Clique aqui] para renovar o serviço. + </notification> + <notification name="VoiceEffectsNew"> + Novas Distorções de voz! + </notification> <notification name="Cannot enter parcel: not a group member"> Só membros de um grupo podem acessar esta área. </notification> @@ -2622,7 +2658,20 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes. O botão será exibido quando houver espaço suficente. </notification> <notification name="ShareNotification"> - Arraste itens do inventário para uma pessoa no seletor de residentes + Selecione os residentes com quem compartilhar. + </notification> + <notification name="ShareItemsConfirmation"> + Tem certeza de que quer compartilhar os items abaixo? + +[ITENS] + +Com os seguintes residentes: + +[RESIDENTS] + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="ItemsShared"> + Itens compartilhados. </notification> <notification name="DeedToGroupFail"> Ocorreu uma falha durante a doação ao grupo. @@ -2631,10 +2680,15 @@ O botão será exibido quando houver espaço suficente. ( [EXISTENCE] segundos de vida ) O avatar de '[NAME]' emergiu em [TIME] segundos. </notification> - <notification name="AvatarRezSelfNotification"> + <notification name="AvatarRezSelfBakedDoneNotification"> ( [EXISTENCE] segundos de vida ) Você confeccionou seu look em [TIME] segundos. </notification> + <notification name="AvatarRezSelfBakedUpdateNotification"> + ( [EXISTENCE] segundos de vida ) +Você enviou uma atualização da sua aparência em [TIME] segundos. +[STATUS] + </notification> <notification name="AvatarRezCloudNotification"> ( [EXISTENCE] segundos de vida ) Avatar '[NAME]' transformou-se em nuvem. @@ -2655,10 +2709,32 @@ Avatar '[NAME]' entrou no modo aparência. ( [EXISTENCE] segundos de vida ) Avatar '[NAME]' sair do modo aparecer. </notification> + <notification name="NoConnect"> + Detectamos um problema de conexão com [PROTOCOL] [HOSTID]. +Verifique a configuração da sua rede e firewall. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> + <notification name="NoVoiceConnect"> + Estamos tendo problemas de conexão com o seu servidor de voz: + +[HOSTID] + +Talvez não seja possível se comunicar via voz. +Verifique a configuração da sua rede e firewall. + <form name="form"> + <button name="OK" text="OK"/> + </form> + </notification> <notification name="AvatarRezLeftNotification"> ( [EXISTENCE] segundos de vida ) Avatar '[NAME]' saiu totalmente carregado. </notification> + <notification name="AvatarRezSelfBakeNotification"> + ( [EXISTENCE] segundos de vida ) +Você carregou uma textura com [RESOLUTION] para o(a) '[BODYREGION]' em [TIME] segundos. + </notification> <notification name="ConfirmLeaveCall"> Tem certeza de que quer sair desta ligação? <usetemplate ignoretext="Confirmar antes de deixar ligação" name="okcancelignore" notext="Não" yestext="Sim"/> @@ -2669,7 +2745,7 @@ Todos os demais residentes que entrarem na ligação mais tarde também serão s Silenciar todos? - <usetemplate ignoretext="Confirmar antes de silenciar todos os participantes em ligações de grupo." name="okcancelignore" notext="OK" yestext="Cancelar"/> + <usetemplate ignoretext="Confirmar antes de silenciar todos os participantes em ligações de grupo." name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <global name="UnsupportedCPU"> - A velocidade da sua CPU não suporta os requisitos mínimos exigidos. 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_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml index 6b9ac94cac..de41ba3ad2 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <text name="avatar_height"> - [HEIGHT] metros de altura - </text> + <string name="meters"> + Metros + </string> + <string name="feet"> + Pés + </string> + <string name="height"> + Altura: + </string> + <text name="avatar_height"/> <panel label="Camisa" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Corpo"/> 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 f14a04f440..9890d26d35 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml @@ -72,7 +72,7 @@ <string name="jacket_desc_text"> Jaqueta: </string> - <string name="skirt_skirt_desc_text"> + <string name="skirt_desc_text"> Saia: </string> <string name="gloves_desc_text"> @@ -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:"/> @@ -100,13 +101,8 @@ <icon name="male_icon" tool_tip="Masculino"/> <icon name="female_icon" tool_tip="Feminino"/> </panel> - <panel label="gear_buttom_panel" name="gear_buttom_panel"> - <button name="friends_viewsort_btn" tool_tip="Opções"/> - <button name="add_btn" tool_tip="TODO"/> - <button name="del_btn" tool_tip="TODO"/> - </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 61e470586e..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"/> - <button label="Editar" name="edit_wearable_btn"/> + <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"> @@ -23,23 +25,19 @@ </panel> <layout_stack name="im_panels"> <layout_panel label="Painel de controle de MIs" name="outfit_wearables_panel"> - <panel label="bottom_panel" name="edit_panel"/> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <text name="add_to_outfit_label" value="Adicionar ao look:"/> <layout_stack name="filter_panels"> - <layout_panel label="Painel de controle de MIs" name="filter_panel"> - <filter_editor label="Filtro" name="look_item_filter"/> + <layout_panel name="add_button_and_combobox"> + <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"/> </layout_panel> </layout_stack> - <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> - <button label="F" name="folder_view_btn"/> - <button label="L" name="list_view_btn"/> - </panel> </layout_panel> + <layout_panel name="add_wearables_panel"/> </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 c8f33f85a9..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,9 +6,8 @@ </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"/> - <button label="Salvar este look" name="make_outfit_btn" tool_tip="Salvar aparência como um look"/> + <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"/> - <button label="Editar look" name="edit_current_outfit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml index f7b6f54dea..5f2c56ab8c 100644 --- a/indra/newview/skins/default/xui/pt/panel_places.xml +++ b/indra/newview/skins/default/xui/pt/panel_places.xml @@ -5,12 +5,12 @@ <filter_editor label="Filtrar meus lugares" name="Filter"/> <panel name="button_panel"> <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/> - <button label="Mapa" name="map_btn"/> + <button label="Mapa" name="map_btn" tool_tip="Mostrar a área no Mapa Múndi"/> <button label="Editar" name="edit_btn" tool_tip="Editar dados do marco"/> <button label="▼" name="overflow_btn" tool_tip="Mostrar opções adicionais"/> <button label="Salvar" name="save_btn"/> <button label="Cancelar" name="cancel_btn"/> <button label="Fechar" name="close_btn"/> - <button label="Perfil" name="profile_btn"/> + <button label="Perfil" name="profile_btn" tool_tip="Mostrar perfil do lugar"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index 885aafc350..13cb8a444e 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -13,7 +13,7 @@ </text> <check_box label="Construção/Edição" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/> <check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/> - <check_box initial_value="1" label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar posicionamento automático da câmera na barra lateral"/> + <check_box initial_value="verdadeiro" label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar posicionamento automático da câmera na barra lateral"/> <check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/> <check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/> <check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/> 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_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml index a320d9d56d..fbbcf0d1be 100644 --- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml @@ -21,8 +21,10 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/> - <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/> + <panel name="balance_bg"> + <text name="balance" tool_tip="Meu saldo" value="L$20"/> + <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/> + </panel> <text name="TimeText" tool_tip="Hora atual (Pacífico)"> 24:00 AM PST </text> diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml new file mode 100644 index 0000000000..1d7878408a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_voice_effect"> + <string name="no_voice_effect"> + Distorção de voz desligada + </string> + <string name="preview_voice_effects"> + Checar distorção de voz ▶ + </string> + <string name="get_voice_effects"> + Distorcer voz ▶ + </string> + <combo_box name="voice_effect" tool_tip="Selecione um efeito de distorção para mudar sua voz."> + <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_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index 31c96cad4c..e382da258f 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml @@ -2,12 +2,12 @@ <panel label="Coisas" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="Perfil" name="info_btn"/> - <button label="Compartilhar" name="share_btn"/> - <button label="Comprar" name="shop_btn"/> - <button label="Vestir" name="wear_btn"/> + <button label="Perfil" name="info_btn" tool_tip="Mostrar perfil do objeto"/> + <button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/> + <button label="Comprar" name="shop_btn" tool_tip="Abrir página do Marketplace"/> + <button label="Vestir" name="wear_btn" tool_tip="Vestir visual selecionado"/> <button label="Tocar" name="play_btn"/> - <button label="Teletransportar" name="teleport_btn"/> + <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/> </panel> </panel> </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..8189da5efb 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,8 +15,8 @@ <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="where" value="(Inventário)"/> + <text name="title" value="Perfil do item"/> + <text name="origin" value="(Inventário)"/> <panel label=""> <text name="LabelItemNameTitle"> Nome: diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 829070418f..ecdbf7b624 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -104,7 +104,7 @@ A cadeia de certificados do servidor tinha certificados demais. Por favor contate o administrador do Grid. </string> <string name="CertInvalidSignature"> - A assinatura do certificado dado pelo servidor do Grid não pôde ser verificada. Por favor contate o administrador do Grid. + A assinatura do certificado dado pelo servidor do Grid não pôde ser verificada. Contate o administrador do seu Grid. </string> <string name="LoginFailedNoNetwork"> Erro de rede: Não foi possível estabelecer a conexão, verifique sua conexão de rede. @@ -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> @@ -732,6 +735,12 @@ <string name="land_type_unknown"> (desconhecido) </string> + <string name="Estate / Full Region"> + Propriedadade / Região inteira: + </string> + <string name="Mainland / Full Region"> + Continente / Região inteira: + </string> <string name="all_files"> Todos os arquivos </string> @@ -837,6 +846,9 @@ <string name="invalid"> Inválido </string> + <string name="none"> + nenhum + </string> <string name="shirt_not_worn"> Camisa não vestida </string> @@ -876,6 +888,9 @@ <string name="NewWearable"> Novo [WEARABLE_ITEM] </string> + <string name="CreateNewWearable"> + Criar [WEARABLE_TYPE] + </string> <string name="next"> Próximo </string> @@ -1053,7 +1068,7 @@ <string name="InvFolder Gestures"> Gestos </string> - <string name="InvFolder favorite"> + <string name="InvFolder Favorite"> Favoritos </string> <string name="InvFolder Current Outfit"> @@ -3447,6 +3462,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="session_initialization_timed_out_error"> A inicialização da sessão expirou </string> + <string name="voice_morphing_url"> + http://secondlife.com/landing/voicemorphing + </string> <string name="paid_you_ldollars"> [NAME] lhe pagou L$ [AMOUNT] </string> @@ -3617,17 +3635,17 @@ Denunciar abuso <string name="Male - Wow"> Wow - masculino </string> - <string name="FeMale - Excuse me"> - Perdão - masc/fem + <string name="Female - Excuse me"> + Perdão - fem </string> - <string name="FeMale - Get lost"> + <string name="Female - Get lost"> Deixe-me em paz - feminino </string> - <string name="FeMale - Blow kiss"> - Mandar beijo - masc/fem + <string name="Female - Blow kiss"> + Mandar beijo - fem </string> - <string name="FeMale - Boo"> - Vaia - masc/fem + <string name="Female - Boo"> + Vaia - fem </string> <string name="Female - Bored"> Maçante - feminino @@ -3659,4 +3677,32 @@ Denunciar abuso <string name="texture_load_dimensions_error"> A imagem excede o limite [WIDTH]*[HEIGHT] </string> + <string name="words_separator" value=","/> + <string name="server_is_down"> + Aconteceu algo inesperado, apesar de termos tentador impedir isso. + + Cheque secondlifegrid.net para saber se foi detectado um problema com o serviço. + Se o problema persisitr, cheque a configuração da sua rede e firewall. + </string> + <string name="dateTimeWeekdaysNames"> + Domingo:Segunda:Terça:Quarta:Quinta:Sexta:Sábado + </string> + <string name="dateTimeWeekdaysShortNames"> + Dom:Seg:Ter:Qua:Qui:Sex:Sab + </string> + <string name="dateTimeMonthNames"> + Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro + </string> + <string name="dateTimeMonthShortNames"> + Jan:Fev:Mar:Abr:Maio:Jun:Jul:Ago:Set:Out:Nov:Dez + </string> + <string name="dateTimeDayFormat"> + [MDAY] + </string> + <string name="dateTimeAM"> + AM + </string> + <string name="dateTimePM"> + PM + </string> </strings> |
