diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-10 15:58:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-10 15:58:08 -0500 |
| commit | 711d70bd4c2a69c5176759f8bcd2ab0b3e1d1715 (patch) | |
| tree | 488e783c98321b8d3eb7e4c5ec7ca28f0cd5ea02 /indra/newview/skins/default/xui | |
| parent | 49b8f8af026a627db47c9592fc92eccda790401e (diff) | |
| parent | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
38 files changed, 401 insertions, 179 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml new file mode 100644 index 0000000000..74092e88ec --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_web_content.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_web_content" title=""> + <layout_stack name="stack1"> + <layout_panel name="nav_controls"> + <button name="back" tool_tip="Navigér tilbage"/> + <button name="forward" tool_tip="Navigér frem"/> + <button name="stop" tool_tip="Stop navigering"/> + <button name="reload" tool_tip="Genindlæs side"/> + <combo_box name="address" tool_tip="Indtast URL her"/> + <icon name="media_secure_lock_flag" tool_tip="Sikker browsing"/> + <button name="popexternal" tool_tip="Åben denne URL i din normale browser"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 1231c4c08d..0b7a5040ae 100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml @@ -16,7 +16,8 @@ <menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/> <menu_item_call label="Vis betingelser" name="TOS"/> <menu_item_call label="Vis vigtig besked" name="Critical"/> - <menu_item_call label="Test i web browser" name="Web Browser Test"/> + <menu_item_call label="Media Browser Test" name="Web Browser Test"/> + <menu_item_call label="Web Content Floater Test" name="Web Content Floater Test"/> <menu_item_check label="Vis gitter vælger" name="Show Grid Picker"/> <menu_item_call label="Vis notifikationskonsol" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml index 9dcce49708..186dbd476a 100644 --- a/indra/newview/skins/default/xui/da/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml @@ -3,6 +3,7 @@ <menu_item_call label="Zoom tæt" name="Zoom Close"/> <menu_item_call label="Zoom mellem" name="Zoom Medium"/> <menu_item_call label="Zoom langt" name="Zoom Far"/> + <menu_item_call label="Zoom standard" name="Zoom Default"/> <menu_item_check label="Rotér kort" name="Rotate Map"/> <menu_item_check label="Auto centrér" name="Auto Center"/> <menu_item_call label="Fjern ref." name="Stop Tracking"/> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index a3dcfdf4cc..fc32be9dc9 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -119,13 +119,15 @@ <menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Mange (L$[COST] pr. fil)..." name="Bulk Upload"/> </menu> + <menu_item_call label="Fortyd" name="Undo"/> + <menu_item_call label="Gendan" name="Redo"/> </menu> <menu label="Hjælp" name="Help"> <menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/> + <menu_item_check label="Aktiver tips" name="Enable Hints"/> <menu_item_call label="Rapporter misbrug" name="Report Abuse"/> <menu_item_call label="Rapportér fejl" name="Report Bug"/> <menu_item_call label="Om [APP_NAME]" name="About Second Life"/> - <menu_item_check label="Aktiver tips" name="Enable Hints"/> </menu> <menu label="Avanceret" name="Advanced"> <menu_item_call label="Gendan teksturer" name="Rebake Texture"/> @@ -266,7 +268,8 @@ <menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/> </menu> <menu label="UI (brugerflade)" name="UI"> - <menu_item_call label="Test web browser" name="Web Browser Test"/> + <menu_item_call label="Media browser test" name="Web Browser Test"/> + <menu_item_call label="Browser med webindhold" name="Web Content Browser"/> <menu_item_call label="Print info om valgt objekt" name="Print Selected Object Info"/> <menu_item_call label="Hukommelse statistik" name="Memory Stats"/> <menu_item_check label="Debug konsol for region" name="Region Debug Console"/> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 27024f4eaa..a3c4897ee1 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -109,6 +109,10 @@ Vælg kun en genstand, og prøv igen. 'Ikke-venner' vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM) <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="FavoritesOnLogin"> + Bemærk: Når du aktiverer dette valg, kan enhver der bruger denne computer se dine favorit lokationer. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Tildeling af ændre-rettigheder til andre beboere, tillader dem at ændre, slette eller tage ETHVERT objekt du måtte have. Vær MEGET forsigtig ved tildeling af denne rettighed. Ønsker du at give ændre-rettgheder til [NAME]? @@ -416,7 +420,7 @@ Tilbyd venskab til [NAME]? <input name="message"> [DESC] (ny) </input> - <button name="Offer" text="OK"/> + <button name="OK" text="OK"/> <button name="Cancel" text="Annullér"/> </form> </notification> @@ -426,7 +430,7 @@ Tilbyd venskab til [NAME]? <input name="message"> [DESC] (ny) </input> - <button name="Offer" text="OK"/> + <button name="OK" text="OK"/> <button name="Cancel" text="Annullér"/> </form> </notification> @@ -436,7 +440,7 @@ Tilbyd venskab til [NAME]? <input name="new_name"> [NAME] </input> - <button name="Offer" text="OK"/> + <button name="OK" text="OK"/> <button name="Cancel" text="Annullér"/> </form> </notification> @@ -598,9 +602,41 @@ Hent og installér venligst den nyeste version fra http://secondlife.com/download. <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="DownloadBackground"> - En opdateret version af [APP_NAME] er hentet. -Den vil blive anvendt næste gang du genstarter [APP_NAME] + <notification name="FailedRequiredUpdateInstall"> + Vi kunne ikke installere en påkrævet opdatering. +Du kan ikke logge på før [APP_NAME] er blevet opdateret. + +Hent og installer venligst den nyeste klien fra +http://secondlife.com/download. + <usetemplate name="okbutton" yestext="Afslut"/> + </notification> + <notification name="UpdaterServiceNotRunning"> + Dette er en påkrævet opdatering af din Second Life installation. + +Du kan downloade opdateringen fra http://www.secondlife.com/downloads +eller du kan installere den nu. + <usetemplate name="okcancelbuttons" notext="Afslut Second Life" yestext="Hent og installér nu"/> + </notification> + <notification name="DownloadBackgroundTip"> + Vi har hentet en opdatering til din [APP_NAME] installation. +Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update] + <usetemplate name="okcancelbuttons" notext="Senere..." yestext="Installér nu og genstart [APP_NAME]"/> + </notification> + <notification name="DownloadBackgroundDialog"> + Vi har hentet en opdatering til din [APP_NAME] installation. +Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update] + <usetemplate name="okcancelbuttons" notext="Senere..." yestext="Installér nu og genstart [APP_NAME]"/> + </notification> + <notification name="RequiredUpdateDownloadedVerboseDialog"> + Vi har hentet en påkrævet opdatering. +Version [VERSION] + +Du skal genstarte [APP_NAME] for at installere denne opdatering. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RequiredUpdateDownloadedDialog"> + Du skal genstarte [APP_NAME] for at installere opdateringen. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="DeedObjectToGroup"> <usetemplate ignoretext="Bekræft før jeg dedikerer et objekt til en gruppe" name="okcancelignore" notext="Cancel" yestext="Deed"/> @@ -1123,14 +1159,6 @@ Prøv at vælge mindre stykker land. <notification name="NoContentToSearch"> Vælg venligst mindst en indholdstype for at søge (PG, Mature, or Adult). </notification> - <notification name="GroupVote"> - [NAME] har forslået at stemme for: -[MESSAGE] - <form name="form"> - <button name="VoteNow" text="Stem nu"/> - <button name="Later" text="Senere"/> - </form> - </notification> <notification name="SystemMessage"> [MESSAGE] </notification> @@ -1682,9 +1710,7 @@ Avatar '[NAME]' har forladt udseende modus. <notification name="NoConnect"> Vi har problemer med at oprette forbindelse via [PROTOCOL] [HOSTID]. Check venligst din netværks- og firewallsetup. - <form name="form"> - <button name="OK" text="OK"/> - </form> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> Vi har problemer med at oprette forbindelse til din stemme server: @@ -1693,9 +1719,7 @@ Check venligst din netværks- og firewallsetup. Stemme kommunikation vil ikke være tilgængelig. Check venligst din netværks- og firewall setup. - <form name="form"> - <button name="OK" text="OK"/> - </form> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> ( [EXISTENCE] sekunder i live ) @@ -1731,6 +1755,9 @@ Sluk for alles lyd? <notification label="Undersøg verden" name="HintDestinationGuide"> Destinationsguiden indeholder tusinder af nye steder der kan opleves. Vælg venligst et sted og vælg Teleport for at komme derhen. </notification> + <notification label="Ændre dit udseende" name="HintAvatarPicker"> + Kunne du tænke dig at prøve et nyt udseende? Klik på knappen nedenfor for at se flere avatarer. + </notification> <notification label="Side panel" name="HintSidePanel"> Få hurtig tilgang til din beholdning, sæt, profiler og andet i dette side panel. </notification> @@ -1740,6 +1767,12 @@ Sluk for alles lyd? <notification label="Visningsnavn" name="HintDisplayName"> Angiv dit konfigurérbare visningsnavn her. Dette er i tillæg til dit unikke brugernavn, som ikke kan ændres. Du kan ændre hvordan du ser andre beboeres navne i dine indstillinger. </notification> + <notification label="Flyt" name="HintMoveArrows"> + For at gå, brug piletasterne på tastaturet. Du kan løbe ved at trykke to gange på Pil-Op + </notification> + <notification label="Se" name="HintView"> + For at ændre dit kamera-view, benyt kredsløbs og panoreringskontrollerne. Nulstil view ved at trykke Esc eller ved at gå. + </notification> <notification label="Beholdning" name="HintInventory"> Undersøg din beholdning for at finde ting. Nyeste genstand findes lettes under fanen "Nye ting" </notification> @@ -1753,6 +1786,15 @@ Sluk for alles lyd? <button name="open" text="Åben pop-up vindue"/> </form> </notification> + <notification name="AuthRequest"> + Hjemmesiden på '<nolink>[HOST_NAME]</nolink>' in realm '[REALM]' kræver et brugernavn og password. + <form name="form"> + <input name="username" text="Brugernavn"/> + <input name="password" text="Password"/> + <button name="ok" text="Send"/> + <button name="cancel" text="Annullér"/> + </form> + </notification> <global name="UnsupportedGLRequirements"> Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter 'multitexture'. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem. diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml index df1173a0a0..890f4a2f0a 100644 --- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml @@ -21,7 +21,7 @@ <string name="FormatYears"> [COUNT]å </string> - <text name="avatar_name" value="Ukendt"/> + <text name="avatar_name" value="(henter)"/> <icon name="permission_edit_theirs_icon" tool_tip="Du kan redigere denne vens objekter"/> <icon name="permission_edit_mine_icon" tool_tip="Denne ven kan redigere, slette eller tage dine objekter"/> <icon name="permission_map_icon" tool_tip="Denne ven kan finde dig på kortet"/> diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml index 3826e8a228..0f60a6df51 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_alpha_panel"> - <panel name="avatar_alpha_color_panel"> - <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øvre" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øje" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> - </panel> + <scroll_container name="avatar_alpha_color_panel_scroll"> + <panel name="avatar_alpha_color_panel"> + <texture_picker label="Nedre alpha" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øverste alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Hovede alpha" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øje alpha" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Hår alpha" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index 268f138185..dc8d9bc432 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -3,9 +3,6 @@ <panel.string name="create_account_url"> http://join.secondlife.com/ </panel.string> - <panel.string name="real_url"> - http://secondlife.com/app/login/ - </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php </panel.string> @@ -14,7 +11,7 @@ <text name="username_text"> Brugernavn: </text> - <line_editor label="bobsmith12 eller Steller Sunshine" name="username_edit" tool_tip="Det brugernavn du valgte da du registrerede, som f.eks. bobsmith12 eller Steller Sunshine"/> + <combo_box name="username_combo" tool_tip="Brugernavnet du valgte da du registrerde dig, som f.eks. bobsmith12 or Steller Sunshine"/> <text name="password_text"> Password: </text> diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml index 2db4b278d7..94da58389f 100644 --- a/indra/newview/skins/default/xui/da/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml @@ -5,30 +5,27 @@ <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> + <string name="name_text_args"> + [NAME] + </string> + <string name="display_name_text_args"> + [DISPLAY_NAME] + </string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <panel name="second_life_image_panel"> - <icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/> - <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> - </panel> - <panel name="first_life_image_panel"> - <icon label="" name="real_world_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/> - <text name="title_rw_descr_text" value="Real World:"/> - </panel> - <text name="title_member_text" value="Beboer siden:"/> - <text name="title_acc_status_text" value="Konto status:"/> - <text name="title_partner_text" value="Partner:"/> - <panel name="partner_data_panel"> - <name_box initial_value="(henter)" name="partner_text"/> + <text name="display_name_descr_text"> + Brugernavn + </text> + <text name="name_descr_text"> + Visningsnavn + </text> + <button label="Profil" name="see_profile_btn" tool_tip="Se profil for denne avatar"/> </panel> - <text name="title_groups_text" value="Grupper:"/> </panel> </scroll_container> </layout_panel> </layout_stack> - <panel name="profile_me_buttons_panel"> - <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/> - </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml index 949ff1a058..30ad4ff9f6 100644 --- a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml @@ -3,8 +3,9 @@ <string name="message_max_lines_count" value="7"/> <panel label="info_panel" name="info_panel"> <text_editor name="message" value="besked"/> - parse_urls="false" + </panel> + <panel label="control_panel" name="control_panel"> <button label="Send" name="btn_submit"/> + <button label="Ignorér" name="ignore_btn"/> </panel> - <panel label="control_panel" name="control_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml index 604a00e0b4..b2b00db769 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml @@ -29,10 +29,10 @@ URL'er </text> <text name="bubble_chat"> - Chat-boble baggrund: + Baggrundsfarve til navne-skilt (berører også Bubble Chat): </text> - <color_swatch name="background" tool_tip="Vælg farve til chat-boble"/> - <slider label="Uigennemsigtighed:" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Vælg farve til navne-skilt"/> + <slider label="Uigennemsigtighed:" name="bubble_chat_opacity" tool_tip="Vælg gennemsigtighed for navneskilt"/> <text name="floater_opacity"> Vindue uigennemsigtighed: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml index 2843f0d339..0df330b016 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml @@ -7,9 +7,11 @@ <text name="cache_size_label_l"> (Lokationer, billeder, web, søge historik) </text> + <check_box label="Vis dig selv i søgeresultater" name="online_searchresults"/> <check_box label="Kun venner og grupper ved jeg er online" name="online_visibility"/> <check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/> <check_box label="Slå mikrofon fra når opkald slutter" name="auto_disengage_mic_check"/> + <check_box label="Vis mine favorit landemærker ved login (via "Start ved" menuen)" name="favorites_on_login_check"/> <text name="Logs:"> Chat Logs: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 332b5ed1c4..479e98817e 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -39,5 +39,11 @@ </text> <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/> <spinner label="Port nummer:" name="web_proxy_port"/> - <check_box initial_value="sand" label="Hent og installer automatisk [APP_NAME] opdateringer" name="updater_service_active"/> + <text name="Software updates:"> + Software opdateringer: + </text> + <combo_box name="updater_service_combobox"> + <combo_box.item label="Installér automatisk" name="Install_automatically"/> + <combo_box.item label="Hent og installér opdateringer manuelt" name="Install_manual"/> + </combo_box> </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 75600a93f6..5810cc21e7 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml @@ -9,7 +9,7 @@ <slider label="Omgivelser" name="Wind Volume"/> <slider label="Lyd effekter" name="SFX Volume"/> <slider label="Musik" name="Music Volume"/> - <check_box label="Aktiveret" name="music_enabled"/> + <check_box label="Aktiveret" name="enable_music"/> <slider label="Media" name="Media Volume"/> <check_box label="Aktiveret" name="enable_media"/> <slider label="Stemme chat" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 8633f12d24..6e7bdfc188 100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml @@ -22,7 +22,7 @@ L$ [AMT] </panel.string> <panel name="balance_bg"> - <text name="balance" tool_tip="Min status" value="L$20"/> + <text name="balance" tool_tip="Klik for at opdaterer din L$ balance" value="L$20"/> <button label="KØB L$" name="buyL" tool_tip="Klik for at købe flere L$"/> </panel> <text name="TimeText" tool_tip="Nuværende tid (Pacific)"> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 6f891b8d1b..aa02fc14e5 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1843,34 +1843,34 @@ Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Fremad </string> - <string name="Left"> + <string name="Direction_Left"> Venstre </string> - <string name="Right"> + <string name="Direction_Right"> Højre </string> - <string name="Back"> + <string name="Direction_Back"> Bagud </string> - <string name="North"> + <string name="Direction_North"> Nord </string> - <string name="South"> + <string name="Direction_South"> Syd </string> - <string name="West"> + <string name="Direction_West"> Vest </string> - <string name="East"> + <string name="Direction_East"> Øst </string> - <string name="Up"> + <string name="Direction_Up"> Op </string> - <string name="Down"> + <string name="Direction_Down"> Ned </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index 26674ea594..0f029d8664 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -9,7 +9,7 @@ <slider label="Umgebung" name="Wind Volume"/> <slider label="Soundeffekte" name="SFX Volume"/> <slider label="Musik wird gestreamt" name="Music Volume"/> - <check_box label="Aktiviert" name="music_enabled"/> + <check_box label="Aktiviert" name="enable_music"/> <slider label="Medien" name="Media Volume"/> <check_box label="Aktiviert" name="enable_media"/> <slider label="Voice-Chat" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index e4676194aa..7284e40be2 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1888,34 +1888,34 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Vorwärts </string> - <string name="Left"> + <string name="Direction_Left"> Links </string> - <string name="Right"> + <string name="Direction_Right"> Rechts </string> - <string name="Back"> + <string name="Direction_Back"> Hinten </string> - <string name="North"> + <string name="Direction_North"> Norden </string> - <string name="South"> + <string name="Direction_South"> Süden </string> - <string name="West"> + <string name="Direction_West"> Westen </string> - <string name="East"> + <string name="Direction_East"> Osten </string> - <string name="Up"> + <string name="Direction_Up"> Nach oben </string> - <string name="Down"> + <string name="Direction_Down"> Nach unten </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3dd6c60095..937a97797d 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1905,7 +1905,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="allow_public_access"> - Allow Public Access ([MATURITY]) + Allow Public Access ([MATURITY]) (Note: Unchecking this will create ban lines) </panel.string> <panel.string name="estate_override"> @@ -1932,7 +1932,7 @@ Only large parcels can be listed in search. name="public_access" top_pad="5" label_text.valign="center" - label_text.v_pad="-7" + label_text.v_pad="-2" width="278" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index cce833b1ea..53cc808e70 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -722,6 +722,33 @@ <button.commit_callback function="BuildTool.applyToSelection"/> </button> + <text + text_color="LtGray_50" + type="string" + length="1" + height="10" + follows="left|top" + halign="right" + layout="topleft" + right="-10" + name="obj_count" + top_pad="5" + width="143"> + Objects: [COUNT] + </text> + <text + text_color="LtGray_50" + type="string" + length="1" + height="10" + follows="left|top" + halign="right" + layout="topleft" + right="-10" + name="prim_count" + width="143"> + Prims: [COUNT] + </text> <text text_color="LtGray_50" type="string" @@ -732,7 +759,7 @@ layout="topleft" right="-100" name="linked_set_count" - top_pad="5" + top="144" width="80"> Linked Sets: [COUNT] </text> diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index 7fa4cd840a..d2519a5aa4 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -39,6 +39,17 @@ parameter="sort_by_recent" /> </menu_item_check> <menu_item_check + label="Sort Folders Always by Name" + layout="topleft" + name="sort_folders_by_name"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="sort_folders_by_name" /> + <on_check + function="Inventory.GearDefault.Check" + parameter="sort_folders_by_name" /> + </menu_item_check> + <menu_item_check label="Sort System Folders to Top" layout="topleft" name="sort_system_folders_to_top"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index f0ce8b849a..26af8dc29d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -198,9 +198,12 @@ label="Enabled" layout="topleft" left_pad="5" - name="music_enabled" + name="enable_music" top_delta="2" - width="350"/> + width="350"> + <check_box.commit_callback + function="Pref.updateMediaAutoPlayCheckbox"/> + </check_box> <slider control_name="AudioLevelMedia" disabled_control="MuteAudio" @@ -245,7 +248,10 @@ top_delta="2" left_pad="5" name="enable_media" - width="110"/> + width="110"> + <check_box.commit_callback + function="Pref.updateMediaAutoPlayCheckbox"/> + </check_box> <slider control_name="AudioLevelVoice" disabled_control="MuteAudio" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 1b2571a0d6..4b871343e2 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1949,7 +1949,7 @@ Requests name of an avatar. When data is available the dataserver event will be <!-- Gestures labels --> <!-- use value="" because they have preceding spaces --> - <string name="Chat" value=" Chat : " /> + <string name="Chat Message" value=" Chat : " /> <string name="Sound" value=" Sound : " /> <string name="Wait" value=" --- Wait : " /> <string name="AnimFlagStop" value=" Stop Animation : " /> @@ -2323,9 +2323,6 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="accel-win-alt">Alt+</string> <string name="accel-win-shift">Shift+</string> - <string name="Esc">Esc</string> - <string name="Home">Home</string> - <!-- Previews --> <string name="FileSaved">File Saved</string> <string name="Receiving">Receiving</string> @@ -2337,16 +2334,16 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT">PDT</string> <!-- Directions, HUD --> - <string name="Forward">Forward</string> - <string name="Left">Left</string> - <string name="Right">Right</string> - <string name="Back">Back</string> - <string name="North">North</string> - <string name="South">South</string> - <string name="West">West</string> - <string name="East">East</string> - <string name="Up">Up</string> - <string name="Down">Down</string> + <string name="Direction_Forward">Forward</string> + <string name="Direction_Left">Left</string> + <string name="Direction_Right">Right</string> + <string name="Direction_Back">Back</string> + <string name="Direction_North">North</string> + <string name="Direction_South">South</string> + <string name="Direction_West">West</string> + <string name="Direction_East">East</string> + <string name="Direction_Up">Up</string> + <string name="Direction_Down">Down</string> <!-- Search Category Strings --> <string name="Any Category">Any Category</string> @@ -3315,4 +3312,119 @@ Abuse Report</string> <string name="EmptyOutfitText">There are no items in this outfit</string> + <!-- Key names begin --> + <string name="Esc">Esc</string> + <string name="Space">Space</string> + <string name="Enter">Enter</string> + <string name="Tab">Tab</string> + <string name="Ins">Ins</string> + <string name="Del">Del</string> + <string name="Backsp">Backsp</string> + <string name="Shift">Shift</string> + <string name="Ctrl">Ctrl</string> + <string name="Alt">Alt</string> + <string name="CapsLock">CapsLock</string> + <string name="Left">Left</string> + <string name="Right">Right</string> + <string name="Up">Up</string> + <string name="Down">Down</string> + <string name="Home">Home</string> + <string name="End">End</string> + <string name="PgUp">PgUp</string> + <string name="PgDn">PgDn</string> + + <string name="F1">F1</string> + <string name="F2">F2</string> + <string name="F3">F3</string> + <string name="F4">F4</string> + <string name="F5">F5</string> + <string name="F6">F6</string> + <string name="F7">F7</string> + <string name="F8">F8</string> + <string name="F9">F9</string> + <string name="F10">F10</string> + <string name="F11">F11</string> + <string name="F12">F12</string> + + <string name="Add">Add</string> + <string name="Subtract">Subtract</string> + <string name="Multiply">Multiply</string> + <string name="Divide">Divide</string> + <string name="PAD_DIVIDE">PAD_DIVIDE</string> + <string name="PAD_LEFT">PAD_LEFT</string> + <string name="PAD_RIGHT">PAD_RIGHT</string> + <string name="PAD_DOWN">PAD_DOWN</string> + <string name="PAD_UP">PAD_UP</string> + <string name="PAD_HOME">PAD_HOME</string> + <string name="PAD_END">PAD_END</string> + <string name="PAD_PGUP">PAD_PGUP</string> + <string name="PAD_PGDN">PAD_PGDN</string> + <string name="PAD_CENTER">PAD_CENTER</string> + <string name="PAD_INS">PAD_INS</string> + <string name="PAD_DEL">PAD_DEL</string> + <string name="PAD_Enter">PAD_Enter</string> + <string name="PAD_BUTTON0">PAD_BUTTON0</string> + <string name="PAD_BUTTON1">PAD_BUTTON1</string> + <string name="PAD_BUTTON2">PAD_BUTTON2</string> + <string name="PAD_BUTTON3">PAD_BUTTON3</string> + <string name="PAD_BUTTON4">PAD_BUTTON4</string> + <string name="PAD_BUTTON5">PAD_BUTTON5</string> + <string name="PAD_BUTTON6">PAD_BUTTON6</string> + <string name="PAD_BUTTON7">PAD_BUTTON7</string> + <string name="PAD_BUTTON8">PAD_BUTTON8</string> + <string name="PAD_BUTTON9">PAD_BUTTON9</string> + <string name="PAD_BUTTON10">PAD_BUTTON10</string> + <string name="PAD_BUTTON11">PAD_BUTTON11</string> + <string name="PAD_BUTTON12">PAD_BUTTON12</string> + <string name="PAD_BUTTON13">PAD_BUTTON13</string> + <string name="PAD_BUTTON14">PAD_BUTTON14</string> + <string name="PAD_BUTTON15">PAD_BUTTON15</string> + + <string name="-">-</string> + <string name="=">=</string> + <string name="`">`</string> + <string name=";">;</string> + <string name="[">[</string> + <string name="]">]</string> + <string name="\">\</string> + + <string name="0">0</string> + <string name="1">1</string> + <string name="2">2</string> + <string name="3">3</string> + <string name="4">4</string> + <string name="5">5</string> + <string name="6">6</string> + <string name="7">7</string> + <string name="8">8</string> + <string name="9">9</string> + + <string name="A">A</string> + <string name="B">B</string> + <string name="C">C</string> + <string name="D">D</string> + <string name="E">E</string> + <string name="F">F</string> + <string name="G">G</string> + <string name="H">H</string> + <string name="I">I</string> + <string name="J">J</string> + <string name="K">K</string> + <string name="L">L</string> + <string name="M">M</string> + <string name="N">N</string> + <string name="O">O</string> + <string name="P">P</string> + <string name="Q">Q</string> + <string name="R">R</string> + <string name="S">S</string> + <string name="T">T</string> + <string name="U">U</string> + <string name="V">V</string> + <string name="W">W</string> + <string name="X">X</string> + <string name="Y">Y</string> + <string name="Z">Z</string> + <!-- Key names end --> + </strings> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index 7989100c09..6c4ab0f14f 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -9,7 +9,7 @@ <slider label="Ambiental" name="Wind Volume"/> <slider label="Efectos de sonido" name="SFX Volume"/> <slider label="Música en streaming" name="Music Volume"/> - <check_box label="Activada" name="music_enabled"/> + <check_box label="Activada" name="enable_music"/> <slider label="Multimedia" name="Media Volume"/> <check_box label="Activada" name="enable_media"/> <slider label="Chat de voz" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 810b1630dd..19adf29d29 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1846,34 +1846,34 @@ Se esperaba .wav, .tga, .bmp, .jpg, .jpeg, o .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Adelante </string> - <string name="Left"> + <string name="Direction_Left"> Izquierda </string> - <string name="Right"> + <string name="Direction_Right"> Derecha </string> - <string name="Back"> + <string name="Direction_Back"> Atrás </string> - <string name="North"> + <string name="Direction_North"> Norte </string> - <string name="South"> + <string name="Direction_South"> Sur </string> - <string name="West"> + <string name="Direction_West"> Oeste </string> - <string name="East"> + <string name="Direction_East"> Este </string> - <string name="Up"> + <string name="Direction_Up"> Arriba </string> - <string name="Down"> + <string name="Direction_Down"> Abajo </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml index 7828d2df97..6287f10f3e 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="gesture_preview"> <floater.string name="step_anim"> - Animation à jouer : + Animation à exécuter : </floater.string> <floater.string name="step_sound"> Son à lire : diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml index 86a2ddd185..20af901ddc 100644 --- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="hide_navbar_menu"> <menu_item_check label="Afficher la barre de navigation" name="ShowNavbarNavigationPanel"/> - <menu_item_check label="Afficher la barre des Favoris" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Afficher la barre des favoris" name="ShowNavbarFavoritesPanel"/> <menu_item_check label="Afficher la mini-barre d'emplacement" name="ShowMiniLocationPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index 654d40e2f9..48630918d7 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -9,13 +9,13 @@ <slider label="Ambiant" name="Wind Volume"/> <slider label="Effets sonores" name="SFX Volume"/> <slider label="Flux musical" name="Music Volume"/> - <check_box label="Activé" name="music_enabled"/> + <check_box label="Activé" name="enable_music"/> <slider label="Média" name="Media Volume"/> <check_box label="Activé" name="enable_media"/> <slider label="Chat vocal" name="Voice Volume"/> <check_box label="Activé" name="enable_voice_check"/> <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="true"/> - <check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/> + <check_box label="Lecture du média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/> <text name="voice_chat_settings"> Paramètres du chat vocal </text> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index d75f6c731d..74c1fd8622 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1888,34 +1888,34 @@ <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Vers l'avant </string> - <string name="Left"> + <string name="Direction_Left"> Gauche </string> - <string name="Right"> + <string name="Direction_Right"> Droite </string> - <string name="Back"> + <string name="Direction_Back"> Arrière </string> - <string name="North"> + <string name="Direction_North"> Nord </string> - <string name="South"> + <string name="Direction_South"> Sud </string> - <string name="West"> + <string name="Direction_West"> Ouest </string> - <string name="East"> + <string name="Direction_East"> Est </string> - <string name="Up"> + <string name="Direction_Up"> Haut </string> - <string name="Down"> + <string name="Direction_Down"> Bas </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index 2ddb226020..6e70a314c5 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml @@ -6,7 +6,7 @@ <slider label="Ambiente" name="Wind Volume"/> <slider label="Effetti sonori" name="SFX Volume"/> <slider label="Musica in streaming" name="Music Volume"/> - <check_box label="Abilitato" name="music_enabled"/> + <check_box label="Abilitato" name="enable_music"/> <slider label="Multimediale" name="Media Volume"/> <check_box label="Abilitato" name="enable_media"/> <slider label="Chat vocale" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index dfe635182e..37dc90d056 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -1846,34 +1846,34 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT"> Ora legale Pacifico </string> - <string name="Forward"> + <string name="Direction_Forward"> Avanti </string> - <string name="Left"> + <string name="Direction_Left"> Sinistra </string> - <string name="Right"> + <string name="Direction_Right"> Destra </string> - <string name="Back"> + <string name="Direction_Back"> Indietro </string> - <string name="North"> + <string name="Direction_North"> Nord </string> - <string name="South"> + <string name="Direction_South"> Sud </string> - <string name="West"> + <string name="Direction_West"> Ovest </string> - <string name="East"> + <string name="Direction_East"> Est </string> - <string name="Up"> + <string name="Direction_Up"> Su </string> - <string name="Down"> + <string name="Direction_Down"> Giù </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml index 4f29ae7b44..9fbbd46220 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -6,7 +6,7 @@ <slider label="風" name="Wind Volume"/> <slider label="効果音" name="SFX Volume"/> <slider label="ストリーミング音楽" name="Music Volume"/> - <check_box label="有効" name="music_enabled"/> + <check_box label="有効" name="enable_music"/> <slider label="メディア" name="Media Volume"/> <check_box label="有効" name="enable_media"/> <slider label="ボイスチャット" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 187f21257a..75cb126874 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1882,34 +1882,34 @@ <string name="PDT"> 太平洋夏時間 </string> - <string name="Forward"> + <string name="Direction_Forward"> 前 </string> - <string name="Left"> + <string name="Direction_Left"> 左 </string> - <string name="Right"> + <string name="Direction_Right"> 右 </string> - <string name="Back"> + <string name="Direction_Back"> 後ろ </string> - <string name="North"> + <string name="Direction_North"> 北 </string> - <string name="South"> + <string name="Direction_South"> 南 </string> - <string name="West"> + <string name="Direction_West"> 西 </string> - <string name="East"> + <string name="Direction_East"> 東 </string> - <string name="Up"> + <string name="Direction_Up"> 上 </string> - <string name="Down"> + <string name="Direction_Down"> 下 </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml index 07265d2716..87e3638a49 100644 --- a/indra/newview/skins/default/xui/nl/strings.xml +++ b/indra/newview/skins/default/xui/nl/strings.xml @@ -1441,34 +1441,34 @@ Verwacht .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Vooruit </string> - <string name="Left"> + <string name="Direction_Left"> Links </string> - <string name="Right"> + <string name="Direction_Right"> Rechts </string> - <string name="Back"> + <string name="Direction_Back"> Achteruit </string> - <string name="North"> + <string name="Direction_North"> Noord </string> - <string name="South"> + <string name="Direction_South"> Zuid </string> - <string name="West"> + <string name="Direction_West"> West </string> - <string name="East"> + <string name="Direction_East"> Oost </string> - <string name="Up"> + <string name="Direction_Up"> Omhoog </string> - <string name="Down"> + <string name="Direction_Down"> Omlaag </string> <string name="Any Category"> 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 c708cc0b99..ac93949a1b 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml @@ -9,7 +9,7 @@ <slider label="Otoczenie" name="Wind Volume"/> <slider label="Efekty dźwiękowe" name="SFX Volume"/> <slider label="Muzyka strumieniowa" name="Music Volume"/> - <check_box label="Odtwarzaj media audio" name="music_enabled"/> + <check_box label="Odtwarzaj media audio" name="enable_music"/> <slider label="Media" name="Media Volume"/> <check_box label="Odtwarzaj media" name="enable_media"/> <slider label="Komunikacja głosowa" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index d1fb382a2d..e6019bf66d 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -1843,34 +1843,34 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Do przodu </string> - <string name="Left"> + <string name="Direction_Left"> W lewo </string> - <string name="Right"> + <string name="Direction_Right"> W prawo </string> - <string name="Back"> + <string name="Direction_Back"> Wróć </string> - <string name="North"> + <string name="Direction_North"> Północ </string> - <string name="South"> + <string name="Direction_South"> Południe </string> - <string name="West"> + <string name="Direction_West"> Zachód </string> - <string name="East"> + <string name="Direction_East"> Wschód </string> - <string name="Up"> + <string name="Direction_Up"> W górę </string> - <string name="Down"> + <string name="Direction_Down"> W dół </string> <string name="Any Category"> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml index 60f51c33e5..3846bfb377 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml @@ -9,7 +9,7 @@ <slider label="Ambiente" name="Wind Volume"/> <slider label="Efeitos sonoros" name="SFX Volume"/> <slider label="Streaming de música" name="Music Volume"/> - <check_box label="Ativado" name="music_enabled"/> + <check_box label="Ativado" name="enable_music"/> <slider label="Mídia" name="Media Volume"/> <check_box label="Ativado" name="enable_media"/> <slider label="Bate-papo de voz" name="Voice Volume"/> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index ce2c2ddaa1..06123e0118 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1846,34 +1846,34 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="PDT"> PDT </string> - <string name="Forward"> + <string name="Direction_Forward"> Avante </string> - <string name="Left"> + <string name="Direction_Left"> Esquerda </string> - <string name="Right"> + <string name="Direction_Right"> Direita </string> - <string name="Back"> + <string name="Direction_Back"> Atrás </string> - <string name="North"> + <string name="Direction_North"> Norte </string> - <string name="South"> + <string name="Direction_South"> Sul </string> - <string name="West"> + <string name="Direction_West"> Oeste </string> - <string name="East"> + <string name="Direction_East"> Leste </string> - <string name="Up"> + <string name="Direction_Up"> Acima </string> - <string name="Down"> + <string name="Direction_Down"> Abaixo </string> <string name="Any Category"> |