diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-04 11:16:32 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-04 11:16:32 +0100 |
| commit | 66d367cb0dfa1b6745a91d770053087e807d5aa9 (patch) | |
| tree | 0a86eeccb9d130ccac6cb63169300ad2b5ba601b /indra/newview/skins | |
| parent | 697e7a3b0c6a6a014bbf4eebc801f15c0af0a235 (diff) | |
| parent | be7554c3b624427ccf8543fb0a3187a2d9f7090b (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/skins')
57 files changed, 761 insertions, 338 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 93c805f724..cee5f5cbca 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -567,6 +567,8 @@ with the same filename but different name <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" /> <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" /> + <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" /> + <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> diff --git a/indra/newview/skins/default/textures/windows/Wearables_Divider.png b/indra/newview/skins/default/textures/windows/Wearables_Divider.png Binary files differnew file mode 100644 index 0000000000..9dce7bf45c --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Wearables_Divider.png diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index 435c7f4907..2e9d003848 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -29,7 +29,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox Version: [VIVOX_VERSION] +Voice Server Version: [VOICE_VERSION] </floater.string> <floater.string name="none"> (ingen) diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index fd1fe4aa19..053fe4d9d9 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -63,6 +63,9 @@ Pacel ikke valgt. Gå til 'Verden' > 'Om land' eller vælg en anden parcel for at se detaljer. </panel.string> + <panel.string name="time_stamp_template"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> <text name="Name:"> Navn: </text> diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index e405a1beb8..d0d766eaab 100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml @@ -3,41 +3,48 @@ <floater.string name="InvalidAvatar"> UGYLDING AVATAR </floater.string> - <text name="composite_label"> - Blandede teksturer - </text> - <button label="Drop" label_selected="Dump" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <texture_picker label="Hår" name="hair-baked"/> - <texture_picker label="Hår" name="hair_grain"/> - <texture_picker label="Alpha - hår" name="hair_alpha"/> - <texture_picker label="Hoved" name="head-baked"/> - <texture_picker label="Makeup" name="head_bodypaint"/> - <texture_picker label="Alpha - hoved" name="head_alpha"/> - <texture_picker label="Tatovering - hoved" name="head_tattoo"/> - <texture_picker label="Eyes" name="eyes-baked"/> - <texture_picker label="Øje" name="eyes_iris"/> - <texture_picker label="Alpha - øjne" name="eyes_alpha"/> - <texture_picker label="Overkrop" name="upper-baked"/> - <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> - <texture_picker label="Undertrøje" name="upper_undershirt"/> - <texture_picker label="Handsker" name="upper_gloves"/> - <texture_picker label="Trøje" name="upper_shirt"/> - <texture_picker label="Jakke - foroven" name="upper_jacket"/> - <texture_picker label="Alpha - øvre" name="upper_alpha"/> - <texture_picker label="Tatovering - øvre" name="upper_tattoo"/> - <texture_picker label="Ben" name="lower-baked"/> - <texture_picker label="Bodypaint - ben" name="lower_bodypaint"/> - <texture_picker label="Underbukser" name="lower_underpants"/> - <texture_picker label="Strømper" name="lower_socks"/> - <texture_picker label="Sko" name="lower_shoes"/> - <texture_picker label="Bukser" name="lower_pants"/> - <texture_picker label="Jakke" name="lower_jacket"/> - <texture_picker label="Alpha - nedre" name="lower_alpha"/> - <texture_picker label="Tatovering - nedre" name="lower_tattoo"/> - <texture_picker label="Nederdel" name="skirt-baked"/> - <texture_picker label="Nederdel" name="skirt"/> + <text name="label"> + Gemte +teksturer + </text> + <text name="composite_label"> + Sammensatte +teksturer + </text> + <button label="Vis IDs på skærm" label_selected="Dump" name="Dump"/> + <panel name="scroll_content_panel"> + <texture_picker label="Hår" name="hair-baked"/> + <texture_picker label="Hår" name="hair_grain"/> + <texture_picker label="Alpha - hår" name="hair_alpha"/> + <texture_picker label="Hoved" name="head-baked"/> + <texture_picker label="Makeup" name="head_bodypaint"/> + <texture_picker label="Alpha - hoved" name="head_alpha"/> + <texture_picker label="Tatovering - hovede" name="head_tattoo"/> + <texture_picker label="Øjne" name="eyes-baked"/> + <texture_picker label="Øje" name="eyes_iris"/> + <texture_picker label="Alpha øjne" name="eyes_alpha"/> + <texture_picker label="Overkrop" name="upper-baked"/> + <texture_picker label="Øverste bodyPaint" name="upper_bodypaint"/> + <texture_picker label="Undertrøje" name="upper_undershirt"/> + <texture_picker label="Handsker" name="upper_gloves"/> + <texture_picker label="Trøje" name="upper_shirt"/> + <texture_picker label="Jakke øverst" name="upper_jacket"/> + <texture_picker label="Alpha - øverst" name="upper_alpha"/> + <texture_picker label="Tatovering - øverst" name="upper_tattoo"/> + <texture_picker label="Underkrop" name="lower-baked"/> + <texture_picker label="BodyPaint - nederst" name="lower_bodypaint"/> + <texture_picker label="Underbukser" name="lower_underpants"/> + <texture_picker label="Strømper" name="lower_socks"/> + <texture_picker label="Sko" name="lower_shoes"/> + <texture_picker label="Bukser" name="lower_pants"/> + <texture_picker label="Jakke" name="lower_jacket"/> + <texture_picker label="Alpha - nederst" name="lower_alpha"/> + <texture_picker label="Tatovering - nederst" name="lower_tattoo"/> + <texture_picker label="Nederdel" name="skirt-baked"/> + <texture_picker label="Nederdel" name="skirt"/> + </panel> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml new file mode 100644 index 0000000000..e32b25ca17 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_buy_currency_html" title="KØB VALUTA"/> diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index 82897d545a..cd6c03058b 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map" title="Mini-kort"> +<floater name="Map" title=""> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index 8385924bda..14d3604b43 100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml @@ -6,18 +6,48 @@ <string name="walk_back_tooltip"> Gå baglæns (Tryk på Ned piletast eller S) </string> + <string name="walk_left_tooltip"> + Gå til venstre (tryk Shift + venstre pil eller A) + </string> + <string name="walk_right_tooltip"> + Gå til højre (tryk Shift + højre pil eller D) + </string> <string name="run_forward_tooltip"> Løb forlæns (Tryk på Op piletast eller W) </string> <string name="run_back_tooltip"> Løb baglæns (Tryk på Ned piletast eller S) </string> + <string name="run_left_tooltip"> + Løb til venstre (tryk Shift + venstre pil eller A) + </string> + <string name="run_right_tooltip"> + Løb til højre (tryk Shift + højre pil eller D) + </string> <string name="fly_forward_tooltip"> Flyv frem (Tryk på Op piletast eller W) </string> <string name="fly_back_tooltip"> Flyv baglæns (Tryk på Ned piletast eller S) </string> + <string name="fly_left_tooltip"> + Flyv til venstre (tryk Shift + venstre pil eller A) + </string> + <string name="fly_right_tooltip"> + Flyv til højre (tryk Shift + højre pil eller D) + </string> + <string name="fly_up_tooltip"> + Flyv op (tryk E) + </string> + <string name="fly_down_tooltip"> + Flyv ned (tryk C) + </string> + <string name="jump_tooltip"> + Hop (tryk E) + </string> + <string name="crouch_tooltip"> + Kryb (tryk C) + </string> <string name="walk_title"> Gå </string> @@ -28,10 +58,12 @@ Flyv </string> <panel name="panel_actions"> + <button label="" label_selected="" name="move up btn" tool_tip="Flyv op (tryk E)"/> <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk på venstre piletast eller A)"/> + <joystick_slide name="move left btn" tool_tip="Gå til venstre (tryk Shift + venstre pil eller A)"/> + <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned (tryk C)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/> - <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/> - <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/> + <joystick_slide name="move right btn" tool_tip="Gå til højre (tryk Shift + højre pil eller D)"/> <joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/> <joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/> </panel> diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index e600a774ec..5a0f5a32c0 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml @@ -9,9 +9,6 @@ <floater.string name="Title"> Note: [NAME] </floater.string> - <floater.string label="Gem" label_selected="Gem" name="Save"> - Gem - </floater.string> <text name="desc txt"> Beskrivelse: </text> @@ -19,4 +16,5 @@ Indlæser... </text_editor> <button label="Gem" label_selected="Gem" name="Save"/> + <button label="Slet" label_selected="Slet" name="Delete"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index b501722e92..a84af9adc0 100644 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml @@ -67,8 +67,8 @@ <text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt"> þ: [COUNT] </text> - <check_box name="checkbox uniform"/> - <text name="checkbox uniform label"> + <check_box label="" name="checkbox uniform"/> + <text label="Stræk begge sider" name="checkbox uniform label"> Stræk begge sider </text> <check_box initial_value="true" label="Stræk teksturer" name="checkbox stretch textures"/> @@ -443,8 +443,6 @@ <check_box label="Vend" name="checkbox flip s"/> <spinner label="Lodret (V)" name="TexScaleV"/> <check_box label="Vend" name="checkbox flip t"/> - <spinner label="Rotation˚"/> - <spinner label="Gentagelser pr. m."/> <button label="Gem" label_selected="Gem" left_delta="62" name="button apply"/> <text name="tex offset"> Tekstur offset @@ -477,14 +475,7 @@ Areal: [AREA] m² </text> <button label="Om land" label_selected="Om land" name="button about land"/> - <check_box label="Vis ejere" name="checkbox show owners" tool_tip="Farver grunde afhængigt af ejerskab: - -Grøn = Dit land -Turkis = Din gruppes land -Rød = Ejet af andre -Gul = Til salg -Lilla = På auktion -Grå = Offentligt ejet"/> + <check_box label="Vis ejere" name="checkbox show owners" tool_tip="Farver grunde afhængigt af ejerskab: Grøn = Dit land Turkis = Din gruppes land Rød = Ejet af andre Gul = Til salg Lilla = På auktion Grå = Offentligt ejet"/> <text name="label_parcel_modify"> Redigere grund </text> diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml index d8bd78fa23..bf52e5d57f 100644 --- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml @@ -5,7 +5,7 @@ <menu_item_call label="Tag af" name="Detach"/> <menu_item_call label="Smid" name="Drop"/> <menu_item_call label="Stå op" name="Stand Up"/> - <menu_item_call label="Udseende" name="Appearance..."/> + <menu_item_call label="Skift sæt" name="Change Outfit"/> <menu_item_call label="Venner" name="Friends..."/> <menu_item_call label="Grupper" name="Groups..."/> <menu_item_call label="Profil" name="Profile..."/> diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index 39f3e49702..ec85bd05a5 100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml @@ -20,7 +20,9 @@ <context_menu label="Tag af ▶" name="Object Detach"/> <menu_item_call label="Tag alt af" name="Detach All"/> </context_menu> - <menu_item_call label="Udseende" name="Appearance..."/> + <menu_item_call label="Skift sæt" name="Chenge Outfit"/> + <menu_item_call label="Redigér mit sæt" name="Edit Outfit"/> + <menu_item_call label="Redigér min form" name="Edit My Shape"/> <menu_item_call label="Venner" name="Friends..."/> <menu_item_call label="Grupper" name="Groups..."/> <menu_item_call label="Profil" name="Profile..."/> diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml index dbdeefeaff..e979e35a91 100644 --- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml @@ -4,6 +4,11 @@ <menu_item_check label="Bevægelse knap" name="ShowMoveButton"/> <menu_item_check label="Vis knap" name="ShowCameraButton"/> <menu_item_check label="Foto knap" name="ShowSnapshotButton"/> + <menu_item_check label="Sidepanel knap" name="ShowSidebarButton"/> + <menu_item_check label="Bygge knap" name="ShowBuildButton"/> + <menu_item_check label="Søge knap" name="ShowSearchButton"/> + <menu_item_check label="Kort knap" name="ShowWorldMapButton"/> + <menu_item_check label="Mini-Map button" name="ShowMiniMapButton"/> <menu_item_call label="Klip" name="NearbyChatBar_Cut"/> <menu_item_call label="Kopiér" name="NearbyChatBar_Copy"/> <menu_item_call label="Sæt ind" name="NearbyChatBar_Paste"/> diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml index aeef2ccb23..c226d06404 100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <menu name="Gear Menu"> <menu_item_call label="Stå op" name="stand_up"/> - <menu_item_call label="Udseende" name="my_appearance"/> + <menu_item_call label="Skift sæt" name="change_outfit"/> <menu_item_call label="Profil" name="my_profile"/> <menu_item_call label="Venner" name="my_friends"/> <menu_item_call label="Grupper" name="my_groups"/> diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index 0ea21dc409..ff70ec7886 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml @@ -52,6 +52,7 @@ <menu_item_call label="Slet ting" name="Purge Item"/> <menu_item_call label="Genskab ting" name="Restore Item"/> <menu_item_call label="åben" name="Open"/> + <menu_item_call label="Åben original" name="Open Original"/> <menu_item_call label="Egenskaber" name="Properties"/> <menu_item_call label="Omdøb" name="Rename"/> <menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/> diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 36e82e8bc4..1231c4c08d 100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml @@ -2,7 +2,7 @@ <menu_bar name="Login Menu"> <menu label="Mig" name="File"> <menu_item_call label="Indstillinger" name="Preferences..."/> - <menu_item_call label="Afslut" name="Quit"/> + <menu_item_call label="Afslut [APP_NAME]" name="Quit"/> </menu> <menu label="Hjælp" name="Help"> <menu_item_call label="[SECOND_LIFE] hjælp" name="Second Life Help"/> diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 02b7e8466b..2bd28e10de 100644 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml @@ -14,8 +14,8 @@ <context_menu label="Moderator muligheder >" name="Moderator Options"> <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> - <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> <menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/> + <menu_item_call label="Sluk lyd for alle" name="ModerateVoiceMute"/> + <menu_item_call label="Tænd lyd for alle" name="ModerateVoiceUnmute"/> </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index e195ebfeed..a061292eb0 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -5,7 +5,7 @@ <menu_item_call label="Mit instrumentpanel" name="Manage My Account"/> <menu_item_call label="Køb L$" name="Buy and Sell L$"/> <menu_item_call label="Profil" name="Profile"/> - <menu_item_call label="Udseende" name="Appearance"/> + <menu_item_call label="Skift sæt" name="ChangeOutfit"/> <menu_item_check label="Beholdning" name="Inventory"/> <menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/> <menu_item_check label="Mine bevægelser" name="Gestures"/> @@ -160,6 +160,7 @@ <menu_item_check label="Fleksible objekter" name="Flexible Objects"/> </menu> <menu_item_check label="Kør flere 'threats'" name="Run Multiple Threads"/> + <menu_item_check label="Benyt "Plugin Read Thread"" name="Use Plugin Read Thread"/> <menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/> <menu_item_check label="Muse udjævning" name="Mouse Smoothing"/> <menu label="Shortcuts" name="Shortcuts"> @@ -186,7 +187,6 @@ <menu_item_call label="Zoom ind" name="Zoom In"/> <menu_item_call label="Zoom standard" name="Zoom Default"/> <menu_item_call label="Zoom ud" name="Zoom Out"/> - <menu_item_call label="Skift fuld-skærm" name="Toggle Fullscreen"/> </menu> <menu_item_call label="Vis debug valg" name="Debug Settings"/> <menu_item_check label="Vis udviklingsmenu" name="Debug Mode"/> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index afccc1e904..72a1ab6a29 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -208,6 +208,9 @@ Du skal skrive både fornavn og efternavn på din figur. Du har brug for en konto for at logge ind i [SECOND_LIFE]. Vil du oprette en nu? <usetemplate name="okcancelbuttons" notext="Prøv igen" yestext="Lav ny konto"/> </notification> + <notification name="InvalidCredentialFormat"> + Du skal indtaste både fornavn og efternavn i din avatars brugernavn felt og derefter logge på igen. + </notification> <notification name="AddClassified"> Annoncer vil vises i 'Annoncer' sektionen i søge biblioteket og på [http://secondlife.com/community/classifieds secondlife.com] i en uge. Udfyld din annonce og klik på 'Udgiv...' for at tilf'je den til biblioteket. @@ -279,6 +282,11 @@ Gå til [_URL] for information om køb af L$? <notification name="CannotEncodeFile"> Kunne ikke 'forstå' filen: [FILE] </notification> + <notification name="CorruptedProtectedDataStore"> + Vi kan ikke læse dine beskyttede data så de nulstilles. + Dette kan ske hvis du ændrer din netværksopsætning. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DoNotSupportBulkAnimationUpload"> [APP_NAME] understøtter p.t. ikke at send flere animationsfiler ad gangen. </notification> @@ -404,6 +412,12 @@ Tilbyd venskab til [NAME]? <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="ConfirmItemDeleteHasLinks"> + Mindst en af genstandene har lænkede genstande der peger på den. Hvis du sletter denne genstand, vil lænkninger ikke virke mere. Det anbefales kraftigt at fjerne lænkninger først. + +Er du sikker på at du vil slette disse genstande? + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> + </notification> <notification name="ErrorMessage"> <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -438,6 +452,42 @@ Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en n Du kan enten checke din Internet forbindelse og prøve igen om lidt, klikke på Hjælp for at se [SUPPORT_SITE] siden, eller klikke på Teleport for at forsøge at teleportere hjem. </notification> + <notification name="CantTeleportToGrid"> + Kunne ikke teleportere til [SLURL] da den er på et andet net ([GRID]) end det nuværende net ([CURRENT_GRID]). Luk venligst din klient og prøv igen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GeneralCertificateError"> + Kunne ikke opnå forbindelse til server. +[REASON] + +Vedrørende: [SUBJECT_NAME_STRING] +Fra: [ISSUER_NAME_STRING] +Valid fra: [VALID_FROM] +Valid til: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="TrustCertificateError"> + Certifikationsmyndighed for denne server er ikke kendt. + +Certifikat information: +Vedrørende: [SUBJECT_NAME_STRING] +Fra: [ISSUER_NAME_STRING] +Valid fra: [VALID_FROM] +Valid til: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + +Ønsker du at stole på denne myndighed? + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Stol på"/> + </notification> <notification name="NotEnoughCurrency"> [NAME] L$ [PRICE] Du har ikke nok L$ til dette. </notification> @@ -627,9 +677,9 @@ Gå til 'Knowledge Base' for mere information om indholdsratings. Du har ikke adgang til denne region på grund af din valgte indholdsrating. </notification> <notification name="RegionEntryAccessBlocked_Change"> - Du har ikke adgang til denne region på grund af din indholdsrating præferencer. + Du har ikke adgang til den region, da din indholdsrating ikke tillader dette. -Du kan klikke på 'Ændre præference' for at ændre din indholdsrating nu og dermed opnå adgang. Du vil så få mulighed for at søge og tilgå [REGIONMATURITY] fra da af. Hvis du senere ønsker at ændre denne opsætning tilbage, gå til Mig > Indstillinger > Generelt. +Klik på "Ændre præference" for at forhøje din indholdsrating for direkte adgang nu. Ved at gøre dette vil du få lov til at søge og få adgang til [REGIONMATURITY] indhold. Hvis du ønsker at ændre denne opsætning senere, kan du gøre dette fra Mig > Indstillinger > Generelt. <form name="form"> <button name="OK" text="Ændre indstillinger"/> <button name="Cancel" text="Luk"/> @@ -1176,15 +1226,6 @@ Prøv igen om lidt. <button name="Mute" text="Blokér"/> </form> </notification> - <notification name="ObjectGiveItemUnknownUser"> - Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]: -[ITEM_SLURL] - <form name="form"> - <button name="Keep" text="Behold"/> - <button name="Discard" text="Smid væk"/> - <button name="Mute" text="Blokér"/> - </form> - </notification> <notification name="UserGiveItem"> [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] @@ -1487,8 +1528,53 @@ Knappen vil blive vist når der er nok plads til den. <notification name="ShareNotification"> Træk genstande fra beholdning til en person i beboer vælgeren </notification> + <notification name="DeedToGroupFail"> + Dedikering til gruppe fejlede. + </notification> <notification name="AvatarRezNotification"> - Avatar '[NAME]' rezzed på [TIME] sekunder. + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' declouded in [TIME] seconds. + </notification> + <notification name="AvatarRezSelfNotification"> + ( [EXISTENCE] sekunder i live ) +Du afsluttede klargøring af dit sæt på [TIME] sekunder. + </notification> + <notification name="AvatarRezCloudNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' blev til "sky". + </notification> + <notification name="AvatarRezArrivedNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' appeared. + </notification> + <notification name="AvatarRezLeftCloudNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' forsvandt efter [TIME] sekunder som "sky". + </notification> + <notification name="AvatarRezEnteredAppearanceNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' skiftede til udseende modus. + </notification> + <notification name="AvatarRezLeftAppearanceNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' har forladt udseende modus. + </notification> + <notification name="AvatarRezLeftNotification"> + ( [EXISTENCE] sekunder i live ) +Avatar '[NAME]' forsvandt helt "uploaded". + </notification> + <notification name="ConfirmLeaveCall"> + Er du sikker på at du vil forlade dette opkald? + <usetemplate ignoretext="Bekræft før jeg forlader opkald" name="okcancelignore" notext="Nej" yestext="Ja"/> + </notification> + <notification name="ConfirmMuteAll"> + Du har valgt at slukke for lyden for alle deltagere i gruppeopkaldet. +Dette vil også betyde, at alle beboere der slutter sig til opkaldet +vil have lyden slukket - selv efter de har forladt kaldet. + + +Sluk for alles lyd? + <usetemplate ignoretext="Bekræft før jeg slukker for alle deltageres lyd i gruppe-kald" name="okcancelignore" notext="OK" yestext="Annullér"/> </notification> <global name="UnsupportedGLRequirements"> Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter 'multitexture'. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem. diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml new file mode 100644 index 0000000000..de764d8025 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="wearable_item"> + <text name="item_name" value="..."/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml new file mode 100644 index 0000000000..4cbcdebbe4 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="clothing_list_button_bar_panel"> + <button label="Skift" name="switch_btn"/> + <button label="Køb >" name="bodyparts_shop_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 4a038e89ba..2d288a9494 100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> - <string name="SpeakBtnToolTip"> - Slukker/tænder mikrofon - </string> - <string name="VoiceControlBtnToolTip"> - Skjuler/viser stemme kontrol panel - </string> + <string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/> + <string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> @@ -24,6 +20,21 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Tag foto"/> </layout_panel> + <layout_panel name="sidebar_btn_panel"> + <button label="Sidepanel" name="sidebar_btn" tool_tip="Vis/skjul sidepanel"/> + </layout_panel> + <layout_panel name="build_btn_panel"> + <button label="Byg" name="build_btn" tool_tip="Vis/skjul byggeværktøjer"/> + </layout_panel> + <layout_panel name="search_btn_panel"> + <button label="Søg" name="search_btn" tool_tip="Vis/skjul søgning"/> + </layout_panel> + <layout_panel name="world_map_btn_panel"> + <button label="Kort" name="world_map_btn" tool_tip="Vis/skjul verdenskort"/> + </layout_panel> + <layout_panel name="mini_map_btn_panel"> + <button label="Mini-kort" name="mini_map_btn" tool_tip="Vis/skjul Mini-kort"/> + </layout_panel> <layout_panel name="im_well_panel"> <chiclet_im_well name="im_well"> <button name="Unread IM messages" tool_tip="Konversationer"/> diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml new file mode 100644 index 0000000000..c08d095c66 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="clothing_list_button_bar_panel"> + <button label="Tilføj +" name="add_btn"/> + <button label="Køb >" name="clothing_shop_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml new file mode 100644 index 0000000000..de764d8025 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="wearable_item"> + <text name="item_name" value="..."/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml new file mode 100644 index 0000000000..92d78b01a2 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="cof_wearables"> + <accordion name="cof_wearables_accordion"> + <accordion_tab name="tab_attachments" title="Attachments"/> + <accordion_tab name="tab_clothing" title="Tøj"/> + <accordion_tab name="tab_body_parts" title="Kropsdele"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml new file mode 100644 index 0000000000..91d90a5660 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="deletable_wearable_item"> + <text name="item_name" value="..."/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml new file mode 100644 index 0000000000..6af84de0c7 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="dummy_clothing_item"> + <text name="item_name" value="..."/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml index 1c8567d27c..4360fe35f5 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml @@ -1,14 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shape_panel"> - <panel name="avatar_sex_panel"> - <text name="gender_text"> - Køn: - </text> - <radio_group name="sex_radio"> - <radio_item label="Kvinde" name="radio"/> - <radio_item label="Mand" name="radio2"/> - </radio_group> - </panel> + <text name="avatar_height"> + [HEIGHT] meter høj + </text> <panel label="Trøje" name="accordion_panel"> <accordion name="wearable_accordion"> <accordion_tab name="shape_body_tab" title="Krop"/> diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml index 4a133d8693..d4a12209db 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml @@ -4,5 +4,6 @@ <texture_picker label="Hoved tatovering" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> + <color_swatch label="Farve/Nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml index 4afb7ba45c..8e6990fe31 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml @@ -93,6 +93,12 @@ <text name="edit_wearable_title" value="Redigerer kropsbygning"/> <panel label="Trøje" name="wearable_type_panel"> <text name="description_text" value="Kropsbygning:"/> + <radio_group name="sex_radio"> + <radio_item label="" name="sex_male" tool_tip="Mand" value="1"/> + <radio_item label="" name="sex_female" tool_tip="Kvinde" value="0"/> + </radio_group> + <icon name="male_icon" tool_tip="Mandlig"/> + <icon name="female_icon" tool_tip="Kvindelig"/> </panel> <panel label="gear_buttom_panel" name="gear_buttom_panel"> <button name="friends_viewsort_btn" tool_tip="Valg"/> diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index 9b0267529c..efad4d0c34 100644 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml @@ -6,6 +6,9 @@ <panel.string name="cant_view_group_land_text"> Du har ikke tilladelse til at se gruppeejet land. </panel.string> + <panel.string name="epmty_view_group_land_text"> + Intet indhold + </panel.string> <panel.string name="cant_view_group_accounting_text"> Du har ikke tilladelse til at se gruppens økonomiinformationer. </panel.string> diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index 7046ac4d7c..d8e8cb3c2a 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml @@ -42,6 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag <text name="string"> Træk og slip en gensand for at vedhæfte den: </text> + <button label="Beholdning" name="open_inventory" tool_tip="Åben beholdning"/> <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/> <button label="Send" label_selected="Send" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/> diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index 1e60174909..d4bf9a7d78 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -11,14 +11,10 @@ </panel.string> <layout_stack name="login_widgets"> <layout_panel name="login"> - <text name="first_name_text"> - Fornavn: + <text name="username_text"> + Brugernavn: </text> - <line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> - <text name="last_name_text"> - Efternavn: - </text> - <line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <line_editor label="Brugernavn" name="username_edit" tool_tip="[SECOND_LIFE] Brugernavn"/> <text name="password_text"> Password: </text> diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml index 16bd22c21a..d6406939c1 100644 --- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml @@ -9,62 +9,20 @@ <text name="ItemcountText"> Genstande: </text> - <menu_bar name="Inventory Menu"> - <menu label="Filer" name="File"> - <menu_item_call label="Åben" name="Open"/> - <menu label="Send fil" name="upload"> - <menu_item_call label="Billede (L$[COST])..." name="Upload Image"/> - <menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/> - <menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/> - <menu_item_call label="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/> - </menu> - <menu_item_call label="Nyt vindue" name="New Window"/> - <menu_item_call label="Vis filtre" name="Show Filters"/> - <menu_item_call label="Nulstil filtre" name="Reset Current"/> - <menu_item_call label="Luk alle mapper" name="Close All Folders"/> - <menu_item_call label="Tøm papirkurv" name="Empty Trash"/> - <menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/> - </menu> - <menu label="Opret" name="Create"> - <menu_item_call label="Ny mappe" name="New Folder"/> - <menu_item_call label="Nyt script" name="New Script"/> - <menu_item_call label="Ny note" name="New Note"/> - <menu_item_call label="Ny bevægelse" name="New Gesture"/> - <menu label="Nyt tøj" name="New Clothes"> - <menu_item_call label="Ny trøje" name="New Shirt"/> - <menu_item_call label="Nye bukser" name="New Pants"/> - <menu_item_call label="Nye sko" name="New Shoes"/> - <menu_item_call label="Nye strømper" name="New Socks"/> - <menu_item_call label="Ny jakke" name="New Jacket"/> - <menu_item_call label="Ny nederdel" name="New Skirt"/> - <menu_item_call label="Nye handsker" name="New Gloves"/> - <menu_item_call label="Ny undertrøje" name="New Undershirt"/> - <menu_item_call label="Nye underbukser" name="New Underpants"/> - <menu_item_call label="Nyt alpha lag" name="New Alpha"/> - <menu_item_call label="Ny tatovering" name="New Tattoo"/> - </menu> - <menu label="Nye kropsdele" name="New Body Parts"> - <menu_item_call label="Ny kropsbygning" name="New Shape"/> - <menu_item_call label="Ny hud" name="New Skin"/> - <menu_item_call label="Nyt hår" name="New Hair"/> - <menu_item_call label="Nye øjne" name="New Eyes"/> - </menu> - </menu> - <menu label="Sortér" name="Sort"> - <menu_item_check label="Efter navn" name="By Name"/> - <menu_item_check label="Efter dato" name="By Date"/> - <menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/> - <menu_item_check label="System-mapper i toppen" name="System Folders To Top"/> - </menu> - </menu_bar> <filter_editor label="Filter" name="inventory search editor"/> <tab_container name="inventory filter tabs"> <inventory_panel label="Alle ting" name="All Items"/> - <inventory_panel label="Nye ting" name="Recent Items"/> + <recent_inventory_panel label="Nye ting" name="Recent Items"/> </tab_container> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/> - <button name="add_btn" tool_tip="Opret ny genstand"/> - <dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/> - </panel> + <layout_stack name="bottom_panel"> + <layout_panel name="options_gear_btn_panel"> + <button name="options_gear_btn" tool_tip="Vis yderligere valg"/> + </layout_panel> + <layout_panel name="add_btn_panel"> + <button name="add_btn" tool_tip="Tilføj ny genstand"/> + </layout_panel> + <layout_panel name="trash_btn_panel"> + <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml index de68366610..9aa9fd14cc 100644 --- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml @@ -2,6 +2,8 @@ <!-- Side tray Outfit Edit panel --> <panel label="Redigér sæt" name="outfit_edit"> <string name="No Outfit" value="Intet sæt"/> + <string name="unsaved_changes" value="Ikke gemte ændringer"/> + <string name="now_editing" value="Redigerer nu"/> <panel.string name="not_available"> (Ikke relevant) </panel.string> @@ -15,24 +17,19 @@ <text name="title" value="Redigér sæt"/> <panel label="bottom_panel" name="header_panel"> <panel label="bottom_panel" name="outfit_name_and_status"> - <text name="status" value="Retter..."/> + <text name="status" value="Redigerer nu..."/> <text name="curr_outfit_name" value="[Current Outfit]"/> </panel> </panel> <layout_stack name="im_panels"> <layout_panel label="IM kontrolpanel" name="outfit_wearables_panel"> - <scroll_list name="look_items_list"> - <scroll_list.columns label="Se genstand" name="look_item"/> - <scroll_list.columns label="Sorter genstande i sæt" name="look_item_sort"/> - </scroll_list> <panel label="bottom_panel" name="edit_panel"/> </layout_panel> <layout_panel name="add_wearables_panel"> - <filter_editor label="Filter" name="look_item_filter"/> + <text name="add_to_outfit_label" value="Tilføj til sæt:"/> <layout_stack name="filter_panels"> - <layout_panel label="IM kontrolpanel" name="filter_button_panel"> - <text name="add_to_outfit_label" value="Tilføj til sæt:"/> - <button label="O" name="filter_button"/> + <layout_panel label="IM kontrolpanel" name="filter_panel"> + <filter_editor label="Filter" name="look_item_filter"/> </layout_panel> </layout_stack> <panel label="add_wearables_button_bar" name="add_wearables_button_bar"> diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index db72125b84..5d8474259c 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -2,9 +2,9 @@ <!-- Side tray panel --> <panel label="Personer" name="people_panel"> <string name="no_recent_people" value="Ingen tidligere personer. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/> - <string name="no_filtered_recent_people" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/> + <string name="no_filtered_recent_people" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/> <string name="no_one_near" value="Ingen i nærheden. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/> - <string name="no_one_filtered_near" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/> + <string name="no_one_filtered_near" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/> <string name="no_friends_online" value="Ingen venner online"/> <string name="no_friends" value="Ingen venner"/> <string name="no_friends_msg"> @@ -12,11 +12,11 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap World Map]. </string> <string name="no_filtered_friends_msg"> - Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]. + Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]. </string> <string name="people_filter_label" value="Filtrér personer"/> <string name="groups_filter_label" value="Filtrér grupper"/> - <string name="no_filtered_groups_msg" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/groups Search]."/> + <string name="no_filtered_groups_msg" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/> <string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Search]."/> <filter_editor label="Filtrér" name="filter_input"/> <tab_container name="tabs"> @@ -55,7 +55,7 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Worl <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/> <button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/> <button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/> - <button label="Del" name="share_btn"/> + <button label="Del" name="share_btn" tool_tip="Del en genstand i beholdning"/> <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/> <button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/> <button label="Gruppe chat" name="chat_btn" tool_tip="Åben chat session"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 4d505db30e..807d7939b8 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -13,6 +13,7 @@ </text> <check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/> <check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/> + <check_box initial_value="1" label="Sidepanel" name="appearance_sidebar_positioning" tool_tip="Benyt automatisk positionering af kamera"/> <check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/> <check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/> <check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index df97193598..20a376f152 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -45,6 +45,7 @@ </text> <check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/> <check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/> + <check_box label="Åben for almindelig tekst i IM og chat historik" name="plain_text_chat_history"/> <text name="show_ims_in_label"> Vis IM'er i: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index 07e3aec72a..586896041d 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Grafik" name="Display panel"> - <text name="UI Size:"> - UI størrelse: - </text> <text name="QualitySpeed"> Kvalitet og hastighed: </text> @@ -53,6 +50,10 @@ m </text> <slider label="Maks. antal partikler:" name="MaxParticleCount"/> + <slider label="Maks. avatar optegningsafstand:" name="MaxAvatarDrawDistance"/> + <text name="DrawDistanceMeterText3"> + m + </text> <slider label="Efterbehandlingskvalitet:" name="RenderPostProcess"/> <text name="MeshDetailText"> Netmaske detaljer: diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index 43ddfdada7..be049bea38 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sæt" name="appearance panel"> <string name="No Outfit" value="Intet sæt"/> + <string name="Unsaved Changes" value="Ikke gemte ændringer"/> + <string name="Now Wearing" value="Bærer nu..."/> <panel name="panel_currentlook"> - <text name="currentlook_title"> - (ikke gemt) + <button label="E" name="editappearance_btn"/> + <button label="O" name="openoutfit_btn"/> + <text name="currentlook_status"> + (Status) </text> </panel> <filter_editor label="Filtrér sæt" name="Filter"/> diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml index 9a2a348f58..767d74ca3f 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml @@ -4,6 +4,7 @@ <panel name="button_panel"> <button label="Profil" name="info_btn"/> <button label="Del" name="share_btn"/> + <button label="Køb ind" name="shop_btn"/> <button label="Bær" name="wear_btn"/> <button label="Afspil" name="play_btn"/> <button label="Teleportér" name="teleport_btn"/> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index bd5ab62be9..5ceb0612a8 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -88,6 +88,24 @@ <string name="LoginDownloadingClothing"> Henter tøj... </string> + <string name="InvalidCertificate"> + Serveren returnerede et ugyldigt eller ødelagt certifikat. Kontakt venligst administrator af dette net. + </string> + <string name="CertInvalidHostname"> + Et ugyldig hostnavn blev brugt for at få adgang til serveren. Check venligst din SLURL eller navnet på hosten. + </string> + <string name="CertExpired"> + Certifikat returneret fra nettet ser ud til at være udløbet. Check venligst din systemtid eller kontakt administratoren af dette net. + </string> + <string name="CertKeyUsage"> + Det certifikat der blev returneret af serveren kan ikke benyttes til SSL. Kontakt venligst administrator af dette net. + </string> + <string name="CertBasicConstraints"> + For mange certifikater i serverens certifikat streng. Kontakt venligst administrator af dette net. + </string> + <string name="CertInvalidSignature"> + Certifikat signaturen returneret på dette net kan ikke bekræftes. Kontakt venligst administrator af dette net. + </string> <string name="LoginFailedNoNetwork"> Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse. </string> @@ -816,6 +834,42 @@ <string name="invalid"> ugyldig </string> + <string name="shirt_not_worn"> + Trøje - ikke på + </string> + <string name="pants_not_worn"> + Bukser - ikke på + </string> + <string name="shoes_not_worn"> + Sko - ikke på + </string> + <string name="socks_not_worn"> + Strømper - ikke på + </string> + <string name="jacket_not_worn"> + Jakke - ikke på + </string> + <string name="gloves_not_worn"> + Handsker - ikke på + </string> + <string name="undershirt_not_worn"> + Undertrøje - ikke på + </string> + <string name="underpants_not_worn"> + Underbukser - ikke på + </string> + <string name="skirt_not_worn"> + Nederdel - ikke på + </string> + <string name="alpha_not_worn"> + Alpha ikke benyttet + </string> + <string name="tattoo_not_worn"> + Tatovering ikke benyttet + </string> + <string name="invalid_not_worn"> + ugyldig + </string> <string name="NewWearable"> Ny [WEARABLE_ITEM] </string> @@ -886,7 +940,10 @@ Tryk ESC for at skift til normalt udsyn </string> <string name="InventoryNoMatchingItems"> - Fandt du ikke hvad du ledte efter. Prøv [secondlife:///app/search/all Search]. + Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/all/[SEARCH_TERM] Search]. + </string> + <string name="PlacesNoMatchingItems"> + Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/places/[SEARCH_TERM] Search]. </string> <string name="FavoritesNoMatchingItems"> Træk et landemærke hertil for at tilføje den som favorit. @@ -916,6 +973,7 @@ <string name="Wave" value=" Vink "/> <string name="HelloAvatar" value=" Hej, avatar! "/> <string name="ViewAllGestures" value=" Se alle >>"/> + <string name="GetMoreGestures" value="Få mere >>"/> <string name="Animations" value=" Animationer,"/> <string name="Calling Cards" value=" Visitkort,"/> <string name="Clothing" value=" Tøj,"/> @@ -1528,16 +1586,19 @@ 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="MuteByName"> - (efter navn) + (Efter navn) </string> <string name="MuteAgent"> (beboer) </string> <string name="MuteObject"> - (objekt) + (Objekt) </string> <string name="MuteGroup"> - (gruppe) + (Gruppe) + </string> + <string name="MuteExternal"> + (Ekstern) </string> <string name="RegionNoCovenant"> Der er ingen regler for dette estate. @@ -3297,11 +3358,14 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="answered_call"> Dit opkald er blevet besvaret </string> - <string name="started_call"> - startede et stemme opkald + <string name="you_started_call"> + Du startede dette stemme kald + </string> + <string name="you_joined_call"> + Du er nu med i stemme opkald </string> - <string name="joined_call"> - tilsluttede stemme opkald + <string name="name_started_call"> + [NAME] startede et stemmekald </string> <string name="ringing-im"> Tilslutter stemme opkald... @@ -3500,6 +3564,90 @@ Krænkelsesanmeldelse <string name="Contents"> Indhold </string> + <string name="Gesture"> + Bevægelse + </string> + <string name="Male Gestures"> + Mandlige bevægelser + </string> + <string name="Female Gestures"> + Kvindelige bevægelser + </string> + <string name="Other Gestures"> + Andre bevægelser + </string> + <string name="Speech Gestures"> + Tale bevægelser + </string> + <string name="Common Gestures"> + Almindelige bevægelser + </string> + <string name="Male - Excuse me"> + Mand - Undskyld mig + </string> + <string name="Male - Get lost"> + Mand - Skrid! + </string> + <string name="Male - Blow kiss"> + Mand - Pust et kys + </string> + <string name="Male - Boo"> + Mand - Boo + </string> + <string name="Male - Bored"> + Mand - Keder sig + </string> + <string name="Male - Hey"> + Mand - Hey + </string> + <string name="Male - Laugh"> + Mand - Latter + </string> + <string name="Male - Repulsed"> + Mand - Frastødt + </string> + <string name="Male - Shrug"> + Mand - Skuldertræk + </string> + <string name="Male - Stick tougue out"> + Mand - Stik tunge ud + </string> + <string name="Male - Wow"> + Mand - Wow + </string> + <string name="FeMale - Excuse me"> + Kvinde - Undskyld mig + </string> + <string name="FeMale - Get lost"> + Kvinde - Skrid! + </string> + <string name="FeMale - Blow kiss"> + Kvinde - Pust et kys + </string> + <string name="FeMale - Boo"> + Kvinde - Boo + </string> + <string name="Female - Bored"> + Kvinde - Keder sig + </string> + <string name="Female - Hey"> + Kvinde - Hey + </string> + <string name="Female - Laugh"> + Kvinde - Latter + </string> + <string name="Female - Repulsed"> + Kvinde - Frastødt + </string> + <string name="Female - Shrug"> + Kvinde - Skuldertræk + </string> + <string name="Female - Stick tougue out"> + Kvinde - Stik tungen ud + </string> + <string name="Female - Wow"> + Kvinde - Wow + </string> <string name="AvatarBirthDateFormat"> [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] </string> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index ad40cafe61..ece406f9b1 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -178,16 +178,16 @@ width="90"> Land Sale </text> - <icon - color="1 1 0.25 1" + <icon + color="0.5 0.25 1 1" follows="top|right" height="16" image_name="legend.tga" layout="topleft" mouse_opaque="true" name="square2" - left="41" - top_pad="-2" + left="20" + top_pad="2" width="16" /> <text type="string" @@ -196,21 +196,21 @@ height="16" layout="topleft" left_pad="0" - name="by_owner_label" + name="auction_label" top_delta="3" - width="100"> - by owner + width="170"> + land auction </text> - <icon - color="0.5 0.25 1 1" + <icon + color="1 1 0.25 1" follows="top|right" height="16" image_name="legend.tga" layout="topleft" mouse_opaque="true" name="square2" - left="41" - top_pad="-3" + left="20" + top_pad="-5" width="16" /> <text type="string" @@ -219,10 +219,10 @@ height="16" layout="topleft" left_pad="0" - name="auction_label" + name="by_owner_label" top_delta="3" - width="170"> - land auction + width="100"> + by owner </text> <button diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index d8410a26dd..72ab6195bc 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -73,6 +73,17 @@ mouse_opaque="false" name="hud container" width="500"> + <panel auto_resize="false" + follows="left|top" + height="19" + left="0" + mouse_opaque="false" + name="topinfo_bar_container" + tab_stop="false" + top="0" + user_resize="false" + visible="false" + width="1024"/> <panel follows="right|top|bottom" height="500" mouse_opaque="false" diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index a175b3103f..3f38d734b9 100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -12,10 +12,10 @@ label="Show Navigation Bar" layout="topleft" name="ShowNavbarNavigationPanel"> - <menu_item_check.on_click + <on_click function="ToggleControl" parameter="ShowNavbarNavigationPanel" /> - <menu_item_check.on_check + <on_check function="CheckControl" parameter="ShowNavbarNavigationPanel" /> </menu_item_check> @@ -23,11 +23,22 @@ label="Show Favorites Bar" layout="topleft" name="ShowNavbarFavoritesPanel"> - <menu_item_check.on_click + <on_click function="ToggleControl" parameter="ShowNavbarFavoritesPanel" /> - <menu_item_check.on_check + <on_check function="CheckControl" parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> + <menu_item_check + label="Show Mini-Location Bar" + layout="topleft" + name="ShowMiniLocationPanel"> + <on_click + function="ToggleControl" + parameter="ShowMiniLocationPanel" /> + <on_check + function="CheckControl" + parameter="ShowMiniLocationPanel" /> + </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index 2edd643cc5..a0bbc8f2ee 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 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|right|left" - height="23" + height="25" layout="topleft" left="0" name="wearable_item" @@ -9,22 +9,22 @@ width="380"> <icon follows="top|right|left" - height="23" + height="22" image_name="ListItem_Over" layout="topleft" left="0" name="hovered_icon" - top="0" + top="1" visible="false" width="380" /> <icon - height="23" + height="22" follows="top|right|left" image_name="ListItem_Select" layout="topleft" left="0" name="selected_icon" - top="0" + top="1" visible="false" width="380" /> <icon @@ -53,7 +53,6 @@ name="btn_lock" layout="topleft" follows="top|right" - image_name="Locked_Icon" top="0" left="0" height="23" @@ -70,24 +69,35 @@ width="9" tab_stop="false" /> </panel> - <button - name="btn_edit" + <panel + background_visible="false" + name="btn_edit_panel" layout="topleft" follows="top|right" - image_overlay="Edit_Wrench" top="0" left_pad="3" - height="23" - width="23" - tab_stop="false" /> - <panel - background_visible="true" - bg_alpha_color="0.4 0.4 0.4 1.0" - bottom="0" + height="24" + width="27" + tab_stop="false"> + <button + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="0" + left="0" + height="24" + width="24" + tab_stop="false" /> + </panel> + <icon follows="left|right|top" - height="1" + height="3" + image_name="Wearables_Divider" layout="bottomleft" left="0" - name="wearable_type_separator_panel" + name="wearable_type_separator_icon" + top="3" + visible="true" width="380"/> </panel> 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 035e8607ec..e41141f6bd 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 @@ -9,22 +9,22 @@ width="380"> <icon follows="top|right|left" - height="23" + height="22" image_name="ListItem_Over" layout="topleft" left="0" name="hovered_icon" - top="0" + top="1" visible="false" width="380" /> <icon - height="23" + height="22" follows="top|right|left" image_name="ListItem_Select" layout="topleft" left="0" name="selected_icon" - top="0" + top="1" visible="false" width="380" /> <button @@ -33,10 +33,10 @@ follows="top|left" image_unselected="Toast_CloseBtn" image_selected="Toast_CloseBtn" - top="0" + top="2" left="0" - height="20" - width="20" + height="18" + width="18" tab_stop="false" /> <icon height="16" @@ -66,8 +66,8 @@ image_overlay="UpArrow_Off" top="0" left="0" - height="23" - width="23" + height="24" + width="24" tab_stop="false" /> <button name="btn_move_down" @@ -76,15 +76,14 @@ image_overlay="DownArrow_Off" top="0" left_pad="3" - height="23" - width="23" + height="24" + width="24" tab_stop="false" /> <panel background_visible="false" name="btn_lock" layout="topleft" follows="top|right" - image_name="Locked_Icon" top="0" left="0" height="23" @@ -101,25 +100,35 @@ width="9" tab_stop="false" /> </panel> - <button - name="btn_edit" + <panel + background_visible="false" + name="btn_edit_panel" layout="topleft" follows="top|right" - image_overlay="Edit_Wrench" top="0" left_pad="3" - height="23" - width="23" - tab_stop="false" /> - <panel - background_visible="true" - bg_alpha_color="0.4 0.4 0.4 1.0" - bottom="0" + height="24" + width="27" + tab_stop="false"> + <button + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="0" + left="0" + height="24" + width="24" + tab_stop="false" /> + </panel> + <icon follows="left|right|top" - height="1" + height="3" + image_name="Wearables_Divider" layout="bottomleft" left="0" - name="wearable_type_separator_panel" + name="wearable_type_separator_icon" + top="0" visible="false" width="380"/> </panel> 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 2f37b9d3c9..b006d125ee 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 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|right|left" - height="23" + height="25" layout="topleft" left="0" name="deletable_wearable_item" @@ -9,22 +9,22 @@ width="380"> <icon follows="top|right|left" - height="20" + height="22" image_name="ListItem_Over" layout="topleft" left="0" name="hovered_icon" - top="0" + top="1" visible="false" width="380" /> <icon - height="20" + height="22" follows="top|right|left" image_name="ListItem_Select" layout="topleft" left="0" name="selected_icon" - top="0" + top="1" visible="false" width="380" /> <button @@ -33,10 +33,10 @@ follows="top|left" image_unselected="Toast_CloseBtn" image_selected="Toast_CloseBtn" - top="0" + top="2" left="0" - height="20" - width="20" + height="18" + width="18" tab_stop="false" /> <icon height="16" @@ -59,15 +59,14 @@ top="4" value="..." width="359" /> - <panel - background_visible="true" - bg_alpha_color="0.4 0.4 0.4 1.0" - bottom="0" + <icon follows="left|right|top" - height="1" + height="3" + image_name="Wearables_Divider" layout="bottomleft" left="0" - name="wearable_type_separator_panel" + name="wearable_type_separator_icon" + top="3" visible="true" width="380"/> </panel> 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 06371b7489..6c43635d49 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 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|right|left" - height="23" + height="25" layout="topleft" left="0" name="dummy_clothing_item" @@ -9,22 +9,22 @@ width="380"> <icon follows="top|right|left" - height="23" + height="22" image_name="ListItem_Over" layout="topleft" left="0" name="hovered_icon" - top="0" + top="1" visible="false" width="380" /> <icon - height="23" + height="22" follows="top|right|left" image_name="ListItem_Select" layout="topleft" left="0" name="selected_icon" - top="0" + top="1" visible="false" width="380" /> <icon @@ -56,17 +56,17 @@ image_overlay="AddItem_Off" top="0" left="0" - height="23" - width="23" + height="24" + width="24" tab_stop="false" /> - <panel - background_visible="true" - bg_alpha_color="0.4 0.4 0.4 1.0" - bottom="0" + <icon follows="left|right|top" - height="1" + height="3" + image_name="Wearables_Divider" layout="bottomleft" left="0" - name="wearable_type_separator_panel" + name="wearable_type_separator_icon" + top="3" + visible="true" width="380"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml index cfcdc25f81..7bcd4962d2 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml @@ -21,126 +21,131 @@ name="avatar_alpha_color_panel" top="0" width="313" > + <check_box + control_name="LowerAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left="5" + name="lower alpha texture invisible" + top="10" + width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="100" + height="115" label="Lower Alpha" layout="topleft" - left="30" + left_pad="5" name="Lower Alpha" tool_tip="Click to choose a picture" top="10" - width="94" > + width="115" > <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> + <check_box - control_name="LowerAlphaTextureInvisible" + control_name="UpperAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="6" - name="lower alpha texture invisible" - top_delta="4" + left_pad="20" + name="upper alpha texture invisible" + top="10" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="100" + height="115" label="Upper Alpha" layout="topleft" - left_pad="20" + left_pad="5" name="Upper Alpha" tool_tip="Click to choose a picture" top="10" - width="94"> + width="115"> <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> + <check_box - control_name="UpperAlphaTextureInvisible" + control_name="HeadAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="6" - name="upper alpha texture invisible" - top_delta="4" + left="5" + name="head alpha texture invisible" + top_pad="15" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="100" + height="115" label="Head Alpha" layout="topleft" - left="30" + left_pad="5" name="Head Alpha" tool_tip="Click to choose a picture" - top="120" - width="94" > + top_delta="0" + width="115" > <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> + <check_box - control_name="HeadAlphaTextureInvisible" + control_name="Eye AlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="6" - name="head alpha texture invisible" - top_delta="4" + left_pad="20" + name="eye alpha texture invisible" + top_delta="0" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="100" + height="115" label="Eye Alpha" layout="topleft" - left_pad="20" + left_pad="5" name="Eye Alpha" tool_tip="Click to choose a picture" - top="120" - width="94" > + top_delta="0" + width="115" > <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> + <check_box - control_name="Eye AlphaTextureInvisible" + control_name="HairAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="6" - name="eye alpha texture invisible" - top_delta="4" + left="5" + name="hair alpha texture invisible" + top_pad="15" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="100" + height="115" label="Hair Alpha" layout="topleft" left="30" name="Hair Alpha" tool_tip="Click to choose a picture" - top="230" - width="94" > + top_delta="0" + width="115" > <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> - <check_box - control_name="HairAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="hair alpha texture invisible" - top_delta="4" - width="16" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 2ff46637f1..769f9b7bbf 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -205,6 +205,9 @@ It is calculated as border_size + 2*UIResizeBarOverlap <button follows="left|bottom" height="22" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" is_toggle="true" label="Add More..." layout="topleft" @@ -227,6 +230,9 @@ It is calculated as border_size + 2*UIResizeBarOverlap follows="bottom|right" height="22" image_overlay="Search_Icon" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" is_toggle="true" layout="topleft" name="filter_button" @@ -294,7 +300,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap background_visible="false" border="false" follows="left|top|right|bottom" - height="210" + height="203" layout="topleft" left="0" mouse_opaque="false" @@ -312,7 +318,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap height="210" left="0" mouse_opaque="false" - width="311" + width="310" top_delta="0" visible="true"> <wearable_items_list diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index a7a0efcdb3..33f895e13a 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -89,6 +89,7 @@ background_visible="true" layout="topleft" left_pad="3" name="map_btn" + tool_tip="Show the corresponding area on the World Map" width="85" /> <button follows="bottom|left" @@ -141,6 +142,7 @@ background_visible="true" layout="topleft" name="profile_btn" right="-1" + tool_tip="Show place profile" top="1" width="111" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml new file mode 100644 index 0000000000..d3fb77f135 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<panel + background_visible="true" + background_opaque="false" + bg_opaque_color="Black_50" + bg_alpha_color="Black_50" + follows="left|top|right" + height="19" + layout="topleft" + name="topinfo_bar" + width="1024"> + <button + border="true" + follows="left|top" + height="16" + hover_glow_amount="0.15" + image_disabled="Info_Off" + image_disabled_selected="Info_Off" + image_selected="Info_Off" + image_unselected="Info_Off" + left="11" + name="place_info_btn" + top="1" + width="16"/> + <text + follows="left|top|right" + font="DejaVu" + height="16" + layout="topleft" + left_pad="11" + length="1" + name="parcel_info_text" + top="1" + type="string" + width="1"/> + <icon + enabled="true" + follows="right|top" + height="18" + image_name="Parcel_VoiceNo_Light" + name="voice_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_FlyNo_Light" + name="fly_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_PushNo_Light" + name="push_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_BuildNo_Light" + name="build_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_ScriptsNo_Light" + name="scripts_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="13" + image_name="Parcel_Health_Dark" + left="2" + name="damage_icon" + top="3" + visible="false" + width="14" + /> + <text + follows="right|top" + font="SansSerifSmall" + halign="right" + height="18" + name="damage_text" + top="5" + visible="false" + width="35" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 4c42d1f750..6c9acae35e 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -45,6 +45,7 @@ layout="topleft" left="0" name="info_btn" + tool_tip="Show object profile" top="0" width="102" /> <button @@ -55,6 +56,7 @@ layout="topleft" left="105" name="share_btn" + tool_tip="Share an inventory item" top="0" width="102" /> <button @@ -65,6 +67,7 @@ layout="topleft" left="210" name="shop_btn" + tool_tip="Open Marketplace webpage" top="0" width="102" /> <button @@ -75,6 +78,7 @@ layout="topleft" left="210" name="wear_btn" + tool_tip="Wear seleceted outfit" top="0" width="102" /> <button @@ -95,6 +99,7 @@ layout="topleft" left="210" name="teleport_btn" + tool_tip="Teleport to the selected area" top="0" width="102" /> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ed6484302f..790bc64a4a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3189,18 +3189,13 @@ Abuse Report</string> </string> <!-- overriding datetime formating. - leave emtpy in for current localization this is not needed - list of values should be separated with ':' - example: - <string name="dateTimeWeekdaysShortNames"> - Son:Mon:Tue:Wed:Thu:Fri:Sat - </string> + didn't translate if this is not needed for current localization --> - <string name="dateTimeWeekdaysNames"></string> - <string name="dateTimeWeekdaysShortNames"></string> - <string name="dateTimeMonthNames"></string> - <string name="dateTimeMonthShortNames"></string> - <string name="dateTimeDayFormat"></string> - <string name="dateTimeAM"></string> - <string name="dateTimePM"></string> + <string name="dateTimeWeekdaysNames">Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday</string> + <string name="dateTimeWeekdaysShortNames">Sun:Mon:Tue:Wed:Thu:Fri:Sat</string> + <string name="dateTimeMonthNames">January:February:March:April:May:June:July:August:September:October:November:December</string> + <string name="dateTimeMonthShortNames">Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec</string> + <string name="dateTimeDayFormat">[MDAY]</string> + <string name="dateTimeAM">AM</string> + <string name="dateTimePM">PM</string> </strings> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index dfc12bc1cb..d59699552d 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -3762,22 +3762,4 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="texture_load_dimensions_error"> [WIDTH]*[HEIGHT] 以上の画像は読み込めません </string> - <!-- overriding datetime formating. leave emtpy in for current localization this is not needed --> - <string name="dateTimeWeekdaysNames"> - Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday - </string> - <string name="dateTimeWeekdaysShortNames"> - Son:Mon:Tue:Wed:Thu:Fri:Sat - </string> - <string name="dateTimeMonthNames"> - January:February:March:April:May:June:July:August:September:October:November:December - </string> - <string name="dateTimeMonthNames"> - Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec - </string> - <string name="dateTimeDayFormat"> - [MDAY] D - </string> - <string name="dateTimeAM">AM</string> - <string name="dateTimePM">PM</string> </strings> diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 65e48b4bfd..878d0b1973 100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml @@ -6,7 +6,7 @@ </text> </panel> <panel name="layout_panel_2"> - <button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/> + <button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" /> <text name="me_label"> Eu </text> |
