diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
| commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
| tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/skins | |
| parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins')
63 files changed, 831 insertions, 222 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png Binary files differnew file mode 100644 index 0000000000..11f4871ad8 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b1594816b2..a3e5361e76 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -247,6 +247,7 @@ with the same filename but different name <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" /> <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" /> <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" /> + <texture name="Inv_Object_Multi" file_name="icons/Inv_Object_Multi.png" preload="false" /> <texture name="Inv_Pants" file_name="icons/Inv_Pants.png" preload="false" /> <texture name="Inv_Script" file_name="icons/Inv_Script.png" preload="false" /> <texture name="Inv_Shirt" file_name="icons/Inv_Shirt.png" preload="false" /> 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 6e7d16aa79..8525b324ab 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="OM LAND"> + <floater.string name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> <floater.string name="Minutes"> [MINUTES] minutter </floater.string> @@ -15,7 +24,7 @@ <tab_container name="landtab"> <panel label="GENERELT" name="land_general_panel"> <panel.string name="new users only"> - Kun nye brugere + Kun nye beboere </panel.string> <panel.string name="anyone"> Alle @@ -421,6 +430,9 @@ Kun større parceller kan vises i søgning. <panel.string name="access_estate_defined"> (Defineret via estate) </panel.string> + <panel.string name="allow_public_access"> + Tillad adgang for alle ([MATURITY]) + </panel.string> <panel.string name="estate_override"> En eller flere af disse valg er indstillet på estate niveau </panel.string> diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index 57bcc7ad9d..970491b41f 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml @@ -41,7 +41,7 @@ Prøv at vælge et mindre område. Det valgte område har ingen offentlige arealer. </floater.string> <floater.string name="not_owned_by_you"> - Jord, der ejes af en anden bruger er valgt. + Land ejet af en anden beboer valgt. Prøv at vælge et mindre område. </floater.string> <floater.string name="processing"> diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml index 2596559609..37e3307960 100644 --- a/indra/newview/skins/default/xui/da/floater_camera.xml +++ b/indra/newview/skins/default/xui/da/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Flyt kamera op og ned, til venstre og højre </floater.string> + <floater.string name="orbit_mode_title"> + Kredsløb + </floater.string> + <floater.string name="pan_mode_title"> + Panorér + </floater.string> + <floater.string name="avatar_view_mode_title"> + Forvalg + </floater.string> + <floater.string name="free_mode_title"> + Se objekt + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, til venstre og højre"/> <panel name="zoom" tool_tip="Zoom kamera mod fokus"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="Rotér kamera"/> <button label="" name="pan_btn" tool_tip="Panorér kamera"/> - <button label="" name="avatarview_btn" tool_tip="Se som avatar"/> + <button label="" name="avatarview_btn" tool_tip="Forvalg"/> <button label="" name="freecamera_btn" tool_tip="Se objekt"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml index 267a36b26c..1816144b45 100644 --- a/indra/newview/skins/default/xui/da/floater_event.xml +++ b/indra/newview/skins/default/xui/da/floater_event.xml @@ -9,6 +9,18 @@ <floater.string name="dont_notify"> Meddel ikke </floater.string> + <floater.string name="moderate"> + Moderat + </floater.string> + <floater.string name="adult"> + Voksent + </floater.string> + <floater.string name="general"> + Generelt + </floater.string> + <floater.string name="unknown"> + Ukendt + </floater.string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <text name="event_name"> @@ -21,12 +33,21 @@ Afholdt af: </text> <text initial_value="(henter)" name="event_runby"/> + <text name="event_date_label"> + Dato: + </text> <text name="event_date"> 10/10/2010 </text> + <text name="event_duration_label"> + Varighed: + </text> <text name="event_duration"> 1 time </text> + <text name="event_covercharge_label"> + Pris: + </text> <text name="event_cover"> Gratis </text> @@ -36,6 +57,9 @@ <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> <text name="rating_label" value="Rating:"/> <text name="rating_value" value="ukendt"/> + <expandable_text name="event_desc"> + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + </expandable_text> </layout_panel> <layout_panel name="button_panel"> <button name="create_event_btn" tool_tip="Opret event"/> diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml index ea045538c5..6b7f9ef209 100644 --- a/indra/newview/skins/default/xui/da/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="godtools floater" title="GOD TOOLS"> <tab_container name="GodTools Tabs"> + <panel label="Grid" name="grid"> + <button label="Spark alle beboere" label_selected="Spark alle beboere" name="Kick all users"/> + </panel> <panel label="Region" name="region"> <check_box label="Reset Home On Teleport" name="check reset home" tool_tip="Når beboere teleporterer væk, så sæt deres hjemmeadresse til deres destinations position."/> </panel> diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml index 2ef8a7ce36..776bc9ab13 100644 --- a/indra/newview/skins/default/xui/da/floater_im.xml +++ b/indra/newview/skins/default/xui/da/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="Personlig samtale (IM)"> <string name="only_user_message"> - Du er den eneste deltager i denne samtale + Du er den eneste beboer i denne session. </string> <string name="offline_message"> [FIRST] [LAST] er ikke logget på. @@ -31,7 +31,7 @@ Du er blevet "blokeret". </string> <string name="add_session_event"> - Ikke muligt at tilføge brugere til samtale med [RECIPIENT]. + Kunne ikke tilføje beboere til chat session med [RECIPIENT]. </string> <string name="message_session_event"> Ikke muligt at sende din besked til samtalen med [RECIPIENT]. diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index 258af489e7..8385924bda 100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Flyv baglæns (Tryk på Ned piletast eller S) </string> + <string name="walk_title"> + Gå + </string> + <string name="run_title"> + Løb + </string> + <string name="fly_title"> + Flyv + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk på venstre piletast eller A)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="Gå tilstand"/> <button label="" name="mode_run_btn" tool_tip="Løbe tilstand"/> <button label="" name="mode_fly_btn" tool_tip="Flyve tilstand"/> - <button label="Stop flyvning" name="stop_fly_btn" tool_tip="Stop flyvning"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml new file mode 100644 index 0000000000..220042f015 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="Publicerer annoncer"> + <text name="explanation_text"> + Din annonce vil blive vist i en uge fra den dato den publiceres. + +Husk, annonceomkostninger kan ikke refunderes. + </text> + <spinner label="Pris for annonce:" name="price_for_listing" tool_tip="Pris for optagelse af annonce." value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + Mere info (link til hjælp om annoncer) + </text> + <button label="Publicér" name="publish_btn"/> + <button label="Annullér" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml index 103feaa879..aedd1b442c 100644 --- a/indra/newview/skins/default/xui/da/floater_water.xml +++ b/indra/newview/skins/default/xui/da/floater_water.xml @@ -7,7 +7,7 @@ <button label="Gem" label_selected="Gem" name="WaterSavePreset"/> <button label="Slet" label_selected="Slet" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Opsætning" name="Settings"> + <panel label="INDSTILLINGER" name="Settings"> <text name="BHText"> Vandtåge farve </text> @@ -65,7 +65,7 @@ <button label="?" name="WaterBlurMultiplierHelp"/> <slider label="" name="WaterBlurMult"/> </panel> - <panel label="Billede" name="Waves"> + <panel label="BILLEDE" name="Waves"> <text name="BHText"> Retning for store bølger </text> diff --git a/indra/newview/skins/default/xui/da/floater_windlight_options.xml b/indra/newview/skins/default/xui/da/floater_windlight_options.xml index 4786609b53..65f3f67a70 100644 --- a/indra/newview/skins/default/xui/da/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/da/floater_windlight_options.xml @@ -1,18 +1,18 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="WindLight floater" title="AVANCERET OPSÆTNING FOR HIMMEL"> <text name="KeyFramePresetsText"> Faste indstillinger: </text> - <button label="Ny" label_selected="Ny" name="WLNewPreset" /> - <button label="Gem" label_selected="Gem" name="WLSavePreset" /> - <button label="Slet" label_selected="Slet" name="WLDeletePreset" /> - <button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton" /> + <button label="Ny" label_selected="Ny" name="WLNewPreset"/> + <button label="Gem" label_selected="Gem" name="WLSavePreset"/> + <button label="Slet" label_selected="Slet" name="WLDeletePreset"/> + <button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton"/> <tab_container name="WindLight Tabs"> - <panel label="Atmosfære" name="Atmosphere"> + <panel label="ATMOSFÆRE" name="Atmosphere"> <text name="BHText"> Blå - horisont </text> - <button label="?" name="WLBlueHorizonHelp" /> + <button label="?" name="WLBlueHorizonHelp"/> <text name="BHText2"> R </text> @@ -25,19 +25,19 @@ <text name="BHText5"> I </text> - <slider label="" name="WLBlueHorizonR" /> - <slider label="" name="WLBlueHorizonG" /> - <slider label="" name="WLBlueHorizonB" /> - <slider label="" name="WLBlueHorizonI" /> + <slider label="" name="WLBlueHorizonR"/> + <slider label="" name="WLBlueHorizonG"/> + <slider label="" name="WLBlueHorizonB"/> + <slider label="" name="WLBlueHorizonI"/> <text name="BDensText"> Dis - horisont </text> - <button label="?" name="WLHazeHorizonHelp" /> - <slider label="" name="WLHazeHorizon" /> + <button label="?" name="WLHazeHorizonHelp"/> + <slider label="" name="WLHazeHorizon"/> <text name="BDensText2"> Blå - tæthed </text> - <button label="?" name="WLBlueDensityHelp" /> + <button label="?" name="WLBlueDensityHelp"/> <text name="BHText6"> R </text> @@ -50,36 +50,36 @@ <text name="BHText9"> I </text> - <slider label="" name="WLBlueDensityR" /> - <slider label="" name="WLBlueDensityG" /> - <slider label="" name="WLBlueDensityB" /> - <slider label="" name="WLBlueDensityI" /> + <slider label="" name="WLBlueDensityR"/> + <slider label="" name="WLBlueDensityG"/> + <slider label="" name="WLBlueDensityB"/> + <slider label="" name="WLBlueDensityI"/> <text name="HDText"> Dis - intensitet </text> - <button label="?" name="WLHazeDensityHelp" /> - <slider label="" name="WLHazeDensity" /> + <button label="?" name="WLHazeDensityHelp"/> + <slider label="" name="WLHazeDensity"/> <text name="DensMultText"> Densitet faktor </text> - <button label="?" name="WLDensityMultHelp" /> - <slider label="" name="WLDensityMult" /> + <button label="?" name="WLDensityMultHelp"/> + <slider label="" name="WLDensityMult"/> <text name="WLDistanceMultText"> Distance faktor </text> - <button label="?" name="WLDistanceMultHelp" /> - <slider label="" name="WLDistanceMult" /> + <button label="?" name="WLDistanceMultHelp"/> + <slider label="" name="WLDistanceMult"/> <text name="MaxAltText"> Maximum højde </text> - <button label="?" name="WLMaxAltitudeHelp" /> - <slider label="" name="WLMaxAltitude" /> + <button label="?" name="WLMaxAltitudeHelp"/> + <slider label="" name="WLMaxAltitude"/> </panel> - <panel label="Lys" name="Lighting"> + <panel label="LYS" name="Lighting"> <text name="SLCText"> Sol/Måne farve </text> - <button label="?" name="WLSunlightColorHelp" /> + <button label="?" name="WLSunlightColorHelp"/> <text name="BHText"> R </text> @@ -92,19 +92,19 @@ <text name="BHText4"> I </text> - <slider label="" name="WLSunlightR" /> - <slider label="" name="WLSunlightG" /> - <slider label="" name="WLSunlightB" /> - <slider label="" name="WLSunlightI" /> + <slider label="" name="WLSunlightR"/> + <slider label="" name="WLSunlightG"/> + <slider label="" name="WLSunlightB"/> + <slider label="" name="WLSunlightI"/> <text name="TODText"> Sol/Måne position </text> - <button label="?" name="WLTimeOfDayHelp" /> - <slider label="" name="WLSunAngle" /> + <button label="?" name="WLTimeOfDayHelp"/> + <slider label="" name="WLSunAngle"/> <text name="WLAmbientText"> Omgivende </text> - <button label="?" name="WLAmbientHelp" /> + <button label="?" name="WLAmbientHelp"/> <text name="BHText5"> R </text> @@ -117,37 +117,37 @@ <text name="BHText8"> I </text> - <slider label="" name="WLAmbientR" /> - <slider label="" name="WLAmbientG" /> - <slider label="" name="WLAmbientB" /> - <slider label="" name="WLAmbientI" /> + <slider label="" name="WLAmbientR"/> + <slider label="" name="WLAmbientG"/> + <slider label="" name="WLAmbientB"/> + <slider label="" name="WLAmbientI"/> <text name="WLEastAngleText"> Øst vinkel </text> - <button label="?" name="WLEastAngleHelp" /> - <slider label="" name="WLEastAngle" /> + <button label="?" name="WLEastAngleHelp"/> + <slider label="" name="WLEastAngle"/> <text name="SunGlowText"> Sol glød </text> - <button label="?" name="WLSunGlowHelp" /> - <slider label="Fokus " name="WLGlowB" /> - <slider label="Størr. " name="WLGlowR" /> + <button label="?" name="WLSunGlowHelp"/> + <slider label="Fokus " name="WLGlowB"/> + <slider label="Størr. " name="WLGlowR"/> <text name="SceneGammaText"> Lysintensitet (gamma) </text> - <button label="?" name="WLSceneGammaHelp" /> - <slider label="" name="WLGamma" /> + <button label="?" name="WLSceneGammaHelp"/> + <slider label="" name="WLGamma"/> <text name="WLStarText"> Stjerne intensitet </text> - <button label="?" name="WLStarBrightnessHelp" /> - <slider label="" name="WLStarAlpha" /> + <button label="?" name="WLStarBrightnessHelp"/> + <slider label="" name="WLStarAlpha"/> </panel> - <panel label="Skyer" name="Clouds"> + <panel label="SKYER" name="Clouds"> <text name="WLCloudColorText"> Farve på skyer </text> - <button label="?" name="WLCloudColorHelp" /> + <button label="?" name="WLCloudColorHelp"/> <text name="BHText"> R </text> @@ -160,14 +160,14 @@ <text name="BHText4"> I </text> - <slider label="" name="WLCloudColorR" /> - <slider label="" name="WLCloudColorG" /> - <slider label="" name="WLCloudColorB" /> - <slider label="" name="WLCloudColorI" /> + <slider label="" name="WLCloudColorR"/> + <slider label="" name="WLCloudColorG"/> + <slider label="" name="WLCloudColorB"/> + <slider label="" name="WLCloudColorI"/> <text name="WLCloudColorText2"> Skyer XY/Tæthed </text> - <button label="?" name="WLCloudDensityHelp" /> + <button label="?" name="WLCloudDensityHelp"/> <text name="BHText5"> X </text> @@ -177,23 +177,23 @@ <text name="BHText7"> T </text> - <slider label="" name="WLCloudX" /> - <slider label="" name="WLCloudY" /> - <slider label="" name="WLCloudDensity" /> + <slider label="" name="WLCloudX"/> + <slider label="" name="WLCloudY"/> + <slider label="" name="WLCloudDensity"/> <text name="WLCloudCoverageText"> Skydække </text> - <button label="?" name="WLCloudCoverageHelp" /> - <slider label="" name="WLCloudCoverage" /> + <button label="?" name="WLCloudCoverageHelp"/> + <slider label="" name="WLCloudCoverage"/> <text name="WLCloudScaleText"> Skystørrelse </text> - <button label="?" name="WLCloudScaleHelp" /> - <slider label="" name="WLCloudScale" /> + <button label="?" name="WLCloudScaleHelp"/> + <slider label="" name="WLCloudScale"/> <text name="WLCloudDetailText"> Sky detaljer(XY/tæthed) </text> - <button label="?" name="WLCloudDetailHelp" /> + <button label="?" name="WLCloudDetailHelp"/> <text name="BHText8"> X </text> @@ -203,23 +203,23 @@ <text name="BHText10"> T </text> - <slider label="" name="WLCloudDetailX" /> - <slider label="" name="WLCloudDetailY" /> - <slider label="" name="WLCloudDetailDensity" /> + <slider label="" name="WLCloudDetailX"/> + <slider label="" name="WLCloudDetailY"/> + <slider label="" name="WLCloudDetailDensity"/> <text name="WLCloudScrollXText"> Sky drift X </text> - <button label="?" name="WLCloudScrollXHelp" /> - <check_box label="Lås" name="WLCloudLockX" /> - <slider label="" name="WLCloudScrollX" /> + <button label="?" name="WLCloudScrollXHelp"/> + <check_box label="Lås" name="WLCloudLockX"/> + <slider label="" name="WLCloudScrollX"/> <text name="WLCloudScrollYText"> Sky drift Y </text> - <button label="?" name="WLCloudScrollYHelp" /> - <check_box label="Lås" name="WLCloudLockY" /> - <slider label="" name="WLCloudScrollY" /> - <check_box label="Benyt simple skyer" name="DrawClassicClouds" /> - <button label="?" name="WLClassicCloudsHelp" /> + <button label="?" name="WLCloudScrollYHelp"/> + <check_box label="Lås" name="WLCloudLockY"/> + <slider label="" name="WLCloudScrollY"/> + <check_box label="Benyt simple skyer" name="DrawClassicClouds"/> + <button label="?" name="WLClassicCloudsHelp"/> </panel> </tab_container> <string name="WLDefaultSkyNames"> diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 7d4a81d655..898d291f1c 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -5,30 +5,66 @@ Forklaring </text> </panel> - <panel> + <panel name="layout_panel_2"> + <button name="Show My Location" tool_tip="Centrer kortet på din avatars lokation"/> <text name="me_label"> Mig </text> <text name="person_label"> Person </text> + <text name="infohub_label"> + Infohub + </text> + <text name="land_sale_label"> + Land til salg + </text> <text name="by_owner_label"> efter ejer </text> <text name="auction_label"> land auktion </text> + <button name="Go Home" tool_tip="Teleportér til min hjemmelokation"/> + <text name="Home_label"> + Hjem + </text> + <text name="events_label"> + Events: + </text> <text name="pg_label"> Generelt </text> + <check_box initial_value="sandt" name="event_mature_chk"/> <text name="mature_label"> Moderat </text> <text name="adult_label"> - Voksen + Voksent </text> </panel> - <panel> + <panel name="layout_panel_3"> + <text name="find_on_map_label"> + Find på kort + </text> + </panel> + <panel name="layout_panel_4"> + <combo_box label="Venner online" name="friend combo" tool_tip="Vis venner på kortet"> + <combo_box.item label="Mine venner som er online" name="item1"/> + </combo_box> + <combo_box label="Mine landemærker" name="landmark combo" tool_tip="Landemærke der skal vises på kort"> + <combo_box.item label="Mine landemærker" name="item1"/> + </combo_box> + <search_editor label="Regioner efter navn" name="location" tool_tip="Indtast navn på en region"/> + <button label="Find" name="DoSearch" tool_tip="Led efter region"/> <button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/> + <button label="Teleport" name="Teleport" tool_tip="Teleportér til valgte sted"/> + <button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer nuværende lokation som SLurl der kan sendes på web."/> + <button label="Vis valgte" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/> + </panel> + <panel name="layout_panel_5"> + <text name="zoom_label"> + Zoom + </text> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index 232f3f64e2..c98a07e140 100644 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml @@ -5,6 +5,7 @@ <menu_item_call label="Byg" name="Build"/> <menu_item_call label="Åben" name="Open"/> <menu_item_call label="Sid her" name="Object Sit"/> + <menu_item_call label="Stå op" name="Object Stand Up"/> <menu_item_call label="Objekt profil" name="Object Inspect"/> <menu_item_call label="Zoom In" name="Zoom In"/> <context_menu label="Tag på ▶" name="Put On"> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 9193bd43e8..ea3527d63b 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -107,7 +107,7 @@ Vælg kun en genstand, og prøv igen. </notification> <notification name="FriendsAndGroupsOnly"> 'Ikke-venner' vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM) - <usetemplate name="okbutton" yestext="Ja"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="GrantModifyRights"> At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse. @@ -243,9 +243,9 @@ Indtast venligst navn på region i Start lokation feltet eller vælg "Min s <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="UnsupportedHardware"> - Bare så du ved det, din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan opleve dårlig hastighed. Desværre kan [SUPPORT_SITE] ikke give teknisk support til ikke-supporterede konfigurationer. -MINSPECS -Besøg [_URL] for mere information? + Din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan risikere nedsat hastighed. Desværre kan [SUPPORT_SITE] ikke tilbyde teknisk support til konfigurationer der ikke er understøttet. + +Besøg [_URL] for yderligere information? <usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/> </notification> <notification name="UnknownGPU"> @@ -525,6 +525,10 @@ Download til dit Program bibliotek? <notification name="ReturnToOwner"> <usetemplate ignoretext="Bekræft før objekter returneres til deres ejere" name="okcancelignore" notext="Cancel" yestext="OK"/> </notification> + <notification name="ConfirmKick"> + Er du SIKKER på at du vil sparke alle beboere ud? + <usetemplate name="okcancelbuttons" notext="Cancel" yestext="Spark alle beboere ud"/> + </notification> <notification name="MuteLinden"> Beklager, men du kan ikke blokere en Linden. </notification> @@ -547,6 +551,15 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a Du er oppe på det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="KickUser"> + Spark beboere ud med hvilken besked? + </notification> + <notification name="FreezeUser"> + Frys beboeren med hvilken besked? + </notification> + <notification name="UnFreezeUser"> + Fjern frysning af beboeren med hvilken besked? + </notification> <notification name="OfferTeleport"> <form name="form"> <input name="message"> @@ -556,6 +569,9 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="OfferTeleportFromGod"> + Tilkald beboer til din lokation? + </notification> <notification name="TeleportFromLandmark"> Er du sikker på at du vil teleportere til <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/> @@ -568,6 +584,13 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a Teleport til [CLASSIFIED]? <usetemplate ignoretext="Bekræft at du ønsker at teleportere til lokation in annoncer" name="okcancelignore" notext="Annullér" yestext="Teleport"/> </notification> + <notification label="Change Linden Estate" name="ChangeLindenEstate"> + Du er i færd med at ændre et Linden ejet estate (mainland, teeen grid, orientation etc.). + +Dette er EKSTREMT FARLIGT da det kan ændre beboernes oplevelse fundamentalt. På mainland vil dette betyde ændring af tusinder af regioner og få spaceserveren til at kløjs i det. + +Fortsæt? + </notification> <notification name="RegionEntryAccessBlocked"> Du har ikke adgang til denne region på grund af din valgte indholdsrating. Dette kan skyldes manglende validering af din alder. @@ -1273,14 +1296,6 @@ Tillad denne anmodning? <button name="Ignore" text="Ignorér"/> </form> </notification> - <notification name="ScriptToast"> - [FIRST] [LAST]'s '[TITLE]' ønsker bruger-input. - <form name="form"> - <button name="Open" text="Åben dialog"/> - <button name="Ignore" text="Ignorér"/> - <button name="Block" text="Blokér"/> - </form> - </notification> <notification name="BuyLindenDollarSuccess"> Tak for din betaling! @@ -1407,7 +1422,7 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager. </notification> <notification name="ConfirmCloseAll"> Er du sikker på at du vil lukke alle personlige samtaler (IM)? - <usetemplate name="okcancelignore" notext="Annullér" yestext="OK"/> + <usetemplate ignoretext="Bekræft før du lukker alle IMer" name="okcancelignore" notext="Annullér" yestext="OK"/> </notification> <notification name="AttachmentSaved"> Vedhæng er blevet gemt. diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml index 6eba024981..28f8936457 100644 --- a/indra/newview/skins/default/xui/da/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml @@ -3,16 +3,46 @@ <panel.string name="l$_price"> L$[PRICE] </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] teleport, [MAP] kort, [PROFILE] profil + </panel.string> + <panel.string name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + Aktiv + </panel.string> + <panel.string name="auto_renew_off"> + Ikke aktiv + </panel.string> <text name="title" value="Annonce info"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <text_editor name="classified_name" value="[name]"/> + <text name="classified_location_label" value="Sted:"/> <text_editor name="classified_location" value="[loading...]"/> + <text name="content_type_label" value="Indholdsype:"/> <text_editor name="content_type" value="[content type]"/> + <text name="category_label" value="Kategori:"/> <text_editor name="category" value="[category]"/> - <check_box label="Forny automatisk hver uge" name="auto_renew"/> - <text_editor name="price_for_listing" tool_tip="Pris for optagelse."/> - <text_editor name="classified_desc" value="[description]"/> + <text name="creation_date_label" value="Oprettet d.:"/> + <text_editor name="creation_date" tool_tip="Oprettet d." value="[date]"/> + <text name="price_for_listing_label" value="Pris for optagelse i lister:"/> + <text_editor name="price_for_listing" tool_tip="Pris for optagelse." value="[price]"/> + <layout_stack name="descr_stack"> + <layout_panel name="clickthrough_layout_panel"> + <text name="click_through_label" value="Klik:"/> + <text_editor name="click_through_text" tool_tip="Klik gennem data" value="[clicks]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="Forny automatisk:"/> + <text name="auto_renew" value="Aktiv"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="Beskrivelse:"/> + <text_editor name="classified_desc" value="[description]"/> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml index 18689105ae..7fb2f930fa 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> (vil blive opdateret efter gemning) </panel.string> + <string name="publish_label"> + Publicér + </string> + <string name="save_label"> + Gem + </string> <text name="title"> Rediger annonce </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <icon label="" name="edit_icon" tool_tip="Klik for at forstørre billede"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="Klik for at vælge et billede"/> + </panel> <text name="Name:"> Titel: </text> @@ -22,12 +30,19 @@ henter... </text> <button label="Sæt til nuværende lokation" name="set_to_curr_location_btn"/> + <text name="category_label" value="Kategori:"/> + <text name="content_type_label" value="Indholdstype:"/> + <icons_combo_box label="Generelt" name="content_type"> + <icons_combo_box.item label="Moderat" name="mature_ci" value="Voksent"/> + <icons_combo_box.item label="Generelt" name="pg_ci" value="PG"/> + </icons_combo_box> + <text name="price_for_listing_label" value="Pris for optagelse:"/> <spinner label="L$" name="price_for_listing" tool_tip="Pris for optagelse." value="50"/> <check_box label="Forny automatisk hver uge" name="auto_renew"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="Gem" name="save_changes_btn"/> + <button label="[LABEL]" name="save_changes_btn"/> <button label="Annullér" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml index 1ba6b8b97f..be9bfab1f6 100644 --- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml @@ -13,7 +13,7 @@ <layout_panel name="share_btn_panel"> <button label="Del" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Betal" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index ecfac67b1a..93aac7d08b 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -7,6 +7,8 @@ <string name="no_friends" value="Ingen venner"/> <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="[secondlife:///app/search/groups Try finding the group in search?]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Try searching for some groups to join.]"/> <filter_editor label="Filtrér" name="filter_input"/> <tab_container name="tabs"> <panel label="TÆT PÅ" name="nearby_panel"> diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml index c1ed95f580..05ef22328f 100644 --- a/indra/newview/skins/default/xui/da/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml @@ -48,10 +48,63 @@ <text name="owner_label" value="Ejer:"/> <text name="maturity_value" value="ukendt"/> <accordion name="advanced_info_accordion"> - <accordion_tab name="parcel_characteristics_tab" title="Parcel"/> - <accordion_tab name="region_information_tab" title="Region"/> - <accordion_tab name="estate_information_tab" title="Estate"/> - <accordion_tab name="sales_tab" title="Til salg"/> + <accordion_tab name="parcel_characteristics_tab" title="Parcel"> + <panel name="parcel_characteristics_panel"> + <text name="rating_label" value="Rating:"/> + <text name="rating_value" value="ukendt"/> + <text name="voice_label" value="Stemme:"/> + <text name="voice_value" value="Til"/> + <text name="fly_label" value="Flyv:"/> + <text name="fly_value" value="Til"/> + <text name="push_label" value="Skub:"/> + <text name="push_value" value="Fra"/> + <text name="build_label" value="Bygge:"/> + <text name="build_value" value="Til"/> + <text name="scripts_label" value="Scripts:"/> + <text name="scripts_value" value="Til"/> + <text name="damage_label" value="Skade:"/> + <text name="damage_value" value="Fra"/> + <button label="Om land" name="about_land_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="region_information_tab" title="Region"> + <panel name="region_information_panel"> + <text name="region_name_label" value="Region:"/> + <text name="region_name" value="Mooseland"/> + <text name="region_type_label" value="Type:"/> + <text name="region_type" value="Moose"/> + <text name="region_rating_label" value="Rating:"/> + <text name="region_rating" value="Voksent"/> + <text name="region_owner_label" value="Ejer:"/> + <text name="region_owner" value="moose Van Moose"/> + <text name="region_group_label" value="Gruppe:"/> + <text name="region_group"> + The Mighty Moose of mooseville soundvillemoose + </text> + <button label="Region/Estate" name="region_info_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="estate_information_tab" title="Estate"> + <panel name="estate_information_panel"> + <text name="estate_name_label" value="Estate:"/> + <text name="estate_rating_label" value="Rating:"/> + <text name="estate_owner_label" value="Ejer:"/> + <text name="covenant_label" value="Regler:"/> + </panel> + </accordion_tab> + <accordion_tab name="sales_tab" title="Til salg"> + <panel name="sales_panel"> + <text name="sales_price_label" value="Pris:"/> + <text name="area_label" value="Areal:"/> + <text name="traffic_label" value="Trafik:"/> + <text name="primitives_label" value="Prims:"/> + <text name="parcel_scripts_label" value="Scripts:"/> + <text name="terraform_limits_label" value="Begræns terrænredigering:"/> + <text name="subdivide_label" value="Opdel/saml mulighed:"/> + <text name="resale_label" value="Mulighed for videresalg:"/> + <text name="sale_to_label" value="Til salg til:"/> + </panel> + </accordion_tab> </accordion> </panel> </scroll_container> 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 3345bceff7..df71e29cb9 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Tekst chat" name="chat"> + <text name="font_size"> + Skriftstørrelse: + </text> <radio_group name="chat_font_size"> <radio_item label="Lille" name="radio" value="0"/> <radio_item label="Mellem" name="radio2" value="1"/> <radio_item label="Stor" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Skriftfarve: + </text> <color_swatch label="Dig" name="user"/> <text name="text_box1"> Dig diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index c21fd9db37..7941553ade 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -39,7 +39,7 @@ </string> <button label="?" name="abuse_email_address_help"/> <button label="Gem" name="apply_btn"/> - <button label="Smid bruger ud fra estate..." name="kick_user_from_estate_btn"/> + <button label="Spark en beboer ud af estate..." name="kick_user_from_estate_btn"/> <button label="Send besked til estate..." name="message_estate_btn"/> <text name="estate_manager_label"> Administratorer: diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml index 6ffe1f34f3..5b5dd411ac 100644 --- a/indra/newview/skins/default/xui/da/panel_region_general.xml +++ b/indra/newview/skins/default/xui/da/panel_region_general.xml @@ -19,35 +19,25 @@ ukendt </text> <check_box label="Blokér for redigering af terræn" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="Blokér for flyvning" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="Tillad skader" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="Begræns skubning" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="Tillad at sælge land" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> <check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/> - <button label="?" name="parcel_search_help"/> <spinner label="Max besøgende" name="agent_limit_spin"/> - <button label="?" name="agent_limit_help"/> <spinner label="Objekt bonus" name="object_bonus_spin"/> - <button label="?" name="object_bonus_help"/> <text label="Indhold" name="access_text"> Rating: </text> - <combo_box label="Mature" name="access_combo"> - <combo_box.item label="Adult" name="Adult"/> - <combo_box.item label="Mature" name="Mature"/> - <combo_box.item label="PG" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="Mature" name="access_combo"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Mature" name="Mature" value="21"/> + <icons_combo_box.item label="PG" name="PG" value="13"/> + </icons_combo_box> <button label="Gem" name="apply_btn"/> - <button label="Send en beboer hjem ..." name="kick_btn"/> - <button label="Send alle beboere hjem..." name="kick_all_btn"/> + <button label="Teleportér en beboer hjem..." name="kick_btn"/> + <button label="Teleportér alle beboere hjem..." name="kick_all_btn"/> <button label="Send besked til region..." name="im_btn"/> <button label="Vedligehold telehub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml index 467684f712..f3c32d6169 100644 --- a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml @@ -36,8 +36,8 @@ <combo_box.item label="Generel" name="PG"/> </combo_box> <button label="Gem" name="apply_btn"/> - <button label="Send en beboer hjem ..." name="kick_btn"/> - <button label="Send alle beboere hjem..."" name="kick_all_btn"/> + <button label="Teleportér en beboer hjem..." name="kick_btn"/> + <button label="Teleportér alle beboere hjem..." name="kick_all_btn"/> <button label="Send besked til region..." name="im_btn"/> <button label="Vedligehold telehub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index 8e324ab777..45946fd222 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -25,16 +25,16 @@ Texture højde intervaller </text> <text name="height_text_lbl6"> - Sydvest + Nordvest </text> <text name="height_text_lbl7"> - Nordvest + Nordøst </text> <text name="height_text_lbl8"> - Sydøst + Sydvest </text> <text name="height_text_lbl9"> - Nordøst + Sydøst </text> <spinner label="Lav" name="height_start_spin_0"/> <spinner label="Lav" name="height_start_spin_1"/> diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 08ffafd5a6..4618fe536d 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> <button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/> - <button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/> + <button label="Køb" name="buyL" tool_tip="Klik for at købe flere L$"/> <text name="TimeText" tool_tip="Nuværende tid (Pacific)"> 24:00 PST </text> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index a1859b64d8..8a01659ffa 100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml @@ -13,6 +13,6 @@ <accordion_tab name="6_months_and_older" title="6 måneder eller ældre"/> </accordion> <panel name="bottom_panel"> - <button name="gear_btn" tool_tip="Vi flere valgmuligheder"/> + <button name="gear_btn" tool_tip="Vis flere valgmuligheder"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index add2fa3c73..4642c11d21 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml @@ -38,16 +38,41 @@ </panel.string> <text name="title" value="Objekt profil"/> <text name="where" value="(verden)"/> - <panel label=""> + <panel label="" name="properties_panel"> + <text name="Name:"> + Navn: + </text> + <text name="Description:"> + Beskrivelse: + </text> <text name="CreatorNameLabel"> - Skaber + Skaber: </text> <text name="Creator Name"> Erica Linden </text> + <text name="Owner:"> + Ejer: + </text> + <text name="Owner Name"> + Erica Linden + </text> <text name="Group_label"> Gruppe: </text> + <button name="button set group" tool_tip="Vælg en gruppe for at dele dette objekts rettigheder"/> + <name_box initial_value="Henter..." name="Group Name Proxy"/> + <button label="Dedikér" label_selected="Dedikér" name="button deed" tool_tip="Dedikering giver denne genstand væk med den næste ejers rettigheder. Gruppe delte objekter kan dedikeres af en gruppe administrator."/> + <text name="label click action"> + Klik for at: + </text> + <combo_box name="clickaction"> + <combo_box.item label="Berør (standard)" name="Touch/grab(default)"/> + <combo_box.item label="Sid på objekt" name="Sitonobject"/> + <combo_box.item label="Køb objekt" name="Buyobject"/> + <combo_box.item label="Betal objekt" name="Payobject"/> + <combo_box.item label="Åben" name="Open"/> + </combo_box> <panel name="perms_inv"> <text name="perm_modify"> Du kan redigere dette objekt @@ -60,26 +85,33 @@ <text name="GroupLabel"> Gruppe: </text> - <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'rediger' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> + <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle gruppemedlemmer i den valgte gruppe at dele dine redigeringsrettigheder for dette objekt. Du skal dedikere for at aktivere rollebegrænsninger"/> <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="checkbox next owner can modify"/> <check_box label="Kopi" name="checkbox next owner can copy"/> - <check_box label="Give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge objekt"/> + <check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> </panel> <check_box label="Til salg" name="checkbox for sale"/> + <combo_box name="sale type"> + <combo_box.item label="Kopi" name="Copy"/> + <combo_box.item label="Indhold" name="Contents"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Pris: L$" name="Edit Cost"/> + <check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/> <text name="B:"> - B: + S: </text> <text name="O:"> - O: + E: </text> <text name="G:"> G: </text> <text name="E:"> - E: + A: </text> <text name="N:"> N: @@ -92,5 +124,6 @@ <button label="Åben" name="open_btn"/> <button label="Betal" name="pay_btn"/> <button label="Køb" name="buy_btn"/> + <button label="Detaljer" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 412f946acc..2fb8a579d2 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -161,6 +161,7 @@ Klik for at starte secondlife:// kommando </string> <string name="CurrentURL" value=" Nuværende URL: [CurrentURL]"/> + <string name="TooltipPrice" value="L$[PRICE]-"/> <string name="SLurlLabelTeleport"> Teleportér til </string> @@ -734,6 +735,9 @@ <string name="invalid"> ugyldig </string> + <string name="NewWearable"> + Ny [WEARABLE_ITEM] + </string> <string name="next"> Næste </string> @@ -1432,6 +1436,9 @@ <string name="PanelContentsNewScript"> Nyt script </string> + <string name="BusyModeResponseDefault"> + Beboeren du sendte en besked er 'optaget', hvilket betyder at han/hun ikke vil forstyrres. Din besked vil blive vis i hans/hendes IM panel til senere visning. + </string> <string name="MuteByName"> (efter navn) </string> diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml index 43f8e5144d..071aab46f4 100644 --- a/indra/newview/skins/default/xui/da/teleport_strings.xml +++ b/indra/newview/skins/default/xui/da/teleport_strings.xml @@ -63,6 +63,9 @@ Prøv evt. igen om lidt. <message name="completing"> Fuldfører teleport. </message> + <message name="completed_from"> + Teleport fuldført fra [T_SLURL] + </message> <message name="resolving"> Finder destination. </message> diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index 186c2932c3..81c2f97263 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -443,6 +443,9 @@ Nur große Parzellen können in der Suche aufgeführt werden. <panel.string name="access_estate_defined"> (Durch Grundstück festgelegt) </panel.string> + <panel.string name="allow_public_access"> + Öffentlichen Zugang erlauben ([MATURITY]) + </panel.string> <panel.string name="estate_override"> Eine oder mehrere dieser Optionen gelten auf Grundstücksebene </panel.string> diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml index d3f89b0ad3..d52b8dcf4d 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -9,7 +9,7 @@ <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> - <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/> + <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" halign="right" /> </talk_button> </layout_panel> <layout_panel name="gesture_panel"> diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml index 0cb14177af..1ec4f09161 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Auswahl bearbeiten" name="panel_edit_pick"> + <panel.string name="location_notice"> + (wird nach Speichern aktualisiert) + </panel.string> <text name="title"> Auswahl bearbeiten </text> @@ -22,7 +25,7 @@ </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="[WHAT] speichern" name="save_changes_btn"/> + <button label="Auswahl speichern" name="save_changes_btn"/> <button label="Abbrechen" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index 7d57a3b3f2..d3eb9ae04c 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sonstiges" name="main inventory panel"> - <panel.string name="Title"> - Sonstiges + <panel.string name="ItemcountFetching"> + Inventar ([ITEM_COUNT] Artikel werden abgerufen... [FILTER] </panel.string> - <filter_editor label="Inventar filtern" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="MEIN INVENTAR" name="All Items"/> - <inventory_panel label="AKTUELL" name="Recent Items"/> - </tab_container> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> - <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> - </panel> + <panel.string name="ItemcountCompleted"> + [ITEM_COUNT] Objekte [FILTER] + </panel.string> + <text name="ItemcountText"> + Objekte: + </text> <menu_bar name="Inventory Menu"> <menu label="Datei" name="File"> <menu_item_call label="Öffnen" name="Open"/> @@ -61,4 +57,14 @@ <menu_item_check label="Systemordner nach oben" name="System Folders To Top"/> </menu> </menu_bar> + <filter_editor label="Inventar filtern" name="inventory search editor"/> + <tab_container name="inventory filter tabs"> + <inventory_panel label="MEIN INVENTAR" name="All Items"/> + <inventory_panel label="AKTUELL" name="Recent Items"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> + <button name="add_btn" tool_tip="Neues Objekt hinzufügen"/> + <dnd_button name="trash_btn" tool_tip="Auswahl löschen"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index 2d97a25fa9..ad26f71245 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -19,10 +19,17 @@ <button label="Mehr >>" label_selected="Weniger <<" name="more_less_btn" tool_tip="Erweiterte Steuerung"/> </panel> <panel name="nearby_media_panel"> + <text name="nearby_media"> + Medien in der Nähe + </text> + <text name="show"> + Anzeigen: + </text> <combo_box name="show_combo"> <combo_box.item label="Alle" name="All"/> <combo_box.item label="Auf dieser Parzelle" name="WithinParcel"/> <combo_box.item label="Außerhalb dieser Parzelle" name="OutsideParcel"/> + <combo_box.item label="An anderen Avataren" name="OnOthers"/> </combo_box> <scroll_list name="media_list"> <scroll_list.columns label="Umgebung" name="media_proximity"/> @@ -31,7 +38,7 @@ <scroll_list.columns label="Name" name="media_name"/> <scroll_list.columns label="Fehler beseitigen" name="media_debug"/> </scroll_list> - <panel> + <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> <button name="stop_btn" tool_tip="Ausgewählte Medien stoppen"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 78c495e377..c0ab69fcdf 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -3,6 +3,9 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <panel.string name="middle_mouse"> + Mittlere Maustaste + </panel.string> <slider label="Sichtwinkel" name="camera_fov"/> <slider label="Abstand" name="camera_offset_scale"/> <text name="heading2"> @@ -16,7 +19,7 @@ <check_box label="Avatarlippen beim Sprechen bewegen" name="enable_lip_sync"/> <check_box label="Blasen-Chat" name="bubble_text_chat"/> <slider label="Deckkraft" label_width="66" name="bubble_chat_opacity"/> - <color_swatch name="background" tool_tip="Farbe für Blasen-Chat auswählen" left_pad="35"/> + <color_swatch left_pad="35" name="background" tool_tip="Farbe für Blasen-Chat auswählen"/> <check_box label="Skript-Fehler anzeigen:" name="show_script_errors"/> <radio_group name="show_location"> <radio_item label="Chat in der Nähe" name="0"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index 45b560c759..aa1a93efac 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -46,6 +46,12 @@ <check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/> <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/> <check_box label="Kompakten Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> + <text name="show_ims_in_label"> + IMs anzeigen in: + </text> + <text name="requires_restart_label"> + (Neustart erforderlich) + </text> <radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit viele Registerkarten an (Neustart erforderlich)."> <radio_item label="Getrennte Fenster" name="radio" value="0"/> <radio_item label="Registerkarten" name="radio2" value="1"/> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index fc01b69461..b99f31c892 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -23,7 +23,22 @@ Hardware wird erfasst... </string> <string name="StartupLoading"> - Wird geladen + [APP_NAME] wird geladen... + </string> + <string name="StartupClearingCache"> + Cache wird gelöscht... + </string> + <string name="StartupInitializingTextureCache"> + Textur-Cache wird initialisiert... + </string> + <string name="StartupInitializingVFS"> + VFS wird initialisiert... + </string> + <string name="ProgressRestoring"> + Wird wiederhergestellt... + </string> + <string name="ProgressChangingResolution"> + Auflösung wird geändert... </string> <string name="Fullbright"> Fullbright (Legacy) @@ -88,6 +103,9 @@ <string name="LoginFailedNoNetwork"> Netzwerk Fehler: Eine Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Netzwerkverbindung. </string> + <string name="LoginFailed"> + Anmeldung fehlgeschlagen + </string> <string name="Quit"> Beenden </string> @@ -97,6 +115,24 @@ <string name="AgentLostConnection"> In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung. </string> + <string name="SavingSettings"> + Ihr Einstellungen werden gespeichert... + </string> + <string name="LoggingOut"> + Abmeldung erfolgt... + </string> + <string name="ShuttingDown"> + Programm wird beendet... + </string> + <string name="YouHaveBeenDisconnected"> + Die Verbindung zu der Region ist abgebrochen. + </string> + <string name="SentToInvalidRegion"> + Sie wurden in eine ungültige Region geschickt. + </string> + <string name="TestingDisconnect"> + Verbindungsabbruch wird getestet + </string> <string name="TooltipPerson"> Person </string> @@ -151,6 +187,24 @@ <string name="TooltipAgentUrl"> Anklicken, um das Profil dieses Einwohners anzuzeigen </string> + <string name="TooltipAgentMute"> + Klicken, um diesen Einwohner stummzuschalten + </string> + <string name="TooltipAgentUnmute"> + Klicken, um diesen Einwohner freizuschalten + </string> + <string name="TooltipAgentIM"> + Klicken, um diesem Einwohner eine IM zu schicken. + </string> + <string name="TooltipAgentPay"> + Klicken, um diesen Einwohner zu bezahlen + </string> + <string name="TooltipAgentOfferTeleport"> + Klicken, um diesem Einwohner einen Teleport anzubieten. + </string> + <string name="TooltipAgentRequestFriend"> + Klicken, um diesem Einwohner ein Freundschaftsangebot zu schicken. + </string> <string name="TooltipGroupUrl"> Anklicken, um Beschreibung der Gruppe anzuzeigen </string> @@ -176,12 +230,31 @@ Anklicken, um Befehl secondlife:// auszuführen </string> <string name="CurrentURL" value=" CurrentURL: [CurrentURL]"/> + <string name="TooltipPrice" value="[PRICE] L$"/> <string name="SLurlLabelTeleport"> Teleportieren nach </string> <string name="SLurlLabelShowOnMap"> Karte anzeigen für </string> + <string name="SLappAgentMute"> + Stummschalten + </string> + <string name="SLappAgentUnmute"> + Stummschaltung aufheben + </string> + <string name="SLappAgentIM"> + IM + </string> + <string name="SLappAgentPay"> + Bezahlen + </string> + <string name="SLappAgentOfferTeleport"> + Teleportangebot an + </string> + <string name="SLappAgentRequestFriend"> + Freundschaftsangebot + </string> <string name="BUTTON_CLOSE_DARWIN"> Schließen (⌘W) </string> @@ -335,6 +408,9 @@ <string name="symbolic link"> Link </string> + <string name="symbolic folder link"> + Link zu Ordner + </string> <string name="AvatarEditingAppearance"> (Aussehen wird bearbeitet) </string> @@ -849,6 +925,7 @@ Keine Inhalte </string> <string name="WornOnAttachmentPoint" value=" (getragen am [ATTACHMENT_POINT])"/> + <string name="ActiveGesture" value="[GESLABEL] (aktiviert)"/> <string name="PermYes"> Ja </string> @@ -948,6 +1025,9 @@ <string name="InvFolder My Outfits"> Meine Outfits </string> + <string name="InvFolder Accessories"> + Zubehör + </string> <string name="InvFolder Friends"> Freunde </string> @@ -1471,6 +1551,9 @@ <string name="PanelContentsNewScript"> Neues Skript </string> + <string name="PanelContentsTooltip"> + Objektinhalt + </string> <string name="BusyModeResponseDefault"> Der Einwohner/Die Einwohnerin ist „beschäftigt", d.h. er/sie möchte im Moment nicht gestört werden. Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden. </string> @@ -3375,4 +3458,31 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="unread_chat_multiple"> [SOURCES] haben etwas Neues gesagt </string> + <string name="paid_you_ldollars"> + [NAME] hat Ihnen [AMOUNT] L$ bezahlt. + </string> + <string name="giving"> + Giving + </string> + <string name="uploading_costs"> + Kosten für Hochladen + </string> + <string name="this_costs"> + Kosten: + </string> + <string name="buying_selected_land"> + Ausgewähltes Land wird gekauft + </string> + <string name="this_object_costs"> + Dieses Objekt kostet + </string> + <string name="group_role_everyone"> + Jeder + </string> + <string name="group_role_officers"> + Offiziere + </string> + <string name="group_role_owners"> + Eigentümer + </string> </strings> diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 961bd6b5e4..e02d32596a 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -182,7 +182,7 @@ width="180" layout="topleft" name="buy_action"> - [NAME] L$ [PRICE] + [ACTION] </text> <text type="string" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 85853f39bb..1ace760816 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -143,12 +143,19 @@ <panel mouse_opaque="false" follows="left|right|top" name="status_bar_container" - tab_stop="false" + tab_stop="false" height="19" left="0" top="0" width="1024" visible="false"/> + <view mouse_opaque="false" + follows="all" + name="menu_bar_holder" + left="0" + top="0" + width="1024" + height="768"/> <notify_box_view top="0" follows="all" height="768" @@ -159,6 +166,15 @@ <panel top="0" follows="all" height="768" + mouse_opaque="true" + name="progress_view" + filename="panel_progress.xml" + class="progress_view" + width="1024" + visible="false"/> + <panel top="0" + follows="all" + height="768" mouse_opaque="false" name="popup_holder" class="popup_holder" diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml index 5162a4902f..b0b7b554b0 100644 --- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml @@ -6,6 +6,15 @@ name="profile_overflow_menu" width="120"> <menu_item_call + label="Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Profile.ShowOnMap" /> + <menu_item_call.on_enable + function="Profile.EnableShowOnMap" /> + </menu_item_call> + <menu_item_call label="Pay" layout="topleft" name="pay"> diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 072ea882e6..d3f6695375 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -39,7 +39,13 @@ name="blocked" tool_tip="List of currently blocked Residents" top="30" - width="270" /> + width="270"> + <scroll_list.columns + name="item_name" /> + <scroll_list.columns + name="item_type" + width="96" /> + </scroll_list> <button follows="left|bottom" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index e70a0512d6..58c5c11e51 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -74,12 +74,15 @@ name="talk" top="5" width="105"> + <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales. + & pad_right is default value for long label which can be right aligned. See EXT-6318 --> <speak_button - halign="left" + halign="center" name="speak_btn" label="Speak" label_selected="Speak" - pad_left="12" + pad_right="22" + use_ellipses="true" /> <show_button> <show_button.init_callback diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 19c0da4f08..0eb5c47f85 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -385,7 +385,7 @@ things in this group. There's a broad variety of Abilities. left="0" follows="left|top|right" right="-1" - max_length="295" + max_length="20" name="role_name" top_pad="0" width="300"> @@ -408,7 +408,7 @@ things in this group. There's a broad variety of Abilities. left="0" follows="left|top|right" right="-1" - max_length="295" + max_length="20" name="role_title" top_pad="0" width="300"> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 627e616af5..d1e0746d9d 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -216,7 +216,7 @@ height="16" name="login_help" top_pad="2" right="-10" - width="180"> + width="190"> Need help logging in? </text> <!-- <text follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index c658e0de6f..e604e401f6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -164,7 +164,7 @@ Automatic position for: label="Opacity" layout="topleft" left="80" - label_width="50" + label_width="60" name="bubble_chat_opacity" width="200" /> <color_swatch diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 15f8b33f5b..fe882730f4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -283,7 +283,7 @@ layout="topleft" left_delta="0" name="external" - value="true" + value="1" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." top_delta="20" width="480" /> diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 6b5f0c3896..6bf00373ea 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="left|right|top|bottom" - name="MediaControlsPanel" + name="MediaControls" background_visible="false" height="200" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 412485e03f..30191aecb6 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -314,9 +314,12 @@ left="2" mouse_opaque="false" name="add_friend" + pad_left="1" + pad_right="1" tool_tip="Offer friendship to the Resident" top="5" - width="80" /> + use_ellipses="true" + width="117" /> <button follows="bottom|left" height="23" @@ -325,8 +328,8 @@ name="im" tool_tip="Open instant message session" top="5" - left_pad="3" - width="39" /> + left_pad="1" + width="21" /> <button follows="bottom|left" height="23" @@ -334,20 +337,12 @@ layout="topleft" name="call" tool_tip="Call this Resident" - left_pad="3" + left_pad="1" + pad_left="1" + pad_right="1" top="5" - width="43" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - tool_tip="Show the Resident on the map" - top="5" - left_pad="3" - width="41" /> + use_ellipses="true" + width="51" /> <button follows="bottom|left" height="23" @@ -355,9 +350,12 @@ layout="topleft" name="teleport" tool_tip="Offer teleport" - left_pad="3" + left_pad="1" + pad_left="1" + pad_right="1" top="5" - width="69" /> + use_ellipses="true" + width="92" /> <button follows="bottom|right" height="23" @@ -367,7 +365,6 @@ tool_tip="Pay money to or share inventory with the Resident" right="-1" top="5" - left_pad="3" width="23" /> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 0c870e155b..84664eedcc 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -94,10 +94,10 @@ <button follows="right|top" height="16" - image_selected="Pause_Off" - image_unselected="Play_Off" - image_pressed="Play_Press" - image_pressed_selected="Pause_Press" + image_selected="Play_Off" + image_unselected="Pause_Off" + image_pressed="Pause_Press" + image_pressed_selected="Play_Press" is_toggle="true" left_pad="15" top="1" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3a766bb798..47386bd332 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2202,7 +2202,8 @@ Clears (deletes) the media and all params from the given face. <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> <string name="Cancel">Cancel</string> - <string name="UploadingCosts">Uploading %s costs</string> + <string name="UploadingCosts">Uploading [NAME] costs L$ [AMOUNT]</string> + <string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string> <string name="UnknownFileExtension"> Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh @@ -3050,14 +3051,48 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <!-- Financial operations strings --> <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> - <string name="giving">Giving</string> - <string name="uploading_costs">Uploading costs</string> - <string name="this_costs">This costs</string> - <string name="buying_selected_land">Buying selected land</string> - <string name="this_object_costs">This object costs"</string> + <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string> + <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> + <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> + <string name="for a parcel of land">for a parcel of land</string> + <string name="for a land access pass">for a land access pass</string> + <string name="for deeding land">for deeding land</string> + <string name="to create a group">to create a group</string> + <string name="to join a group">to join a group</string> + <string name="to upload">to upload</string> + + <string name="giving">Giving L$ [AMOUNT]</string> + <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string> + <string name="this_costs">This costs L$ [AMOUNT]</string> + <string name="buying_selected_land">Buying selected land L$ [AMOUNT]</string> + <string name="this_object_costs">This object costs L$ [AMOUNT]</string> <string name="group_role_everyone">Everyone</string> <string name="group_role_officers">Officers</string> <string name="group_role_owners">Owners</string> + <string name="uploading_abuse_report">Uploading... + +Abuse Report</string> + + <!-- names for new inventory items--> + <string name="New Shape">New Shape</string> + <string name="New Skin">New Skin</string> + <string name="New Hair">New Hair</string> + <string name="New Eyes">New Eyes</string> + <string name="New Shirt">New Shirt</string> + <string name="New Pants">New Pants</string> + <string name="New Shoes">New Shoes</string> + <string name="New Socks">New Socks</string> + <string name="New Jacket">New Jacket</string> + <string name="New Gloves">New Gloves</string> + <string name="New Undershirt">New Undershirt</string> + <string name="New Underpants">New Underpants</string> + <string name="New Skirt">New Skirt</string> + <string name="New Alpha">New Alpha</string> + <string name="New Tattoo">New Tattoo</string> + <string name="Invalid Wearable">Invalid Wearable</string> + <string name="New Script">New Script</string> + <string name="New Folder">New Folder</string> + <string name="Contents">Contents</string> </strings> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index ef885e8045..aa3ea736b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -2,6 +2,7 @@ <chat_history message_header="panel_chat_header.xml" message_separator="panel_chat_separator.xml" + message_plaintext_separator="panel_chat_plaintext_separator.xml" left_text_pad="10" right_text_pad="15" left_widget_pad="0" diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index b5acd6299a..16ed27817e 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -449,6 +449,9 @@ musique : <panel.string name="access_estate_defined"> (défini par le domaine </panel.string> + <panel.string name="allow_public_access"> + Autoriser l'accès public ([MATURITY]) + </panel.string> <panel.string name="estate_override"> Au moins une de ces options est définie au niveau du domaine. </panel.string> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml index f234529764..0bbcbe833f 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Modifier la préférence" name="panel_edit_pick"> + <panel.string name="location_notice"> + (mise à jour après enregistrement) + </panel.string> <text name="title"> Modifier la préférence </text> @@ -22,7 +25,7 @@ </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="Enregistrer [WHAT]" name="save_changes_btn"/> + <button label="Enregistrer" name="save_changes_btn"/> <button label="Annuler" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml index 7c8365fdee..4be12054df 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml @@ -40,7 +40,7 @@ Page d'accueil : </text> <line_editor name="homepage_edit" value="http://"/> - <check_box label="Afficher dans les résultats de recherche" name="show_in_search_checkbox"/> + <check_box label="Afficher avec la recherche" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="Mon compte :"/> <text_editor name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/> <text name="my_account_link" value="[[URL] Accéder à ma Page d'accueil]"/> diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index 5faba01339..1a4450cccc 100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Choses" name="main inventory panel"> - <panel.string name="Title"> - Choses + <panel.string name="ItemcountFetching"> + Récupération de [ITEM_COUNT] objets... [FILTER] </panel.string> - <filter_editor label="Filtrer l'inventaire" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="MON INVENTAIRE" name="All Items"/> - <inventory_panel label="RÉCENT" name="Recent Items"/> - </tab_container> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> - <button name="add_btn" tool_tip="Ajouter un nouvel article"/> - <dnd_button name="trash_btn" tool_tip="Supprimer l'article sélectionné"/> - </panel> + <panel.string name="ItemcountCompleted"> + [ITEM_COUNT] objets [FILTER] + </panel.string> + <text name="ItemcountText"> + Objets : + </text> <menu_bar name="Inventory Menu"> <menu label="Fichier" name="File"> <menu_item_call label="Ouvrir" name="Open"/> @@ -61,4 +57,14 @@ <menu_item_check label="Dossiers système en premier" name="System Folders To Top"/> </menu> </menu_bar> + <filter_editor label="Filtrer l'inventaire" name="inventory search editor"/> + <tab_container name="inventory filter tabs"> + <inventory_panel label="MON INVENTAIRE" name="All Items"/> + <inventory_panel label="RÉCENT" name="Recent Items"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> + <button name="add_btn" tool_tip="Ajouter un nouvel article"/> + <dnd_button name="trash_btn" tool_tip="Supprimer l'article sélectionné"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index a1c4c92618..6bf8a94c68 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -19,10 +19,17 @@ <button label="Plus >>" label_selected="Moins <<" name="more_less_btn" tool_tip="Options avancées"/> </panel> <panel name="nearby_media_panel"> + <text name="nearby_media"> + Média près de vous + </text> + <text name="show"> + Afficher : + </text> <combo_box name="show_combo"> <combo_box.item label="Tout" name="All"/> <combo_box.item label="Dans cette parcelle" name="WithinParcel"/> <combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/> + <combo_box.item label="Sur les autres avatars" name="OnOthers"/> </combo_box> <scroll_list name="media_list"> <scroll_list.columns label="Proximité" name="media_proximity"/> @@ -31,19 +38,19 @@ <scroll_list.columns label="Nom" name="media_name"/> <scroll_list.columns label="Débogage" name="media_debug"/> </scroll_list> - <panel> + <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> <button name="stop_btn" tool_tip="Arrêter le média sélectionné"/> </layout_panel> <layout_panel name="play"> - <button name="play_btn" tool_tip="Jouer le média sélectionné"/> + <button name="play_btn" tool_tip="Lire le média sélectionné"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pauser le média sélectionné"/> + <button name="pause_btn" tool_tip="Suspendre la lecture du média sélectionné"/> </layout_panel> <layout_panel name="volume_slider_ctrl"> - <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume audio pour le média sélectionné"/> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume audio du média sélectionné"/> </layout_panel> <layout_panel name="mute"> <button name="mute_btn" tool_tip="Couper l'audio sur le média sélectionné"/> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index b47ed4bd8b..f8ecfbedac 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -3,6 +3,9 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <panel.string name="middle_mouse"> + Bouton central de la souris + </panel.string> <slider label="Angle de vue" name="camera_fov"/> <slider label="Distance" name="camera_offset_scale"/> <text name="heading2"> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 7e6e96aa49..64635fbac0 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -46,6 +46,12 @@ <check_box initial_value="true" label="Jouer l'animation clavier quand vous écrivez" name="play_typing_animation"/> <check_box label="M'envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/> <check_box label="Activer l'historique des chats en texte brut" name="plain_text_chat_history"/> + <text name="show_ims_in_label"> + Afficher les IM dans : + </text> + <text name="requires_restart_label"> + (redémarrage requis) + </text> <radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)"> <radio_item label="Plusieurs fenêtres" name="radio" value="0"/> <radio_item label="Onglets" name="radio2" value="1"/> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml index cc99b1a07c..c8e76118a1 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml @@ -100,7 +100,7 @@ <combo_box.item label="Original" name="Original"/> </combo_box> <spinner label="Prix : L$" name="Edit Cost"/> - <check_box label="Afficher dans les résultats de recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/> + <check_box label="Afficher avec la recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/> <text name="B:"> B : </text> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index c031762d4b..ac78790807 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -23,7 +23,22 @@ Détection du matériel... </string> <string name="StartupLoading"> - Chargement + Chargement de [APP_NAME]... + </string> + <string name="StartupClearingCache"> + Vidage du cache... + </string> + <string name="StartupInitializingTextureCache"> + Initialisation du cache des textures... + </string> + <string name="StartupInitializingVFS"> + Initialisation VFS… + </string> + <string name="ProgressRestoring"> + Restauration... + </string> + <string name="ProgressChangingResolution"> + Changement de la résolution... </string> <string name="Fullbright"> Fullbright (Legacy) @@ -88,6 +103,9 @@ <string name="LoginFailedNoNetwork"> Erreur réseau : impossible d'établir la connexion. Veuillez vérifier votre connexion réseau. </string> + <string name="LoginFailed"> + Échec de la connexion. + </string> <string name="Quit"> Quitter </string> @@ -97,6 +115,24 @@ <string name="AgentLostConnection"> Il y a peut-être des problèmes techniques dans cette région. Veuillez vérifier votre connexion Internet. </string> + <string name="SavingSettings"> + Enregistrement des paramètres... + </string> + <string name="LoggingOut"> + Déconnexion... + </string> + <string name="ShuttingDown"> + Arrêt en cours... + </string> + <string name="YouHaveBeenDisconnected"> + Vous avez été déconnecté de la région où vous étiez. + </string> + <string name="SentToInvalidRegion"> + Vous avez été transféré vers une région non valide. + </string> + <string name="TestingDisconnect"> + Test de déconnexion du client + </string> <string name="TooltipPerson"> Personne </string> @@ -151,6 +187,24 @@ <string name="TooltipAgentUrl"> Cliquez pour afficher le profil de ce résident </string> + <string name="TooltipAgentMute"> + Cliquer pour ignorer ce résident + </string> + <string name="TooltipAgentUnmute"> + Cliquer pour ne plus ignorer ce résident + </string> + <string name="TooltipAgentIM"> + Cliquer pour envoyer un IM à ce résident + </string> + <string name="TooltipAgentPay"> + Cliquer pour payer ce résident + </string> + <string name="TooltipAgentOfferTeleport"> + Cliquer pour proposer une téléportation à ce résident + </string> + <string name="TooltipAgentRequestFriend"> + Cliquer pour demander à ce résident d'être votre ami + </string> <string name="TooltipGroupUrl"> Cliquez pour afficher la description de ce groupe </string> @@ -176,12 +230,31 @@ Cliquez pour exécuter la commande secondlife:// command </string> <string name="CurrentURL" value=" URL actuelle : [CurrentURL]"/> + <string name="TooltipPrice" value="[PRICE] L$-"/> <string name="SLurlLabelTeleport"> Me téléporter vers </string> <string name="SLurlLabelShowOnMap"> Afficher la carte pour </string> + <string name="SLappAgentMute"> + Ignorer + </string> + <string name="SLappAgentUnmute"> + Ne plus ignorer + </string> + <string name="SLappAgentIM"> + IM + </string> + <string name="SLappAgentPay"> + Payer + </string> + <string name="SLappAgentOfferTeleport"> + Proposer une téléportation à + </string> + <string name="SLappAgentRequestFriend"> + Demande d'amitié + </string> <string name="BUTTON_CLOSE_DARWIN"> Fermer (⌘W) </string> @@ -335,6 +408,9 @@ <string name="symbolic link"> lien </string> + <string name="symbolic folder link"> + lien du dossier + </string> <string name="AvatarEditingAppearance"> (Apparence en cours de modification) </string> @@ -849,6 +925,7 @@ Aucun contenu </string> <string name="WornOnAttachmentPoint" value=" (porté sur [ATTACHMENT_POINT])"/> + <string name="ActiveGesture" value="[GESLABEL] (actif)"/> <string name="PermYes"> Oui </string> @@ -948,6 +1025,9 @@ <string name="InvFolder My Outfits"> Mes tenues </string> + <string name="InvFolder Accessories"> + Accessoires + </string> <string name="InvFolder Friends"> Amis </string> @@ -1471,6 +1551,9 @@ <string name="PanelContentsNewScript"> Nouveau script </string> + <string name="PanelContentsTooltip"> + Contenu de l'objet + </string> <string name="BusyModeResponseDefault"> Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu'il a demandé à ne pas être dérangé. Votre message restera affiché dans son panneau IM afin qu'il puisse le lire ultérieurement. </string> @@ -2272,7 +2355,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Brillant </string> <string name="Glove Fingers"> - Doigts avec gants + Gants avec doigts </string> <string name="Glove Length"> Longueur des gants @@ -3034,7 +3117,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Cheveux lisses </string> <string name="Socks Length"> - Longueur des chaussettes + Longueur </string> <string name="Soulpatch"> Barbichette @@ -3375,4 +3458,31 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="unread_chat_multiple"> [SOURCES] ont dit quelque chose de nouveau </string> + <string name="paid_you_ldollars"> + [NAME] vous a payé [AMOUNT] L$ + </string> + <string name="giving"> + Giving + </string> + <string name="uploading_costs"> + Chargement des coûts + </string> + <string name="this_costs"> + This costs + </string> + <string name="buying_selected_land"> + Achat du terrain sélectionné + </string> + <string name="this_object_costs"> + This object costs" + </string> + <string name="group_role_everyone"> + Tous + </string> + <string name="group_role_officers"> + Officiers + </string> + <string name="group_role_owners"> + Propriétaires + </string> </strings> diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml index 0e1e2851e3..1fe6ad25ed 100644 --- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml @@ -67,7 +67,7 @@ <button name="close_btn" tool_tip="Zoom Back"/> </layout_panel> <layout_panel name="new_window"> - <button name="new_window_btn" tool_tip="URLをブラウザで開く"/> + <button name="new_window_btn" tool_tip="URL をブラウザで開く"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index 3113a68505..36cf993ef7 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -16,7 +16,7 @@ （不明） </text> <text name="Only Allow"> - 次のアカウントのアクセス禁止： + 次のアカウントのみアクセスを許可： </text> <check_box label="支払情報登録済" name="limit_payment" tool_tip="未確認の住人の立入を禁止します"/> <check_box label="年齢確認" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人の立入を禁止します。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/> |
