diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
549 files changed, 2121 insertions, 6033 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index 2e9d003848..435c7f4907 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -29,7 +29,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Voice Server Version: [VOICE_VERSION] +Vivox Version: [VIVOX_VERSION] </floater.string> <floater.string name="none"> (ingen) 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 a096a87928..fd1fe4aa19 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -63,9 +63,6 @@ Pacel ikke valgt. Gå til 'Verden' > 'Om land' eller vælg en anden parcel for at se detaljer. </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:"> Navn: </text> @@ -219,7 +216,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel Region objekt bonus faktor: [BONUS] </text> <text name="Simulator primitive usage:"> - Prim benyttelse: + Prim forbrug: </text> <text name="objects_available"> [COUNT] ud af [MAX] ([AVAILABLE] ledige) diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index d0d766eaab..e405a1beb8 100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml @@ -3,48 +3,41 @@ <floater.string name="InvalidAvatar"> UGYLDING AVATAR </floater.string> + <text name="composite_label"> + Blandede teksturer + </text> + <button label="Drop" label_selected="Dump" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="label"> - Gemte -teksturer - </text> - <text name="composite_label"> - Sammensatte -teksturer - </text> - <button label="Vis IDs på skærm" label_selected="Dump" name="Dump"/> - <panel name="scroll_content_panel"> - <texture_picker label="Hår" name="hair-baked"/> - <texture_picker label="Hår" name="hair_grain"/> - <texture_picker label="Alpha - hår" name="hair_alpha"/> - <texture_picker label="Hoved" name="head-baked"/> - <texture_picker label="Makeup" name="head_bodypaint"/> - <texture_picker label="Alpha - hoved" name="head_alpha"/> - <texture_picker label="Tatovering - hovede" name="head_tattoo"/> - <texture_picker label="Øjne" name="eyes-baked"/> - <texture_picker label="Øje" name="eyes_iris"/> - <texture_picker label="Alpha øjne" name="eyes_alpha"/> - <texture_picker label="Overkrop" name="upper-baked"/> - <texture_picker label="Øverste bodyPaint" name="upper_bodypaint"/> - <texture_picker label="Undertrøje" name="upper_undershirt"/> - <texture_picker label="Handsker" name="upper_gloves"/> - <texture_picker label="Trøje" name="upper_shirt"/> - <texture_picker label="Jakke øverst" name="upper_jacket"/> - <texture_picker label="Alpha - øverst" name="upper_alpha"/> - <texture_picker label="Tatovering - øverst" name="upper_tattoo"/> - <texture_picker label="Underkrop" name="lower-baked"/> - <texture_picker label="BodyPaint - nederst" name="lower_bodypaint"/> - <texture_picker label="Underbukser" name="lower_underpants"/> - <texture_picker label="Strømper" name="lower_socks"/> - <texture_picker label="Sko" name="lower_shoes"/> - <texture_picker label="Bukser" name="lower_pants"/> - <texture_picker label="Jakke" name="lower_jacket"/> - <texture_picker label="Alpha - nederst" name="lower_alpha"/> - <texture_picker label="Tatovering - nederst" name="lower_tattoo"/> - <texture_picker label="Nederdel" name="skirt-baked"/> - <texture_picker label="Nederdel" name="skirt"/> - </panel> + <texture_picker label="Hår" name="hair-baked"/> + <texture_picker label="Hår" name="hair_grain"/> + <texture_picker label="Alpha - hår" name="hair_alpha"/> + <texture_picker label="Hoved" name="head-baked"/> + <texture_picker label="Makeup" name="head_bodypaint"/> + <texture_picker label="Alpha - hoved" name="head_alpha"/> + <texture_picker label="Tatovering - hoved" name="head_tattoo"/> + <texture_picker label="Eyes" name="eyes-baked"/> + <texture_picker label="Øje" name="eyes_iris"/> + <texture_picker label="Alpha - øjne" name="eyes_alpha"/> + <texture_picker label="Overkrop" name="upper-baked"/> + <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> + <texture_picker label="Undertrøje" name="upper_undershirt"/> + <texture_picker label="Handsker" name="upper_gloves"/> + <texture_picker label="Trøje" name="upper_shirt"/> + <texture_picker label="Jakke - foroven" name="upper_jacket"/> + <texture_picker label="Alpha - øvre" name="upper_alpha"/> + <texture_picker label="Tatovering - øvre" name="upper_tattoo"/> + <texture_picker label="Ben" name="lower-baked"/> + <texture_picker label="Bodypaint - ben" name="lower_bodypaint"/> + <texture_picker label="Underbukser" name="lower_underpants"/> + <texture_picker label="Strømper" name="lower_socks"/> + <texture_picker label="Sko" name="lower_shoes"/> + <texture_picker label="Bukser" name="lower_pants"/> + <texture_picker label="Jakke" name="lower_jacket"/> + <texture_picker label="Alpha - nedre" name="lower_alpha"/> + <texture_picker label="Tatovering - nedre" name="lower_tattoo"/> + <texture_picker label="Nederdel" name="skirt-baked"/> + <texture_picker label="Nederdel" name="skirt"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml deleted file mode 100644 index e32b25ca17..0000000000 --- a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="KØB VALUTA"/> diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index f6ee78fa6d..970491b41f 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml @@ -126,6 +126,9 @@ gennemført. <floater.string name="no_parcel_selected"> (intet parcel er valgt) </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Region: </text> diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml index 5b7ef6db54..37e3307960 100644 --- a/indra/newview/skins/default/xui/da/floater_camera.xml +++ b/indra/newview/skins/default/xui/da/floater_camera.xml @@ -9,57 +9,35 @@ <floater.string name="move_tooltip"> Flyt kamera op og ned, til venstre og højre </floater.string> - <floater.string name="camera_modes_title"> - Kamera valg + <floater.string name="orbit_mode_title"> + Kredsløb </floater.string> <floater.string name="pan_mode_title"> - Kredsløb zoom panorering + Panorér </floater.string> - <floater.string name="presets_mode_title"> + <floater.string name="avatar_view_mode_title"> Forvalg </floater.string> <floater.string name="free_mode_title"> Se objekt </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - Se forfra - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Se fra siden - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Se bagfra - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Se fra objekt - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Førsteperson - </panel_camera_item.text> - </panel_camera_item> - </panel> + <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"/> - <joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, venstre og højre"/> + </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"/> </panel> </panel> <panel name="buttons"> - <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"/> + <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"/> </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 7a3c3e466a..2349174db2 100644 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml @@ -16,13 +16,7 @@ har sluttet sig til stemme chat opkald med en konference chat. </floater.string> <floater.string name="VoiceInviteGroup"> - 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? + deltager nu i Stemme chat opkald med denne gruppe [GROUP]. </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 c331908c3c..82897d545a 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini-kort"> <floater.string name="mini_map_north"> N </floater.string> @@ -24,9 +24,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index 14d3604b43..8385924bda 100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> Gå baglæns (Tryk på Ned piletast eller S) </string> - <string name="walk_left_tooltip"> - Gå til venstre (tryk Shift + venstre pil eller A) - </string> - <string name="walk_right_tooltip"> - Gå til højre (tryk Shift + højre pil eller D) - </string> <string name="run_forward_tooltip"> Løb forlæns (Tryk på Op piletast eller W) </string> <string name="run_back_tooltip"> Løb baglæns (Tryk på Ned piletast eller S) </string> - <string name="run_left_tooltip"> - Løb til venstre (tryk Shift + venstre pil eller A) - </string> - <string name="run_right_tooltip"> - Løb til højre (tryk Shift + højre pil eller D) - </string> <string name="fly_forward_tooltip"> Flyv frem (Tryk på Op piletast eller W) </string> <string name="fly_back_tooltip"> Flyv baglæns (Tryk på Ned piletast eller S) </string> - <string name="fly_left_tooltip"> - Flyv til venstre (tryk Shift + venstre pil eller A) - </string> - <string name="fly_right_tooltip"> - Flyv til højre (tryk Shift + højre pil eller D) - </string> - <string name="fly_up_tooltip"> - Flyv op (tryk E) - </string> - <string name="fly_down_tooltip"> - Flyv ned (tryk C) - </string> - <string name="jump_tooltip"> - Hop (tryk E) - </string> - <string name="crouch_tooltip"> - Kryb (tryk C) - </string> <string name="walk_title"> Gå </string> @@ -58,12 +28,10 @@ Flyv </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Flyv op (tryk E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk på venstre piletast eller A)"/> - <joystick_slide name="move left btn" tool_tip="Gå til venstre (tryk Shift + venstre pil eller A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned (tryk C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/> - <joystick_slide name="move right btn" tool_tip="Gå til højre (tryk Shift + højre pil eller D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/> + <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/> <joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/> <joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/> </panel> 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 bd2b194717..f49fd8c99a 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> Bevægelse: [NAME] </floater.string> + <text name="name_text"> + Navn: + </text> <text name="desc_label"> Beskrivelse: </text> @@ -42,12 +45,7 @@ <text name="library_label"> Type: </text> - <scroll_list name="library_list"> - <scroll_list.rows name="action_animation" value="Animation"/> - <scroll_list.rows name="action_sound" value="Lyd"/> - <scroll_list.rows name="action_chat" value="Chat"/> - <scroll_list.rows name="action_wait" value="Vent"/> - </scroll_list> + <scroll_list name="library_list"/> <button label="Tilføj >>" name="add_btn"/> <text name="steps_label"> Trin: @@ -55,15 +53,12 @@ <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_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index 5a0f5a32c0..e600a774ec 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <floater.string name="Title"> Note: [NAME] </floater.string> + <floater.string label="Gem" label_selected="Gem" name="Save"> + Gem + </floater.string> <text name="desc txt"> Beskrivelse: </text> @@ -16,5 +19,4 @@ Indlæser... </text_editor> <button label="Gem" label_selected="Gem" name="Save"/> - <button label="Slet" label_selected="Slet" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml index 0f65e6c18a..220042f015 100644 --- a/indra/newview/skins/default/xui/da/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/da/floater_publish_classified.xml @@ -5,7 +5,7 @@ Husk, annonceomkostninger kan ikke refunderes. </text> - <spinner label="Pris: L$" name="price_for_listing" tool_tip="Pris for optagelse af annonce." value="50"/> + <spinner label="Pris for annonce:" name="price_for_listing" tool_tip="Pris for optagelse af annonce." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Mere info (link til hjælp om annoncer) diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 926c2429ac..7f7fb8ddf0 100644 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml @@ -1,75 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="SE FOTO"> +<floater name="Snapshot" title="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"/> - <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"/> + <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"/> </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 2e59dfd649..05e9eb6cdd 100644 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="Min avatar:"/> </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_panel name="leave_call_btn_panel"> + <button label="Forlad opkald" name="leave_call_btn"/> + </layout_panel> </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 deleted file mode 100644 index 86ad251103..0000000000 --- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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 97364e0f9f..898d291f1c 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -19,12 +19,12 @@ <text name="land_sale_label"> Land til salg </text> - <text name="auction_label"> - land auktion - </text> <text name="by_owner_label"> efter ejer </text> + <text name="auction_label"> + land auktion + </text> <button name="Go Home" tool_tip="Teleportér til min hjemmelokation"/> <text name="Home_label"> Hjem @@ -35,11 +35,11 @@ <text name="pg_label"> Generelt </text> - <check_box initial_value="true" name="events_mature_chk"/> - <text name="events_mature_label"> + <check_box initial_value="sandt" name="event_mature_chk"/> + <text name="mature_label"> Moderat </text> - <text name="events_adult_label"> + <text name="adult_label"> Voksent </text> </panel> @@ -58,9 +58,6 @@ <search_editor label="Regioner efter navn" name="location" tool_tip="Indtast navn på en region"/> <button label="Find" name="DoSearch" tool_tip="Led efter region"/> <button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/> - <text name="events_label"> - Lokation: - </text> <button label="Teleport" name="Teleport" tool_tip="Teleportér til valgte sted"/> <button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer nuværende lokation som SLurl der kan sendes på web."/> <button label="Vis valgte" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/> diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml index 78ccc5b869..8cbcf6cac8 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] -Owner [OWNER] + af [CREATOR] +ejer [OWNER] </string> <string name="Price"> L$[AMOUNT] @@ -23,13 +23,6 @@ Owner [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 e70b7ce33d..d8bd78fa23 100644 --- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml @@ -3,13 +3,11 @@ <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="Udseende" name="Appearance..."/> <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_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index ec85bd05a5..39f3e49702 100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml @@ -20,9 +20,7 @@ <context_menu label="Tag af ▶" name="Object Detach"/> <menu_item_call label="Tag alt af" name="Detach All"/> </context_menu> - <menu_item_call label="Skift sæt" name="Chenge Outfit"/> - <menu_item_call label="Redigér mit sæt" name="Edit Outfit"/> - <menu_item_call label="Redigér min form" name="Edit My Shape"/> + <menu_item_call label="Udseende" name="Appearance..."/> <menu_item_call label="Venner" name="Friends..."/> <menu_item_call label="Grupper" name="Groups..."/> <menu_item_call label="Profil" name="Profile..."/> diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml index e979e35a91..dbdeefeaff 100644 --- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml @@ -4,11 +4,6 @@ <menu_item_check label="Bevægelse knap" name="ShowMoveButton"/> <menu_item_check label="Vis knap" name="ShowCameraButton"/> <menu_item_check label="Foto knap" name="ShowSnapshotButton"/> - <menu_item_check label="Sidepanel knap" name="ShowSidebarButton"/> - <menu_item_check label="Bygge knap" name="ShowBuildButton"/> - <menu_item_check label="Søge knap" name="ShowSearchButton"/> - <menu_item_check label="Kort knap" name="ShowWorldMapButton"/> - <menu_item_check label="Mini-Map button" name="ShowMiniMapButton"/> <menu_item_call label="Klip" name="NearbyChatBar_Cut"/> <menu_item_call label="Kopiér" name="NearbyChatBar_Copy"/> <menu_item_call label="Sæt ind" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml deleted file mode 100644 index 9d7fc0f223..0000000000 --- a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 0e90d5a3ae..0000000000 --- a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 16c225b7d9..0000000000 --- a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?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="Redigér" name="edit"/> - <menu_item_call label="Erstat" name="replace"/> -</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 deleted file mode 100644 index f44369fd84..0000000000 --- a/indra/newview/skins/default/xui/da/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 d96a8a8a17..45276adda4 100644 --- a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <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_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml index c226d06404..aeef2ccb23 100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <menu name="Gear Menu"> <menu_item_call label="Stå op" name="stand_up"/> - <menu_item_call label="Skift sæt" name="change_outfit"/> + <menu_item_call label="Udseende" name="my_appearance"/> <menu_item_call label="Profil" name="my_profile"/> <menu_item_call label="Venner" name="my_friends"/> <menu_item_call label="Grupper" name="my_groups"/> diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index 35551318d1..0ea21dc409 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml @@ -52,14 +52,12 @@ <menu_item_call label="Slet ting" name="Purge Item"/> <menu_item_call label="Genskab ting" name="Restore Item"/> <menu_item_call label="åben" name="Open"/> - <menu_item_call label="Åben original" name="Open Original"/> <menu_item_call label="Egenskaber" name="Properties"/> <menu_item_call label="Omdøb" name="Rename"/> <menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/> <menu_item_call label="Kopiér" name="Copy"/> <menu_item_call label="Indsæt" name="Paste"/> <menu_item_call label="Sæt ind som link" name="Paste As Link"/> - <menu_item_call label="Slet" name="Remove Link"/> <menu_item_call label="Slet" name="Delete"/> <menu_item_call label="Slet systemfolder" name="Delete System Folder"/> <menu_item_call label="start konference chat" name="Conference Chat Folder"/> @@ -74,11 +72,11 @@ <menu_item_call label="Deaktivér" name="Deactivate"/> <menu_item_call label="Gem som" name="Save As"/> <menu_item_call label="Tag af dig selv" name="Detach From Yourself"/> - <menu_item_call label="Tag på" name="Wearable And Object Wear"/> + <menu_item_call label="Tag på" name="Object Wear"/> <menu label="Vedhæft" name="Attach To"/> <menu label="Vedhæft til HUD" name="Attach To HUD"/> <menu_item_call label="Redigér" name="Wearable Edit"/> - <menu_item_call label="Tilføj" name="Wearable Add"/> + <menu_item_call label="Tag på" name="Wearable Wear"/> <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_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml index 07f70d7190..dc79e4109e 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml @@ -5,7 +5,6 @@ <menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/> <menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Hent mange (L$[COST] pr. fil)..." name="Bulk Upload"/> - <menu_item_call label="Sæt standardværdier for upload rettigheder" name="perm prefs"/> </menu> <menu_item_call label="Ny mappe" name="New Folder"/> <menu_item_call label="Nyt script" name="New Script"/> diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml index 75ce7b22f6..e643498822 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="Vis filtre" name="show_filters"/> <menu_item_call label="Nulstil filtre" name="reset_filters"/> <menu_item_call label="Luk alle mapper" name="close_folders"/> + <menu_item_call label="Tøm papirkurv" name="empty_trash"/> <menu_item_call label="Tøm "fundne genstande"" name="empty_lostnfound"/> <menu_item_call label="Gem tekstur som" name="Save Texture As"/> - <menu_item_call label="Del" name="Share"/> <menu_item_call label="Find original" name="Find Original"/> <menu_item_call label="Find alle links" name="Find All Links"/> - <menu_item_call label="Tøm papirkurv" name="empty_trash"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 1231c4c08d..1408702a1c 100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml @@ -2,11 +2,10 @@ <menu_bar name="Login Menu"> <menu label="Mig" name="File"> <menu_item_call label="Indstillinger" name="Preferences..."/> - <menu_item_call label="Afslut [APP_NAME]" name="Quit"/> + <menu_item_call label="Afslut" name="Quit"/> </menu> <menu label="Hjælp" name="Help"> <menu_item_call label="[SECOND_LIFE] hjælp" name="Second Life Help"/> - <menu_item_call label="Om [APP_NAME]" name="About Second Life"/> </menu> <menu_item_check label="Vis debug menu" name="Show Debug Menu"/> <menu label="Debug" name="Debug"> diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index f4f7eb0af8..c98a07e140 100644 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Berør" name="Object Touch"> - <on_enable parameter="Berør" name="EnableTouch"/> - </menu_item_call> + <menu_item_call label="Berør" name="Object Touch"/> <menu_item_call label="Redigér" name="Edit..."/> <menu_item_call label="Byg" name="Build"/> <menu_item_call label="Åben" name="Open"/> diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml deleted file mode 100644 index 8b4c776496..0000000000 --- a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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 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 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 deleted file mode 100644 index d6a6f2724f..0000000000 --- a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 2bd28e10de..02b7e8466b 100644 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml @@ -14,8 +14,8 @@ <context_menu label="Moderator muligheder >" name="Moderator Options"> <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> <menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Sluk lyd for alle" name="ModerateVoiceMute"/> - <menu_item_call label="Tænd lyd for alle" name="ModerateVoiceUnmute"/> + <menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/> </context_menu> </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 188229b586..3d89715ea8 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" name="save_as_new_outfit"/> + <menu_item_call label="Gem som ny" 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 deleted file mode 100644 index 08d1c25d6f..0000000000 --- a/indra/newview/skins/default/xui/da/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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 be57f88e8a..e195ebfeed 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -29,6 +29,7 @@ <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/> <menu label="Profil for sted" name="Land"> + <menu_item_call label="Profil for sted" name="Place Profile"/> <menu_item_call label="Om land" name="About Land"/> <menu_item_call label="Region/Estate" name="Region/Estate"/> </menu> @@ -64,17 +65,6 @@ <menu_item_call label="Byg værktøj" name="Create"/> <menu_item_call label="Land værktøj" name="Land"/> </menu> - <menu label="Redigér" name="Edit"> - <menu_item_call label="Fortryd" name="Undo"/> - <menu_item_call label="Gendan" name="Redo"/> - <menu_item_call label="Klip" name="Cut"/> - <menu_item_call label="Kopiér" name="Copy"/> - <menu_item_call label="Sæt ind" name="Paste"/> - <menu_item_call label="Slet" name="Delete"/> - <menu_item_call label="Duplikér" name="Duplicate"/> - <menu_item_call label="Vælg alt" name="Select All"/> - <menu_item_call label="Fravælg" name="Deselect"/> - </menu> <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"/> @@ -122,6 +112,7 @@ <menu_item_call label="Om [APP_NAME]" name="About Second Life"/> </menu> <menu label="Avanceret" name="Advanced"> + <menu_item_check label="Vis avanceret menu" name="Show Advanced Menu"/> <menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/> <menu_item_call label="Gendan teksturer" name="Rebake Texture"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> @@ -143,7 +134,6 @@ <menu_item_check label="Fremhæv gennemsigtigt" name="Highlight Transparent"/> <menu_item_check label="Vis HUD vedhæftninger" name="Show HUD Attachments"/> <menu_item_check label="Vis muse-sigte" name="ShowCrosshairs"/> - <menu_item_check label="Vis tips om land" name="Land Tips"/> </menu> <menu label="Gengivelsestyper" name="Rendering Types"> <menu_item_check label="Simpel" name="Simple"/> @@ -169,7 +159,7 @@ <menu_item_check label="Tåge" name="Fog"/> <menu_item_check label="Fleksible objekter" name="Flexible Objects"/> </menu> - <menu_item_check label="Kør flere 'threats'" name="Run Multiple Threads"/> + <menu_item_check label="Kør flere 'threats'" name="Run Multiple Threads"/> <menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/> <menu_item_check label="Muse udjævning" name="Mouse Smoothing"/> <menu label="Shortcuts" name="Shortcuts"> 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 deleted file mode 100644 index 00055c8932..0000000000 --- a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Erstat" name="wear_replace"/> - <menu_item_call label="Tag på" name="wear_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 deleted file mode 100644 index 39f99ad6aa..0000000000 --- a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 878c8bb04d..0000000000 --- a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 30e19ee901..afccc1e904 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -224,6 +224,9 @@ Er du sikker på at du vil fortsætte? Ikke nok penge til at oprette annonce. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="DeleteAvatarPick"> + Slet favorit <nolink>[PICK]</nolink>? + </notification> <notification name="CacheWillClear"> Cache vil blive tømt ved næste genstart af [APP_NAME]. </notification> @@ -391,6 +394,16 @@ Tilbyd venskab til [NAME]? <button name="Cancel" text="Annullér"/> </form> </notification> + <notification label="Gem sæt" name="SaveOutfitAs"> + Gem det som jeg har på som nyt sæt: + <form name="form"> + <input name="message"> + [DESC] (ny) + </input> + <button name="Offer" text="OK"/> + <button name="Cancel" text="Annullér"/> + </form> + </notification> <notification name="ErrorMessage"> <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -584,6 +597,10 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a Teleport til [CLASSIFIED]? <usetemplate ignoretext="Bekræft at du ønsker at teleportere til lokation in annoncer" name="okcancelignore" notext="Annullér" yestext="Teleport"/> </notification> + <notification name="TeleportToHistoryEntry"> + Teleport til [HISTORY_ENTRY]? + <usetemplate ignoretext="Bekræft at du ønsker at teleportere til en lokation i din historik" name="okcancelignore" notext="Annullér" yestext="Teleport"/> + </notification> <notification label="Change Linden Estate" name="ChangeLindenEstate"> Du er i færd med at ændre et Linden ejet estate (mainland, teeen grid, orientation etc.). @@ -619,6 +636,9 @@ Du kan klikke på 'Ændre præference' for at ændre din indholdsratin <ignore name="ignore" text="Din valgte indholdsrating forhindrer dig i at kommer til en region"/> </form> </notification> + <notification name="PreferredMaturityChanged"> + Din indholdsrating er nu [RATING]. + </notification> <notification name="LandClaimAccessBlocked"> Du kan ikke kræve dette land på grund af din nuværende indholdsrating indstillinge . Dette kan skyldes manglende validering af din alder. @@ -813,6 +833,9 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati <notification name="SystemMessageTip"> [MESSAGE] </notification> + <notification name="IMSystemMessageTip"> + [MESSAGE] + </notification> <notification name="Cancelled"> Annulléret </notification> @@ -838,6 +861,11 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati Uploader billeder fra verdenen og www... (Tager omkring 5 minutter.) </notification> + <notification name="UploadConfirmation"> + Omkostninger ved at sende: L$[AMOUNT]. +Ønsker du at fortsætte? + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Send"/> + </notification> <notification name="UploadPayment"> Du betalte L$[AMOUNT] for at uploade. </notification> @@ -1180,9 +1208,9 @@ Prøv igen om lidt. </form> </notification> <notification name="TeleportOffered"> - [NAME] har tilbudt dig en teleport til lokationen: + [NAME_SLURL] har tilbudt en teleport til deres lokation: -[MESSAGE] +[MESSAGE] - [MATURITY_STR] <icon>[MATURITY_ICON]</icon> <form name="form"> <button name="Teleport" text="Teleportér"/> <button name="Cancel" text="Annullér"/> @@ -1200,9 +1228,11 @@ Prøv igen om lidt. </form> </notification> <notification name="OfferFriendship"> - [NAME] tilbyder venskab. + [NAME_SLURL] tilbyder venskab. -Som standard vil du kunne se andres onlinestatus. +[MESSAGE] + +(Som udgangspunkt vil I være i stand til at se hinandens online status.) <form name="form"> <button name="Accept" text="Acceptér"/> <button name="Decline" text="Afvis"/> @@ -1256,6 +1286,9 @@ Fra genstand: [OBJECTNAME], ejer: [NAME]? <notification name="FailedToFindWearable"> Det lykkedes ikke at finde [TYPE] med navnet [DESC] i databasen. </notification> + <notification name="ShareToWebFailed"> + Fejl ved afsendelse af billede til web. + </notification> <notification name="InvalidWearable"> Den genstand du prøver at tage på benytter en funktion din klient ikke kan forstå. Upgradér venligst din version af [APP_NAME] for at kunne tage denne genstand på. </notification> @@ -1451,6 +1484,12 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager. Den valgte knap kan ikke vises lige nu. 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 + </notification> + <notification name="AvatarRezNotification"> + Avatar '[NAME]' rezzed på [TIME] sekunder. + </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 deleted file mode 100644 index d2ade170d1..0000000000 --- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 4cbcdebbe4..0000000000 --- a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Skift" name="switch_btn"/> - <button label="Køb >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 2d288a9494..4a038e89ba 100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/> - <string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/> + <string name="SpeakBtnToolTip"> + Slukker/tænder mikrofon + </string> + <string name="VoiceControlBtnToolTip"> + Skjuler/viser stemme kontrol panel + </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -20,21 +24,6 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Tag foto"/> </layout_panel> - <layout_panel name="sidebar_btn_panel"> - <button label="Sidepanel" name="sidebar_btn" tool_tip="Vis/skjul sidepanel"/> - </layout_panel> - <layout_panel name="build_btn_panel"> - <button label="Byg" name="build_btn" tool_tip="Vis/skjul byggeværktøjer"/> - </layout_panel> - <layout_panel name="search_btn_panel"> - <button label="Søg" name="search_btn" tool_tip="Vis/skjul søgning"/> - </layout_panel> - <layout_panel name="world_map_btn_panel"> - <button label="Kort" name="world_map_btn" tool_tip="Vis/skjul verdenskort"/> - </layout_panel> - <layout_panel name="mini_map_btn_panel"> - <button label="Mini-kort" name="mini_map_btn" tool_tip="Vis/skjul Mini-kort"/> - </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="Konversationer"/> diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml deleted file mode 100644 index c08d095c66..0000000000 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Tilføj +" name="add_btn"/> - <button label="Køb >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index 88b0636e9e..0000000000 --- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml deleted file mode 100644 index 92d78b01a2..0000000000 --- a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Attachments"/> - <accordion_tab name="tab_clothing" title="Tøj"/> - <accordion_tab name="tab_body_parts" title="Kropsdele"/> - </accordion> -</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 deleted file mode 100644 index 700ad4fa14..0000000000 --- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index dd8d86cfbf..0000000000 --- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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 7c1ffe5cfa..1c8567d27c 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <string name="meters"> - Meter - </string> - <string name="feet"> - Fod - </string> - <string name="height"> - Højde: - </string> - <text name="avatar_height"/> + <panel name="avatar_sex_panel"> + <text name="gender_text"> + Køn: + </text> + <radio_group name="sex_radio"> + <radio_item label="Kvinde" name="radio"/> + <radio_item label="Mand" name="radio2"/> + </radio_group> + </panel> <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_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml index d4a12209db..4a133d8693 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml @@ -4,6 +4,5 @@ <texture_picker label="Hoved tatovering" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> - <color_swatch label="Farve/Nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> </panel> </panel> 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 604c166ef0..4afb7ba45c 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_desc_text"> + <string name="skirt_skirt_desc_text"> Nederdel: </string> <string name="gloves_desc_text"> @@ -90,19 +90,17 @@ <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:"/> - <radio_group name="sex_radio"> - <radio_item label="" name="sex_male" tool_tip="Mand" value="1"/> - <radio_item label="" name="sex_female" tool_tip="Kvinde" value="0"/> - </radio_group> - <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="Annullér ændringer" name="revert_button"/> + <button label="Vend tilbage" 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 eccddb55c8..3079a23d20 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 indholdsrating - + - Vælg Mature - </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_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index efad4d0c34..9b0267529c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> Du har ikke tilladelse til at se gruppeejet land. </panel.string> - <panel.string name="epmty_view_group_land_text"> - Intet indhold - </panel.string> <panel.string name="cant_view_group_accounting_text"> Du har ikke tilladelse til at se gruppens økonomiinformationer. </panel.string> diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index 0a0b8f5e04..7046ac4d7c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml @@ -24,7 +24,7 @@ Maksimum er 200 pr. gruppe pr. dag <text name="notice_list_none_found"> Ingen fundet </text> - <button label="Ny besked" label_selected="Lav ny besked" name="create_new_notice" tool_tip="Lav en ny besked"/> + <button label="Lav en ny besked" label_selected="Lav ny besked" name="create_new_notice" tool_tip="Lav en ny besked"/> <button label="Genopfrisk" label_selected="Genopfrisk liste" name="refresh_notices" tool_tip="Genopfrisk beskedliste"/> <panel label="Lav ny besked" name="panel_create_new_notice"> <text name="lbl"> @@ -42,7 +42,6 @@ Maksimum er 200 pr. gruppe pr. dag <text name="string"> Træk og slip en gensand for at vedhæfte den: </text> - <button label="Beholdning" name="open_inventory" tool_tip="Åben beholdning"/> <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/> <button label="Send" label_selected="Send" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/> diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml index ebc773f7ed..3ab3dd8bf8 100644 --- a/indra/newview/skins/default/xui/da/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml @@ -13,9 +13,6 @@ Vælg flere medlemmer ved at holde Ctrl-tasten nede og klik på deres navne. </panel.string> - <panel.string name="donation_area"> - [AREA] m² - </panel.string> <filter_editor label="Filtrér medlemmer" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Medlemsnavn" name="name"/> @@ -79,15 +76,21 @@ ting i denne gruppe. Der er en bred vifte af rettigheder. <text name="static"> Rolle navn </text> - <line_editor name="role_name"/> + <line_editor name="role_name"> + Ansatte + </line_editor> <text name="static3"> Rolle titel </text> - <line_editor name="role_title"/> + <line_editor name="role_title"> + (venter) + </line_editor> <text name="static2"> Beskrivelse </text> - <text_editor name="role_description"/> + <text_editor name="role_description"> + (venter) + </text_editor> <text name="static4"> Tildelte roller </text> @@ -102,6 +105,9 @@ ting i denne gruppe. Der er en bred vifte af rettigheder. </scroll_list> </panel> <panel name="actions_footer"> + <text name="static"> + Beskrivelse + </text> <text_editor name="action_description"> Denne rettigheder 'Udmeld medlemmer fra denne gruppe'. Kun en ejer kan udmelde en anden ejer. </text_editor> diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml index d6406939c1..16bd22c21a 100644 --- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml @@ -9,20 +9,62 @@ <text name="ItemcountText"> Genstande: </text> + <menu_bar name="Inventory Menu"> + <menu label="Filer" name="File"> + <menu_item_call label="Åben" name="Open"/> + <menu label="Send fil" 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="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Nyt vindue" name="New Window"/> + <menu_item_call label="Vis filtre" name="Show Filters"/> + <menu_item_call label="Nulstil filtre" name="Reset Current"/> + <menu_item_call label="Luk alle mapper" name="Close All Folders"/> + <menu_item_call label="Tøm papirkurv" name="Empty Trash"/> + <menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/> + </menu> + <menu label="Opret" name="Create"> + <menu_item_call label="Ny mappe" name="New Folder"/> + <menu_item_call label="Nyt script" name="New Script"/> + <menu_item_call label="Ny note" name="New Note"/> + <menu_item_call label="Ny bevægelse" name="New Gesture"/> + <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="Nyt alpha lag" 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 kropsbygning" name="New Shape"/> + <menu_item_call label="Ny 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> + <menu label="Sortér" name="Sort"> + <menu_item_check label="Efter navn" name="By Name"/> + <menu_item_check label="Efter dato" name="By Date"/> + <menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/> + <menu_item_check label="System-mapper i toppen" name="System Folders To Top"/> + </menu> + </menu_bar> <filter_editor label="Filter" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="Alle ting" name="All Items"/> - <recent_inventory_panel label="Nye ting" name="Recent Items"/> + <inventory_panel label="Nye ting" name="Recent Items"/> </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <button name="options_gear_btn" tool_tip="Vis yderligere valg"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Tilføj ny genstand"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> - </layout_panel> - </layout_stack> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/> + <button name="add_btn" tool_tip="Opret ny genstand"/> + <dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index 7a8b5a6389..95bfc89f20 100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="nearby_media"> + <string name="media_item_count_format"> + (%ld media items) + </string> <string name="empty_item_text"> <tom> </string> @@ -16,15 +19,10 @@ <button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/> <button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/> <button name="open_prefs_btn" tool_tip="Vis media preferencer"/> - <button label="Mere >>" label_selected="Mindre <<" name="more_less_btn" tool_tip="Avanceret opsætning"/> + <button label="Mere >>" label_selected="Mindre <<" name="more_btn" tool_tip="Advancerede kontroller"/> + <button label="Mere >>" label_selected="Mindre <<" name="less_btn" tool_tip="Advancerede kontroller"/> </panel> <panel name="nearby_media_panel"> - <text name="nearby_media"> - Media i nærheden - </text> - <text name="show"> - Vis: - </text> <combo_box name="show_combo"> <combo_box.item label="Overalt" name="All"/> <combo_box.item label="På dette sted" name="WithinParcel"/> @@ -38,7 +36,7 @@ <scroll_list.columns label="Navn" name="media_name"/> <scroll_list.columns label="Debug" name="media_debug"/> </scroll_list> - <panel name="media_controls_panel"> + <panel> <layout_stack name="media_controls"> <layout_panel name="stop"> <button name="stop_btn" tool_tip="Stop valgte medie"/> @@ -47,16 +45,16 @@ <button name="play_btn" tool_tip="Afspil valgte medie"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pause valgte medie"/> + <button name="pause_btn" tool_tip="Pause valgt medie"/> </layout_panel> <layout_panel name="volume_slider_ctrl"> - <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Lydstyrke for valgte medie"/> </layout_panel> <layout_panel name="mute"> - <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/> + <button name="mute_btn" tool_tip="Sluk lyd fra valgte medie"/> </layout_panel> <layout_panel name="zoom"> - <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/> + <button name="zoom_btn" tool_tip="Zoom til valgte medie"/> </layout_panel> <layout_panel name="unzoom"> <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/> 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 99ef3b5411..de68366610 100644 --- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml @@ -2,8 +2,6 @@ <!-- Side tray Outfit Edit panel --> <panel label="Redigér sæt" name="outfit_edit"> <string name="No Outfit" value="Intet sæt"/> - <string name="unsaved_changes" value="Ikke gemte ændringer"/> - <string name="now_editing" value="Redigerer nu"/> <panel.string name="not_available"> (Ikke relevant) </panel.string> @@ -13,39 +11,38 @@ <string name="Filter.All" value="Alle"/> <string name="Filter.Clothes/Body" value="Tøj/Krop"/> <string name="Filter.Objects" value="Objekter"/> - <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"/> + <button label="redigér" name="edit_wearable_btn"/> <text name="title" value="Redigér sæt"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> - <text name="status" value="Redigerer nu..."/> + <text name="status" value="Retter..."/> <text name="curr_outfit_name" value="[Current Outfit]"/> </panel> </panel> <layout_stack name="im_panels"> <layout_panel label="IM kontrolpanel" name="outfit_wearables_panel"> + <scroll_list name="look_items_list"> + <scroll_list.columns label="Se genstand" name="look_item"/> + <scroll_list.columns label="Sorter genstande i sæt" name="look_item_sort"/> + </scroll_list> + <panel label="bottom_panel" name="edit_panel"/> + </layout_panel> + <layout_panel name="add_wearables_panel"> + <filter_editor label="Filter" name="look_item_filter"/> <layout_stack name="filter_panels"> - <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 label="IM kontrolpanel" name="filter_button_panel"> + <text name="add_to_outfit_label" value="Tilføj til sæt:"/> + <button label="O" name="filter_button"/> </layout_panel> </layout_stack> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <button label="Tag genstand på" name="plus_btn"/> + <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_stack> - <panel name="no_add_wearables_button_bar"> - <button name="shop_btn_1" tool_tip="Besøg SL markedspladsen. Du kan også vælge noget du har på, og så klikke her for at se andre ting som dette"/> - </panel> - <panel name="add_wearables_button_bar"> - <button name="shop_btn_2" tool_tip="Besøg SL markedspladsen. Du kan også vælge noget du har på, og så klikke her for at se andre ting som dette"/> - </panel> <panel name="save_revert_button_bar"> <button label="Gem" name="save_btn"/> - <button label="Annullér ændringer" name="revert_btn" tool_tip="Vend tilbage til sidst gemte version"/> + <button label="Gendan" name="revert_btn"/> </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 6f9dd5b775..681701aba2 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ting" name="Outfits"> - <panel.string name="wear_outfit_tooltip"> - Tag valgte sæt på - </panel.string> - <panel.string name="wear_items_tooltip"> - Bær valgte genstande - </panel.string> <tab_container name="appearance_tabs"> <panel label="MINE SÆT" name="outfitslist_tab"/> - <panel label="HAR PÅ" name="cof_tab"/> + <inventory_panel label="HAR PÅ" name="cof_tab"/> </tab_container> <panel name="bottom_panel"> - <button label="Gem som" name="save_btn"/> + <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"/> <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_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml deleted file mode 100644 index 72caedb461..0000000000 --- a/indra/newview/skins/default/xui/da/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Vis yderligere valgmuligheder"/> - <button name="trash_btn" tool_tip="Slet valgte sæt"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml deleted file mode 100644 index 8d25efa97b..0000000000 --- a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Vis yderligere valgmuligheder"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 5d8474259c..db72125b84 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -2,9 +2,9 @@ <!-- Side tray panel --> <panel label="Personer" name="people_panel"> <string name="no_recent_people" value="Ingen tidligere personer. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/> - <string name="no_filtered_recent_people" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/> + <string name="no_filtered_recent_people" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/> <string name="no_one_near" value="Ingen i nærheden. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/> - <string name="no_one_filtered_near" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/> + <string name="no_one_filtered_near" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/> <string name="no_friends_online" value="Ingen venner online"/> <string name="no_friends" value="Ingen venner"/> <string name="no_friends_msg"> @@ -12,11 +12,11 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap World Map]. </string> <string name="no_filtered_friends_msg"> - Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]. + Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]. </string> <string name="people_filter_label" value="Filtrér personer"/> <string name="groups_filter_label" value="Filtrér grupper"/> - <string name="no_filtered_groups_msg" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/> + <string name="no_filtered_groups_msg" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/groups Search]."/> <string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Search]."/> <filter_editor label="Filtrér" name="filter_input"/> <tab_container name="tabs"> @@ -55,7 +55,7 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Worl <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/> <button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/> <button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/> - <button label="Del" name="share_btn" tool_tip="Del en genstand i beholdning"/> + <button label="Del" name="share_btn"/> <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/> <button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/> <button label="Gruppe chat" name="chat_btn" tool_tip="Åben chat session"/> diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index ac15da1717..c06176f994 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" tool_tip="Vis dette område på verdenskortet"/> + <button label="Kort" name="map_btn"/> <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" tool_tip="Vis profil for stedet"/> + <button label="Profil" name="profile_btn"/> </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 1570960745..4d505db30e 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -20,6 +20,9 @@ <check_box label="Talebobler" name="bubble_text_chat"/> <slider label="Synlighed" name="bubble_chat_opacity"/> <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> + <text name="UI Size:"> + Brugerflade størrelse + </text> <check_box label="Vis script fejl i:" name="show_script_errors"/> <radio_group name="show_location"> <radio_item label="Chat" name="0"/> @@ -29,4 +32,5 @@ <line_editor label="Brug walkie-talkie modus" name="modifier_combo"/> <button label="Angiv taste" name="set_voice_hotkey_button"/> <button label="Midterste museknap" name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste musetaste"/> + <button label="Andre enheder" name="joystick_setup_button"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 20a376f152..df97193598 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -45,7 +45,6 @@ </text> <check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/> <check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/> - <check_box label="Åben for almindelig tekst i IM og chat historik" name="plain_text_chat_history"/> <text name="show_ims_in_label"> Vis IM'er i: </text> 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 62214089f5..07e3aec72a 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Grafik" name="Display panel"> + <text name="UI Size:"> + UI størrelse: + </text> <text name="QualitySpeed"> Kvalitet og hastighed: </text> @@ -50,7 +53,6 @@ m </text> <slider label="Maks. antal partikler:" name="MaxParticleCount"/> - <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_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 38bc9c0a2a..8202c78947 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -37,10 +37,10 @@ <radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/> <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value=""/> </radio_group> - <check_box label="Aktivér plugins" name="browser_plugins_enabled"/> - <check_box label="Acceptér cookies" name="cookies_enabled"/> - <check_box label="Aktivér Javascript" name="browser_javascript_enabled"/> - <check_box label="Aktivér web proxy" name="web_proxy_enabled"/> + <check_box initial_value="sand" label="Aktivér plugins" name="browser_plugins_enabled"/> + <check_box initial_value="sand" label="Acceptér cookies" name="cookies_enabled"/> + <check_box initial_value="sand" label="Aktivér Javascript" name="browser_javascript_enabled"/> + <check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/> <text name="Proxy location"> Proxy placering: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index 18cb0e47b9..856f978ebd 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Aktiveret" name="enable_media"/> <slider label="Stemme chat" name="Voice Volume"/> <check_box label="Aktiveret" name="enable_voice_check"/> - <check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="true"/> - <check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="true"/> + <check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="sandt"/> + <check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="sandt"/> <text name="voice_chat_settings"> Stemme chat opsætning </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Standard </panel.string> - <panel.string name="default system device"> - Standard systemenhed - </panel.string> - <panel.string name="no device"> - Ingen enheder - </panel.string> <text name="Input"> Input </text> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index e6e78028f5..8a01659ffa 100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/places/[SEARCH_TERM] Search]."/> - <no_visible_tabs_text name="no_teleports_msg" value="Teleport historik er tom. Prøv [secondlife:///app/search/places/ Search]."/> <accordion_tab name="today" title="I dag"/> <accordion_tab name="yesterday" title="I går"/> <accordion_tab name="2_days_ago" title="2 dage siden"/> + 5 <accordion_tab name="3_days_ago" title="3 dage siden"/> <accordion_tab name="4_days_ago" title="4 dage siden"/> <accordion_tab name="5_days_ago" title="5 dage siden"/> diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml deleted file mode 100644 index 50f561ec7f..0000000000 --- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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 c5caefe070..43ddfdada7 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sæt" name="appearance panel"> <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 name="currentlook_title"> + (ikke gemt) </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 64ee3f0428..9a2a348f58 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml @@ -2,12 +2,11 @@ <panel label="Ting" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <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="Profil" name="info_btn"/> + <button label="Del" name="share_btn"/> + <button label="Bær" name="wear_btn"/> <button label="Afspil" name="play_btn"/> - <button label="Teleportér" name="teleport_btn" tool_tip="Teleport til det valgte område"/> + <button label="Teleportér" name="teleport_btn"/> </panel> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 37501a3534..bd5ab62be9 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -246,6 +246,9 @@ <string name="BUTTON_CLOSE_WIN"> Luk (Ctrl+W) </string> + <string name="BUTTON_CLOSE_CHROME"> + Luk + </string> <string name="BUTTON_RESTORE"> Gendan </string> @@ -285,6 +288,9 @@ <string name="GroupNameNone"> (ingen) </string> + <string name="AvalineCaller"> + Avaline opkalder [ORDER] + </string> <string name="AssetErrorNone"> Ingen fejl </string> @@ -880,7 +886,7 @@ Tryk ESC for at skift til normalt udsyn </string> <string name="InventoryNoMatchingItems"> - Ingen matchende genstande fundet i beholdning. Prøv evt. [secondlife:///app/search/groups "Search"]. + Fandt du ikke hvad du ledte efter. Prøv [secondlife:///app/search/all Search]. </string> <string name="FavoritesNoMatchingItems"> Træk et landemærke hertil for at tilføje den som favorit. @@ -1539,9 +1545,7 @@ <string name="RegionNoCovenantOtherOwner"> Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab. Kontakt venligst estate ejeren for detaljer om salg. </string> - <string name="covenant_last_modified"> - Sidst ændret: - </string> + <string name="covenant_last_modified" value="Sidst rettet:"/> <string name="none_text" value=" (ingen) "/> <string name="never_text" value=" (aldrig) "/> <string name="GroupOwned"> @@ -3218,6 +3222,15 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="LocationCtrlComboBtnTooltip"> Min lokationshistorik </string> + <string name="LocationCtrlAdultIconTooltip"> + Adult region + </string> + <string name="LocationCtrlModerateIconTooltip"> + Moderate region + </string> + <string name="LocationCtrlGeneralIconTooltip"> + Generel region + </string> <string name="UpdaterWindowTitle"> [APP_NAME] Opdatér </string> @@ -3248,6 +3261,12 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="UpdaterFailStartTitle"> Opstart af klient fejlede </string> + <string name="ItemsComingInTooFastFrom"> + [APP_NAME]: Genstande modtages for hurtigt fra [FROM_NAME], automatisk visning er slået fra i [TIME] sekunder + </string> + <string name="ItemsComingInTooFast"> + [APP_NAME]: Genstande modtages for hurtigt, automatisk visning er slået fra i [TIME] sekunder + </string> <string name="IM_logging_string"> -- Logning af IM aktiveret -- </string> @@ -3275,6 +3294,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="IM_moderator_label"> (Moderator) </string> + <string name="answered_call"> + Dit opkald er blevet besvaret + </string> <string name="started_call"> startede et stemme opkald </string> @@ -3356,12 +3378,18 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="unread_chat_multiple"> [SOURCES] har sagt noget nyt </string> + <string name="session_initialization_timed_out_error"> + Initialisering af session er "timed out" + </string> <string name="paid_you_ldollars"> [NAME] betalte dig L$[AMOUNT] </string> <string name="you_paid_ldollars"> Du betalte [NAME] L$[AMOUNT] [REASON]. </string> + <string name="you_paid_ldollars_no_info"> + Du betalte L$[AMOUNT]. + </string> <string name="you_paid_ldollars_no_reason"> Du betalte [NAME] L$[AMOUNT]. </string> @@ -3472,4 +3500,13 @@ Krænkelsesanmeldelse <string name="Contents"> Indhold </string> + <string name="AvatarBirthDateFormat"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </string> + <string name="DefaultMimeType"> + ingen/ingen + </string> + <string name="texture_load_dimensions_error"> + Kan ikke hente billeder større end [WIDTH]*[HEIGHT] + </string> </strings> 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 8235eacde0..92c0c4a27a 100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml @@ -3,48 +3,46 @@ <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"> - <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> + <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"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml index 38321b7906..21e3bd280f 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml @@ -59,8 +59,9 @@ </text> <button label="Jetzt kaufen" name="buy_btn"/> <button label="Abbrechen" name="cancel_btn"/> - <text name="info_cannot_buy"> - Kaufabbruch + <text height="40" left="160" name="info_cannot_buy" width="200"> + Kauf nicht +möglich </text> - <button label="Weiter zur Kontoseite" name="error_web"/> + <button label="Weiter zum Internet" name="error_web"/> </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 deleted file mode 100644 index 38d3bdd77f..0000000000 --- a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?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_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index 5369155cf9..5708a3f80a 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml @@ -124,6 +124,9 @@ unterstützt [AMOUNT2] Objekte <floater.string name="no_parcel_selected"> (keine Parzelle ausgewählt) </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Region: </text> diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml index d49c207f98..87371b05e3 100644 --- a/indra/newview/skins/default/xui/de/floater_camera.xml +++ b/indra/newview/skins/default/xui/de/floater_camera.xml @@ -9,57 +9,35 @@ <floater.string name="move_tooltip"> Kamera nach oben, unten, links und rechts bewegen </floater.string> - <floater.string name="camera_modes_title"> - Kameramodi + <floater.string name="orbit_mode_title"> + Kreisen </floater.string> <floater.string name="pan_mode_title"> - Kreisen - Zoomen - Schwenken + Schwenken </floater.string> - <floater.string name="presets_mode_title"> - Ansichten + <floater.string name="avatar_view_mode_title"> + Voreinstellungen </floater.string> <floater.string name="free_mode_title"> Objekt ansehen </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - Vorderansicht - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Seitenansicht - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Hinteransicht - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Objektansicht - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Mouselook - </panel_camera_item.text> - </panel_camera_item> - </panel> + <joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/> <panel name="zoom" tool_tip="Kamera auf Fokus zoomen"> - <joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/> <slider_bar name="zoom_slider" tool_tip="Kamera auf Fokus zoomen"/> - <joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Hinteransicht"/> + <button name="group_view" tool_tip="Gruppen-Ansicht"/> + <button name="front_view" tool_tip="Vorderansicht"/> + <button name="mouselook_view" tool_tip="Mouselook"/> </panel> </panel> <panel name="buttons"> - <button label="" name="presets_btn" tool_tip="Ansichten"/> - <button label="" name="pan_btn" tool_tip="Kreisen - Zoomen - Schwenken"/> - <button label="" name="avatarview_btn" tool_tip="Kameramodi"/> + <button label="" name="orbit_btn" tool_tip="Kamera kreisen"/> + <button label="" name="pan_btn" tool_tip="Kamera schwenken"/> + <button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/> + <button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml index 0fe154b531..aed4bacb30 100644 --- a/indra/newview/skins/default/xui/de/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml @@ -18,7 +18,7 @@ <text name="l_val_text"> Hell.: </text> - <check_box label="Sofort übernehmen" name="apply_immediate"/> + <check_box label="Jetzt übernehmen" name="apply_immediate"/> <button label="" label_selected="" name="color_pipette"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/> <button label="OK" label_selected="OK" name="select_btn"/> diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml index d931596efe..d01ea145f1 100644 --- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml @@ -22,7 +22,7 @@ VBO aktivieren: </text> <check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern. Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/> - <slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/> + <slider label="Texturspeicher (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/> <spinner label="Nebeldistanzverhältnis:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml index 0312f7dfe9..740085599f 100644 --- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml @@ -16,13 +16,7 @@ ist einem Voice-Konferenz-Chat beigetreten. </floater.string> <floater.string name="VoiceInviteGroup"> - ist dem '[GROUP]' Voice-Kanal beigetreten. - </floater.string> - <floater.string name="VoiceInviteQuestionGroup"> - Möchten Sie [CURRENT_CHAT] verlassen und dem Gespräch mit '[GROUP]' beitreten? - </floater.string> - <floater.string name="VoiceInviteQuestionDefault"> - Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten? + ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten. </floater.string> <text name="question"> Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten? diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index d4358fa8e9..a9a3149177 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=""> +<floater name="Map" title="Minikarte"> <floater.string name="mini_map_north"> N </floater.string> @@ -27,9 +27,6 @@ <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 4333392582..b978322cef 100644 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml @@ -6,48 +6,18 @@ <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> @@ -58,12 +28,10 @@ Fliegen </string> <panel name="panel_actions"> - <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)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Nach oben fliegen, „E" drücken"/> + <button label="" label_selected="" name="move down btn" tool_tip="Nach unten fliegen, „C" 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 6d3635fa8d..1426a33d1d 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml @@ -7,7 +7,7 @@ Sound abspielen: </floater.string> <floater.string name="step_chat"> - Im Chat anzeigen: + Chat sprechen: </floater.string> <floater.string name="step_wait"> Warten: @@ -24,6 +24,9 @@ <floater.string name="Title"> Gesten: [NAME] </floater.string> + <text name="name_text"> + Name: + </text> <text name="desc_label"> Beschreibung: </text> @@ -33,7 +36,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 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"/> + <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"/> <text name="key_label"> Tastenkürzel: </text> @@ -42,29 +45,20 @@ <text name="library_label"> Bibliothek: </text> - <scroll_list name="library_list" width="166"> - <scroll_list.rows name="action_animation" value="Animation"/> - <scroll_list.rows name="action_sound" value="Sound"/> - <scroll_list.rows name="action_chat" value="Chat"/> - <scroll_list.rows name="action_wait" value="Warten"/> - </scroll_list> - <button label="Hinzufügen >>" left_pad="6" name="add_btn" width="94"/> + <scroll_list name="library_list" width="166"/> + <button label="Hinzufügen >>" name="add_btn" left_pad="6" 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"/> - <line_editor name="wait_time_editor"/> + <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 14e666fd22..62f9e1e9e5 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <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> @@ -16,5 +19,4 @@ 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_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml index d91535ebc3..993382727b 100644 --- a/indra/newview/skins/default/xui/de/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/de/floater_publish_classified.xml @@ -5,7 +5,7 @@ Anzeigengebühren werden nicht zurückerstattet. </text> - <spinner label="Preis: L$" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/> + <spinner label="Anzeigenpreis:" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Weitere Infos (Link zur Hilfe) diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 12ae9898c3..bb28f1b33f 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -67,10 +67,7 @@ <text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt"> þ: [COUNT] </text> - <check_box label="" name="checkbox uniform"/> - <text label="Beide Seiten dehnen" name="checkbox uniform label"> - Beide Seiten dehnen - </text> + <check_box label="Beide Seiten dehnen" name="checkbox uniform"/> <check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/> <check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="10"/> <combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus."> diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml index 07b7689cd0..aa582838a4 100644 --- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="Mein Avatar:"/> </layout_panel> - <layout_stack name="voice_effect_and_leave_call_stack"> - <layout_panel name="leave_call_btn_panel"> - <button label="Anruf beenden" name="leave_call_btn"/> - </layout_panel> - </layout_stack> + <layout_panel name="leave_call_btn_panel"> + <button label="Anruf beenden" name="leave_call_btn"/> + </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml deleted file mode 100644 index 21031cd556..0000000000 --- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Orte" name="voice_effects" title="VOICE MORPHING"> - <string name="no_voice_effect"> - (Kein Voice-Morphing) - </string> - <string name="active_voice_effect"> - (Aktiv) - </string> - <string name="unsubscribed_voice_effect"> - (nicht abonniert) - </string> - <string name="new_voice_effect"> - (Neu!) - </string> - <text name="preview_text"> - Zur Vorschau - </text> - <text name="status_text"> - Stimme aufnehmen und auf einen Effekt klicken, um diesen auf Ihre Stimme anzuwenden. - </text> - <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] 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="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 befa46651a..a1f41f53ad 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -22,12 +22,12 @@ <text name="land_sale_label"> Land-Verkauf </text> - <text name="auction_label"> - Land-Auktion - </text> <text name="by_owner_label"> durch Besitzer </text> + <text name="auction_label"> + Land-Auktion + </text> <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/> <text name="Home_label"> Zuhause @@ -39,12 +39,12 @@ <text name="pg_label"> Generell </text> - <check_box initial_value="true" label="Mature" name="events_mature_chk"/> - <text name="events_mature_label"> + <check_box initial_value="wahr" label="Mature" name="event_mature_chk"/> + <text name="mature_label"> Moderat </text> - <check_box label="Adult" name="events_adult_chk"/> - <text name="events_adult_label"> + <check_box label="Adult" name="event_adult_chk"/> + <text name="adult_label"> Adult </text> </panel> @@ -67,9 +67,6 @@ <scroll_list.columns label="" name="icon"/> <scroll_list.columns label="" name="sim_name"/> </scroll_list> - <text name="events_label"> - Standort: - </text> <button label="Teleportieren" label_selected="Teleportieren" name="Teleport" tool_tip="Zu ausgewählter Position teleportieren"/> <button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/> <button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/> diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml index 72b8235828..ede14a37d7 100644 --- a/indra/newview/skins/default/xui/de/inspect_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_object.xml @@ -8,7 +8,7 @@ Von [CREATOR] </string> <string name="CreatorAndOwner"> - Von [CREATOR] + von [CREATOR] Besitzer [OWNER] </string> <string name="Price"> @@ -23,16 +23,16 @@ Besitzer [OWNER] <string name="Sit"> Sitzen </string> - <text name="object_name" value="Test für ein Objektname der sehr lange ist und über zwei Zeilen geht."/> + <text name="object_name" value="Wirklich langen Objektnamen als Test eingeben"/> <text name="object_creator"> von secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about Besitzer secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> <text name="price_text"> - 30.000 L$ + 300.000 L$ </text> <text name="object_description"> - Dies ist eine wirklich lange Beschreibung für ein Objekt, mindestens 80 Zeichen lang oder jetzt schon mindestens 120 Zeichen lang und länger als der englische Originaltext. Niemand weiß es genau. + Dies ist eine wirklich lange Beschreibung für ein Objekt, mindestens 80 Zeichen lang oder jetzt schon 120 Zeichen. Niemand weiß es genau. </text> <text name="object_media_url"> http://www.superdupertest.com diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml index 6c4308286a..3f12906adc 100644 --- a/indra/newview/skins/default/xui/de/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/menu_bottomtray.xml @@ -4,11 +4,6 @@ <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_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml deleted file mode 100644 index 05d3dfca9d..0000000000 --- a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Attachment"> - <menu_item_call label="Abnehmen" name="detach"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml deleted file mode 100644 index 07960a525c..0000000000 --- a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Body"> - <menu_item_call label="Ersetzen" name="replace"/> - <menu_item_call label="Bearbeiten" name="edit"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml deleted file mode 100644 index 7fced273a7..0000000000 --- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Clothing"> - <menu_item_call label="Ausziehen" name="take_off"/> - <menu_item_call label="Ersetzen" name="replace"/> - <menu_item_call label="Eine Kategorie nach oben" name="move_up"/> - <menu_item_call label="Eine Kategorie nach unten" name="move_down"/> - <menu_item_call label="Bearbeiten" name="edit"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml deleted file mode 100644 index 54b218d22f..0000000000 --- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> - <menu label="Neue Kleider" name="COF.Gear.New_Clothes"/> - <menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/> -</menu> diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml index 9acf96dc6d..32a6823b35 100644 --- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Navigationsleiste anzeigen" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Favoritenleiste anzeigen" name="ShowNavbarFavoritesPanel"/> - <menu_item_check label="Mini-Standortleiste anzeigen" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml index dccee6712d..531edc02f1 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml @@ -5,7 +5,6 @@ <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_item_call label="Hochlade-Berechtigungen (Standard) festlegen" name="perm prefs"/> </menu> <menu_item_call label="Neuer Ordner" name="New Folder"/> <menu_item_call label="Neues Skript" name="New Script"/> diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml index 3fa68a27bd..e2b980c7b6 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="Filter anzeigen" name="show_filters"/> <menu_item_call label="Filter zurücksetzen" name="reset_filters"/> <menu_item_call label="Alle Ordner schließen" name="close_folders"/> + <menu_item_call label="Papierkorb ausleeren" name="empty_trash"/> <menu_item_call label="Fundbüro ausleeren" name="empty_lostnfound"/> <menu_item_call label="Textur speichern als" name="Save Texture As"/> - <menu_item_call label="Teilen" name="Share"/> <menu_item_call label="Original suchen" name="Find Original"/> <menu_item_call label="Alle Links suchen" name="Find All Links"/> - <menu_item_call label="Papierkorb ausleeren" name="empty_trash"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 756b606d65..8bb7b66482 100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Berühren" name="Object Touch"> - <on_enable parameter="Berühren" name="EnableTouch"/> - </menu_item_call> + <menu_item_call label="Berühren" name="Object Touch"/> <menu_item_call label="Bearbeiten" name="Edit..."/> <menu_item_call label="Bauen" name="Build"/> <menu_item_call label="Öffnen" name="Open"/> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml deleted file mode 100644 index 897154ec56..0000000000 --- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Outfit"> - <menu_item_call label="Anziehen - Aktuelles Outfit ersetzen" name="wear"/> - <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 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" 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_item_call label="Outfit neu benennen" name="rename"/> - <menu_item_call label="Outfit löschen" name="delete_outfit"/> -</menu> diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml deleted file mode 100644 index 32a65c96fc..0000000000 --- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit"> - <menu_item_call label="Anziehen - Aktuelles Outfit ersetzen" name="wear_replace"/> - <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="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_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml deleted file mode 100644 index 5b0a724244..0000000000 --- a/indra/newview/skins/default/xui/de/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml deleted file mode 100644 index 6c8fc69fc0..0000000000 --- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Ersetzen" name="wear_replace"/> - <menu_item_call label="Anziehen" name="wear_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"/> - <context_menu label="Anhängen an ▶" name="wearable_attach_to"/> - <context_menu label="An HUD hängen ▶" name="wearable_attach_to_hud"/> - <menu_item_call label="Ausziehen" name="take_off"/> - <menu_item_call label="Bearbeiten" name="edit"/> - <menu_item_call label="Objektprofil" name="object_profile"/> - <menu_item_call label="Original anzeigen" name="show_original"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml deleted file mode 100644 index d994571f01..0000000000 --- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index d690572c8e..0000000000 --- a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml deleted file mode 100644 index 799586f021..0000000000 --- a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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 deleted file mode 100644 index 4d7e65405a..0000000000 --- a/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 ea15c88380..d52b8dcf4d 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/> - <string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/> + <string name="SpeakBtnToolTip"> + Schaltet Mikrofon ein/aus + </string> + <string name="VoiceControlBtnToolTip"> + Voice-Chat-Steuerung anzeigen/ausblenden + </string> <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" halign="right" /> </talk_button> </layout_panel> <layout_panel name="gesture_panel"> @@ -20,21 +24,6 @@ <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 deleted file mode 100644 index fc45c9ce79..0000000000 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 945acb02d7..0000000000 --- a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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 deleted file mode 100644 index 12294a43ce..0000000000 --- a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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 deleted file mode 100644 index a27252e23e..0000000000 --- a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index b7ad1bdc1b..0000000000 --- a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml index 4b48950341..b6c53be778 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="edit_alpha_panel"> - <panel name="avatar_alpha_color_panel"> - <texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> +<panel name="edit_alpha_panel" width="320"> + <panel name="avatar_alpha_color_panel" width="300"> + <texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="70"/> + <texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="66"/> <texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="72"/> + <texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken" width="70"/> </panel> </panel> 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 075a9d752a..12649e9251 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> + <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"/> </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 125bf1436e..0c89946987 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,9 +6,6 @@ <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 8c1df04ed8..cc5664bd97 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -21,7 +21,7 @@ Maximal 200 pro Gruppe täglich <text name="notice_list_none_found"> Nicht gefunden. </text> - <button label="Neue Mitteilung" label_selected="Neue Mitteilung" name="create_new_notice" tool_tip="Neue Mitteilung erstellen"/> + <button label="Neue Mitteilung erstellen" label_selected="Neue Mitteilung" name="create_new_notice" tool_tip="Neue Mitteilung erstellen"/> <button label="Aktualisieren" label_selected="Liste aktualisieren" name="refresh_notices" tool_tip="Mitteilungsliste aktualisieren"/> <panel label="Neue Mitteilung" name="panel_create_new_notice"> <text name="lbl"> @@ -39,7 +39,6 @@ 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_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index f297d32a91..db5186e081 100644 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml @@ -13,9 +13,6 @@ Drücken Sie die Strg-Taste und klicken Sie auf Namen, um mehrere Mitglieder auszuwählen. </panel.string> - <panel.string name="donation_area"> - [AREA] m². - </panel.string> <filter_editor label="Mitglieder filtern" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Mitglied" name="name" relative_width="0.30"/> diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml index 10cf34c170..9cef7b6d35 100644 --- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml @@ -18,6 +18,9 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> <button name="back_btn" tool_tip="Hinten"/> <text name="title" value="Ortsprofil"/> <scroll_container name="place_scroll"> diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml index 0f02de866b..2a6ea42c73 100644 --- a/indra/newview/skins/default/xui/de/panel_login.xml +++ b/indra/newview/skins/default/xui/de/panel_login.xml @@ -8,15 +8,18 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="username_text"> - Benutzername: + <text name="first_name_text"> + Vorname: </text> - <line_editor label="Benutzername" name="username_edit" tool_tip="[SECOND_LIFE]-Benutzername"/> + <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"/> <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> @@ -25,6 +28,7 @@ <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 2f00782ef0..d3eb9ae04c 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -9,20 +9,62 @@ <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"/> - <recent_inventory_panel label="AKTUELL" name="Recent Items"/> + <inventory_panel label="AKTUELL" name="Recent Items"/> </tab_container> - <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 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> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml index ee1a543aac..99293edd0f 100644 --- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <pull_button name="back_btn" tool_tip="Zurück zum vorherigen Standort teleportieren"/> - <pull_button name="forward_btn" tool_tip="Um einen Standort weiter teleportieren"/> + <pull_button name="back_btn" tool_tip="Zurück zum vorherigen Standort gehen"/> + <pull_button name="forward_btn" tool_tip="Um einen Standort weiter gehen"/> <button name="home_btn" tool_tip="Zu meinem Zuhause teleportieren"/> <location_input label="Standort" name="location_combo"/> <search_combo_box label="Suche" name="search_combo_box" tool_tip="Suche"> diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml deleted file mode 100644 index 65a38ea342..0000000000 --- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <button name="trash_btn" tool_tip="Ausgewähltes Outfit löschen"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml deleted file mode 100644 index 27141796a8..0000000000 --- a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml index 9d1a582b7c..ed1421aa60 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -41,6 +41,21 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> + <string name="icon_Voice" value="parcel_drk_Voice"/> + <string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/> + <string name="icon_Fly" value="parcel_drk_Fly"/> + <string name="icon_FlyNo" value="parcel_drk_FlyNo"/> + <string name="icon_Push" value="parcel_drk_Push"/> + <string name="icon_PushNo" value="parcel_drk_PushNo"/> + <string name="icon_Build" value="parcel_drk_Build"/> + <string name="icon_BuildNo" value="parcel_drk_BuildNo"/> + <string name="icon_Scripts" value="parcel_drk_Scripts"/> + <string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/> + <string name="icon_Damage" value="parcel_drk_Damage"/> + <string name="icon_DamageNo" value="parcel_drk_DamageNo"/> <button name="back_btn" tool_tip="Hinten"/> <text name="title" value="Ortsprofil"/> <scroll_container name="place_scroll"> 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 5c91b34a21..aa1a93efac 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -45,14 +45,14 @@ </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 IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> + <check_box label="Kompakten Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> <text name="show_ims_in_label"> IMs anzeigen in: </text> <text name="requires_restart_label"> (Neustart erforderlich) </text> - <radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich)."> + <radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit viele Registerkarten an (Neustart erforderlich)."> <radio_item label="Getrennte Fenster" name="radio" value="0"/> <radio_item label="Registerkarten" name="radio2" value="1"/> </radio_group> 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 7077534719..16b4598486 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -1,5 +1,19 @@ <?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> @@ -49,7 +63,6 @@ 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: @@ -85,8 +98,8 @@ Beleuchtungsdetails: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Nur Sonne und Mond" name="SunMoon" value="0"/> - <radio_item label="Lokale Lichtquellen" name="LocalLights" value="1"/> + <radio_item label="Nur Sonne und Mond" name="SunMoon"/> + <radio_item label="Lokale Lichtquellen" name="LocalLights"/> </radio_group> <text name="TerrainDetailText"> Terraindetails: diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index 5c71b20fb0..96a86ed85d 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Aktiviert" name="enable_media"/> <slider label="Voice-Chat" name="Voice Volume"/> <check_box label="Aktiviert" name="enable_voice_check"/> - <check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="true"/> - <check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="true"/> + <check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="wahr"/> + <check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="wahr"/> <text name="voice_chat_settings"> Voice-Chat-Einstellungen </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Standard </panel.string> - <panel.string name="default system device"> - Standardgerät - </panel.string> - <panel.string name="no device"> - Kein Gerät - </panel.string> <text name="Input"> Eingabe </text> diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml index 4d721f2af6..4efd83dfff 100644 --- a/indra/newview/skins/default/xui/de/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/places/[SEARCH_TERM] Suche]."/> - <no_visible_tabs_text name="no_teleports_msg" value="Die Teleportliste ist leer. Versuchen Sie es mit der [secondlife:///app/search/all Suche]."/> <accordion_tab name="today" title="Heute"/> <accordion_tab name="yesterday" title="Gestern"/> <accordion_tab name="2_days_ago" title="Vor 2 Tagen"/> diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml deleted file mode 100644 index 533deb8597..0000000000 --- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="panel_voice_effect"> - <string name="no_voice_effect"> - Voice-Morphing Aus - </string> - <string name="preview_voice_effects"> - Voice-Morphing ausprobieren ▶ - </string> - <string name="get_voice_effects"> - 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="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 7fb9b34e0a..7a280bd7ff 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml @@ -1,19 +1,16 @@ <?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="B" name="editappearance_btn"/> - <button label="Ö" name="openoutfit_btn"/> - <text name="currentlook_status"> - (Status) + <button label="Bearbeiten" name="editappearance_btn"/> + <text name="currentlook_title"> + (nicht gespeichert) </text> <text name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> - <button label="" name="edit_outfit_btn" tool_tip="Dieses 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_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml index 4ba187dbd6..09935019ab 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml @@ -15,15 +15,9 @@ <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> - <panel.string name="origin_inventory"> - (Inventar) - </panel.string> - <panel.string name="origin_inworld"> - (Inworld) - </panel.string> <text name="title" value="Objektprofil"/> - <text name="origin" value="(Inventar)"/> - <panel label="" name="item_profile"> + <text name="where" value="(Inventar)"/> + <panel label=""> <text name="LabelItemNameTitle"> Name: </text> @@ -33,24 +27,30 @@ <text name="LabelCreatorTitle"> Ersteller: </text> - <text name="LabelCreatorName"/> + <text name="LabelCreatorName"> + Nicole Linden + </text> <button label="Profil" name="BtnCreator"/> <text name="LabelOwnerTitle"> Eigentümer: </text> - <text name="LabelOwnerName"/> + <text name="LabelOwnerName"> + Thrax Linden + </text> <button label="Profil" name="BtnOwner"/> <text name="LabelAcquiredTitle"> Erworben: </text> - <text name="LabelAcquiredDate"/> + <text name="LabelAcquiredDate"> + Mittwoch, 24. Mai 2006, 12:50:46 + </text> <panel name="perms_inv"> <text name="perm_modify"> Sie können: </text> <check_box label="Bearbeiten" name="CheckOwnerModify"/> <check_box label="Kopieren" name="CheckOwnerCopy"/> - <check_box label="Übertragen" name="CheckOwnerTransfer"/> + <check_box label="Transferieren" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> Jeder: </text> @@ -58,13 +58,13 @@ <text name="GroupLabel"> Gruppe: </text> - <check_box label="Teilen" name="CheckShareWithGroup" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern, teilen. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/> + <check_box label="Teilen" name="CheckShareWithGroup" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern teilen. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/> <text name="NextOwnerLabel"> Nächster Eigentümer: </text> <check_box label="Bearbeiten" name="CheckNextOwnerModify"/> <check_box label="Kopieren" name="CheckNextOwnerCopy"/> - <check_box label="Übertragen" name="CheckNextOwnerTransfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/> + <check_box label="Transferieren" name="CheckNextOwnerTransfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/> </panel> <check_box label="Zum Verkauf" name="CheckPurchase"/> <combo_box name="combobox sale copy"> diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml index 6474576c0f..990543b725 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -37,7 +37,7 @@ Mischverkauf </panel.string> <text name="title" value="Objektprofil"/> - <text name="where" value="(Inworld)"/> + <text name="where" value="(inworld)"/> <panel label="" name="properties_panel"> <text name="Name:"> Name: diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index a60e9afab1..632564d793 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="false" + use_ellipses="flse" pad_right="10" pad_left="10" is_toggle="false" diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml deleted file mode 100644 index 4b990fa566..0000000000 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - can_resize="false" - can_close="true" - width="422" - height="202" - layout="topleft" - name="floater_buy_currency_html" - help_topic="floater_buy_currency_html" - save_rect="true" - single_instance="true" - title="BUY CURRENCY" -> - <floater.string - name="buy_currency_url" translate="false"> - https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&sum=[SUM]&msg=[MSG]&bal=[BAL] - </floater.string> - <web_browser - follows="all" - layout="topleft" - left="1" - right="-1" - top="1" - bottom="-1" - ignore_ui_scale="false" - name="browser"/> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index da2be18db6..b45e39a111 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -4,8 +4,9 @@ can_dock="true" can_minimize="true" can_close="false" + center_horiz="true" follows="bottom" - height="164" + height="152" layout="topleft" name="camera_floater" help_topic="camera_floater" @@ -13,7 +14,7 @@ save_visibility="true" save_dock_state="true" single_instance="true" - width="228"> + width="150"> <floater.string name="rotate_tooltip"> Rotate Camera Around Focus @@ -27,16 +28,16 @@ Move Camera Up and Down, Left and Right </floater.string> <floater.string - name="camera_modes_title"> - Camera modes + name="orbit_mode_title"> + Orbit </floater.string> <floater.string name="pan_mode_title"> - Orbit Zoom Pan + Pan </floater.string> <floater.string - name="presets_mode_title"> - Preset Views + name="avatar_view_mode_title"> + Presets </floater.string> <floater.string name="free_mode_title"> @@ -44,139 +45,39 @@ </floater.string> <panel border="false" - height="123" + height="110" layout="topleft" left="2" top="0" mouse_opaque="false" name="controls" - width="226"> - <panel - color="Transparent" - follows="all" - height="102" + width="148"> + <joystick_track + follows="top|left" + height="78" + image_selected="Cam_Tracking_In" + image_unselected="Cam_Tracking_Out" layout="topleft" - left="8" - name="preset_views_list" - opaque="true" - top="24" - width="212" - visible="false"> - <panel_camera_item - name="front_view"> - <panel_camera_item.mousedown_callback - function="CameraPresets.ChangeView" - parameter="front_view" /> - <panel_camera_item.picture - image_name="Cam_Preset_Front_Off" /> - <panel_camera_item.selected_picture - image_name="Cam_Preset_Front_On" /> - <panel_camera_item.text - name="front_view_text"> - Front View - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item - name="group_view" - top_pad="4"> - <panel_camera_item.mousedown_callback - function="CameraPresets.ChangeView" - parameter="group_view" /> - <panel_camera_item.picture - image_name="Cam_Preset_Side_Off" /> - <panel_camera_item.selected_picture - image_name="Cam_Preset_Side_On" /> - <panel_camera_item.text - name="side_view_text"> - Side View - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item - name="rear_view" - layout="topleft" - top_pad="4"> - <panel_camera_item.mousedown_callback - function="CameraPresets.ChangeView" - parameter="rear_view" /> - <panel_camera_item.picture - image_name="Cam_Preset_Back_Off" /> - <panel_camera_item.selected_picture - image_name="Cam_Preset_Back_On" /> - <panel_camera_item.text - name="rear_view_text"> - Rear View - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel - color="Transparent" - follows="all" - height="68" - item_pad="4" - layout="topleft" - left="8" - name="camera_modes_list" - opaque="true" - top="24" - width="212" - visible="false"> - <panel_camera_item - name="object_view"> - <panel_camera_item.mousedown_callback - function="CameraPresets.ChangeView" - parameter="object_view" /> - <panel_camera_item.text - name="object_view_text"> - Object View - </panel_camera_item.text> - <panel_camera_item.picture - image_name="Object_View_Off" /> - <panel_camera_item.selected_picture - image_name="Object_View_On" /> - </panel_camera_item> - <panel_camera_item - name="mouselook_view" - layout="topleft"> - <panel_camera_item.mousedown_callback - function="CameraPresets.ChangeView" - parameter="mouselook_view" /> - <panel_camera_item.text - name="mouselook_view_text"> - Mouselook View - </panel_camera_item.text> - <panel_camera_item.picture - image_name="MouseLook_View_Off" /> - <panel_camera_item.selected_picture - image_name="MouseLook_View_On" /> - </panel_camera_item> - </panel> + left="45" + name="cam_track_stick" + quadrant="left" + scale_image="false" + sound_flags="3" + tool_tip="Move camera up and down, left and right" + top="22" + visible="false" + width="78" /> <!--TODO: replace + - images --> <panel border="false" class="camera_zoom_panel" - height="114" + height="94" layout="topleft" - left="0" + left="7" mouse_opaque="false" name="zoom" - top="20" - width="226"> - <joystick_rotate - follows="top|left" - height="78" - image_selected="Cam_Rotate_In" - image_unselected="Cam_Rotate_Out" - layout="topleft" - left="7" - mouse_opaque="false" - name="cam_rotate_stick" - quadrant="left" - scale_image="false" - sound_flags="3" - visible="true" - tool_tip="Orbit camera around focus" - top="20" - width="78" /> + top="22" + width="18"> <button follows="top|left" height="18" @@ -184,17 +85,15 @@ image_selected="AddItem_Press" image_unselected="AddItem_Off" layout="topleft" - left_pad="14" name="zoom_plus_btn" - width="18" - top="18"> + width="18"> <commit_callback function="Zoom.plus" /> <mouse_held_callback function="Zoom.plus" /> </button> <slider_bar - height="50" + height="48" layout="topleft" name="zoom_slider" orientation="vertical" @@ -220,20 +119,90 @@ <mouse_held_callback function="Zoom.minus" /> </button> - <joystick_track + </panel> + <joystick_rotate follows="top|left" height="78" - image_selected="Cam_Tracking_In" - image_unselected="Cam_Tracking_Out" + image_selected="Cam_Rotate_In" + image_unselected="Cam_Rotate_Out" layout="topleft" - left="133" - name="cam_track_stick" + left="45" + mouse_opaque="false" + name="cam_rotate_stick" quadrant="left" scale_image="false" sound_flags="3" - tool_tip="Move camera up and down, left and right" + visible="true" + tool_tip="Orbit camera around focus" + top="22" + width="78" /> + <panel + height="78" + layout="topleft" + left="36" + name="camera_presets" top="20" - width="78"/> + visible="false" + width="78"> + <button + height="40" + image_selected="Cam_Preset_Back_On" + image_unselected="Cam_Preset_Back_Off" + is_toggle="true" + layout="topleft" + left="0" + name="rear_view" + tool_tip="Rear View" + top="2" + width="40"> + <click_callback + function="CameraPresets.ChangeView" + parameter="rear_view" /> + </button> + <button + height="40" + image_selected="Cam_Preset_Side_On" + image_unselected="Cam_Preset_Side_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="group_view" + tool_tip="Group View" + top="2" + width="40"> + <click_callback + function="CameraPresets.ChangeView" + parameter="group_view" /> + </button> + <button + height="40" + image_selected="Cam_Preset_Front_On" + image_unselected="Cam_Preset_Front_Off" + is_toggle="true" + layout="topleft" + left="0" + name="front_view" + tool_tip="Front View" + top_pad="5" + width="40"> + <click_callback + function="CameraPresets.ChangeView" + parameter="front_view" /> + </button> + <button + height="40" + image_selected="Cam_Preset_Eye_Off" + image_unselected="Cam_Preset_Eye_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mouselook_view" + tool_tip="Mouselook View" + width="40"> + <click_callback + function="CameraPresets.ChangeView" + parameter="mouselook_view" /> + </button> </panel> </panel> <panel @@ -243,44 +212,56 @@ left="2" top_pad="0" name="buttons" - width="226"> + width="148"> <button height="23" label="" layout="topleft" - left="70" + left="23" is_toggle="true" - image_overlay="Cam_Avatar_Off" + image_overlay="Cam_Orbit_Off" image_selected="PushButton_Selected_Press" - name="presets_btn" + name="orbit_btn" tab_stop="false" - tool_tip="Preset Views" - top="13" + tool_tip="Orbit camera" width="25"> </button> <button height="23" label="" layout="topleft" - left_pad="1" + left_pad="0" is_toggle="true" - image_overlay="PanOrbit_Off" + image_overlay="Cam_Pan_Off" image_selected="PushButton_Selected_Press" name="pan_btn" tab_stop="false" - tool_tip="Orbit Zoom Pan" + tool_tip="Pan camera" width="25"> </button> <button height="23" label="" layout="topleft" - left_pad="1" - image_overlay="Cam_FreeCam_Off" + left_pad="0" + image_overlay="Cam_Avatar_Off" image_selected="PushButton_Selected_Press" name="avatarview_btn" tab_stop="false" - tool_tip="Camera modes" + tool_tip="Presets" + width="25"> + </button> + <button + height="23" + label="" + layout="topleft" + left_pad="0" + is_toggle="true" + image_overlay="Cam_FreeCam_Off" + image_selected="PushButton_Selected_Press" + name="freecamera_btn" + tab_stop="false" + tool_tip="View object" width="25"> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 05c958e051..7b5451553f 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,7 +6,6 @@ height="500" layout="topleft" name="modal container" - open_centered="true" width="600"> <button height="20" @@ -17,6 +16,15 @@ name="Continue" top="465" width="100" /> + <button + height="20" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_delta="-468" + name="Cancel" + top_delta="0" + width="100" /> <text type="string" length="1" @@ -24,9 +32,9 @@ font="SansSerif" height="20" layout="topleft" - left="20" + left_delta="4" name="tos_heading" - top="20" + top_delta="-450" width="552"> Please read the following message carefully. </text> diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index 24fff6d4ae..1d67123726 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -32,15 +32,7 @@ </floater.string> <floater.string name="VoiceInviteGroup"> - just joined '[GROUP]' voice channel. - </floater.string> - <floater.string - name="VoiceInviteQuestionGroup"> - Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'? - </floater.string> - <floater.string - name="VoiceInviteQuestionDefault"> - Do you want to leave [CURRENT_CHAT] and join this voice chat? + has joined a Voice Chat call with the group [GROUP]. </floater.string> <avatar_icon enabled="false" diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 0b9ae3c9f3..06c766f744 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -99,7 +99,7 @@ name="allowed_label" top="366" left="10" - width="365"> + width="290"> Allowed land holdings at current payment plan: </text> <text @@ -110,7 +110,7 @@ layout="topleft" name="allowed_text" top="366" - left="380" + left="305" width="290"> [AREA] m² </text> @@ -123,7 +123,7 @@ top="386" left="10" name="current_label" - width="365"> + width="290"> Current land holdings: </text> <text @@ -133,7 +133,7 @@ height="16" layout="topleft" top="386" - left="380" + left="305" name="current_text" width="290"> [AREA] m² @@ -148,7 +148,7 @@ top="406" left="10" name="available_label" - width="365"> + width="290"> Available for land purchases: </text> <text @@ -160,7 +160,7 @@ layout="topleft" name="available_text" top="406" - left="380" + left="305" width="290"> [AREA] m² </text> diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index c02d607586..70dac7e41c 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -182,7 +182,7 @@ </button> </layout_panel> <layout_panel - height="40" + height="20" layout="topleft" left_delta="0" name="external_controls" @@ -190,7 +190,7 @@ user_resize="false" width="540"> <web_browser - bottom="-30" + bottom="-10" follows="left|right|top|bottom" layout="topleft" left="0" @@ -206,9 +206,9 @@ name="open_browser" top_pad="5" width="185"> - <button.commit_callback - function="MediaBrowser.OpenWebBrowser" /> - </button> + <button.commit_callback + function="MediaBrowser.OpenWebBrowser" /> + </button> <check_box control_name="UseExternalBrowser" follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 6f29255a6b..8e2c57764b 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -4,6 +4,7 @@ can_dock="true" can_minimize="true" can_close="false" + center_horiz="true" follows="bottom" height="110" layout="topleft" @@ -12,7 +13,7 @@ save_rect="true" save_visibility="true" save_dock_state="true" - width="133"> + width="115"> <string name="walk_forward_tooltip"> Walk Forward (press Up Arrow or W) @@ -22,14 +23,6 @@ Walk Backwards (press Down Arrow or S) </string> <string - name="walk_left_tooltip"> - Walk left (press Shift + Left Arrow or A) - </string> - <string - name="walk_right_tooltip"> - Walk right (press Shift + Right Arrow or D) - </string> - <string name="run_forward_tooltip"> Run Forward (press Up Arrow or W) </string> @@ -38,14 +31,6 @@ Run Backwards (press Down Arrow or S) </string> <string - name="run_left_tooltip"> - Run left (press Shift + Left Arrow or A) - </string> - <string - name="run_right_tooltip"> - Run right (press Shift + Right Arrow or D) - </string> - <string name="fly_forward_tooltip"> Fly Forward (press Up Arrow or W) </string> @@ -54,30 +39,6 @@ Fly Backwards (press Down Arrow or S) </string> <string - name="fly_left_tooltip"> - Fly left (press Shift + Left Arrow or A) - </string> - <string - name="fly_right_tooltip"> - Fly right (press Shift + Right Arrow or D) - </string> - <string - name="fly_up_tooltip"> - Fly up (press E) - </string> - <string - name="fly_down_tooltip"> - Fly down (press C) - </string> - <string - name="jump_tooltip"> - Jump (press E) - </string> - <string - name="crouch_tooltip"> - Crouch (press C) - </string> - <string name="walk_title"> Walk </string> @@ -98,82 +59,76 @@ mouse_opaque="false" name="panel_actions" top="0" - width="133"> - <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad--> - <!-- Left column --> + width="115"> <button follows="left|bottom" - height="24" + height="25" image_selected="Movement_TurnLeft_On" image_pressed_selected="Movement_TurnLeft_On" image_unselected="Movement_TurnLeft_Off" layout="topleft" - left="30" + left="17" name="turn left btn" scale_image="false" tool_tip="Turn left (press Left Arrow or A)" - top="34" - width="24" /> - <joystick_slide - follows="left|bottom" - height="10" - image_selected="Movement_Left_On" - image_pressed_selected="Movement_Left_On" - image_unselected="Movement_Left_Off" - layout="topleft" - left_delta="4" - name="move left btn" - quadrant="left" - scale_image="false" - tool_tip="Walk left (press Shift + Left Arrow or A)" - top_pad="10" - width="19" /> - <!-- Right column --> + top="45" + width="25" /> <button follows="left|bottom" - height="24" + height="25" image_selected="Movement_TurnRight_On" image_pressed_selected="Movement_TurnRight_On" image_unselected="Movement_TurnRight_Off" layout="topleft" - right="-30" + left_pad="34" name="turn right btn" scale_image="false" tool_tip="Turn right (press Right Arrow or D)" - top="34" - width="24" /> - <joystick_slide + top_delta="0" + width="25" /> + <button + follows="left|bottom" + height="25" + image_selected="Movement_Up_On" + image_pressed_selected="Movement_Up_On" + image_unselected="Movement_Up_Off" + layout="topleft" + left="10" + name="move up btn" + scale_image="false" + tool_tip="Fly up, press E" + top="14" + width="25" /> + <button follows="left|bottom" - height="10" - image_selected="Movement_Right_On" - image_pressed_selected="Movement_Right_On" - image_unselected="Movement_Right_Off" + height="25" + image_selected="Movement_Down_On" + image_pressed_selected="Movement_Down_On" + image_unselected="Movement_Down_Off" layout="topleft" - name="move right btn" - quadrant="right" - right_delta="4" + left_pad="45" + name="move down btn" scale_image="false" - tool_tip="Walk right (press Shift + Right Arrow or D)" - top_pad="10" - width="19" /> - <!-- Middle column --> + tool_tip="Fly down, press C" + top_delta="0" + width="20" /> <joystick_turn follows="left|bottom" - height="24" + height="25" image_selected="Movement_Forward_On" image_pressed_selected="Movement_Forward_On" image_unselected="Movement_Forward_Off" layout="topleft" - left="54" + left="46" name="forward btn" quadrant="up" scale_image="false" tool_tip="Walk forward (press up arrow or W)" - top="20" - width="24" /> + top_delta="10" + width="21" /> <joystick_turn follows="left|bottom" - height="24" + height="25" image_selected="Movement_Backward_On" image_pressed_selected="Movement_Backward_On" image_unselected="Movement_Backward_Off" @@ -183,35 +138,8 @@ quadrant="down" scale_image="false" tool_tip="Walk backward (press down arrow or S)" - top_pad="5" - width="24" /> - <!-- Fly up/down (jump/crouch) buttons --> - <button - follows="left|bottom" - height="19" - image_selected="Movement_Up_On" - image_pressed_selected="Movement_Up_On" - image_unselected="Movement_Up_Off" - layout="topleft" - right="-11" - name="move up btn" - scale_image="false" - tool_tip="Fly up (press E)" - top="22" - width="10" /> - <button - follows="left|bottom" - height="19" - image_selected="Movement_Down_On" - image_pressed_selected="Movement_Down_On" - image_unselected="Movement_Down_Off" - layout="topleft" - right_delta="0" - name="move down btn" - scale_image="false" - tool_tip="Fly down (press C)" - top_pad="10" - width="10" /> + top_delta="30" + width="21" /> </panel> <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml --> <panel @@ -221,7 +149,7 @@ left="0" name="panel_modes" top_pad="0" - width="133"> + width="115"> <button follows="left|bottom" height="23" @@ -230,7 +158,7 @@ label="" layout="topleft" name="mode_walk_btn" - left="20" + left="10" pad_right="0" tool_tip="Walking mode" top="2" 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 ec097a8e87..28616d503b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,6 +1,8 @@ <?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" @@ -24,20 +26,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_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 691472633e..3dc546aee3 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -39,6 +39,28 @@ name="Title"> Gesture: [NAME] </floater.string> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + name="name_text" + top="20" + font.style="BOLD" + width="100"> + Name: + </text> + <line_editor + follows="left|top" + height="20" + layout="topleft" + left_delta="84" + name="name" + top_delta="-4" + width="180" /> <text type="string" length="1" @@ -48,7 +70,7 @@ layout="topleft" left="10" name="desc_label" - top_pad="25" + top_pad="10" font.style="BOLD" width="100"> Description: @@ -57,10 +79,10 @@ follows="left|top" height="20" layout="topleft" - left_delta="89" + left_delta="84" name="desc" top_delta="-4" - width="175" /> + width="180" /> <text type="string" length="1" @@ -79,11 +101,11 @@ follows="left|top" height="20" layout="topleft" - left_delta="89" + left_delta="84" max_length="31" name="trigger_editor" top_delta="-4" - width="175" /> + width="180" /> <text type="string" length="1" @@ -103,12 +125,12 @@ follows="left|top" height="20" layout="topleft" - left_delta="89" + left_delta="84" max_length="31" name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" top_delta="-4" - width="175" /> + width="180" /> <text type="string" length="1" @@ -127,7 +149,7 @@ height="20" label="None" layout="topleft" - left_delta="89" + left_delta="84" name="modifier_combo" top_delta="-4" width="75" /> @@ -149,7 +171,7 @@ left="10" font.style="BOLD" name="library_label" - top_delta="25" + top="135" width="100"> Library: </text> @@ -159,19 +181,15 @@ layout="topleft" left="10" name="library_list" - top_delta="15" + top="150" width="180"> <scroll_list.rows - name="action_animation" value="Animation" /> <scroll_list.rows - name="action_sound" value="Sound" /> <scroll_list.rows - name="action_chat" value="Chat" /> <scroll_list.rows - name="action_wait" value="Wait" /> </scroll_list> <button @@ -181,7 +199,7 @@ layout="topleft" left_pad="10" name="add_btn" - top_delta="-1" + top_delta="0" width="70" /> <text type="string" @@ -212,7 +230,7 @@ layout="topleft" left_pad="10" name="up_btn" - top_delta="-1" + top_delta="0" width="70" /> <button follows="top|left" @@ -238,25 +256,23 @@ layout="topleft" left="15" name="options_text" - top="315" - width="205"> - (options) - </text> + top="330" + width="205" /> <combo_box follows="top|left" height="20" layout="topleft" left_delta="15" name="animation_list" - top="330" - width="100"/> + top="345" + width="100" /> <combo_box follows="top|left" height="20" layout="topleft" left_delta="0" name="sound_list" - top="330" + top_delta="0" width="100" /> <line_editor follows="top|left" @@ -265,7 +281,7 @@ left_delta="0" max_length="127" name="chat_editor" - top="330" + top_delta="0" width="100" /> <radio_group draw_border="false" @@ -274,7 +290,7 @@ layout="topleft" left_pad="8" name="animation_trigger_type" - top="330" + top_delta="0" width="80"> <radio_item height="16" @@ -282,7 +298,7 @@ layout="topleft" left="3" name="start" - top_delta="45" + top="-11" width="80" /> <radio_item height="16" @@ -290,7 +306,7 @@ layout="topleft" left_delta="0" name="stop" - top_pad="3" + top_pad="10" width="80" /> </radio_group> <check_box @@ -298,27 +314,27 @@ height="20" label="until animations are done" layout="topleft" - left="28" + left="16" name="wait_anim_check" - top="330" + top="340" width="100" /> <check_box follows="top|left" height="20" - label="time in seconds:" + label="time in seconds" layout="topleft" left_delta="0" name="wait_time_check" top_delta="20" - width="115" /> + width="100" /> <line_editor follows="top|left" height="20" layout="topleft" - left_pad="10" + left_pad="5" max_length="15" name="wait_time_editor" - top_delta="1" + top_delta="0" width="50" /> <text type="string" 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 6ce9ed6e77..3225843d09 100644 --- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -5,6 +5,7 @@ height="200" layout="topleft" name="publish_classified" + help_topic="price_for_listing" title="Publishing Classified" width="320"> <text @@ -25,12 +26,11 @@ Remember, Classified fees are non-refundable. <spinner decimal_digits="0" follows="left|top" - font="SansSerif" halign="left" height="23" increment="1" - label_width="50" - label="Price: L$ " + label_width="70" + label="Price for Ad: " v_pad="10" layout="topleft" left="15" @@ -41,6 +41,27 @@ 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_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 32fb6f97e7..262bcd07a0 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -7,7 +7,7 @@ name="regioninfo" save_rect="true" title="REGION/ESTATE" - width="530"> + width="480"> <tab_container bottom="555" follows="left|right|top|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 49b3b58113..9ca18d455b 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -9,7 +9,6 @@ name="floater_search" help_topic="floater_search" save_rect="true" - save_visibility="true" single_instance="true" title="FIND" width="650"> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 452b2ac664..7dcf2aab99 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,399 +1,127 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - can_minimize="false" - can_close="true" + can_minimize="true" + can_close="false" follows="left|top" - height="516" + height="340" layout="topleft" name="Snapshot" help_topic="snapshot" save_rect="true" save_visibility="true" - title="SNAPSHOT PREVIEW" - width="215"> - <floater.string - name="share_to_web_url" translate="false"> -http://pdp36.lindenlab.com:12777/ - </floater.string> - <floater.string - name="unknown"> - unknown - </floater.string> - <radio_group - height="58" - label="Snapshot type" - layout="topleft" - left="10" - name="snapshot_type_radio" - top="25" - width="205"> - <radio_item - bottom="19" - height="16" - label="Email" - layout="topleft" - name="postcard" /> - <radio_item - bottom="38" - height="16" - label="My inventory (L$[AMOUNT])" - layout="topleft" - name="texture" /> - <radio_item - bottom="57" - height="16" - label="Save to my computer" - layout="topleft" - name="local" /> - </radio_group> - <ui_ctrl - height="90" - width="125" + can_dock="true" + title="Snapshot" + width="250"> + <floater.string + name="unknown"> + unknown + </floater.string> + <floater.string + name="share_to_web_url" translate="false"> + http://pdp36.lindenlab.com:12777/ + </floater.string> + <view + height="160" + width="230" layout="topleft" name="thumbnail_placeholder" - top_pad="6" + top_pad="30" follows="left|top" left="10" /> - <text - type="string" - font="SansSerifSmall" - length="1" - follows="left|top" - height="14" - layout="topleft" - right="-5" - left_delta="0" - halign="right" - name="file_size_label" - top_pad="10" - width="195"> - [SIZE] KB - </text> - <button - follows="left|top" + <button + follows="left|top" + height="22" + image_overlay="Refresh_Off" + layout="topleft" + left="20" + top_pad="-30" + name="new_snapshot_btn" + width="23" /> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + max_length="500" + name="description" + top_pad="15" + width="230" + label="Description"/> + <button + label="Share Snapshot" + name="share" + top_pad="20" + left="10" + width="130"/> + <button + label="Share to Web" + name="share_to_web" + top_delta="0" + left="10" + width="130"/> + <button + label="Save to My Inventory" + name="save_to_inventory" + top_delta="0" + left="10" + width="130"/> + <button + label="Save Snapshot" + name="save" + top_pad="7" + left="10" + width="130"/> + <button + label="Email Snapshot" + name="share_to_email" + top_delta="0" + left="10" + width="130"/> + <button + label="Save to My Computer" + name="save_to_computer" + top_delta="0" + left="10" + width="130"/> + <button + label="Set As Profile Pic" + name="set_profile_pic" + top_pad="7" + left="10" + width="130"/> + <button + label="Back" + name="cancel" + top_delta="0" + left="10" + width="130"/> + <button + follows="left" height="22" - image_overlay="Refresh_Off" - layout="topleft" - left="10" - name="new_snapshot_btn" - width="23" /> - <button - follows="left|top" - height="23" - label="Send" - layout="topleft" - left_pad="5" - right="-5" - name="send_btn" - width="100" /> - <button - follows="left|top" - height="23" - label="Save (L$[AMOUNT])" - layout="topleft" - right="-5" - name="upload_btn" - top_delta="0" - width="100" /> - <flyout_button - follows="left|top" - height="23" - label="Save" - layout="topleft" - right="-5" - name="save_btn" - tool_tip="Save image to a file" - top_delta="0" - width="100"> - <flyout_button.item - label="Save" - name="save_item" - value="save" /> - <flyout_button.item - label="Save As..." - name="saveas_item" - value="save as" /> - </flyout_button> - <button - follows="left|top" - height="23" - label="More" - layout="topleft" - left="10" - name="more_btn" - tool_tip="Advanced options" - width="80" /> - <button - follows="left|top" - height="23" - label="Less" - layout="topleft" - left_delta="0" - name="less_btn" - tool_tip="Advanced options" - top_delta="0" - width="80" /> - <button - follows="left|top" - height="23" - label="Cancel" - layout="topleft" - right="-5" - left_pad="5" - name="discard_btn" - width="100" /> - <text - type="string" - length="1" - follows="top|left" - height="12" - layout="topleft" - left="10" - name="type_label2" - top_pad="5" - width="127"> - Size - </text> - <text - type="string" - length="1" - follows="top|left" - height="12" - layout="topleft" - left_pad="5" - name="format_label" - top_delta="0" - width="70"> - Format - </text> - <combo_box - height="23" - label="Resolution" - layout="topleft" - left="10" - name="postcard_size_combo" - width="120"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="640x480" - name="640x480" - value="[i640,i480]" /> - <combo_box.item - label="800x600" - name="800x600" - value="[i800,i600]" /> - <combo_box.item - label="1024x768" - name="1024x768" - value="[i1024,i768]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Resolution" layout="topleft" - left_delta="0" - name="texture_size_combo" - top_delta="0" - width="127"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="Small (128x128)" - name="Small(128x128)" - value="[i128,i128]" /> - <combo_box.item - label="Medium (256x256)" - name="Medium(256x256)" - value="[i256,i256]" /> - <combo_box.item - label="Large (512x512)" - name="Large(512x512)" - value="[i512,i512]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Resolution" - layout="topleft" - left_delta="0" - name="local_size_combo" - top_delta="0" - width="127"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="320x240" - name="320x240" - value="[i320,i240]" /> - <combo_box.item - label="640x480" - name="640x480" - value="[i640,i480]" /> - <combo_box.item - label="800x600" - name="800x600" - value="[i800,i600]" /> - <combo_box.item - label="1024x768" - name="1024x768" - value="[i1024,i768]" /> - <combo_box.item - label="1280x1024" - name="1280x1024" - value="[i1280,i1024]" /> - <combo_box.item - label="1600x1200" - name="1600x1200" - value="[i1600,i1200]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Format" - layout="topleft" - left_pad="5" - name="local_format_combo" - width="70"> - <combo_box.item - label="PNG" - name="PNG" /> - <combo_box.item - label="JPEG" - name="JPEG" /> - <combo_box.item - label="BMP" - name="BMP" /> - </combo_box> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Width" - label_width="40" - layout="topleft" - left="10" - max_val="6016" - min_val="32" - name="snapshot_width" - top_pad="10" - width="95" /> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Height" - label_width="40" + left="210" + name="show_advanced" + image_overlay="TabIcon_Close_Off" + top_delta="1" + width="30"/> + <button + follows="left" + height="22" layout="topleft" - left_pad="5" - max_val="6016" - min_val="32" - name="snapshot_height" + left="210" + visible="false" + name="hide_advanced" + image_overlay="TabIcon_Open_Off" top_delta="0" - width="95" /> - <check_box - bottom_delta="20" - label="Constrain proportions" - layout="topleft" - left="10" - name="keep_aspect_check" /> - <slider - decimal_digits="0" - follows="left|top" - height="15" - increment="1" - initial_value="75" - label="Image quality" - label_width="100" - layout="topleft" - left_delta="0" - max_val="100" - name="image_quality_slider" - top_pad="5" - width="205" /> - <text - type="string" - length="1" - follows="left|top" - height="13" - layout="topleft" - left="10" - name="layer_type_label" - top_pad="5" - width="50"> - Capture: - </text> - <combo_box - height="23" - label="Image Layers" - layout="topleft" - left="30" - name="layer_types" - width="145"> - <combo_box.item - label="Colors" - name="Colors" - value="colors" /> - <combo_box.item - label="Depth" - name="Depth" - value="depth" /> - </combo_box> - <check_box - label="Interface" - layout="topleft" - left="30" - top_pad="10" - width="180" - name="ui_check" /> - <check_box - label="HUDs" - layout="topleft" - left="30" - top_pad="10" - width="180" - name="hud_check" /> - <check_box - label="Keep open after saving" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="keep_open_check" /> - <check_box - label="Freeze frame (fullscreen)" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="freeze_frame_check" /> - <check_box - label="Auto-refresh" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="auto_snapshot_check" /> + width="30"/> + <panel + visible="false" + left="250" + top="17" + name="snapshot_advanced" + filename="panel_snapshot_advanced.xml"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index b87cb9a433..f9dacf0207 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -361,7 +361,8 @@ <stat_view name="physicsdetail" label="Physics Details" - show_label="true"> + show_label="true" + display_children="false"> <stat_bar name="physicspinnedtasks" label="Pinned Objects" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index fb583114c0..80cb2723a0 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -49,10 +49,13 @@ name="test_menu_bar" top="16"> <menu + height="16" label="Menu" layout="topleft" tear_off="true" + left="0" name="Menu" + top="-32" width="128"> <!-- menu_item_call will trigger a function call in the C++ code --> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml deleted file mode 100644 index 9bf9cc6c77..0000000000 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="27" - can_resize="true" - height="500" - name="voice_effects" - help_topic="voice_effects" - title="VOICE MORPHING" - background_visible="true" - follows="all" - label="Places" - layout="topleft" - min_height="360" - min_width="200" - width="300"> - <string name="no_voice_effect"> - (No Voice Morph) - </string> - <string name="active_voice_effect"> - (Active) - </string> - <string name="unsubscribed_voice_effect"> - (Unsubscribed) - </string> - <string name="new_voice_effect"> - (New!) - </string> - <text - height="16" - word_wrap="true" - use_ellipses="true" - type="string" - follows="left|top|right" - layout="topleft" - font="SansSerifBold" - color="White" - left="10" - name="preview_text" - right="-10" - top="27">To Preview - </text> - <text - height="23" - word_wrap="true" - use_ellipses="true" - type="string" - follows="left|top|right" - layout="topleft" - left="10" - name="status_text" - right="-5" - top_pad="0"> -Record a sample, then click on a voice to hear how it will sound. - </text> - <button - follows="left|top" - height="23" - label="Record" - layout="topleft" - left="10" - name="record_btn" - tool_tip="Record a sample of your voice." - top_pad="5" - width="100"> - <button.commit_callback - function="VoiceEffect.Record" /> - </button> - <button - follows="left|top" - height="23" - label="Stop" - layout="topleft" - left_delta="0" - name="record_stop_btn" - top_delta="0" - width="100"> - <button.commit_callback - function="VoiceEffect.Stop" /> - </button> - <text - height="23" - halign="right" - use_ellipses="true" - type="string" - follows="left|top|right" - layout="topleft" - left_pad="10" - top_delta="10" - name="voice_morphing_link" - right="-10"> - [[URL] Subscribe Now] - </text> - <scroll_list - bottom="-10" - draw_heading="true" - follows="all" - layout="topleft" - left="10" - multi_select="false" - name="voice_effect_list" - right="-10" - tool_tip="Record a sample of your voice, then click an effect to preview." - top="95"> - <scroll_list.columns - label="Voice Name" - name="name" - relative_width="0.60" /> - <scroll_list.columns - dynamic_width="true" - label="Expires" - name="expires" - relative_width="0.30" /> - </scroll_list> - -</floater> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index bcdb63228d..37ae5a64d7 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -79,7 +79,7 @@ L$123 to join height="23" label="Join" left="8" - top="125" + top="286" name="join_btn" width="103" commit_callback.function="InspectGroup.Join"/> @@ -88,7 +88,7 @@ L$123 to join height="23" label="Leave" left="8" - top="125" + top="286" name="leave_btn" width="103" commit_callback.function="InspectGroup.Leave"/> @@ -97,7 +97,7 @@ L$123 to join height="23" label="View Profile" name="view_profile_btn" - top="125" + top="286" left="117" width="103" commit_callback.function="InspectGroup.ViewProfile" /> diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index c8a06fe401..c523185034 100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -23,7 +23,6 @@ datetimeToCodes["month"] = "%B"; // August datetimeToCodes["mthnum"] = "%m"; // 08 datetimeToCodes["day"] = "%d"; // 31 - datetimeToCodes["sday"] = "%-d"; // 9 datetimeToCodes["hour24"] = "%H"; // 14 datetimeToCodes["hour"] = "%H"; // 14 datetimeToCodes["hour12"] = "%I"; // 02 diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 5beafef4e4..7ef91a1d85 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -52,50 +52,6 @@ function="CheckControl" parameter="ShowSnapshotButton" /> </menu_item_check> - <menu_item_check - label="Build button" - layout="topleft" - name="ShowBuildButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBuildButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowBuildButton" /> - </menu_item_check> - <menu_item_check - label="Search button" - layout="topleft" - name="ShowSearchButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowSearchButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowSearchButton" /> - </menu_item_check> - <menu_item_check - label="Map button" - layout="topleft" - name="ShowWorldMapButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowWorldMapButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowWorldMapButton" /> - </menu_item_check> - <menu_item_check - label="Mini-Map button" - layout="topleft" - name="ShowMiniMapButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowMiniMapButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowMiniMapButton" /> - </menu_item_check> <menu_item_separator name="Separator" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml deleted file mode 100644 index c402100fb1..0000000000 --- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - layout="topleft" - name="COF Attachment"> - <menu_item_call - label="Detach" - layout="topleft" - name="detach"> - <on_click - function="Attachment.Detach" - parameter="detach"/> - </menu_item_call> -</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml deleted file mode 100644 index f0e8461360..0000000000 --- a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - layout="topleft" - name="COF Body"> - <menu_item_call - label="Replace" - layout="topleft" - name="replace"> - <on_click - function="BodyPart.Replace"/> - </menu_item_call> - <menu_item_call - label="Edit" - layout="topleft" - name="edit"> - <on_click - function="BodyPart.Edit"/> - <on_enable - function="BodyPart.OnEnable" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Create New" - layout="topleft" - name="create_new" - translate="false"> - <on_click - function="BodyPart.Create"/> - <on_enable - function="BodyPart.OnEnable" - parameter="create" /> - </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 deleted file mode 100644 index 206d49e8c7..0000000000 --- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - layout="topleft" - name="COF Clothing"> - <menu_item_call - label="Take Off" - layout="topleft" - name="take_off"> - <on_click - function="Clothing.TakeOff" /> - <on_enable - function="Clothing.OnEnable" - parameter="take_off" /> - </menu_item_call> - <menu_item_call - label="Edit" - layout="topleft" - name="edit"> - <on_click - function="Clothing.Edit" /> - <on_enable - function="Clothing.OnEnable" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Replace" - layout="topleft" - name="replace"> - <on_click - function="Clothing.Replace" /> - <on_enable - function="Clothing.OnEnable" - parameter="replace" /> - </menu_item_call> - <menu_item_call - label="Create New" - layout="topleft" - name="create_new" - translate="false"> - <on_click - function="Clothing.Create"/> - <on_enable - function="Clothing.OnEnable" - parameter="create" /> - </menu_item_call> -</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml deleted file mode 100644 index c2a11a64ec..0000000000 --- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu - layout="topleft" - name="Gear COF"> - <menu - label="New Clothes" - layout="topleft" - name="COF.Gear.New_Clothes" /> - <menu - label="New Body Parts" - layout="topleft" - name="COF.Geear.New_Body_Parts" /> -</menu> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index 3f38d734b9..a175b3103f 100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -12,10 +12,10 @@ label="Show Navigation Bar" layout="topleft" name="ShowNavbarNavigationPanel"> - <on_click + <menu_item_check.on_click function="ToggleControl" parameter="ShowNavbarNavigationPanel" /> - <on_check + <menu_item_check.on_check function="CheckControl" parameter="ShowNavbarNavigationPanel" /> </menu_item_check> @@ -23,22 +23,11 @@ label="Show Favorites Bar" layout="topleft" name="ShowNavbarFavoritesPanel"> - <on_click + <menu_item_check.on_click function="ToggleControl" parameter="ShowNavbarFavoritesPanel" /> - <on_check + <menu_item_check.on_check function="CheckControl" parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> - <menu_item_check - label="Show Mini-Location Bar" - layout="topleft" - name="ShowMiniLocationPanel"> - <on_click - function="ToggleControl" - parameter="ShowMiniLocationPanel" /> - <on_check - function="CheckControl" - parameter="ShowMiniLocationPanel" /> - </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml index 8ec7689819..22df02cd7e 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml @@ -22,7 +22,7 @@ <menu_item_call.on_click function="InspectObject.Sit"/> <menu_item_call.on_visible - function="Object.EnableSit"/> + function="Object.EnableSit" /> </menu_item_call> <menu_item_call label="Pay" diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index ae98abf4fb..5ad099e2d9 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -50,13 +50,8 @@ function="File.UploadBulk" parameter="" /> </menu_item_call> - <menu_item_call - label="Set Default Upload Permissions" - name="perm prefs"> - <menu_item_call.on_click - function="Floater.Toggle" - parameter="perm_prefs" /> - </menu_item_call> + <menu_item_separator + layout="topleft" /> </menu> <menu_item_call 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 c394700081..4e6a07d020 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 @@ -61,6 +61,14 @@ <menu_item_separator layout="topleft" /> <menu_item_call + label="Empty Trash" + layout="topleft" + name="empty_trash"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="empty_trash" /> + </menu_item_call> + <menu_item_call label="Empty Lost and Found" layout="topleft" name="empty_lostnfound"> @@ -81,17 +89,6 @@ 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" @@ -114,15 +111,4 @@ function="Inventory.GearDefault.Enable" parameter="find_links" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - - <menu_item_call - label="Empty Trash" - layout="topleft" - name="empty_trash"> - <on_click - function="Inventory.GearDefault.Custom.Action" - parameter="empty_trash" /> - </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml deleted file mode 100644 index 732b8a788d..0000000000 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ /dev/null @@ -1,215 +0,0 @@ -<?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" - layout="topleft" - name="wear"> - <on_click - function="Gear.Wear" /> - <on_enable - function="Gear.OnEnable" - parameter="wear" /> - <on_visible - function="Gear.OnVisible" - 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"> - <on_click - function="Gear.TakeOff" /> - <on_enable - function="Gear.OnEnable" - parameter="take_off" /> - <on_visible - function="Gear.OnVisible" - parameter="take_off" /> - </menu_item_call> - - <menu_item_separator name="sepatator1" /> - <!-- copied (with minor modifications) from menu_inventory_add.xml --> - <!-- *TODO: generate dynamically? --> - <menu - height="175" - label="New Clothes" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="New Clothes" - top_pad="514" - width="125"> - <menu_item_call - label="New Shirt" - layout="topleft" - name="New Shirt"> - <menu_item_call.on_click - function="Gear.Create" - parameter="shirt" /> - </menu_item_call> - <menu_item_call - label="New Pants" - layout="topleft" - name="New Pants"> - <menu_item_call.on_click - function="Gear.Create" - parameter="pants" /> - </menu_item_call> - <menu_item_call - label="New Shoes" - layout="topleft" - name="New Shoes"> - <menu_item_call.on_click - function="Gear.Create" - parameter="shoes" /> - </menu_item_call> - <menu_item_call - label="New Socks" - layout="topleft" - name="New Socks"> - <menu_item_call.on_click - function="Gear.Create" - parameter="socks" /> - </menu_item_call> - <menu_item_call - label="New Jacket" - layout="topleft" - name="New Jacket"> - <menu_item_call.on_click - function="Gear.Create" - parameter="jacket" /> - </menu_item_call> - <menu_item_call - label="New Skirt" - layout="topleft" - name="New Skirt"> - <menu_item_call.on_click - function="Gear.Create" - parameter="skirt" /> - </menu_item_call> - <menu_item_call - label="New Gloves" - layout="topleft" - name="New Gloves"> - <menu_item_call.on_click - function="Gear.Create" - parameter="gloves" /> - </menu_item_call> - <menu_item_call - label="New Undershirt" - layout="topleft" - name="New Undershirt"> - <menu_item_call.on_click - function="Gear.Create" - parameter="undershirt" /> - </menu_item_call> - <menu_item_call - label="New Underpants" - layout="topleft" - name="New Underpants"> - <menu_item_call.on_click - function="Gear.Create" - parameter="underpants" /> - </menu_item_call> - <menu_item_call - label="New Alpha" - layout="topleft" - name="New Alpha"> - <menu_item_call.on_click - function="Gear.Create" - parameter="alpha" /> - </menu_item_call> - <menu_item_call - label="New Tattoo" - layout="topleft" - name="New Tattoo"> - <menu_item_call.on_click - function="Gear.Create" - parameter="tattoo" /> - </menu_item_call> - </menu> - <menu - height="85" - label="New Body Parts" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="New Body Parts" - top_pad="514" - width="118"> - <menu_item_call - label="New Shape" - layout="topleft" - name="New Shape"> - <menu_item_call.on_click - function="Gear.Create" - parameter="shape" /> - </menu_item_call> - <menu_item_call - label="New Skin" - layout="topleft" - name="New Skin"> - <menu_item_call.on_click - function="Gear.Create" - parameter="skin" /> - </menu_item_call> - <menu_item_call - label="New Hair" - layout="topleft" - name="New Hair"> - <menu_item_call.on_click - function="Gear.Create" - parameter="hair" /> - </menu_item_call> - <menu_item_call - label="New Eyes" - layout="topleft" - name="New Eyes"> - <menu_item_call.on_click - function="Gear.Create" - parameter="eyes" /> - </menu_item_call> - </menu> - <!-- copied from menu_inventory_add.xml --> - - <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"> - <on_click - function="Gear.Delete" /> - <on_enable - function="Gear.OnEnable" - parameter="delete" /> - <on_visible - function="Gear.OnVisible" - parameter="delete" /> - </menu_item_call> -</menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml deleted file mode 100644 index 8c8bb29baf..0000000000 --- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - layout="topleft" - name="Outfit"> - <menu_item_call - label="Wear - Replace Current Outfit" - layout="topleft" - name="wear_replace"> - <on_click - function="Outfit.WearReplace" /> - <on_enable - function="Outfit.OnEnable" - parameter="wear_replace" /> - <on_visible - function="Outfit.OnVisible" - parameter="wear_replace" /> - </menu_item_call> - <menu_item_call - label="Wear - Add to Current Outfit" - layout="topleft" - name="wear_add"> - <on_click - function="Outfit.WearAdd" /> - <on_enable - function="Outfit.OnEnable" - parameter="wear_add" /> - <on_visible - function="Outfit.OnVisible" - parameter="wear_add" /> - </menu_item_call> - <menu_item_call - label="Take Off - Remove from Current Outfit" - layout="topleft" - name="take_off"> - <on_click - function="Outfit.TakeOff" /> - <on_enable - function="Outfit.OnEnable" - parameter="take_off" /> - <on_visible - function="Outfit.OnVisible" - parameter="take_off" /> - </menu_item_call> - <menu_item_call - label="Edit Outfit" - layout="topleft" - name="edit"> - <on_click - function="Outfit.Edit" /> - <on_visible - function="Outfit.OnVisible" - parameter="edit" /> - </menu_item_call> - <menu_item_separator /> - <menu_item_call - label="Rename Outfit" - layout="topleft" - name="rename"> - <on_click - function="Outfit.Rename" /> - <on_enable - function="Outfit.OnEnable" - parameter="rename" /> - </menu_item_call> - <menu_item_call - label="Delete Outfit" - layout="topleft" - name="delete"> - <on_click - function="Outfit.Delete" /> - <on_visible - function="Outfit.OnVisible" - parameter="delete" /> - </menu_item_call> -</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml deleted file mode 100644 index cbe249ed4d..0000000000 --- a/indra/newview/skins/default/xui/en/menu_topinfobar.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu - height="201" - layout="topleft" - left="100" - mouse_opaque="false" - name="menu_topinfobar" - top="624" - visible="false" - width="128"> - <menu_item_check - label="Show Coordinates" - name="Show Coordinates"> - <on_click - function="ToggleControl" - parameter="NavBarShowCoordinates" /> - <on_check - function="CheckControl" - parameter="NavBarShowCoordinates" /> - </menu_item_check> - <menu_item_check - label="Show Parcel Properties" - name="Show Parcel Properties"> - <on_click - function="ToggleControl" - parameter="NavBarShowParcelProperties" /> - <on_check - function="CheckControl" - parameter="NavBarShowParcelProperties" /> - </menu_item_check> - <menu_item_separator - name="Separator" /> - <!-- Label of 'Landmark' item is changing in runtime, - see AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml --> - <menu_item_call - label="Landmark" - name="Landmark"> - <on_click - function="TopInfoBar.Action" - parameter="landmark" /> - </menu_item_call> - <menu_item_separator - name="Separator" /> - <menu_item_call - label="Copy" - name="Copy"> - <on_click - function="TopInfoBar.Action" - parameter="copy" /> - </menu_item_call> -</menu> 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 deleted file mode 100644 index 8af2e1eaca..0000000000 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu - name="Outfit Wearable Context Menu"> - <menu_item_call - label="Replace" - layout="topleft" - 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"> - <on_click - function="Wearable.Add" /> - </menu_item_call> - <menu_item_call - label="Take Off / Detach" - layout="topleft" - name="take_off_or_detach"> - <on_click - function="Wearable.TakeOffDetach" /> - </menu_item_call> - <menu_item_call - label="Detach" - layout="topleft" - name="detach"> - <on_click - function="Attachment.Detach" /> - </menu_item_call> - <context_menu - label="Attach to ▶" - layout="topleft" - name="wearable_attach_to" /> - <context_menu - label="Attach to HUD ▶" - layout="topleft" - name="wearable_attach_to_hud" /> - <menu_item_call - label="Take Off" - layout="topleft" - name="take_off"> - <on_click - function="Clothing.TakeOff" /> - </menu_item_call> - <menu_item_call - label="Edit" - layout="topleft" - name="edit"> - <on_click - function="Wearable.Edit" /> - </menu_item_call> - <menu_item_call - label="Item Profile" - layout="topleft" - name="object_profile"> - <on_click - function="Attachment.Profile" /> - </menu_item_call> - <menu_item_call - label="Show Original" - layout="topleft" - name="show_original"> - <on_click - function="Wearable.ShowOriginal" /> - </menu_item_call> - <menu_item_call - label="Create New" - layout="topleft" - name="create_new" - translate="false"> - <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 deleted file mode 100644 index 747352cb29..0000000000 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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 deleted file mode 100644 index 85505f9972..0000000000 --- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 1e6a31d388..d3f6695375 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -11,16 +11,14 @@ width="280"> <button follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="25" + image_overlay="BackArrow_Off" layout="topleft" name="back" - left="4" + left="10" tab_stop="false" - top="1" - width="30"/> + top="0" + width="25"/> <text follows="top|left|right" font="SansSerifLargeBold" diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index e96dbd527c..c8293d3663 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -25,7 +25,6 @@ [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] </panel.string> <texture_picker - fallback_image="default_land_picture.j2c" follows="left|top" height="300" layout="topleft" 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 e66cf400b4..e3b331799c 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -40,22 +40,21 @@ </panel.string> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="10" + picture_style="true" + left="11" tab_stop="false" top="2" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="4" + left_pad="10" name="title" text_color="LtGray" top="0" @@ -93,7 +92,6 @@ width="275" > <texture_picker - fallback_image="default_land_picture.j2c" enabled="false" follows="left|top|right" height="197" diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml deleted file mode 100644 index 75b5fd1532..0000000000 --- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="top|right|left" - height="23" - layout="topleft" - left="0" - name="deletable_wearable_item" - top="0" - width="380"> - <icon - follows="top|right|left" - height="22" - image_name="ListItem_Over" - layout="topleft" - left="0" - name="hovered_icon" - top="1" - visible="false" - width="380" /> - <icon - height="22" - follows="top|right|left" - image_name="ListItem_Select" - layout="topleft" - left="0" - name="selected_icon" - top="1" - visible="false" - width="380" /> - <button - name="btn_delete" - layout="topleft" - follows="top|left" - image_unselected="Toast_CloseBtn" - image_selected="Toast_CloseBtn" - top="3" - left="0" - height="18" - width="18" - tab_stop="false" - tool_tip="Remove from outfit"/> - <icon - height="16" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left_pad="3" - name="item_icon" - top="2" - width="16" /> - <text - follows="left|right" - height="16" - layout="topleft" - left_pad="5" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="white" - top="5" - value="..." - width="359" /> - <icon - follows="left|right|top" - height="3" - image_name="Wearables_Divider" - layout="bottomleft" - left="0" - name="wearable_type_separator_icon" - top="0" - visible="true" - width="380"/> -</panel> 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 a5c74b08e7..7383edf63d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -24,16 +24,15 @@ </string> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="10" + picture_style="true" + left="12" tab_stop="false" top="2" - width="30" /> + width="23" /> <text type="string" length="1" @@ -41,7 +40,7 @@ font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="4" + left_pad="10" name="title" text_color="LtGray" top="0" @@ -78,7 +77,6 @@ top="10" width="272"> <texture_picker - fallback_image="default_land_picture.j2c" follows="left|top|right" height="197" width="272" @@ -254,16 +252,9 @@ width="20"/> </icons_combo_box.item> </icons_combo_box> - <check_box - height="16" - label="Auto renew each week" - layout="topleft" - left="10" - name="auto_renew" - top_pad="15" - width="250" /> <text follows="left|top" + font.style="BOLD" height="10" layout="topleft" left="10" @@ -290,6 +281,14 @@ top_pad="5" tool_tip="Price for listing." width="105" /> + <check_box + height="16" + label="Auto renew each week" + layout="topleft" + left="10" + name="auto_renew" + top_pad="15" + width="250" /> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index f50e182313..08ee0306dd 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -18,16 +18,14 @@ </panel.string> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="10" + left="12" tab_stop="false" top="2" - width="30" /> + width="23" /> <text type="string" length="1" @@ -35,10 +33,10 @@ font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="4" + left_pad="10" name="title" text_color="LtGray" - top="2" + top="0" width="250"> Edit Pick </text> @@ -63,7 +61,6 @@ left="0" width="285"> <texture_picker - fallback_image="default_land_picture.j2c" follows="left|top|right" height="197" width="272" 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 5072ec3a66..dff2b9a214 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -118,7 +118,6 @@ allow_no_texture="true" default_image_name="None" enabled="false" - fallback_image="default_profile_picture.j2c" follows="top|left" height="124" layout="topleft" @@ -175,7 +174,6 @@ 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_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 18a2f37ba2..0eb5c47f85 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -50,10 +50,6 @@ Select multiple Members by holding the Ctrl key and clicking on their names. </panel.string> <panel.string - name="donation_area"> - [AREA] m² - </panel.string> - <panel.string name="power_folder_icon" translate="false"> Inv_FolderClosed </panel.string> diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index 3143b0a40c..16593751f7 100644 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml @@ -23,7 +23,7 @@ name="notifications_list" sort_ascending="false" sort_column="2" - top="0" + top="-78" user_resize="true" width="100"> <scroll_list.columns @@ -48,7 +48,7 @@ name="notification_rejects_list" sort_ascending="false" sort_column="2" - top="0" + top="-78" user_resize="true" width="100"> <scroll_list.columns diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml deleted file mode 100644 index 2fbbf6610c..0000000000 --- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?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_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index f6f1c33fe3..ecf5516390 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -12,25 +12,23 @@ width="333"> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="10" + left="12" tab_stop="false" top="2" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="4" + left_pad="10" name="title" text_color="LtGray" - top="2" + top="0" value="Pick Info" use_ellipses="true" width="275" /> @@ -55,7 +53,6 @@ left="0" width="285"> <texture_picker - fallback_image="default_land_picture.j2c" enabled="false" follows="left|top|right" height="197" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index a815cdf7f0..0093a08e15 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -38,6 +38,7 @@ bg_opaque_color="DkGray2" single_expansion="true" width="313"> <accordion_tab + can_resize="false" layout="topleft" height="235" min_height="150" @@ -55,6 +56,7 @@ 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_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index aa760edad3..e03ecd8f04 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -14,7 +14,7 @@ follows="left|top" font.style="BOLD" height="15" - increment="0.025" + increment="0.05" initial_value="0.5" label="Master volume" label_width="120" @@ -57,7 +57,7 @@ disabled_control="MuteAudio" follows="left|top" height="15" - increment="0.025" + increment="0.05" initial_value="0.5" label="Buttons" label_width="120" @@ -91,7 +91,7 @@ disabled_control="MuteAudio" follows="left|top" height="15" - increment="0.025" + increment="0.05" initial_value="0.5" label="Ambient" label_width="120" @@ -125,7 +125,7 @@ disabled_control="MuteAudio" follows="left|top" height="15" - increment="0.025" + increment="0.05" initial_value="0.5" label="Sound Effects" label_width="120" @@ -159,7 +159,7 @@ disabled_control="MuteAudio" follows="left|top" height="15" - increment="0.025" + increment="0.05" initial_value="0.5" label="Streaming music" label_width="120" @@ -202,7 +202,7 @@ disabled_control="MuteAudio" follows="left|top" height="16" - increment="0.025" + increment="0.05" initial_value="0.5" label="Media" label_width="120" @@ -247,7 +247,7 @@ disabled_control="MuteAudio" follows="left|top" height="16" - increment="0.025" + increment="0.05" initial_value="0.5" label="Voice Chat" label_width="120" @@ -408,14 +408,6 @@ name="default_text"> Default </panel.string> - <panel.string - name="default system device"> - Default system device - </panel.string> - <panel.string - name="no device"> - No device - </panel.string> <icon height="18" image_name="Microphone_On" @@ -462,7 +454,7 @@ control_name="AudioLevelMic" follows="left|top" height="17" - increment="0.025" + increment="0.05" initial_value="1.0" layout="topleft" left="160" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index d9030fc0d6..5a96ba2dd2 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -18,16 +18,14 @@ </string> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back" - left="10" + left="12" tab_stop="false" top="2" - width="30" /> + width="23" /> <text_editor h_pad="0" v_pad="0" @@ -38,10 +36,10 @@ font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="5" + left_pad="10" name="user_name" text_color="LtGray" - top="2" + top="0" value="(Loading...)" use_ellipses="true" width="275" /> diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml index 07642946f8..b48943c699 100644 --- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml @@ -6,27 +6,25 @@ name="panel_stand_stop_flying" mouse_opaque="false" visible="true" - width="133"> + width="115"> <button follows="left|bottom" height="19" label="Stand" layout="topleft" - left="10" name="stand_btn" tool_tip="Click here to stand up." top="2" visible="false" - width="113" /> + width="115" /> <button follows="left|bottom" height="19" label="Stop Flying" layout="topleft" - left="10" name="stop_fly_btn" tool_tip="Stop flying" top="2" visible="false" - width="113" /> + width="115" /> </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 deleted file mode 100644 index d8f4297e0c..0000000000 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<panel - background_visible="true" - background_opaque="false" - bg_opaque_color="Black_50" - bg_alpha_color="Black_50" - follows="left|top|right" - height="19" - layout="topleft" - name="topinfo_bar" - width="1024"> - <button - follows="left|top" - height="16" - hover_glow_amount="0.15" - image_disabled="Info_Off" - image_disabled_selected="Info_Off" - image_selected="Info_Off" - image_unselected="Info_Off" - left="11" - name="place_info_btn" - top="1" - width="16"/> - <text - follows="left|top|right" - font="DejaVu" - height="16" - layout="topleft" - left_pad="11" - length="1" - name="parcel_info_text" - top="1" - type="string" - width="1"/> - <icon - enabled="true" - follows="right|top" - height="18" - image_name="Parcel_VoiceNo_Light" - name="voice_icon" - top="1" - visible="false" - width="22" - /> - <icon - follows="right|top" - height="18" - image_name="Parcel_FlyNo_Light" - name="fly_icon" - top="1" - visible="false" - width="22" - /> - <icon - follows="right|top" - height="18" - image_name="Parcel_PushNo_Light" - name="push_icon" - top="1" - visible="false" - width="22" - /> - <icon - follows="right|top" - height="18" - image_name="Parcel_BuildNo_Light" - name="build_icon" - top="1" - visible="false" - width="22" - /> - <icon - follows="right|top" - height="18" - image_name="Parcel_ScriptsNo_Light" - name="scripts_icon" - top="1" - visible="false" - width="22" - /> - <icon - follows="right|top" - height="13" - image_name="Parcel_Health_Dark" - left="2" - name="damage_icon" - top="3" - visible="false" - width="14" - /> - <text - follows="right|top" - font="SansSerifSmall" - halign="right" - height="18" - name="damage_text" - top="5" - visible="false" - width="35" - /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml deleted file mode 100644 index 93e79b7328..0000000000 --- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="all" - height="26" - layout="topleft" - name="panel_voice_effect" - width="200"> - <string name="no_voice_effect"> - Voice Morphing Off - </string> - <string name="preview_voice_effects"> - Preview Voice Morphing ▶ - </string> - <string name="get_voice_effects"> - Get Voice Morphing ▶ - </string> - <combo_box - enabled="false" - follows="left|top|right" - height="23" - name="voice_effect" - tool_tip="Select a Voice Morph to change your voice" - top_pad="0" - width="200"> - <combo_box.item - label="Voice Morphing Off" - name="no_voice_effect" - top_pad="0" - value="0" /> - <combo_box.commit_callback - function="Voice.CommitVoiceEffect" /> - </combo_box> -</panel> 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 843015cb8b..d46783e058 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -1,9 +1,11 @@ <?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 @@ -56,16 +58,14 @@ </panel.string> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" - left="8" + left="10" name="back_btn" tab_stop="false" top="0" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHuge" @@ -85,7 +85,7 @@ left="45" name="where" text_color="LtGray_50" - value="(Inworld)" + value="(inworld)" width="150" /> <panel follows="all" @@ -217,6 +217,7 @@ 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/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml deleted file mode 100644 index 1a66f0f5c5..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/accordion.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<accordion - height="100" - name="accordion" - width="200"> - <!-- It is possible to override attributes of "no_matched_tabs_text" and "no_visible_tabs_text" with a short form: - no_matched_tabs_text.value="Overridden text" (placed among <accordion> attributes) - But unfortunatly such form is not supported by VLT Tool. It requires to have the overridden "value" - attribute declared in tags below ("no_matched_tabs_text" & "no_visible_tabs_text"). - It looks less clean but we have to use "long" form for these messages to enable automated translation with VLT. - --> - <no_matched_tabs_text - follows="all" - height="100" - h_pad="10" - name="no_matched_tabs_msg" - v_pad="15" - width="200" - wrap="true "/> - <!-- This widget will not be created in viewer. Only its value will be used for empty accordion without filter. --> - <no_visible_tabs_text - name="no_visible_tabs_msg" - visible="false"/> -</accordion> 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 6f68c99021..102dc0c16d 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="AccordionHeaderTextColor" + header_text_color="LtGray" font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml deleted file mode 100644 index c08267de82..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<bodyparts_list_item - follows="top|right|left" - height="23" - layout="topleft" - left="0" - name="wearable_item" - bottom="0" - width="380"> - <item_icon - height="16" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left="0" - name="item_icon" - top="2" - width="16" /> - <item_name - follows="left|right" - height="16" - layout="topleft" - left="21" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="white" - top="5" - value="..." - width="359" /> - <lock_panel - background_visible="false" - name="btn_lock" - layout="topleft" - follows="top|right" - top="0" - left="0" - height="23" - width="23" - tab_stop="false" - tool_tip="You don't have permission to edit"/> - <lock_icon - name="btn_lock1" - layout="topleft" - follows="top|right" - image_name="Locked_Icon" - top="2" - left="5" - height="13" - width="9" - tab_stop="false" /> - <edit_panel - background_visible="false" - name="btn_edit_panel" - layout="topleft" - follows="top|right" - top="1" - left="17" - height="23" - width="26" - tab_stop="false"/> - <edit_btn - name="btn_edit" - layout="topleft" - follows="top|right" - image_overlay="Edit_Wrench" - top="0" - left="0" - height="23" - width="23" - tab_stop="false" - tool_tip="Edit this shape"/> -</bodyparts_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 2d0a1728d5..c4f0fe5208 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -2,7 +2,6 @@ <!-- Additional attributes: image_pressed image_pressed_selected - image_flash --> <button image_unselected="PushButton_Off" image_selected="PushButton_Selected" diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml deleted file mode 100644 index f7a05e9bc4..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<clothing_list_item - follows="top|right|left" - height="23" - layout="topleft" - left="0" - name="wearable_item" - bottom="0" - width="380"> - <lock_icon - height="16" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left="21" - name="item_icon" - top="2" - width="16" /> - <item_name - follows="left|right" - height="16" - layout="topleft" - left="42" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="white" - top="5" - value="..." - width="359" /> - <up_btn - name="btn_move_up" - layout="topleft" - follows="top|right" - image_overlay="UpArrow_Off" - top="1" - left="0" - height="23" - width="23" - tab_stop="false" /> - <down_btn - name="btn_move_down" - layout="topleft" - follows="top|right" - image_overlay="DownArrow_Off" - top="1" - left="26" - height="23" - width="23" - tab_stop="false" /> - <lock_panel - background_visible="false" - name="btn_lock" - layout="topleft" - follows="top|right" - top="0" - left="0" - height="23" - width="23" - tab_stop="false" - tool_tip="You don't have permission to edit"/> - <lock_icon - name="btn_lock1" - layout="topleft" - follows="top|right" - image_name="Locked_Icon" - top="2" - left="5" - height="13" - width="9" - tab_stop="false" /> - <edit_panel - background_visible="false" - name="btn_edit_panel" - layout="topleft" - follows="top|right" - top="0" - left="26" - height="23" - width="26" - tab_stop="false"/> - <edit_btn - name="btn_edit" - layout="topleft" - follows="top|right" - image_overlay="Edit_Wrench" - top="1" - left="0" - height="23" - width="23" - tab_stop="false" - tool_tip="Edit this wearable"/> -</clothing_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index 48b987d7e8..dfd301a770 100644 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml @@ -4,6 +4,5 @@ name="color_swatch"> <color_swatch.caption_text name="caption" halign="center" - follows="left|right|bottom" - v_pad="2"/> + follows="left|right|bottom"/> </color_swatch> diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml deleted file mode 100644 index 88a4682e13..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<deletable_wearable_list_item - follows="top|right|left" - height="23" - layout="topleft" - left="0" - name="deletable_wearable_item" - bottom="0" - width="380"> - <delete_btn - name="btn_delete" - layout="topleft" - follows="top|left" - image_unselected="Toast_CloseBtn" - image_selected="Toast_CloseBtn" - top="3" - left="0" - height="18" - width="18" - tab_stop="false" - tool_tip="Remove from outfit"/> - <item_icon - height="16" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left="24" - name="item_icon" - top="2" - width="16" /> - <item_name - follows="left|right" - height="16" - layout="topleft" - left="45" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="white" - top="5" - value="..." - width="359" /> -</deletable_wearable_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml deleted file mode 100644 index 80a877a6c2..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<dummy_clothing_list_item - follows="top|right|left" - height="23" - layout="topleft" - left="0" - name="dummy_clothing_item" - bottom="0" - width="380"> - <item_icon - height="16" - color="0.75 0.75 0.75 1" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left="20" - name="item_icon" - top="2" - width="16" /> - <item_name - follows="left|right" - height="16" - layout="topleft" - left="41" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="LtGray_50" - top="4" - value="..." - width="359" /> - <add_panel - name="btn_add_panel" - layout="topleft" - follows="top|right" - top="0" - left="0" - height="23" - width="26" - tab_stop="false"/> - <add_btn - name="btn_add" - layout="topleft" - follows="top|right" - image_overlay="AddItem_Off" - top="0" - left="0" - height="23" - width="23" - tab_stop="false" - tool_tip="Add more items of this type" /> -</dummy_clothing_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml index e05ddf9815..a71b293f31 100644 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml @@ -11,6 +11,6 @@ name="no_items_msg" v_pad="10" h_pad="10" - value="No matches found" + value="There are no any items in the list" wrap="true" /> </flat_list_view>
\ No newline at end of file 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 deleted file mode 100644 index 0a5930c820..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<inventory_list_item - follows="top|right|left" - height="20" - name="inventory_item" - tab_stop="false" - hover_image="ListItem_Over" - selected_image="ListItem_Select" - separator_image="Wearables_Divider" - width="380"> - <!-- 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" /> - <item_icon - height="16" - follows="top|left" - image_name="Inv_Object" - layout="topleft" - left="0" - name="item_icon" - top="0" - width="16" /> - <item_name - follows="left|right" - height="20" - layout="topleft" - left="21" - allow_html="false" - use_ellipses="true" - name="item_name" - text_color="white" - top="4" - value="..." - width="359" /> -</inventory_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml deleted file mode 100644 index 98707b8495..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel_camera_item - background_visible="false" - height="30" - layout="topleft" - width="212"> - <panel_camera_item.icon_over - follows="top|left" - height="30" - image_name="ListItem_Over" - left="0" - mouse_opaque="false" - layout="topleft" - name="hovered_icon" - top="30" - scale_image="true" - visible="false" - width="212" /> - <panel_camera_item.icon_selected - follows="top|left" - height="30" - image_name="ListItem_Select" - layout="topleft" - left="0" - mouse_opaque="false" - name="selected_icon" - top="30" - scale_image="true" - visible="false" - width="212" /> - <panel_camera_item.picture - follows="top|left" - height="30" - image_name="Icon_For_Sale" - layout="topleft" - left="0" - mouse_opaque="false" - name="picture" - tab_stop="false" - top="30" - top_pad="10" - width="30" /> - <panel_camera_item.selected_picture - follows="top|left" - height="30" - image_name="Cam_Rotate_In" - layout="topleft" - left="0" - mouse_opaque="false" - name="selected_picture" - tab_stop="false" - top="30" - top_pad="8" - visible="false" - width="30" /> - <panel_camera_item.text - follows="top|left|right" - font="SansSerifMedium" - height="15" - layout="topleft" - left ="38" - name="picture_name" - text_color="white" - top="21" - use_ellipses="true" - width="170" - word_wrap="false" > - Text - </panel_camera_item.text> -</panel_camera_item> 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 ce84cfedc0..5d429d5b5b 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,12 +1,15 @@ <?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"> + allow_new_values="true" + background_image="TextField_Search_Off" + background_image_disabled="TextField_Search_Disabled" + background_image_focused="TextField_Search_Active"> <combo_editor name="child1" select_on_focus="true" diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index c37ead0be2..8d6b0c1cfe 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -11,12 +11,6 @@ label_pad_left - padding to the left of tab button labels tab_height="21" label_pad_bottom="2" label_pad_left="4"> - <!-- - Possible additional attributes for tabs: - tab_bottom_image_flash - tab_left_image_flash - tab_top_image_flash - --> <first_tab tab_top_image_unselected="TabTop_Left_Off" tab_top_image_selected="TabTop_Left_Selected" tab_bottom_image_unselected="Toolbar_Left_Off" diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index b2da2147c1..f4dc192bc3 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,5 +1,3 @@ <?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/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml index 757f0f49d1..33c3475eb2 100644 --- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml +++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml @@ -3,8 +3,7 @@ <multiselect_text font="SansSerifSmall"/> <caption_text text="Multiple" halign="center" - font="SansSerifSmall" - v_pad="2"/> + font="SansSerifSmall"/> <border bevel_style="in"/> </texture_picker> diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml index 54ef34264c..089ff3cd68 100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml @@ -3,46 +3,41 @@ <floater.string name="InvalidAvatar"> AVATAR NO VÁLIDO </floater.string> + <text name="composite_label"> + Texturas compuestas + </text> + <button label="Soltar" label_selected="Soltar" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="label"> - Texturas obtenidas mediante bake - </text> - <text name="composite_label"> - Texturas compuestas - </text> - <button label="Volcar IDs a la consola" label_selected="Volcado" name="Dump"/> - <panel name="scroll_content_panel"> - <texture_picker label="Pelo" name="hair-baked"/> - <texture_picker label="Pelo" name="hair_grain"/> - <texture_picker label="Alfa del pelo" name="hair_alpha"/> - <texture_picker label="Cabeza" name="head-baked"/> - <texture_picker label="Maquillaje" name="head_bodypaint"/> - <texture_picker label="Alfa de la cabeza" name="head_alpha"/> - <texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/> - <texture_picker label="Ojos" name="eyes-baked"/> - <texture_picker label="Ojo" name="eyes_iris"/> - <texture_picker label="Alfa de los ojos" name="eyes_alpha"/> - <texture_picker label="Parte superior del cuerpo" name="upper-baked"/> - <texture_picker label="Pintura corporal superior" name="upper_bodypaint"/> - <texture_picker label="Camiseta" name="upper_undershirt"/> - <texture_picker label="Guantes" name="upper_gloves"/> - <texture_picker label="Camisa" name="upper_shirt"/> - <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/> - <texture_picker label="Alfa superior" name="upper_alpha"/> - <texture_picker label="Tatuaje superior" name="upper_tattoo"/> - <texture_picker label="Parte inferior del cuerpo" name="lower-baked"/> - <texture_picker label="Pintura corporal inferior" name="lower_bodypaint"/> - <texture_picker label="Ropa interior" name="lower_underpants"/> - <texture_picker label="Calcetines" name="lower_socks"/> - <texture_picker label="Zapatos" name="lower_shoes"/> - <texture_picker label="Pantalones" name="lower_pants"/> - <texture_picker label="Chaqueta" name="lower_jacket"/> - <texture_picker label="Alfa inferior" name="lower_alpha"/> - <texture_picker label="Tatuaje inferior" name="lower_tattoo"/> - <texture_picker label="Falda" name="skirt-baked"/> - <texture_picker label="Falda" name="skirt"/> - </panel> + <texture_picker label="Pelo" name="hair-baked"/> + <texture_picker label="Pelo" name="hair_grain"/> + <texture_picker label="Alfa del pelo" name="hair_alpha"/> + <texture_picker label="Cabeza" name="head-baked"/> + <texture_picker label="Maquillaje" name="head_bodypaint"/> + <texture_picker label="Alfa de la cabeza" name="head_alpha"/> + <texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/> + <texture_picker label="Ojos" name="eyes-baked"/> + <texture_picker label="Ojo" name="eyes_iris"/> + <texture_picker label="Alfa de los ojos" name="eyes_alpha"/> + <texture_picker label="Parte superior del cuerpo" name="upper-baked"/> + <texture_picker label="Pintura corporal: parte superior del cuerpo" name="upper_bodypaint"/> + <texture_picker label="Camiseta" name="upper_undershirt"/> + <texture_picker label="Guantes" name="upper_gloves"/> + <texture_picker label="Camisa" name="upper_shirt"/> + <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/> + <texture_picker label="Alfa superior" name="upper_alpha"/> + <texture_picker label="Tatuaje superior" name="upper_tattoo"/> + <texture_picker label="Parte inferior del cuerpo" name="lower-baked"/> + <texture_picker label="Pintura corporal: parte inferior del cuerpo" name="lower_bodypaint"/> + <texture_picker label="Ropa interior" name="lower_underpants"/> + <texture_picker label="Calcetines" name="lower_socks"/> + <texture_picker label="Zapatos" name="lower_shoes"/> + <texture_picker label="Pantalones" name="lower_pants"/> + <texture_picker label="Chaqueta" name="lower_jacket"/> + <texture_picker label="Alfa inferior" name="lower_alpha"/> + <texture_picker label="Tatuaje inferior" name="lower_tattoo"/> + <texture_picker label="Falda" name="skirt-baked"/> + <texture_picker label="Falda" name="skirt"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml deleted file mode 100644 index 08ea67d4cb..0000000000 --- a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="COMPRAR DINERO"/> diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index ccf3d4bf91..787c37e12c 100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml @@ -9,57 +9,35 @@ <floater.string name="move_tooltip"> Mover la cámara arriba y abajo, izquierda y derecha </floater.string> - <floater.string name="camera_modes_title"> - Modos de cámara + <floater.string name="orbit_mode_title"> + Orbital </floater.string> <floater.string name="pan_mode_title"> - Orbital - Zoom - Panóramica + Panorámica </floater.string> - <floater.string name="presets_mode_title"> - Vistas predefinidas + <floater.string name="avatar_view_mode_title"> + Posición de tu cámara </floater.string> <floater.string name="free_mode_title"> Centrar el objeto </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - De frente - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Vista lateral - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Desde detrás - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Vista de objeto - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Vista subjetiva - </panel_camera_item.text> - </panel_camera_item> - </panel> + <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"/> - <joystick_track name="cam_track_stick" tool_tip="Mueve la cámara arriba y abajo, a izquierda y derecha"/> + </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"/> </panel> </panel> <panel name="buttons"> - <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"/> + <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"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index 73e947f1f7..fde4d37caf 100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Minimapa"> <floater.string name="mini_map_north"> N </floater.string> @@ -24,9 +24,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml index 258f84c361..7cb41d3f5b 100644 --- a/indra/newview/skins/default/xui/es/floater_moveview.xml +++ b/indra/newview/skins/default/xui/es/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> Caminar de espaldas (cursor abajo o S) </string> - <string name="walk_left_tooltip"> - Caminar a la izq. (pulsa Mayúsculas + cursor izq. o A) - </string> - <string name="walk_right_tooltip"> - Caminar a la der. (pulsa Mayúsculas + cursor der. o D) - </string> <string name="run_forward_tooltip"> Correr hacia adelante (cursor arriba o W) </string> <string name="run_back_tooltip"> Correr de espaldas (cursor abajo o S) </string> - <string name="run_left_tooltip"> - Correr a la izq. (pulsa Mayúsculas + cursor izq. o A) - </string> - <string name="run_right_tooltip"> - Correr a la der. (pulsa Mayúsculas + cursor der. o D) - </string> <string name="fly_forward_tooltip"> Volar hacia adelante (cursor arriba o W) </string> <string name="fly_back_tooltip"> Volar hacia atrás (cursor abajo o S) </string> - <string name="fly_left_tooltip"> - Volar a la izq. (pulsa Mayúsculas + cursor izq. o A) - </string> - <string name="fly_right_tooltip"> - Volar a la der. (pulsa Mayúsculas + cursor der. o D) - </string> - <string name="fly_up_tooltip"> - Volar (pulsa E para subir) - </string> - <string name="fly_down_tooltip"> - Volar (pulsa C para descender) - </string> - <string name="jump_tooltip"> - Saltar (pulsa E) - </string> - <string name="crouch_tooltip"> - Agacharse (pulsa C) - </string> <string name="walk_title"> Caminar </string> @@ -58,12 +28,10 @@ Volar </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Volar (pulsa E para subir)"/> <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izq. (cursor izq. o A)"/> - <joystick_slide name="move left btn" tool_tip="Caminar a la izq. (pulsa Mayúsculas + cursor izq. o A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Volar (pulsa C para descender)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la der. (cursor der. o D)"/> - <joystick_slide name="move right btn" tool_tip="Caminar a la der. (pulsa Mayúsculas + cursor der. o D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Volar: pulsa E para subir"/> + <button label="" label_selected="" name="move down btn" tool_tip="Volar: pulsa C para descender"/> <joystick_turn name="forward btn" tool_tip="Caminar hacia adelante (cursor arriba o W)"/> <joystick_turn name="backward btn" tool_tip="Caminar de espaldas (cursor abajo o S)"/> </panel> 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 c58eb227aa..44179d6b28 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> Gesto: [NAME] </floater.string> + <text name="name_text"> + Nombre: + </text> <text name="desc_label"> Descripción: </text> @@ -42,12 +45,7 @@ <text name="library_label"> Biblioteca: </text> - <scroll_list name="library_list"> - <scroll_list.rows name="action_animation" value="Animaciones"/> - <scroll_list.rows name="action_sound" value="Sonido"/> - <scroll_list.rows name="action_chat" value="Chat"/> - <scroll_list.rows name="action_wait" value="Espera"/> - </scroll_list> + <scroll_list name="library_list"/> <button label="Añadir >>" name="add_btn"/> <text name="steps_label"> Pasos: @@ -55,15 +53,13 @@ <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"> - (opciones) - </text> + <text left="230" name="options_text" width="200"/> <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_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml index d05a023279..57ec5eb7b4 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <floater.string name="Title"> Nota: [NAME] </floater.string> + <floater.string label="Guardar" label_selected="Guardar" name="Save"> + Guardar + </floater.string> <text name="desc txt"> Descripción: </text> @@ -16,5 +19,4 @@ Cargando... </text_editor> <button label="Guardar" label_selected="Guardar" name="Save"/> - <button label="Borrar" label_selected="Borrar" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml index a1645f0c64..5eed89d522 100644 --- a/indra/newview/skins/default/xui/es/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml @@ -5,7 +5,7 @@ Recuerda, no se reembolsarán las cantidades abonadas por clasificados. </text> - <spinner label="Precio: L$" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/> + <spinner label="Precio por el anuncio:" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Más información (enlace a ayuda de clasificados) 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 51adeb4dff..934d14a45c 100644 --- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="Mi avatar:"/> </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_panel name="leave_call_btn_panel"> + <button label="Colgar" name="leave_call_btn"/> + </layout_panel> </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 deleted file mode 100644 index 5ef4347958..0000000000 --- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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 acc63e52a0..38a12002f5 100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml @@ -19,11 +19,11 @@ <text name="land_sale_label"> Venta de terreno </text> - <text name="auction_label"> - subasta - </text> <text name="by_owner_label"> - por el dueño + por el propietario + </text> + <text name="auction_label"> + subasta de terreno </text> <button name="Go Home" tool_tip="Teleportar a mi Base"/> <text name="Home_label"> @@ -35,11 +35,11 @@ <text name="pg_label"> General </text> - <check_box initial_value="true" name="events_mature_chk"/> - <text name="events_mature_label"> + <check_box initial_value="verdadero" name="event_mature_chk"/> + <text name="mature_label"> Moderado </text> - <text name="events_adult_label"> + <text name="adult_label"> Adulto </text> </panel> @@ -58,9 +58,6 @@ <search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escribe el nombre de una región"/> <button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/> <button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/> - <text name="events_label"> - Lugar: - </text> <button label="Teleportar" name="Teleport" tool_tip="Teleportar a la localización seleccionada"/> <button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/> <button label="Ver lo elegido" name="Show Destination" tool_tip="Centrar el mapa en la localización seleccionada"/> diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml index d608b4a0f7..6a831def07 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,13 +23,6 @@ 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_bottomtray.xml b/indra/newview/skins/default/xui/es/menu_bottomtray.xml index 62683f3076..8169563882 100644 --- a/indra/newview/skins/default/xui/es/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/es/menu_bottomtray.xml @@ -4,11 +4,6 @@ <menu_item_check label="Botón Moverse" name="ShowMoveButton"/> <menu_item_check label="Botón Vista" name="ShowCameraButton"/> <menu_item_check label="Botón Foto" name="ShowSnapshotButton"/> - <menu_item_check label="Botón Barra lateral" name="ShowSidebarButton"/> - <menu_item_check label="Botón Construir" name="ShowBuildButton"/> - <menu_item_check label="Botón Buscar" name="ShowSearchButton"/> - <menu_item_check label="Botón Mapa" name="ShowWorldMapButton"/> - <menu_item_check label="Botón Minimapa" name="ShowMiniMapButton"/> <menu_item_call label="Cortar" name="NearbyChatBar_Cut"/> <menu_item_call label="Copiar" name="NearbyChatBar_Copy"/> <menu_item_call label="Pegar" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml deleted file mode 100644 index 7541530601..0000000000 --- a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 56b95bdc3b..0000000000 --- a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 3c0c588284..0000000000 --- a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?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="Editar" name="edit"/> - <menu_item_call label="Reemplazar" name="replace"/> -</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 deleted file mode 100644 index ff8ad0977a..0000000000 --- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 22a1873234..7fc1af00c5 100644 --- a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <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_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml index ba106e8335..91cb4a08ff 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml @@ -5,7 +5,6 @@ <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_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/> </menu> <menu_item_call label="Carpeta nueva" name="New Folder"/> <menu_item_call label="Script nuevo" name="New Script"/> diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml index 8c4488a285..80cf78c0b5 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="Ver los filtros" name="show_filters"/> <menu_item_call label="Restablecer los filtros" name="reset_filters"/> <menu_item_call label="Cerrar todas las carpetas" name="close_folders"/> + <menu_item_call label="Vaciar la Papelera" name="empty_trash"/> <menu_item_call label="Vaciar Objetos Perdidos" name="empty_lostnfound"/> <menu_item_call label="Guardar la textura como" name="Save Texture As"/> - <menu_item_call label="Compartir" name="Share"/> <menu_item_call label="Encontrar el original" name="Find Original"/> <menu_item_call label="Encontrar todos los enlazados" name="Find All Links"/> - <menu_item_call label="Vaciar la Papelera" name="empty_trash"/> </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 deleted file mode 100644 index 3b11bceecf..0000000000 --- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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="Ponerme - Añadir al vestuario actual" name="wear_add"/> - <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 deleted file mode 100644 index 4136082a62..0000000000 --- a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml deleted file mode 100644 index 2125fd51b2..0000000000 --- a/indra/newview/skins/default/xui/es/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml deleted file mode 100644 index 5b3d7d8cb3..0000000000 --- a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Reemplazar" name="wear_replace"/> - <menu_item_call label="Ponerme" name="wear_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 deleted file mode 100644 index 5f68e1687f..0000000000 --- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 56f4afda9b..0000000000 --- a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml deleted file mode 100644 index 8f4e0101aa..0000000000 --- a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 66ae7d868b..0000000000 --- a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Cambiar" name="switch_btn"/> - <button label="Comprar >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray.xml b/indra/newview/skins/default/xui/es/panel_bottomtray.xml index 5ea09ed795..74dc17f3de 100644 --- a/indra/newview/skins/default/xui/es/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/es/panel_bottomtray.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="Activa/Desactiva el micrófono"/> - <string name="VoiceControlBtnToolTip" value="Muestra/Oculta el panel del control de voz"/> + <string name="SpeakBtnToolTip"> + Activa/Desactiva el micrófono + </string> + <string name="VoiceControlBtnToolTip"> + Muestra/Oculta el panel del control de voz + </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -20,21 +24,6 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Hacer una foto"/> </layout_panel> - <layout_panel name="sidebar_btn_panel"> - <button label="Barra lateral" name="sidebar_btn" tool_tip="Muestra/Oculta la barra lateral"/> - </layout_panel> - <layout_panel name="build_btn_panel"> - <button label="Construir" name="build_btn" tool_tip="Muestra/Oculta las herramientas de construcción"/> - </layout_panel> - <layout_panel name="search_btn_panel"> - <button label="Buscar" name="search_btn" tool_tip="Muestra/Oculta la búsqueda"/> - </layout_panel> - <layout_panel name="world_map_btn_panel"> - <button label="Mapa" name="world_map_btn" tool_tip="Muestra/Oculta el mapa del mundo"/> - </layout_panel> - <layout_panel name="mini_map_btn_panel"> - <button label="Minimapa" name="mini_map_btn" tool_tip="Muestra/Oculta el minimapa"/> - </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="Conversaciones"/> diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml deleted file mode 100644 index d3b3d31bd9..0000000000 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Añadir +" name="add_btn"/> - <button label="Comprar >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index 959b83d658..0000000000 --- a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml deleted file mode 100644 index a2994894c1..0000000000 --- a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Adjuntos"/> - <accordion_tab name="tab_clothing" title="Ropa"/> - <accordion_tab name="tab_body_parts" title="Partes del cuerpo"/> - </accordion> -</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 deleted file mode 100644 index d1d7d8ec82..0000000000 --- a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index bc3046978c..0000000000 --- a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml index 8776dd6c10..e5e72a11e4 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml @@ -4,6 +4,5 @@ <texture_picker label="Tatuaje de la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/> <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/> <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index f307126b03..b763e2e74d 100644 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> No tienes permiso para ver el terreno propiedad del grupo </panel.string> - <panel.string name="epmty_view_group_land_text"> - No hay entradas - </panel.string> <panel.string name="cant_view_group_accounting_text"> No tienes permiso para ver la información de la cuenta del grupo. </panel.string> diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml index 1eaa69abff..58e1919782 100644 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml @@ -18,7 +18,7 @@ El máximo es de 200 por día y grupo. <text name="notice_list_none_found"> No se han encontrado </text> - <button label="Nuevo aviso" label_selected="Crear un aviso nuevo" name="create_new_notice" tool_tip="Crear un aviso nuevo"/> + <button label="Crear un aviso nuevo" label_selected="Crear un aviso nuevo" name="create_new_notice" tool_tip="Crear un aviso nuevo"/> <button label="Actualizar" label_selected="Actualizar la lista" name="refresh_notices" tool_tip="Actualizar la lista de avisos"/> <panel label="Crear un aviso nuevo" name="panel_create_new_notice"> <text name="lbl"> @@ -36,7 +36,6 @@ El máximo es de 200 por día y grupo. <text name="string"> Arrastra y suelta aquí un ítem para adjuntarlo: </text> - <button label="Inventario" name="open_inventory" tool_tip="Abrir inventario"/> <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quita el adjunto de tu aviso"/> <button label="Enviar" label_selected="Enviar" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta este cajetín. Para poder adjuntarlo, debes tener permiso para copiarlo y transferirlo."/> diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 390b4e2e9d..5ef81162bc 100644 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml @@ -12,9 +12,6 @@ Puede añadir o quitar los roles asignados a los miembros. Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos. </panel.string> - <panel.string name="donation_area"> - [AREA] m² - </panel.string> <filter_editor label="Filtrar los miembros" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Miembro" name="name"/> @@ -77,15 +74,21 @@ incluyendo el de Todos y el de Propietarios. <text name="static"> Nombre del rol </text> - <line_editor name="role_name"/> + <line_editor name="role_name"> + Empleados + </line_editor> <text name="static3"> Etiqueta del rol </text> - <line_editor name="role_title"/> + <line_editor name="role_title"> + (esperando) + </line_editor> <text name="static2"> Descripción </text> - <text_editor name="role_description"/> + <text_editor name="role_description"> + (esperando) + </text_editor> <text name="static4"> Roles asignados </text> @@ -100,6 +103,9 @@ incluyendo el de Todos y el de Propietarios. </scroll_list> </panel> <panel name="actions_footer"> + <text name="static"> + Descripción de la capacidad + </text> <text_editor name="action_description"> Esta capacidad es la de 'Expulsar miembros de este grupo'. Sólo un propietario puede expulsar a otro. </text_editor> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index 4b45a6f7b8..0e4f118605 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -8,15 +8,18 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="username_text"> - Nombre de usuario: + <text name="first_name_text"> + Nombre: </text> - <line_editor label="Nombre de usuario" name="username_edit" tool_tip="Nombre de usuario de [SECOND_LIFE]"/> + <line_editor label="Nombre" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <text name="last_name_text"> + Apellido: + </text> + <line_editor label="Apellido" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> <text name="password_text"> Contraseña: </text> <check_box label="Recordar la contraseña" name="remember_check"/> - <button label="Iniciar sesión" name="connect_btn"/> <text name="start_location_text"> Empezar en: </text> @@ -24,6 +27,7 @@ <combo_box.item label="Mi última posición" name="MyLastLocation"/> <combo_box.item label="Mi Base" name="MyHome"/> </combo_box> + <button label="Iniciar sesión" name="connect_btn"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml index 7e318a150b..3a1e96a821 100644 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml @@ -9,20 +9,62 @@ <text name="ItemcountText"> Ítems: </text> + <menu_bar name="Inventory Menu"> + <menu label="Archivo" name="File"> + <menu_item_call label="Abrir" name="Open"/> + <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_item_call label="Ventana nueva" name="New Window"/> + <menu_item_call label="Ver los filtros" name="Show Filters"/> + <menu_item_call label="Restablecer los filtros" name="Reset Current"/> + <menu_item_call label="Cerrar todas las carpetas" name="Close All Folders"/> + <menu_item_call label="Vaciar la Papelera" name="Empty Trash"/> + <menu_item_call label="Vaciar Objetos Perdidos" name="Empty Lost And Found"/> + </menu> + <menu label="Crear" name="Create"> + <menu_item_call label="Carpeta nueva" name="New Folder"/> + <menu_item_call label="Script nuevo" name="New Script"/> + <menu_item_call label="Nota nueva" name="New Note"/> + <menu_item_call label="Gesto nuevo" name="New Gesture"/> + <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="Forma 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> + <menu label="Ordenar" name="Sort"> + <menu_item_check label="Alfabéticamente" name="By Name"/> + <menu_item_check label="Cronológicamente" name="By Date"/> + <menu_item_check label="Las carpetas siempre alfabéticamente" name="Folders Always By Name"/> + <menu_item_check label="Las carpetas del sistema, arriba" name="System Folders To Top"/> + </menu> + </menu_bar> <filter_editor label="Filtrar" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="Todos los ítems" name="All Items"/> - <recent_inventory_panel label="Ítems recientes" name="Recent Items"/> + <inventory_panel label="Ítems recientes" name="Recent Items"/> </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <button name="options_gear_btn" tool_tip="Ver más opciones"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Añadir un ítem nuevo"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/> - </layout_panel> - </layout_stack> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostrar más opciones"/> + <button name="add_btn" tool_tip="Añadir un ítem nuevo"/> + <dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml deleted file mode 100644 index 661b44e419..0000000000 --- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Ver más opciones"/> - <button name="trash_btn" tool_tip="Eliminar el vestuario seleccionado"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml deleted file mode 100644 index 8cea619bd5..0000000000 --- a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Ver más opciones"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml index 88f5ba42b5..fe9736f758 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml @@ -37,10 +37,10 @@ <radio_item label="Usar mi navegador (IE, Firefox, Safari)" name="external" tool_tip="Usa tu navegador por defecto para ayuda, enlaces web, etc. No es aconsejable si estás a pantalla completa." value="1"/> <radio_item label="Usar el navegador incorporado" name="internal" tool_tip="Usa el navegador incorporado para ayuda, enlaces web, etc. Este navegador se abre en una nueva ventana dentro de [APP_NAME]." value=""/> </radio_group> - <check_box label="Activar plugins" name="browser_plugins_enabled"/> - <check_box label="Aceptar las 'cookies'" name="cookies_enabled"/> - <check_box label="Activar Javascript" name="browser_javascript_enabled"/> - <check_box label="Activar web proxy" name="web_proxy_enabled"/> + <check_box initial_value="verdadero" label="Activar plugins" name="browser_plugins_enabled"/> + <check_box initial_value="verdadero" label="Aceptar las 'cookies'" name="cookies_enabled"/> + <check_box initial_value="verdadero" label="Activar Javascript" name="browser_javascript_enabled"/> + <check_box initial_value="false" label="Activar web proxy" name="web_proxy_enabled"/> <text name="Proxy location"> Localización del proxy: </text> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index b0088ee1a2..1e8b0c736c 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Activada" name="enable_media"/> <slider label="Chat de voz" name="Voice Volume"/> <check_box label="Activado" name="enable_voice_check"/> - <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="true"/> - <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="true"/> + <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="Sí"/> + <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="Sí"/> <text name="voice_chat_settings"> Configuración del chat de voz </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Por defecto </panel.string> - <panel.string name="default system device"> - Dispositivo del sistema por defecto - </panel.string> - <panel.string name="no device"> - Ningún dispositivo - </panel.string> <text name="Input"> Entrada </text> diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml index 364451b26b..a0ee30e8f6 100644 --- a/indra/newview/skins/default/xui/es/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="¿No encuentras lo que buscas? Intenta con [secondlife:///app/search/places/[SEARCH_TERM] Buscar]."/> - <no_visible_tabs_text name="no_teleports_msg" value="El historial de teleportes está vacío. Intenta con [secondlife:///app/search/places/ Buscar]."/> <accordion_tab name="today" title="Hoy"/> <accordion_tab name="yesterday" title="Ayer"/> <accordion_tab name="2_days_ago" title="Hace 2 días"/> + 5 <accordion_tab name="3_days_ago" title="Hace 3 días"/> <accordion_tab name="4_days_ago" title="Hace 4 días"/> <accordion_tab name="5_days_ago" title="Hace 5 días"/> diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml deleted file mode 100644 index 94a0428941..0000000000 --- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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 bdef89c392..0c7f63d662 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Vestuarios" name="appearance panel"> <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 name="currentlook_title"> + (sin guardar) </text> - <button label="" name="edit_outfit_btn" tool_tip="Editar este vestuario"/> </panel> <filter_editor label="Filtrar los vestuarios" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml index 0cea46afba..0d2eb0ac35 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 elemento"> +<panel name="item properties" title="Perfil del objeto"> <panel.string name="unknown"> (desconocidas) </panel.string> @@ -15,15 +15,9 @@ <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> - <panel.string name="origin_inventory"> - (Inventario) - </panel.string> - <panel.string name="origin_inworld"> - (En el mundo) - </panel.string> - <text name="title" value="Perfil del elemento"/> - <text name="origin" value="(Inventario)"/> - <panel label="" name="item_profile"> + <text name="title" value="Perfil del objeto"/> + <text name="where" value="(Inventario)"/> + <panel label=""> <text name="LabelItemNameTitle"> Nombre: </text> @@ -41,28 +35,30 @@ <text name="LabelAcquiredTitle"> Obtenido: </text> - <text name="LabelAcquiredDate"/> + <text name="LabelAcquiredDate"> + Miér., 24 Mayo 2006 12:50:46 + </text> <panel name="perms_inv"> <text name="perm_modify"> Tú puedes: </text> <check_box label="Modificar" name="CheckOwnerModify"/> - <check_box label="Copiar" name="CheckOwnerCopy"/> - <check_box label="Transferir" name="CheckOwnerTransfer"/> + <check_box label="Copiarlo" name="CheckOwnerCopy"/> + <check_box label="Transferirlo" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> Cualquiera: </text> - <check_box label="Copiar" name="CheckEveryoneCopy"/> + <check_box label="Copiarlo" name="CheckEveryoneCopy"/> <text name="GroupLabel"> Grupo: </text> - <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación de este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> <text name="NextOwnerLabel"> Próximo propietario: </text> - <check_box label="Modificar" name="CheckNextOwnerModify"/> - <check_box label="Copiar" name="CheckNextOwnerCopy"/> - <check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> + <check_box label="Modificarlo" name="CheckNextOwnerModify"/> + <check_box label="Copiarlo" name="CheckNextOwnerCopy"/> + <check_box label="Transferirlo" name="CheckNextOwnerTransfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> </panel> <check_box label="En venta" name="CheckPurchase"/> <combo_box name="combobox sale copy"> diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml index e6d9e28aff..f40813d3c9 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml @@ -37,7 +37,7 @@ Mixed Sale </panel.string> <text name="title" value="Perfil del objeto"/> - <text name="where" value="(En el mundo)"/> + <text name="where" value="(en el mundo)"/> <panel label="" name="properties_panel"> <text name="Name:"> Nombre: diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml index e1786eafc7..ae8f926d8f 100644 --- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml @@ -3,46 +3,44 @@ <floater.string name="InvalidAvatar"> AVATAR NON VALIDE </floater.string> + <text name="label"> + Textures fixées + </text> + <text name="composite_label"> + Textures composées + </text> + <button label="Vider ces ID dans la console" label_selected="Vider" left="-185" name="Dump" width="175"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="label"> - Textures figées - </text> - <text name="composite_label"> - Textures composites - </text> - <button label="Vider les ID dans la console" label_selected="Vider" name="Dump"/> - <panel name="scroll_content_panel"> - <texture_picker label="Cheveux" name="hair-baked"/> - <texture_picker label="Cheveux" name="hair_grain"/> - <texture_picker label="Alpha cheveux" name="hair_alpha"/> - <texture_picker label="Tête" name="head-baked"/> - <texture_picker label="Maquillage" name="head_bodypaint"/> - <texture_picker label="Alpha tête" name="head_alpha"/> - <texture_picker label="Tatouage tête" name="head_tattoo"/> - <texture_picker label="Yeux" name="eyes-baked"/> - <texture_picker label="Œil" name="eyes_iris"/> - <texture_picker label="Alpha yeux" name="eyes_alpha"/> - <texture_picker label="Haut du corps" name="upper-baked"/> - <texture_picker label="Peinture sur corps (haut)" name="upper_bodypaint"/> - <texture_picker label="Débardeur" name="upper_undershirt"/> - <texture_picker label="Gants" name="upper_gloves"/> - <texture_picker label="Chemise" name="upper_shirt"/> - <texture_picker label="Veste (haut)" name="upper_jacket"/> - <texture_picker label="Alpha haut" name="upper_alpha"/> - <texture_picker label="Tatouage haut" name="upper_tattoo"/> - <texture_picker label="Bas du corps" name="lower-baked"/> - <texture_picker label="Peinture sur corps (bas)" name="lower_bodypaint"/> - <texture_picker label="Caleçon" name="lower_underpants"/> - <texture_picker label="Chaussettes" name="lower_socks"/> - <texture_picker label="Chaussures" name="lower_shoes"/> - <texture_picker label="Pantalon" name="lower_pants"/> - <texture_picker label="Veste" name="lower_jacket"/> - <texture_picker label="Alpha bas" name="lower_alpha"/> - <texture_picker label="Tatouage bas" name="lower_tattoo"/> - <texture_picker label="Jupe" name="skirt-baked"/> - <texture_picker label="Jupe" name="skirt"/> - </panel> + <texture_picker label="Cheveux" name="hair-baked"/> + <texture_picker label="Cheveux" name="hair_grain"/> + <texture_picker label="Alpha cheveux" name="hair_alpha"/> + <texture_picker label="Tête" name="head-baked"/> + <texture_picker label="Maquillage" name="head_bodypaint"/> + <texture_picker label="Alpha tête" name="head_alpha"/> + <texture_picker label="Tatouage tête" name="head_tattoo"/> + <texture_picker label="Yeux" name="eyes-baked"/> + <texture_picker label="Œil" name="eyes_iris"/> + <texture_picker label="Alpha yeux" name="eyes_alpha"/> + <texture_picker label="Haut du corps" name="upper-baked"/> + <texture_picker label="Peinture corporelle haut" name="upper_bodypaint"/> + <texture_picker label="Débardeur" name="upper_undershirt"/> + <texture_picker label="Gants" name="upper_gloves"/> + <texture_picker label="Chemise" name="upper_shirt"/> + <texture_picker label="Veste (haut)" name="upper_jacket"/> + <texture_picker label="Alpha haut" name="upper_alpha"/> + <texture_picker label="Tatouage haut" name="upper_tattoo"/> + <texture_picker label="Bas du corps" name="lower-baked"/> + <texture_picker label="Peinture corporelle bas" name="lower_bodypaint"/> + <texture_picker label="Caleçon" name="lower_underpants"/> + <texture_picker label="Chaussettes" name="lower_socks"/> + <texture_picker label="Chaussures" name="lower_shoes"/> + <texture_picker label="Pantalon" name="lower_pants"/> + <texture_picker label="Veste" name="lower_jacket"/> + <texture_picker label="Alpha bas" name="lower_alpha"/> + <texture_picker label="Tatouage bas" name="lower_tattoo"/> + <texture_picker label="Jupe" name="skirt-baked"/> + <texture_picker label="Jupe" name="skirt"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml index ab68ce166b..503fe5c154 100644 --- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml @@ -44,7 +44,7 @@ </text> <check_box label="Copier" name="everyone_copy"/> <text name="NextOwnerLabel"> - Prochain propr. : + Le prochain propriétaire : </text> <check_box label="Modifier" name="next_owner_modify"/> <check_box label="Copier" name="next_owner_copy"/> diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml deleted file mode 100644 index 953fca3544..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="ACHETER DEVISE"/> diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml index b7f8f36f81..7c9a31a4c3 100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml @@ -124,6 +124,9 @@ prend en charge [AMOUNT2] objets <floater.string name="no_parcel_selected"> (aucune parcelle sélectionnée) </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Région : </text> diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 1d62a89ff2..558551b649 100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml @@ -9,57 +9,35 @@ <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="camera_modes_title"> - Modes + <floater.string name="orbit_mode_title"> + Faire tourner </floater.string> <floater.string name="pan_mode_title"> - Rotation - Zoom - Panoramique + Faire un panoramique </floater.string> - <floater.string name="presets_mode_title"> + <floater.string name="avatar_view_mode_title"> Préréglages </floater.string> <floater.string name="free_mode_title"> Voir l'objet </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - Vue frontale - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Vue latérale - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Vue arrière - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Vue de l'objet - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Vue subjective - </panel_camera_item.text> - </panel_camera_item> - </panel> + <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"/> - <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> + <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"/> </panel> </panel> <panel name="buttons"> - <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"/> + <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"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml index 5ead1cae3a..1e0f5672a4 100644 --- a/indra/newview/skins/default/xui/fr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml @@ -22,6 +22,6 @@ <button name="del_btn" tool_tip="Supprimer ce geste"/> </panel> <button label="Modifier" name="edit_btn"/> - <button label="Lire" name="play_btn"/> + <button label="Jouer" name="play_btn"/> <button label="Stop" name="stop_btn"/> </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 43a7424851..110c61aedc 100644 --- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml @@ -16,13 +16,7 @@ a rejoint un chat vocal avec conférence. </floater.string> <floater.string name="VoiceInviteGroup"> - 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 ? + a rejoint un chat vocal avec le groupe [GROUP]. </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_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml index 29b61fc98d..fca1a329a2 100644 --- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml @@ -44,7 +44,7 @@ <text name="OwnerLabel"> Vous : </text> - <check_box label="Modifier" name="CheckOwnerModify"/> + <check_box label="Éditer" name="CheckOwnerModify"/> <check_box label="Copier" name="CheckOwnerCopy"/> <check_box label="Revendre" name="CheckOwnerTransfer"/> <text name="AnyoneLabel" width="80"> @@ -58,7 +58,7 @@ <text name="NextOwnerLabel" width="192"> Le prochain propriétaire : </text> - <check_box label="Modifier" name="CheckNextOwnerModify"/> + <check_box label="Éditer" name="CheckNextOwnerModify"/> <check_box label="Copier" name="CheckNextOwnerCopy"/> <check_box label="Revendre" name="CheckNextOwnerTransfer"/> <check_box label="À vendre" name="CheckPurchase"/> diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index cd013f6c0e..e01b687fce 100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini-carte"> <floater.string name="mini_map_north"> N </floater.string> @@ -27,9 +27,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index c0f3864b81..fac569557e 100644 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> Marcher en arrière (appuyer sur la flèche vers le bas ou S) </string> - <string name="walk_left_tooltip"> - Marcher vers la gauche (Maj+Flèche gauche ou touche A) - </string> - <string name="walk_right_tooltip"> - Marcher vers la droite (Maj+Flèche droite ou touche D) - </string> <string name="run_forward_tooltip"> Courir vers l'avant (appuyer sur la flèche vers le haut ou W) </string> <string name="run_back_tooltip"> Courir en arrière (appuyer sur la flèche vers le bas ou S) </string> - <string name="run_left_tooltip"> - Courir vers la gauche (Maj+Flèche gauche ou touche A) - </string> - <string name="run_right_tooltip"> - Courir vers la droite (Maj+Flèche droite ou touche D) - </string> <string name="fly_forward_tooltip"> Voler vers l'avant (appuyer sur la flèche vers le haut ou W) </string> <string name="fly_back_tooltip"> Voler vers l'arrière (appuyer sur la flèche vers le bas ou S) </string> - <string name="fly_left_tooltip"> - Voler vers la gauche (Maj+Flèche gauche ou touche A) - </string> - <string name="fly_right_tooltip"> - Voler vers la droite (Maj+Flèche droite ou touche D) - </string> - <string name="fly_up_tooltip"> - Voler vers le haut (touche E) - </string> - <string name="fly_down_tooltip"> - Voler vers le bas (touche C) - </string> - <string name="jump_tooltip"> - Sauter (touche E) - </string> - <string name="crouch_tooltip"> - S'accroupir (touche C) - </string> <string name="walk_title"> Marcher </string> @@ -58,12 +28,10 @@ Voler </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Voler vers le haut (touche E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/> - <joystick_slide name="move left btn" tool_tip="Marcher vers la gauche (Maj+Flèche gauche ou touche A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Voler vers le bas (touche C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/> - <joystick_slide name="move right btn" tool_tip="Marcher vers la droite (Maj+Flèche droite ou touche D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Voler vers le haut, appuyer sur E"/> + <button label="" label_selected="" name="move down btn" tool_tip="Voler vers le bas, appuyer sur C"/> <joystick_turn name="forward btn" tool_tip="Marcher en avant (appuyer sur la flèche vers le haut ou W)"/> <joystick_turn name="backward btn" tool_tip="Marcher en arrière (appuyer sur la flèche vers le bas ou S)"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml index 06cc7df522..30e510efb5 100644 --- a/indra/newview/skins/default/xui/fr/floater_pay.xml +++ b/indra/newview/skins/default/xui/fr/floater_pay.xml @@ -18,7 +18,7 @@ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> <text left="4" name="amount text"> - Ou choisir un montant : + Ou choisissez un montant : </text> <line_editor left="60" name="amount" width="55"/> <button label="Payer" label_selected="Payer" name="pay btn"/> diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml index bb8dee241f..9cac739ab0 100644 --- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml @@ -22,7 +22,7 @@ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> <text halign="left" left="5" name="amount text"> - Ou choisir un montant : + Ou choisissez un montant : </text> <line_editor left="65" name="amount" width="50"/> <button label="Payer" label_selected="Payer" name="pay btn"/> diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml index 91a943ef15..489b90eeba 100644 --- a/indra/newview/skins/default/xui/fr/floater_postcard.xml +++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml @@ -13,10 +13,10 @@ </text> <line_editor left="143" name="name_form" width="130" left_delta="146"/> <text name="subject_label"> - Objet : + Sujet : </text> <line_editor left="143" name="subject_form" width="130" left_delta="146"/> - <line_editor label="Saisir ici votre objet" name="subject_form"/> + <line_editor label="Saisissez votre sujet ici." name="subject_form"/> <text name="msg_label"> Message : </text> @@ -24,7 +24,7 @@ <check_box label="Contenu adulte" name="mature_check" tool_tip="Cette carte postale est à caractère adulte."/> <button label="?" name="publish_help_btn"/> <text_editor name="msg_form"> - Saisir ici votre message. + Saisissez votre message ici. </text_editor> <text name="fine_print"> Si le destinataire s'inscrit sur [SECOND_LIFE], vous recevrez un bonus. 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 82f5bac047..7133f8754c 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml @@ -13,25 +13,28 @@ Attendre : </floater.string> <floater.string name="stop_txt"> - Arrêter + Stop </floater.string> <floater.string name="preview_txt"> Prévisualiser </floater.string> <floater.string name="none_text"> - - Aucun choix - + -- Aucune -- </floater.string> <floater.string name="Title"> Geste : [NAME] </floater.string> + <text name="name_text"> + Nom : + </text> <text name="desc_label"> Description : </text> <text name="trigger_label"> - Déclench. : + Déclencheur : </text> <text name="replace_text" tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste."> - Rempl. par : + Remplacer par : </text> <line_editor left="310" name="replace_editor" tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste" width="120"/> <text name="key_label"> @@ -42,33 +45,25 @@ <text name="library_label"> Bibliothèque : </text> - <scroll_list name="library_list"> - <scroll_list.rows name="action_animation" value="Animation"/> - <scroll_list.rows name="action_sound" value="Son"/> - <scroll_list.rows name="action_chat" value="Chat"/> - <scroll_list.rows name="action_wait" value="Attente"/> - </scroll_list> + <scroll_list name="library_list"/> <button label="Ajouter >>" name="add_btn"/> <text name="steps_label"> Étapes : </text> - <button label="Haut" name="up_btn"/> - <button label="Bas" name="down_btn"/> + <button label="Vers le haut" name="up_btn"/> + <button label="Vers le 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 en secondes" 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. </text> - <check_box label="Actif" name="active_check" tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis."/> + <check_box label="Actifs" name="active_check" tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis."/> <button label="Prévisualiser" name="preview_btn" width="86"/> <button label="Enregistrer" left_delta="96" name="save_btn" width="86"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml index 5646ad45eb..d6ec915fd1 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <floater.string name="Title"> Note : [NAME] </floater.string> + <floater.string label="Enregistrer" label_selected="Enregistrer" name="Save"> + Enregistrer + </floater.string> <text name="desc txt"> Description : </text> @@ -16,5 +19,4 @@ Chargement... </text_editor> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> - <button label="Supprimer" label_selected="Supprimer" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml index d4d8652434..39a2b086f1 100644 --- a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml @@ -5,7 +5,7 @@ Rappel : les frais liés aux annonces passées ne sont pas remboursables. </text> - <spinner label="Prix : L$" name="price_for_listing" tool_tip="Coût de l’annonce." value="50"/> + <spinner label="Coût de l'annonce :" name="price_for_listing" tool_tip="Coût de l’annonce." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> En savoir plus (lien vers l'aide sur les annonces) 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 b5ffc8f9c7..d79726e8e2 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. Vendre les objets avec ce terrain ? + 3. Vendez-vous 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_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index 5c26527ed6..1a7bc228fa 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="Mon avatar :"/> </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_panel name="leave_call_btn_panel"> + <button label="Quitter l'appel" name="leave_call_btn"/> + </layout_panel> </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 deleted file mode 100644 index 56cb654440..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml index 7d1e3cd65c..96723b0fe6 100644 --- a/indra/newview/skins/default/xui/fr/floater_water.xml +++ b/indra/newview/skins/default/xui/fr/floater_water.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Water Floater" title="ÉDITEUR D'EAU AVANCÉ"> <floater.string name="WLDefaultWaterNames"> - Valeur par défaut:Transparente:Bassin:Trouble:Première plaie:SERPENT !!!:Valdez + Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez </floater.string> <text name="KeyFramePresetsText" width="120"> Préréglages : diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml index 657e5f5051..74f1697449 100644 --- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml @@ -184,6 +184,6 @@ </panel> </tab_container> <string name="WLDefaultSkyNames"> - A-Minuit:A-Midi:A-3h:A-15h:A-16h30:A-6h:A-18h:A-9h:A-21h:Barcelone:Blizzard:Bleu mi-journée:Après-midi sur la côte:Coucher de soleil (côte):Valeur par défaut:Coucher de soleil (désert):Belle journée:Gros nuages floconneux:Brumeux:Funky Funky:Funky Funky Funky:Gelatto:Fantôme:Vérités incohérentes:Mi-journée 1:Mi-journée 2:Mi-journée 3:Mi-journée 4:Nuit:Pirate:Mauve:Rêve de navigateur:Sensualité pure + A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality </string> </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 f5dab91924..4d500857ea 100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml @@ -19,12 +19,12 @@ <text name="land_sale_label"> Vente de terrains </text> - <text name="auction_label"> - enchères - </text> <text name="by_owner_label"> propriétaire </text> + <text name="auction_label"> + enchères + </text> <button name="Go Home" tool_tip="Me téléporter jusqu’à mon domicile"/> <text name="Home_label"> Domicile @@ -35,11 +35,11 @@ <text name="pg_label"> Général </text> - <check_box initial_value="true" name="events_mature_chk"/> - <text name="events_mature_label"> + <check_box initial_value="true" name="event_mature_chk"/> + <text name="mature_label"> Modéré </text> - <text name="events_adult_label"> + <text name="adult_label"> Adulte </text> </panel> @@ -58,9 +58,6 @@ <search_editor label="Régions par nom" name="location" tool_tip="Tapez le nom d'une région"/> <button label="Trouver" name="DoSearch" tool_tip="Rechercher une région"/> <button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/> - <text name="events_label"> - Endroit : - </text> <button label="Téléporter" name="Teleport" tool_tip="Me téléporter à l'emplacement sélectionné"/> <button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l’emplacement actuel sous la forme d’une SLurl à utiliser sur le Web."/> <button label="Afficher la sélection" name="Show Destination" tool_tip="Centrer la carte sur l'emplacement sélectionné"/> diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml index b66af7a2bf..e50de400fd 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"> - De [CREATOR] -Propriétaire [OWNER] + par [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="Test Object Name That Is actually two lines and Really Long"/> + <text name="object_name" value="Nom d'objet de test vraiment très 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"> - 30 000 L$ + 300 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? + 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? </text> <text name="object_media_url"> http://www.superdupertest.com diff --git a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml index bfdc89c5bb..3229940980 100644 --- a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml @@ -2,13 +2,8 @@ <menu name="hide_camera_move_controls_menu"> <menu_item_check label="Bouton Geste" name="ShowGestureButton"/> <menu_item_check label="Bouton Bouger" name="ShowMoveButton"/> - <menu_item_check label="Bouton Affichage" name="ShowCameraButton"/> + <menu_item_check label="Bouton Afficher" name="ShowCameraButton"/> <menu_item_check label="Bouton Photo" name="ShowSnapshotButton"/> - <menu_item_check label="Bouton Panneau latéral" name="ShowSidebarButton"/> - <menu_item_check label="Bouton Construire" name="ShowBuildButton"/> - <menu_item_check label="Bouton Rechercher" name="ShowSearchButton"/> - <menu_item_check label="Bouton Carte" name="ShowWorldMapButton"/> - <menu_item_check label="Bouton Mini-carte" name="ShowMiniMapButton"/> <menu_item_call label="Couper" name="NearbyChatBar_Cut"/> <menu_item_call label="Copier" name="NearbyChatBar_Copy"/> <menu_item_call label="Coller" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml deleted file mode 100644 index a4ead48b6b..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 4b6907fcc6..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 03cc569704..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?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="Modifier" name="edit"/> - <menu_item_call label="Remplacer" name="replace"/> -</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 deleted file mode 100644 index 8276d57025..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml index 062dd0f005..02d734045a 100644 --- a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_gesture_gear"> - <menu_item_call label="Ajouter/Supprimer des favoris" name="activate"/> + <menu_item_call label="Ajouter/Supprimer des Favoris" name="activate"/> <menu_item_call label="Copier" name="copy_gesture"/> <menu_item_call label="Coller" name="paste"/> <menu_item_call label="Copier l'UUID" name="copy_uuid"/> <menu_item_call label="Enregistrer dans la tenue actuelle" name="save_to_outfit"/> - <menu_item_call label="Modifier" name="edit_gesture"/> + <menu_item_call label="Éditer" name="edit_gesture"/> <menu_item_call label="Inspecter" name="inspect"/> </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 86a2ddd185..3a7126fe50 100644 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <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_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml index e2b215cbb8..0ecce069bd 100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml @@ -7,7 +7,7 @@ <menu_item_call label="Prendre" name="take"/> <menu_item_call label="Prendre une copie" name="take_copy"/> <menu_item_call label="Ouvrir" name="open"/> - <menu_item_call label="Modifier" name="edit"/> + <menu_item_call label="Éditer" name="edit"/> <menu_item_call label="Porter" name="wear"/> <menu_item_call label="Signaler" name="report"/> <menu_item_call label="Ignorer" name="block"/> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml index fe096b4a7e..57b0a768c2 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml @@ -5,7 +5,6 @@ <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_item_call label="Définir les droits de chargement par défaut" name="perm prefs"/> </menu> <menu_item_call label="Nouveau dossier" name="New Folder"/> <menu_item_call label="Nouveau script" name="New Script"/> diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml index 73eaa4af7e..2e0cafa227 100644 --- a/indra/newview/skins/default/xui/fr/menu_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_landmark.xml @@ -2,6 +2,6 @@ <toggleable_menu name="landmark_overflow_menu"> <menu_item_call label="Copier la SLurl" name="copy"/> <menu_item_call label="Supprimer" name="delete"/> - <menu_item_call label="Créer un favori" name="pick"/> - <menu_item_call label="Ajouter à la barre des favoris" name="add_to_favbar"/> + <menu_item_call label="Créer une préférence" name="pick"/> + <menu_item_call label="Ajouter à la barre des Favoris" name="add_to_favbar"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 257c44795f..6492a83e06 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Toucher" name="Object Touch"> - <on_enable parameter="Toucher" name="EnableTouch"/> - </menu_item_call> - <menu_item_call label="Modifier" name="Edit..."/> + <menu_item_call label="Toucher" name="Object Touch"/> + <menu_item_call label="Éditer" name="Edit..."/> <menu_item_call label="Construire" name="Build"/> <menu_item_call label="Ouvrir" name="Open"/> <menu_item_call label="M'asseoir ici" name="Object Sit"/> diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml deleted file mode 100644 index 5db7f176b5..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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="Porter - Ajouter à la tenue actuelle" name="wear_add"/> - <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 deleted file mode 100644 index 2a7f618e07..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml index b6cde6d6e2..a3b4fb4f55 100644 --- a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="picks_plus_menu"> - <menu_item_call label="Nouveau favori" name="create_pick"/> + <menu_item_call label="Nouveau Favori" name="create_pick"/> <menu_item_call label="Nouvelle petite annonce" name="create_classified"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml index 6b0f4db752..beaf37011f 100644 --- a/indra/newview/skins/default/xui/fr/menu_place.xml +++ b/indra/newview/skins/default/xui/fr/menu_place.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="place_overflow_menu"> <menu_item_call label="Enregistrer comme repère" name="landmark"/> - <menu_item_call label="Créer un favori" name="pick"/> + <menu_item_call label="Créer une préférence" name="pick"/> <menu_item_call label="Acheter un pass" name="pass"/> - <menu_item_call label="Modifier" name="edit"/> + <menu_item_call label="Éditer" name="edit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml index 5491c1b3fc..2ad007c142 100644 --- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml @@ -14,5 +14,5 @@ <menu_item_call label="Développer tous les dossiers" name="expand_all"/> <menu_item_call label="Réduire tous les dossiers" name="collapse_all"/> <menu_item_check label="Trier par date" name="sort_by_date"/> - <menu_item_call label="Créer un favori" name="create_pick"/> + <menu_item_call label="Créer une préférence" name="create_pick"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml deleted file mode 100644 index dc68f40fe7..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml deleted file mode 100644 index c477471a64..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Remplacer" name="wear_replace"/> - <menu_item_call label="Porter" name="wear_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 deleted file mode 100644 index d5330c2417..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index b99f751fae..0000000000 --- a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml deleted file mode 100644 index 377f85368f..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 5e7442b877..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Changer" name="switch_btn"/> - <button label="Acheter >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml index 328b97ee72..d3e4afd6ee 100644 --- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="Active/Désactive le micro"/> - <string name="VoiceControlBtnToolTip" value="Affiche/Masque le panneau de contrôle de la voix"/> + <string name="SpeakBtnToolTip"> + Active/Désactive le micro + </string> + <string name="VoiceControlBtnToolTip"> + Affiche/Masque le panneau de contrôle vocal + </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -20,21 +24,6 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Prendre une photo"/> </layout_panel> - <layout_panel name="sidebar_btn_panel"> - <button label="Panneau latéral" name="sidebar_btn" tool_tip="Affiche/Masque le panneau latéral"/> - </layout_panel> - <layout_panel name="build_btn_panel"> - <button label="Construire" name="build_btn" tool_tip="Affiche/Masque les outils pour la construction"/> - </layout_panel> - <layout_panel name="search_btn_panel"> - <button label="Rechercher" name="search_btn" tool_tip="Affiche/Masque la recherche"/> - </layout_panel> - <layout_panel name="world_map_btn_panel"> - <button label="Carte" name="world_map_btn" tool_tip="Affiche/Masque la carte du monde"/> - </layout_panel> - <layout_panel name="mini_map_btn_panel"> - <button label="Mini-carte" name="mini_map_btn" tool_tip="Affiche/Masque la mini-carte"/> - </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="Conversations"/> diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml deleted file mode 100644 index 0b58a4e40b..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Ajout +" name="add_btn"/> - <button label="Acheter >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index b23cb91c6f..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml deleted file mode 100644 index c1085aa461..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Éléments attachés"/> - <accordion_tab name="tab_clothing" title="Habits"/> - <accordion_tab name="tab_body_parts" title="Parties du corps"/> - </accordion> -</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 deleted file mode 100644 index e1fa769f2f..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index bc0edda5b6..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml index 5872b01fb0..0bbcbe833f 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Modifier le favori" name="panel_edit_pick"> +<panel label="Modifier la préférence" name="panel_edit_pick"> <panel.string name="location_notice"> (mise à jour après enregistrement) </panel.string> <text name="title"> - Modifier le favori + Modifier la préférence </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml index 086542dee2..7ab2aa6bc9 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <texture_picker label="Tatouage tête" name="Head Tattoo" width="76" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Tatouage haut" name="Upper Tattoo" width="80" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Tatouage bas" name="Lower Tattoo" width="76" tool_tip="Cliquez pour sélectionner une image"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml index 3e66b3c72a..69403939aa 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml @@ -11,7 +11,7 @@ <button label="Quitter l'appel" name="end_call_btn"/> </layout_panel> <layout_panel name="voice_ctrls_btn_panel"> - <button label="Ouvrir contrôles vocaux" name="voice_ctrls_btn"/> + <button label="Ouvrir les contrôles vocaux" name="voice_ctrls_btn"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index dcc27a9be4..a10eaf9d18 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> Vous n'avez pas la permission de voir quel terrain possède ce groupe </panel.string> - <panel.string name="epmty_view_group_land_text"> - Aucune entrée - </panel.string> <panel.string name="cant_view_group_accounting_text"> Vous n'avez pas la permission d'accéder aux informations financières de ce groupe. </panel.string> @@ -23,7 +20,7 @@ <scroll_list.columns label="Parcelle" name="name"/> <scroll_list.columns label="Région" name="location"/> <scroll_list.columns label="Type" name="type"/> - <scroll_list.columns label="Surf." name="area"/> + <scroll_list.columns label="Surface" name="area"/> </scroll_list> <text name="total_contributed_land_label"> Total des contributions : diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml index 3364dd9dbc..35a5caaa92 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml @@ -21,7 +21,7 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. <text name="notice_list_none_found"> Aucun résultat </text> - <button label="Nouv. notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/> + <button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/> <button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices" tool_tip="Actualiser la liste des notices"/> <panel label="Créer une notice" name="panel_create_new_notice"> <text name="lbl"> @@ -36,14 +36,13 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. </text> <text_editor name="create_message"/> <text name="lbl5"> - Pièce jointe : + Pièce-jointe : </text> <line_editor name="create_inventory_name"/> <text name="string"> Faire glisser l'objet et le déposer ici pour le joindre : </text> - <button label="Inventaire" name="open_inventory" tool_tip="Ouvrir l'inventaire"/> - <button label="Supprimer" label_selected="Supprimer pièce jointe" name="remove_attachment" tool_tip="Supprimer la pièce jointe de votre notification"/> + <button label="Supprimer" label_selected="Supprimer pièce-jointe" name="remove_attachment" tool_tip="Supprimer la pièce jointe de votre notification"/> <button label="Envoyer" label_selected="Envoyer" left="200" name="send_notice" width="100"/> <group_drop_target name="drop_target" tool_tip="Faites glisser un objet de l'inventaire jusqu'à cette case pour l'envoyer avec la notice. Vous devez avoir l'autorisation de copier et transférer l'objet pour pouvoir le joindre."/> </panel> @@ -52,7 +51,7 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. Détails </text> <text name="lbl2"> - Pour envoyer une nouvelle notice, cliquez sur +. + Pour envoyer une nouvelle notice, cliquez sur le bouton + </text> <text name="lbl3"> Sujet : @@ -61,6 +60,6 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. Message : </text> <line_editor left="128" name="view_inventory_name" width="256"/> - <button label="Ouvrir pièce jointe" label_selected="Ouvrir pièce jointe" name="open_attachment" width="118"/> + <button label="Ouvrir la pièce jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 0bd2e0bdab..e1eeaa8601 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml @@ -12,9 +12,6 @@ Vous pouvez ajouter ou supprimer les rôles assignés aux membres. Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée. </panel.string> - <panel.string name="donation_area"> - [AREA] m² - </panel.string> <filter_editor label="Filtrer les membres" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Membre" name="name"/> diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml index 60507f191d..4001616034 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml @@ -16,8 +16,11 @@ Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle. </string> <string name="acquired_date"> - [weekday,datetime,local] [sday,datetime,local] [month,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> <button name="back_btn" tool_tip="Précédent"/> <text name="title" value="Profil du lieu"/> <scroll_container name="place_scroll"> diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml index 9e0d08958b..9c15b0bbd3 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Landmarks"> <accordion name="landmarks_accordion"> - <accordion_tab name="tab_favorites" title="Barre des favoris"/> + <accordion_tab name="tab_favorites" title="Barre des Favoris"/> <accordion_tab name="tab_landmarks" title="Mes repères"/> <accordion_tab name="tab_inventory" title="Mon inventaire"/> <accordion_tab name="tab_library" title="Bibliothèque"/> diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index 1b3e1c1c90..8569a544fa 100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -8,23 +8,27 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="username_text"> - Nom d'utilisateur : + <text name="first_name_text"> + Prénom : </text> - <line_editor label="Nom d'utilisateur" name="username_edit" tool_tip="Nom d'utilisateur [SECOND_LIFE]"/> + <line_editor label="Prénom" name="first_name_edit" tool_tip="Prénom [SECOND_LIFE]"/> + <text name="last_name_text"> + Nom : + </text> + <line_editor label="Nom :" name="last_name_edit" tool_tip="Nom [SECOND_LIFE]"/> <text name="password_text"> Mot de passe : </text> <check_box label="Enregistrer" name="remember_check"/> - <button label="Connexion" name="connect_btn"/> <text name="start_location_text"> Lieu de départ : </text> <combo_box name="start_location_combo" width="152"> <combo_box.item label="Dernier emplacement" name="MyLastLocation"/> <combo_box.item label="Domicile" name="MyHome"/> - <combo_box.item label="<Saisir le nom de la région>" name="Typeregionname"/> + <combo_box.item label="<Saisissez le nom de la région>" name="Typeregionname"/> </combo_box> + <button label="Connexion" name="connect_btn"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index 219e5801f2..2521967bc6 100644 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml @@ -2,6 +2,6 @@ <panel label="Mon profil" name="panel_me"> <tab_container name="tabs"> <panel label="MON PROFIL" name="panel_profile"/> - <panel label="MES FAVORIS" name="panel_picks"/> + <panel label="MES PRÉFÉRENCES" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml index 1609b6c9d3..f4e4f8a4ab 100644 --- a/indra/newview/skins/default/xui/fr/panel_notes.xml +++ b/indra/newview/skins/default/xui/fr/panel_notes.xml @@ -17,7 +17,7 @@ <button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/> <button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/> <button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/> - <button label="Téléporter" name="teleport" tool_tip="Proposer une téléportation"/> + <button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml deleted file mode 100644 index ab352deec4..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> - <button name="trash_btn" tool_tip="Supprimer la tenue sélectionnée"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml deleted file mode 100644 index 874bab2daa..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml index 78acf929ba..e33281defc 100644 --- a/indra/newview/skins/default/xui/fr/panel_picks.xml +++ b/indra/newview/skins/default/xui/fr/panel_picks.xml @@ -7,7 +7,7 @@ <accordion_tab name="tab_classifieds" title="Petites annonces"/> </accordion> <panel label="bottom_panel" name="edit_panel"> - <button name="new_btn" tool_tip="Créer un nouveau favori ou une nouvelle petite annonce à l'endroit actuel"/> + <button name="new_btn" tool_tip="Créer une nouvelle préférence ou petite annonce à l'emplacement actuel"/> </panel> <panel name="buttons_cucks"> <button label="Infos" name="info_btn" tool_tip="Afficher les informations du Favori"/> diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml index 731e045019..598e94166e 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -41,6 +41,21 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> + <string name="icon_Voice" value="parcel_drk_Voice"/> + <string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/> + <string name="icon_Fly" value="parcel_drk_Fly"/> + <string name="icon_FlyNo" value="parcel_drk_FlyNo"/> + <string name="icon_Push" value="parcel_drk_Push"/> + <string name="icon_PushNo" value="parcel_drk_PushNo"/> + <string name="icon_Build" value="parcel_drk_Build"/> + <string name="icon_BuildNo" value="parcel_drk_BuildNo"/> + <string name="icon_Scripts" value="parcel_drk_Scripts"/> + <string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/> + <string name="icon_Damage" value="parcel_drk_Damage"/> + <string name="icon_DamageNo" value="parcel_drk_DamageNo"/> <button name="back_btn" tool_tip="Précédent"/> <text name="title" value="Profil du lieu"/> <scroll_container name="place_scroll"> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 76f3319525..64635fbac0 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -45,7 +45,7 @@ </text> <check_box initial_value="true" label="Jouer l'animation clavier quand vous écrivez" name="play_typing_animation"/> <check_box label="M'envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/> - <check_box label="Activer l'historique des chats et des IM en texte brut" name="plain_text_chat_history"/> + <check_box label="Activer l'historique des chats en texte brut" name="plain_text_chat_history"/> <text name="show_ims_in_label"> Afficher les IM dans : </text> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 3245132972..8e8ee26af4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -59,7 +59,7 @@ <combo_box.item label="5 minutes" name="item1"/> <combo_box.item label="10 minutes" name="item2"/> <combo_box.item label="30 minutes" name="item3"/> - <combo_box.item label="Jamais" name="item4"/> + <combo_box.item label="jamais" name="item4"/> </combo_box> <text name="text_box3"> Réponse si occupé(e) : 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 23dc2f6e89..450ad64ae4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Graphiques" name="Display panel"> + <text name="WindowSizeLabel"> + Taille de la fenêtre : + </text> + <check_box label="Utiliser le plein écran" name="windowed mode"/> + <combo_box name="windowsize combo"> + <combo_box.item label="640 x 480" name="640x480"/> + <combo_box.item label="800 x 600" name="800x600"/> + <combo_box.item label="720 x 480 (NTSC)" name="720x480"/> + <combo_box.item label="768 x 576 (PAL)" name="768x576"/> + <combo_box.item label="1024 x 768" name="1024x768"/> + </combo_box> + <text name="UI Size:"> + Taille de l'interface : + </text> <text name="QualitySpeed"> Qualité et vitesse : </text> @@ -13,10 +27,10 @@ Faible </text> <text name="ShadersPrefText2"> - Moyenne + Moyen </text> <text name="ShadersPrefText3"> - Élevée + Élevé </text> <text name="ShadersPrefText4"> Ultra @@ -49,7 +63,6 @@ m </text> <slider label="Nombre de particules max. :" label_width="147" name="MaxParticleCount"/> - <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 : @@ -85,8 +98,8 @@ Sources lumineuses : </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Soleil et lune uniquement" name="SunMoon" value="0"/> - <radio_item label="Lumières à proximité" name="LocalLights" value="1"/> + <radio_item label="Soleil et lune uniquement" name="SunMoon"/> + <radio_item label="Lumières à proximité" name="LocalLights"/> </radio_group> <text left="380" name="TerrainDetailText"> Rendu du terrain : diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index b82d8bcd18..4c055a2b8d 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Activé" name="enable_media"/> <slider label="Chat vocal" name="Voice Volume"/> <check_box label="Activé" name="enable_voice_check"/> - <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="true"/> - <check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/> + <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="vrai"/> + <check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="vrai"/> <text name="voice_chat_settings"> Paramètres du chat vocal </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Défaut </panel.string> - <panel.string name="default system device"> - Périphérique système par défaut - </panel.string> - <panel.string name="no device"> - Aucun périphérique - </panel.string> <text name="Input"> Entrée </text> diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml index f1c12c9fee..f801aee312 100644 --- a/indra/newview/skins/default/xui/fr/panel_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_profile.xml @@ -45,7 +45,7 @@ <button label="IM" name="im" tool_tip="Ouvrir une session IM"/> <button label="Appeler" name="call" tool_tip="Appeler ce résident"/> <button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/> - <button label="Téléporter" name="teleport" tool_tip="Proposer une téléportation"/> + <button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/> <button label="▼" name="overflow_btn" tool_tip="Payer ou partager l'inventaire avec le résident"/> </layout_panel> <layout_panel name="profile_me_buttons_panel"> diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index fb650ff646..2c12547d61 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml @@ -73,6 +73,6 @@ domaine. <button label="?" name="ban_resident_help"/> <button label="Ajouter..." name="add_banned_avatar_btn"/> <button label="Supprimer..." name="remove_banned_avatar_btn"/> - <button label="Message au domaine..." name="message_estate_btn"/> - <button label="Éjecter du domaine..." name="kick_user_from_estate_btn"/> + <button label="Envoyer un message au domaine..." name="message_estate_btn"/> + <button label="Éjecter un résident du domaine..." name="kick_user_from_estate_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index ada4583648..925f4375da 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml @@ -39,5 +39,5 @@ <button label="Téléporter un résident chez lui…" name="kick_btn"/> <button label="Téléporter tous les résidents chez eux…" name="kick_all_btn"/> <button label="Envoyer un message à la région..." name="im_btn"/> - <button label="Gérer le téléhub..." name="manage_telehub_btn"/> + <button label="Gérer le Téléhub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml index 1586c201da..bfd7a869c5 100644 --- a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Vous n'avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/places/Rechercher [SEARCH_TERM]]."/> - <no_visible_tabs_text name="no_teleports_msg" value="L'historique des téléportations est vide. Essayez [secondlife:///app/search/places/ Rechercher]."/> <accordion_tab name="today" title="Aujourd'hui"/> <accordion_tab name="yesterday" title="Hier"/> <accordion_tab name="2_days_ago" title="Il y a 2 jours"/> diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml deleted file mode 100644 index a134854706..0000000000 --- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml index d731fa6896..c049de48b1 100644 --- a/indra/newview/skins/default/xui/fr/role_actions.xml +++ b/indra/newview/skins/default/xui/fr/role_actions.xml @@ -3,12 +3,12 @@ <action_set description="Ces pouvoirs permettent d'ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d'invitation." name="Membership"> <action description="Inviter des membres dans ce groupe" longdescription="Invitez des personnes à rejoindre ce groupe en utilisant le bouton Inviter dans l'onglet Membres de la section Rôles." name="member invite" value="1"/> <action description="Expulser des membres du groupe" longdescription="Expulsez des personnes de ce groupe en utilisant le bouton Expulser dans l'onglet Membres de la section Rôles. Un propriétaire peut expulser tout le monde à l'exception des autres propriétaires. Si vous n'êtes pas propriétaire, vous pouvez expulser un membre d'un groupe uniquement si il n'a que le rôle Tous et AUCUN autre rôle. Pour supprimer des membres des rôles, vous devez disposer du pouvoir correspondant." name="member eject" value="2"/> - <action description="Activer Inscription libre et modifier les frais d'inscription" longdescription="Activez Inscription libre pour permettre aux nouveaux membres de s'inscrire sans invitation, et changez les frais d'inscription dans la section Général." name="member options" value="3"/> + <action description="Activez Inscription libre et modifiez les frais d'inscription" longdescription="Activez Inscription libre pour permettre aux nouveaux membres de s'inscrire sans invitation, et changez les frais d'inscription dans la section Général." name="member options" value="3"/> </action_set> <action_set description="Ces pouvoirs permettent d'ajouter, de supprimer et de modifier les rôles dans le groupe et d'y assigner des membres et des pouvoirs." name="Roles"> <action description="Créer des rôles" longdescription="Créez de nouveaux rôles dans l'onglet Rôles de la section Rôles." name="role create" value="4"/> <action description="Supprimer des rôles" longdescription="Supprimez des rôles dans l'onglet Rôles de la section Rôles." name="role delete" value="5"/> - <action description="Changer les noms, les titres et les descriptions des rôles et indiquer si les membres des rôles sont rendus publics" longdescription="Changez les noms, les titres et les descriptions des rôles, et indiquez si les membres des rôles sont rendus publics. Vous pouvez le faire au bas de l'onglet Rôles dans la section Rôles, après avoir sélectionné un rôle." name="role properties" value="6"/> + <action description="Changez les noms, les titres et les descriptions des rôles, et indiquez si les membres des rôles sont rendus publics" longdescription="Changez les noms, les titres et les descriptions des rôles, et indiquez si les membres des rôles sont rendus publics. Vous pouvez le faire au bas de l'onglet Rôles dans la section Rôles, après avoir sélectionné un rôle." name="role properties" value="6"/> <action description="Attribuer des rôles limités" longdescription="Assignez des membres aux rôles dans la liste Rôles assignés (section Rôles > onglet Membres). Un membre avec ce pouvoir peut uniquement ajouter des membres à un rôle dans lequel le responsable de l'assignation est déjà présent." name="role assign member limited" value="7"/> <action description="Attribuer tous les rôles" longdescription="Assignez des membres à n'importe quel rôle dans la liste Rôles assignés (section Rôles > onglet Membres). *AVERTISSEMENT* Tout membre disposant de ce pouvoir peut s'assigner lui-même, ainsi que tout autre membre non-propriétaire, à des rôles disposant de pouvoirs plus importants, et accéder potentiellement à des pouvoirs proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d'attribuer ce pouvoir." name="role assign member" value="8"/> <action description="Destituer des membres de leurs rôles" longdescription="Supprimez des membres des rôles dans la liste Rôles assignés (section Rôles > onglet Membres). Les propriétaires ne peuvent pas être supprimés." name="role remove member" value="9"/> @@ -24,8 +24,8 @@ <action description="Diviser et fusionner des parcelles" longdescription="Divisez et fusionnez des parcelles. Pour ce faire, cliquez sur le sol avec le bouton droit de la souris, sélectionnez Modifier le terrain et faites glisser la souris sur le terrain pour faire une sélection. Pour diviser une parcelle, sélectionnez ce que vous souhaitez diviser et cliquez sur Sous-diviser. Pour fusionner des parcelles, sélectionnez-en deux ou plus qui sont contiguës et cliquez sur Fusionner." name="land divide join" value="15"/> </action_set> <action_set description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation." name="Parcel Identity"> - <action description="Activer Afficher le lieu dans la recherche et définir la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d'une parcelle dans l'onglet À propos du terrain > Options." name="land find places" value="17"/> - <action description="Modifier le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche. Pour ce faire, utilisez l'onglet À propos du terrain > Options." name="land change identity" value="18"/> + <action description="Activez Afficher le lieu dans la recherche et définissez la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d'une parcelle dans l'onglet À propos du terrain > Options." name="land find places" value="17"/> + <action description="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche. Pour ce faire, utilisez l'onglet À propos du terrain > Options." name="land change identity" value="18"/> <action description="Définir le lieu d'arrivée et le routage des téléportations" longdescription="Définissez le lieu d'arrivée des téléportations et le routage à partir du menu À propos du terrain > Options." name="land set landing point" value="19"/> </action_set> <action_set description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief." name="Parcel Settings"> @@ -43,7 +43,7 @@ <action_set description="Ces pouvoirs permettent d'autoriser ou d'interdire l'accès à des parcelles du groupe et de figer ou d'expulser des résidents." name="Parcel Access"> <action description="Gérer la liste d'accès à la parcelle" longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain > Accès." name="land manage allowed" value="29"/> <action description="Gérer la liste noire de cette parcelle" longdescription="Gérez les listes des résidents bannis des parcelles dans l'onglet À propos du terrain > Accès." name="land manage banned" value="30"/> - <action description="Modifier les paramètres Vendre des pass à" longdescription="Modifiez les paramètres Vendre des pass à dans l'onglet À propos du terrain > Accès." name="land manage passes" value="31"/> + <action description="Modifiez les paramètres Vendre des pass à" longdescription="Modifiez les paramètres Vendre des pass à dans l'onglet À propos du terrain > Accès." name="land manage passes" value="31"/> <action description="Expulser et figer des résidents" longdescription="Les membres dans un rôle avec ce pouvoir peuvent se charger des résidents indésirables sur une parcelle appartenant au groupe en cliquant dessus, puis en sélectionnant Expulser ou Figer." name="land admin" value="32"/> </action_set> <action_set description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement." name="Parcel Content"> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml index 5e1ac55a97..60fd63bffc 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Tenues" name="appearance panel"> <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"/> - <text name="currentlook_status"> - (État) + <button label="Éditer" name="editappearance_btn"/> + <text name="currentlook_title"> + (non enregistré) </text> <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"/> + <button label="Porter" name="wear_btn"/> + <button label="Nouvelle tenue" name="newlook_btn"/> </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 77c6f4877c..31a0534b2d 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'article"> +<panel name="item properties" title="Profil de l'objet"> <panel.string name="unknown"> (inconnu) </panel.string> @@ -15,17 +15,11 @@ <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> - <panel.string name="origin_inventory"> - (inventaire) - </panel.string> - <panel.string name="origin_inworld"> - (dans Second Life) - </panel.string> - <text name="title" value="Profil de l'article"/> - <text name="origin" value="(inventaire)"/> - <panel label="" name="item_profile"> + <text name="title" value="Profil de l'objet"/> + <text name="where" value="(inventaire)"/> + <panel label=""> <text name="LabelItemNameTitle"> - Nom : + Nom : </text> <text name="LabelItemDescTitle"> Description : @@ -33,17 +27,23 @@ <text name="LabelCreatorTitle"> Créateur : </text> - <text name="LabelCreatorName"/> + <text name="LabelCreatorName"> + Nicole Linden + </text> <button label="Profil" name="BtnCreator"/> <text name="LabelOwnerTitle"> - Propriétaire : + Propriétaire : + </text> + <text name="LabelOwnerName"> + Thrax Linden </text> - <text name="LabelOwnerName"/> <button label="Profil" name="BtnOwner"/> <text name="LabelAcquiredTitle"> - Acquis le : + Acquis : + </text> + <text name="LabelAcquiredDate"> + Wed May 24 12:50:46 2006 </text> - <text name="LabelAcquiredDate"/> <panel name="perms_inv"> <text name="perm_modify"> Vous pouvez : @@ -52,26 +52,26 @@ <check_box label="Copier" name="CheckOwnerCopy"/> <check_box label="Transférer" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> - N'importe qui : + N'importe qui : </text> <check_box label="Copier" name="CheckEveryoneCopy"/> <text name="GroupLabel"> - Groupe : + Groupe : </text> - <check_box label="Partager" name="CheckShareWithGroup" tool_tip="Autoriser tous les membres du groupe choisi à partager vos droits de modification pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Céder."/> + <check_box label="Partager" name="CheckShareWithGroup" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Transférer."/> <text name="NextOwnerLabel"> - Prochain propriétaire : + Le prochain propriétaire : </text> <check_box label="Modifier" name="CheckNextOwnerModify"/> <check_box label="Copier" name="CheckNextOwnerCopy"/> - <check_box label="Transférer" name="CheckNextOwnerTransfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet."/> + <check_box label="Transférer" name="CheckNextOwnerTransfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/> </panel> <check_box label="À vendre" name="CheckPurchase"/> <combo_box name="combobox sale copy"> <combo_box.item label="Copier" name="Copy"/> <combo_box.item label="Original" name="Original"/> </combo_box> - <spinner label="Prix : L$" name="Edit Cost"/> + <spinner label="Prix : L$" name="Edit Cost"/> </panel> <panel name="button_panel"> <button label="Annuler" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml deleted file mode 100644 index 4a1bf33403..0000000000 --- a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="ACQUISTA VALUTA"/> diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml index 3fdf4f48a2..febbfd2739 100644 --- a/indra/newview/skins/default/xui/it/floater_camera.xml +++ b/indra/newview/skins/default/xui/it/floater_camera.xml @@ -9,57 +9,35 @@ <floater.string name="move_tooltip"> Muovi la telecamera su e giù e a sinistra e destra </floater.string> - <floater.string name="camera_modes_title"> - Modalità della fotocamera + <floater.string name="orbit_mode_title"> + Ruota visuale </floater.string> <floater.string name="pan_mode_title"> - Ruota visuale - Ingrandisci - Panoramica + Panoramica </floater.string> - <floater.string name="presets_mode_title"> - Visuali predefinite + <floater.string name="avatar_view_mode_title"> + Valori predefiniti </floater.string> <floater.string name="free_mode_title"> Vedi oggetto </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - Visuale frontale - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Visuale laterale - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Visuale posteriore - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Visuale oggetto - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Visuale soggettiva - </panel_camera_item.text> - </panel_camera_item> - </panel> + <joystick_track name="cam_track_stick" tool_tip="Sposta la visuale in su e in giù, a sinistra e a destra"/> <panel name="zoom" tool_tip="Avvicina la telecamera nell'inquadratura"> - <joystick_rotate name="cam_rotate_stick" tool_tip="Ruota la visuale intorno al punto focale"/> <slider_bar name="zoom_slider" tool_tip="Zoom verso il centro focale"/> - <joystick_track name="cam_track_stick" tool_tip="Sposta la visuale in su e in giù, a sinistra e a destra"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="Ruota la visuale intorno al punto focale"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Visuale posteriore"/> + <button name="group_view" tool_tip="Visuale di gruppo"/> + <button name="front_view" tool_tip="Visuale frontale"/> + <button name="mouselook_view" tool_tip="Visuale soggettiva"/> </panel> </panel> <panel name="buttons"> - <button label="" name="presets_btn" tool_tip="Visuali predefinite"/> - <button label="" name="pan_btn" tool_tip="Ruota visuale - Ingrandisci - Panoramica"/> - <button label="" name="avatarview_btn" tool_tip="Modalità della fotocamera"/> + <button label="" name="orbit_btn" tool_tip="Ruota la visuale"/> + <button label="" name="pan_btn" tool_tip="Visuale panoramica"/> + <button label="" name="avatarview_btn" tool_tip="Valori predefiniti"/> + <button label="" name="freecamera_btn" tool_tip="Vedi oggetto"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml index ca537efba9..70ab8dcb5a 100644 --- a/indra/newview/skins/default/xui/it/floater_map.xml +++ b/indra/newview/skins/default/xui/it/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini mappa"> <floater.string name="mini_map_north"> N </floater.string> @@ -24,9 +24,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml index cdafdb0089..26d861c566 100644 --- a/indra/newview/skins/default/xui/it/floater_moveview.xml +++ b/indra/newview/skins/default/xui/it/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> Cammina indietro (premi freccia giù o S) </string> - <string name="walk_left_tooltip"> - Cammina a sinistra (premi Maiusc + freccia sinistra o A) - </string> - <string name="walk_right_tooltip"> - Cammina a destra (premi Maiusc + freccia destra o D) - </string> <string name="run_forward_tooltip"> Corri in avanti (premi freccia su o W) </string> <string name="run_back_tooltip"> Corri indietro (premi freccia giù o S) </string> - <string name="run_left_tooltip"> - Corri a sinistra (premi Maiusc + freccia sinistra o A) - </string> - <string name="run_right_tooltip"> - Corri a destra (premi Maiusc + freccia destra o D) - </string> <string name="fly_forward_tooltip"> Vola in avanti (premi freccia su o W) </string> <string name="fly_back_tooltip"> Vola indietro (premi freccia giù o S) </string> - <string name="fly_left_tooltip"> - Vola a sinistra (premi Maiusc + freccia sinistra o A) - </string> - <string name="fly_right_tooltip"> - Vola a destra (premi Maiusc + freccia destra o D) - </string> - <string name="fly_up_tooltip"> - Vola in alto (premi E) - </string> - <string name="fly_down_tooltip"> - Vola in basso (premi C) - </string> - <string name="jump_tooltip"> - Salta (premi E) - </string> - <string name="crouch_tooltip"> - Accovacciarsi (premi C) - </string> <string name="walk_title"> Cammina </string> @@ -58,12 +28,10 @@ Vola </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Vola in alto (premi E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="Gira a sinistra (premi freccia sinistra o A)"/> - <joystick_slide name="move left btn" tool_tip="Cammina a sinistra (premi Maiusc + freccia sinistra o A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Vola in basso (premi C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Gira a destra (premi freccia destra o D)"/> - <joystick_slide name="move right btn" tool_tip="Cammina a destra (premi Maiusc + freccia destra o D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Vola in alto, premi E"/> + <button label="" label_selected="" name="move down btn" tool_tip="Vola in basso, premi C"/> <joystick_turn name="forward btn" tool_tip="Cammina in avanti (premi freccia su o W)"/> <joystick_turn name="backward btn" tool_tip="Cammina indietro (premi freccia giù o S)"/> </panel> diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml index c371e28caa..6984412728 100644 --- a/indra/newview/skins/default/xui/it/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/it/floater_publish_classified.xml @@ -5,7 +5,7 @@ Ricordiamo che i costi per gli annunci non possono essere rimborsati </text> - <spinner label="Prezzo: L$" name="price_for_listing" tool_tip="Prezzo per inserzione:" value="50"/> + <spinner label="Prezzo per inserzione:" name="price_for_listing" tool_tip="Prezzo per inserzione:" value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Maggiori informazioni (link alla guida sugli annunci) diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml index eeba54b0ca..4827cc739d 100644 --- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml @@ -67,8 +67,8 @@ <combo_box.item label="Molestie > Abusi verbali" name="Harassment__Verbal_abuse"/> <combo_box.item label="Indecenza > Condotta o contenuti largamente offensivi" name="Indecency__Broadly_offensive_content_or_conduct"/> <combo_box.item label="Indecenza > Nome di un avatar inappropriato" name="Indecency__Inappropriate_avatar_name"/> - <combo_box.item label="Indecenza > Contenuto o condotta inappropriata in una regione con accesso Generale" name="Indecency__Mature_content_in_PG_region"/> - <combo_box.item label="Indecenza > Contenuto o condotta inappropriata in una regione con accesso Moderato" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="Indecenza > Contenuto o condotta inappropriata in una regione PG" name="Indecency__Mature_content_in_PG_region"/> + <combo_box.item label="Indecenza > Contenuto o condotta inappropriata in una regione Mature" name="Indecency__Inappropriate_content_in_Mature_region"/> <combo_box.item label="Violazione della proprietà intellettuale > Rimozione contenuti" name="Intellectual_property_infringement_Content_Removal"/> <combo_box.item label="Violazione della proprietà intellettuale > CopyBot o sblocco di permessi" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> <combo_box.item label="Intolleranza" name="Intolerance"/> diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index 6ad8d68df2..1c611915dc 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" short_title="STRUMENTI PER COSTRUZIONE" title="" width="288"> +<floater name="toolbox floater" short_title="STRUMENTI PER COSTRUZIONE"> <floater.string name="status_rotate"> Sposta le fasce colorate per ruotare l'oggetto </floater.string> @@ -44,7 +44,7 @@ <button label="" label_selected="" name="button edit" tool_tip="Modifica"/> <button label="" label_selected="" name="button create" tool_tip="Crea"/> <button label="" label_selected="" name="button land" tool_tip="Terra"/> - <text name="text status" width="280"> + <text name="text status"> Trascina per muovere, trascina+maiuscolo per copiare </text> <radio_group name="focus_radio_group"> @@ -70,7 +70,7 @@ <check_box label="Ridimens. simmetricamente" name="checkbox uniform"/> <check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/> <check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/> - <combo_box left_delta="48" name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l'oggetto"> + <combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l'oggetto"> <combo_box.item label="Rete del mondo" name="World"/> <combo_box.item label="Rete locale" name="Local"/> <combo_box.item label="Griglia di riferimento" name="Reference"/> @@ -110,18 +110,18 @@ <text name="Dozer Size:"> Grandezza </text> - <slider_bar initial_value="2.0" left="184" name="slider brush size" width="74"/> + <slider_bar initial_value="2.0" name="slider brush size"/> <text name="Strength:"> Potenza </text> - <button label="Applica" label_selected="Applica" left="146" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/> - <text left="134" name="obj_count"> + <button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/> + <text name="obj_count"> Oggetti: [COUNT] </text> - <text left="134" name="prim_count"> + <text name="prim_count"> Prim: [COUNT] </text> - <tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30" width="288"> + <tab_container name="Object Info Tabs"> <panel label="Generale" name="General"> <panel.string name="text deed continued"> Cessione @@ -182,12 +182,12 @@ </text> <button label="Imposta..." label_selected="Imposta..." name="button set group" tool_tip="Scegli un gruppo con cui condividere i diritti relativi all'oggetto"/> <name_box initial_value="Caricamento in corso..." name="Group Name Proxy"/> - <button label="Cessione" label_selected="Cessione" left_delta="152" name="button deed" tool_tip="Con una cessione si trasferisce il bene con i diritti al proprietario successivo Gli oggetti in proprietà condivisa di gruppo possono essere ceduti soltanto da un funzionario del gruppo." width="98"/> + <button label="Cessione" label_selected="Cessione" name="button deed" tool_tip="Con una cessione si trasferisce il bene con i diritti al proprietario successivo Gli oggetti in proprietà condivisa di gruppo possono essere ceduti soltanto da un funzionario del gruppo."/> <check_box label="Condividi" name="checkbox share with group" tool_tip="Consenti a tutti i membri del gruppo selezionato di condividere i tuoi diritti di modifica di questo oggetto. Per attivare le restrizioni per ruolo devi prima effettuare la cessione."/> - <text name="label click action" width="220"> + <text name="label click action"> Fai clic per: </text> - <combo_box name="clickaction" width="192"> + <combo_box name="clickaction"> <combo_box.item label="Tocca (predefinito)" name="Touch/grab(default)"/> <combo_box.item label="Siediti sull'oggetto" name="Sitonobject"/> <combo_box.item label="Compra l'oggetto" name="Buyobject"/> @@ -216,8 +216,8 @@ Proprietario successivo: </text> <check_box label="Modificare" name="checkbox next owner can modify"/> - <check_box label="Copiare" left_delta="80" name="checkbox next owner can copy"/> - <check_box label="Trasferisci" left_delta="67" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/> + <check_box label="Copiare" name="checkbox next owner can copy"/> + <check_box label="Trasferisci" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/> <text name="B:"> B: </text> @@ -318,7 +318,7 @@ </text> <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> - <text name="advanced_cut" width="149"> + <text name="advanced_cut"> Riduci un bordo (inizio/fine) </text> <text name="advanced_dimple"> @@ -355,29 +355,29 @@ </combo_box> </panel> <panel label="Caratteristiche" name="Features"> - <text name="select_single" width="280"> + <text name="select_single"> Seleziona solo un prim per modificarne le caratteristiche. </text> <text name="edit_object"> Modifica le caratteristiche dell'oggetto: </text> <check_box label="Flessibilità" name="Flexible1D Checkbox Ctrl" tool_tip="Consenti all'oggetto di flettersi lungo l'asse Z (solo lato client)"/> - <spinner label="Morbidezza" label_width="72" name="FlexNumSections" width="135"/> - <spinner label="Gravità" label_width="72" name="FlexGravity" width="135"/> - <spinner label="Elasticità" label_width="72" name="FlexFriction" width="135"/> - <spinner label="Sventolio" label_width="72" name="FlexWind" width="135"/> - <spinner label="Tensione" label_width="72" name="FlexTension" width="135"/> - <spinner label="Forza X" label_width="72" name="FlexForceX" width="135"/> - <spinner label="Forza Y" label_width="72" name="FlexForceY" width="135"/> - <spinner label="Forza Z" label_width="72" name="FlexForceZ" width="135"/> + <spinner label="Morbidezza" name="FlexNumSections"/> + <spinner label="Gravità" name="FlexGravity"/> + <spinner label="Elasticità" name="FlexFriction"/> + <spinner label="Sventolio" name="FlexWind"/> + <spinner label="Tensione" name="FlexTension"/> + <spinner label="Forza X" name="FlexForceX"/> + <spinner label="Forza Y" name="FlexForceY"/> + <spinner label="Forza Z" name="FlexForceZ"/> <check_box label="Luce" name="Light Checkbox Ctrl" tool_tip="Imposta l'oggetto come sorgente di luce"/> <color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire il selettore dei colori"/> <texture_picker label="" name="light texture control" tool_tip="Clicca per scegliere un'immagine da proiettare (funziona solo con il rendering differito attivato)"/> - <spinner label="Intensità" label_width="72" name="Light Intensity" width="135"/> + <spinner label="Intensità" name="Light Intensity"/> <spinner label="Angolo di vista" name="Light FOV"/> - <spinner label="Raggio" label_width="72" name="Light Radius" width="135"/> + <spinner label="Raggio" name="Light Radius"/> <spinner label="Centro focale" name="Light Focus"/> - <spinner label="Attenuazione" label_width="72" name="Light Falloff" width="135"/> + <spinner label="Attenuazione" name="Light Falloff"/> <spinner label="Atmosfera" name="Light Ambiance"/> </panel> <panel label="Texture" name="Texture"> @@ -395,28 +395,27 @@ <text name="glow label"> Bagliore </text> - <check_box bottom_delta="-21" label="Massima luminosità" name="checkbox fullbright"/> + <check_box label="Massima luminosità" name="checkbox fullbright"/> <text name="tex gen"> - Applicazione -della texture + Applicazione della texture </text> - <combo_box bottom_delta="-38" name="combobox texgen"> + <combo_box name="combobox texgen"> <combo_box.item label="Default" name="Default"/> <combo_box.item label="Planare" name="Planar"/> </combo_box> - <text bottom="-120" name="label shininess"> + <text name="label shininess"> Brillantezza </text> - <combo_box bottom_delta="-22" name="combobox shininess"> + <combo_box name="combobox shininess"> <combo_box.item label="Nessuna" name="None"/> <combo_box.item label="Bassa" name="Low"/> <combo_box.item label="Media" name="Medium"/> <combo_box.item label="Alta" name="High"/> </combo_box> - <text bottom="-120" name="label bumpiness"> + <text name="label bumpiness"> Rilievo </text> - <combo_box bottom_delta="-22" name="combobox bumpiness" width="100"> + <combo_box name="combobox bumpiness"> <combo_box.item label="Nessuna" name="None"/> <combo_box.item label="Luminoso" name="Brightness"/> <combo_box.item label="Scuro" name="Darkness"/> @@ -476,17 +475,17 @@ della texture <text name="label_area"> Zona: [AREA] m² </text> - <button label="Informazioni sui terreni" label_selected="Informazioni sui terreni" name="button about land" width="156"/> + <button label="Informazioni sui terreni" label_selected="Informazioni sui terreni" name="button about land"/> <check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari: Verde = il tuo terreno Acqua = la terra del tuo gruppo Rosso = posseduta da altri Giallo = in vendita Viola = in asta Grigia = pubblica"/> <text name="label_parcel_modify"> Modifica il terreno </text> - <button label="Suddividi" label_selected="Suddividi" name="button subdivide land" width="156"/> - <button label="Iscriviti" label_selected="Iscriviti" name="button join land" width="156"/> + <button label="Suddividi" label_selected="Suddividi" name="button subdivide land"/> + <button label="Iscriviti" label_selected="Iscriviti" name="button join land"/> <text name="label_parcel_trans"> Transazioni terreno </text> - <button label="Acquista terreno" label_selected="Acquista terreno" name="button buy land" width="156"/> - <button label="Abbandona il terreno" label_selected="Abbandona il terreno" name="button abandon land" width="156"/> + <button label="Acquista terreno" label_selected="Acquista terreno" name="button buy land"/> + <button label="Abbandona il terreno" label_selected="Abbandona il terreno" name="button abandon land"/> </panel> </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 deleted file mode 100644 index 4c440c45b6..0000000000 --- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE"> - <string name="no_voice_effect"> - (Nessuna manipolazione voce) - </string> - <string name="active_voice_effect"> - (Attivato) - </string> - <string name="unsubscribed_voice_effect"> - (Iscrizione annullata) - </string> - <string name="new_voice_effect"> - (Nuovo!) - </string> - <text name="preview_text"> - Per l'anteprima - </text> - <text name="status_text"> - Registra un campione di voce, quindi fai clic su un effetto per ascoltare il risultato. - </text> - <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] 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="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 8da17a4034..31d7a8df9e 100644 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml @@ -19,12 +19,12 @@ <text name="land_sale_label"> Vendita terreno </text> - <text name="auction_label"> - asta di terreni - </text> <text name="by_owner_label"> da parte del proprietario </text> + <text name="auction_label"> + asta di terreni + </text> <button name="Go Home" tool_tip="Teleport a casa"/> <text name="Home_label"> Home @@ -35,11 +35,11 @@ <text name="pg_label"> Generale </text> - <check_box initial_value="true" name="events_mature_chk"/> - <text name="events_mature_label"> + <check_box initial_value="vero" name="event_mature_chk"/> + <text name="mature_label"> Moderato </text> - <text name="events_adult_label"> + <text name="adult_label"> Adulto </text> </panel> @@ -58,9 +58,6 @@ <search_editor label="Regioni secondo il nome" name="location" tool_tip="Digita il nome di una regione"/> <button label="Trova" name="DoSearch" tool_tip="Cerca la regione"/> <button name="Clear" tool_tip="Elimina le linee di monitoraggio e reimposta la mappa"/> - <text name="events_label"> - Luogo: - </text> <button label="Teleport" name="Teleport" tool_tip="Teleport al luogo selezionato"/> <button label="Copia SLurl" name="copy_slurl" tool_tip="Copia la posizione attuale come un SLurl da usare nel Web."/> <button label="Mostra la selezione" name="Show Destination" tool_tip="Centra la mappa sul luogo selezionato"/> diff --git a/indra/newview/skins/default/xui/it/menu_bottomtray.xml b/indra/newview/skins/default/xui/it/menu_bottomtray.xml index 8ca5b24b48..7203d002d2 100644 --- a/indra/newview/skins/default/xui/it/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/it/menu_bottomtray.xml @@ -4,11 +4,6 @@ <menu_item_check label="Tasto Movimento" name="ShowMoveButton"/> <menu_item_check label="Tasto Visuale" name="ShowCameraButton"/> <menu_item_check label="Tasto Foto" name="ShowSnapshotButton"/> - <menu_item_check label="Pulsante barra laterale" name="ShowSidebarButton"/> - <menu_item_check label="Pulsante Costruisci" name="ShowBuildButton"/> - <menu_item_check label="Pulsante Cerca" name="ShowSearchButton"/> - <menu_item_check label="Pulsante Mappa" name="ShowWorldMapButton"/> - <menu_item_check label="Pulsante Mini mappa" name="ShowMiniMapButton"/> <menu_item_call label="Taglia" name="NearbyChatBar_Cut"/> <menu_item_call label="Copia" name="NearbyChatBar_Copy"/> <menu_item_call label="Incolla" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml deleted file mode 100644 index 699490c8f1..0000000000 --- a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Attachment"> - <menu_item_call label="Stacca" name="detach"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml deleted file mode 100644 index 1e3658ef45..0000000000 --- a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Body"> - <menu_item_call label="Sostituisci" name="replace"/> - <menu_item_call label="Modifica" name="edit"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml deleted file mode 100644 index 1e16ce8ed1..0000000000 --- a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Clothing"> - <menu_item_call label="Togli" name="take_off"/> - <menu_item_call label="Modifica" name="edit"/> - <menu_item_call label="Sostituisci" name="replace"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml deleted file mode 100644 index 10524ba92d..0000000000 --- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> - <menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/> - <menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/> -</menu> diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml index 2c2c6c4bc5..ee50a18ba5 100644 --- a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <menu name="hide_navbar_menu"> <menu_item_check label="Mostra la barra di navigazione" name="ShowNavbarNavigationPanel"/> <menu_item_check label="Mostra la barra dei Preferiti" name="ShowNavbarFavoritesPanel"/> - <menu_item_check label="Mostra mini barra del luogo" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index 5e61625f84..05f53f44ba 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml @@ -5,7 +5,6 @@ <menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/> <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> <menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/> - <menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/> </menu> <menu_item_call label="Nuova cartella" name="New Folder"/> <menu_item_call label="Nuovo script" name="New Script"/> diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml index 9f1b413276..cf87148f2e 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="Mostra filtri" name="show_filters"/> <menu_item_call label="Ripristina filtri" name="reset_filters"/> <menu_item_call label="Chiudi tutte le cartelle" name="close_folders"/> + <menu_item_call label="Svuota cestino" name="empty_trash"/> <menu_item_call label="Svuota oggetti smarriti" name="empty_lostnfound"/> <menu_item_call label="Salva texture come" name="Save Texture As"/> - <menu_item_call label="Condividi" name="Share"/> <menu_item_call label="Trova originale" name="Find Original"/> <menu_item_call label="Trova tutti i link" name="Find All Links"/> - <menu_item_call label="Svuota cestino" name="empty_trash"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml index 81f27ab8fa..237b6b3a0e 100644 --- a/indra/newview/skins/default/xui/it/menu_object.xml +++ b/indra/newview/skins/default/xui/it/menu_object.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Tocca" name="Object Touch"> - <on_enable parameter="Tocca" name="EnableTouch"/> - </menu_item_call> + <menu_item_call label="Tocca" name="Object Touch"/> <menu_item_call label="Modifica" name="Edit..."/> <menu_item_call label="Costruisci" name="Build"/> <menu_item_call label="Apri" name="Open"/> diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml deleted file mode 100644 index a02d4ad429..0000000000 --- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Outfit"> - <menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear"/> - <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 label="Nuovi abiti" name="New Clothes"> - <menu_item_call label="Nuova camicia" name="New Shirt"/> - <menu_item_call label="Nuovi pantaloni" name="New Pants"/> - <menu_item_call label="Nuove scarpe" name="New Shoes"/> - <menu_item_call label="Nuove calze" name="New Socks"/> - <menu_item_call label="Nuova giacca" name="New Jacket"/> - <menu_item_call label="Nuova gonna" name="New Skirt"/> - <menu_item_call label="Nuovi guanti" name="New Gloves"/> - <menu_item_call label="Nuova maglietta intima" name="New Undershirt"/> - <menu_item_call label="Nuovi slip" name="New Underpants"/> - <menu_item_call label="Nuovo Alpha (trasparenza)" name="New Alpha"/> - <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> - </menu> - <menu label="Nuove parti del corpo" name="New Body Parts"> - <menu_item_call label="Nuova figura corporea" name="New Shape"/> - <menu_item_call label="Nuova pelle" name="New Skin"/> - <menu_item_call label="Nuovi capelli" name="New Hair"/> - <menu_item_call label="Nuovi occhi" name="New Eyes"/> - </menu> - <menu_item_call label="Cambia nome del vestiario" name="rename"/> - <menu_item_call label="Elimina vestito" name="delete_outfit"/> -</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 deleted file mode 100644 index 8166cf20ed..0000000000 --- a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit"> - <menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear_replace"/> - <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="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 deleted file mode 100644 index 0beb9314de..0000000000 --- a/indra/newview/skins/default/xui/it/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml deleted file mode 100644 index 4848d95370..0000000000 --- a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Sostituisci" name="wear_replace"/> - <menu_item_call label="Indossa" name="wear_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"/> - <context_menu label="Attacca a ▶" name="wearable_attach_to"/> - <context_menu label="Attacca a HUD ▶" name="wearable_attach_to_hud"/> - <menu_item_call label="Togli" name="take_off"/> - <menu_item_call label="Modifica" name="edit"/> - <menu_item_call label="Profilo dell'oggetto" name="object_profile"/> - <menu_item_call label="Mostra originale" name="show_original"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml deleted file mode 100644 index 40eea8f03c..0000000000 --- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 48ff0a2160..0000000000 --- a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml deleted file mode 100644 index b44c4c29e6..0000000000 --- a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 8fc23d34f1..0000000000 --- a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Cambia" name="switch_btn"/> - <button label="Acquista >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml deleted file mode 100644 index e9d9795b3a..0000000000 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Aggiungi +" name="add_btn"/> - <button label="Acquista >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index 7667e95663..0000000000 --- a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml deleted file mode 100644 index d914a5740f..0000000000 --- a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Allegati"/> - <accordion_tab name="tab_clothing" title="Vestiario"/> - <accordion_tab name="tab_body_parts" title="Parti del corpo"/> - </accordion> -</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 deleted file mode 100644 index cbcaa0689a..0000000000 --- a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index eb3af5f2a5..0000000000 --- a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml index d76fb62c53..d8cfa15b25 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml @@ -4,6 +4,5 @@ <texture_picker label="Tatuaggio della testa" name="Head Tattoo" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Tatuaggio superiore" name="Upper Tattoo" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Tattuaggio inferiore" name="Lower Tattoo" tool_tip="Clicca per scegliere una fotografia"/> - <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml index b4c5ab01bc..4af59605c1 100644 --- a/indra/newview/skins/default/xui/it/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/it/panel_landmark_info.xml @@ -19,7 +19,7 @@ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> <button name="back_btn" tool_tip="Indietro"/> - <text name="title" value="Profilo del luogo"/> + <text name="title" value="Profilo del posto"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> <text name="maturity_value" value="sconosciuto"/> diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index 446b51ffa3..878daf1e6b 100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml @@ -9,20 +9,62 @@ <text name="ItemcountText"> Oggetti: </text> + <menu_bar name="Inventory Menu"> + <menu label="File" name="File"> + <menu_item_call label="Apri" name="Open"/> + <menu label="Carica nel server" name="upload"> + <menu_item_call label="Immagine ([COST]L$)..." name="Upload Image"/> + <menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/> + <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> + <menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Nuova finestra" name="New Window"/> + <menu_item_call label="Mostra filtri" name="Show Filters"/> + <menu_item_call label="Ripristina filtri" name="Reset Current"/> + <menu_item_call label="Chiudi tutte le cartelle" name="Close All Folders"/> + <menu_item_call label="Svuota cestino" name="Empty Trash"/> + <menu_item_call label="Svuota oggetti smarriti" name="Empty Lost And Found"/> + </menu> + <menu label="Crea" name="Create"> + <menu_item_call label="Nuova cartella" name="New Folder"/> + <menu_item_call label="Nuovo script" name="New Script"/> + <menu_item_call label="Nuovo biglietto" name="New Note"/> + <menu_item_call label="Nuova gesture" name="New Gesture"/> + <menu label="Maglietta intima" name="New Clothes"> + <menu_item_call label="Nuova camicia" name="New Shirt"/> + <menu_item_call label="Nuovi pantaloni" name="New Pants"/> + <menu_item_call label="Nuove scarpe" name="New Shoes"/> + <menu_item_call label="Nuove calze" name="New Socks"/> + <menu_item_call label="Nuova giacca" name="New Jacket"/> + <menu_item_call label="Nuova gonna" name="New Skirt"/> + <menu_item_call label="Nuovi guanti" name="New Gloves"/> + <menu_item_call label="Nuova maglietta intima" name="New Undershirt"/> + <menu_item_call label="Nuovi slip" name="New Underpants"/> + <menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/> + <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> + </menu> + <menu label="Nuove parti del corpo" name="New Body Parts"> + <menu_item_call label="Nuova figura corporea" name="New Shape"/> + <menu_item_call label="Nuova pelle" name="New Skin"/> + <menu_item_call label="Nuovi capelli" name="New Hair"/> + <menu_item_call label="Nuovi occhi" name="New Eyes"/> + </menu> + </menu> + <menu label="Ordina" name="Sort"> + <menu_item_check label="In base al nome" name="By Name"/> + <menu_item_check label="In base alla data" name="By Date"/> + <menu_item_check label="Cartelle sempre in base al nome" name="Folders Always By Name"/> + <menu_item_check label="Cartelle di sistema all'inizio" name="System Folders To Top"/> + </menu> + </menu_bar> <filter_editor label="Filtro" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="Tutti gli elementi" name="All Items"/> - <recent_inventory_panel label="Elementi recenti" name="Recent Items"/> + <inventory_panel label="Elementi recenti" name="Recent Items"/> </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="Aggiungi nuovo elemento"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> - </layout_panel> - </layout_stack> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> + <button name="add_btn" tool_tip="Aggiungi nuovo elemento"/> + <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml deleted file mode 100644 index e5194e95d7..0000000000 --- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/> - <button name="trash_btn" tool_tip="Elimina il vestiario selezionato"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml deleted file mode 100644 index 3bbf2446f5..0000000000 --- a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index fb8ddf607d..28df9d2e43 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -45,7 +45,6 @@ </text> <check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/> <check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/> - <check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/> <text name="show_ims_in_label"> Mostra gli IM in: </text> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index e8c826609c..6bf857366b 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -20,20 +20,20 @@ (Richiede il riavvio) </text> <text name="maturity_desired_prompt"> - Voglio accedere ai contenuti di tipo: + Voglio accedere al contenuto di tipo: </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="Generale, Moderato e Adulti" name="Desired_Adult"/> - <combo_box.item label="Generale e Moderato" name="Desired_Mature"/> - <combo_box.item label="Generale" name="Desired_PG"/> + <combo_box.item label="PG, Mature e Adult" name="Desired_Adult"/> + <combo_box.item label="PG e Mature" name="Desired_Mature"/> + <combo_box.item label="PG" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> Luogo di partenza: </text> <combo_box name="start_location_combo"> - <combo_box.item label="Ultimo luogo visitato" name="MyLastLocation" tool_tip="Vai automaticamente all'ultimo luogo visitato quando effettui l'accesso."/> - <combo_box.item label="Casa mia" name="MyHome" tool_tip="Vai automaticamente a casa quando effettui l'accesso"/> + <combo_box.item label="Ultimo posto visitato" name="MyLastLocation" tool_tip="Vai nell'ultimo posto visitato di default quando fai login."/> + <combo_box.item label="Casa mia" name="MyHome" tool_tip="Vai a casa di default quando fai login"/> </combo_box> <check_box initial_value="true" label="Mostra con il login" name="show_location_checkbox"/> <text name="name_tags_textbox"> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml index 29618485c2..cedf93beed 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml @@ -37,10 +37,10 @@ <radio_item label="Usa il mio browser (IE, Firefox, Safari)" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l'aiuto, per i link Web e così via. Sconsigliato durante l'esecuzione a tutto schermo." value="1"/> <radio_item label="Utilizza il browser Web integrato" name="internal" tool_tip="Utilizza il browser Web integrato per l'aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value=""/> </radio_group> - <check_box label="Abilita plugin" name="browser_plugins_enabled"/> - <check_box label="Accetta cookie" name="cookies_enabled"/> - <check_box label="Abilita Javascript" name="browser_javascript_enabled"/> - <check_box label="Abilita proxy Web" name="web_proxy_enabled"/> + <check_box initial_value="vero" label="Abilita plugin" name="browser_plugins_enabled"/> + <check_box initial_value="vero" label="Accetta cookie" name="cookies_enabled"/> + <check_box initial_value="vero" label="Abilita Javascript" name="browser_javascript_enabled"/> + <check_box initial_value="false" label="Abilita proxy Web" name="web_proxy_enabled"/> <text name="Proxy location"> Ubicazione proxy: </text> diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml index 6ca5dd878e..7d8b346c17 100644 --- a/indra/newview/skins/default/xui/it/panel_region_general.xml +++ b/indra/newview/skins/default/xui/it/panel_region_general.xml @@ -30,10 +30,10 @@ <text label="Maturità" name="access_text" width="120"> Categoria di accesso: </text> - <icons_combo_box label="Moderato" left="126" name="access_combo" width="74"> - <icons_combo_box.item label="Adulti" name="Adult" value="42"/> - <icons_combo_box.item label="Moderato" name="Mature" value="21"/> - <icons_combo_box.item label="Generale" name="PG" value="13"/> + <icons_combo_box label="Mature" left="126" name="access_combo" width="74"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Mature" name="Mature" value="21"/> + <icons_combo_box.item label="PG" name="PG" value="13"/> </icons_combo_box> <button label="Applica" name="apply_btn"/> <button label="Teleport a casa un residente..." name="kick_btn"/> diff --git a/indra/newview/skins/default/xui/it/panel_region_general_layout.xml b/indra/newview/skins/default/xui/it/panel_region_general_layout.xml index 4cf31f4b6e..232cd0c387 100644 --- a/indra/newview/skins/default/xui/it/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/it/panel_region_general_layout.xml @@ -31,7 +31,7 @@ Categoria: </text> <combo_box label="Moderato" name="access_combo"> - <combo_box.item label="Adulti" name="Adult"/> + <combo_box.item label="Adulto" name="Adult"/> <combo_box.item label="Moderato" name="Mature"/> <combo_box.item label="Generale" name="PG"/> </combo_box> diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml index e4ff7019ec..198ebf4b2a 100644 --- a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> <panel name="panel_stand_stop_flying"> - <button label="Alzati" name="stand_btn" tool_tip="Clicca qui per alzarti."/> + <button label="Stai in piedi" name="stand_btn" tool_tip="Clicca qui per alzarti."/> <button label="Ferma il volo" name="stop_fly_btn" tool_tip="Ferma il volo"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml index f4fa59babe..85f8f87e68 100644 --- a/indra/newview/skins/default/xui/it/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/it/panel_teleport_history.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/places/[SEARCH_TERM] Cerca]."/> - <no_visible_tabs_text name="no_teleports_msg" value="La cronologia dei teleport è vuota. Prova [secondlife:///app/search/places/ Cerca]."/> <accordion_tab name="today" title="Oggi"/> <accordion_tab name="yesterday" title="Ieri"/> <accordion_tab name="2_days_ago" title="2 giorni fa"/> + 5 <accordion_tab name="3_days_ago" title="3 giorni fa"/> <accordion_tab name="4_days_ago" title="4 giorni fa"/> <accordion_tab name="5_days_ago" title="5 giorni fa"/> diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml deleted file mode 100644 index b43f766e5e..0000000000 --- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="panel_voice_effect"> - <string name="no_voice_effect"> - Disattiva manipolazione voce - </string> - <string name="preview_voice_effects"> - Anteprima manipolazione voce ▶ - </string> - <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="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 220a6f84af..c2e99b5573 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Vestiario" name="appearance panel"> <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 name="currentlook_title"> + (non salvato) </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 6f650ea55d..e1ad1452ff 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 articolo"> +<panel name="item properties" title="Profilo dell'oggetto"> <panel.string name="unknown"> (sconosciuto) </panel.string> @@ -15,15 +15,9 @@ <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> - <panel.string name="origin_inventory"> - (Inventario) - </panel.string> - <panel.string name="origin_inworld"> - (in Second Life) - </panel.string> - <text name="title" value="Profilo articolo"/> - <text name="origin" value="(Inventario)"/> - <panel label="" name="item_profile"> + <text name="title" value="Profilo dell'oggetto"/> + <text name="where" value="(Inventario)"/> + <panel label=""> <text name="LabelItemNameTitle"> Nome: </text> @@ -41,7 +35,9 @@ <text name="LabelAcquiredTitle"> Acquisito: </text> - <text name="LabelAcquiredDate"/> + <text name="LabelAcquiredDate"> + mer 24 maggio 12:50:46 2006 + </text> <panel name="perms_inv"> <text name="perm_modify"> Tu puoi: diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml index 5c23b77498..0ea913e66a 100644 --- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml @@ -3,48 +3,44 @@ <floater.string name="InvalidAvatar"> 無効なアバター </floater.string> + <text name="label" width="100"> + ベークドテクスチャ + </text> + <text name="composite_label" width="128"> + 合成テクスチャ + </text> + <button label="テクスチャID一覧をコンソールに書き込む" label_selected="捨てる" name="Dump" width="200"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="label"> - ベークド -テクスチャ - </text> - <text name="composite_label"> - 合成 -テクスチャ - </text> - <button label="ID をコンソールにダンプ" label_selected="ダンプ" name="Dump"/> - <panel name="scroll_content_panel"> - <texture_picker label="髪" name="hair-baked"/> - <texture_picker label="髪" name="hair_grain"/> - <texture_picker label="髪のアルファ" name="hair_alpha"/> - <texture_picker label="頭" name="head-baked"/> - <texture_picker label="メイクアップ" name="head_bodypaint"/> - <texture_picker label="頭部のアルファ" name="head_alpha"/> - <texture_picker label="頭部のタトゥー" name="head_tattoo"/> - <texture_picker label="目" name="eyes-baked"/> - <texture_picker label="目" name="eyes_iris"/> - <texture_picker label="目のアルファ" name="eyes_alpha"/> - <texture_picker label="上半身" name="upper-baked"/> - <texture_picker label="ボディペイント（上）" name="upper_bodypaint"/> - <texture_picker label="下着シャツ" name="upper_undershirt"/> - <texture_picker label="手袋" name="upper_gloves"/> - <texture_picker label="シャツ" name="upper_shirt"/> - <texture_picker label="上着" name="upper_jacket"/> - <texture_picker label="アルファ（上）" name="upper_alpha"/> - <texture_picker label="上部のタトゥー" name="upper_tattoo"/> - <texture_picker label="下半身" name="lower-baked"/> - <texture_picker label="ボディペイント（下）" name="lower_bodypaint"/> - <texture_picker label="下着パンツ" name="lower_underpants"/> - <texture_picker label="靴下" name="lower_socks"/> - <texture_picker label="靴" name="lower_shoes"/> - <texture_picker label="パンツ" name="lower_pants"/> - <texture_picker label="ジャケット" name="lower_jacket"/> - <texture_picker label="アルファ（下）" name="lower_alpha"/> - <texture_picker label="下部のタトゥー" name="lower_tattoo"/> - <texture_picker label="スカート" name="skirt-baked"/> - <texture_picker label="スカート" name="skirt"/> - </panel> + <texture_picker label="髪" name="hair-baked"/> + <texture_picker label="髪" name="hair_grain"/> + <texture_picker label="髪のアルファ" name="hair_alpha"/> + <texture_picker label="頭" name="head-baked"/> + <texture_picker label="メイクアップ" name="head_bodypaint"/> + <texture_picker label="頭部のアルファ" name="head_alpha"/> + <texture_picker label="頭部のタトゥー" name="head_tattoo"/> + <texture_picker label="目" name="eyes-baked"/> + <texture_picker label="目" name="eyes_iris"/> + <texture_picker label="目のアルファ" name="eyes_alpha"/> + <texture_picker label="上半身" name="upper-baked"/> + <texture_picker label="上半身のボディペイント" name="upper_bodypaint"/> + <texture_picker label="下着シャツ" name="upper_undershirt"/> + <texture_picker label="手袋" name="upper_gloves"/> + <texture_picker label="シャツ" name="upper_shirt"/> + <texture_picker label="上着" name="upper_jacket"/> + <texture_picker label="アルファ（上）" name="upper_alpha"/> + <texture_picker label="上部のタトゥー" name="upper_tattoo"/> + <texture_picker label="下半身" name="lower-baked"/> + <texture_picker label="下半身のボディペイント" name="lower_bodypaint"/> + <texture_picker label="下着パンツ" name="lower_underpants"/> + <texture_picker label="靴下" name="lower_socks"/> + <texture_picker label="靴" name="lower_shoes"/> + <texture_picker label="パンツ" name="lower_pants"/> + <texture_picker label="ジャケット" name="lower_jacket"/> + <texture_picker label="アルファ（下）" name="lower_alpha"/> + <texture_picker label="下部のタトゥー" name="lower_tattoo"/> + <texture_picker label="スカート" name="skirt-baked"/> + <texture_picker label="スカート" name="skirt"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml deleted file mode 100644 index 37fd6826e5..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="通貨の購入"/> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml index 34f9d38de1..a274e25326 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml @@ -124,6 +124,9 @@ <floater.string name="no_parcel_selected"> (区画が選定されていません) </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> 地域： </text> diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 71a20c8e18..610d4183b3 100644 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml @@ -9,57 +9,35 @@ <floater.string name="move_tooltip"> カメラを上下左右に移動 </floater.string> - <floater.string name="camera_modes_title"> - カメラモード + <floater.string name="orbit_mode_title"> + 旋回 </floater.string> <floater.string name="pan_mode_title"> - 旋回 - ズーム - 水平・垂直移動 + 水平・垂直移動 </floater.string> - <floater.string name="presets_mode_title"> - 事前設定の視野 + <floater.string name="avatar_view_mode_title"> + 固定 </floater.string> <floater.string name="free_mode_title"> オブジェクトを見る </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - 前方視界 - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - グループ視界 - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - 後方視界 - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - オブジェクト視点 - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - 一人称視点 - </panel_camera_item.text> - </panel_camera_item> - </panel> + <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="向いている方向にカメラをズーム"/> - <joystick_track name="cam_track_stick" 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="一人称視界"/> </panel> </panel> <panel name="buttons"> - <button label="" name="presets_btn" tool_tip="事前設定の視野"/> - <button label="" name="pan_btn" tool_tip="旋回 - ズーム - 水平・垂直移動"/> - <button label="" name="avatarview_btn" tool_tip="カメラモード"/> + <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="オブジェクトを見る"/> </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 8e5177d6fe..04013799ec 100644 --- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml @@ -16,13 +16,7 @@ がコンファレンスチャットで、ボイスチャットに参加しました。 </floater.string> <floater.string name="VoiceInviteGroup"> - '[GROUP]'のボイスチャネルに参加なさいました。 - </floater.string> - <floater.string name="VoiceInviteQuestionGroup"> - [CURRENT_CHAT]を退席して、'[GROUP]'とのチャットに参加しますか？ - </floater.string> - <floater.string name="VoiceInviteQuestionDefault"> - [CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？ + は [GROUP]. のボイスチャットコールに参加しました。 </floater.string> <text name="question"> [CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？ diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml index daa480ef5a..65eeebe4ed 100644 --- a/indra/newview/skins/default/xui/ja/floater_joystick.xml +++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml @@ -89,7 +89,7 @@ <spinner left="205" name="BuildAxisDeadZone3" width="50"/> <spinner left="275" name="FlycamAxisDeadZone3" width="50"/> <text name="Feathering"> - 感度調整 + 羽毛 </text> <slider label="" left="126" name="AvatarFeathering" width="67"/> <slider label="" left="196" name="BuildFeathering" width="67"/> diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 0676e86703..8d920a3c3f 100644 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="ミニマップ"> <floater.string name="mini_map_north"> 北 </floater.string> @@ -27,9 +27,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml index 57ab32f486..20aec48541 100644 --- a/indra/newview/skins/default/xui/ja/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> 後ろに歩く（下矢印か S を押す） </string> - <string name="walk_left_tooltip"> - 左に水平移動（Shift + 左矢印か A を押す） - </string> - <string name="walk_right_tooltip"> - 右に水平移動（Shift + 右矢印か D を押す） - </string> <string name="run_forward_tooltip"> 前に走る（上矢印か W を押す） </string> <string name="run_back_tooltip"> 後ろに走る（下矢印か S を押す） </string> - <string name="run_left_tooltip"> - 左に水平移動（Shift + 左矢印か A を押す） - </string> - <string name="run_right_tooltip"> - 右に水平移動（Shift + 右矢印か D を押す） - </string> <string name="fly_forward_tooltip"> 前に飛ぶ（上矢印か W を押す） </string> <string name="fly_back_tooltip"> 後ろに飛ぶ（下矢印か S を押す） </string> - <string name="fly_left_tooltip"> - 左に水平移動（Shift + 左矢印か A を押す） - </string> - <string name="fly_right_tooltip"> - 右に水平移動（Shift + 右矢印か D を押す） - </string> - <string name="fly_up_tooltip"> - 上に移動（E を押す） - </string> - <string name="fly_down_tooltip"> - 下に移動（C を押す） - </string> - <string name="jump_tooltip"> - ジャンプ（E を押す） - </string> - <string name="crouch_tooltip"> - かがむ（C を押す） - </string> <string name="walk_title"> 歩く </string> @@ -58,12 +28,10 @@ 飛ぶ </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="上に移動（E を押す）"/> <button label="" label_selected="" name="turn left btn" tool_tip="左を向く（左矢印か A を押す）"/> - <joystick_slide name="move left btn" tool_tip="左に歩く（Shift + 左矢印か A を押す）"/> - <button label="" label_selected="" name="move down btn" tool_tip="下に移動（C を押す）"/> <button label="" label_selected="" name="turn right btn" tool_tip="右を向く（右矢印か D を押す）"/> - <joystick_slide name="move right btn" tool_tip="右に歩く（Shift + 右矢印か D を押す）"/> + <button label="" label_selected="" name="move up btn" tool_tip="飛ぶ・E を押す"/> + <button label="" label_selected="" name="move down btn" tool_tip="着地・C を押す"/> <joystick_turn name="forward btn" tool_tip="前に進む（上矢印か W を押す）"/> <joystick_turn name="backward btn" tool_tip="後ろに歩く（下矢印か S を押す）"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml index 9d9b59fa51..5a2b047fe0 100644 --- a/indra/newview/skins/default/xui/ja/floater_postcard.xml +++ b/indra/newview/skins/default/xui/ja/floater_postcard.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Postcard" title="スナップショットをEメールで送信"> +<floater name="Postcard" title="スナップショットをメール"> <text name="to_label"> - 受信先のEメール： + 住人のメール： </text> <line_editor left="145" name="to_form" width="125"/> <text name="from_label"> - あなたのEメール： + あなたのメール： </text> <line_editor left="145" name="from_form" width="125"/> <text name="name_label"> 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 59ce36b022..64c577b879 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> ジェスチャー： [NAME] </floater.string> + <text name="name_text"> + 名前： + </text> <text name="desc_label"> 説明： </text> @@ -42,12 +45,7 @@ <text name="library_label"> ライブラリ： </text> - <scroll_list name="library_list"> - <scroll_list.rows name="action_animation" value="アニメーション"/> - <scroll_list.rows name="action_sound" value="サウンド"/> - <scroll_list.rows name="action_chat" value="チャット"/> - <scroll_list.rows name="action_wait" value="待機"/> - </scroll_list> + <scroll_list name="library_list"/> <button label="追加＞＞" name="add_btn"/> <text name="steps_label"> 手順： @@ -55,15 +53,12 @@ <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_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml index ae8ae9f7b5..6e6e04c7d8 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <floater.string name="Title"> ノートカード： [NAME] </floater.string> + <floater.string label="保存" label_selected="保存" name="Save"> + 保存 + </floater.string> <text name="desc txt"> 説明： </text> @@ -16,5 +19,4 @@ ローディング．．． </text_editor> <button label="保存" label_selected="保存" name="Save"/> - <button label="削除" label_selected="削除" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml index f33406da51..ca6204424e 100644 --- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml @@ -5,7 +5,7 @@ クラシファイド広告は返金できませんのでご了承ください。 </text> - <spinner label="価格：L$" name="price_for_listing" tool_tip="掲載価格" value="50"/> + <spinner label="広告費：" name="price_for_listing" tool_tip="掲載価格" value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> 詳しい情報（クラシファイドヘルプへのリンク） diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index d095dee974..a8261a7493 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -49,7 +49,7 @@ </text> <radio_group name="focus_radio_group"> <radio_item label="ズーム" name="radio zoom"/> - <radio_item label="旋回（Ctrl）" name="radio orbit"/> + <radio_item label="軌跡（Ctrl）" name="radio orbit"/> <radio_item label="水平・垂直移動 (Ctrl + Shift)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> @@ -67,11 +67,8 @@ <text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示"> þ: [COUNT] </text> - <check_box label="" left="116" name="checkbox uniform"/> - <text label="両側を延ばす" name="checkbox uniform label"> - 両側を延ばす - </text> - <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/> + <check_box label="両側を引伸ばす" left="116" name="checkbox uniform"/> + <check_box initial_value="true" label="テクスチャを引伸ばす" name="checkbox stretch textures"/> <check_box initial_value="true" label="グリッドにスナップ" left_delta="27" name="checkbox snap to grid"/> <combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" width="76"> <combo_box.item label="インワールドグリッド" name="World"/> @@ -87,7 +84,7 @@ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="半円柱"/> <button label="" label_selected="" name="ToolCone" tool_tip="円錐"/> <button label="" label_selected="" name="ToolHemiCone" tool_tip="半円錐"/> - <button label="" label_selected="" name="ToolSphere" tool_tip="球体"/> + <button label="" label_selected="" name="ToolSphere" tool_tip="球形"/> <button label="" label_selected="" name="ToolHemiSphere" tool_tip="半球"/> <button label="" label_selected="" name="ToolTorus" tool_tip="トーラス"/> <button label="" label_selected="" name="ToolTube" tool_tip="チューブ"/> @@ -267,7 +264,7 @@ <combo_box.item label="ボックス" name="Box"/> <combo_box.item label="シリンダー" name="Cylinder"/> <combo_box.item label="プリズム" name="Prism"/> - <combo_box.item label="球体" name="Sphere"/> + <combo_box.item label="球形" name="Sphere"/> <combo_box.item label="トーラス" name="Torus"/> <combo_box.item label="チューブ" name="Tube"/> <combo_box.item label="リング" name="Ring"/> @@ -350,7 +347,7 @@ </text> <combo_box name="sculpt type control"> <combo_box.item label="（なし）" name="None"/> - <combo_box.item label="球体" name="Sphere"/> + <combo_box.item label="球形" name="Sphere"/> <combo_box.item label="トーラス" name="Torus"/> <combo_box.item label="平面" name="Plane"/> <combo_box.item label="シリンダー" name="Cylinder"/> 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 4b95aa544f..5af8f20690 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="マイ アバター："/> </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_panel name="leave_call_btn_panel"> + <button label="コール終了" name="leave_call_btn"/> + </layout_panel> </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 deleted file mode 100644 index 4557815129..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index fb4937242b..aeac0a8328 100644 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml @@ -20,7 +20,7 @@ <button label="IM" name="im_btn"/> <button label="プロフィール" name="view_profile_btn"/> <panel name="moderator_panel"> - <button label="ボイスを無効" name="disable_voice"/> - <button label="ボイスを有効" name="enable_voice"/> + <button label="ボイスを無効にする" name="disable_voice"/> + <button label="ボイスを有効にする" name="enable_voice"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml index e6999ac9b1..842030c39a 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="二行にわたる長いオブジェクト名をテスト"/> + <text name="object_name" value="Test Object Name That Is Really Long"/> <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$30,000 + L$300,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? + 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? </text> <text name="object_media_url"> http://www.superdupertest.com diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml index e5703c559b..ea7ba1b741 100644 --- a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml @@ -4,11 +4,6 @@ <menu_item_check label="移動ボタン" name="ShowMoveButton"/> <menu_item_check label="視界ボタン" name="ShowCameraButton"/> <menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/> - <menu_item_check label="サイドバーボタン" name="ShowSidebarButton"/> - <menu_item_check label="制作ボタン" name="ShowBuildButton"/> - <menu_item_check label="検索ボタン" name="ShowSearchButton"/> - <menu_item_check label="地図ボタン" name="ShowWorldMapButton"/> - <menu_item_check label="ミニマップボタン" name="ShowMiniMapButton"/> <menu_item_call label="切り取り" name="NearbyChatBar_Cut"/> <menu_item_call label="コピー" name="NearbyChatBar_Copy"/> <menu_item_call label="貼り付け" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml deleted file mode 100644 index e786d02e40..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index eb5faa2545..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index d984342896..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?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="edit"/> - <menu_item_call label="交換" name="replace"/> -</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 deleted file mode 100644 index a071abbd2e..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 3a1ae49700..09e70b0d1f 100644 --- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <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_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml index 42dcd06a07..14ad7900e1 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml @@ -5,7 +5,6 @@ <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_item_call label="デフォルトのアップロード権限を設定" name="perm prefs"/> </menu> <menu_item_call label="新規フォルダ" name="New Folder"/> <menu_item_call label="新規スクリプト" name="New Script"/> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml index f0e5e936ca..e3114327a0 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="フィルターを表示" name="show_filters"/> <menu_item_call label="フィルターをリセット" name="reset_filters"/> <menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/> + <menu_item_call label="ごみ箱を空にする" name="empty_trash"/> <menu_item_call label="紛失物を空にする" name="empty_lostnfound"/> <menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/> - <menu_item_call label="共有" name="Share"/> <menu_item_call label="オリジナルを表示" name="Find Original"/> <menu_item_call label="すべてのリンクを表示" name="Find All Links"/> - <menu_item_call label="ごみ箱を空にする" name="empty_trash"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index be25a2932e..e59a500534 100644 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="触る" name="Object Touch"> - <on_enable parameter="触る" name="EnableTouch"/> - </menu_item_call> + <menu_item_call label="触る" name="Object Touch"/> <menu_item_call label="編集" name="Edit..."/> <menu_item_call label="制作" name="Build"/> <menu_item_call label="開く" name="Open"/> diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml deleted file mode 100644 index d31b34deeb..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Outfit"> - <menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear"/> - <menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/> - <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 deleted file mode 100644 index 9491c22f31..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml deleted file mode 100644 index 1a67a2a8f7..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml deleted file mode 100644 index 73a8f87afd..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="交換" name="wear_replace"/> - <menu_item_call label="装着" name="wear_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 deleted file mode 100644 index f79b59ee05..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 1336df94b0..0000000000 --- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 b4bf1c0ff0..7adc5e3a78 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -2662,7 +2662,7 @@ M キーを押して変更します。 住人選択画面に表示された人に「持ち物」からアイテムをドラッグしてください </notification> <notification name="AvatarRezNotification"> - アバター名「 [NAME] 」が [TIME] 秒で出現します。 + アバター「 [NAME] 」が [TIME] 秒で出現します。 </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 deleted file mode 100644 index 95a5a26d4e..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 42d8a21660..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="交換" name="switch_btn"/> - <button label="買い物 >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml index 04b4893026..f12f07f3e9 100644 --- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="マイクのオン・オフ"/> - <string name="VoiceControlBtnToolTip" value="ボイスコントロールパネルの表示・非表示"/> + <string name="SpeakBtnToolTip"> + マイクのオン・オフ + </string> + <string name="VoiceControlBtnToolTip"> + ボイスコントロールパネルの表示・非表示 + </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -20,21 +24,6 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="スナップショットを撮ります"/> </layout_panel> - <layout_panel name="sidebar_btn_panel"> - <button label="サイドバー" name="sidebar_btn" tool_tip="サイドバーの表示・非表示"/> - </layout_panel> - <layout_panel name="build_btn_panel"> - <button label="制作" name="build_btn" tool_tip="制作ツールの表示・非表示"/> - </layout_panel> - <layout_panel name="search_btn_panel"> - <button label="検索" name="search_btn" tool_tip="検索の表示・非表示"/> - </layout_panel> - <layout_panel name="world_map_btn_panel"> - <button label="地図" name="world_map_btn" tool_tip="世界地図の表示・非表示"/> - </layout_panel> - <layout_panel name="mini_map_btn_panel"> - <button label="ミニマップ" name="mini_map_btn" tool_tip="ミニマップの表示・非表示"/> - </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="会話"/> diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml deleted file mode 100644 index 2159f17fec..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="追加 +" name="add_btn"/> - <button label="買い物 >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index 158b2fa6ac..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml deleted file mode 100644 index b9bc10c220..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="アタッチメント"/> - <accordion_tab name="tab_clothing" title="衣類"/> - <accordion_tab name="tab_body_parts" title="身体部位"/> - </accordion> -</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 deleted file mode 100644 index a1e30283ee..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 0395d4edd8..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml index f4cfe6d83f..78ddae47f9 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> <panel name="avatar_tattoo_color_panel"> - <texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択"/> - <texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択"/> - <texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択"/> - <color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/> + <texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択" width="70"/> + <texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択" width="70"/> + <texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択" width="70"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml index 4b3a7f880b..ef6d8cce47 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> グループ所有地を確認する権限がありません。 </panel.string> - <panel.string name="epmty_view_group_land_text"> - なし - </panel.string> <panel.string name="cant_view_group_accounting_text"> グループの会計情報を確認する権限がありません。 </panel.string> diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml index 96e0382975..a0c50c6122 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml @@ -15,17 +15,17 @@ <scroll_list name="notice_list"> <scroll_list.columns label="" name="icon"/> <scroll_list.columns label="件名" name="subject"/> - <scroll_list.columns label="送信者" name="from"/> + <scroll_list.columns label="送り主" name="from"/> <scroll_list.columns label="日付" name="date"/> </scroll_list> <text name="notice_list_none_found"> 見つかりませんでした </text> - <button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/> + <button label="新しい通知を作成" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成します"/> <button label="更新" label_selected="リスト更新" name="refresh_notices" tool_tip="通知リストを更新します"/> <panel label="新しい通知を作成" name="panel_create_new_notice"> <text name="lbl"> - 通知の作成 + 通知を作成 </text> <text name="lbl3"> 件名： @@ -39,7 +39,6 @@ <text name="string"> ここにアイテムをドラッグ＆ドロップして添付してください： </text> - <button label="持ち物" name="open_inventory" tool_tip="持ち物を開きます"/> <button label="取り外す" label_selected="添付物を削除" name="remove_attachment" tool_tip="あなたの通知から添付されたアイテムを削除します"/> <button label="送信" label_selected="送信" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="持ち物のアイテムをこのボックスにドラッグして、通知と一緒に送ります。 添付するには、そのアイテムのコピーと再販・プレゼントの権限があなたにある必要があります。"/> diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml index be203b0761..8a629be910 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml @@ -13,9 +13,6 @@ Ctrl キーを押しながらメンバー名をクリックすると 複数の人を選択できます。 </panel.string> - <panel.string name="donation_area"> - [AREA] 平方メートル - </panel.string> <filter_editor label="メンバーを選別" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="メンバー" name="name"/> diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml index 7fca66f90f..87477c2651 100644 --- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml @@ -18,6 +18,9 @@ <string name="acquired_date"> [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> <button name="back_btn" tool_tip="戻る"/> <text name="title" value="場所のプロフィール"/> <scroll_container name="place_scroll"> diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index 47d7a88b4c..c217af38ba 100644 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml @@ -8,15 +8,18 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="username_text"> - ユーザーネーム： + <text name="first_name_text"> + ファーストネーム： </text> - <line_editor label="ユーザーネーム" name="username_edit" tool_tip="[SECOND_LIFE] ユーザーネーム"/> + <line_editor label="最初" name="first_name_edit" tool_tip="[SECOND_LIFE] ファーストネーム"/> + <text name="last_name_text"> + ラストネーム： + </text> + <line_editor label="最後" name="last_name_edit" tool_tip="[SECOND_LIFE] ラストネーム"/> <text name="password_text"> パスワード： </text> <check_box label="パスワードを記憶" name="remember_check"/> - <button label="ログイン" left_pad="30" name="connect_btn" width="60"/> <text name="start_location_text"> 開始地点： </text> @@ -25,6 +28,7 @@ <combo_box.item label="ホーム" name="MyHome"/> <combo_box.item label="＜地域名を入力＞" name="Typeregionname"/> </combo_box> + <button label="ログイン" left_pad="30" name="connect_btn" width="60"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index ff968696b7..9981d13bbb 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -9,20 +9,62 @@ <text name="ItemcountText"> アイテム： </text> + <menu_bar name="Inventory Menu"> + <menu label="ファイル" name="File"> + <menu_item_call label="開く" name="Open"/> + <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_item_call label="新しいウィンドウ" name="New Window"/> + <menu_item_call label="フィルターを表示" name="Show Filters"/> + <menu_item_call label="フィルターをリセット" name="Reset Current"/> + <menu_item_call label="すべてのフォルダを閉じる" name="Close All Folders"/> + <menu_item_call label="ごみ箱を空にする" name="Empty Trash"/> + <menu_item_call label="紛失物を空にする" name="Empty Lost And Found"/> + </menu> + <menu label="新規作成" name="Create"> + <menu_item_call label="フォルダ" name="New Folder"/> + <menu_item_call label="スクリプト" name="New Script"/> + <menu_item_call label="ノートカード" name="New Note"/> + <menu_item_call label="ジェスチャー" name="New Gesture"/> + <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> + <menu label="並べ替え" name="Sort"> + <menu_item_check label="名前順" name="By Name"/> + <menu_item_check label="日付順" name="By Date"/> + <menu_item_check label="フォルダを常に名前順に並べる" name="Folders Always By Name"/> + <menu_item_check label="システムフォルダを上に並べる" name="System Folders To Top"/> + </menu> + </menu_bar> <filter_editor label="持ち物をフィルター" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="持ち物" name="All Items"/> - <recent_inventory_panel label="最新" name="Recent Items"/> + <inventory_panel label="最新" name="Recent Items"/> </tab_container> - <layout_stack name="bottom_panel"> - <layout_panel name="options_gear_btn_panel"> - <button name="options_gear_btn" tool_tip="オプションを表示します"/> - </layout_panel> - <layout_panel name="add_btn_panel"> - <button name="add_btn" tool_tip="新しいアイテムを追加します"/> - </layout_panel> - <layout_panel name="trash_btn_panel"> - <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/> - </layout_panel> - </layout_stack> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="その他のオプションを表示します"/> + <button name="add_btn" tool_tip="新しいアイテムを追加します"/> + <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml deleted file mode 100644 index e9e36e4842..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="オプションを表示します"/> - <button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml deleted file mode 100644 index fd03e6b89e..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="オプションを表示します"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index b897e1d748..9de04f0d6a 100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml @@ -41,6 +41,21 @@ <string name="acquired_date"> [year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] </string> + <string name="icon_PG" value="parcel_drk_PG"/> + <string name="icon_M" value="parcel_drk_M"/> + <string name="icon_R" value="parcel_drk_R"/> + <string name="icon_Voice" value="parcel_drk_Voice"/> + <string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/> + <string name="icon_Fly" value="parcel_drk_Fly"/> + <string name="icon_FlyNo" value="parcel_drk_FlyNo"/> + <string name="icon_Push" value="parcel_drk_Push"/> + <string name="icon_PushNo" value="parcel_drk_PushNo"/> + <string name="icon_Build" value="parcel_drk_Build"/> + <string name="icon_BuildNo" value="parcel_drk_BuildNo"/> + <string name="icon_Scripts" value="parcel_drk_Scripts"/> + <string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/> + <string name="icon_Damage" value="parcel_drk_Damage"/> + <string name="icon_DamageNo" value="parcel_drk_DamageNo"/> <button name="back_btn" tool_tip="戻る"/> <text name="title" value="場所のプロフィール"/> <scroll_container name="place_scroll"> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 86f880de09..e5780697b1 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -45,7 +45,7 @@ </text> <check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/> <check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/> - <check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/> + <check_box label="チャット履歴に文字だけ表示する" name="plain_text_chat_history"/> <text name="show_ims_in_label"> IM の表示方法： </text> 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 8a50581075..8df829c296 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="表示" name="Display panel"> + <text name="WindowSizeLabel"> + ウィンドウ・サイズ： + </text> + <check_box label="全画面" name="windowed mode"/> + <combo_box 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 サイズ： + </text> <text name="QualitySpeed"> クオリティとスピード： </text> @@ -49,7 +63,6 @@ m </text> <slider label="最大パーティクル数：" name="MaxParticleCount"/> - <slider label="簡略化せずに描画するアバターの最大数：" name="MaxNumberAvatarDrawn"/> <slider label="ポストプロセス品質：" name="RenderPostProcess"/> <text name="MeshDetailText"> メッシュ詳細： @@ -85,8 +98,8 @@ ライティング詳細： </text> <radio_group name="LightingDetailRadio"> - <radio_item label="太陽と月のみ" name="SunMoon" value="0"/> - <radio_item label="近くのローカルサイト" name="LocalLights" value="1"/> + <radio_item label="太陽と月のみ" name="SunMoon"/> + <radio_item label="近くのローカルサイト" name="LocalLights"/> </radio_group> <text name="TerrainDetailText"> 地形詳細： diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index 54ec24773f..b72fac1a7c 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml @@ -18,7 +18,7 @@ <text left_delta="70" name="region_type"> 不明 </text> - <check_box label="地形編集をブロック" name="block_terraform_check"/> + <check_box label="土地整備をブロック" name="block_terraform_check"/> <check_box label="飛行をブロック" name="block_fly_check"/> <check_box label="ダメージを許可" name="allow_damage_check"/> <check_box label="プッシュを制限" name="restrict_pushobject"/> diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 9e442ce091..14fc0b4c22 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -22,7 +22,7 @@ 4（高） </text> <text name="height_text_lbl5"> - 地形テクスチャの隆起範囲 + テクスチャ標高範囲 </text> <text name="height_text_lbl6"> 北西 @@ -45,7 +45,7 @@ <spinner label="高" name="height_range_spin_2"/> <spinner label="高" name="height_range_spin_3"/> <text name="height_text_lbl10"> - 数値は上のテクスチャが調和する範囲を示します。 + 数値は上のテクスチャのブレンド範囲を示します。 </text> <text name="height_text_lbl11"> 計測単位はメートルで、「低」の値は、1番のテクスチャの高さの diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml index 58e396877c..c1bf81f7e7 100644 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/places/[SEARCH_TERM]をお試しください。"/> - <no_visible_tabs_text name="no_teleports_msg" value="テレポートの履歴には何も情報がありません。[secondlife:///app/search/places/ Search]をお試しください。"/> <accordion_tab name="today" title="今日"/> <accordion_tab name="yesterday" title="昨日"/> <accordion_tab name="2_days_ago" title="2日前"/> diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml deleted file mode 100644 index 530f0fb59d..0000000000 --- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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 30cef9ccc0..94be8ba73d 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="アウトフィット" name="appearance panel"> <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"/> - <text name="currentlook_status"> - （状態） + <button label="編集" name="editappearance_btn"/> + <text name="currentlook_title"> + （保存されていません） </text> <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"/> + <button label="装着" name="wear_btn"/> + <button label="新しいアウトフィット" name="newlook_btn"/> </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 519b69799b..c6a13fa212 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,15 +15,9 @@ <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> - <panel.string name="origin_inventory"> - （持ち物） - </panel.string> - <panel.string name="origin_inworld"> - （インワールド） - </panel.string> - <text name="title" value="アイテムのプロフィール"/> - <text name="origin" value="（持ち物）"/> - <panel label="" name="item_profile"> + <text name="title" value="オブジェクトのプロフィール"/> + <text name="where" value="（持ち物）"/> + <panel label=""> <text name="LabelItemNameTitle"> 名前： </text> @@ -33,17 +27,23 @@ <text name="LabelCreatorTitle"> 制作者： </text> - <text name="LabelCreatorName"/> + <text name="LabelCreatorName"> + Nicole Linden + </text> <button label="プロフィール" name="BtnCreator"/> <text name="LabelOwnerTitle"> 所有者： </text> - <text name="LabelOwnerName"/> + <text name="LabelOwnerName"> + Thrax Linden + </text> <button label="プロフィール" name="BtnOwner"/> <text name="LabelAcquiredTitle"> 取得： </text> - <text name="LabelAcquiredDate"/> + <text name="LabelAcquiredDate"> + Wed May 24 12:50:46 2006 + </text> <panel name="perms_inv"> <text name="perm_modify"> あなたができること： @@ -58,20 +58,20 @@ <text name="GroupLabel"> グループ： </text> - <check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。譲渡しない限り、役割制限を有効にはできません。"/> + <check_box label="共有" name="CheckShareWithGroup" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/> <text name="NextOwnerLabel"> 次の所有者： </text> <check_box label="修正" name="CheckNextOwnerModify"/> <check_box label="コピー" name="CheckNextOwnerCopy"/> - <check_box label="再販・プレゼント" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます"/> + <check_box label="再販・プレゼント" name="CheckNextOwnerTransfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/> </panel> - <check_box label="販売中" name="CheckPurchase"/> + <check_box label="販売する" name="CheckPurchase"/> <combo_box name="combobox sale copy"> <combo_box.item label="コピー" name="Copy"/> <combo_box.item label="オリジナル" name="Original"/> </combo_box> - <spinner label="価格：L$" name="Edit Cost"/> + <spinner label="価格： L$" name="Edit Cost"/> </panel> <panel name="button_panel"> <button label="キャンセル" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml index 212cac0a5b..f79d3dbd6b 100644 --- a/indra/newview/skins/default/xui/nl/floater_tools.xml +++ b/indra/newview/skins/default/xui/nl/floater_tools.xml @@ -33,10 +33,7 @@ <combo_box.item name="Reference" label="Referentie" /> </combo_box> - <check_box left="136" name="checkbox uniform"/> - <text name="checkbox uniform label"> - Beide zijden uitrekken - </text> + <check_box left="136" label="Beide zijden uitrekken" name="checkbox uniform"/> <check_box left="136" label="Texturen uitrekken" name="checkbox stretch textures"/> <check_box left="136" label="Gebruik grid" name="checkbox snap to grid"/> <button label="Opties..." label_selected="Opties..." name="Options..." height="18" bottom_delta="-15"/> @@ -406,7 +403,7 @@ <text name="glow label"> Gloed </text> - <check_box label="Volledige helderheid" name="checkbox fullbright"/> + <check_box label="Volledige helderheid" name="checkbox fullbright" bottom_delta="-21"/> <text name="tex gen"> Mapping </text> 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 2fee2ecf05..bc14f92126 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="events_mature_chk"/> - <check_box label="Adult" name="events_adult_chk"/> + <check_box label="Mature" name="event_mature_chk"/> + <check_box label="Adult" name="event_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/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml deleted file mode 100644 index 36ac88f7f6..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="KUP WALUTĘ"/> diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml index 4f1430623a..1e5f3e6d46 100644 --- a/indra/newview/skins/default/xui/pl/floater_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini-Mapa"> <floater.string name="mini_map_north"> N </floater.string> @@ -24,9 +24,6 @@ <floater.string name="mini_map_northwest"> NW </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/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml index cfdac165cd..12cda04e10 100644 --- a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml @@ -5,7 +5,7 @@ Pamiętaj, opłaty za reklamy nie podlegają prawu zwrotu. </text> - <spinner label="Cena: L$" name="price_for_listing" tool_tip="Cena za umieszczenie reklamy w wyszukiwarce." value="50"/> + <spinner label="Cena za Reklamę:" name="price_for_listing" tool_tip="Cena za umieszczenie reklamy w wyszukiwarce." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Więcej info (link do pomocy) diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index bb2de773f0..6f71488347 100644 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=""> - <floater.string name="real_url"> - http://secondlife.com/app/tos/ - </floater.string> - <floater.string name="loading_url"> - data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E - </floater.string> <button label="Kontynuuj" label_selected="Kontynuuj" name="Continue"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <check_box label="Zgadzam się na Warunki Serwisu (Terms of Service) i Politykę Prywatności (Privacy Policy)" name="agree_chk"/> <text name="tos_heading"> Proszę dokładnie przeczytać następujące Warunki Serwisu (Terms of Service) i Politykę Prywatności (Privacy Policy). Musisz zaakceptować umowę żeby kontynuować logowanie do [SECOND_LIFE]. </text> + <text_editor name="tos_text"> + TOS_TEXT + </text_editor> + <string name="real_url"> + http://secondlife.com/app/tos/ + </string> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml deleted file mode 100644 index e2d1fb77e9..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Miejsca" name="voice_effects" title="VOICE MORPHING"> - <string name="no_voice_effect"> - (Bez Voice Morphing) - </string> - <string name="active_voice_effect"> - (Aktywny) - </string> - <string name="unsubscribed_voice_effect"> - (Bez subskrybcji) - </string> - <string name="new_voice_effect"> - (Nowy!) - </string> - <text name="preview_text"> - Przeglądaj - </text> - <text name="status_text"> - Nagraj próbkę, następnie kliknij na głos aby usłyszeć jego brzmienie. - </text> - <button label="Nagraj" name="record_btn" tool_tip="Nagraj próbkę swojego głosu."/> - <button label="Zatrzymaj" name="record_stop_btn"/> - <text name="voice_morphing_link"> - [[URL] Subskrybuj teraz] - </text> - <scroll_list name="voice_effect_list" tool_tip="Nagraj próbke swojego głosu, następnie kliknij aby odsłuchać."> - <scroll_list.columns label="Nazwa głosu" name="name"/> - <scroll_list.columns label="Termin zakończenia subskrypcji" name="expires"/> - </scroll_list> -</floater> diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml index 8a3269a923..4872956cc2 100644 --- a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml @@ -10,7 +10,7 @@ <menu_item_call label="Raport" name="abuse"/> <menu_item_call label="Unieruchom" name="Freeze..."/> <menu_item_call label="Wyrzuć" name="Eject..."/> - <menu_item_call label="Debugowanie tekstur" name="Debug..."/> + <menu_item_call label="Debugowanie" name="Debug..."/> <menu_item_call label="Przybliż" name="Zoom In"/> <menu_item_call label="Zapłać" name="Pay..."/> <menu_item_call label="Sprawdź" name="Object Inspect"/> diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml index 9a1603e212..832c2f9c96 100644 --- a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml @@ -10,7 +10,7 @@ <menu_item_call label="Raport" name="abuse"/> <menu_item_call label="Unieruchom" name="Freeze..."/> <menu_item_call label="Wyrzuć" name="Eject..."/> - <menu_item_call label="Debugowanie tekstur" name="Debug..."/> + <menu_item_call label="Debug" name="Debug..."/> <menu_item_call label="Przybliż" name="Zoom In"/> <menu_item_call label="Zapłać" name="Pay..."/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml index aa415db6ea..0bca90168f 100644 --- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml @@ -20,11 +20,8 @@ <context_menu label="Odłącz ▶" name="Object Detach"/> <menu_item_call label="Odłącz Wszystko" name="Detach All"/> </context_menu> - <menu_item_call label="Zmień strój" name="Chenge Outfit"/> - <menu_item_call label="Edytuj mój strój" name="Edit Outfit"/> - <menu_item_call label="Edytuj mój kształt" name="Edit My Shape"/> + <menu_item_call label="Mój Wygląd" name="Appearance..."/> <menu_item_call label="Moi Znajomi" name="Friends..."/> <menu_item_call label="Moje Grupy" name="Groups..."/> <menu_item_call label="Mój Profil" name="Profile..."/> - <menu_item_call label="Debugowanie tekstur" name="Debug..."/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml deleted file mode 100644 index 4e5407601b..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Attachment"> - <menu_item_call label="Odłącz" name="detach"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml deleted file mode 100644 index ee60d3feb6..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Body"> - <menu_item_call label="Zastąp" name="replace"/> - <menu_item_call label="Edytuj" name="edit"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml deleted file mode 100644 index ad43900137..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="COF Clothing"> - <menu_item_call label="Zdejmij" name="take_off"/> - <menu_item_call label="Edytuj" name="edit"/> - <menu_item_call label="Zastąp" name="replace"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml deleted file mode 100644 index e8aaa2cf82..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear COF"> - <menu label="Nowe Ubranie" name="COF.Gear.New_Clothes"/> - <menu label="Nowe części ciała" name="COF.Geear.New_Body_Parts"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml deleted file mode 100644 index 578e270fed..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_edit.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu label="Edycja" name="Edit"> - <menu_item_call label="Cofnij" name="Undo"/> - <menu_item_call label="Powtórz" name="Redo"/> - <menu_item_call label="Wytnij" name="Cut"/> - <menu_item_call label="Kopiuj" name="Copy"/> - <menu_item_call label="Wklej" name="Paste"/> - <menu_item_call label="Usuń" name="Delete"/> - <menu_item_call label="Powiel" name="Duplicate"/> - <menu_item_call label="Zaznacz wszystko" name="Select All"/> - <menu_item_call label="Odznacz" name="Deselect"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml index 2ea3702663..ee2f202ee9 100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <menu name="Gear Menu"> <menu_item_call label="Wstań" name="stand_up"/> - <menu_item_call label="Zmień strój" name="change_outfit"/> + <menu_item_call label="Mój Wygląd" name="my_appearance"/> <menu_item_call label="Mój Profil" name="my_profile"/> <menu_item_call label="Moi Znajomi" name="my_friends"/> <menu_item_call label="Moje Grupy" name="my_groups"/> - <menu_item_call label="Debugowanie tekstur" name="Debug..."/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml deleted file mode 100644 index 5ef0f2f7a4..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="InvOfferChiclet Menu"> - <menu_item_call label="Zamknij" name="Close"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml deleted file mode 100644 index ed754e36a7..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Outfit"> - <menu_item_call label="Załóż - Zastąp obecny strój" name="wear"/> - <menu_item_call label="Załóż - Dodaj do bieżącego stroju" name="wear_add"/> - <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off"/> - <menu label="Nowe ubranie" name="New Clothes"> - <menu_item_call label="Nowa koszula" name="New Shirt"/> - <menu_item_call label="Nowe spodnie" name="New Pants"/> - <menu_item_call label="Nowe buty" name="New Shoes"/> - <menu_item_call label="Nowe skarpetki" name="New Socks"/> - <menu_item_call label="Nowa kurtka" name="New Jacket"/> - <menu_item_call label="Nowa spódnica" name="New Skirt"/> - <menu_item_call label="Nowe rękawiczki" name="New Gloves"/> - <menu_item_call label="Nowa podkoszulka" name="New Undershirt"/> - <menu_item_call label="Nowa bielizna" name="New Underpants"/> - <menu_item_call label="Nowe alpha" name="New Alpha"/> - <menu_item_call label="Nowy tatuaż" name="New Tattoo"/> - </menu> - <menu label="Nowe części ciała" name="New Body Parts"> - <menu_item_call label="Nowy kształt" name="New Shape"/> - <menu_item_call label="Nowa skórka" name="New Skin"/> - <menu_item_call label="Nowe włosy" name="New Hair"/> - <menu_item_call label="Nowe oczy" name="New Eyes"/> - </menu> - <menu_item_call label="Zmień nazwę stroju" name="rename"/> - <menu_item_call label="Usuń strój" name="delete_outfit"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml deleted file mode 100644 index 998e25f38e..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit"> - <menu_item_call label="Załóż - Zastąp obecny strój" name="wear_replace"/> - <menu_item_call label="Załóż - Dodaj do obecnego stroju" name="wear_add"/> - <menu_item_call label="Zdejmij - Usuń z obecnego stroju" name="take_off"/> - <menu_item_call label="Edytuj strój" name="edit"/> - <menu_item_call label="Zmień nazwę stroju" name="rename"/> - <menu_item_call label="Usuń strój" name="delete"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml deleted file mode 100644 index 4bc65eca38..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<toggleable_menu name="save_outfit_menu"> - <menu_item_call label="Zapisz" name="save_outfit"/> - <menu_item_call label="Zapisz jako" name="save_as_new_outfit"/> -</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml deleted file mode 100644 index 256500a402..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="ScriptChiclet Menu"> - <menu_item_call label="Zamknij" name="Close"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml deleted file mode 100644 index 53536c8f1c..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_topinfobar"> - <menu_item_check label="Pokaż współprzędne" name="Show Coordinates"/> - <menu_item_check label="Pokaż O Posiadłości" name="Show Parcel Properties"/> - <menu_item_call label="Landmark" name="Landmark"/> - <menu_item_call label="Kopiuj" name="Copy"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml deleted file mode 100644 index b32e4adc5c..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Zastąp" name="wear_replace"/> - <menu_item_call label="Załóż" name="wear_wear"/> - <menu_item_call label="Dodaj" name="wear_add"/> - <menu_item_call label="Zdejmij/Odłącz" name="take_off_or_detach"/> - <menu_item_call label="Odłącz" name="detach"/> - <context_menu label="Dołącz do ▶" name="wearable_attach_to"/> - <context_menu label="Dołącz do załączników HUD ▶" name="wearable_attach_to_hud"/> - <menu_item_call label="Zdejmij" name="take_off"/> - <menu_item_call label="Edytuj" name="edit"/> - <menu_item_call label="Profil obiekty" name="object_profile"/> - <menu_item_call label="Pokaż oryginalny" name="show_original"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml deleted file mode 100644 index 4930bd7540..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> - <menu_item_call label="Edytuj strój" name="edit"/> -</menu> diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml deleted file mode 100644 index 6ee55133fe..0000000000 --- a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Wearing"> - <menu_item_call label="Edytuj strój" name="edit"/> -</context_menu> diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml deleted file mode 100644 index bac885e5d8..0000000000 --- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder--> -<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume--> -<accordion_tab name="Mockup Tab" title="Mockup Tab"/> diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml deleted file mode 100644 index cebb6e3cfe..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="wearable_item"> - <text name="item_name" value="..."/> - <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycję"/> - <panel name="btn_edit_panel"> - <button name="btn_edit" tool_tip="Edytuj ten kształt"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 560bfe78f4..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Switch" name="switch_btn"/> - <button label="Zakupy >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml deleted file mode 100644 index 17a6d1eb8b..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Dodaj +" name="add_btn"/> - <button label="Zakupy >" name="clothing_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml deleted file mode 100644 index 42d1ead400..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="wearable_item"> - <button name="btn_delete" tool_tip="Usuń ze stroju"/> - <text name="item_name" value="..."/> - <panel name="btn_lock" tool_tip="Nie masz pozwolenia na edycję"/> - <panel name="btn_edit_panel"> - <button name="btn_edit" tool_tip="Edytuj część stroju"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml deleted file mode 100644 index 970b994c20..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Załączniki"/> - <accordion_tab name="tab_clothing" title="Ubranie"/> - <accordion_tab name="tab_body_parts" title="Części ciała"/> - </accordion> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml deleted file mode 100644 index f9fba4d79f..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="deletable_wearable_item"> - <button name="btn_delete" tool_tip="Usuń ze stroju"/> - <text name="item_name" value="..."/> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml deleted file mode 100644 index 83210808f1..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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="Dodaj więcej obiektów tego typu"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml index 390a5313b5..5e7a3a8fa0 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml @@ -3,9 +3,7 @@ <panel name="avatar_eye_color_panel"> <texture_picker label="Iris" name="Iris" tool_tip="Kliknij aby wybrać teksturę"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="eyes_main_tab" title="Oczy"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="eyes_main_tab" title="Oczy"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml index 166e3c4551..8b16506d9c 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać teksturę"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="gloves_main_tab" title="Rękawiczki"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="gloves_main_tab" title="Rękawiczki"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml index cbcba97eb6..567ff10506 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml @@ -3,12 +3,10 @@ <panel name="avatar_hair_color_panel"> <texture_picker label="Tekstura" name="Texture" tool_tip="Kliknij aby wybrać teksturę"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="hair_color_tab" title="Kolor"/> - <accordion_tab name="hair_style_tab" title="Styl"/> - <accordion_tab name="hair_eyebrows_tab" title="Brwi"/> - <accordion_tab name="hair_facial_tab" title="Twarzy"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="hair_color_tab" title="Kolor"/> + <accordion_tab name="hair_style_tab" title="Styl"/> + <accordion_tab name="hair_eyebrows_tab" title="Brwi"/> + <accordion_tab name="hair_facial_tab" title="Twarzy"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml index 4adac604f4..247d63c5a3 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="pants_main_tab" title="Spodnie"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="pants_main_tab" title="Spodnie"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml index 54f9fdc21c..3cacbd7fdd 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml @@ -1,26 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <string name="meters"> - Metry - </string> - <string name="feet"> - Feet - </string> - <string name="height"> - Wysokość: - </string> - <text name="avatar_height"/> - <panel label="Koszula" name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="shape_body_tab" title="Ciało"/> - <accordion_tab name="shape_head_tab" title="Głowa"/> - <accordion_tab name="shape_eyes_tab" title="Oczy"/> - <accordion_tab name="shape_ears_tab" title="Uszy"/> - <accordion_tab name="shape_nose_tab" title="Nos"/> - <accordion_tab name="shape_mouth_tab" title="Usta"/> - <accordion_tab name="shape_chin_tab" title="Podbródek"/> - <accordion_tab name="shape_torso_tab" title="Tors"/> - <accordion_tab name="shape_legs_tab" title="Nogi"/> - </accordion> + <panel name="avatar_sex_panel"> + <text name="gender_text"> + Płeć: + </text> + <radio_group name="sex_radio"> + <radio_item label="Kobieta" name="radio"/> + <radio_item label="Mężczyzna" name="radio2"/> + </radio_group> </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shape_body_tab" title="Ciało"/> + <accordion_tab name="shape_head_tab" title="Głowa"/> + <accordion_tab name="shape_eyes_tab" title="Oczy"/> + <accordion_tab name="shape_ears_tab" title="Uszy"/> + <accordion_tab name="shape_nose_tab" title="Nos"/> + <accordion_tab name="shape_mouth_tab" title="Usta"/> + <accordion_tab name="shape_chin_tab" title="Podbródek"/> + <accordion_tab name="shape_torso_tab" title="Tułów"/> + <accordion_tab name="shape_legs_tab" title="Nogi"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml index 3bcf992d4d..27d8981e80 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać grafikę"/> <color_swatch label="Kolor/Odcień" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="shirt_main_tab" title="Spódnica"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shirt_main_tab" title="Spódnica"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml index e2c00c0506..09eb1008e8 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="shoes_main_tab" title="Buty"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shoes_main_tab" title="Buty"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml index 9e0acd3cec..617aad8650 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml @@ -5,12 +5,10 @@ <texture_picker label="Górny tatuaż" name="Upper Tattoos" tool_tip="Kliknij aby wybrać teksturę"/> <texture_picker label="Dolny tatuaż" name="Lower Tattoos" tool_tip="Kliknij aby wybrać teksturę"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="skin_color_tab" title="Kolor skórki"/> - <accordion_tab name="skin_face_tab" title="Szczegóły twarzy"/> - <accordion_tab name="skin_makeup_tab" title="Makijaż"/> - <accordion_tab name="skin_body_tab" title="Szczegóły ciała"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skin_color_tab" title="Kolor skórki"/> + <accordion_tab name="skin_face_tab" title="Szczegóły twarzy"/> + <accordion_tab name="skin_makeup_tab" title="Makijaż"/> + <accordion_tab name="skin_body_tab" title="Szczegóły budowy ciała"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml index 3fa9cefeb6..f89148ffac 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="skirt_main_tab" title="Spódnica"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skirt_main_tab" title="Spódnica"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml index bb2cd637b5..5481c73804 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="socks_main_tab" title="Skarpetki"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="socks_main_tab" title="Skarpetki"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml index 010d9b53d9..94034aa8ab 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać kolor"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="underpants_main_tab" title="Bielizna"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="underpants_main_tab" title="Bielizna"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml index 63ae1215e0..72b72b76de 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml @@ -4,9 +4,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> - <panel name="accordion_panel"> - <accordion name="wearable_accordion"> - <accordion_tab name="undershirt_main_tab" title="Podkoszulek"/> - </accordion> - </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="undershirt_main_tab" title="Podkoszulek"/> + </accordion> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml index acceb88711..a52b7f7745 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> Nie masz pozwolenia na oglądanie Posiadłości Grupy. </panel.string> - <panel.string name="epmty_view_group_land_text"> - Brak wstępu - </panel.string> <panel.string name="cant_view_group_accounting_text"> Nie masz dostępu do konta, finansów Grupy. </panel.string> diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index 5526694863..8a422e2586 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml @@ -12,9 +12,6 @@ Możesz dodawać i usuwać Funkcje przypisane do Członków. Możesz wybrać wielu Członków naciskając Ctrl i klikając na ich imionach. </panel.string> - <panel.string name="donation_area"> - [AREA] m² - </panel.string> <filter_editor label="Filtruj Członków" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Członek" name="name"/> @@ -78,15 +75,21 @@ Istnieje wiele Przywilei. <text name="static"> Nazwa Funkcji </text> - <line_editor name="role_name"/> + <line_editor name="role_name"> + Liczba + </line_editor> <text name="static3"> Nazwa Funkcji </text> - <line_editor name="role_title"/> + <line_editor name="role_title"> + (proszę czekać) + </line_editor> <text name="static2"> Opis </text> - <text_editor name="role_description"/> + <text_editor name="role_description"> + (proszę czekać) + </text_editor> <text name="static4"> Przypisane Funkcje </text> @@ -101,6 +104,9 @@ Istnieje wiele Przywilei. </scroll_list> </panel> <panel name="actions_footer"> + <text name="static"> + Opis Przywileju + </text> <text_editor name="action_description"> Przywilej 'Usuń Członka z Grupy'. Tylko Właściciel może usunąć innego Właściciela. </text_editor> diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml index 84d1982440..ffd75994cb 100644 --- a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml @@ -20,7 +20,7 @@ <button label="Dzwoń" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> - <button label="Zakończ rozmowę" name="end_call_btn"/> + <button label="Zakończ Rozmowę" name="end_call_btn"/> </layout_panel> <layout_panel name="voice_ctrls_btn_panel"> <button label="Przełączniki Głosu" name="voice_ctrls_btn"/> diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml deleted file mode 100644 index d18047fbcf..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="inventory_item"> - <text name="item_name" value="..."/> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index 5e4955c28c..6b0061926b 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -8,31 +8,24 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="username_text"> - Użytkownik: - </text> - <line_editor label="Użytkownik" name="username_edit" tool_tip="[SECOND_LIFE] Użytkownik"/> - <text name="password_text"> - Hasło: + <text name="first_name_text"> + Imię: </text> + <line_editor label="Imię" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Nazwisko" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> <check_box label="Zapamiętaj Hasło" name="remember_check"/> - <button label="Połącz" name="connect_btn"/> <text name="start_location_text"> Rozpocznij w: </text> <combo_box name="start_location_combo"> - <combo_box.item label="Ostatnie Miejsce" name="MyLastLocation"/> <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> - <combo_box.item label="<Wpisz Region>" name="Typeregionname"/> </combo_box> + <button label="Połącz" name="connect_btn"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> Utwórz nowe konto </text> - <text name="forgot_password_text"> - Nie pamiętasz hasła? - </text> <text name="login_help"> Potrzebujesz pomocy z logowaniem się? </text> diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml deleted file mode 100644 index 2c5e2a3f61..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- Side tray Outfit Edit panel --> -<panel label="Edytuj strój" name="outfit_edit"> - <string name="No Outfit" value="Brak stroju"/> - <string name="unsaved_changes" value="Zmiany niezachowane"/> - <string name="now_editing" value="Obecnie edytujesz"/> - <panel.string name="not_available"> - (N\A) - </panel.string> - <panel.string name="unknown"> - (nieznany) - </panel.string> - <string name="Filter.All" value="Wszystko"/> - <string name="Filter.Clothes/Body" value="Ubrania/Ciało"/> - <string name="Filter.Objects" value="Obiekty"/> - <string name="Filter.Clothing" value="Ubranie"/> - <string name="Filter.Bodyparts" value="Części ciała"/> - <string name="replace_body_part" value="Kliknij aby zastąpić Twój obecny ksztalt"/> - <text name="title" value="Edytuj strój"/> - <panel label="bottom_panel" name="header_panel"> - <panel label="bottom_panel" name="outfit_name_and_status"> - <text name="status" value="Trwa edycja..."/> - <text name="curr_outfit_name" value="[Current Outfit]"/> - </panel> - </panel> - <layout_stack name="im_panels"> - <layout_panel label="Panel kontrolny IM" name="outfit_wearables_panel"> - <layout_stack name="filter_panels"> - <layout_panel name="add_button_and_combobox"> - <button label="Dodaj..." name="show_add_wearables_btn" tool_tip="Otwórz/Zamknij"/> - </layout_panel> - <layout_panel name="filter_panel"> - <filter_editor label="Filtruj częśći stroju w Szafie" name="look_item_filter"/> - </layout_panel> - </layout_stack> - </layout_panel> - <layout_panel name="add_wearables_panel"> - <button label="Załóż obiekt" name="plus_btn"/> - </layout_panel> - </layout_stack> - <panel name="no_add_wearables_button_bar"> - <button name="shop_btn_1" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/> - </panel> - <panel name="add_wearables_button_bar"> - <button name="shop_btn_2" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/> - </panel> - <panel name="save_revert_button_bar"> - <button label="Zapisz" name="save_btn"/> - <button label="Cofnij zmiany" name="revert_btn" tool_tip="Cofnij do ostatniej zapisanej wersji"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml index 2d2ada25e8..5e7fd46754 100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Rzeczy" name="Outfits"> - <panel.string name="wear_outfit_tooltip"> - Załóż zaznaczony strój - </panel.string> - <panel.string name="wear_items_tooltip"> - Załóż wybrane obiekty - </panel.string> <tab_container name="appearance_tabs"> - <panel label="MOJE UBRANIA" name="outfitslist_tab"/> - <panel label="ZAŁOŻONE" name="cof_tab"/> + <inventory_panel label="MOJE UBRANIA" name="outfitslist_tab"/> + <inventory_panel label="ZAŁOŻONE" name="cof_tab"/> </tab_container> <panel name="bottom_panel"> - <button label="Zapisz jako" name="save_btn"/> + <button name="options_gear_btn" tool_tip="Pokaż opcje dodatkowe"/> + <dnd_button name="trash_btn" tool_tip="Usuń zaznaczony obiekt"/> + <button label="Zapisz Ubranie" name="make_outfit_btn" tool_tip="Zapisz wygląd jako ubranie"/> <button label="Ubierz" name="wear_btn" tool_tip="Ubierz wybrany obiekt"/> + <button label="M" name="look_edit_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml deleted file mode 100644 index ed3057399d..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/> - <button name="trash_btn" tool_tip="Usuń wybrany strój"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml deleted file mode 100644 index 5559c151e7..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml index 23f724317e..c7f3f00d98 100644 --- a/indra/newview/skins/default/xui/pl/panel_places.xml +++ b/indra/newview/skins/default/xui/pl/panel_places.xml @@ -5,12 +5,11 @@ <filter_editor label="Filtruj Moje Miejsca" name="Filter"/> <panel name="button_panel"> <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do wybranego miejsca"/> - <button label="Mapa" name="map_btn" tool_tip="Pokaż miejsce na Mapie Świata"/> + <button label="Mapa" name="map_btn"/> <button label="Edytuj" name="edit_btn" tool_tip="Edytuj informacje landmarka"/> <button label="▼" name="overflow_btn" tool_tip="Pokaż opcje dodatkowe"/> - <button label="Zapisz" name="save_btn"/> - <button label="Anuluj" name="cancel_btn"/> <button label="Zamknij" name="close_btn"/> - <button label="Profil" name="profile_btn" tool_tip="Pokaż opis miejsca"/> + <button label="Anuluj" name="cancel_btn"/> + <button label="Zapisz" name="save_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml index de4fa10b73..9905bbbc18 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml @@ -13,7 +13,6 @@ </text> <check_box label="Buduj/Edytuj" name="edit_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery aktywując i deaktywując tryb edycji"/> <check_box label="Wygląd" name="appearance_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas trybu edycji"/> - <check_box initial_value="prawda" label="Schowek" name="appearance_sidebar_positioning" tool_tip="Użyj automatycznego pozycjonowania kamery dla schowka"/> <check_box label="Pokaż w trybie widoku panoramicznego" name="first_person_avatar_visible"/> <check_box label="Aktywacja klawiszy strzałek do poruszania awatarem" name="arrow_keys_move_avatar_check"/> <check_box label="kliknij-kliknij-przytrzymaj, aby uruchomić" name="tap_tap_hold_to_run"/> @@ -21,9 +20,6 @@ <check_box label="Czat Chmurkowy" name="bubble_text_chat"/> <slider label="Intensywność" name="bubble_chat_opacity"/> <color_swatch name="background" tool_tip="Wybierz kolor czatu w chmurce"/> - <text name="UI Size:"> - Rozmiar UI - </text> <check_box label="Pokaż błędy skryptu w:" name="show_script_errors"/> <radio_group name="show_location"> <radio_item label="Czat Lokalny" name="0"/> @@ -33,5 +29,4 @@ <line_editor label="Naciśnij Mów by rozpocząć komunikację głosową" name="modifier_combo"/> <button label="wybierz Klawisz" name="set_voice_hotkey_button"/> <button label="Środkowy Przycisk Myszki" name="set_voice_middlemouse_button" tool_tip="Zresetuj do środkowego przycisku myszy"/> - <button label="Inne urządzenia" name="joystick_setup_button"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml index 98fdffeb50..f74f4f2333 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml @@ -38,10 +38,10 @@ <radio_item label="Użyj zewnętrznej przeglądarki (IE, Firefox, Safari)" name="external" tool_tip="Używaj zewnętrznej przeglądarki. Nie jest to rekomendowane w trybie pełnoekranowym." value="1"/> <radio_item label="Używaj wbudowanej przeglądarki." name="internal" tool_tip="Używaj wbudowanej przeglądarki. Ta przeglądarka otworzy nowe okno w [APP_NAME]." value=""/> </radio_group> - <check_box label="Zezwalaj na wtyczki" name="browser_plugins_enabled"/> - <check_box label="Akceptuj ciasteczka z Internetu" name="cookies_enabled"/> - <check_box label="Zezwalaj na Javascript" name="browser_javascript_enabled"/> - <check_box label="Używaj Serwera Proxy" name="web_proxy_enabled"/> + <check_box initial_value="prawda" label="Zezwalaj na wtyczki" name="browser_plugins_enabled"/> + <check_box initial_value="prawda" label="Akceptuj ciasteczka z Internetu" name="cookies_enabled"/> + <check_box initial_value="prawda" label="Zezwalaj na Javascript" name="browser_javascript_enabled"/> + <check_box initial_value="false" label="Używaj Serwera Proxy" name="web_proxy_enabled"/> <text name="Proxy location"> Lokalizacja Proxy: </text> diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml index b43bd96536..d143843eaf 100644 --- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Szukaj]."/> - <no_visible_tabs_text name="no_teleports_msg" value="Historia teleportacji jest pusta. Spróbuj [secondlife:///app/search/places/ Szukaj]."/> <accordion_tab name="today" title="Dzisiaj"/> <accordion_tab name="yesterday" title="Wczoraj"/> <accordion_tab name="2_days_ago" title="2 dni temu"/> + 5 <accordion_tab name="3_days_ago" title="3 dni temu"/> <accordion_tab name="4_days_ago" title="4 dni temu"/> <accordion_tab name="5_days_ago" title="5 dni temu"/> diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml deleted file mode 100644 index f8a076424f..0000000000 --- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="panel_voice_effect"> - <string name="no_voice_effect"> - Wyłącz Voice Morph - </string> - <string name="preview_voice_effects"> - Przeglądaj Voice Morphing ▶ - </string> - <string name="get_voice_effects"> - Uzyskaj Voice Morphing ▶ - </string> - <combo_box name="voice_effect" tool_tip="Wybierz Voice Morph aby zmienić Twój głos"> - <combo_box.item label="Wyłącz Voice Morph" name="no_voice_effect"/> - </combo_box> -</panel> diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml index 2fc07aaaca..ecbf262777 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ubrania" name="appearance panel"> <string name="No Outfit" value="Bez Ubrania"/> - <string name="Unsaved Changes" value="Zmiany niezachowane"/> - <string name="Now Wearing" value="Obecnie założone..."/> - <string name="Changing outfits" value="Zmiana stroju"/> <panel name="panel_currentlook"> - <button label="E" name="editappearance_btn"/> - <button label="O" name="openoutfit_btn"/> - <text name="currentlook_status"> - (Status) + <text name="currentlook_title"> + (niezapisane) </text> - <button label="" name="edit_outfit_btn" tool_tip="Edytuj ten strój"/> </panel> <filter_editor label="Przeglądaj Ubrania" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml index 9e5280bcc4..d7a813b1b7 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml @@ -2,12 +2,10 @@ <panel label="Rzeczy" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> <panel name="button_panel"> - <button label="Profil" name="info_btn" tool_tip="Pokaż profil obiektu"/> - <button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/> - <button label="Zakupy" name="shop_btn" tool_tip="Otwórz stronę Marketplace"/> - <button label="Ubierz" name="wear_btn" tool_tip="Załóż wybrany strój"/> + <button label="Profil" name="info_btn"/> + <button label="Ubierz" name="wear_btn"/> <button label="Odtwarzaj" name="play_btn"/> - <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj się w wybrane miejsce"/> + <button label="Teleportuj" name="teleport_btn"/> </panel> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml index 84b5471e49..17cd13f970 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml @@ -37,7 +37,7 @@ Sprzedaż mieszana </panel.string> <text name="title" value="Profil Obiektu"/> - <text name="where" value="(W Świecie)"/> + <text name="where" value="(w świecie)"/> <panel label="" name="properties_panel"> <text name="Name:"> Nazwa: diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml index 9473ee7ce9..5fb64f64b3 100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml @@ -3,48 +3,41 @@ <floater.string name="InvalidAvatar"> AVATAR INVÁLIDO </floater.string> + <text name="composite_label"> + Texturas compostas + </text> + <button label="Tombar" label_selected="Tombar" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="label"> - Pronto -Texturas - </text> - <text name="composite_label"> - Compósito: -Texturas - </text> - <button label="Enviar IDs para painel" label_selected="Dump" name="Dump"/> - <panel name="scroll_content_panel"> - <texture_picker label="Cabelo" name="hair-baked"/> - <texture_picker label="Cabelo" name="hair_grain"/> - <texture_picker label="Cabelo alpha" name="hair_alpha"/> - <texture_picker label="Cabeça" name="head-baked"/> - <texture_picker label="Maquilagem" name="head_bodypaint"/> - <texture_picker label="Cabeça Alpha" name="head_alpha"/> - <texture_picker label="Tatuagem na cabeça" name="head_tattoo"/> - <texture_picker label="Olhos" name="eyes-baked"/> - <texture_picker label="Olho" name="eyes_iris"/> - <texture_picker label="Olhos Alpha" name="eyes_alpha"/> - <texture_picker label="Cintura acima" name="upper-baked"/> - <texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/> - <texture_picker label="Camiseta" name="upper_undershirt"/> - <texture_picker label="Luvas" name="upper_gloves"/> - <texture_picker label="Camisa" name="upper_shirt"/> - <texture_picker label="Jaqueta (cima)" name="upper_jacket"/> - <texture_picker label="Alpha de cima" name="upper_alpha"/> - <texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/> - <texture_picker label="Cintura para baixo" name="lower-baked"/> - <texture_picker label="Cintura para baixo" name="lower_bodypaint"/> - <texture_picker label="Roupa de baixo" name="lower_underpants"/> - <texture_picker label="Meias" name="lower_socks"/> - <texture_picker label="Sapatos" name="lower_shoes"/> - <texture_picker label="Calças" name="lower_pants"/> - <texture_picker label="Jaqueta" name="lower_jacket"/> - <texture_picker label="Alpha inferior" name="lower_alpha"/> - <texture_picker label="Tatuagem de baixo" name="lower_tattoo"/> - <texture_picker label="Saia" name="skirt-baked"/> - <texture_picker label="Saia" name="skirt"/> - </panel> + <texture_picker label="Cabelo" name="hair-baked"/> + <texture_picker label="Cabelo" name="hair_grain"/> + <texture_picker label="Cabelo alpha" name="hair_alpha"/> + <texture_picker label="Cabeça" name="head-baked"/> + <texture_picker label="Maquilagem" name="head_bodypaint"/> + <texture_picker label="Cabeça Alpha" name="head_alpha"/> + <texture_picker label="Tatuagem na cabeça" name="head_tattoo"/> + <texture_picker label="Olhos" name="eyes-baked"/> + <texture_picker label="Olho" name="eyes_iris"/> + <texture_picker label="Olhos Alpha" name="eyes_alpha"/> + <texture_picker label="Cintura acima" name="upper-baked"/> + <texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/> + <texture_picker label="Camiseta" name="upper_undershirt"/> + <texture_picker label="Luvas" name="upper_gloves"/> + <texture_picker label="Camisa" name="upper_shirt"/> + <texture_picker label="Jaqueta (cima)" name="upper_jacket"/> + <texture_picker label="Alpha de cima" name="upper_alpha"/> + <texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/> + <texture_picker label="Cintura para baixo" name="lower-baked"/> + <texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/> + <texture_picker label="Roupa de baixo" name="lower_underpants"/> + <texture_picker label="Meias" name="lower_socks"/> + <texture_picker label="Sapatos" name="lower_shoes"/> + <texture_picker label="Calças" name="lower_pants"/> + <texture_picker label="Jaqueta" name="lower_jacket"/> + <texture_picker label="Alpha inferior" name="lower_alpha"/> + <texture_picker label="Tatuagem de baixo" name="lower_tattoo"/> + <texture_picker label="Saia" name="skirt-baked"/> + <texture_picker label="Saia" name="skirt"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml deleted file mode 100644 index 24e41ac8c8..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_currency_html" title="COMPRAR MOEDA"/> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml index 5c5ee3b7a0..73b483acf2 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml @@ -124,6 +124,9 @@ contribuídas para cobrir este lote antes da aquisição se completar. <floater.string name="no_parcel_selected"> (nenhum lote selecionado) </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Região: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index 4f3729c623..7989ce66bc 100644 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml @@ -9,57 +9,35 @@ <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="camera_modes_title"> - Modos de câmera + <floater.string name="orbit_mode_title"> + Órbita </floater.string> <floater.string name="pan_mode_title"> - Pan zoom orbital + Pan </floater.string> - <floater.string name="presets_mode_title"> - Ângulos predefinidos + <floater.string name="avatar_view_mode_title"> + Predefinições </floater.string> <floater.string name="free_mode_title"> Visualizar objeto </floater.string> <panel name="controls"> - <panel name="preset_views_list"> - <panel_camera_item name="front_view"> - <panel_camera_item.text name="front_view_text"> - Vista frontal - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="group_view"> - <panel_camera_item.text name="side_view_text"> - Vista lateral - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="rear_view"> - <panel_camera_item.text name="rear_view_text"> - Vista de trás - </panel_camera_item.text> - </panel_camera_item> - </panel> - <panel name="camera_modes_list"> - <panel_camera_item name="object_view"> - <panel_camera_item.text name="object_view_text"> - Vista de objetos - </panel_camera_item.text> - </panel_camera_item> - <panel_camera_item name="mouselook_view"> - <panel_camera_item.text name="mouselook_view_text"> - Vista do mouse - </panel_camera_item.text> - </panel_camera_item> - </panel> + <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"/> - <joystick_track name="cam_track_stick" tool_tip="Move a câmera para cima e para baixo, direita e esquerda"/> + </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"/> </panel> </panel> <panel name="buttons"> - <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"/> + <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"/> </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 4b9553adfe..cdebe533bd 100644 --- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml @@ -16,13 +16,7 @@ entrou numa ligação de voz via conferência. </floater.string> <floater.string name="VoiceInviteGroup"> - 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? + entrou numa ligação de bate-papo de voz com o grupo [GROUP]. </floater.string> <text name="question"> Sair do [CURRENT_CHAT] e entrar neste bate-papo? diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml index 7475bdd5b8..2b0d6790f2 100644 --- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml @@ -7,28 +7,28 @@ <column label="Área" name="area"/> </scroll_list> <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/> - <button label="Mostrar no mapa" label_selected="Mapa" name="Show on Map" tool_tip="Mostrar terreno no mápa-mundi" width="130"/> + <button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Mostrar terreno na mápa-mundi" width="130"/> <text name="contrib_label"> - Contribuições de grupos: + Contribuições para os seus grupos: </text> <scroll_list name="grant list"> <column label="Grupo" name="group"/> <column label="Área" name="area"/> </scroll_list> <text name="allowed_label" width="380"> - Metragem permitida com o plano atual: + Propriedades de terreno permitidas com o plano de pagamento atual: </text> <text left_delta="390" name="allowed_text"> [AREA] m² </text> <text name="current_label"> - Metragem atual: + Propriedades de terrenos atuais: </text> <text left_delta="390" name="current_text"> [AREA] m² </text> <text name="available_label"> - Metragem disponível para compra: + Disponível para compra de terras: </text> <text left_delta="390" name="available_text"> [AREA] m² diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index 6f09a5e383..3a04528228 100644 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title=""> +<floater name="Map" title="Mini Mapa"> <floater.string name="mini_map_north"> N </floater.string> @@ -24,9 +24,6 @@ <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_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml index b1dc65e3af..9c02570076 100644 --- a/indra/newview/skins/default/xui/pt/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml @@ -6,48 +6,18 @@ <string name="walk_back_tooltip"> Andar para trás (flecha para baixo ou S) </string> - <string name="walk_left_tooltip"> - Andar para a esquerda (Shift + Seta esquerda ou A) - </string> - <string name="walk_right_tooltip"> - Andar para a direita (Shift + Seta direita ou D) - </string> <string name="run_forward_tooltip"> Correr para frente (flecha para cima ou W) </string> <string name="run_back_tooltip"> Correr para trás (flecha para baixo ou S) </string> - <string name="run_left_tooltip"> - Correr para a esquerda (Shift + Seta esquerda ou A) - </string> - <string name="run_right_tooltip"> - Correr para a direita (Shift + Seta direita ou D) - </string> <string name="fly_forward_tooltip"> Voar para frente (flecha para cima ou W) </string> <string name="fly_back_tooltip"> Voar para trás (flecha para baixo ou S) </string> - <string name="fly_left_tooltip"> - Voar para a esquerda (Shift + Seta esquerda ou A) - </string> - <string name="fly_right_tooltip"> - Voar para a direita (Shift + Seta direita ou D) - </string> - <string name="fly_up_tooltip"> - Voar para cima (tecla E) - </string> - <string name="fly_down_tooltip"> - Voar para baixo (tecla C) - </string> - <string name="jump_tooltip"> - Pular (tecla E) - </string> - <string name="crouch_tooltip"> - Agachar (tecla C) - </string> <string name="walk_title"> Andar </string> @@ -58,12 +28,10 @@ Voar </string> <panel name="panel_actions"> - <button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/> - <joystick_slide name="move left btn" tool_tip="Andar para a esquerda (Shift + Seta esquerda ou A)"/> - <button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/> - <joystick_slide name="move right btn" tool_tip="Andar para a direita (Shift + Seta direita ou D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/> + <button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/> <joystick_turn name="forward btn" tool_tip="Andar para frente (flecha para cima ou W)"/> <joystick_turn name="backward btn" tool_tip="Andar para trás (flecha para baixo ou S)"/> </panel> 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 80bdbb0fb4..48f27f1968 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="gesture_preview"> <floater.string name="step_anim"> - Executar animação: + Selecionar animação: </floater.string> <floater.string name="step_sound"> - Executar som: + Selecionar animação: </floater.string> <floater.string name="step_chat"> - Executar bate-papo: + Diga por bate-papo: </floater.string> <floater.string name="step_wait"> - Pausa + Espere: </floater.string> <floater.string name="stop_txt"> Parar @@ -24,6 +24,9 @@ <floater.string name="Title"> Gesto: [NAME] </floater.string> + <text name="name_text"> + Nome: + </text> <text name="desc_label"> Descrição: </text> @@ -31,23 +34,18 @@ Gatilho: </text> <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"> - Trocar por: + Substituir por: </text> - <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/> + <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/> <text name="key_label"> - Atalho: + Tecla de Atalho: </text> <combo_box label="Nenhum" left="116" name="modifier_combo" width="76"/> <combo_box label="Nenhum" left_delta="80" name="key_combo" width="76"/> <text name="library_label"> Biblioteca: </text> - <scroll_list name="library_list" width="84"> - <scroll_list.rows name="action_animation" value="Animação"/> - <scroll_list.rows name="action_sound" value="Som"/> - <scroll_list.rows name="action_chat" value="Bate-papo"/> - <scroll_list.rows name="action_wait" value="Espere"/> - </scroll_list> + <scroll_list name="library_list" width="84"/> <button label="Incluir" left="118" name="add_btn" width="87"/> <text name="steps_label"> Passos: @@ -56,20 +54,17 @@ <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="Iniciar" name="start"/> - <radio_item label="Parar" name="stop"/> + <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="segundos:" name="wait_time_check"/> + <check_box bottom_delta="-30" label="tempo em segundos" name="wait_time_check"/> <line_editor left_delta="130" name="wait_time_editor"/> <text name="help_label"> - Se não incluir uma pausa, todas as etapas ocorrem ao mesmo tempo. + Se não incluir etapas de espera, todas as etapas ocorrem ao mesmo tempo. </text> - <check_box label="Ativar" name="active_check" tool_tip="Gestos podem ser ativados escrevendo suas frases de gatilho no chat ou teclando o atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/> + <check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/> <button label="Prévia" name="preview_btn"/> <button label="Salvar" name="save_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml index d094c1b63a..e648a7d873 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml @@ -9,6 +9,9 @@ <floater.string name="Title"> Anotação: [NAME] </floater.string> + <floater.string label="Salvar" label_selected="Salvar" name="Save"> + Salvar + </floater.string> <text name="desc txt"> Descrição: </text> @@ -16,5 +19,4 @@ Carregando... </text_editor> <button label="Salvar" label_selected="Salvar" name="Save"/> - <button label="Excluir" label_selected="Excluir" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml index de3417ea14..988f8f2ce1 100644 --- a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml +++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml @@ -5,7 +5,7 @@ Lembre-se, o pagamento do anúncio não é reembolsável </text> - <spinner label="Preço: L$" name="price_for_listing" tool_tip="Preço do anúncio." value="50"/> + <spinner label="Preço do anúncio:" name="price_for_listing" tool_tip="Preço do anúncio." value="50"/> <text name="l$_text" value="L$"/> <text name="more_info_text"> Mais informações (link para ajuda com anúncios) diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index 958a166dfc..eb18bfdb32 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -68,7 +68,7 @@ þ: [COUNT] </text> <check_box label="Esticar ambos os lados" name="checkbox uniform"/> - <check_box initial_value="true" label="Esticar Texturas" name="checkbox stretch textures"/> + <check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/> <check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/> <combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado"> <combo_box.item label="Grid SL" name="World"/> @@ -115,7 +115,7 @@ </text> <button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar a terra selecionada"/> <text left="134" name="obj_count"> - Objects: [COUNT] + Objetos: [COUNT] </text> <text left="134" name="prim_count"> Prims: [COUNT] 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 44f08b76b5..5ef8479b7a 100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml @@ -19,10 +19,8 @@ <layout_panel name="my_panel"> <text name="user_text" value="Meu avatar:"/> </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_panel name="leave_call_btn_panel"> + <button label="Desligar" name="leave_call_btn"/> + </layout_panel> </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 deleted file mode 100644 index cb9b3c8c0d..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Lugares" name="voice_effects" title="EFEITOS DE 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/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml index b72de7038d..e9f1ca3a0b 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,13 +23,6 @@ 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_bottomtray.xml b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml index 479d02512f..43b446a67e 100644 --- a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml @@ -4,11 +4,6 @@ <menu_item_check label="Botão de movimento" name="ShowMoveButton"/> <menu_item_check label="Botão de ver" name="ShowCameraButton"/> <menu_item_check label="Botão de fotos" name="ShowSnapshotButton"/> - <menu_item_check label="Botão da Barra lateral" name="ShowSidebarButton"/> - <menu_item_check label="Botão Construir" name="ShowBuildButton"/> - <menu_item_check label="Botão Buscar" name="ShowSearchButton"/> - <menu_item_check label="Botão Mapa" name="ShowWorldMapButton"/> - <menu_item_check label="Botão do Mini Mapa" name="ShowMiniMapButton"/> <menu_item_call label="Cortar" name="NearbyChatBar_Cut"/> <menu_item_call label="Copiar" name="NearbyChatBar_Copy"/> <menu_item_call label="Colar" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml deleted file mode 100644 index 527e3af3c9..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 704fd226eb..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 051323ae6a..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?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="Editar" name="edit"/> - <menu_item_call label="Trocar" name="replace"/> -</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 deleted file mode 100644 index 8716992a5e..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 c2b063193e..472ca466c9 100644 --- a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml @@ -2,5 +2,4 @@ <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_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml index a3e62924ec..8bae7afddc 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml @@ -6,10 +6,9 @@ <menu_item_call label="Mostrar filtros" name="show_filters"/> <menu_item_call label="Restabelecer filtros" name="reset_filters"/> <menu_item_call label="Fechar todas as pastas" name="close_folders"/> + <menu_item_call label="Esvaziar lixeira" name="empty_trash"/> <menu_item_call label="Esvaziar achados e perdidos" name="empty_lostnfound"/> <menu_item_call label="Salvar textura como" name="Save Texture As"/> - <menu_item_call label="Compartilhar" name="Share"/> <menu_item_call label="Encontrar original" name="Find Original"/> <menu_item_call label="Encontrar todos os links" name="Find All Links"/> - <menu_item_call label="Esvaziar lixeira" name="empty_trash"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml index cd1a72b896..a5969cacc3 100644 --- a/indra/newview/skins/default/xui/pt/menu_object.xml +++ b/indra/newview/skins/default/xui/pt/menu_object.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Tocar" name="Object Touch"> - <on_enable parameter="Tocar" name="EnableTouch"/> - </menu_item_call> + <menu_item_call label="Tocar" name="Object Touch"/> <menu_item_call label="Editar" name="Edit..."/> <menu_item_call label="Construir" name="Build"/> <menu_item_call label="Abrir" name="Open"/> diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml deleted file mode 100644 index 11b3e653c6..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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="Vestir - Adicionar ao look atual" name="wear_add"/> - <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 deleted file mode 100644 index 8db5e405b3..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml deleted file mode 100644 index d9347950b1..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml deleted file mode 100644 index f8e8a33521..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<context_menu name="Outfit Wearable Context Menu"> - <menu_item_call label="Trocar" name="wear_replace"/> - <menu_item_call label="Vestir" name="wear_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 deleted file mode 100644 index c0387f491a..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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 deleted file mode 100644 index 5b62d9578c..0000000000 --- a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?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/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml deleted file mode 100644 index 87a2e1674d..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml deleted file mode 100644 index 094a03553b..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Trocar" name="switch_btn"/> - <button label="Comprar >" name="bodyparts_shop_btn"/> -</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml index 9fd7da55df..092135bd42 100644 --- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip" value="Liga e desliga o microfone"/> - <string name="VoiceControlBtnToolTip" value="Mostra/oculta os controles de voz"/> + <string name="SpeakBtnToolTip"> + Liga e desliga o microfone + </string> + <string name="VoiceControlBtnToolTip"> + Mostra/oculta os controles de voz + </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -20,21 +24,6 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Tirar foto"/> </layout_panel> - <layout_panel name="sidebar_btn_panel"> - <button label="Barra lateral" name="sidebar_btn" tool_tip="Mostra/oculta a barra lateral"/> - </layout_panel> - <layout_panel name="build_btn_panel"> - <button label="Construir" name="build_btn" tool_tip="Mostra/oculta ferramentas de Construção"/> - </layout_panel> - <layout_panel name="search_btn_panel"> - <button label="Busca" name="search_btn" tool_tip="Mostra/oculta os gestos"/> - </layout_panel> - <layout_panel name="world_map_btn_panel"> - <button label="Mapa" name="world_map_btn" tool_tip="Mostra/oculta o Mapa Múndi"/> - </layout_panel> - <layout_panel name="mini_map_btn_panel"> - <button label="Mini Mapa" name="mini_map_btn" tool_tip="Mostra/oculta o Mini Mapa"/> - </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="Conversas"/> diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml deleted file mode 100644 index bfdc7290d2..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="clothing_list_button_bar_panel"> - <button label="Adicionar +" name="add_btn"/> - <button label="Comprar >" name="clothing_shop_btn"/> -</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 deleted file mode 100644 index 4b45a49f74..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?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_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml deleted file mode 100644 index 3e4b12b001..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="cof_wearables"> - <accordion name="cof_wearables_accordion"> - <accordion_tab name="tab_attachments" title="Anexos"/> - <accordion_tab name="tab_clothing" title="Vestuário"/> - <accordion_tab name="tab_body_parts" title="Corpo"/> - </accordion> -</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 deleted file mode 100644 index 7ca5e23981..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 3dfb5a0a16..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml index e57a85a726..6f21b78b10 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml @@ -6,9 +6,6 @@ <panel.string name="cant_view_group_land_text"> Você não está autorizado a acessar terrenos de grupos </panel.string> - <panel.string name="epmty_view_group_land_text"> - Nada consta - </panel.string> <panel.string name="cant_view_group_accounting_text"> Você não está autorizado a acessar os dados de contabilidade do grupo. </panel.string> diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml index c861e29624..9c3792ec43 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml @@ -11,9 +11,6 @@ <panel.string name="help_text"> Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes. </panel.string> - <panel.string name="donation_area"> - [AREA] m² - </panel.string> <filter_editor label="Filtrar por membro" name="filter_input"/> <name_list bottom_delta="-105" height="104" name="member_list"> <name_list.columns label="Membro" name="name"/> @@ -66,15 +63,21 @@ Há uma grande variedade de habilidades. <text name="static"> Nome da função </text> - <line_editor name="role_name"/> + <line_editor name="role_name"> + Empregados + </line_editor> <text name="static3"> Título da função </text> - <line_editor name="role_title"/> + <line_editor name="role_title"> + (esperando) + </line_editor> <text name="static2"> Descrição </text> - <text_editor name="role_description"/> + <text_editor name="role_description"> + (esperando) + </text_editor> <text name="static4"> Cargos desempenhados </text> @@ -85,6 +88,9 @@ Há uma grande variedade de habilidades. <scroll_list name="role_allowed_actions" tool_tip="Clique na guia Funções para ver mais detalhes"/> </panel> <panel name="actions_footer"> + <text name="static"> + Descrição da função + </text> <text_editor name="action_description"> Essa habilidade permite tirar alguem do grupo. Somente o dono do grupo poderá retirar outro dono do grupo. </text_editor> diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml index 39c19a22d4..6196c06d09 100644 --- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="landmark_info"> - <string name="title_create_landmark" value="Criar marco"/> - <string name="title_edit_landmark" value="Editar marco"/> - <string name="title_landmark" value="Marco"/> - <string name="not_available" value="(N/A)"/> + <string name="title_create_landmark" value="Criar Landmark"/> + <string name="title_edit_landmark" value="Editar Landmark"/> + <string name="title_landmark" value="Landmark"/> + <string name="not_available" value="(N\A)"/> <string name="unknown" value="(desconhecido)"/> <string name="public" value="(público)"/> <string name="server_update_text"> Informação do lugar não disponível sem atualização do servidor. </string> <string name="server_error_text"> - No momento não há informações sobre este lugar; por favor tente novamente mais tarde. + Informações sobre esta localização não está disponível neste momento, por favor, tente novamente mais tarde. </string> <string name="server_forbidden_text"> - Os dados deste lugar não estão indisponíveis devido a restrições de acesso. Verifique as permissões com o proprietário do terreno ou parcela. + Informações sobre esta localização está indisponível devido a restrições de acesso. Por favor, verifique as permissões com o proprietário da parcela. </string> <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> <button name="back_btn" tool_tip="Atrás"/> - <text name="title" value="Perfil do lugar"/> + <text name="title" value="Perfil do Lugar"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> <text name="maturity_value" value="desconhecido"/> @@ -31,7 +31,7 @@ <panel name="landmark_edit_panel"> <text name="title_label" value="Título:"/> <text name="notes_label" value="Minhas notas:"/> - <text name="folder_label" value="Localização do marco:"/> + <text name="folder_label" value="Localização da Landmark:"/> </panel> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml deleted file mode 100644 index 2b2e7c1dbf..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> - <button name="trash_btn" tool_tip="Excluir o look selecionado"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml deleted file mode 100644 index 9224ec4742..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Wearing"> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> - </panel> -</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml index ba4ebdb9bf..0cf2b7a4af 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml @@ -21,6 +21,6 @@ Localização dos logs: </text> <line_editor left="278" name="log_path_string" right="-20"/> - <button label="Procurar" label_selected="Procurar" name="log_path_button" width="120"/> - <button label="Lista de bloqueados" name="block_list"/> + <button label="Navegar" label_selected="Navegar" name="log_path_button" width="120"/> + <button label="Lista dos bloqueados" name="block_list"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml index 5be07f4d1f..5dbd3d4904 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml @@ -11,8 +11,8 @@ <check_box label="Ativado" name="enable_media"/> <slider label="Bate-papo de voz" name="Voice Volume"/> <check_box label="Ativado" name="enable_voice_check"/> - <check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/> - <check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/> + <check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="verdadeiro"/> + <check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="verdadeiro"/> <text name="voice_chat_settings"> Configuração de bate-papo de voz </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Padrão </panel.string> - <panel.string name="default system device"> - Dispositivo padrão do sistema - </panel.string> - <panel.string name="no device"> - Nenhum - </panel.string> <text name="Input"> Entrada </text> diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml index f2cc9f644d..2119a06e55 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml @@ -6,15 +6,15 @@ <text name="region_text"> desconhecido </text> - <check_box label="Desativar scripts" name="disable_scripts_check" tool_tip="Desativar todos os scripts nesta região"/> + <check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos os scripts nesta região"/> <button label="?" name="disable_scripts_help"/> - <check_box label="Desativar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/> + <check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/> <button label="?" name="disable_collisions_help"/> - <check_box label="Desativar física" name="disable_physics_check" tool_tip="Desativar toda a físíca nesta região"/> + <check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar toda a físíca nesta região"/> <button label="?" name="disable_physics_help"/> <button label="Aplicar" name="apply_btn"/> <text name="objret_text_lbl" width="130"> - Devolver objeto + Retornar objeto </text> <text name="resident_text_lbl"> Residente: @@ -27,14 +27,14 @@ Opções: </text> <check_box label="Com scripts" name="return_scripts" tool_tip="Só devolver objetos com scripts"/> - <check_box label="No terreno de outra pessoa" name="return_other_land" tool_tip="Devolver apenas objetos que estejam em terrenos de outra pessoa"/> - <check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Devolver objetos em todas as regiões que constituem esta propriedade"/> - <button label="Devolver" name="return_btn"/> - <button label="Principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos com maior potencial de colisão" width="280"/> + <check_box label="No terreno de outra pessoa" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/> + <check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/> + <button label="Retornar" name="return_btn"/> + <button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões" width="280"/> <button label="?" left="297" name="top_colliders_help"/> - <button label="Principais scripts..." name="top_scripts_btn" tool_tip="Lista de objetos que mais passam tempo executando scripts" width="280"/> + <button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts" width="280"/> <button label="?" left="297" name="top_scripts_help"/> - <button label="Reiniciar a região" name="restart_btn" tool_tip="Após 2 minutos de contagem regressiva, reiniciar a região"/> + <button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/> <button label="?" name="restart_help"/> - <button label="Adiar reinício" name="cancel_restart_btn" tool_tip="Adiar o reinício da região por uma hora"/> + <button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml index e06f3c74bf..d1a5eaa11e 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml @@ -18,26 +18,26 @@ <text name="region_type"> desconhecido </text> - <check_box label="Bloquear terraplenagem" name="block_terraform_check"/> - <check_box label="Bloquear voos" name="block_fly_check"/> - <check_box label="Permitir dano" name="allow_damage_check"/> - <check_box label="Restringir empurrões" name="restrict_pushobject"/> - <check_box label="Permitir revenda do terreno" name="allow_land_resell_check"/> - <check_box label="Permitir junção/divisão do terreno" name="allow_parcel_changes_check"/> - <check_box label="Bloquear exibição do terreno na busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/> - <spinner label="Limite do agente" name="agent_limit_spin"/> - <spinner label="Bônus de objetos" name="object_bonus_spin"/> + <check_box label="Bloquear Terraform" name="block_terraform_check"/> + <check_box label="Bloquear Vôo" name="block_fly_check"/> + <check_box label="Permitir Dano" name="allow_damage_check"/> + <check_box label="Restringir Empurrar" name="restrict_pushobject"/> + <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/> + <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/> + <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/> + <spinner label="Limit do Agente" name="agent_limit_spin"/> + <spinner label="Objeto Bonus" name="object_bonus_spin"/> <text label="Maturidade" name="access_text"> Classificação: </text> <icons_combo_box label="Mature" name="access_combo"> - <icons_combo_box.item label="Adulto" name="Adult" value="42"/> - <icons_combo_box.item label="Moderado" name="Mature" value="21"/> - <icons_combo_box.item label="Geral" name="PG" value="13"/> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Mature" name="Mature" value="21"/> + <icons_combo_box.item label="PG" name="PG" value="13"/> </icons_combo_box> <button label="Aplicar" name="apply_btn"/> <button label="Teletransportar um residente para início..." name="kick_btn"/> <button label="Teletransportar todos para início..." name="kick_all_btn"/> - <button label="Enviar mensagem para a região..." name="im_btn"/> - <button label="Gerenciar telehub..." name="manage_telehub_btn"/> + <button label="Enviar Mensagem para a Região..." name="im_btn"/> + <button label="Gerenciar Telehub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml index 534b2826af..d2d5fb649c 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml @@ -18,12 +18,12 @@ <text name="region_type"> (Desconhecido) </text> - <check_box label="Bloquear terraplanagens" name="block_terraform_check"/> + <check_box label="Bloquear terraplanagem" name="block_terraform_check"/> <check_box label="Bloquear voos" name="block_fly_check"/> <check_box label="Permitir danos" name="allow_damage_check"/> <check_box label="Limitar empurrões" name="restrict_pushobject"/> <check_box label="Permitir revenda de terrenos" name="allow_land_resell_check"/> - <check_box label="Permitir união e divisão de terrenos" name="allow_parcel_changes_check"/> + <check_box label="Permitir junção e divisão de terrenos" name="allow_parcel_changes_check"/> <check_box label="Não mostrar nos resultados de pesquisa" name="block_parcel_search_check" tool_tip="Mostrar esta região e lotes nos resultados de pesquisa"/> <spinner label="Limite do agente" name="agent_limit_spin"/> <spinner label="Bônus do objeto" name="object_bonus_spin"/> diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml index b77064a1ff..ba83fee7ba 100644 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Teleport History"> <accordion name="history_accordion"> - <no_matched_tabs_text name="no_matched_teleports_msg" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups/[SEARCH_TERM] Busca]."/> - <no_visible_tabs_text name="no_teleports_msg" value="Histórico de teletransportes vazio. Tente fazer uma [secondlife:///app/search/groups Busca]."/> <accordion_tab name="today" title="Hoje"/> <accordion_tab name="yesterday" title="Ontem"/> <accordion_tab name="2_days_ago" title="2 dias atrás"/> + 5 <accordion_tab name="3_days_ago" title="3 dias atrás"/> <accordion_tab name="4_days_ago" title="4 dias atrás"/> <accordion_tab name="5_days_ago" title="5 dias atrás"/> diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml deleted file mode 100644 index 1d7878408a..0000000000 --- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml index 88fd4b3ca8..2e6e4dd133 100644 --- a/indra/newview/skins/default/xui/pt/role_actions.xml +++ b/indra/newview/skins/default/xui/pt/role_actions.xml @@ -2,7 +2,7 @@ <role_actions> <action_set description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite." name="Membership"> <action description="Convidar pessoas para este grupo" longdescription="Em Membros > Cargos, use o botão 'Convidar' para convidar pessoas para entrar no grupo." name="member invite"/> - <action description="Expulsar membros deste grupo" longdescription="Em Membros > Cargos, use o botão 'Ejetar' para tirar pessoas do grupo. Proprietários podem expulsar qualquer pessoa, menos outro proprietário. Se você não é Proprietário, um membro só pode ser expulso se tiver cargo 'Todos' e nenhum outro cargo. Para destituir um membro de seu cargo, você precisa ter a função 'Destituir membro com cargo'." name="member eject"/> + <action description="Expulsar membros deste grupo" longdescription="Em Membros > Cargos, use o botão 'Ejetar' para tirar pessoas do grupo. Proprietários podem expulsar qualquer pessoa, menos outro proprietário. Se você não é Proprietário, um membro só pode ser expulso se tiver cargo 'Todos' e nenhum outro cargo. Para destituir um membro de seu cargo, você precisa ter a função 'Destituir membro com cargo'." name="member eject"/> <action description="Alterna entre 'Inscrições abertas' e 'Taxa de associação'." longdescription="Ative 'Inscrições abertas' para que novos membros entrem no grupo sem convite, mude a 'Taxa de associação' na seção Geral." name="member options"/> </action_set> <action_set description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções." name="Roles"> @@ -18,7 +18,7 @@ <action description="Mudar apresentação, insígnia, 'Publicar na web', e quais membros estão publicamente visíveis em Informações do Grupo." longdescription="Modificar o estatuto, símbolo e exibição nos resultados de busca. Use a seção Geral." name="group change identity"/> </action_set> <action_set description="Estas funções incluem poderes de transferir, vender e modificar os terrenos do grupo. Para acessar a janela 'Sobre terrenos', clique no chão com o botão direito e selecione 'Sobre terrenos'. Ou clique no ícone 'i' da barra de navegação." name="Parcel Management"> - <action description="Transferir e comprar terreno para o grupo" longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral." name="land deed"/> + <action description="Transferir e comprar terreno para o grupo" longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral." name="land deed"/> <action description="Abandonar terreno para Governador Linden" longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno > aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade." name="land release"/> <action description="Definir terreno para informação de venda" longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno > aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade." name="land set sale info"/> <action description="Subdividir e unir parcelas" longdescription="Juntar ou dividir lotes. Clique no chão com o botão direito, selecione 'Editar terreno' e arraste o mouse sobre o terreno para ver as opções. Para dividir um terreno, selecione a área a ser dividida e clique em 'Dividir'. Para juntar terrenos, selecione dois ou mais lotes adjacentes e clique em 'Juntar'." name="land divide join"/> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml index a5048e63b2..b8bbb4051a 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Looks" name="appearance panel"> <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 name="currentlook_title"> + (não salvo) </text> - <button label="" name="edit_outfit_btn" tool_tip="Editar este look"/> </panel> <filter_editor label="Filtrar looks" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml index 5af3a73d3d..4fc50bac67 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 item"> +<panel name="item properties" title="Perfil do objeto"> <panel.string name="unknown"> (desconhecido) </panel.string> @@ -15,15 +15,9 @@ <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> - <panel.string name="origin_inventory"> - (Inventário) - </panel.string> - <panel.string name="origin_inworld"> - (Inworld) - </panel.string> - <text name="title" value="Perfil do item"/> - <text name="origin" value="(Inventário)"/> - <panel label="" name="item_profile"> + <text name="title" value="Perfil do objeto"/> + <text name="where" value="(Inventário)"/> + <panel label=""> <text name="LabelItemNameTitle"> Nome: </text> @@ -41,7 +35,9 @@ <text name="LabelAcquiredTitle"> Adquirido: </text> - <text name="LabelAcquiredDate"/> + <text name="LabelAcquiredDate"> + Quarta 24 de Maio 12:50:46 2006 + </text> <panel name="perms_inv"> <text name="perm_modify"> Você pode: diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml index dd65810b22..9193730018 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml @@ -37,7 +37,7 @@ Venda mista </panel.string> <text name="title" value="Perfil do objeto"/> - <text name="where" value="(Inworld)"/> + <text name="where" value="(inworld)"/> <panel label="" name="properties_panel"> <text name="Name:"> Nome: |