diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
93 files changed, 422 insertions, 805 deletions
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..a26f2f95c9 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -42,12 +42,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: 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..ca18faa0bb 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,7 +35,7 @@ <text name="pg_label"> Generelt </text> - <check_box initial_value="true" name="events_mature_chk"/> + <check_box name="events_mature_chk"/> <text name="events_mature_label"> Moderat </text> @@ -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/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index fa74568c2d..bb4ee1800a 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -92,7 +92,6 @@ <menu_item_call label="Sæt scripts til "Not Running"" name="Set Scripts to Not Running"/> </menu> <menu label="Valg" name="Options"> - <menu_item_call label="Sæt standard rettigher for upload" name="perm prefs"/> <menu_item_check label="Vis avancerede rettigheder" name="DebugPermissions"/> <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/> <menu_item_check label="Vis kun flytbare objekter" name="Select Only Movable Objects"/> @@ -110,6 +109,7 @@ <menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/> <menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Mange (L$[COST] pr. fil)..." name="Bulk Upload"/> + <menu_item_call label="Sæt standardværdier for upload rettigheder" name="perm prefs"/> </menu> </menu> <menu label="Hjælp" name="Help"> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 62d9c5a203..73a42e7fb8 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -231,7 +231,7 @@ Er du sikker på at du vil fortsætte? Slet favorit <nolink>[PICK]</nolink>? </notification> <notification name="DeleteOutfits"> - Slet valgte sæt? + Slet det valgte sæt? <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> </notification> <notification name="CacheWillClear"> @@ -1635,8 +1635,8 @@ Check venligst din netværks- og firewall setup. Avatar '[NAME]' forsvandt helt "uploaded". </notification> <notification name="AvatarRezSelfBakeNotification"> - ( [EXISTENCE] sekunder i live ) -You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. + ( [EXISTENCE] seconds alive ) +Du sendte en [RESOLUTION] tekstur til '[BODYREGION]' efter [TIME] sekunder. </notification> <notification name="ConfirmLeaveCall"> Er du sikker på at du vil forlade dette opkald? @@ -1660,7 +1660,4 @@ Hvis du bliver ved med at have problemer, besøg venligst [SUPPORT_SITE]. Hvis du selv ejer land, kan du benytte det til hjemme lokation. Ellers kan du se på verdenskortet og finde steder markeret med "Infohub". </global> - <global name="You died and have been teleported to your home location"> - Du døde og er blevet teleporteret til din hjemmelokation. - </global> </notifications> 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..d8e8cb3c2a 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"> 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_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index b4be70a22a..a269e35f4b 100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -45,25 +45,25 @@ <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> - <button name="stop_btn" tool_tip="Stop valgte media"/> + <button name="stop_btn" tool_tip="Stop valgte medie"/> </layout_panel> <layout_panel name="play"> - <button name="play_btn" tool_tip="Afspil valgte media"/> + <button name="play_btn" tool_tip="Afspil valgte medie"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pause valgte media"/> + <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="Lydstyrke for valgte media"/> + <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 lyd for valgte media"/> + <button name="mute_btn" tool_tip="Sluk lyd fra valgte medie"/> </layout_panel> <layout_panel name="zoom"> - <button name="zoom_btn" tool_tip="Zoom til valgte media"/> + <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 media"/> + <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/> </layout_panel> </layout_stack> </panel> 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..a1b47c3c1f 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" /> + <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" /> <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/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index 2350af8d49..b1ec2c44df 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -23,7 +23,8 @@ </panel.string> <text name="title" value="Profil for genstand"/> <text name="origin" value="(Beholdning)"/> - <panel label="" name="item_profile"> + <panel label="" + name="item_profile"> <text name="LabelItemNameTitle"> Navn: </text> @@ -39,7 +40,7 @@ </text> <button label="Profil..." name="BtnOwner"/> <text name="LabelAcquiredTitle"> - Anskaffet: + Erhvervet: </text> <text name="LabelAcquiredDate"/> <panel name="perms_inv"> @@ -48,21 +49,21 @@ </text> <check_box label="Redigere" name="CheckOwnerModify"/> <check_box label="Kopiere" name="CheckOwnerCopy"/> - <check_box label="Overfør" name="CheckOwnerTransfer"/> + <check_box label="Give væk" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> - Alle: + Enhver: </text> <check_box label="Kopiere" name="CheckEveryoneCopy"/> <text name="GroupLabel"> Gruppe: </text> - <check_box label="Del" name="CheckShareWithGroup" tool_tip="Giver alle medlemmer adgang til at give gruppen ret til at ændre rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> + <check_box label="Dele" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="CheckNextOwnerModify"/> <check_box label="Kopiere" name="CheckNextOwnerCopy"/> - <check_box label="Overføre" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + <check_box label="Give væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> </panel> <check_box label="Til salg" name="CheckPurchase"/> <combo_box name="combobox sale copy"> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 3152661fd4..9b33ca6f0d 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -642,9 +642,6 @@ <string name="worldmap_offline"> Offline </string> - <string name="worldmap_item_tooltip_format"> - [AREA] m² L$[PRICE] - </string> <string name="worldmap_results_none_found"> Ingen fundet. </string> @@ -1034,7 +1031,6 @@ <string name="AnimFlagStop" value=" Stop Animation : "/> <string name="AnimFlagStart" value=" Start Animation : "/> <string name="Wave" value=" Vink "/> - <string name="GestureActionNone" value="Ingen"/> <string name="HelloAvatar" value=" Hej, avatar! "/> <string name="ViewAllGestures" value=" Se alle >>"/> <string name="GetMoreGestures" value="Få mere >>"/> @@ -1117,12 +1113,12 @@ <string name="InvFolder Favorite"> Favoritter </string> + <string name="InvFolder favorite"> + Favoritter + </string> <string name="InvFolder Current Outfit"> Nuværende sæt </string> - <string name="InvFolder Initial Outfits"> - Start sæt - </string> <string name="InvFolder My Outfits"> Mine sæt </string> @@ -1442,7 +1438,6 @@ <string name="SummaryForTheWeek" value="Opsummering for denne uge, begyndende med "/> <string name="NextStipendDay" value="Næste stipendie dag er "/> <string name="GroupIndividualShare" value=" Gruppe Individuel Delt"/> - <string name="GroupColumn" value="Gruppe"/> <string name="Balance"> Balance </string> @@ -1656,12 +1651,6 @@ <string name="BusyModeResponseDefault"> Beboeren du sendte en besked er 'optaget', hvilket betyder at han/hun ikke vil forstyrres. Din besked vil blive vis i hans/hendes IM panel til senere visning. </string> - <string name="NoOutfits"> - You don't have any outfits yet. Try [secondlife:///app/search/all/ Search] - </string> - <string name="NoOutfitsTabsMatched"> - Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/all/[SEARCH_TERM] Search]. - </string> <string name="MuteByName"> (Efter navn) </string> @@ -3582,9 +3571,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="group_role_owners"> Ejere </string> - <string name="group_member_status_online"> - Online - </string> <string name="uploading_abuse_report"> Uploader... @@ -3638,15 +3624,9 @@ Krænkelsesanmeldelse <string name="Invalid Wearable"> Kan ikke tages på </string> - <string name="New Gesture"> - Ny bevægelse - </string> <string name="New Script"> Nyt script </string> - <string name="New Note"> - Ny note - </string> <string name="New Folder"> Ny folder </string> @@ -3704,15 +3684,6 @@ Krænkelsesanmeldelse <string name="Male - Wow"> Mand - Wow </string> - <string name="Female - Chuckle"> - Kvinde - Kluklatter - </string> - <string name="Female - Cry"> - Kvinde - gråd - </string> - <string name="Female - Embarrassed"> - Kvinde - Flov - </string> <string name="Female - Excuse me"> Kvinde - Undskyld mig </string> @@ -3731,21 +3702,9 @@ Krænkelsesanmeldelse <string name="Female - Hey"> Kvinde - Hey </string> - <string name="Female - Hey baby"> - Kvinde - Hey baby - </string> <string name="Female - Laugh"> Kvinde - Latter </string> - <string name="Female - Looking good"> - Kvinde - "Ser godt ud" - </string> - <string name="Female - Over here"> - Kvinde - Herovre - </string> - <string name="Female - Please"> - Kvinde - Be´ om - </string> <string name="Female - Repulsed"> Kvinde - Frastødt </string> @@ -3795,46 +3754,4 @@ Krænkelsesanmeldelse <string name="dateTimePM"> PM </string> - <string name="LocalEstimateUSD"> - US$ [AMOUNT] - </string> - <string name="Membership"> - Medlemsskab - </string> - <string name="Roles"> - Roller - </string> - <string name="Group Identity"> - Gruppe identitet - </string> - <string name="Parcel Management"> - Parcel håndtering - </string> - <string name="Parcel Identity"> - Parcel identitet - </string> - <string name="Parcel Settings"> - Parcel opsætning - </string> - <string name="Parcel Powers"> - Parcel beføjelser - </string> - <string name="Parcel Access"> - Parcel adgang - </string> - <string name="Parcel Content"> - Parcel indhold - </string> - <string name="Object Management"> - Objekt håndtering - </string> - <string name="Accounting"> - Regnskab - </string> - <string name="Notices"> - Beskeder - </string> - <string name="Chat"> - Chat - </string> </strings> 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..c3c017ae97 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml @@ -64,7 +64,6 @@ </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"/> <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/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index cae6146880..b9bc45a10b 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -21,7 +21,7 @@ <string name="test_the_vlt">This string CHANGE2 is extracted.</string> <string name="testing_eli">Just a test. changes.</string> <chat_history - parse_urls="true" + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" border_visible="false" diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f4d65bdb3a..b5be03346e 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -73,7 +73,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number help_topic="about_support_tab" name="support_panel"> <text_editor - parse_urls="true" + allow_html="true" follows="top|left" font="SansSerif" height="343" diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 9864083442..887cedc33f 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -244,6 +244,7 @@ layout="topleft" left="6" name="event_desc" + textbox.label="More" width="322"> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 6c1214f152..c9b013099b 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -67,7 +67,7 @@ height="150" name="chat_history" parse_highlights="true" - parse_urls="true" + allow_html="true" left="1" width="249"> </chat_history> 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 3b26c2ab59..ec097a8e87 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -25,7 +25,7 @@ single_instance="true" width="320"> <chat_history - parse_urls="true" + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" 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..7be9cfbb71 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -310,7 +310,7 @@ left_delta="0" name="wait_time_check" top_delta="20" - width="115" /> + width="100" /> <line_editor follows="top|left" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index e5a5fab9b9..0e8eef2a21 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -71,7 +71,7 @@ left="4" max_length="65536" name="Notecard Editor" - parse_urls="false" + allow_html="false" tab_group="1" top="46" width="392" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 857932e51a..452b2ac664 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -4,52 +4,48 @@ can_minimize="false" can_close="true" follows="left|top" - height="520" + height="516" layout="topleft" name="Snapshot" help_topic="snapshot" save_rect="true" save_visibility="true" title="SNAPSHOT PREVIEW" - width="215"> + 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="70" + height="58" label="Snapshot type" layout="topleft" left="10" name="snapshot_type_radio" - top="20" + top="25" width="205"> -<!-- <radio_item - height="16" - label="Share to Web" - layout="topleft" - name="share_to_web" - top_pad="0" /> ---> - <radio_item + bottom="19" height="16" label="Email" layout="topleft" - name="postcard" - top_pad="2" /> + name="postcard" /> <radio_item + bottom="38" height="16" label="My inventory (L$[AMOUNT])" layout="topleft" - name="texture" - top_pad="2" /> + name="texture" /> <radio_item + bottom="57" height="16" label="Save to my computer" layout="topleft" - name="local" - top_pad="2" /> + name="local" /> </radio_group> <ui_ctrl height="90" @@ -71,7 +67,7 @@ left_delta="0" halign="right" name="file_size_label" - top_pad="8" + top_pad="10" width="195"> [SIZE] KB </text> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 514b0a501b..a96dbe3553 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2322,7 +2322,6 @@ even though the user gets a free copy. layout="topleft" left_pad="15" name="color trans" - text_readonly_color="LabelDisabledColor" top="6" width="110"> Transparency % @@ -2347,7 +2346,6 @@ even though the user gets a free copy. layout="topleft" left_delta="0" name="glow label" - text_readonly_color="LabelDisabledColor" top_pad="8" width="80"> Glow @@ -2378,7 +2376,6 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex gen" - text_readonly_color="LabelDisabledColor" top_pad="5" width="90"> Mapping @@ -2407,7 +2404,6 @@ even though the user gets a free copy. layout="topleft" name="label shininess" left_pad="4" - text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Shininess @@ -2444,7 +2440,6 @@ even though the user gets a free copy. layout="topleft" left_pad="4" name="label bumpiness" - text_readonly_color="LabelDisabledColor" top_pad="-36" width="90"> Bumpiness @@ -2570,8 +2565,7 @@ even though the user gets a free copy. height="10" layout="topleft" left="10" - name="rpt" - text_readonly_color="LabelDisabledColor" + name="tex scale" top_pad="4" width="200"> Repeats / Face @@ -2660,7 +2654,6 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex offset" - text_readonly_color="LabelDisabledColor" width="200"> Texture Offset </text> @@ -2744,9 +2737,9 @@ even though the user gets a free copy. follows="top|left" tool_tip="Edit this Media" height="12" - image_disabled="Icon_Gear_Background" - image_selected="Icon_Gear_Press" - image_unselected="Icon_Gear_Foreground" + image_disabled="Icon_Gear_Foreground" + image_selected="Icon_Gear_Background" + image_unselected="Icon_Gear_Press" layout="topleft" left_pad="10" name="edit_media" diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index eb2e7ea788..8aeec46ba3 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -26,7 +26,7 @@ Owner [OWNER] <string name="Touch">Touch</string> <string name="Sit">Sit</string> <text - parse_urls="false" + allow_html="false" follows="all" font="SansSerifLarge" height="30" diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml deleted file mode 100644 index 1925d3396f..0000000000 --- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu - layout="topleft" - name="Add Wearable Gear Menu"> - <menu_item_check - label="Sort by Most Recent" - layout="topleft" - name="sort_by_most_recent"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_most_recent" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_most_recent" /> - </menu_item_check> - <menu_item_check - label="Sort by Name" - layout="topleft" - name="sort_by_name"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_name" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_name" /> - </menu_item_check> - <menu_item_check - label="Sort by Type" - layout="topleft" - name="sort_by_type"> - <on_check - function="AddWearable.Gear.Check" - parameter="by_type" /> - <on_click - function="AddWearable.Gear.Sort" - parameter="by_type" /> - <on_visible - function="AddWearable.Gear.Visible" - parameter="by_type" /> - </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 76f68c6d4b..8ec7689819 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 @@ -89,15 +89,6 @@ function="Object.EnableWear" /> </menu_item_call> <menu_item_call - label="Add" - layout="topleft" - name="add"> - <menu_item_call.on_click - function="Object.AttachAddToAvatar" /> - <menu_item_call.on_visible - function="Object.EnableWear" /> - </menu_item_call> - <menu_item_call label="Report" layout="topleft" name="report"> diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 31f70d99ca..b6cc222e96 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -83,15 +83,6 @@ <menu_item_call.on_enable function="Object.EnableWear" /> </menu_item_call> - <menu_item_call - enabled="false" - label="Add" - name="Add"> - <menu_item_call.on_click - function="Object.AttachAddToAvatar" /> - <menu_item_call.on_enable - function="Object.EnableWear" /> - </menu_item_call> <context_menu label="Attach ▶" name="Object Attach" /> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 77cc3910fd..3e38503e43 100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -94,9 +94,6 @@ <on_enable function="Places.LandmarksGear.Enable" parameter="expand" /> - <on_visible - function="Places.LandmarksGear.Enable" - parameter="expand" /> </menu_item_call> <menu_item_call label="Collapse" @@ -108,9 +105,6 @@ <on_enable function="Places.LandmarksGear.Enable" parameter="collapse" /> - <on_visible - function="Places.LandmarksGear.Enable" - parameter="collapse" /> </menu_item_call> <menu_item_call label="Expand all folders" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 52cf24333f..63ff7047b4 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -29,9 +29,7 @@ <menu_item_call.on_click function="BuyCurrency" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="My Profile" name="Profile"> @@ -126,9 +124,7 @@ <menu_item_call.on_click function="Advanced.LeaveAdminStatus" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Exit [APP_NAME]" name="Quit" @@ -157,9 +153,7 @@ function="SideTray.PanelPeopleTab" parameter="groups_panel" /> </menu_item_call> - <menu_item_separator/> - <!--menu_item_call label="Chat" name="Chat"> @@ -257,9 +251,7 @@ parameter="region_info" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_call label="Buy This Land" name="Buy Land"> @@ -356,9 +348,7 @@ control="NavBarShowParcelProperties" /> </menu_item_check> </menu> - <menu_item_separator/> - <menu_item_call label="Teleport Home" name="Teleport Home" @@ -397,9 +387,7 @@ parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> <menu_item_separator/>--> - <menu_item_separator/> - <menu create_jump_keys="true" label="Sun" @@ -442,9 +430,7 @@ function="World.EnvSettings" parameter="default" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Environment Editor" name="Environment Editor"> @@ -593,7 +579,6 @@ </menu_item_call> </menu> <menu_item_separator/> - <menu_item_call label="Focus on Selection" name="Focus on Selection" @@ -614,9 +599,7 @@ <menu_item_call.on_enable function="Tools.SomethingSelectedNoHUD" /> </menu_item_call> - <menu_item_separator/> - <menu create_jump_keys="true" label="Object" @@ -718,9 +701,7 @@ function="EditableSelected" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu create_jump_keys="true" label="Options" @@ -736,9 +717,7 @@ function="ToggleControl" parameter="DebugPermissions" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Select Only My Objects" name="Select Only My Objects"> @@ -765,9 +744,7 @@ <menu_item_check.on_click function="Tools.SelectBySurrounding" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Hidden Selection" name="Show Hidden Selection"> @@ -793,9 +770,7 @@ function="ToggleControl" parameter="ShowSelectionBeam" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Snap to Grid" name="Snap to Grid" @@ -919,9 +894,7 @@ function="Floater.Show" parameter="hud" /> </menu_item_call>--> - <menu_item_separator/> - <menu_item_call label="Report Abuse" name="Report Abuse"> @@ -935,9 +908,7 @@ function="ShowHelp" parameter="report_bug" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="About [APP_NAME]" name="About Second Life"> @@ -951,6 +922,17 @@ name="Advanced" tear_off="true" visible="false"> + <menu_item_check + label="Show Advanced Menu" + name="Show Advanced Menu" + shortcut="control|alt|shift|D"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> <menu_item_call label="Stop Animating Me" name="Stop Animating My Avatar"> @@ -977,9 +959,7 @@ function="Floater.Show" parameter="window_size" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Limit Select Distance" name="Limit Select Distance"> @@ -1000,9 +980,7 @@ function="ToggleControl" parameter="DisableCameraConstraints" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="High-res Snapshot" name="HighResSnapshot"> @@ -1033,9 +1011,7 @@ function="ToggleControl" parameter="CompressSnapshotsToDisk" /> </menu_item_check> - <menu_item_separator/> - <menu create_jump_keys="true" label="Performance Tools" @@ -1148,9 +1124,7 @@ <menu_item_check.on_click function="View.ShowHoverTips" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Land Tooltips" name="Land Tips"> @@ -1457,9 +1431,7 @@ function="ToggleControl" parameter="MouseSmooth" /> </menu_item_check> - <menu_item_separator/> - <menu label="Shortcuts" name="Shortcuts" @@ -1503,9 +1475,19 @@ <menu_item_call.on_click function="View.DefaultUISize" /> </menu_item_call> - + <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. --> + <menu_item_check + label="Show Advanced Menu - legacy shortcut" + name="Show Advanced Menu - legacy shortcut" + shortcut="control|alt|D"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> <menu_item_separator/> - <menu_item_check label="Always Run" name="Always Run" @@ -1526,9 +1508,7 @@ <menu_item_check.on_enable function="Agent.enableFlying" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Close Window" name="Close Window" @@ -1547,9 +1527,7 @@ <menu_item_call.on_enable function="File.EnableCloseAllWindows" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Snapshot to Disk" name="Snapshot to Disk" @@ -1558,9 +1536,7 @@ <menu_item_call.on_click function="File.TakeSnapshotToDisk" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Mouselook" name="Mouselook" @@ -1597,9 +1573,7 @@ <menu_item_call.on_enable function="View.EnableLastChatter" /> </menu_item_call> - <menu_item_separator/> - <menu create_jump_keys="true" label="Select Build Tool" @@ -1646,9 +1620,7 @@ parameter="land" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_call label="Zoom In" name="Zoom In" @@ -1670,27 +1642,8 @@ <menu_item_call.on_click function="View.ZoomOut" /> </menu_item_call> - <menu_item_separator - visible="false"/> - <!-- Made invisible to avoid a dissonance: menu item toggle menu where it is located. EXT-8069. - Can't be removed to keep sortcut workable. - --> - <menu_item_check - label="Show Advanced Menu" - name="Show Advanced Menu" - shortcut="control|alt|D" - visible="false"> - <on_check - function="CheckControl" - parameter="UseDebugMenus" /> - <on_click - function="ToggleControl" - parameter="UseDebugMenus" /> - </menu_item_check> - </menu> <!--Shortcuts--> - + </menu> <menu_item_separator/> - <menu_item_call label="Show Debug Settings" name="Debug Settings"> @@ -1709,7 +1662,6 @@ function="ToggleControl" parameter="QAMode" /> </menu_item_check> - </menu> <menu create_jump_keys="true" @@ -1800,9 +1752,7 @@ function="Advanced.ToggleConsole" parameter="memory view" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"> @@ -1824,9 +1774,7 @@ function="Advanced.DumpInfoToConsole" parameter="capabilities" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Camera" name="Camera"> @@ -1914,9 +1862,7 @@ function="ToggleControl" parameter="DebugShowColor" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Updates to Objects" name="Show Updates" @@ -1928,9 +1874,7 @@ function="Advanced.ToggleShowObjectUpdates" /> </menu_item_check> </menu> - <menu_item_separator/> - <menu create_jump_keys="true" label="Force an Error" @@ -2224,12 +2168,9 @@ <menu_item_check.on_enable function="Advanced.EnableRenderFBO" /> </menu_item_check> - - <menu_item_separator /> - <menu_item_check - label="Lighting and Shadows" - name="Lighting and Shadows"> + label="Deferred Rendering" + name="Deferred Rendering"> <menu_item_check.on_check function="CheckControl" parameter="RenderDeferred" /> @@ -2240,31 +2181,7 @@ function="Advanced.EnableRenderDeferred" /> </menu_item_check> <menu_item_check - label=" Shadows from Sun/Moon/Projectors" - name="Shadows from Sun/Moon/Projectors"> - <menu_item_check.on_check - function="Advanced.CheckRenderShadowOption" - parameter="RenderShadowDetail" /> - <menu_item_check.on_click - function="Advanced.ClickRenderShadowOption" - parameter="RenderShadowDetail" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> - </menu_item_check> - <menu_item_check - label=" SSAO and Shadow Smoothing" - name="SSAO and Shadow Smoothing"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderDeferredSSAO" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderDeferredSSAO" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> - </menu_item_check> - <menu_item_check - label=" Global Illumination (experimental)" + label="Global Illumination" name="Global Illumination"> <menu_item_check.on_check function="CheckControl" @@ -2273,11 +2190,9 @@ function="ToggleControl" parameter="RenderDeferredGI" /> <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> + function="Advanced.EnableRenderDeferredGI" /> </menu_item_check> - <menu_item_separator /> - <menu_item_check label="Debug GL" name="Debug GL"> @@ -2299,24 +2214,14 @@ parameter="RenderDebugPipeline" /> </menu_item_check> <menu_item_check - label="Automatic Alpha Masks (deferred)" - name="Automatic Alpha Masks (deferred)"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderAutoMaskAlphaDeferred" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderAutoMaskAlphaDeferred" /> - </menu_item_check> - <menu_item_check - label="Automatic Alpha Masks (non-deferred)" - name="Automatic Alpha Masks (non-deferred)"> + label="Fast Alpha" + name="Fast Alpha"> <menu_item_check.on_check function="CheckControl" - parameter="RenderAutoMaskAlphaNonDeferred" /> + parameter="RenderFastAlpha" /> <menu_item_check.on_click function="ToggleControl" - parameter="RenderAutoMaskAlphaNonDeferred" /> + parameter="RenderFastAlpha" /> </menu_item_check> <menu_item_check label="Animation Textures" @@ -2359,7 +2264,7 @@ parameter="AuditTexture" /> </menu_item_check> <menu_item_check - label="Texture Atlas (experimental)" + label="Texture Atlas" name="Texture Atlas"> <menu_item_check.on_check function="CheckControl" @@ -2415,9 +2320,7 @@ function="ToggleControl" parameter="AgentPause" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Enable Message Log" name="Enable Message Log"> @@ -2430,9 +2333,7 @@ <menu_item_call.on_click function="Advanced.DisableMessageLog" /> </menu_item_call> - <menu_item_separator/> - <menu_item_check label="Velocity Interpolate Objects" name="Velocity Interpolate Objects"> @@ -2453,9 +2354,7 @@ function="ToggleControl" parameter="PingInterpolate" /> </menu_item_check> - <menu_item_separator/> - <menu_item_call label="Drop a Packet" name="Drop a Packet" @@ -2643,7 +2542,6 @@ </menu_item_check> <menu_item_separator /> - <menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"> @@ -2989,9 +2887,7 @@ function="Advanced.DumpAvatarLocalTextures" /> </menu_item_call> </menu> - <menu_item_separator/> - <menu_item_check label="HTTP Textures" name="HTTP Textures"> @@ -3028,9 +2924,7 @@ function="ToggleControl" parameter="ShowConsoleWindow" /> </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Show Admin Menu" name="View Admin Options"> @@ -3365,9 +3259,7 @@ name="PublicIssueTrackerHelp_url" parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Bug Reporting 101" name="Bug Reporing 101"> diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index 5feac53c33..8af2e1eaca 100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -13,7 +13,7 @@ layout="topleft" name="wear_wear"> <on_click - function="Wearable.Wear" /> + function="Wearable.Add" /> </menu_item_call> <menu_item_call label="Add" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 609a9b09be..3576462cca 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4023,19 +4023,6 @@ Are you sure you want to quit? <notification icon="alertmodal.tga" - name="DeleteItems" - type="alertmodal"> - [QUESTION] - <usetemplate - ignoretext="Confirm before deleting items" - name="okcancelignore" - notext="Cancel" - yestext="OK"/> - <unique/> - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseEmailLL" type="alert"> Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 20ff492c0f..06bd1e9ff4 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -9,7 +9,6 @@ layout="topleft" name="Mockup Tab" selection_enabled="true" - tab_stop="false" title="Mockup Tab" translate="false" width="0"> diff --git a/indra/newview/skins/default/xui/en/panel_bars.xml b/indra/newview/skins/default/xui/en/panel_bars.xml new file mode 100644 index 0000000000..96722ce278 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bars.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top|bottom" + height="768" + layout="topleft" + left="0" + mouse_opaque="false" + name="screen" + width="1024"> + <layout_stack name="menu_stack" orientation="vertical" height="768" border_size="0"> + <panel auto_resize="false" width="1024" name="status_bar" filename="panel_status_bar.xml"/> + <panel auto_resize="false" width="1024" height="60" name="navigation bar" filename="panel_navigation_bar.xml"/> + <layout_stack name="hud_stack" orientation="horizontal" auto_resize="true" width="1024" height="500" follows="all"> + <panel auto_resize="true" name="floater_view" height="500"/> + <panel auto_resize="false" filename="panel_side_tray.xml" height="500" width="333"/> + </layout_stack> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index 216a265164..4f989a6f6f 100644 --- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml @@ -41,7 +41,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 17e8d4d2df..9124ad528d 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -21,7 +21,7 @@ top="3" width="18" /> <text - parse_urls="false" + allow_html="false" allow_scroll="false" v_pad = "7" read_only = "true" @@ -38,17 +38,16 @@ use_ellipses="true" valign="bottom" value="Ericag Vader" /> - <text - allow_scroll="false" - font="SansSerifSmall" - follows="right" - halign="right" - height="13" - layout="topleft" - left_pad="5" - name="time_box" - right="-5" - top="8" - value="23:30" - width="110" /> + <text + font="SansSerifSmall" + follows="right" + halign="right" + height="13" + layout="topleft" + left_pad="5" + name="time_box" + right="-5" + top="8" + value="23:30" + width="110" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 268cb4e5f9..e66cf400b4 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -202,7 +202,7 @@ value="Category:" width="140" /> <text_editor - parse_urls="true" + allow_html="true" allow_scroll="false" bg_visible="false" follows="left|top|right" @@ -371,7 +371,7 @@ value="Description:" width="250" /> <text_editor - parse_urls="true" + allow_html="true" allow_scroll="true" bg_visible="false" follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 27c653bc35..e390b9e836 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -65,6 +65,7 @@ left="103" name="description" textbox.max_length="1024" + textbox.label="More" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml index cc0541e65c..93d7720c57 100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml @@ -53,7 +53,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" 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 index de2ff0afc9..75b5fd1532 100644 --- 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 @@ -53,7 +53,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml index df459b4083..a5dd34bd22 100644 --- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml @@ -42,7 +42,7 @@ height="16" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="LtGray_50" diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index ab34cbf20e..b674b39d9b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -36,7 +36,7 @@ top="2" width="20" /> <text - parse_urls="false" + allow_html="false" follows="left|right" font="SansSerifSmall" height="15" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 6f271a757c..65b2e81d50 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -50,7 +50,7 @@ width="230" /> </panel> <text_editor - parse_urls="true" + allow_html="true" enabled="true" follows="all" height="0" 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 4af4774304..18a2f37ba2 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -103,7 +103,7 @@ clicking on their names. height="23" follows="top|left" label="Invite" - left="5" + left="0" name="member_invite" width="100" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml index 2e38835810..f1b7b92ece 100644 --- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml +++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml @@ -41,7 +41,7 @@ height="20" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index c5d6aced7a..a0a1e2963a 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -139,6 +139,7 @@ layout="topleft" left="10" name="description" + textbox.label="More" top_pad="10" value="Du waltz die spritz" width="280" /> @@ -235,7 +236,7 @@ value="Title:" width="290" /> <text - parse_urls="false" + allow_html="false" follows="left|top" height="22" layout="topleft" @@ -275,7 +276,7 @@ name="notes_editor" read_only="true" text_readonly_color="white" - text_type="ascii_with_newline" + text_type="ascii" top_pad="5" width="290" wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index d3a58fed58..c5f44cd049 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -16,8 +16,7 @@ follows="top|left" height="15" left="10" - name="controls_label" - text_readonly_color="LabelDisabledColor"> + name="controls_label"> Controls: </text> <combo_box @@ -47,8 +46,7 @@ follows="top|left" height="15" left="10" - name="owner_label" - text_readonly_color="LabelDisabledColor"> + name="owner_label"> Owner </text> @@ -85,9 +83,8 @@ enabled="false" follows="top|left" height="15" - left="10" - name="group_label" - text_readonly_color="LabelDisabledColor"> + left="10" + name="group_label"> Group: </text> @@ -98,7 +95,6 @@ font="SansSerif" height="20" left="60" name="perms_group_name" - text_readonly_color="LabelDisabledColor" value ="" width="200" /> @@ -136,8 +132,7 @@ follows="top|left" height="15" left="10" - name="anyone_label" - text_readonly_color="LabelDisabledColor"> + name="anyone_label"> Anyone </text> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 4629bb9cfe..2e49fc8d6f 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -118,6 +118,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="sl_description_edit" top_pad="-3" @@ -174,6 +175,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="fl_description_edit" top_pad="-3" @@ -315,6 +317,7 @@ name="sl_groups" top_pad="0" translate="false" + textbox.label="More" textbox.show_context_menu="true" width="298" expanded_bg_visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 082d51ed3c..2c9d7e4b6a 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -97,8 +97,6 @@ name="location_combo" top_delta="0" width="266"> - <combo_list - mouse_wheel_opaque="true"/> <!-- *TODO: Delete. Let the location_input use the correct art sizes. <location_input.add_landmark_button height="18" diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 59ead84127..34738745eb 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -78,7 +78,7 @@ width="285" wrap="true" parse_highlights="true" - parse_urls="true"/> + allow_html="true"/> </panel> <panel background_visible="false" 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 95c8cb301d..f6f1c33fe3 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -101,7 +101,7 @@ follows="all" height="100" width="280" - parse_urls="true" + allow_html="true" hide_scrollbar="false" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index de147908d8..292bd47207 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -65,6 +65,7 @@ left="103" name="picture_descr" textbox.max_length="1024" + textbox.label="More" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index c6e93af50a..35e8075896 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -264,7 +264,7 @@ </layout_panel> </layout_stack> <text - parse_urls="false" + allow_html="false" follows="left|top|right" font="SansSerifLarge" height="14" @@ -277,7 +277,7 @@ value="SampleRegion" width="290" /> <text - parse_urls="false" + allow_html="false" follows="left|top|right" height="14" layout="topleft" @@ -293,6 +293,7 @@ layout="topleft" left="5" name="description" + textbox.label="More" top_pad="10" value="Du waltz die spritz" width="300" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 113d5fb6dc..f4694180a1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -155,7 +155,7 @@ visiblity_control="ShowAdvancedGraphicsSettings" border="false" follows="top|left" - height="283" + height="260" label="CustomGraphics" layout="topleft" left="5" @@ -211,112 +211,119 @@ <check_box.commit_callback function="Pref.VertexShaderEnable" /> </check_box> -<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS - <check_box - control_name="RenderDeferred" + <check_box + control_name="RenderWaterReflections" height="16" initial_value="true" - label="Lighting and Shadows" + label="Water reflections" layout="topleft" left_delta="0" - name="UseLightShaders" + name="Reflections" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> - <check_box - control_name="RenderDeferredSSAO" + </check_box> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="0" + name="ReflectionDetailText" + top_pad="7" + width="128"> + Reflection detail: + </text> + <radio_group + control_name="RenderReflectionDetail" + draw_border="false" + height="70" + layout="topleft" + left_delta="-2" + name="ReflectionDetailRadio" + top_pad="3" + width="321"> + <radio_item + height="16" + label="Terrain and trees" + layout="topleft" + left="3" + name="0" + top="3" + width="315" /> + <radio_item + height="16" + label="All static objects" + layout="topleft" + left_delta="0" + name="1" + top_delta="16" + width="315" /> + <radio_item + height="16" + label="All avatars and objects" + layout="topleft" + left_delta="0" + name="2" + top_delta="16" + width="315" /> + <radio_item + height="16" + label="Everything" + layout="topleft" + left_delta="0" + name="3" + top_delta="16" + width="315" /> + </radio_group> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="2" + name="AvatarRenderingText" + top_pad="5" + width="158"> + Avatar rendering: + </text> + <check_box + control_name="RenderUseImpostors" + height="16" + initial_value="true" + label="Avatar impostors" + layout="topleft" + left_delta="0" + name="AvatarImpostors" + top_pad="7" + width="256" /> + <check_box + control_name="RenderAvatarVP" height="16" initial_value="true" - label="Ambient Occlusion" + label="Hardware skinning" layout="topleft" left_delta="0" - name="UseSSAO" + name="AvatarVertexProgram" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> + </check_box> + <check_box + control_name="RenderAvatarCloth" + height="16" + initial_value="true" + label="Avatar cloth" + layout="topleft" + left_delta="0" + name="AvatarCloth" + top_pad="1" + width="256" /> - <text - type="string" - length="1" - top_pad="8" - follows="top|left" - height="23" - width="110" - word_wrap="true" - layout="topleft" - left="10" - name="shadows_label"> - Shadows: - </text> - <combo_box - control_name="RenderShadowDetail" - height="23" - layout="topleft" - left="10" - top_pad="0" - name="ShadowDetail" - width="150"> - <combo_box.item - label="None" - name="0" - value="0"/> - <combo_box.item - label="Sun/Moon" - name="1" - value="1"/> - <combo_box.item - label="Sun/Moon + Projectors" - name="2" - value="2"/> - </combo_box> ---> - <text - type="string" - length="1" - top_pad="8" - follows="top|left" - height="23" - width="110" - word_wrap="true" - layout="topleft" - left="10" - name="reflection_label"> - Water Reflections: - </text> - <combo_box - control_name="RenderReflectionDetail" - height="23" - layout="topleft" - left_="10" - top_pad ="0" - name="Reflections" - width="150"> - <combo_box.item - label="Minimal" - name="0" - value="0"/> - <combo_box.item - label="Terrain and trees" - name="1" - value="1"/> - <combo_box.item - label="All static objects" - name="2" - value="2"/> - <combo_box.item - label="All avatars and objects" - name="3" - value="3"/> - <combo_box.item - label="Everything" - name="4" - value="4"/> - </combo_box> - <slider control_name="RenderFarClip" decimal_digits="0" @@ -608,58 +615,49 @@ width="128"> Low </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="-260" - name="AvatarRenderingText" + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="200" + name="LightingDetailText" top_pad="18" - width="128"> - Avatar rendering: - </text> - <check_box - control_name="RenderUseImpostors" - height="16" - initial_value="true" - label="Avatar impostors" - layout="topleft" - left_delta="0" - name="AvatarImpostors" - top_pad="7" - width="256" /> - <check_box - control_name="RenderAvatarVP" - height="16" - initial_value="true" - label="Hardware skinning" - layout="topleft" - left_delta="0" - name="AvatarVertexProgram" - top_pad="1" - width="256"> - <check_box.commit_callback - function="Pref.VertexShaderEnable" /> - </check_box> - <check_box - control_name="RenderAvatarCloth" - height="16" - initial_value="true" - label="Avatar cloth" - layout="topleft" - left_delta="0" - name="AvatarCloth" - top_pad="1" - width="256" /> + width="140"> + Lighting detail: + </text> + <radio_group + control_name="RenderLightingDetail" + draw_border="false" + height="38" + layout="topleft" + name="LightingDetailRadio" + top_pad="5" + width="200"> + <radio_item + height="16" + label="Sun and moon only" + layout="topleft" + name="SunMoon" + value="0" + top="3" + width="156" /> + <radio_item + height="16" + label="Nearby local lights" + layout="topleft" + name="LocalLights" + value="1" + top_delta="16" + width="156" /> + </radio_group> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left="358" left_pad="-30" name="TerrainDetailText" top="226" @@ -689,7 +687,7 @@ name="2" top_delta="16" width="50" /> - </radio_group> --> + </radio_group> </panel> <button diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index e41b80baf2..fc33836c79 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -108,6 +108,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="sl_description_edit" top_pad="-3" @@ -154,6 +155,7 @@ layout="topleft" left="107" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" name="fl_description_edit" top_pad="-3" @@ -293,6 +295,7 @@ left="7" name="sl_groups" textbox.max_length="512" + textbox.label="More" textbox.show_context_menu="true" top_pad="0" translate="false" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index d38ad8c5f8..c5f3fcc27d 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -41,7 +41,7 @@ height="20" layout="topleft" left_pad="5" - parse_urls="false" + allow_html="false" use_ellipses="true" name="region" text_color="white" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2aa34b746b..048de70045 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3024,9 +3024,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="conference-title"> Ad-hoc Conference </string> - <string name="conference-title-incoming"> - [AGENT_NAME] Conference - </string> <string name="inventory_item_offered-im"> Inventory item offered </string> @@ -3258,8 +3255,4 @@ Abuse Report</string> <string name="Notices">Notices</string> <string name="Chat">Chat</string> - <!-- Question strings for delete items notifications --> - <string name="DeleteItems">Delete selected items?</string> - <string name="DeleteItem">Delete selected item?</string> - </strings> 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 index 0eec002006..c08267de82 100644 --- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml @@ -21,7 +21,7 @@ height="16" layout="topleft" left="21" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" 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 index 96d72c78a6..f7a05e9bc4 100644 --- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml @@ -21,7 +21,7 @@ height="16" layout="topleft" left="42" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" 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 index 0534485ddd..88a4682e13 100644 --- 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 @@ -33,7 +33,7 @@ height="16" layout="topleft" left="45" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" 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 index 6c60624805..80a877a6c2 100644 --- 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 @@ -22,7 +22,7 @@ height="16" layout="topleft" left="41" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="LtGray_50" diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index c6331ec87b..216c4dea95 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -2,9 +2,10 @@ <expandable_text max_height="300" > <textbox - parse_urls="true" + allow_html="true" allow_scroll="true" bg_visible="false" + label="More" follows="left|top|right" name="text" read_only="true" 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 index da9059c819..0a5930c820 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -32,7 +32,7 @@ height="20" layout="topleft" left="21" - parse_urls="false" + allow_html="false" use_ellipses="true" name="item_name" text_color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index dd93675807..63166f32b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -12,7 +12,6 @@ draw_stripes="true" scroll_bar_bg_visible="false" scroll_bar_bg_color="black" - mouse_wheel_opaque="false" background_visible="true" heading_height="23" draw_border="false" diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 3878c7a144..bb46ec0954 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <simple_text_editor - parse_urls="false" + allow_html="false" mouse_opaque="true" font="SansSerifSmall" max_length="255" @@ -15,13 +15,11 @@ default_color="TextDefaultColor" text_color="TextFgColor" text_readonly_color="TextFgReadOnlyColor" - text_selected_color="White" h_pad="6" v_pad="4" bg_visible="true" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" - bg_selected_color="EmphasisColor" bg_focus_color="TextBgFocusColor"> <simple_text_editor.border bevel_style="in" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 134f2d7522..3006df22b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<text parse_urls="true" +<text allow_html="true" mouse_opaque="false" name="text_box" font="SansSerifSmall" @@ -8,7 +8,7 @@ halign="left" h_pad="0" allow_scroll="false" - text_readonly_color="LabelTextColor" + text_readonly_color="LabelDisabledColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 180120ec89..2ced8b1b4b 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Core parameters are in simple_text_editor.xml --> <text_editor - parse_urls="false" - text_readonly_color="LabelDisabledColor" + allow_html="false" show_context_menu="true"/> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index 5263de4532..5c71e50282 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -220,7 +220,7 @@ ou divisé. [COUNT] sur [MAX] ([DELETED] seront supprimés) </panel.string> <text name="parcel_object_bonus"> - Facteur Bonus objets : [BONUS] + Facteur Bonus Objets : [BONUS] </text> <text name="Simulator primitive usage:"> Utilisation des primitives : diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml index 0ce17b9dc6..87c8847cbd 100644 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml @@ -80,12 +80,12 @@ </text> <spinner label="Heure" name="WLLengthOfDayHour"/> <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> + <spinner label="S" name="WLLengthOfDaySec"/> <text name="DayCycleText3"> Aperçu : </text> <button label="Lire" label_selected="Lire" name="WLAnimSky"/> - <button label="Arrêter" label_selected="Stop" name="WLStopAnimSky"/> + <button label="Stop !" label_selected="Stop" name="WLStopAnimSky"/> <button label="Utiliser heure domaine" label_selected="Aller heure domaine" name="WLUseLindenTime"/> <button label="Enregistrer jour test" label_selected="Enregistrer jour test" name="WLSaveDayCycle"/> <button label="Charger jour test" label_selected="Charger jour test" name="WLLoadDayCycle"/> diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml index 91a943ef15..0f3a4541e2 100644 --- a/indra/newview/skins/default/xui/fr/floater_postcard.xml +++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml @@ -16,7 +16,7 @@ Objet : </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 objet 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_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 92f02ad1fa..26d097d549 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="toolbox floater" short_title="OUTILS POUR LA CONSTRUCTION" title=""> <floater.string name="status_rotate"> - Pour faire tourner l'objet, faites glisser les bandes de couleur. + Pour faire tourner l'objet, faîtes glisser les bandes de couleur. </floater.string> <floater.string name="status_scale"> Pour étirer le côté sélectionné, cliquez et faites glisser. @@ -54,7 +54,7 @@ </radio_group> <radio_group name="move_radio_group"> <radio_item label="Déplacer" name="radio move"/> - <radio_item label="Soulever (Ctrl)" name="radio lift"/> + <radio_item label="Orbite (Ctrl)" name="radio lift"/> <radio_item label="Faire tourner (Ctrl+Maj)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> @@ -190,7 +190,7 @@ Cliquer pour : </text> <combo_box name="clickaction" width="178"> - <combo_box.item label="Toucher (par défaut)" name="Touch/grab(default)"/> + <combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/> <combo_box.item label="S'asseoir sur l'objet" name="Sitonobject"/> <combo_box.item label="Acheter l'objet" name="Buyobject"/> <combo_box.item label="Payer l'objet" name="Payobject"/> @@ -402,8 +402,8 @@ Application </text> <combo_box name="combobox texgen"> - <combo_box.item label="Par défaut" name="Default"/> - <combo_box.item label="Plan" name="Planar"/> + <combo_box.item label="Défaut" name="Default"/> + <combo_box.item label="Planar" name="Planar"/> </combo_box> <text name="label shininess"> Brillance diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 6492a83e06..257c44795f 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Toucher" name="Object Touch"/> - <menu_item_call label="Éditer" name="Edit..."/> + <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="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/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/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index c68e1c72ce..d0521fefc3 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -327,7 +327,7 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. <check_box label="Wszyscy" name="edit objects check"/> <check_box label="Grupa" name="edit group objects check"/> <text name="allow_label3"> - Nowe obiekty: + Nowe Obiekty: </text> <check_box label="Wszyscy" name="all object entry check"/> <check_box label="Grupa" name="group object entry check"/> @@ -380,7 +380,7 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. Punkt Lądowania: [LANDING] </text> <button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej posiadłości."/> - <button label="Nowy" label_selected="Nowy" name="Clear" tool_tip="Usuń dotychczasowe miejsce lądowania."/> + <button label="Nowy" label_selected="Nowy" name="Clear" tool_tip="Clear the landing point."/> <text name="Teleport Routing: "> Trasa teleportacji: </text> @@ -399,7 +399,7 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. URL mediów: </text> <button label="Ustaw" name="set_media_url"/> - <check_box label="Ukryj URL mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym Rezydentom. Nie dotyczy to jednak typów HTML."/> + <check_box label="Ukryj URL mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym Użytkownikom. Nie dotyczy to jednak typów HTML."/> <text name="Description:"> Opis: </text> @@ -431,14 +431,14 @@ Mediów: <check_box label="Ukryj URL muzyki" name="hide_music_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów muzycznych w posiadłości wszystkim nieautoryzowanym Użytkownikom"/> <check_box label="Rozmowy dozwolone" name="parcel_enable_voice_channel"/> <check_box label="Rozmowy dozwolone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box label="Ogranicz komunikację głosową w tej Posiadłości." name="parcel_enable_voice_channel_local"/> + <check_box label="Ogranicz komunikację głosową w tej posiadłości." name="parcel_enable_voice_channel_local"/> </panel> <panel label="DOSTĘP" name="land_access_panel"> <panel.string name="access_estate_defined"> (Zdefiniowane przez Majątek) </panel.string> <panel.string name="allow_public_access"> - Udostępnij publicznie ([MATURITY]) + Udostępnij dostęp publiczny ([MATURITY]) </panel.string> <panel.string name="estate_override"> Jedna lub więcej z tych opcji ustawiona jest z poziomu Posiadłości diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml index 3402d8d31f..d8ae185687 100644 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml @@ -26,7 +26,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. Plik BVH nie może zostać otworzony. </floater.string> <floater.string name="E_ST_NO_HIER"> - Niewłaściwy nagłówek HIERARCHII. + Niewłaściwy nagłówek HIERARCHI. </floater.string> <floater.string name="E_ST_NO_JOINT"> ROOT oraz JOINT nieodnalezione. @@ -104,7 +104,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. Brak otrzymania wartości morfizacji. </floater.string> <floater.string name="E_ST_NO_XLT_EMOTE"> - Nie można odczytać nazwy emocji. + Niemożliwość przeczytania nazwy emocji. </floater.string> <floater.string name="E_ST_BAD_ROOT"> Nieprawidłowa nazwa, użyj "hip". @@ -120,7 +120,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. <spinner label="Od(%)" name="loop_in_point" tool_tip="Wybierz punkt, od którego chcesz zacząć powtarzać animację"/> <spinner label="Do(%)" name="loop_out_point" tool_tip="Wybierz punkt, od którego chcesz zakończyć powtarzanie animacji"/> <text name="hand_label"> - Pozycja ręki + Pozycja Ręki </text> <combo_box label="" name="hand_pose_combo" tool_tip="Kontroluje co robi ręka podczas animacji"> <combo_box.item label="Rozciągaj" name="Spread"/> @@ -128,14 +128,14 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. <combo_box.item label="Wskazuj" name="PointBoth"/> <combo_box.item label="Pięść" name="Fist"/> <combo_box.item label="Lewa-Odpocznij" name="RelaxedLeft"/> - <combo_box.item label="Wskazuj lewą" name="PointLeft"/> - <combo_box.item label="Zaciśnij lewą" name="FistLeft"/> - <combo_box.item label="Prawa-odpocznij" name="RelaxedRight"/> - <combo_box.item label="Wskazuj prawą" name="PointRight"/> - <combo_box.item label="Zaciśnij prawą" name="FistRight"/> - <combo_box.item label="Salutuj prawą" name="SaluteRight"/> + <combo_box.item label="Wskazuj Lewą" name="PointLeft"/> + <combo_box.item label="Zaciśnij Lewą" name="FistLeft"/> + <combo_box.item label="Prawa-Odpocznij" name="RelaxedRight"/> + <combo_box.item label="Wskazuj Prawą" name="PointRight"/> + <combo_box.item label="Zaciśnij Prawą" name="FistRight"/> + <combo_box.item label="Salutuj Prawą" name="SaluteRight"/> <combo_box.item label="Pisz" name="Typing"/> - <combo_box.item label="Prawa-pokój" name="PeaceRight"/> + <combo_box.item label="Prawa-Pokój" name="PeaceRight"/> </combo_box> <text name="emote_label"> Ekspresja @@ -145,18 +145,18 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. <item label="Aaaaah" name="Aaaaah" value="Aaaaah"/> <item label="Obawa" name="Afraid" value="Obawa"/> <item label="Złość" name="Angry" value="Złość"/> - <item label="Duży uśmiech" name="BigSmile" value="Duży uśmiech"/> + <item label="Duży Uśmiech" name="BigSmile" value="Duży uśmiech"/> <item label="Znudzenie" name="Bored" value="Znudzenie"/> <item label="Płacz" name="Cry" value="Płacz"/> <item label="Wzgarda" name="Disdain" value="Wzgarda"/> <item label="Zakłopotanie" name="Embarrassed" value="Zakłopotanie"/> - <item label="Marszczenie brwi" name="Frown" value="Marszczenie brwi"/> + <item label="Marszczenie Brwi" name="Frown" value="Marszczenie brwi"/> <item label="Pocałunek" name="Kiss" value="Pocałunek"/> <item label="Śmiech" name="Laugh" value="Śmiech"/> <item label="Plllppt" name="Plllppt" value="Plllppt"/> <item label="Odrzucenie" name="Repulsed" value="Odrzucenie"/> <item label="Smutek" name="Sad" value="Smutek"/> - <item label="Wzruszenie ramionami" name="Shrug" value="Wzruszenie ramionami"/> + <item label="Wzruszenie Ramionami" name="Shrug" value="Wzruszenie ramionami"/> <item label="Uśmiech" name="Smile" value="Uśmiech"/> <item label="Niespodzianka" name="Surprise" value="Niespodzianka"/> <item label="Mrugnięcie" name="Wink" value="Mrugnięcie"/> @@ -175,7 +175,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. <spinner label="Złagodzić na zewnątrz (sekund)" name="ease_out_time" tool_tip="Ilość Czasu (w sekundach), w których animacje oddzielają się"/> <button label="" name="play_btn" tool_tip="Odtwarzaj animację"/> <button name="pause_btn" tool_tip="Zatrzymaj animację"/> - <button label="" name="stop_btn" tool_tip="Zakończ odtwarzanie animacji"/> + <button label="" name="stop_btn" tool_tip="Stop animation playback"/> <slider label="" name="playback_slider"/> <text name="bad_animation_text"> Brak możliwości wczytania pliku animacji. diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml index 45b9e066e9..5c623e251f 100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml @@ -6,7 +6,8 @@ <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <text name="label"> - Tekstury bakowane + Baked +Textures </text> <text name="composite_label"> Tekstury kompozytowe diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml index ed2e037d3c..f4721b05d8 100644 --- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml @@ -48,7 +48,7 @@ </text> <check_box label="Modyfikuje" name="next_owner_modify"/> <check_box label="Kopiuje" name="next_owner_copy"/> - <check_box initial_value="true" label="Oddaj/Sprzedaj" name="next_owner_transfer" tool_tip="Następny Właściciel może oddać lub sprzedać ten obiekt."/> + <check_box initial_value="true" label="Oddaj/Sprzedaj" name="next_owner_transfer" tool_tip="Następny właściciel może oddać lub sprzedać ten obiekt."/> <button label="OK" name="apply"/> <button label="Anuluj" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 5b9dd47616..bdff791609 100644 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml @@ -16,7 +16,7 @@ W prawo lub w lewo </floater.string> <floater.string name="presets_mode_title"> - Ustaw widok + Preset Views </floater.string> <floater.string name="free_mode_title"> Zobacz obiekt @@ -58,7 +58,7 @@ </panel> </panel> <panel name="buttons"> - <button label="" name="presets_btn" tool_tip="Ustaw widok"/> + <button label="" name="presets_btn" tool_tip="Preset Views"/> <button label="" name="pan_btn" tool_tip="Kamera horyzontalna"/> <button label="" name="avatarview_btn" tool_tip="Ustawienia"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/floater_customize.xml b/indra/newview/skins/default/xui/pl/floater_customize.xml index 373e74ffe0..dd1d5cf684 100644 --- a/indra/newview/skins/default/xui/pl/floater_customize.xml +++ b/indra/newview/skins/default/xui/pl/floater_customize.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="WYGLĄD"> <tab_container name="customize tab container"> - <text label="Części ciała" name="body_parts_placeholder"> + <text label="Części Ciała" name="body_parts_placeholder"> Części ciała </text> <panel label="Kształt" name="Shape"> @@ -157,7 +157,7 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> - <button label="Nowa koszula" label_selected="Nowa Koszula" name="Create New"/> + <button label="Nowa Koszula" label_selected="Nowa Koszula" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> @@ -183,7 +183,7 @@ Nie posiadasz prawa do modyfikowania tej koszuli. </text> <text name="Item Action Label"> - Koszula: + Koszulka: </text> </panel> <panel label="Spodnie" name="Pants"> @@ -504,7 +504,7 @@ <text name="not worn instructions"> Załóż nową maskę alpha poprzez przeciągnięcie jej ze swojej szafy na awatara. Alternatywnie, możesz także stworzyć własną z plików roboczych. </text> - <button label="Stwórz nową Alpha" label_selected="Utwórz nową Alpha" name="Create New"/> + <button label="Stwórz nową Alpha" label_selected="Utwórz Nową Alpha" name="Create New"/> <text name="no modify instructions"> Nie posiadasz uprawnień do modyfikowania tych ubrań/części ciała. </text> diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml index f3929df3e3..e7f73faca7 100644 --- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Day Cycle Floater" title="EDYTOR CYKLU DNIA"> <tab_container name="Day Cycle Tabs"> - <panel label="Cykl dnia" name="Day Cycle"> + <panel label="Cykl Dnia" name="Day Cycle"> <button label="?" name="WLDayCycleHelp"/> <multi_slider label="" name="WLTimeSlider"/> <multi_slider label="" name="WLDayCycleKeys"/> diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml index 80862bfd2f..7588493464 100644 --- a/indra/newview/skins/default/xui/pl/floater_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_event.xml @@ -16,7 +16,7 @@ Adult </floater.string> <floater.string name="general"> - General + PG </floater.string> <floater.string name="unknown"> Nieznana @@ -62,8 +62,8 @@ </expandable_text> </layout_panel> <layout_panel name="button_panel"> - <button name="create_event_btn" tool_tip="Stwórz imprezę"/> - <button name="god_delete_event_btn" tool_tip="Skasuj imprezę"/> + <button name="create_event_btn" tool_tip="Stwórz Imprezę"/> + <button name="god_delete_event_btn" tool_tip="Skasuj Imprezę"/> <button label="Zawiadom mnie" name="notify_btn"/> <button label="Teleportuj" name="teleport_btn"/> <button label="Mapa" name="map_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml index 0c27e4d0bb..750a9e4a66 100644 --- a/indra/newview/skins/default/xui/pl/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml @@ -18,8 +18,8 @@ <panel label="bottom_panel" name="bottom_panel"> <menu_button name="gear_btn" tool_tip="Więcej opcji"/> <button name="new_gesture_btn" tool_tip="Stwórz nową gesturę"/> - <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybraną gesturę"/> - <button name="del_btn" tool_tip="Usuń gesturę"/> + <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybrany gest"/> + <button name="del_btn" tool_tip="Usuń gest"/> </panel> <button label="Edytuj" name="edit_btn"/> <button label="Odtwarzaj" name="play_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml index 828898de54..1f4502b9a4 100644 --- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml @@ -10,16 +10,16 @@ </text> <line_editor left="115" name="region name" width="178"/> <check_box label="Wstęp" name="check prelude" tool_tip="Set this to make the region a prelude"/> - <check_box label="Korekta słońca" name="check fixed sun" tool_tip="Skoryguj ustawienia pozycji słońca."/> + <check_box label="Korekta Słońca" name="check fixed sun" tool_tip="Skorektuj ustawienia pozycji słońca."/> <check_box height="32" label="Zresetuj pozycję Miejsca Startowego" name="check reset home" tool_tip="Zresetuj miejsce startu Rezydentów po teleportacji"/> <check_box bottom_delta="-32" label="Widoczny" name="check visible" tool_tip="Wybierz tą opcję by ustawić region widocznym dla wszystkich."/> <check_box label="Zniszczenia" name="check damage" tool_tip="Wybierz tę opcję by uruchomić opcję zniszczeń w regionie."/> - <check_box label="Zablokuj monitorowanie trafficu" name="block dwell" tool_tip="Wybierz tą opcję by zablokować monitorowanie trafficu w regionie."/> - <check_box label="Zablokuj terraformowanie" name="block terraform" tool_tip="Wybierz tą opcję by zablokować terraforming w regionie"/> + <check_box label="Zablokuj Monitorowanie Trafficu" name="block dwell" tool_tip="Wybierz tą opcję by zablokować monitorowanie trafficu w regionie."/> + <check_box label="Zablokuj Terraformowanie" name="block terraform" tool_tip="Wybierz tą opcję by zablokować terraforming w regionie"/> <check_box label="Piaskownica" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/> <button label="Ustal teren" label_selected="Ustal teren" name="Bake Terrain" tool_tip="Zapamiętaj obecny teren jako początkowy dla cofnięcia modyfikacji terenu." width="138"/> <button label="Cofnięcie modyfikacji" label_selected="Cofnięcie modyfikacji" name="Revert Terrain" tool_tip="Przywróć ustawienia domyślne Regionu." width="138"/> - <button label="Zamień teren" label_selected="Zamień teren" name="Swap Terrain" tool_tip="Zmień bieżący teren domyślnie" width="138"/> + <button label="Zamień teren" label_selected="Zamień teren" name="Swap Terrain" tool_tip="Swap current terrain with default" width="138"/> <text name="estate id"> ID Regionu: </text> @@ -46,8 +46,8 @@ L$/m²: </text> <spinner name="land cost"/> - <button label="Odśwież" label_selected="Odśwież" name="Refresh" tool_tip="Kliknij tutaj aby odswieżyć powyższe informacje"/> - <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tutaj aby zastosować powyższe zmiany"/> + <button label="Odśwież" label_selected="Odśwież" name="Refresh" tool_tip="Click here to refresh the above information"/> + <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Click here to apply any changes from above"/> <button label="Wybierz Region" label_selected="Wybierz Region" left="156" name="Select Region" tool_tip="Wybierz cały Region za pomocą narzędzi edycji terenu" width="150"/> <button label="Automatyczne zapisanie" label_selected="Automatyczne zapisanie" left="156" name="Autosave now" tool_tip="Save gzipped state to autosave directory" width="150"/> </panel> @@ -58,17 +58,17 @@ <text left_delta="110" name="region name"> Welsh </text> - <check_box label="Wyłącz skrypty" name="disable scripts" tool_tip="Wybierz aby wyłączyć skrypty w tym Regionie"/> + <check_box label="Wyłącz skrypty" name="disable scripts" tool_tip="Set this to disable all scripts in this region"/> <check_box label="Deaktywuj kolizje" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/> - <check_box label="Wylącz fizykę" name="disable physics" tool_tip="Wybierz aby wyłączyć fizykę w tym Regionie"/> - <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Kliknij tu aby zastosować powyższe zmiany"/> - <button label="Ustaw cel" label_selected="Ustaw cel" name="Set Target" tool_tip="Ustaw docelowego awatara w celu skasowania obiektów"/> + <check_box label="Wylącz fizykę" name="disable physics" tool_tip="Set this to disable all physics in this region"/> + <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Click here to apply any changes from above"/> + <button label="Ustaw Cel" label_selected="Set Target" name="Set Target" tool_tip="Set the target avatar for object deletion"/> <text name="target_avatar_name"> (brak) </text> - <button label="Usuń cel z oskryptowanych obiektów na innych posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na innych posiadłościach" name="Delete Target's Scripted Objects On Others Land" tool_tip="Skasuj wszystkie oskryptowane obiekty posiadane przez cel na Posiadłości, której nie jest właścicielem. (obiekty bez praw kopiowania zostaną zwrócone)"/> - <button label="Usuń cel z oskryptowanych obiektów na jakichkolwiek posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Skasuj wszystkie oksryptowane obiekty posiadane przez cel w tym Regionie. (obiekty bez praw kopiowania zostaną zwrócone)"/> - <button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target's Objects" tool_tip="Skasuj wszystkie obiekty posiadane przez cel w tym Regionie. (obiekty bez praw kopiowania zostaną zwrócone)"/> + <button label="Usuń cel z oskryptowanych obiektów na innych posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na innych posiadłościach" name="Delete Target's Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."/> + <button label="Usuń cel z oskryptowanych obiektów na jakichkolwiek posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."/> + <button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target's Objects" tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."/> <button label="Główne kolizje" label_selected="Główne kolizje" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks"/> <button label="Główne skrypty" label_selected="Główne skrypty" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts"/> <button label="Treść skryptów" label_selected="Treść skryptów" name="Scripts digest" tool_tip="Wyświetla listę wszystkich skryptów i liczbę ich zastosowań."/> diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml index ba9724ff9a..6b0770af84 100644 --- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml @@ -12,12 +12,12 @@ <combo_box label="Rodzaj Ubrania" name="clothing_type_combo"> <item label="Obraz" name="Image" value="Tekstura"/> <item label="Włosy" name="Hair" value="Włosy"/> - <item label="Głowa kobiety" name="FemaleHead" value="Głowa kobiety"/> - <item label="Górna część ciała kobiety" name="FemaleUpperBody" value="Górna część ciała kobiety"/> - <item label="Dolna część ciała kobiety" name="FemaleLowerBody" value="Dolna część ciała kobiety"/> - <item label="Głowa mężczyzny" name="MaleHead" value="Głowa mężczyzny"/> - <item label="Górna część ciała mężczyzny" name="MaleUpperBody" value="Górna część ciała mężczyzny"/> - <item label="Dona część ciała mężczyzny" name="MaleLowerBody" value="Dolna część ciała mężczyzny"/> + <item label="Damska głowa" name="FemaleHead" value="Głowa kobiety"/> + <item label="Damska górna część ciała" name="FemaleUpperBody" value="Górna część ciała kobiety"/> + <item label="Damska górna część ciała" name="FemaleLowerBody" value="Dolna część ciała kobiety"/> + <item label="Męska głowa" name="MaleHead" value="Głowa mężczyzny"/> + <item label="Męska górna część ciała" name="MaleUpperBody" value="Górna część ciała mężczyzny"/> + <item label="Męska dolna część ciała" name="MaleLowerBody" value="Dolna część ciała mężczyzny"/> <item label="Spódnica" name="Skirt" value="Spódnica"/> <item label="Prim sculptowy" name="SculptedPrim" value="Prim sculptowy"/> </combo_box> diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml index c42f57fb55..0dc4d5b96d 100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml @@ -7,7 +7,7 @@ MOJA SZAFA (Dostarczanie [ITEM_COUNT] obiektów...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - MOJA SZAFA ([ITEM_COUNT] obiektów) [FILTER] + MOJA SZAFA ([ITEM_COUNT] Obiektów) [FILTER] </floater.string> <floater.string name="Fetched"> Dostarczono diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml index 9ae63031b6..2756f5e850 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml @@ -42,12 +42,7 @@ <text name="library_label"> Zbiór: </text> - <scroll_list name="library_list"> - <scroll_list.rows name="action_animation" value="Animacja"/> - <scroll_list.rows name="action_sound" value="Dźwięk"/> - <scroll_list.rows name="action_chat" value="Czat"/> - <scroll_list.rows name="action_wait" value="Wstrzymaj"/> - </scroll_list> + <scroll_list name="library_list"/> <button label="Dodaj >>" name="add_btn"/> <text name="steps_label"> Etapy: diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 5bf394f45a..3e62393e7a 100644 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml @@ -19,12 +19,12 @@ <text name="land_sale_label"> Sprzedaż Posiadłości </text> - <text name="auction_label"> - aukcja Posiadłości - </text> <text name="by_owner_label"> przez Właściciela </text> + <text name="auction_label"> + aukcja Posiadłości + </text> <button name="Go Home" tool_tip="Teleportuj do mojego Miejsca Startowego"/> <text name="Home_label"> Miejsce Startu @@ -35,7 +35,7 @@ <text name="pg_label"> Ogólne </text> - <check_box initial_value="true" name="events_mature_chk"/> + <check_box name="events_mature_chk"/> <text name="events_mature_label"> Moderuj </text> @@ -58,9 +58,6 @@ <search_editor label="Regiony Według Nazwy" name="location" tool_tip="Wpisz nazwę regionu"/> <button label="Znajdź" name="DoSearch" tool_tip="Szukaj regionu"/> <button name="Clear" tool_tip="Wyczyść zapamiętane linie oraz zresetuj mapę"/> - <text name="events_label"> - Lokalizacja: - </text> <button label="Teleportuj" name="Teleport" tool_tip="Teleportuj do wybranego miejsca"/> <button label="Kopiuj SLurl" name="copy_slurl" tool_tip="Kopie obecnego miejsca jako SLurl mogą zostać użyte na stronie internetowej."/> <button label="Pokaż wybrane" name="Show Destination" tool_tip="Wyśrodkuj mapę w wybranym miejscu"/> diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 97a94584c4..16a89b2b27 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -92,7 +92,6 @@ <menu_item_call label="Wstrzymaj Działanie Skryptów w Selekcji" name="Set Scripts to Not Running"/> </menu> <menu label="Opcje" name="Options"> - <menu_item_call label="Ustaw domyślne pozwolenia ładowania" name="perm prefs"/> <menu_item_check label="Pokaż Zaawansowane Pozwolenia" name="DebugPermissions"/> <menu_item_check label="Wybierz Tylko Moje Obiekty" name="Select Only My Objects"/> <menu_item_check label="Wybierz Tylko Obiekty Przesuwalne" name="Select Only Movable Objects"/> @@ -110,6 +109,7 @@ <menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/> <menu_item_call label="animację (L$[COST])..." name="Upload Animation"/> <menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/> + <menu_item_call label="Ustaw domyślne pozwolenia ładowania" name="perm prefs"/> </menu> </menu> <menu label="Pomoc" name="Help"> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 14718e8f6f..58ca77411d 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -355,7 +355,7 @@ Czy na pewno chcesz kontynuować? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="DeleteOutfits"> - Skasować wybrane stroje? + Czy usunąć wybrany strój? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="PromptGoToEventsPage"> @@ -2720,8 +2720,8 @@ Proszę sprawdź swoją sieć i ustawienia firewall. Awatar '[NAME]' pozostał w pełni załadowany. </notification> <notification name="AvatarRezSelfBakeNotification"> - ( [EXISTENCE] sekund w Second Life ) -You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. + ( [EXISTENCE] sekund w Second Life) +Załadowano [RESOLUTION] teksturę dla '[BODYREGION]' po [TIME] sekundach. </notification> <notification name="ConfirmLeaveCall"> Czy jestes pewien/pewna, że chcesz zakończyć rozmowę? @@ -2758,7 +2758,4 @@ Jeżeli wciąż masz problemy sprawdź: [SUPPORT_SITE]. Jeśli jesteś właścicielem posiadłości, możesz ustawić na niej miejsce startu. W innym przypadku możesz poszukać na mapie miejsca oznaczone jako "Infohub". </global> - <global name="You died and have been teleported to your home location"> - Nastąpiła śmierć i teleportacja do Miejsca Startu. - </global> </notifications> 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_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index 5e4955c28c..7447efe667 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -12,27 +12,19 @@ Użytkownik: </text> <line_editor label="Użytkownik" name="username_edit" tool_tip="[SECOND_LIFE] Użytkownik"/> - <text name="password_text"> - Hasło: - </text> <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> </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_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml index a78ab4d6f8..926ca806ac 100644 --- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml @@ -45,7 +45,7 @@ <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> - <button name="stop_btn" tool_tip="Zatrzymaj wybrane media"/> + <button name="stop_btn" tool_tip="Wyłącz wybrane media"/> </layout_panel> <layout_panel name="play"> <button name="play_btn" tool_tip="Włącz wybrane media"/> @@ -57,13 +57,13 @@ <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Głośność audio dla wybranych mediów"/> </layout_panel> <layout_panel name="mute"> - <button name="mute_btn" tool_tip="Wycisz audio wybranych mediów"/> + <button name="mute_btn" tool_tip="Wycisz audio dla wybranych mediów"/> </layout_panel> <layout_panel name="zoom"> <button name="zoom_btn" tool_tip="Przybliż wybrane media"/> </layout_panel> <layout_panel name="unzoom"> - <button name="unzoom_btn" tool_tip="Oddal od wybranych mediów"/> + <button name="unzoom_btn" tool_tip="Oddal wybrane media"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml index b0d02179fd..6ab5be77d8 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Dźwięki" name="Preference Media panel"> <slider label="Główny" name="System Volume"/> - <check_box initial_value="true" label="Wycisz podczas minimalizacji" name="mute_when_minimized"/> + <check_box label="Wycisz podczas minimalizacji" name="mute_when_minimized"/> <slider label="Interfejs" name="UI Volume"/> <slider label="Otoczenie" name="Wind Volume"/> <slider label="Efekty dźwiękowe" name="SFX Volume"/> @@ -11,8 +11,8 @@ <check_box label="Odtwarzaj media" name="enable_media"/> <slider label="Komunikacja Głosowa" name="Voice Volume"/> <check_box label="Pozwól na rozmowy głosowe" name="enable_voice_check"/> - <check_box label="Automatycznie odtwarzaj media" name="media_auto_play_btn" tool_tip="Zaznacz tę funkcję by uruchomić automatyczne uruchamianie mediów" value="true"/> - <check_box label="Uruchom media załączone do innych awatarów" name="media_show_on_others_btn" tool_tip="Odznacz tę funkcję by ukryć media załączone to awatarów w publiżu" value="true"/> + <check_box label="Automatycznie odtwarzaj media" name="media_auto_play_btn" tool_tip="Zaznacz tę funkcję by uruchomić automatyczne uruchamianie mediów"/> + <check_box label="Uruchom media załączone do innych awatarów" name="media_show_on_others_btn" tool_tip="Odznacz tę funkcję by ukryć media załączone to awatarów w publiżu"/> <text name="voice_chat_settings"> Ustawienia Komunikacji Głosowej </text> @@ -28,12 +28,6 @@ <panel.string name="default_text"> Domyślne </panel.string> - <panel.string name="default system device"> - Domyślne ustawienia sprzętowe - </panel.string> - <panel.string name="no device"> - Brak sprzętu - </panel.string> <text name="Input"> Wejściowe </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/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml index 3282926bcd..0c6169c9c0 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml @@ -23,7 +23,8 @@ </panel.string> <text name="title" value="Profil obiektu"/> <text name="origin" value="(Szafa)"/> - <panel label="" name="item_profile"> + <panel label="" + name="item_profile"> <text name="LabelItemNameTitle"> Nazwa: </text> @@ -44,10 +45,10 @@ <text name="LabelAcquiredDate"/> <panel name="perms_inv"> <text name="perm_modify"> - Możesz: + Ty możesz: </text> <check_box label="Zmienia" name="CheckOwnerModify"/> - <check_box label="Kopiuj" name="CheckOwnerCopy"/> + <check_box label="Kopiuje" name="CheckOwnerCopy"/> <check_box label="Sprzedaje/Oddaje" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> Każdy: @@ -56,18 +57,18 @@ <text name="GroupLabel"> Grupa: </text> - <check_box label="Udostępnij" name="CheckShareWithGroup" tool_tip="Pozwól wszystkim członkom ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z roli."/> + <check_box label="Udostępnij" name="CheckShareWithGroup" tool_tip="Pozwól wszystkim członkom ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz Przypisać aby aktywować ograniczenia wynikające z roli."/> <text name="NextOwnerLabel"> Następny Właściciel: </text> <check_box label="Modyfikuje" name="CheckNextOwnerModify"/> <check_box label="Kopiuje" name="CheckNextOwnerCopy"/> - <check_box label="Sprzedaje/Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny Właściciel może oddawać lub sprzedawać ten obiekt"/> + <check_box label="Sprzedaje/Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddać lub sprzedać ten obiekt"/> </panel> - <check_box label="Na sprzedaż" name="CheckPurchase"/> + <check_box label="Na Sprzedaż" name="CheckPurchase"/> <combo_box name="combobox sale copy"> - <combo_box.item label="Kopiuje" name="Copy"/> - <combo_box.item label="Oryginalny" name="Original"/> + <combo_box.item label="Kopia" name="Copy"/> + <combo_box.item label="Originał" name="Original"/> </combo_box> <spinner label="Cena: L$" name="Edit Cost"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index e4423dc5ce..bd1fb6a5da 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -642,9 +642,6 @@ <string name="worldmap_offline"> Mapa Świata jest Niedostępna </string> - <string name="worldmap_item_tooltip_format"> - [AREA] m² L$[PRICE] - </string> <string name="worldmap_results_none_found"> Miejsce Nieodnalezione. </string> @@ -1034,7 +1031,6 @@ <string name="AnimFlagStop" value=" Zatrzymaj Animację :"/> <string name="AnimFlagStart" value=" Rozpocznij Animację :"/> <string name="Wave" value=" Wave"/> - <string name="GestureActionNone" value="Żadne"/> <string name="HelloAvatar" value=" Witaj, Awatarze!"/> <string name="ViewAllGestures" value=" Zobacz Wszystkie >>"/> <string name="GetMoreGestures" value="Więcej gesturek >>"/> @@ -1114,12 +1110,12 @@ <string name="InvFolder Gestures"> Gesturki </string> + <string name="InvFolder favorite"> + Ulubione + </string> <string name="InvFolder Current Outfit"> Obecne Ubranie </string> - <string name="InvFolder Initial Outfits"> - Początkowe stroje - </string> <string name="InvFolder My Outfits"> Moje Ubranie </string> @@ -1439,7 +1435,6 @@ <string name="SummaryForTheWeek" value="Podsumowanie dla tego tygodnia, począwszy od "/> <string name="NextStipendDay" value="Następna wypłata będzie w "/> <string name="GroupIndividualShare" value=" Groupa Udziały Indywidualne"/> - <string name="GroupColumn" value="Grupa"/> <string name="Balance"> Stan </string> @@ -1653,12 +1648,6 @@ <string name="BusyModeResponseDefault"> Rezydent, do którego wysłałeś wiadomość prywatną znajduje się w trybie pracy. Oznacza to, iż Twoja wiadomość zostanie zapisana do przeglądnięcia poźniej. </string> - <string name="NoOutfits"> - Nie posiadasz jeszcze żadnych strojów. Spróbuj [secondlife:///app/search/all/ Szukaj] - </string> - <string name="NoOutfitsTabsMatched"> - Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/all/[SEARCH_TERM] Szukaj]. - </string> <string name="MuteByName"> (Nazwa) </string> @@ -3579,9 +3568,6 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. <string name="group_role_owners"> Właściciele </string> - <string name="group_member_status_online"> - Obecnie w SL - </string> <string name="uploading_abuse_report"> Pobieranie... @@ -3635,15 +3621,9 @@ Raport o Nadużyciu <string name="Invalid Wearable"> Nieaktualne ubranie/część ciała </string> - <string name="New Gesture"> - Nowy gest - </string> <string name="New Script"> Nowy skrypt </string> - <string name="New Note"> - Stwórz nowe ogłoszenie - </string> <string name="New Folder"> Nowy folder </string> @@ -3701,15 +3681,6 @@ Raport o Nadużyciu <string name="Male - Wow"> Mężczyzna - Wow </string> - <string name="Female - Chuckle"> - Kobieta - Chichot - </string> - <string name="Female - Cry"> - Kobieta - Płacze - </string> - <string name="Female - Embarrassed"> - Kobieta - Zakłopotana - </string> <string name="Female - Excuse me"> Kobieta - Excuse me </string> @@ -3728,21 +3699,9 @@ Raport o Nadużyciu <string name="Female - Hey"> Kobieta - Hey </string> - <string name="Female - Hey baby"> - Kobieta - Hey baby - </string> <string name="Female - Laugh"> Kobieta - Śmiech </string> - <string name="Female - Looking good"> - Kobieta - Looking good - </string> - <string name="Female - Over here"> - Kobieta - Over here - </string> - <string name="Female - Please"> - Kobieta - Please - </string> <string name="Female - Repulsed"> Kobieta - Odrzucenie </string> @@ -3792,46 +3751,4 @@ Raport o Nadużyciu <string name="dateTimePM"> PM </string> - <string name="LocalEstimateUSD"> - US$ [AMOUNT] - </string> - <string name="Membership"> - Członkostwo - </string> - <string name="Roles"> - Funkcje - </string> - <string name="Group Identity"> - Status Grupy - </string> - <string name="Parcel Management"> - Parcel Management - </string> - <string name="Parcel Identity"> - Parcel Identity - </string> - <string name="Parcel Settings"> - Parcel Settings - </string> - <string name="Parcel Powers"> - Parcel Powers - </string> - <string name="Parcel Access"> - Dostęp do posiadłości - </string> - <string name="Parcel Content"> - Parcel Content - </string> - <string name="Object Management"> - Object Management - </string> - <string name="Accounting"> - Accounting - </string> - <string name="Notices"> - Ogłoszenia - </string> - <string name="Chat"> - Czat - </string> </strings> |