diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
| commit | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (patch) | |
| tree | d4991e4c1a9dd934f48d33804e55eb8ffa085679 /indra/newview/skins/default | |
| parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
| parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) | |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/skins/default')
200 files changed, 4321 insertions, 2931 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index eb62c442db..4d8f88c80b 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -651,13 +651,13 @@ reference="White_10" /> <color name="ToolTipBgColor" - value="DkGray" /> + value="0.937 0.89 0.655 1" /> <color name="ToolTipBorderColor" - value="White_50" /> + value="0.812 0.753 0.451 1" /> <color name="ToolTipTextColor" - reference="LtGray" /> + value="0.749 0.749 0.749 1" /> <color name="UserChatColor" reference="LtGray" /> diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga Binary files differdeleted file mode 100644 index 6fdba25d4e..0000000000 --- a/indra/newview/skins/default/textures/alpha_gradient.tga +++ /dev/null diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c Binary files differdeleted file mode 100644 index 5de5a80a65..0000000000 --- a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c +++ /dev/null diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2c09689ec6..546a06b93f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -444,8 +444,6 @@ <texture name="cam_zoom_plus_in.tga" preload="false" /> <texture name="cam_zoom_minus_in.tga" preload="false" /> - <texture name="icn_clear_lineeditor.tga" /> - <texture name="icn_chatbar.tga" /> <texture name="icn_media-pause.tga" /> <texture name="icn_media-play.tga" /> @@ -528,7 +526,6 @@ <texture name="startup_logo.j2c" preload="true" /> <texture name="color_swatch_alpha.tga" preload="true" /> - <texture name="active_voice_tab.tga" /> <texture name="button_anim_pause.tga" /> <texture name="button_anim_pause_selected.tga" /> <texture name="button_anim_play.tga" /> diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml index fc88b3d49a..87023b4f64 100644 --- a/indra/newview/skins/default/xui/da/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="sell land" title="Sælg land"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Parcel: </text> @@ -55,4 +57,6 @@ </text> <button label="Sæt land til salg" name="sell_btn" /> <button label="Annullér" name="cancel_btn" /> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index a509d5f046..e50494ff9e 100644 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml @@ -153,7 +153,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Du kan redigére dette objekt. + Du kan redigére dette objekt </text> <text name="B:"> B: @@ -187,22 +187,22 @@ Du kan redigere disse objekter </string> <string name="text modify info 3"> - Du kan ikke redigere dette objekt. + Du kan ikke redigere dette objekt </string> <string name="text modify info 4"> - Du kan ikke redigere disse objekter. + Du kan ikke redigere disse objekter </string> <string name="text modify warning"> - Du skal vælge hele objektet for at sætte rettigheder. + Du skal vælge hele objektet for at sætte rettigheder </string> <string name="Cost Default"> - Pris: L$ + Pris: L$ </string> <string name="Cost Total"> - Total pris: L$ + Total pris: L$ </string> <string name="Cost Per Unit"> - Pris Pr: L$ + Pris Pr: L$ </string> <string name="Cost Mixed"> Blandet pris @@ -449,8 +449,8 @@ <button label="Ret ind" label_selected="Ret ind" name="button align" left="160"/> </panel> <panel label="Indhold" name="Contents"> - <button label="Nyt script" label_selected="Nyt script..." name="button new script"/> - <button label="Rettigheder..." name="button permissions"/> + <button label="Nyt script" label_selected="Nyt script" name="button new script"/> + <button label="Rettigheder" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -464,18 +464,18 @@ Område: [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"/> + <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"/> <button label="?" label_selected="?" name="button show owners help"/> <text name="label_parcel_modify"> Redigere grund </text> - <button label="Opdel..." label_selected="Opdel..." name="button subdivide land"/> - <button label="Saml..." label_selected="Saml..." name="button join land"/> + <button label="Opdel" label_selected="Opdel" name="button subdivide land"/> + <button label="Saml" label_selected="Saml" name="button join land"/> <text name="label_parcel_trans"> Transaktioner for land </text> - <button label="Køb land..." label_selected="Køb land..." name="button buy land"/> - <button label="Flyt fra land..." label_selected="Flyt fra land..." name="button abandon land"/> + <button label="Køb land" label_selected="Køb land" name="button buy land"/> + <button label="Flyt fra land" label_selected="Flyt fra land" name="button abandon land"/> </panel> <floater.string name="status_rotate"> Træk i de farvede bånd for at rotere objekt diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 5ab8e4eb30..42f55d4678 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -1079,7 +1079,7 @@ Fleksible genstande er ikke fysiske og man kan gå igennem dem, indtil fleksibel <notification name="FirstDebugMenus"> Du har sat avanceret menu til. Denne menu indeholder funktioner brugbare for udviklere, der udbedrer fejl i [SECOND_LIFE]. -For at vise denne menu, skal man i Windows trykke Ctrl-Alt-D. På Mac tryk ⌘-Opt-Shift-D. +For at vise denne menu, skal man i Windows trykke Ctrl+Alt+D. På Mac tryk ⌥⌘D. </notification> <notification name="FirstSculptedPrim"> Du retter en sculpted prim. diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml new file mode 100644 index 0000000000..74b7c7dd72 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Beboer" />
+ <string name="AcctTypeTrial"
+ value="På prøve" />
+ <string name="AcctTypeCharterMember"
+ value="æresmedlem" />
+ <string name="AcctTypeEmployee"
+ value="Linden Lab medarbejder" />
+ <string name="PaymentInfoUsed"
+ value="Betalende medlem" />
+ <string name="PaymentInfoOnFile"
+ value="Registreret betalende" />
+ <string name="NoPaymentInfoOnFile"
+ value="Ingen betalingsinfo" />
+ <string name="AgeVerified"
+ value="Alders-checket" />
+ <string name="NotAgeVerified"
+ value="Ikke alders-checket" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=da
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Optaget autosvar:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index edce758e7c..4e98ca2bc2 100644 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Generelt" name="general_tab"> <string name="help_text"> - Generel-fanen indeholder generel information om -denne gruppe, en liste med ejere og synlige medlemmer, -generel-gruppeindstillinger og medlemsmuligheder. + Generel-fanen indeholder generel information om denne gruppe, en liste med ejere og synlige medlemmer, generel-gruppeindstillinger og medlemsmuligheder. Bevæg din mus over mulighederne for mere hjælp. </string> @@ -47,7 +45,7 @@ Bevæg din mus over mulighederne for mere hjælp. <panel name="preferences_container"> <check_box label="Vis i søgning" name="show_in_group_list" tool_tip="Lad folk se denne gruppe i søgeresultater."/> <check_box label="Åben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/> - <check_box label="Tilmeldingsgebyr: L$" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen."/> + <check_box label="Tilmeldingsgebyr:" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen."/> <spinner name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når Tilmeldingsgebyr er valgt." width="60" left_delta="130"/> <combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som 'mature'." width="150"> <combo_box.item name="select_mature" label="- Vælg indholdsrating -"/> 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 029922c413..636a16f97b 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 @@ -48,8 +48,11 @@ <string name="land_contrib_error"> Ikke muligt at lave dit bidrag til landet. </string> + <text name="your_contribution_units"> + ( m² ) + </text> <text name="your_contribution_max_value"> - m² ([AMOUNT] maks.) + ([AMOUNT] maks.) </text> <text name="group_over_limit_text"> Gruppemedlemmer må bidrag med mere, for at understøtte diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index 9490f94a42..ed23a9a706 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature og Adult"/> <combo_box.item name="Desired_Mature" label="PG and Mature"/> - <combo_box.item name="Desired_PG" label="PG only"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG only + PG </text> <text name="start_location_textbox"> Start lokation: 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 7039f8fd6c..5d0799cab9 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estate" name="Estate"> +<panel label="Estate" name="Estate"> <text name="estate_help_text"> Ændringer i dette afsnit vil påvirke alle regioner i dette estate. @@ -70,6 +68,4 @@ regioner i dette estate. <button label="?" name="ban_resident_help" /> <button label="Fjern..." name="remove_banned_avatar_btn" /> <button label="Tilføj..." name="add_banned_avatar_btn" /> - </panel> - </scroll_container> </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 a7477d3a65..65c4743da0 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Terræn textures" name="Textures"> +<panel label="Terræn textures" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ og HØJ værdien er MIMIMUM højde for texture nummer 4. </text> <button label="Gem" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 9849f2f56d..945833d57a 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -484,16 +484,16 @@ Vælg bibliotek </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -603,6 +603,9 @@ <string name="no_ability_error"> Du har ikke den mulighed. </string> + <string name="no_ability"> + Du har ikke den mulighed. + </string> <string name="not_a_mod_error"> Du er ikke moderator for denne samtale. </string> @@ -621,4 +624,31 @@ <string name="close_on_no_ability"> Du har ikke længere mulighed for at deltage i samtalen </string> + <string name="AcctTypeResident"> + Beboer + </string> + <string name="AcctTypeTrial"> + På prøve + </string> + <string name="AcctTypeCharterMember"> + æresmedlem + </string> + <string name="AcctTypeEmployee"> + Linden Lab medarbejder + </string> + <string name="PaymentInfoUsed"> + Betalende medlem + </string> + <string name="PaymentInfoOnFile"> + Registreret betalende + </string> + <string name="NoPaymentInfoOnFile"> + Ingen betalingsinfo + </string> + <string name="AgeVerified"> + Alders-checket + </string> + <string name="NotAgeVerified"> + Ikke alders-checket + </string> </strings> diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml index c34252d8a7..1499bb0152 100644 --- a/indra/newview/skins/default/xui/de/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="sell land" title="Land verkaufen"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Parzelle: </text> @@ -60,4 +62,6 @@ wechseln den Eigentümer. </text> <button label="Land zum Verkauf freigeben" width="180" name="sell_btn" /> <button label="Abbrechen" name="cancel_btn" /> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 2875f5d04c..2815fd34a2 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -159,7 +159,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Sie können dieses Objekt ändern. + Sie können dieses Objekt ändern </text> <text name="B:"> B: @@ -187,28 +187,28 @@ <check_box name="checkbox next owner can transfer"/> </panel> <string name="text modify info 1"> - Sie können dieses Objekt ändern. + Sie können dieses Objekt ändern </string> <string name="text modify info 2"> - Sie können diese Objekte ändern. + Sie können diese Objekte ändern </string> <string name="text modify info 3"> - Sie können dieses Objekt nicht ändern. + Sie können dieses Objekt nicht ändern </string> <string name="text modify info 4"> - Sie können diese Objekte nicht ändern. + Sie können diese Objekte nicht ändern </string> <string name="text modify warning"> - Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen. + Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen </string> <string name="Cost Default"> - Preis:L$ + Preis: L$ </string> <string name="Cost Total"> - Summe:L$ + Summe: L$ </string> <string name="Cost Per Unit"> - Stückpreis:L$ + Stückpreis: L$ </string> <string name="Cost Mixed"> Mischpreis @@ -503,8 +503,8 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild <button label="Ausrichten" label_selected="Ausrichten" name="button align"/> </panel> <panel label="Inhalt" name="Contents"> - <button label="Neues Skript" label_selected="Neues Skript..." name="button new script"/> - <button label="Berechtigungen..." name="button permissions"/> + <button label="Neues Skript" label_selected="Neues Skript" name="button new script"/> + <button label="Berechtigungen" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -512,24 +512,24 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild Parzelleninformation </text> <text name="label_area_price"> - Preis: L$ [PRICE] für [AREA] m2. + Preis: L$ [PRICE] für [AREA] m² </text> <text name="label_area"> - Fläche: [AREA] m2 + Fläche: [AREA] m² </text> <button label="Info zu Land..." label_selected="Info zu Land..." name="button about land"/> - <check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen"/> + <check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen: Grün = Ihr Land Blau = Das Land Ihrer Gruppe Rot = Im Eigentum anderer Geld = Zum Verkauf Lila = Zur Auktion Grau = Öffentlich"/> <button label="?" label_selected="?" name="button show owners help"/> <text name="label_parcel_modify"> Parzelle ändern </text> - <button label="Unterteilen..." label_selected="Unterteilen..." name="button subdivide land"/> + <button label="Unterteilen" label_selected="Unterteilen" name="button subdivide land"/> <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land"/> <text name="label_parcel_trans"> Land-Transaktionen </text> - <button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land"/> - <button label="Land aufgeben..." label_selected="Land aufgeben..." name="button abandon land"/> + <button label="Land kaufen" label_selected="Land kaufen" name="button buy land"/> + <button label="Land aufgeben" label_selected="Land aufgeben" name="button abandon land"/> </panel> <floater.string name="status_rotate"> An den farbigen Bändern ziehen, um das Objekt zu drehen diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index b738b2d864..ebe2d9b260 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1696,7 +1696,7 @@ Ist die Option aktiviert, können Käufer ihr Land in dieser Region weiterverkau Standard: deaktiviert </notification> <notification label="Skripts deaktivieren" name="HelpRegionDisableScripts"> - Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für „Simulator Physics FPS“ (Simulator Physik-FPS) an. + Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie die Statistikleiste (Strg+Umschalt+1). Sehen Sie sich den Wert für „Simulator Physics FPS“ (Simulator Physik-FPS) an. Wenn der Wert unter 45 liegt, öffnen Sie den Bereich „Time“ (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für „Script Time“ (Skriptzeit) 25 ms oder höher ist, klicken Sie auf „Top-Skripts“. Der Name und die Position der Skripts, die für die schlechte Performance verantwortlich sind, werden angezeigt. Wenn Sie das Kontrollkästchen „Skripts deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Skripts in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Skripts“ reisen können. Sobald Sie dort angekommen sind, sollten Sie das Skript auf die Ursache des Problems hin untersuchen. Möglicherweise müssen Sie sich an den Skript-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um die Skripte in der Region wieder zu aktivieren, deaktivieren Sie „Skript deaktivieren“ und klicken Sie auf „Übernehmen“. @@ -1704,7 +1704,7 @@ Standard: deaktiviert </notification> <notification label="Kollisionen deaktivieren" name="HelpRegionDisableCollisions"> Schlechte Sim-Performance ist oftmals auf physische Objekte zurückzuführen. -Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert „Simulator Physics FPS“ an. Liegt dieser unter 45, öffnen Sie unten in der Statistikleiste den „Time“-Bereich. Liegt die „Sim Time (Physics)“ bei 20 ms oder darüber, klicken Sie auf „Top-Kollisionsobjekte“. +Öffnen Sie die Statistikleiste (Strg+Umschalt+1). Sehen Sie sich den Wert „Simulator Physics FPS“ an. Liegt dieser unter 45, öffnen Sie unten in der Statistikleiste den „Time“-Bereich. Liegt die „Sim Time (Physics)“ bei 20 ms oder darüber, klicken Sie auf „Top-Kollisionsobjekte“. Der Name und der Standort der physischen Objekte, die das Problem verursachen, werden angezeigt. Wenn Sie das Kontrollkästchen „Kollisionen deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Kollisionsobjekts“ reisen können. Überprüfen Sie das Objekt an der angegebenen Position. @@ -2849,7 +2849,7 @@ Ein flexibles Objekt ist ein Phantom und nicht physisch, bis die Option „Flexi <notification name="FirstDebugMenus"> Sie haben das Advanced-Menü aktiviert. Dieses Menü enthält nützliche Funktionen zum Debuggen von [SECOND_LIFE]. -Drücken Sie in Windows Strg-Alt-D (Mac: Befehl-Opt-Umschalt-D) zum Ein- und Ausschalten dieses Menüs. +Drücken Sie in Windows Strg+Alt+D (Mac: ⌥⌘D) zum Ein- und Ausschalten dieses Menüs. </notification> <notification name="FirstSculptedPrim"> Sie bearbeiten ein geformtes Primitiv. diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml new file mode 100644 index 0000000000..1f67e0231d --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Einwohner" />
+ <string name="AcctTypeTrial"
+ value="Test" />
+ <string name="AcctTypeCharterMember"
+ value="Charta-Mitglied" />
+ <string name="AcctTypeEmployee"
+ value="Linden Lab-Mitarbeiter" />
+ <string name="PaymentInfoUsed"
+ value="Zahlungsinfo verwendet" />
+ <string name="PaymentInfoOnFile"
+ value="Zahlungsinfo archiviert" />
+ <string name="NoPaymentInfoOnFile"
+ value="Keine Zahlungsinfo archiviert" />
+ <string name="AgeVerified"
+ value="Altersgeprüft" />
+ <string name="NotAgeVerified"
+ value="Nicht altersgeprüft" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=de
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Antwort für Beschäftigt-Modus:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index e214b19ffd..2acc9e0649 100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Allgemein" name="general_tab"> <string name="help_text"> - Die Registerkarte „Allgemein“ enthält Informationen über -diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, -allgemeine Gruppeneinstellungen und Mitgliederoptionen. + Die Registerkarte „Allgemein“ enthält Informationen über diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, allgemeine Gruppeneinstellungen und Mitgliederoptionen. Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. </string> @@ -47,7 +45,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. <panel name="preferences_container"> <check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/> <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> - <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/> + <check_box label="Beitrittsgebühr:" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/> <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> <combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind."> <combo_box.item name="select_mature" label="- Mature wählen -"/> @@ -72,88 +70,3 @@ Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gr Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein. </string> </panel> - -<!-- original file - -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Allgemein" name="general_tab"> - <string name="help_text"> - Die Registerkarte „Allgemein“ enthält Informationen über -diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, -allgemeine Gruppeneinstellungen und Mitgliederoptionen. - -Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. - </string> - <string name="group_info_unchanged"> - Die allgemeine Gruppeninfo wurde geändert. - </string> - <button label="?" label_selected="?" name="help_button"/> - <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/> - <text name="group_name"> - Neuen Gruppennamen hier eingeben - </text> - <text name="prepend_founded_by"> - Gegründet von - </text> - <text left_delta="79" name="founder_name"> - (wartet) - </text> - <text name="group_charter_label"> - Gruppencharta - </text> - <texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> - <text_editor name="charter"> - Gruppencharta - </text_editor> - <button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/> - <button label="Detailansicht" label_selected="Detailansicht" name="info_button"/> - <text name="text_owners_and_visible_members"> - Eigentümer und sichtbare Mitglieder - </text> - <text name="text_owners_are_shown_in_bold"> - (Eigentümer werden fettgedruckt angezeigt) - </text> - <name_list name="visible_members"> - <name_list.columns label="Mitgliedsname" name="name" relwidth="0.40"/> - <name_list.columns label="Titel" name="title" relwidth="0.25"/> - <name_list.columns label="Letzte Anmeldung" name="online" relwidth="0.35"/> - </name_list> - <text name="text_group_preferences"> - Gruppeneinstellungen - </text> - <panel name="preferences_container"> - <check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/> - <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> - <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/> - <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> - <combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind."> - <combo_box.item name="select_mature"> - - Mature wählen - - </combo_item> - <combo_box.item name="mature"> - Mature-Inhalt - </combo_item> - <combo_box.item name="pg"> - PG-Inhalt - </combo_item> - </combo_box> - <panel name="title_container"> - <text name="active_title_label"> - Mein aktiver Titel - </text> - <combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/> - </panel> - <check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können. Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten." width="173"/> - <check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/> - </panel> - <string name="incomplete_member_data_str"> - Mitgliedsdaten werden abgerufen - </string> - <string name="confirm_group_create_str"> - Die Gründung dieser Gruppe kostet 100 L$. -Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten? -Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein. - </string> -</panel> - ---> diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index e2e30b7479..bc39a3a1bb 100644 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml @@ -48,8 +48,11 @@ <string name="land_contrib_error"> Ihr Landbeitrag kann nicht festgelegt werden. </string> + <text name="your_contribution_units"> + ( qm ) + </text> <text name="your_contribution_max_value"> - qm (max. [AMOUNT]) + (max. [AMOUNT]) </text> <text name="group_over_limit_text"> Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann. diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index bfd4148895..8d9ebe423b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature und Adult"/> <combo_box.item name="Desired_Mature" label="PG und Mature"/> - <combo_box.item name="Desired_PG" label="Nur PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - Nur PG + PG </text> <text name="start_location_textbox"> Startposition: diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index 790555296d..ddc5941da6 100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Grundstück" name="Estate"> +<panel label="Grundstück" name="Estate"> <text name="estate_help_text"> Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus. @@ -76,6 +74,4 @@ auf alle Regionen auf dem Grundstück aus. <button label="Entfernen..." name="remove_banned_avatar_btn" /> <button label="Nachricht an Grundstück senden..." name="message_estate_btn" /> <button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml index 456feb0371..df936ff643 100644 --- a/indra/newview/skins/default/xui/de/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/de/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Bodentexturen" name="Textures"> +<panel label="Bodentexturen" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ und der OBERE WERT die MINIMALE Höhe von Textur 4. </text> <button label="Übernehmen" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 5df1570bfd..af9185e0b7 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -488,16 +488,16 @@ Verzeichnis auswählen </string> <string name="accel-mac-control"> - Strg- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Umschalt- + ⇧ </string> <string name="accel-win-control"> Strg+ @@ -603,6 +603,9 @@ <string name="no_ability_error"> Sie besitzen diese Fähigkeit nicht. </string> + <string name="no_ability"> + Sie besitzen diese Fähigkeit nicht. + </string> <string name="not_a_mod_error"> Sie sind kein Sitzungsmoderator. </string> @@ -621,4 +624,31 @@ <string name="close_on_no_ability"> Sie haben nicht mehr die Berechtigung an der Chat-Sitzung teilzunehmen. </string> + <string name="AcctTypeResident"> + Einwohner + </string> + <string name="AcctTypeTrial"> + Test + </string> + <string name="AcctTypeCharterMember"> + Charta-Mitglied + </string> + <string name="AcctTypeEmployee"> + Linden Lab-Mitarbeiter + </string> + <string name="PaymentInfoUsed"> + Zahlungsinfo verwendet + </string> + <string name="PaymentInfoOnFile"> + Zahlungsinfo archiviert + </string> + <string name="NoPaymentInfoOnFile"> + Keine Zahlungsinfo archiviert + </string> + <string name="AgeVerified"> + Altersgeprüft + </string> + <string name="NotAgeVerified"> + Nicht altersgeprüft + </string> </strings> diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index dcd85e1f58..a8d3f440c3 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -9,15 +9,15 @@ image_disabled_selected="transparent.j2c" image_selected="transparent.j2c" image_unselected="transparent.j2c" - image_hover_selected="PushButton_Selected" - image_hover_unselected="PushButton_Off" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" + image_hover_selected="FileMenu_BarSelect" + image_hover_unselected="FileMenu_BarSelect" + image_pressed="FileMenu_BarSelect" + image_pressed_selected="FileMenu_BarSelect" hover_glow_amount="0.15" layout="topleft" - left="2" + left="0" name="favorites_bar_btn" tab_stop="false" - top="2" + top="10" use_ellipses="true" width="120" /> diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 0733280c39..b194b533af 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -78,6 +78,7 @@ <panel border="true" label="Support" + help_topic="about_support_tab" name="support_panel"> <text_editor allow_html="true" @@ -103,6 +104,7 @@ <panel border="true" label="Credits" + help_topic="about_credits_tab" name="credits_panel"> <text_editor enabled="false" @@ -134,6 +136,7 @@ It is a rare mind indeed that can render the hitherto non-existent blindingly ob <panel border="true" label="Licenses" + help_topic="about_licenses_tab" name="licenses_panel"> <text_editor enabled="false" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 524495d83d..1f366f6c52 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -40,6 +40,7 @@ label="General" layout="topleft" left="1" + help_topic="land_general_tab" name="land_general_panel" top="-31" width="458"> @@ -535,6 +536,7 @@ Go to World menu > About Land or select another parcel to show its details. label="Covenant" layout="topleft" left_delta="-1" + help_topic="land_covenant_tab" name="land_covenant_panel" top_delta="-47" width="458"> @@ -801,6 +803,7 @@ Go to World menu > About Land or select another parcel to show its details. label="Objects" layout="topleft" left_delta="0" + help_topic="land_objects_tab" name="land_objects_panel" top_delta="-47" width="458"> @@ -1166,6 +1169,7 @@ Go to World menu > About Land or select another parcel to show its details. label="Options" layout="topleft" left_delta="0" + help_topic="land_options_tab" name="land_options_panel" top_delta="31" width="458"> @@ -1603,6 +1607,7 @@ Only large parcels can be listed in search. label="Media" layout="topleft" left_delta="0" + help_topic="land_media_tab" name="land_media_panel" top_delta="1" width="458"> @@ -1865,6 +1870,7 @@ Texture: label="Audio" layout="topleft" left_delta="0" + help_topic="land_audio_tab" name="land_audio_panel" top_delta="1" width="458"> @@ -1968,6 +1974,7 @@ Texture: label="Access" layout="topleft" left_delta="0" + help_topic="land_access_tab" name="land_access_panel" top_delta="31" width="458"> diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 29f8b49794..fb0994b4cd 100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="368" + height="412" layout="topleft" - min_height="368" + min_height="412" min_width="420" name="floater_auction" help_topic="floater_auction" @@ -49,21 +49,47 @@ left_delta="0" name="snapshot_btn" top_pad="4" - width="96"> + width="150"> <button.commit_callback function="ClickSnapshot" /> </button> <button follows="left|bottom" height="20" - label="OK" - label_selected="OK" + label="Sell to Anyone" + label_selected="Sell to Anyone" + layout="topleft" + left_delta="0" + name="sell_to_anyone_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickSellToAnyone" /> + </button> + <button + follows="left|bottom" + height="20" + label="Clear Settings" + label_selected="Clear Settings" + layout="topleft" + left_delta="0" + name="reset_parcel_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickResetParcel" /> + </button> + <button + follows="left|bottom" + height="20" + label="Start Auction" + label_selected="Start Auction" layout="topleft" left_pad="4" - name="ok_btn" + name="start_auction_btn" top_delta="0" - width="48"> + width="150"> <button.commit_callback - function="ClickOK" /> + function="ClickStartAuction" /> </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index e1f8011cbe..0542d4509e 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -40,6 +40,7 @@ label="Search" layout="topleft" left="6" + help_topic="avatarpicker_search_tab" name="SearchPanel" top="150" width="132"> @@ -91,6 +92,7 @@ label="Near Me" layout="topleft" left="6" + help_topic="avatarpicker_near_me_tab" name="NearMePanel" top="150" width="132"> 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 991c9a84a3..041cd2a118 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -12,10 +12,6 @@ name="buy_currency"> Buy L$ [LINDENS] for approx. [LOCALAMOUNT] </floater.string> - <floater.string - name="account_website"> - http://secondlife.com/account/billing.php - </floater.string> <icon height="215" image_name="Linden_Dollar_Background" @@ -35,7 +31,7 @@ top="30" width="300" name="info_need_more"> - You need more L$: + You need more L$ </text> <text type="string" @@ -43,7 +39,8 @@ follows="top|left" height="16" layout="topleft" - left="20" + top="246" + left="15" width="300" name="contacting"> Contacting LindeX... @@ -70,7 +67,7 @@ layout="topleft" left="20" name="balance_label" - top_pad="10" + top="70" width="210"> I have </text> @@ -85,7 +82,7 @@ left="200" name="balance_amount" top_delta="0" - width="100"> + width="120"> L$ [AMT] </text> <text @@ -94,7 +91,7 @@ follows="top|left" font="SansSerifMedium" height="16" - top_pad="15" + top="100" layout="topleft" left="20" name="currency_action" @@ -109,7 +106,7 @@ height="16" layout="topleft" top_delta="0" - left="222" + left="242" name="currency_label" width="15"> L$ @@ -136,7 +133,7 @@ height="16" layout="topleft" left="20" - top_pad="10" + top="130" name="buying_label" width="210"> For the price @@ -153,7 +150,7 @@ layout="topleft" left="170" name="currency_est" - width="130"> + width="150"> [LOCALAMOUNT] </text> <text @@ -164,8 +161,9 @@ follows="top|left" height="16" layout="topleft" - left="40" - width="100" + top="130" + left="170" + width="150" halign="right" name="getting_data"> Estimating... @@ -173,13 +171,13 @@ <text type="string" font="SansSerifSmall" - top_delta="0" + top="150" length="1" follows="top|left" halign="right" height="16" - left_pad="10" - width="150" + left="150" + width="170" layout="topleft" name="buy_action"> [NAME] L$ [PRICE] @@ -193,6 +191,7 @@ layout="topleft" left="20" name="total_label" + top="170" width="210"> My new balance will be </text> @@ -207,7 +206,7 @@ left="200" halign="right" name="total_amount" - width="100"> + width="120"> L$ [AMT] </text> <text @@ -215,8 +214,10 @@ length="1" follows="top|left" layout="topleft" + top="195" left="20" width="300" + height="30" name="purchase_warning_repurchase"> Confirming this purchase only buys the L$. You'll need to try again. @@ -226,7 +227,10 @@ You'll need to try again. length="1" follows="top|left" layout="topleft" + top="195" left="20" + width="300" + height="30" name="purchase_warning_notenough"> You aren't buying enough L$. Increase the amount to buy. @@ -239,7 +243,7 @@ Increase the amount to buy. layout="topleft" left="151" name="buy_btn" - top="248" + top="242" width="90"/> <button follows="bottom|right" @@ -260,15 +264,23 @@ Increase the amount to buy. <text type="string" font="SansSerifHuge" - left="170" + left="165" width="170" - height="80" - top="30" + height="25" + top="25" name="info_cannot_buy"> - Take your -[SECOND_LIFE] to -the next level... + Unable to Buy </text> + <text + type="string" + width="175" + height="125" + top="60" + left="165" + word_wrap="true" + follows="bottom|right" + name="cannot_buy_message"> + </text> <button follows="bottom|left" height="20" @@ -276,16 +288,6 @@ the next level... layout="topleft" left="170" name="error_web" - top="120" + top="200" width="160"/> - <text - type="string" - width="350" - height="20" - top_pad="92" - left_pad="-300" - follows="bottom|right" - name="cannot_buy_message"> - Continue to the web site and enter payment information - </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 62d40bc45f..6d1c2c1cb9 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -587,7 +587,7 @@ sold with objects width="215" word_wrap="true"> You hold 1309 m² of land. - This parcel is 512 m² of land. +This parcel is 512 m² of land. </text> <locate height="10" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index c4a2654403..86c75a3946 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_dock="true" - can_minimize="false" - can_close="false" + can_minimize="true" + can_close="true" center_horiz="true" follows="top" height="110" diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 6f9038df62..66c207603b 100644 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml @@ -199,7 +199,7 @@ bottom_delta="20" follows="left|top|right" font="SansSerif" - font_shadow="hard" + font_shadow="none" height="16" layout="topleft" left="16"> diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 052398bcd3..3d0a969112 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -2,13 +2,16 @@ <floater can_resize="true" height="465" - layout="topleft" - min_height="200" - min_width="280" name="gestures" help_topic="gestures" - title="Active Gestures" - width="280"> + title="Gestures" + background_visible="true" + follows="all" + label="Places" + layout="topleft" + min_height="350" + min_width="240" + width="313"> <floater.string name="loading"> Loading... @@ -17,31 +20,20 @@ name="playing"> (Playing) </floater.string> - <text - type="string" - length="1" - bottom="30" - follows="top|left" - layout="topleft" - left="15" - name="help_label"> - Double-click a gesture to play. - </text> <scroll_list - bottom_delta="390" + bottom_delta="400" draw_heading="true" - follows="top|left|bottom|right" - height="380" + follows="all" layout="topleft" - left="15" - name="gesture_list" - right="-15"> + left="0" + top="20" + name="gesture_list"> <scroll_list.columns label="Name" name="name" - width="90" /> + width="153" /> <scroll_list.columns - label="Trigger" + label="Chat" name="trigger" width="80" /> <scroll_list.columns @@ -51,29 +43,74 @@ <scroll_list.columns label="Key" name="shortcut" - width="50" /> + width="80" /> </scroll_list> + <panel + background_visible="true" + bevel_style="none" + top_pad="0" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="313"> + <button + follows="bottom|left" + font="SansSerifBigBold" + tool_tip="Change sort and view of Recent Residents list" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="recent_viewsort_btn" + picture_style="true" + top="5" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="new_gesture_btn" + picture_style="true" + tool_tip="Make new Gesture" + top_delta="0" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + image_disabled="TrashItem_Disabled" + layout="topleft" + left_pad="230" + name="del_btn" + picture_style="true" + tool_tip="Delete this Gesture" + top_delta="0" + width="18" /> + </panel> <button follows="bottom|right" - height="20" - label="New" - layout="topleft" - left_delta="0" - name="new_gesture_btn" - top_pad="10" - width="83" /> - <button - follows="bottom|right" - height="20" + height="23" label="Edit" layout="topleft" - left_pad="6" + left="6" name="edit_btn" - top_delta="0" + top_pad="5" width="83" /> <button follows="bottom|right" - height="20" + height="23" label="Play" layout="topleft" left_pad="6" @@ -82,7 +119,7 @@ width="83" /> <button follows="bottom|right" - height="20" + height="23" label="Stop" layout="topleft" left_delta="0" @@ -90,4 +127,3 @@ top_delta="0" width="83" /> </floater> - diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 615c35e6c3..53d05f3c61 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -23,6 +23,7 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="godtools_grid_tab" name="grid" top="16" width="398"> @@ -61,6 +62,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="godtools_region_tab" name="region" top_delta="0" width="398"> @@ -483,6 +485,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="godtools_objects_tab" name="objects" top_delta="0" width="398"> @@ -690,6 +693,7 @@ label="Request" layout="topleft" left_delta="0" + help_topic="godtools_request_tab" name="request" top_delta="0" width="398"> diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 70f296b606..c695753ca3 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -95,7 +95,7 @@ name="(brightness, lower is brighter)" top_delta="2" width="315"> - (brightness, lower = brighter, 0 = default) + (0 = default brightness, lower = brighter) </text> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index a233f7f0fa..611c51ad11 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -11,10 +11,10 @@ can_dock="true" can_minimize="true" visible="true" - width="315"> + width="365"> <layout_stack follows="left|top|right|bottom" height="235" - width="315" + width="365" layout="topleft" orientation="horizontal" name="im_panels" @@ -25,13 +25,13 @@ layout="topleft" top_delta="-3" min_width="96" - width="96" + width="146" height="225" label="IM Control Panel" user_resize="false" /> <layout_panel height="235" width="200" - left_delta="96" + left_delta="146" top="0" user_resize="false"> <button height="12" @@ -62,7 +62,7 @@ width="195" word_wrap="true"> </text_editor> - <line_editor name="chat_editor" height="20" layout="topleft" width="190"> + <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="190"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index bdce8fa4fc..95e4247a05 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -34,7 +34,6 @@ font="SansSerif" height="64" border_visible="false" - hide_scrollbar="true" layout="topleft" left="77" max_length="2147483647" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index dc6a02efe1..a2b2e1ddf3 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -67,7 +67,6 @@ left="0" name="floater_map_north" right="10" - text="N" text_color="1 1 1 0.7" top="215"> N diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 65235da8d5..f82e01dd1f 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_dock="true" - can_close="false" - can_minimize="false" + can_close="true" + can_minimize="true" center_horiz="true" follows="bottom" height="110" @@ -50,6 +50,7 @@ follows="left|bottom" height="25" image_selected="Movement_TurnLeft_On" + image_pressed_selected="Movement_TurnLeft_On" image_unselected="Movement_TurnLeft_Off" layout="topleft" left="17" @@ -63,6 +64,7 @@ follows="left|bottom" height="25" image_selected="Movement_TurnRight_On" + image_pressed_selected="Movement_TurnRight_On" image_unselected="Movement_TurnRight_Off" layout="topleft" left_pad="34" @@ -76,6 +78,7 @@ follows="left|bottom" height="25" image_selected="Movement_Up_On" + image_pressed_selected="Movement_Up_On" image_unselected="Movement_Up_Off" layout="topleft" left="10" @@ -89,6 +92,7 @@ follows="left|bottom" height="25" image_selected="Movement_Down_On" + image_pressed_selected="Movement_Down_On" image_unselected="Movement_Down_Off" layout="topleft" left_pad="45" @@ -102,6 +106,7 @@ follows="left|bottom" height="25" image_selected="Movement_Forward_On" + image_pressed_selected="Movement_Forward_On" image_unselected="Movement_Forward_Off" layout="topleft" left="46" @@ -116,6 +121,7 @@ follows="left|bottom" height="25" image_selected="Movement_Backward_On" + image_pressed_selected="Movement_Backward_On" image_unselected="Movement_Backward_Off" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_my_friends.xml b/indra/newview/skins/default/xui/en/floater_my_friends.xml index a9a18f44c4..0ca4fc825a 100644 --- a/indra/newview/skins/default/xui/en/floater_my_friends.xml +++ b/indra/newview/skins/default/xui/en/floater_my_friends.xml @@ -28,6 +28,7 @@ label="Friends" layout="topleft" left="0" + help_topic="my_friends_friends_tab" name="friends_panel" width="370" /> <panel @@ -36,6 +37,7 @@ label="Groups" layout="topleft" left="0" + help_topic="my_friends_groups_tab" name="groups_panel" width="370" /> </tab_container> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index e851710ad8..f1976afb4a 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -31,12 +31,13 @@ name="close_btn"/> </panel> <text_editor + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="left|top|right|bottom" font="SansSerif" layout="topleft" - height="320" + height="320" max_length="2147483647" name="Chat History Editor" parse_highlights="true" diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml index aaf7aecd6b..571f4149f0 100644 --- a/indra/newview/skins/default/xui/en/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en/floater_post_process.xml @@ -23,6 +23,7 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="post_process_color_filter_tab" name="wmiColorFilterPanel" top="0" width="398"> @@ -184,6 +185,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="post_process_night_vision_tab" name="wmiNightVisionPanel" top_delta="-236" width="398"> @@ -279,6 +281,7 @@ label="Bloom" layout="topleft" left_delta="0" + help_topic="post_process_bloom_tab" name="wmiBloomPanel" top_delta="-236" width="398"> @@ -374,6 +377,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="post_process_extras_tab" name="Extras" top_delta="-236" width="398"> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index d655c268b2..cf9e3a82fc 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -52,54 +52,63 @@ filename="panel_preferences_general.xml" label="General" layout="topleft" + help_topic="preferences_general_tab" name="general" /> <panel class="panel_preference" filename="panel_preferences_graphics1.xml" label="Graphics" layout="topleft" + help_topic="preferences_display_tab" name="display" /> <panel class="panel_preference" filename="panel_preferences_im.xml" label="Privacy" layout="topleft" + help_topic="preferences_im_tab" name="im" /> <panel class="panel_preference" filename="panel_preferences_audio.xml" label="Sound" layout="topleft" + help_topic="preferences_audio_tab" name="audio" /> <panel class="panel_preference" filename="panel_preferences_chat.xml" label="Chat" layout="topleft" + help_topic="preferences_chat_tab" name="chat" /> <panel class="panel_preference" filename="panel_preferences_popups.xml" label="Alerts" layout="topleft" + help_topic="preferences_msgs_tab" name="msgs" /> <panel class="panel_preference" filename="panel_preferences_input.xml" label="Setup" layout="topleft" + help_topic="preferences_input_tab" name="input" /> <panel class="panel_preference" filename="panel_preferences_advanced.xml" label="Advanced" layout="topleft" + help_topic="preferences_advanced1_tab" name="advanced1" /> <panel class="panel_preference" filename="panel_preferences_advanced2.xml" label="Move or Kill" layout="topleft" + help_topic="preferences_advanced2_tab" name="advanced2" /> </tab_container> diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index f90f2a81cf..448b0fa6af 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -86,7 +86,7 @@ follows="left|bottom" height="22" label="Save" - label_selected="Discard" + label_selected="Save" layout="topleft" left="288" name="Save" diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index a243cb399e..e477b6ddb8 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -45,22 +45,22 @@ <button follows="left|bottom" height="22" - label="Delete" + label="OK" layout="topleft" left="80" - name="Discard" + name="Keep" top="302" width="100" /> <button follows="left|bottom" height="22" - label="Save" + label="Cancel" layout="topleft" left_pad="5" - name="Keep" + name="Discard" top_delta="0" width="100" /> - <text + <text type="string" length="1" follows="left|bottom" @@ -68,8 +68,66 @@ layout="topleft" left="13" name="dimensions" - top="287" + top="309" width="303"> [WIDTH]px x [HEIGHT]px </text> + <text + type="string" + length="1" + bg_visible="false" + border_drop_shadow_visible="false" + border_visible="false" + top="309" + drop_shadow_visible="true" + enabled="true" + follows="right|bottom" + font="SansSerifSmall" + h_pad="0" + halign="right" + height="14" + left="54" + mouse_opaque="true" + name="aspect_ratio" + v_pad="0" + width="110"> + Preview Aspect Ratio + </text> + <combo_box + allow_text_entry="true" + top="306" + follows="right|bottom" + height="20" + left="176" + max_chars="20" + mouse_opaque="true" + enabled="true" + width="108" + name="combo_aspect_ratio" + tool_tip="Preview at a fixed aspect ratio"> + <combo_item name="Unconstrained" value="Unconstrained"> + Unconstrained + </combo_item> + <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> + 1:1 + </combo_item> + <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> + 4:3 + </combo_item> + <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> + 10:7 + </combo_item> + <combo_item name="3:2" value="3:2" tool_tip="About land"> + 3:2 + </combo_item> + <combo_item name="16:10" value="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> + 16:9 + </combo_item> + <combo_item name="2:1" value="2:1"> + 2:1 + </combo_item> + </combo_box> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index e045b811f2..3fadc15616 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater height="512" + help_topic="regioninfo" layout="topleft" name="regioninfo" - help_topic="regioninfo" save_rect="true" title="Region/Estate" - width="280"> + width="480"> <tab_container bottom="512" follows="left|right|top|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index f07b9d3767..652ed96192 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -212,7 +212,7 @@ name="Anyone" value="anyone" /> <combo_box.item - label="Specific user:" + label="Specific person:" name="Specificuser:" value="user" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index e2f4a73ec8..b7779687ec 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -23,7 +23,6 @@ <text_editor enabled="false" height="60" - hide_scrollbar="true" layout="topleft" left_delta="0" name="comment_text" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 8ed2047a27..cc0fc34dd5 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -277,6 +277,7 @@ follows="top|left" label="Spinner" layout="topleft" + label_width="45" name="test_spinner" tool_tip="spinner"/> <text diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index c65206d629..d3ceb67ceb 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -32,7 +32,7 @@ </floater.string> <floater.string name="status_grab"> - Drag to move, Ctrl to lift, Ctrl-Shift to rotate + Drag to move, Ctrl to lift, Ctrl+Shift to rotate </floater.string> <floater.string name="status_place"> @@ -66,8 +66,8 @@ follows="left|top" height="20" image_disabled="Tool_Zoom" - image_disabled_selected="tool_zoom_active.tga" - image_selected="tool_zoom_active.tga" + image_disabled_selected="Tool_Zoom" + image_selected="Tool_Zoom" image_unselected="Tool_Zoom" layout="topleft" left="10" @@ -83,8 +83,8 @@ follows="left|top" height="20" image_disabled="Tool_Grab" - image_disabled_selected="tool_grab_active.tga" - image_selected="tool_grab_active.tga" + image_disabled_selected="Tool_Grab" + image_selected="Tool_Grab" image_unselected="Tool_Grab" layout="topleft" left_pad="8" @@ -100,8 +100,8 @@ follows="left|top" height="20" image_disabled="Tool_Face" - image_disabled_selected="tool_face_active.tga" - image_selected="tool_face_active.tga" + image_disabled_selected="Tool_Face" + image_selected="Tool_Face" image_unselected="Tool_Face" layout="topleft" left_pad="8" @@ -117,8 +117,8 @@ follows="left|top" height="20" image_disabled="Tool_Create" - image_disabled_selected="tool_create_active.tga" - image_selected="tool_create_active.tga" + image_disabled_selected="Tool_Create" + image_selected="Tool_Create" image_unselected="Tool_Create" layout="topleft" left_pad="8" @@ -134,8 +134,8 @@ follows="left|top" height="20" image_disabled="Tool_Dozer" - image_disabled_selected="tool_dozer_active.tga" - image_selected="tool_dozer_active.tga" + image_disabled_selected="Tool_Dozer" + image_selected="Tool_Dozer" image_unselected="Tool_Dozer" layout="topleft" left_pad="8" @@ -148,6 +148,9 @@ parameter="Land" /> </button> <text + height="30" + word_wrap="true" + use_ellipses="true" type="string" text_color="LabelSelectedDisabledColor" length="1" @@ -156,7 +159,7 @@ left="8" name="text status" top_pad="3" - width="280"> + width="275"> Drag to move, shift-drag to copy </text> <radio_group @@ -177,7 +180,7 @@ name="radio orbit" /> <radio_item top_pad="6" - label="Pan (Ctrl-Shift)" + label="Pan (Ctrl+Shift)" layout="topleft" name="radio pan" /> <radio_group.commit_callback @@ -215,7 +218,7 @@ name="radio lift" /> <radio_item top_pad="6" - label="Spin (Ctrl-Shift)" + label="Spin (Ctrl+Shift)" layout="topleft" name="radio spin" /> <radio_group.commit_callback @@ -239,7 +242,7 @@ name="radio rotate" /> <radio_item top_pad="6" - label="Stretch (Ctrl-Shift)" + label="Stretch (Ctrl+Shift)" layout="topleft" name="radio stretch" /> <radio_item @@ -251,39 +254,17 @@ function="BuildTool.commitRadioEdit"/> </radio_group> <check_box - left="10" + left="10" follows="left|top" + height="16" control_name="EditLinkedParts" label="Edit linked" layout="topleft" name="checkbox edit linked parts" > <check_box.commit_callback function="BuildTool.selectComponent"/> - </check_box> - <combo_box - height="19" - left="10" - layout="topleft" - follows="left|top" - top_pad="0" - name="combobox grid mode" - width="120"> - <combo_box.item - label="World ruler" - name="World" - value="World" /> - <combo_box.item - label="Local ruler" - name="Local" - value="Local" /> - <combo_box.item - label="Reference ruler" - name="Reference" - value="Reference" /> - <combo_box.commit_callback - function="BuildTool.gridMode"/> - </combo_box> - <check_box + </check_box> + <check_box control_name="ScaleUniform" height="19" label="Stretch Both Sides" @@ -301,26 +282,51 @@ name="checkbox stretch textures" top_pad="0" width="134" /> - <check_box + <check_box control_name="SnapEnabled" - height="19" + height="20" initial_value="true" - label="Snap to Grid" + label="Snap to grid" layout="topleft" - name="checkbox snap to grid" top_pad="0" + name="checkbox snap to grid" width="134" /> - <button - left="163" - top_pad="0" - image_overlay="Arrow_Right_Off" + <combo_box + height="20" + layout="topleft" + follows="left|top" + top_pad="4" + name="combobox grid mode" + width="108"> + <combo_box.item + label="World grid" + name="World" + value="World" /> + <combo_box.item + label="Local grid" + name="Local" + value="Local" /> + <combo_box.item + label="Reference grid" + name="Reference" + value="Reference" /> + <combo_box.commit_callback + function="BuildTool.gridMode"/> + </combo_box> + <button + left_pad="0" + right="-12" + image_disabled="ForwardArrow_Disabled" + image_selected="ForwardArrow_Press" + image_unselected="ForwardArrow_Off" picture_style="true" label_selected="Options" layout="topleft" name="Options..." - tool_tip="Set the Grid Options" - width="26" - height="22" > + tool_tip="Grid Options" + top_delta="0" + width="18" + height="18" > <button.commit_callback function="BuildTool.gridOptions"/> </button> @@ -328,8 +334,8 @@ follows="left|top" height="20" image_disabled="Object_Cube" - image_disabled_selected="object_cube_active.tga" - image_selected="object_cube_active.tga" + image_disabled_selected="Object_Cube" + image_selected="Object_Cube" image_unselected="Object_Cube" layout="topleft" left="4" @@ -342,8 +348,8 @@ follows="left|top" height="20" image_disabled="Object_Prism" - image_disabled_selected="object_prism_active.tga" - image_selected="object_prism_active.tga" + image_disabled_selected="Object_Prism" + image_selected="Object_Prism" image_unselected="Object_Prism" layout="topleft" left_delta="26" @@ -384,8 +390,8 @@ follows="left|top" height="20" image_disabled="Object_Cylinder" - image_disabled_selected="object_cylinder_active.tga" - image_selected="object_cylinder_active.tga" + image_disabled_selected="Object_Cylinder" + image_selected="Object_Cylinder" image_unselected="Object_Cylinder" layout="topleft" left_delta="26" @@ -398,8 +404,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Cylinder" - image_disabled_selected="object_hemi_cylinder_active.tga" - image_selected="object_hemi_cylinder_active.tga" + image_disabled_selected="Object_Hemi_Cylinder" + image_selected="Object_Hemi_Cylinder" image_unselected="Object_Hemi_Cylinder" layout="topleft" left_delta="26" @@ -412,8 +418,8 @@ follows="left|top" height="20" image_disabled="Object_Cone" - image_disabled_selected="object_cone_active.tga" - image_selected="object_cone_active.tga" + image_disabled_selected="Object_Cone" + image_selected="Object_Cone" image_unselected="Object_Cone" layout="topleft" left_delta="26" @@ -426,8 +432,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Cone" - image_disabled_selected="object_hemi_cone_active.tga" - image_selected="object_hemi_cone_active.tga" + image_disabled_selected="Object_Hemi_Cone" + image_selected="Object_Hemi_Cone" image_unselected="Object_Hemi_Cone" layout="topleft" left_delta="26" @@ -440,8 +446,8 @@ follows="left|top" height="20" image_disabled="Object_Sphere" - image_disabled_selected="object_sphere_active.tga" - image_selected="object_sphere_active.tga" + image_disabled_selected="Object_Sphere" + image_selected="Object_Sphere" image_unselected="Object_Sphere" layout="topleft" left_delta="26" @@ -454,8 +460,8 @@ follows="left|top" height="20" image_disabled="Object_Hemi_Sphere" - image_disabled_selected="object_hemi_sphere_active.tga" - image_selected="object_hemi_sphere_active.tga" + image_disabled_selected="Object_Hemi_Sphere" + image_selected="Object_Hemi_Sphere" image_unselected="Object_Hemi_Sphere" layout="topleft" left_delta="26" @@ -468,8 +474,8 @@ follows="left|top" height="20" image_disabled="Object_Torus" - image_disabled_selected="object_torus_active.tga" - image_selected="object_torus_active.tga" + image_disabled_selected="Object_Torus" + image_selected="Object_Torus" image_unselected="Object_Torus" layout="topleft" left="4" @@ -482,8 +488,8 @@ follows="left|top" height="20" image_disabled="Object_Tube" - image_disabled_selected="object_tube_active.tga" - image_selected="object_tube_active.tga" + image_disabled_selected="Object_Tube" + image_selected="Object_Tube" image_unselected="Object_Tube" layout="topleft" left_delta="26" @@ -496,8 +502,8 @@ follows="left|top" height="20" image_disabled="Object_Ring" - image_disabled_selected="object_ring_active.tga" - image_selected="object_ring_active.tga" + image_disabled_selected="Object_Ring" + image_selected="Object_Ring" image_unselected="Object_Ring" layout="topleft" left_delta="26" @@ -510,8 +516,8 @@ follows="left|top" height="20" image_disabled="Object_Tree" - image_disabled_selected="object_tree_active.tga" - image_selected="object_tree_active.tga" + image_disabled_selected="Object_Tree" + image_selected="Object_Tree" image_unselected="Object_Tree" layout="topleft" left_delta="26" @@ -524,8 +530,8 @@ follows="left|top" height="20" image_disabled="Object_Grass" - image_disabled_selected="object_grass_active.tga" - image_selected="object_grass_active.tga" + image_disabled_selected="Object_Grass" + image_selected="Object_Grass" image_unselected="Object_Grass" layout="topleft" left_delta="26" @@ -716,25 +722,24 @@ </button> <text type="string" - text_color="LabelSelectedDisabledColor" length="1" - top_pad="4" height="12" follows="left|top" halign="right" layout="topleft" - left="115" + right="-13" name="obj_count" + top_pad="8" width="143"> Objects: [COUNT] </text> <text type="string" - text_color="LabelSelectedDisabledColor" length="1" follows="left|top" halign="right" layout="topleft" + right="-13" name="prim_count" width="143"> Prims: [COUNT] @@ -756,6 +761,7 @@ label="General" layout="topleft" mouse_opaque="false" + help_topic="toolbox_general_tab" name="General" top="16"> <panel.string @@ -827,7 +833,7 @@ name="Object Name" select_on_focus="true" top_delta="0" - width="165" /> + width="170" /> <text type="string" length="1" @@ -849,7 +855,7 @@ name="Object Description" select_on_focus="true" top_delta="0" - width="165" /> + width="170" /> <text type="string" left="10" @@ -884,7 +890,7 @@ width="90"> Owner: </text> -<!--TODO: add person inspector to creator name--> +<!--TODO: add person inspector to owner name--> <text type="string" length="1" @@ -902,41 +908,48 @@ follows="left|top" layout="topleft" left="10" - height="19" + height="18" name="Group:" - width="70"> + top_pad="5" + width="75"> Group: </text> + <button + follows="top|left" + height="10" + image_disabled="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + image_color="White_50" + layout="topleft" + left_pad="0" + top_delta="2" + name="button set group" + picture_style="true" + tab_stop="false" + tool_tip="Choose a group to share this object's permissions" + width="10" /> <name_box follows="left|top" - height="19" + height="18" initial_value="Loading..." layout="topleft" - left_pad="0" + left_pad="4" + top_delta="-1" name="Group Name Proxy" - width="159" /> - <button - follows="left|top" - left_pad="0" - image_overlay="Arrow_Right_Off" - picture_style="true" - layout="topleft" - name="button set group" - tool_tip="Choose a group to share this object's permissions" - width="26" - height="22" /> + width="150" /> <button follows="top|left" font="SansSerifSmall" - height="19" + height="20" label="Deed" label_selected="Deed" layout="topleft" name="button deed" top_pad="0" - left="80" + left="83" tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer." - width="90" /> + width="100" /> <check_box height="19" follows="left|top" @@ -944,8 +957,8 @@ layout="topleft" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." - left_pad="5" - width="93" /> + left_pad="3" + width="100" /> <text type="string" length="1" @@ -960,10 +973,10 @@ </text> <combo_box follows="left|top" - height="22" + height="20" layout="topleft" name="clickaction" - width="155" + width="158" left_pad="0"> <combo_box.item label="Touch (default)" @@ -1000,12 +1013,12 @@ layout="topleft" follows="left|top" allow_text_entry="false" - height="22" - width="155" + height="20" + intial_value="2" max_chars="20" mouse_opaque="true" name="sale type" - intial_value="2"> + width="158"> <combo_box.item name="Copy" label="Copy" @@ -1024,21 +1037,23 @@ follows="left|top" decimal_digits="0" increment="1" - top_pad="10" + top_pad="8" + left="100" control_name="Edit Cost" name="Edit Cost" label="Price: L$" - label_width="60" - width="155" + label_width="70" + width="168" min_val="1" - height="19" + height="20" max_val="999999999" /> <check_box - left="107" height="15" width="100" + top_pad="3" label="Show in search" layout="topleft" + left="100" name="search_check" tool_tip="Let people see this object in search results" /> @@ -1090,13 +1105,6 @@ left_pad="0" name="checkbox allow everyone copy" width="90" /> - <check_box - height="19" - label="Use" - layout="topleft" - left_pad="0" - name="allow everyone to use" - width="90" /> <text type="string" follows="left|top" @@ -1133,78 +1141,78 @@ width="90" /> <text type="string" - text_color="EmphasisColor_35" + text_color="EmphasisColor" length="1" top_pad="5" follows="left|top" layout="topleft" - left="18" + left="10" name="B:" height="10" - width="30"> + width="45"> B: </text> <text type="string" - text_color="EmphasisColor_35" + text_color="White" length="1" follows="left|top" layout="topleft" left_pad="0" name="O:" height="10" - width="30"> + width="44"> O: </text> <text type="string" - text_color="EmphasisColor_35" + text_color="EmphasisColor" length="1" follows="left|top" layout="topleft" left_pad="0" name="G:" height="10" - width="30"> + width="43"> G: </text> <text type="string" - text_color="EmphasisColor_35" + text_color="White" length="1" follows="left|top" left_pad="0" layout="topleft" name="E:" height="10" - width="30"> + width="43"> E: </text> <text type="string" - text_color="EmphasisColor_35" + text_color="EmphasisColor" length="1" follows="left|top" layout="topleft" left_pad="0" name="N:" height="10" - width="30"> + width="48"> N: </text> <text type="string" - text_color="EmphasisColor_35" + text_color="White" length="1" follows="left|top" layout="topleft" left_pad="0" name="F:" height="10" - width="30"> + width="50"> F: </text> - </panel> + </panel> </panel> <panel border="false" @@ -1214,6 +1222,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_object_tab" name="Object" top="16" width="280"> @@ -2002,6 +2011,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_features_tab" name="Features" top_delta="0" width="280"> @@ -2169,18 +2179,18 @@ name="colorswatch" tool_tip="Click to open Color Picker" width="40" /> - <texture_picker - allow_no_texture="true" - top_delta="0" + <texture_picker + allow_no_texture="true" + top_delta="0" can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="48" + default_image_name="Default" + follows="left|top" + height="48" label="" - left_delta="57" - mouse_opaque="true" + left_delta="57" + mouse_opaque="true" name="light texture control" - tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" + tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" width="32" /> <spinner follows="left|top" @@ -2239,6 +2249,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_texture_tab" name="Texture" top_delta="0" width="280"> @@ -2484,7 +2495,7 @@ name="weave" value="weave" /> </combo_box> - <!-- + <!-- <line_editor bevel_style="in" border_style="line" @@ -2517,7 +2528,7 @@ name="media info set" top_delta="-4" width="120" /> ---> +--> <text type="string" length="1" @@ -2570,16 +2581,16 @@ name="checkbox flip t" top_delta="0" width="70" /> - + <spinner decimal_digits="2" follows="left|top" height="19" increment="1" initial_value="0" - label="Rotation (degrees)" + label="Rotation (degrees)" layout="topleft" - label_width="100" + label_width="100" left="10" max_val="9999" min_val="-9999" @@ -2682,7 +2693,7 @@ name="media_tex" width="100"> Media: - </text> + </text> <line_editor follows="left|top|right" height="18" @@ -2735,7 +2746,7 @@ left_delta="190"> <button.commit_callback function="BuildTool.EditMedia"/> - </button> + </button> </panel> <panel border="false" @@ -2744,6 +2755,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_contents_tab" name="Contents" top_delta="0" width="280"> @@ -2822,7 +2834,7 @@ </text> <button follows="left|top" - height="22" + height="20" label="Land profile" label_selected="Land profile" layout="topleft" @@ -2837,17 +2849,18 @@ layout="topleft" left_delta="0" name="checkbox show owners" - tool_tip="Colorize the parcels according to the type of owner" + tool_tip="Colorize the parcels according to the type of owner: Green = Your land Aqua = Your group's land Red = Owned by others Yellow = For sale Purple = For auction Grey = Public" top_pad="8" width="205" /> - <button + <!--TODO: HOOK UP TO HELP VIEWER--> + <!-- <button image_overlay="Arrow_Right_Off" picture_style="true" left_pad="5" name="button show owners help" tool_tip="See an explanation of colors" width="26" - height="22" /> + height="22" />--> <text type="string" length="1" @@ -2863,7 +2876,7 @@ </text> <button follows="left|top" - height="22" + height="20" label="Subdivide" label_selected="Subdivide" layout="topleft" @@ -2873,7 +2886,7 @@ width="112" /> <button follows="left|top" - height="22" + height="20" label="Join" label_selected="Join" layout="topleft" @@ -2896,7 +2909,7 @@ </text> <button follows="left|top" - height="22" + height="20" label="Buy Land" label_selected="Buy Land" layout="topleft" @@ -2906,7 +2919,7 @@ width="112" /> <button follows="left|top" - height="19" + height="20" label="Abandon Land" label_selected="Abandon Land" layout="topleft" @@ -2914,5 +2927,5 @@ name="button abandon land" top_pad="4" width="112" /> - </panel> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 4ed6787f53..acd770cd38 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -102,7 +102,6 @@ top_delta="0" width="85" /> <button - enabled="false" follows="right|top" height="25" is_toggle="true" @@ -171,6 +170,15 @@ name="export_schema" top_delta="0" width="120" /> + <check_box + follows="left|top" + label="Show Rectangles" + name="show_rectangles" + left_pad="10" + top_delta="0" + height="25" + width="120" /> + <scroll_list bottom="525" column_padding="0" @@ -347,14 +355,22 @@ </panel> <scroll_container follows="top|right|bottom" - height="637" + height="600" layout="topleft" - left_delta="550" + left="750" name="overlap_scroll" reserve_scroll_corner="true" - top_delta="2" + top="20" width="300"> - <panel + <panel + border="true" + name="overlap_dummy_panel" + top="0" + left="0" + width="300" + height="600" + > + <overlap_panel background_opaque="true" background_visible="true" bevel_style="in" @@ -362,14 +378,14 @@ bg_opaque_color="1 1 1 1" border="true" follows="top|right|bottom" - height="637" + height="600" label="Overlap Panel" layout="topleft" - left_delta="0" + left="0" min_width="300" name="overlap_panel" tool_tip="This panel displays the currently-selected element and all of the elements that overlap it, separated by horizontal lines" - top="-607" + top="0" visible="false" width="300" /> <text @@ -380,12 +396,11 @@ height="30" layout="topleft" left="10" - left_delta="10" name="overlap_panel_label" - right="-50" - top="0" + top="10" width="150"> Overlapping Elements: </text> + </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index febfd1929e..6206ea29c2 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -75,6 +75,7 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="water_settings_tab" name="Settings" top="60" width="698"> @@ -465,6 +466,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="water_waves_tab" name="Waves" top_delta="44" width="698"> diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 872bd704d5..2b3bc5f11a 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -84,6 +84,7 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="windlight_atmosphere_tab" name="Atmosphere" top="60" width="698"> @@ -519,6 +520,7 @@ label="Lighting" layout="topleft" left_delta="0" + help_topic="windlight_lighting_tab" name="Lighting" top_delta="4" width="698"> @@ -978,6 +980,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="windlight_clouds_tab" name="Clouds" top_delta="4" width="698"> 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 bd76b10312..8f88366842 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -30,6 +30,7 @@ label="Objects" layout="topleft" left="1" + help_topic="worldmap_objects_tab" name="objects_mapview" top="19" width="540" /> @@ -40,6 +41,7 @@ label="Terrain" layout="topleft" left_delta="0" + help_topic="worldmap_terrain_tab" name="terrain_mapview" top_delta="3" width="540" /> @@ -417,7 +419,8 @@ left_delta="0" name="search_results" top_pad="10" - width="222"> + width="222" + sort_column="1"> <scroll_list.columns label="" name="icon" diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index dec9839d1a..b261281c64 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -150,9 +150,11 @@ comment="Size of large font (points, or 1/72 of an inch)" size="10.0" /> + <!-- Changed Medium size to address menu font size not matching spec. + May want to revert/update after menu font configuration has been enabled. --> <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" - size="9.0" + size="8.0" /> <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 1af07c35be..a934e541da 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -148,4 +148,17 @@ right="-10" top="249" width="18" /> + <menu_button + visible="false" + follows="top|left" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + menu_filename="menu_inspect_self_gear.xml" + name="gear_self_btn" + picture_style="true" + right="-10" + top="249" + width="18" /> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index 97df28aa30..73a7bef77d 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -144,7 +144,7 @@ This is a really long description for an object being as how it is at least 80 c image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" image_unselected="OptionsMenu_Off" - menu_filename="menu_inspect_avatar_gear.xml" + menu_filename="menu_inspect_object_gear.xml" name="gear_btn" picture_style="true" right="-10" diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index e98920f8c2..a7abb223ba 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -31,7 +31,7 @@ parameter="ShowMoveButton" /> </menu_item_check> <menu_item_check - label="Camera button" + label="View button" layout="topleft" name="ShowCameraButton"> <menu_item_check.on_click @@ -41,4 +41,15 @@ function="CheckControl" parameter="ShowCameraButton" /> </menu_item_check> + <menu_item_check + label="Snapshot button" + layout="topleft" + name="ShowSnapshotButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowSnapshotButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowSnapshotButton" /> + </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index 951cf63c76..be380e11e5 100644 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml @@ -29,7 +29,7 @@ parameter="copy_slurl" /> </menu_item_call> <menu_item_call - label="Show On Map" + label="Show on Map" layout="topleft" name="Show On Map"> <menu_item_call.on_click @@ -55,6 +55,9 @@ <menu_item_call.on_click function="Favorites.DoToSelected" parameter="paste" /> + <menu_item_call.on_enable + function="Favorites.EnableSelected" + parameter="can_paste" /> </menu_item_call> <menu_item_separator diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml index 2029b19c1c..e83d07baec 100644 --- a/indra/newview/skins/default/xui/en/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> <menu_item_call name="item_join" label="Join Group..."> <menu_item_call.on_click function="People.Group.Plus.Action" userdata="join_group" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 9f5b7f3813..5279f9d141 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -99,10 +99,11 @@ function="InspectAvatar.VisibleFindOnMap"/>
</menu_item_call>
<menu_item_call
- enabled="false"
label="Zoom In"
layout="topleft"
name="zoom_in">
+ <menu_item_call.on_click
+ function="InspectAvatar.ZoomIn"/>
</menu_item_call>
<menu_item_call
label="Pay"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml index 1bba8eb264..93c53981f3 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml @@ -105,10 +105,11 @@ function="Object.VisibleMute" /> </menu_item_call> <menu_item_call - enabled="false" label="Zoom In" layout="topleft" name="zoom_in"> + <menu_item_call.on_click + function="InspectObject.ZoomIn" /> </menu_item_call> <menu_item_call label="Remove" diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml new file mode 100644 index 0000000000..240822e5ca --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu
+ create_jump_keys="true"
+ layout="topleft"
+ mouse_opaque="false"
+ visible="false"
+ name="Gear Menu">
+ <menu_item_call
+ label="Stand Up"
+ layout="topleft"
+ enabled="true"
+ name="stand_up">
+ <menu_item_call.on_click
+ function="Self.StandUp"
+ parameter="" />
+ <menu_item_call.on_visible
+ function="Self.VisibleStandUp" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Appearance"
+ layout="topleft"
+ name="my_appearance">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="appearance" />
+ <menu_item_call.on_enable
+ function="Edit.EnableCustomizeAvatar" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Profile"
+ layout="topleft"
+ enabled="true"
+ name="my_profile">
+ <menu_item_call.on_click
+ function="ShowAgentProfile"
+ parameter="agent" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Friends"
+ layout="topleft"
+ name="my_friends">
+ <menu_item_call.on_click
+ function="Self.Friends"
+ parameter="" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Groups"
+ layout="topleft"
+ name="my_groups">
+ <menu_item_call.on_click
+ function="Self.Groups" />
+ </menu_item_call>
+</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index d3a2b2c66b..8cb0a69906 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -178,7 +178,7 @@ </menu> <menu_item_separator /> <menu_item_call - label="Debug Settings editor" + label="Show Debug Settings" layout="topleft" name="Debug Settings"> <menu_item_call.on_click @@ -239,5 +239,12 @@ function="ShowFloater" parameter="message_critical" /> </menu_item_call> + <menu_item_call + label="Web Browser Test" + name="Web Browser Test"> + <menu_item_call.on_click + function="Advanced.WebBrowserTest" + parameter="http://join.secondlife.com/"/> + </menu_item_call> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 6ef1eb9513..3c7b6dad14 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> <menu_item_call name="sort_name" label="Sort by Name"> <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_name" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml index ec8582f5b5..2bec745410 100644 --- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> <menu_item_check label="Display Group Icons" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index 2b0f029016..f91a961388 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> <menu_item_call name="sort_recent" label="Sort by Recent Speakers"> <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_recent" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index d9606de90d..ed03cd467c 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> <menu_item_call name="sort_most" label="Sort by Most Recent"> <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml new file mode 100644 index 0000000000..6768d7fccb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + name="Teleport History Gear Context Menu" + left="0" + bottom="0" + visible="false" + mouse_opaque="false" + opaque="true" + color="MenuDefaultBgColor" + drop_shadow="true" > + <menu_item_call + label="Expand all folders" + name="Expand all folders"> + <menu_item_call.on_click + function="TeleportHistory.ExpandAllFolders" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + name="Collapse all folders"> + <menu_item_call.on_click + function="TeleportHistory.CollapseAllFolders" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call + label="Clear Teleport History" + name="Clear Teleport History"> + <menu_item_call.on_click + function="TeleportHistory.ClearTeleportHistory" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml index d9cba27b88..515278c23d 100644 --- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml @@ -23,11 +23,4 @@ <menu_item_call.on_click function="TeleportHistory.Copy" /> </menu_item_call> - <menu_item_call - label="Make Landmark" - layout="topleft" - name="Make Landmark"> - <menu_item_call.on_click - function="TeleportHistory.MakeLandmark" /> - </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml index 885ebbcd52..fa05dac148 100644 --- a/indra/newview/skins/default/xui/en/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml @@ -12,14 +12,14 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy Name To Clipboard" + label="Copy Name to clipboard" layout="topleft" name="url_copy_label"> <menu_item_call.on_click function="Url.CopyLabel" /> </menu_item_call> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml index 68da7a0ced..c5eaf94d22 100644 --- a/indra/newview/skins/default/xui/en/menu_url_group.xml +++ b/indra/newview/skins/default/xui/en/menu_url_group.xml @@ -12,14 +12,14 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy Group To Clipboard" + label="Copy Group to clipboard" layout="topleft" name="url_copy_label"> <menu_item_call.on_click function="Url.CopyLabel" /> </menu_item_call> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml index 2503b4a2a3..7a4b1e619b 100644 --- a/indra/newview/skins/default/xui/en/menu_url_http.xml +++ b/indra/newview/skins/default/xui/en/menu_url_http.xml @@ -28,7 +28,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy URL To Clipboard" + label="Copy URL to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml index d7106da177..6f7e659f48 100644 --- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml @@ -21,14 +21,14 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy Object Name To Clipboard" + label="Copy Object Name to clipboard" layout="topleft" name="url_copy_label"> <menu_item_call.on_click function="Url.CopyLabel" /> </menu_item_call> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml index cbeb1f8e51..3804f7f780 100644 --- a/indra/newview/skins/default/xui/en/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml @@ -12,7 +12,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml index 3eeef0f47e..6d1060b633 100644 --- a/indra/newview/skins/default/xui/en/menu_url_slapp.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml @@ -12,7 +12,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml index 933f8a4484..58714f1f42 100644 --- a/indra/newview/skins/default/xui/en/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml @@ -21,7 +21,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml index 62c7a2f5a9..ff52d7e109 100644 --- a/indra/newview/skins/default/xui/en/menu_url_teleport.xml +++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml @@ -3,7 +3,7 @@ layout="topleft" name="Url Popup"> <menu_item_call - label="Teleport To This Location" + label="Teleport to this Location" layout="topleft" name="teleport"> <menu_item_call.on_click @@ -12,7 +12,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Copy SLurl To Clipboard" + label="Copy SLurl to clipboard" layout="topleft" name="url_copy"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b0839ce255..93a0b917f9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -18,23 +18,7 @@ function="Floater.Show" parameter="preferences" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - label="My Account" - layout="topleft" - name="My Account" - tear_off="true"> - <menu_item_call - label="Account History" - layout="topleft" - name="Account History"> - <menu_item_call.on_click - function="PromptShowURL" - name="AccountHistory_url" - parameter="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" /> - </menu_item_call> - <menu_item_call + <menu_item_call label="Manage My Account" layout="topleft" name="Manage My Account"> @@ -42,28 +26,7 @@ function="PromptShowURL" name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="My Land" - layout="topleft" - name="My Land"> - <menu_item_call.on_click - function="ShowFloater" - parameter="land_holdings" /> - </menu_item_call> - <menu_item_call - label="Buy Land" - layout="topleft" - name="Buy Land"> - <menu_item_call.on_click - function="ShowFloater" - parameter="buy land" /> - <menu_item_call.on_enable - function="World.EnableBuyLand" /> - </menu_item_call> - </menu> + </menu_item_call> <menu_item_call label="Buy L$" layout="topleft" @@ -113,15 +76,13 @@ function="ShowFloater" parameter="gestures" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> <menu - label="Status" + label="My Status" layout="topleft" name="Status" tear_off="true"> <menu_item_call - label="Set Away" + label="Away" layout="topleft" name="Set Away"> <menu_item_call.on_click @@ -130,7 +91,7 @@ <menu_item_separator layout="topleft"/> <menu_item_call - label="Set Busy" + label="Busy" layout="topleft" name="Set Busy"> <menu_item_call.on_click @@ -183,7 +144,7 @@ function="World.Chat" /> </menu_item_call--> <menu_item_check - label="Local Chat" + label="Nearby Chat" layout="topleft" name="Nearby Chat" shortcut="control|H"> @@ -246,32 +207,32 @@ layout="topleft" name="World" tear_off="true"> - <menu_item_check - label="Camera Controls" + <menu_item_check + label="Move" layout="topleft" - name="Camera Controls"> + name="Movement Controls"> <menu_item_check.on_check function="Floater.Visible" - parameter="camera" /> + parameter="moveview" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="camera" /> + parameter="moveview" /> </menu_item_check> <menu_item_check - label="Movement Controls" + label="View" layout="topleft" - name="Movement Controls"> + name="Camera Controls"> <menu_item_check.on_check function="Floater.Visible" - parameter="moveview" /> + parameter="camera" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="moveview" /> + parameter="camera" /> </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call - label="Place Information" + label="Place Profile" layout="topleft" name="About Land"> <menu_item_call.on_click @@ -286,14 +247,32 @@ function="Floater.Show" parameter="region_info" /> </menu_item_call> + <menu_item_call + label="Buy Land" + layout="topleft" + name="Buy Land"> + <menu_item_call.on_click + function="ShowFloater" + parameter="buy land" /> + <menu_item_call.on_enable + function="World.EnableBuyLand" /> + </menu_item_call> + <menu_item_call + label="My Land" + layout="topleft" + name="My Land"> + <menu_item_call.on_click + function="ShowFloater" + parameter="land_holdings" /> + </menu_item_call> <menu create_jump_keys="true" - label="Land Options" + label="Show" layout="topleft" name="Land" tear_off="true"> <menu_item_check - label="Show Property Lines" + label="Property Lines" layout="topleft" name="Property Lines" shortcut="control|alt|shift|P"> @@ -304,7 +283,7 @@ parameter="ShowPropertyLines" /> </menu_item_check> <menu_item_check - label="Show Land Owners" + label="Land Owners" layout="topleft" name="Land Owners"> <menu_item_check.on_check @@ -314,7 +293,7 @@ parameter="ShowParcelOwners" /> </menu_item_check> <menu_item_check - label="Show Ban Lines" + label="Ban Lines" layout="topleft" name="Ban Lines"> <menu_item_check.on_check @@ -360,19 +339,7 @@ function="World.EnableTeleportHome" /> </menu_item_call> </menu> - <menu_item_check - label="World Map" - layout="topleft" - name="World Map" - shortcut="control|M"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="world_map" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="world_map" /> - </menu_item_check> - <menu_item_check + <menu_item_check label="Mini-Map" layout="topleft" name="Mini-Map" @@ -384,34 +351,45 @@ function="Floater.Toggle" parameter="mini_map" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_check + <menu_item_check + label="World Map" + layout="topleft" + name="World Map" + shortcut="control|M" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="world_map" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="world_map" /> + </menu_item_check> + <!-- <menu_item_check label="Show Navigation Bar" layout="topleft" name="ShowNavbarNavigationPanel"> <menu_item_check.on_click function="ToggleControl" - parameter="ShowNavbarNavigationPanel" /> + parameter="ShowNavbarNavigationPanel" /> <menu_item_check.on_check function="CheckControl" parameter="ShowNavbarNavigationPanel" /> - </menu_item_check> - <menu_item_check + </menu_item_check> + <menu_item_check label="Show Favorites Bar" layout="topleft" name="ShowNavbarFavoritesPanel"> <menu_item_check.on_click function="ToggleControl" - parameter="ShowNavbarFavoritesPanel" /> + parameter="ShowNavbarFavoritesPanel" /> <menu_item_check.on_check function="CheckControl" parameter="ShowNavbarFavoritesPanel" /> - </menu_item_check> + </menu_item_check> <menu_item_separator - layout="topleft" /> + layout="topleft" />--> <menu_item_call - label="Take Snapshot" + label="Snapshot" layout="topleft" name="Take Snapshot" shortcut="control|shift|S"> @@ -419,11 +397,9 @@ function="Floater.Show" parameter="snapshot" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> <menu create_jump_keys="true" - label="Sun Settings" + label="Sun" layout="topleft" name="Environment Settings" tear_off="true"> @@ -462,7 +438,7 @@ parameter="midnight" /> </menu_item_call> <menu_item_call - label="Use region settings" + label="Use the Estate Time" layout="topleft" name="Revert to Region Default"> <menu_item_call.on_click @@ -489,7 +465,7 @@ tear_off="true" visible="true"> <menu_item_check - label="Show Build Tools" + label="Build" layout="topleft" name="Show Build Tools" shortcut="control|B"> @@ -825,12 +801,23 @@ function="Tools.EnableToolNotPie" /> </menu_item_check> <menu_item_call - label="Set Default Permissions" + label="Set Default Upload Permissions" layout="topleft" name="perm prefs"> <menu_item_call.on_click function="Floater.Toggle" parameter="perm_prefs" /> + <menu_item_check + label="Show Advanced Permissions" + layout="topleft" + name="DebugPermissions"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugPermissions" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugPermissions" /> + </menu_item_check> </menu_item_call> <!--menu_item_call label="Show Script Warning/Error Window" @@ -995,6 +982,57 @@ </menu_item_check> </menu> </menu> + <menu + create_jump_keys="true" + label="Select Linked Parts" + layout="topleft" + name="Select Linked Parts" + tear_off="true"> + <menu_item_call + label="Select Next Part" + layout="topleft" + name="Select Next Part" + shortcut="control|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="next" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Select Previous Part" + layout="topleft" + name="Select Previous Part" + shortcut="control|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="previous" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Next Part" + layout="topleft" + name="Include Next Part" + shortcut="control|shift|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includenext" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Previous Part" + layout="topleft" + name="Include Previous Part" + shortcut="control|shift|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includeprevious" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + </menu> </menu> <menu label="Help" @@ -1018,19 +1056,10 @@ function="Floater.Show" parameter="hud" /> </menu_item_call> - <menu_item_check - label="Show Quick Tips" - layout="topleft" - name="Show Quick Tips"> - <menu_item_check.on_check - function="Help.CheckShowFirstTimeTip" /> - <menu_item_check.on_click - function="Help.ShowQuickTips" /> - </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call - label="Report Abuse..." + label="Report Abuse" layout="topleft" name="Report Abuse"> <menu_item_call.on_click @@ -1054,233 +1083,8 @@ name="Advanced" tear_off="true" visible="false"> - <menu - label="Shortcuts" - layout="topleft" - name="Shortcuts" - tear_off="true" - visible="false"> - <menu_item_check - label="Search" - layout="topleft" - name="Search" - shortcut="control|F"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="search" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="search" /> - </menu_item_check> - <menu_item_call - enabled="false" - label="Release Keys" - layout="topleft" - name="Release Keys"> - <menu_item_call.on_click - function="Tools.ReleaseKeys" - parameter="" /> - <menu_item_call.on_enable - function="Tools.EnableReleaseKeys" - parameter="" /> - </menu_item_call> - <menu_item_call - label="Set UI Size to Default" - layout="topleft" - name="Set UI Size to Default"> - <menu_item_call.on_click - function="View.DefaultUISize" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Always Run" - layout="topleft" - name="Always Run" - shortcut="control|R"> - <menu_item_check.on_check - function="World.CheckAlwaysRun" /> - <menu_item_check.on_click - function="World.AlwaysRun" /> - </menu_item_check> - <menu_item_check - label="Fly" - layout="topleft" - name="Fly" - shortcut="Home"> - <menu_item_check.on_click - function="Agent.toggleFlying" /> - <menu_item_check.on_enable - function="Agent.enableFlying" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Close Window" - layout="topleft" - name="Close Window" - shortcut="control|W"> - <menu_item_call.on_click - function="File.CloseWindow" /> - <menu_item_call.on_enable - function="File.EnableCloseWindow" /> - </menu_item_call> - <menu_item_call - label="Close All Windows" - layout="topleft" - name="Close All Windows" - shortcut="control|shift|W"> - <menu_item_call.on_click - function="File.CloseAllWindows" /> - <menu_item_call.on_enable - function="File.EnableCloseAllWindows" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Snapshot to Disk" - layout="topleft" - name="Snapshot to Disk" - shortcut="control|`" - use_mac_ctrl="true"> - <menu_item_call.on_click - function="File.TakeSnapshotToDisk" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Mouselook" - layout="topleft" - name="Mouselook" - shortcut="M"> - <menu_item_call.on_click - function="View.Mouselook" /> - <menu_item_call.on_enable - function="View.EnableMouselook" /> - </menu_item_call> - <menu_item_check - label="Joystick Flycam" - layout="topleft" - name="Joystick Flycam" - shortcut="alt|shift|F"> - <menu_item_check.on_check - function="View.CheckJoystickFlycam" /> - <menu_item_check.on_click - function="View.JoystickFlycam" /> - <menu_item_check.on_enable - function="View.EnableJoystickFlycam" /> - </menu_item_check> - <menu_item_call - label="Reset View" - layout="topleft" - name="Reset View" - shortcut="Esc"> - <menu_item_call.on_click - function="View.ResetView" /> - </menu_item_call> - <menu_item_call - label="Look at Last Chatter" - layout="topleft" - name="Look at Last Chatter" - shortcut="control|\"> - <menu_item_call.on_click - function="View.LookAtLastChatter" /> - <menu_item_call.on_enable - function="View.EnableLastChatter" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Select Tool" - layout="topleft" - name="Select Tool" - tear_off="true"> - <menu_item_call - label="Focus" - layout="topleft" - name="Focus" - shortcut="control|1"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="focus" /> - </menu_item_call> - <menu_item_call - label="Move" - layout="topleft" - name="Move" - shortcut="control|2"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="move" /> - </menu_item_call> - <menu_item_call - label="Edit" - layout="topleft" - name="Edit" - shortcut="control|3"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Create" - layout="topleft" - name="Create" - shortcut="control|4"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="create" /> - </menu_item_call> - <menu_item_call - label="Land" - layout="topleft" - name="Land" - shortcut="control|5"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="land" /> - </menu_item_call> - </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Zoom In" - layout="topleft" - name="Zoom In" - shortcut="control|0"> - <menu_item_call.on_click - function="View.ZoomIn" /> - </menu_item_call> - <menu_item_call - label="Zoom Default" - layout="topleft" - name="Zoom Default" - shortcut="control|9"> - <menu_item_call.on_click - function="View.ZoomDefault" /> - </menu_item_call> - <menu_item_call - label="Zoom Out" - layout="topleft" - name="Zoom Out" - shortcut="control|8"> - <menu_item_call.on_click - function="View.ZoomOut" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Toggle Fullscreen" - layout="topleft" - name="Toggle Fullscreen" - shortcut="alt|Enter"> - <menu_item_call.on_click - function="View.Fullscreen" /> - </menu_item_call> - </menu> <menu_item_check - label="Go Away/AFK When Idle" + label="Set Away After 30 Minutes" layout="topleft" name="Go Away/AFK When Idle"> <menu_item_check.on_check @@ -1291,14 +1095,14 @@ parameter="AllowIdleAFK" /> </menu_item_check> <menu_item_call - label="Stop Animating My Avatar" + label="Stop Animating Me" layout="topleft" name="Stop Animating My Avatar"> <menu_item_call.on_click function="Tools.StopAllAnimations" /> </menu_item_call> <menu_item_call - label="Rebake Texture" + label="Rebake Textures" layout="topleft" name="Rebake Texture" shortcut="control|alt|R"> @@ -1363,7 +1167,7 @@ parameter="CompressSnapshotsToDisk" /> </menu_item_check> <menu_item_call - label="Save Texture As..." + label="Save Texture As" layout="topleft" name="Save Texture As"> <menu_item_call.on_click @@ -1399,6 +1203,17 @@ function="Floater.Toggle" parameter="stats" /> </menu_item_check> + <menu_item_check + label="Show Avatar Rendering Cost" + layout="topleft" + name="Avatar Rendering Cost"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="shame" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="shame" /> + </menu_item_check> </menu> <menu create_jump_keys="true" @@ -1407,16 +1222,6 @@ name="Highlighting and Visibility" tear_off="true"> <menu_item_check - label="Highlight Transparent" - layout="topleft" - name="Highlight Transparent" - shortcut="control|alt|T"> - <menu_item_check.on_check - function="View.CheckHighlightTransparent" /> - <menu_item_check.on_click - function="View.HighlightTransparent" /> - </menu_item_check> - <menu_item_check label="Hide Particles" layout="topleft" name="Hide Particles" @@ -1429,16 +1234,6 @@ parameter="hideparticles" /> </menu_item_check> <menu_item_check - label="Show HUD Attachments" - layout="topleft" - name="Show HUD Attachments" - shortcut="alt|shift|H"> - <menu_item_check.on_check - function="View.CheckHUDAttachments" /> - <menu_item_check.on_click - function="View.ShowHUDAttachments" /> - </menu_item_check> - <menu_item_check label="Hide Selected" layout="topleft" name="Hide Selected"> @@ -1450,6 +1245,26 @@ parameter="HideSelectedObjects" /> </menu_item_check> <menu_item_check + label="Highlight Transparent" + layout="topleft" + name="Highlight Transparent" + shortcut="control|alt|T"> + <menu_item_check.on_check + function="View.CheckHighlightTransparent" /> + <menu_item_check.on_click + function="View.HighlightTransparent" /> + </menu_item_check> + <menu_item_check + label="Show HUD Attachments" + layout="topleft" + name="Show HUD Attachments" + shortcut="alt|shift|H"> + <menu_item_check.on_check + function="View.CheckHUDAttachments" /> + <menu_item_check.on_click + function="View.ShowHUDAttachments" /> + </menu_item_check> + <menu_item_check label="Show Mouselook Crosshairs" layout="topleft" name="ShowCrosshairs"> @@ -1460,8 +1275,7 @@ function="ToggleControl" parameter="ShowCrosshairs" /> </menu_item_check> - </menu> - <menu + <!-- <menu create_jump_keys="true" label="Hover Tips" layout="topleft" @@ -1478,9 +1292,9 @@ function="View.ShowHoverTips" /> </menu_item_check> <menu_item_separator - layout="topleft" /> + layout="topleft" />--> <menu_item_check - label="Land Tips" + label="Show Land Tooltips" layout="topleft" name="Land Tips"> <menu_item_check.on_check @@ -1491,8 +1305,8 @@ <menu_item_check.on_enable function="View.CheckShowHoverTips" /> </menu_item_check> - <menu_item_check - label="Tips On All Objects" + <!-- <menu_item_check + label="Show Tips On All Objects" layout="topleft" name="Tips On All Objects"> <menu_item_check.on_check @@ -1503,33 +1317,10 @@ <menu_item_check.on_enable function="View.CheckShowHoverTips" /> </menu_item_check> + </menu>--> + </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Run Multiple Threads" - layout="topleft" - name="Run Multiple Threads"> - <menu_item_check.on_check - function="CheckControl" - parameter="RunMultipleThreads" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RunMultipleThreads" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Avatar Rendering Cost" - layout="topleft" - name="Avatar Rendering Cost"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="shame" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="shame" /> - </menu_item_check> + <menu create_jump_keys="true" label="Rendering Types" @@ -1573,7 +1364,7 @@ parameter="tree" /> </menu_item_check> <menu_item_check - label="Character" + label="Avatars" layout="topleft" name="Character" shortcut="control|alt|shift|4"> @@ -1796,66 +1587,17 @@ parameter="flexible" /> </menu_item_check> </menu> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Recorder" - layout="topleft" - name="Recorder" - tear_off="true"> - <menu_item_call - label="Start Playback" - layout="topleft" - name="Start Playback"> - <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="start playback" /> - </menu_item_call> - <menu_item_call - label="Stop Playback" - layout="topleft" - name="Stop Playback"> - <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="stop playback" /> - </menu_item_call> - <menu_item_check - label="Loop Playback" - layout="topleft" - name="Loop Playback"> - <menu_item_check.on_check - function="Advanced.CheckAgentPilotLoop" - parameter="loopPlayback" /> - <menu_item_check.on_click - function="Advanced.ToggleAgentPilotLoop" /> - </menu_item_check> - <menu_item_call - label="Start Record" - layout="topleft" - name="Start Record"> - <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="start record" /> - </menu_item_call> - <menu_item_call - label="Stop Record" - layout="topleft" - name="Stop Record"> - <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="stop record" /> - </menu_item_call> - </menu> - <menu_item_call - label="Dump Scripted Camera" + <menu_item_check + label="Run Multiple Threads" layout="topleft" - name="Dump Scripted Camera"> - <menu_item_call.on_click - function="Advanced.DumpScriptedCamera" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> + name="Run Multiple Threads"> + <menu_item_check.on_check + function="CheckControl" + parameter="RunMultipleThreads" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RunMultipleThreads" /> + </menu_item_check> <menu_item_call label="Clear Group Cache" layout="topleft" @@ -1863,7 +1605,7 @@ <menu_item_call.on_click function="Advanced.ClearGroupCache" parameter="ClearGroupCache" /> - </menu_item_call> + </menu_item_call> <menu_item_check label="Mouse Smoothing" layout="topleft" @@ -1878,7 +1620,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Debug Settings editor" + label="Show Debug Settings" layout="topleft" name="Debug Settings"> <menu_item_call.on_click @@ -1886,7 +1628,7 @@ parameter="all" /> </menu_item_call> <menu_item_check - label="Activate Debug Mode (QA)" + label="Show Develop Menu" layout="topleft" name="Debug Mode" shortcut="control|alt|Q"> @@ -1900,9 +1642,9 @@ </menu> <menu create_jump_keys="true" - label="Debug" + label="Develop" layout="topleft" - name="Debug" + name="Develop" tear_off="true" visible="false"> <menu @@ -1915,7 +1657,8 @@ label="Texture Console" layout="topleft" name="Texture Console" - shortcut="control|shift|3"> + shortcut="control|shift|3" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="texture" /> @@ -1927,7 +1670,8 @@ label="Debug Console" layout="topleft" name="Debug Console" - shortcut="control|shift|4"> + shortcut="control|shift|4" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="debug" /> @@ -1939,7 +1683,8 @@ label="Fast Timers" layout="topleft" name="Fast Timers" - shortcut="control|shift|9"> + shortcut="control|shift|9" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="fast timers" /> @@ -1951,7 +1696,8 @@ label="Memory" layout="topleft" name="Memory" - shortcut="control|shift|0"> + shortcut="control|shift|0" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="memory view" /> @@ -1963,7 +1709,8 @@ label="Notifications Console" layout="topleft" name="Notifications" - shortcut="control|shift|5"> + shortcut="control|shift|5" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="notifications" /> @@ -1997,6 +1744,41 @@ function="Advanced.DumpInfoToConsole" parameter="capabilities" /> </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Camera" + layout="topleft" + name="Camera"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="camera" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="camera" /> + </menu_item_check> + <menu_item_check + label="Wind" + layout="topleft" + name="Wind"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="wind" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="wind" /> + </menu_item_check> + <menu_item_check + label="FOV" + layout="topleft" + name="FOV"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="fov" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="fov" /> + </menu_item_check> </menu> <menu create_jump_keys="true" @@ -2051,7 +1833,7 @@ <menu_item_separator layout="topleft" /> <menu_item_check - label="Show Updates to objects" + label="Show Updates to Objects" layout="topleft" name="Show Updates" shortcut="control|alt|shift|U"> @@ -2317,184 +2099,6 @@ parameter="raycast" /> </menu_item_check> </menu> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Network" - layout="topleft" - name="Network" - tear_off="true"> - <menu_item_check - label="Pause Agent" - layout="topleft" - name="AgentPause"> - <menu_item_check.on_check - function="CheckControl" - parameter="AgentPause" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="AgentPause" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Enable Message Log" - layout="topleft" - name="Enable Message Log"> - <menu_item_call.on_click - function="Advanced.EnableMessageLog" /> - </menu_item_call> - <menu_item_call - label="Disable Message Log" - layout="topleft" - name="Disable Message Log"> - <menu_item_call.on_click - function="Advanced.DisableMessageLog" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Velocity Interpolate Objects" - layout="topleft" - name="Velocity Interpolate Objects"> - <menu_item_check.on_check - function="CheckControl" - parameter="VelocityInterpolate" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="VelocityInterpolate" /> - </menu_item_check> - <menu_item_check - label="Ping Interpolate Object Positions" - layout="topleft" - name="Ping Interpolate Object Positions"> - <menu_item_check.on_check - function="CheckControl" - parameter="PingInterpolate" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="PingInterpolate" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Drop a Packet" - layout="topleft" - name="Drop a Packet" - shortcut="control|alt|L"> - <menu_item_call.on_click - function="Advanced.DropPacket" /> - </menu_item_call> - </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Bumps, Pushes & Hits..." - layout="topleft" - name="Bumps, Pushes &amp; Hits"> - <menu_item_call.on_click - function="Floater.Show" - parameter="bumps" /> - </menu_item_call> - <menu_item_check - label="Output Debug Minidump" - layout="topleft" - name="Output Debug Minidump"> - <menu_item_check.on_check - function="CheckControl" - parameter="SaveMinidump" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="SaveMinidump" /> - </menu_item_check> - <menu_item_check - label="Debug Permissions in Build Tool" - layout="topleft" - name="DebugPermissions"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugPermissions" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugPermissions" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="View Admin Options" - layout="topleft" - name="View Admin Options"> - <menu_item_check.on_check - function="Advanced.CheckViewAdminOptions" - parameter="ViewAdminOptions" /> - <menu_item_check.on_click - function="Advanced.ToggleViewAdminOptions" /> - </menu_item_check> - <menu_item_call - label="Request Admin Status" - layout="topleft" - name="Request Admin Options" - shortcut="control|alt|G"> - <menu_item_call.on_click - function="Advanced.RequestAdminStatus" /> - </menu_item_call> - <menu_item_call - label="Deactivate Admin Status" - layout="topleft" - name="Leave Admin Options" - shortcut="control|alt|shift|G"> - <menu_item_call.on_click - function="Advanced.LeaveAdminStatus" /> - </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="Develop" - layout="topleft" - name="Develop" - tear_off="true" - visible="false"> - <menu - create_jump_keys="true" - label="HUD Info" - layout="topleft" - name="HUD Info" - tear_off="true"> - <menu_item_check - label="Camera" - layout="topleft" - name="Camera"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="camera" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="camera" /> - </menu_item_check> - <menu_item_check - label="Wind" - layout="topleft" - name="Wind"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="wind" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="wind" /> - </menu_item_check> - <menu_item_check - label="FOV" - layout="topleft" - name="FOV"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="fov" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="fov" /> - </menu_item_check> - </menu> <menu create_jump_keys="true" label="Rendering" @@ -2587,9 +2191,7 @@ <menu_item_check.on_enable function="Advanced.EnableRenderDeferredGI" /> </menu_item_check> - <menu_item_separator /> - <menu_item_check label="Debug GL" name="Debug GL"> @@ -2679,6 +2281,367 @@ parameter="RenderHighlightEnable" /> </menu_item_check> </menu> + + <menu + create_jump_keys="true" + label="Network" + layout="topleft" + name="Network" + tear_off="true"> + <menu_item_check + label="Pause Agent" + layout="topleft" + name="AgentPause"> + <menu_item_check.on_check + function="CheckControl" + parameter="AgentPause" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AgentPause" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Enable Message Log" + layout="topleft" + name="Enable Message Log"> + <menu_item_call.on_click + function="Advanced.EnableMessageLog" /> + </menu_item_call> + <menu_item_call + label="Disable Message Log" + layout="topleft" + name="Disable Message Log"> + <menu_item_call.on_click + function="Advanced.DisableMessageLog" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Velocity Interpolate Objects" + layout="topleft" + name="Velocity Interpolate Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="VelocityInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="VelocityInterpolate" /> + </menu_item_check> + <menu_item_check + label="Ping Interpolate Object Positions" + layout="topleft" + name="Ping Interpolate Object Positions"> + <menu_item_check.on_check + function="CheckControl" + parameter="PingInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="PingInterpolate" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Drop a Packet" + layout="topleft" + name="Drop a Packet" + shortcut="control|alt|L"> + <menu_item_call.on_click + function="Advanced.DropPacket" /> + </menu_item_call> + </menu> + <menu_item_call + label="Dump Scripted Camera" + layout="topleft" + name="Dump Scripted Camera"> + <menu_item_call.on_click + function="Advanced.DumpScriptedCamera" /> + </menu_item_call> + <menu_item_call + label="Bumps, Pushes & Hits" + layout="topleft" + name="Bumps, Pushes &amp; Hits"> + <menu_item_call.on_click + function="Floater.Show" + parameter="bumps" /> + </menu_item_call> + + <menu + create_jump_keys="true" + label="Recorder" + layout="topleft" + name="Recorder" + tear_off="true"> + <menu_item_call + label="Start Playback" + layout="topleft" + name="Start Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start playback" /> + </menu_item_call> + <menu_item_call + label="Stop Playback" + layout="topleft" + name="Stop Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop playback" /> + </menu_item_call> + <menu_item_check + label="Loop Playback" + layout="topleft" + name="Loop Playback"> + <menu_item_check.on_check + function="Advanced.CheckAgentPilotLoop" + parameter="loopPlayback" /> + <menu_item_check.on_click + function="Advanced.ToggleAgentPilotLoop" /> + </menu_item_check> + <menu_item_call + label="Start Record" + layout="topleft" + name="Start Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start record" /> + </menu_item_call> + <menu_item_call + label="Stop Record" + layout="topleft" + name="Stop Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop record" /> + </menu_item_call> + </menu> + <menu + label="Shortcuts" + layout="topleft" + name="Shortcuts" + tear_off="true" + visible="false"> + <menu_item_check + label="Search" + layout="topleft" + name="Search" + shortcut="control|F"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="search" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="search" /> + </menu_item_check> + <menu_item_call + enabled="false" + label="Release Keys" + layout="topleft" + name="Release Keys"> + <menu_item_call.on_click + function="Tools.ReleaseKeys" + parameter="" /> + <menu_item_call.on_enable + function="Tools.EnableReleaseKeys" + parameter="" /> + </menu_item_call> + <menu_item_call + label="Set UI Size to Default" + layout="topleft" + name="Set UI Size to Default"> + <menu_item_call.on_click + function="View.DefaultUISize" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Always Run" + layout="topleft" + name="Always Run" + shortcut="control|R"> + <menu_item_check.on_check + function="World.CheckAlwaysRun" /> + <menu_item_check.on_click + function="World.AlwaysRun" /> + </menu_item_check> + <menu_item_check + label="Fly" + layout="topleft" + name="Fly" + shortcut="Home"> + <menu_item_check.on_click + function="Agent.toggleFlying" /> + <menu_item_check.on_enable + function="Agent.enableFlying" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Close Window" + layout="topleft" + name="Close Window" + shortcut="control|W"> + <menu_item_call.on_click + function="File.CloseWindow" /> + <menu_item_call.on_enable + function="File.EnableCloseWindow" /> + </menu_item_call> + <menu_item_call + label="Close All Windows" + layout="topleft" + name="Close All Windows" + shortcut="control|shift|W"> + <menu_item_call.on_click + function="File.CloseAllWindows" /> + <menu_item_call.on_enable + function="File.EnableCloseAllWindows" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Snapshot to Disk" + layout="topleft" + name="Snapshot to Disk" + shortcut="control|`" + use_mac_ctrl="true"> + <menu_item_call.on_click + function="File.TakeSnapshotToDisk" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Mouselook" + layout="topleft" + name="Mouselook" + shortcut="M"> + <menu_item_call.on_click + function="View.Mouselook" /> + <menu_item_call.on_enable + function="View.EnableMouselook" /> + </menu_item_call> + <menu_item_check + label="Joystick Flycam" + layout="topleft" + name="Joystick Flycam" + shortcut="alt|shift|F"> + <menu_item_check.on_check + function="View.CheckJoystickFlycam" /> + <menu_item_check.on_click + function="View.JoystickFlycam" /> + <menu_item_check.on_enable + function="View.EnableJoystickFlycam" /> + </menu_item_check> + <menu_item_call + label="Reset View" + layout="topleft" + name="Reset View" + shortcut="Esc"> + <menu_item_call.on_click + function="View.ResetView" /> + </menu_item_call> + <menu_item_call + label="Look at Last Chatter" + layout="topleft" + name="Look at Last Chatter" + shortcut="control|\"> + <menu_item_call.on_click + function="View.LookAtLastChatter" /> + <menu_item_call.on_enable + function="View.EnableLastChatter" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Select Build Tool" + layout="topleft" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + layout="topleft" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + layout="topleft" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + layout="topleft" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + layout="topleft" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + layout="topleft" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Zoom In" + layout="topleft" + name="Zoom In" + shortcut="control|0"> + <menu_item_call.on_click + function="View.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Zoom Default" + layout="topleft" + name="Zoom Default" + shortcut="control|9"> + <menu_item_call.on_click + function="View.ZoomDefault" /> + </menu_item_call> + <menu_item_call + label="Zoom Out" + layout="topleft" + name="Zoom Out" + shortcut="control|8"> + <menu_item_call.on_click + function="View.ZoomOut" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Toggle Fullscreen" + layout="topleft" + name="Toggle Fullscreen" + > + <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> + <menu_item_call.on_click + function="View.Fullscreen" /> + </menu_item_call> + </menu> + <menu create_jump_keys="true" label="World" @@ -2732,7 +2695,7 @@ layout="topleft" name="UI" tear_off="true"> - <menu_item_check + <!-- <menu_item_check label="New Bottom Bar" layout="topleft" name="New Bottom Bar"> @@ -2742,21 +2705,14 @@ <menu_item_check.on_click function="ToggleControl" parameter="BottomPanelNew" /> - </menu_item_check> + </menu_item_check>--> <menu_item_call label="Web Browser Test" layout="topleft" name="Web Browser Test"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" /> - </menu_item_call> - <menu_item_call - label="UI/Color Settings" - layout="topleft" - name="UI/Color Settings"> - <menu_item_call.on_click - function="Advanced.ShowDebugSettings" - parameter="skin" /> + function="Advanced.WebBrowserTest" + parameter="http://secondlife.com/app/search/slurls.html"/> </menu_item_call> <menu_item_call label="Dump SelectMgr" @@ -2773,6 +2729,12 @@ function="Advanced.DumpInventory" /> </menu_item_call> <menu_item_call + label="Dump Timers" + name="Dump Timers"> + <menu_item_call.on_click + function="Advanced.DumpTimers" /> + </menu_item_call> + <menu_item_call label="Dump Focus Holder" layout="topleft" name="Dump Focus Holder" @@ -2815,8 +2777,8 @@ function="ToggleControl" parameter="DoubleClickAutoPilot" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator /> <menu_item_check label="Debug SelectMgr" layout="topleft" @@ -2952,7 +2914,7 @@ </menu> <menu create_jump_keys="true" - label="Character" + label="Avatar" layout="topleft" name="Character" tear_off="true"> @@ -3226,7 +3188,18 @@ function="Advanced.CompressImage" /> </menu_item_call> <menu_item_check - label="Console Window" + label="Output Debug Minidump" + layout="topleft" + name="Output Debug Minidump"> + <menu_item_check.on_check + function="CheckControl" + parameter="SaveMinidump" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SaveMinidump" /> + </menu_item_check> + <menu_item_check + label="Console Window on next Run" layout="topleft" name="Console Window"> <menu_item_check.on_check @@ -3236,6 +3209,34 @@ function="ToggleControl" parameter="ShowConsoleWindow" /> </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Show Admin Menu" + layout="topleft" + name="View Admin Options"> + <menu_item_check.on_check + function="Advanced.CheckViewAdminOptions" + parameter="ViewAdminOptions" /> + <menu_item_check.on_click + function="Advanced.ToggleViewAdminOptions" /> + </menu_item_check> + <menu_item_call + label="Request Admin Status" + layout="topleft" + name="Request Admin Options" + shortcut="control|alt|G"> + <menu_item_call.on_click + function="Advanced.RequestAdminStatus" /> + </menu_item_call> + <menu_item_call + label="Leave Admin Status" + layout="topleft" + name="Leave Admin Options" + shortcut="control|alt|shift|G"> + <menu_item_call.on_click + function="Advanced.LeaveAdminStatus" /> + </menu_item_call> </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f141a909a8..95dd8677b4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -485,6 +485,20 @@ You do not have enough L$ to join this group. <notification icon="alertmodal.tga" + name="CreateGroupCost" + type="alertmodal"> +Creating this group will cost L$100. +Groups need more than one member, or they are deleted forever. +Please invite members within 48 hours. + <usetemplate + canceltext="Cancel" + name="okcancelbuttons" + notext="Cancel" + yestext="Create group for L$100"/> + </notification> + + <notification + icon="alertmodal.tga" name="LandBuyPass" type="alertmodal"> For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hours. Buy a pass? @@ -493,7 +507,7 @@ For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hour notext="Cancel" yestext="OK"/> </notification> - + <notification icon="alertmodal.tga" name="SalePriceRestriction" @@ -650,7 +664,7 @@ Scripts must be allowed to run for weapons to work. icon="alertmodal.tga" name="MultipleFacesSelected" type="alertmodal"> - Multiple faces are currently selected. +Multiple faces are currently selected. If you continue this action, separate instances of media will be set on multiple faces of the object. To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add. <usetemplate @@ -3468,7 +3482,7 @@ You can click 'Change Preference' to raise your maturity Rating prefer icon="alertmodal.tga" name="TooManyPrimsSelected" type="alertmodal"> - "There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again" +There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again <usetemplate name="okbutton" yestext="OK"/> @@ -3742,7 +3756,7 @@ Default: Disallow label="Disable Scripts" name="HelpRegionDisableScripts" type="alertmodal"> -When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. +When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance. Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted 'top script'. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object. @@ -3757,7 +3771,7 @@ Default: off name="HelpRegionDisableCollisions" type="alertmodal"> When sim performance is poor, physical objects may be to blame. -Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button. +Open the Statistics Bar (Ctrl+Shift+1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button. You will be given the name and location of physical objects that may be causing poor performance. Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted 'top collider'. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object. @@ -4418,7 +4432,7 @@ Are you sure you want to delete your travel, web, and search history? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Yes"/> + yestext="OK"/> </notification> <notification @@ -5014,347 +5028,349 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="SystemMessageTip" type="notifytip"> - [MESSAGE] +[MESSAGE] </notification> <notification icon="notifytip.tga" name="Cancelled" type="notifytip"> - Cancelled +Cancelled </notification> <notification icon="notifytip.tga" name="CancelledSit" type="notifytip"> - Cancelled Sit +Cancelled Sit </notification> <notification icon="notifytip.tga" name="CancelledAttach" type="notifytip"> - Cancelled Attach +Cancelled Attach </notification> <notification icon="notifytip.tga" name="ReplacedMissingWearable" type="notifytip"> - Replaced missing clothing/body part with default. +Replaced missing clothing/body part with default. </notification> <notification icon="groupnotify" name="GroupNotice" type="groupnotify"> - Topic: [SUBJECT], Message: [MESSAGE] +Topic: [SUBJECT], Message: [MESSAGE] </notification> <notification icon="notifytip.tga" name="FriendOnline" type="notifytip"> - [FIRST] [LAST] is Online +[FIRST] [LAST] is Online </notification> <notification icon="notifytip.tga" name="FriendOffline" type="notifytip"> - [FIRST] [LAST] is Offline +[FIRST] [LAST] is Offline </notification> <notification icon="notifytip.tga" name="AddSelfFriend" type="notifytip"> - Although you're very nice, you can't add yourself as a friend. +Although you're very nice, you can't add yourself as a friend. </notification> <notification icon="notifytip.tga" name="UploadingAuctionSnapshot" type="notifytip"> - Uploading in-world and web site snapshots... - (Takes about 5 minutes.) +Uploading in-world and web site snapshots... +(Takes about 5 minutes.) </notification> <notification icon="notify.tga" name="UploadPayment" type="notify"> - You paid L$[AMOUNT] to upload. +You paid L$[AMOUNT] to upload. </notification> <notification icon="notifytip.tga" name="UploadWebSnapshotDone" type="notifytip"> - Web site snapshot upload done. +Web site snapshot upload done. </notification> <notification icon="notifytip.tga" name="UploadSnapshotDone" type="notifytip"> - In-world snapshot upload done +In-world snapshot upload done </notification> <notification icon="notifytip.tga" name="TerrainDownloaded" type="notifytip"> - Terrain.raw downloaded +Terrain.raw downloaded </notification> <notification icon="notifytip.tga" name="GestureMissing" type="notifytip"> - Hmm. Gesture [NAME] is missing from the database. +Hmm. Gesture [NAME] is missing from the database. </notification> <notification icon="notifytip.tga" name="UnableToLoadGesture" type="notifytip"> - Unable to load gesture [NAME]. - Please try again. +Unable to load gesture [NAME]. +Please try again. </notification> <notification icon="notifytip.tga" name="LandmarkMissing" type="notifytip"> - Landmark is missing from database. +Landmark is missing from database. </notification> <notification icon="notifytip.tga" name="UnableToLoadLandmark" type="notifytip"> - Unable to load landmark. Please try again. +Unable to load landmark. Please try again. </notification> <notification icon="notifytip.tga" name="CapsKeyOn" type="notifytip"> - Your Caps Lock key is on. - This might affect your password. +Your Caps Lock key is on. +This might affect your password. </notification> <notification icon="notifytip.tga" name="NotecardMissing" type="notifytip"> - Notecard is missing from database. +Notecard is missing from database. </notification> <notification icon="notifytip.tga" name="NotecardNoPermissions" type="notifytip"> - You don't have permission to view this notecard. +You don't have permission to view this notecard. </notification> <notification icon="notifytip.tga" name="RezItemNoPermissions" type="notifytip"> - Insufficient permissions to rez object. +Insufficient permissions to rez object. </notification> <notification icon="notifytip.tga" name="UnableToLoadNotecard" type="notifytip"> - Unable to load notecard. - Please try again. +Unable to load notecard. +Please try again. </notification> <notification icon="notifytip.tga" name="ScriptMissing" type="notifytip"> - Script is missing from database. +Script is missing from database. </notification> <notification icon="notifytip.tga" name="ScriptNoPermissions" type="notifytip"> - Insufficient permissions to view script. +Insufficient permissions to view script. </notification> <notification icon="notifytip.tga" name="UnableToLoadScript" type="notifytip"> - Unable to load script. Please try again. +Unable to load script. Please try again. </notification> <notification icon="notifytip.tga" name="IncompleteInventory" type="notifytip"> - The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. +The complete contents you are offering are not yet locally available. Please try offering those items again in a minute. </notification> <notification icon="notifytip.tga" name="CannotModifyProtectedCategories" type="notifytip"> - You cannot modify protected categories. +You cannot modify protected categories. </notification> <notification icon="notifytip.tga" name="CannotRemoveProtectedCategories" type="notifytip"> - You cannot remove protected categories. +You cannot remove protected categories. </notification> <notification icon="notifytip.tga" name="OfferedCard" type="notifytip"> - You have offered a calling card to [FIRST] [LAST] +You have offered a calling card to [FIRST] [LAST] </notification> <notification icon="notifytip.tga" name="UnableToBuyWhileDownloading" type="notifytip"> - Unable to buy while downloading object data. - Please try again. +Unable to buy while downloading object data. +Please try again. </notification> <notification icon="notifytip.tga" name="UnableToLinkWhileDownloading" type="notifytip"> - Unable to link while downloading object data. - Please try again. +Unable to link while downloading object data. +Please try again. </notification> <notification icon="notifytip.tga" name="CannotBuyObjectsFromDifferentOwners" type="notifytip"> - You can only buy objects from one owner at a time. - Please select a single object. +You can only buy objects from one owner at a time. +Please select a single object. </notification> <notification icon="notifytip.tga" name="ObjectNotForSale" type="notifytip"> - This object is not for sale. +This object is not for sale. </notification> <notification icon="notifytip.tga" name="EnteringGodMode" type="notifytip"> - Entering god mode, level [LEVEL] +Entering god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="LeavingGodMode" type="notifytip"> - Now leaving god mode, level [LEVEL] +Now leaving god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="CopyFailed" type="notifytip"> - You don't have permission to copy this. +You don't have permission to copy this. </notification> <notification icon="notifytip.tga" name="InventoryAccepted" type="notifytip"> - [NAME] accepted your inventory offer. +[NAME] accepted your inventory offer. </notification> <notification icon="notifytip.tga" name="InventoryDeclined" type="notifytip"> - [NAME] declined your inventory offer. +[NAME] declined your inventory offer. </notification> <notification icon="notifytip.tga" name="ObjectMessage" type="notifytip"> - [NAME]: [MESSAGE] +[NAME]: [MESSAGE] </notification> <notification icon="notifytip.tga" name="CallingCardAccepted" type="notifytip"> - Your calling card was accepted. +Your calling card was accepted. </notification> <notification icon="notifytip.tga" name="CallingCardDeclined" type="notifytip"> - Your calling card was declined. +Your calling card was declined. </notification> <notification icon="notifytip.tga" name="TeleportToLandmark" type="notifytip"> - Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. - Double click on the landmark and click on Teleport to travel there. +You can teleport to locations like '[NAME]' by opening the Places panel on the right side of your screen, and then select the Landmarks tab. +Click on any landmark to select it, then click 'Teleport' at the bottom of the panel. +(You can also double-click on the landmark, or right-click it and choose 'Teleport'.) </notification> <notification icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> - Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. - Double click on the card, click on Instant Message, and type a message. +You can contact residents like '[NAME]' by opening the People panel on the right side of your screen. +Select the resident from the list, then click 'IM' at the bottom of the panel. +(You can also double-click on their name in the list, or right-click and choose 'IM'). </notification> <notification icon="notifytip.tga" name="CantSelectLandFromMultipleRegions" type="notifytip"> - Can't select land across server boundaries. - Try selecting a smaller piece of land. +Can't select land across server boundaries. +Try selecting a smaller piece of land. </notification> <notification icon="notifytip.tga" name="SearchWordBanned" type="notifytip"> - Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. +Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards. </notification> <notification icon="notifytip.tga" name="NoContentToSearch" type="notifytip"> - Please select at least one type of content to search (PG, Mature, or Adult). +Please select at least one type of content to search (PG, Mature, or Adult). </notification> <notification icon="notify.tga" name="GroupVote" type="notify"> - [NAME] has proposed to vote on: - [MESSAGE] +[NAME] has proposed to vote on: +[MESSAGE] <form name="form"> <button index="0" @@ -5371,17 +5387,17 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="SystemMessage" type="notify"> - [MESSAGE] +[MESSAGE] </notification> <notification icon="notify.tga" name="EventNotification" type="notify"> - Event Notification: +Event Notification: - [NAME] - [DATE] +[NAME] +[DATE] <form name="form"> <button index="0" @@ -5402,9 +5418,9 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="TransferObjectsHighlighted" type="notify"> - All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. +All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. - * Trees and grasses that will transfer are not highlighted. +* Trees and grasses that will transfer are not highlighted. <form name="form"> <button index="0" @@ -5417,79 +5433,79 @@ The string [STRING_NAME] is missing from strings.xml icon="notify.tga" name="DeactivatedGesturesTrigger" type="notify"> - Deactivated gestures with same trigger: - [NAMES] +Deactivated gestures with same trigger: +[NAMES] </notification> <notification icon="notify.tga" name="NoQuickTime" type="notify"> - Apple's QuickTime software does not appear to be installed on your system. - If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. +Apple's QuickTime software does not appear to be installed on your system. +If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. </notification> <notification icon="notify.tga" name="NoPlugin" type="notify"> - No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. +No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. </notification> <notification icon="alertmodal.tga" name="MediaPluginFailed" type="alertmodal"> - The following Media Plugin has failed: +The following Media Plugin has failed: [PLUGIN] Please re-install the plugin or contact the vendor if you continue to experience problems. <form name="form"> <ignore name="ignore" - text="When a Media Plugin fails"/> + text="A Media Plugin fails to run"/> </form> </notification> <notification icon="notify.tga" name="OwnedObjectsReturned" type="notify"> - The objects you own on the selected parcel of land have been returned back to your inventory. +The objects you own on the selected parcel of land have been returned back to your inventory. </notification> <notification icon="notify.tga" name="OtherObjectsReturned" type="notify"> - The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. +The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. </notification> <notification icon="notify.tga" name="OtherObjectsReturned2" type="notify"> - The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. +The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. </notification> <notification icon="notify.tga" name="GroupObjectsReturned" type="notify"> - The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. - Transferable deeded objects have been returned to their previous owners. - Non-transferable objects that are deeded to the group have been deleted. +The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. +Transferable deeded objects have been returned to their previous owners. +Non-transferable objects that are deeded to the group have been deleted. </notification> <notification icon="notify.tga" name="UnOwnedObjectsReturned" type="notify"> - The objects on the selected parcel that are NOT owned by you have been returned to their owners. +The objects on the selected parcel that are NOT owned by you have been returned to their owners. </notification> <notification icon="notify.tga" name="NotSafe" type="notify"> - This land has damage enabled. - You can be hurt here. If you die, you will be teleported to your home location. +This land has damage enabled. +You can be hurt here. If you die, you will be teleported to your home location. <unique/> </notification> @@ -5497,8 +5513,8 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="NoFly" type="notify"> - This area has flying disabled. - You can't fly here. +This area has flying disabled. +You can't fly here. <unique/> </notification> @@ -5506,7 +5522,7 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="PushRestricted" type="notify"> - This area does not allow pushing. You can't push others here unless you own the land. +This area does not allow pushing. You can't push others here unless you own the land. <unique/> </notification> @@ -5514,7 +5530,7 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="NoVoice" type="notify"> - This area has voice chat disabled. You won't be able to hear anyone talking. +This area has voice chat disabled. You won't be able to hear anyone talking. <unique/> </notification> @@ -5522,7 +5538,7 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="NoBuild" type="notify"> - This area has building disabled. You can't build or rez objects here. +This area has building disabled. You can't build or rez objects here. <unique/> </notification> @@ -5530,232 +5546,232 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="ScriptsStopped" type="notify"> - An administrator has temporarily stopped scripts in this region. +An administrator has temporarily stopped scripts in this region. </notification> <notification icon="notify.tga" name="ScriptsNotRunning" type="notify"> - This region is not running any scripts. +This region is not running any scripts. </notification> <notification icon="notify.tga" name="NoOutsideScripts" type="notify"> - This land has outside scripts disabled. +This land has outside scripts disabled. - No scripts will work here except those belonging to the land owner. +No scripts will work here except those belonging to the land owner. </notification> <notification icon="notify.tga" name="ClaimPublicLand" type="notify"> - You can only claim public land in the Region you're in. +You can only claim public land in the Region you're in. </notification> <notification icon="notify.tga" name="RegionTPAccessBlocked" type="notify"> - You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. +You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. - Please go to the Knowledge Base for details on accessing areas with this maturity Rating. +Please go to the Knowledge Base for details on accessing areas with this maturity Rating. </notification> <notification icon="notify.tga" name="URBannedFromRegion" type="notify"> - You are banned from the region. +You are banned from the region. </notification> <notification icon="notify.tga" name="NoTeenGridAccess" type="notify"> - Your account cannot connect to this teen grid region. +Your account cannot connect to this teen grid region. </notification> <notification icon="notify.tga" name="NoHelpIslandTP" type="notify"> - You cannot teleport back to Help Island. - Go to 'Help Island Public' to repeat the tutorial. +You cannot teleport back to Help Island. +Go to 'Help Island Public' to repeat the tutorial. </notification> <notification icon="notify.tga" name="ImproperPaymentStatus" type="notify"> - You do not have proper payment status to enter this region. +You do not have proper payment status to enter this region. </notification> <notification icon="notify.tga" name="MustGetAgeRgion" type="notify"> - You must be age-verified to enter this region. +You must be age-verified to enter this region. </notification> <notification icon="notify.tga" name="MustGetAgeParcel" type="notify"> - You must be age-verified to enter this parcel. +You must be age-verified to enter this parcel. </notification> <notification icon="notify.tga" name="NoDestRegion" type="notify"> - No destination region found. +No destination region found. </notification> <notification icon="notify.tga" name="NotAllowedInDest" type="notify"> - You are not allowed into the destination. +You are not allowed into the destination. </notification> <notification icon="notify.tga" name="RegionParcelBan" type="notify"> - Cannot region cross into banned parcel. Try another way. +Cannot region cross into banned parcel. Try another way. </notification> <notification icon="notify.tga" name="TelehubRedirect" type="notify"> - You have been redirected to a telehub. +You have been redirected to a telehub. </notification> <notification icon="notify.tga" name="CouldntTPCloser" type="notify"> - Could not teleport closer to destination. +Could not teleport closer to destination. </notification> <notification icon="notify.tga" name="TPCancelled" type="notify"> - Teleport cancelled. +Teleport cancelled. </notification> <notification icon="notify.tga" name="FullRegionTryAgain" type="notify"> - The region you are attempting to enter is currently full. - Please try again in a few moments. +The region you are attempting to enter is currently full. +Please try again in a few moments. </notification> <notification icon="notify.tga" name="GeneralFailure" type="notify"> - General failure. +General failure. </notification> <notification icon="notify.tga" name="RoutedWrongRegion" type="notify"> - Routed to wrong region. Please try again. +Routed to wrong region. Please try again. </notification> <notification icon="notify.tga" name="NoValidAgentID" type="notify"> - No valid agent id. +No valid agent id. </notification> <notification icon="notify.tga" name="NoValidSession" type="notify"> - No valid session id. +No valid session id. </notification> <notification icon="notify.tga" name="NoValidCircuit" type="notify"> - No valid circuit code. +No valid circuit code. </notification> <notification icon="notify.tga" name="NoValidTimestamp" type="notify"> - No valid timestamp. +No valid timestamp. </notification> <notification icon="notify.tga" name="NoPendingConnection" type="notify"> - Unable to create pending connection. +Unable to create pending connection. </notification> <notification icon="notify.tga" name="InternalUsherError" type="notify"> - Internal error attempting to connect agent usher. +Internal error attempting to connect agent usher. </notification> <notification icon="notify.tga" name="NoGoodTPDestination" type="notify"> - Unable to find a good teleport destination in this region. +Unable to find a good teleport destination in this region. </notification> <notification icon="notify.tga" name="InternalErrorRegionResolver" type="notify"> - Internal error attempting to activate region resolver. +Internal error attempting to activate region resolver. </notification> <notification icon="notify.tga" name="NoValidLanding" type="notify"> - A valid landing point could not be found. +A valid landing point could not be found. </notification> <notification icon="notify.tga" name="NoValidParcel" type="notify"> - No valid parcel could be found. +No valid parcel could be found. </notification> <notification icon="notify.tga" name="ObjectGiveItem" type="notify"> - An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. +An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. <form name="form"> <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" @@ -5767,16 +5783,16 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="ObjectGiveItemUnknownUser" type="notify"> - An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a [OBJECTTYPE] named [OBJECTNAME]. +An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a [OBJECTTYPE] named [OBJECTNAME]. <form name="form"> <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" @@ -5788,16 +5804,16 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="UserGiveItem" type="notify"> - [NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. +[NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. <form name="form"> <button index="0" name="Keep" - text="Keep"/> + text="OK"/> <button index="1" name="Discard" - text="Discard"/> + text="Cancel"/> <button index="2" name="Mute" @@ -5809,15 +5825,15 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="GodMessage" type="notify"> - [NAME] - [MESSAGE] +[NAME] +[MESSAGE] </notification> <notification icon="notify.tga" name="JoinGroup" type="notify"> - [MESSAGE] +[MESSAGE] <form name="form"> <button index="0" @@ -5838,9 +5854,9 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="TeleportOffered" type="notify"> - [NAME] has offered to teleport you to their location: +[NAME] has offered to teleport you to their location: - [MESSAGE] +[MESSAGE] <form name="form"> <button index="0" @@ -5857,8 +5873,8 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="GotoURL" type="notify"> - [MESSAGE] - [URL] +[MESSAGE] +[URL] <form name="form"> <button index="0" @@ -5875,11 +5891,11 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="OfferFriendship" type="notify"> - [NAME] is offering friendship. +[NAME] is offering friendship. - [MESSAGE] +[MESSAGE] - (By default, you will be able to see each other's online status.) +(By default, you will be able to see each other's online status.) <form name="form"> <button index="0" @@ -5896,9 +5912,9 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="OfferFriendshipNoMessage" type="notify"> - [NAME] is offering friendship. +[NAME] is offering friendship. - (By default, you will be able to see each other's online status.) +(By default, you will be able to see each other's online status.) <form name="form"> <button index="0" @@ -5915,22 +5931,22 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="FriendshipAccepted" type="notify"> - [NAME] accepted your friendship offer. +[NAME] accepted your friendship offer. </notification> <notification icon="notify.tga" name="FriendshipDeclined" type="notify"> - [NAME] declined your friendship offer. +[NAME] declined your friendship offer. </notification> <notification icon="notify.tga" name="OfferCallingCard" type="notify"> - [FIRST] [LAST] is offering their calling card. - This will add a bookmark in your inventory so you can quickly IM this resident. +[FIRST] [LAST] is offering their calling card. +This will add a bookmark in your inventory so you can quickly IM this resident. <form name="form"> <button index="0" @@ -5949,8 +5965,8 @@ Please re-install the plugin or contact the vendor if you continue to experience priority="high" sound="UISndAlert" type="notify"> - This region will restart in [MINUTES] minutes. - If you stay in this region you will be logged out. +This region will restart in [MINUTES] minutes. +If you stay in this region you will be logged out. </notification> <notification @@ -5959,19 +5975,19 @@ Please re-install the plugin or contact the vendor if you continue to experience priority="high" sound="UISndAlert" type="notify"> - This region will restart in [SECONDS] seconds. - If you stay in this region you will be logged out. +This region will restart in [SECONDS] seconds. +If you stay in this region you will be logged out. </notification> <notification icon="notify.tga" name="LoadWebPage" type="notify"> - Load web page [URL]? +Load web page [URL]? - [MESSAGE] +[MESSAGE] - From object: [OBJECTNAME], owner: [NAME]? +From object: [OBJECTNAME], owner: [NAME]? <form name="form"> <button index="0" @@ -5988,31 +6004,31 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="FailedToFindWearableUnnamed" type="notify"> - Failed to find [TYPE] in database. +Failed to find [TYPE] in database. </notification> <notification icon="notify.tga" name="FailedToFindWearable" type="notify"> - Failed to find [TYPE] named [DESC] in database. +Failed to find [TYPE] named [DESC] in database. </notification> <notification icon="notify.tga" name="InvalidWearable" type="notify"> - The item you are trying to wear uses a feature that your Viewer can't read. Please upgrade your version of [APP_NAME] to wear this item. +The item you are trying to wear uses a feature that your Viewer can't read. Please upgrade your version of [APP_NAME] to wear this item. </notification> <notification icon="notify.tga" name="ScriptQuestion" type="notify"> - '[OBJECTNAME]', an object owned by '[NAME]', would like to: +'[OBJECTNAME]', an object owned by '[NAME]', would like to: - [QUESTIONS] - Is this OK? +[QUESTIONS] +Is this OK? <form name="form"> <button index="0" @@ -6034,12 +6050,12 @@ Please re-install the plugin or contact the vendor if you continue to experience name="ScriptQuestionCaution" priority="high" type="notify"> - An object named '[OBJECTNAME]', owned by '[NAME]' would like to: +An object named '[OBJECTNAME]', owned by '[NAME]' would like to: - [QUESTIONS] - If you do not trust this object and its creator, you should deny the request. +[QUESTIONS] +If you do not trust this object and its creator, you should deny the request. - Grant this request? +Grant this request? <form name="form"> <button index="0" @@ -6061,8 +6077,8 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="ScriptDialog" type="notify"> - [FIRST] [LAST]'s '[TITLE]' - [MESSAGE] +[FIRST] [LAST]'s '[TITLE]' +[MESSAGE] <form name="form"> <button index="-1" @@ -6075,8 +6091,8 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="ScriptDialogGroup" type="notify"> - [GROUPNAME]'s '[TITLE]' - [MESSAGE] +[GROUPNAME]'s '[TITLE]' +[MESSAGE] <form name="form"> <button index="-1" @@ -6089,41 +6105,41 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="FirstBalanceIncrease" type="notify"> - You just received L$[AMOUNT]. - Your L$ balance is shown in the upper-right. +You just received L$[AMOUNT]. +Your L$ balance is shown in the upper-right. </notification> <notification icon="notify.tga" name="FirstBalanceDecrease" type="notify"> - You just paid L$[AMOUNT]. - Your L$ balance is shown in the upper-right. +You just paid L$[AMOUNT]. +Your L$ balance is shown in the upper-right. </notification> <notification icon="notify.tga" name="FirstSit" type="notify"> - You are sitting. - Use your arrow keys (or AWSD) to look around. - Click the 'Stand Up' button to stand. +You are sitting. +Use your arrow keys (or AWSD) to look around. +Click the 'Stand Up' button to stand. </notification> <notification icon="notify.tga" name="FirstMap" type="notify"> - Click and drag the map to look around. - Double-click to teleport. - Use the controls on the right to find things and display different backgrounds. +Click and drag the map to look around. +Double-click to teleport. +Use the controls on the right to find things and display different backgrounds. </notification> <notification icon="notify.tga" name="FirstBuild" type="notify"> - You have opened the Build Tools. Every object you see around you was created using these tools. +You have opened the Build Tools. Every object you see around you was created using these tools. </notification> <!-- @@ -6140,24 +6156,24 @@ Please re-install the plugin or contact the vendor if you continue to experience icon="notify.tga" name="FirstTeleport" type="notify"> - You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it. +You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it. </notification> <notification icon="notify.tga" name="FirstOverrideKeys" type="notify"> - Your movement keys are now being handled by an object. - Try the arrow keys or AWSD to see what they do. - Some objects (like guns) require you to go into mouselook to use them. - Press 'M' to do this. +Your movement keys are now being handled by an object. +Try the arrow keys or AWSD to see what they do. +Some objects (like guns) require you to go into mouselook to use them. +Press 'M' to do this. </notification> <notification icon="notify.tga" name="FirstAppearance" type="notify"> - You are editing your Appearance. +You are editing your Appearance. Use the arrow keys to look around. When you are done, press 'Save All'. </notification> @@ -6166,38 +6182,38 @@ When you are done, press 'Save All'. icon="notify.tga" name="FirstInventory" type="notify"> - This is your Inventory, which contains items you own. +This is your Inventory, which contains items you own. - * To wear something, drag it onto yourself. - * To rez something inworld, drag it onto the ground. - * To read a notecard, double-click it. +* To wear something, drag it onto yourself. +* To rez something inworld, drag it onto the ground. +* To read a notecard, double-click it. </notification> <notification icon="notify.tga" name="FirstSandbox" type="notify"> - This is a sandbox area, and is meant to help Residents learn how to build. +This is a sandbox area, and is meant to help Residents learn how to build. - Things you build here will be deleted after you leave, so don't forget to right-click and choose 'Take' to move your creation to your Inventory. +Things you build here will be deleted after you leave, so don't forget to right-click and choose 'Take' to move your creation to your Inventory. </notification> <notification icon="notify.tga" name="FirstFlexible" type="notify"> - This object is flexible. Flexis must be phantom and not physical. +This object is flexible. Flexis must be phantom and not physical. </notification> <notification icon="notify.tga" name="FirstDebugMenus" type="notify"> - You opened the Advanced menu. +You opened the Advanced menu. - To toggle this menu, - Windows: Ctrl-Alt-D - Mac: ⌘-Opt-D +To toggle this menu, + Windows: Ctrl+Alt+D + Mac: ⌥⌘D </notification> @@ -6205,7 +6221,7 @@ When you are done, press 'Save All'. icon="notify.tga" name="FirstSculptedPrim" type="notify"> - You are editing a Sculpted prim. Sculpties require a special texture to define their shape. +You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> <!--notification @@ -6219,7 +6235,7 @@ When you are done, press 'Save All'. icon="notifytip.tga" name="MaxListSelectMessage" type="notifytip"> - You may only select up to [MAX_SELECT] items from this list. +You may only select up to [MAX_SELECT] items from this list. </notification> <notification @@ -6348,7 +6364,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceChannelFull" type="notifytip"> - The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later. +The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6358,7 +6374,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="ProximalVoiceChannelFull" type="notifytip"> - We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. +We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. <unique/> </notification> @@ -6366,7 +6382,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceChannelDisconnected" type="notifytip"> - You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to spatial voice chat. +You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6376,7 +6392,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceChannelDisconnectedP2P" type="notifytip"> - [VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6386,7 +6402,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="P2PCallDeclined" type="notifytip"> - [VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6396,7 +6412,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="P2PCallNoAnswer" type="notifytip"> - [VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6406,7 +6422,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceChannelJoinFailed" type="notifytip"> - Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to spatial voice chat. +Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to spatial voice chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6417,7 +6433,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceLoginRetry" type="notifytip"> - We are creating a voice channel for you. This may take up to one minute. +We are creating a voice channel for you. This may take up to one minute. <unique/> </notification> @@ -6425,28 +6441,28 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> - Only members of a certain group can visit this area. +Only members of a certain group can visit this area. </notification> <notification icon="notifytip.tga" name="Cannot enter parcel: banned" type="notifytip"> - Cannot enter parcel, you have been banned. +Cannot enter parcel, you have been banned. </notification> <notification icon="notifytip.tga" name="Cannot enter parcel: not on access list" type="notifytip"> - Cannot enter parcel, you are not on the access list. +Cannot enter parcel, you are not on the access list. </notification> <notification icon="notifytip.tga" name="VoiceNotAllowed" type="notifytip"> - You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME]. +You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME]. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6456,7 +6472,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block icon="notifytip.tga" name="VoiceCallGenericError" type="notifytip"> - An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME]. Please try again later. +An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME]. Please try again later. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6468,7 +6484,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block name="ServerVersionChanged" priority="high" type="notifytip"> - You just entered a region using a different server version, which may affect performance. Click to see the release notes. +You just entered a region using a different server version, which may affect performance. Click to see the release notes. </notification> <notification @@ -6476,33 +6492,19 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block name="UnsupportedCommandSLURL" priority="high" type="notifytip"> - The SLurl you clicked on is not supported. +The SLurl you clicked on is not supported. </notification> <notification name="IMToast" type="notifytoast"> - [MESSAGE] +[MESSAGE] <form name="form"> <button index="0" name="respondbutton" text="Respond"/> </form> </notification> - - <notification - icon="alertmodal.tga" - name="CreateGroupCost" - type="alertmodal"> - Creating this group will cost L$100. - Groups need more than one member, or they are deleted forever. - Please invite members within 48 hours. - <usetemplate - canceltext="Cancel" - name="okcancelbuttons" - notext="Cancel" - yestext="Create group for L$100"/> - </notification> <notification icon="notifytip.tga" name="AttachmentSaved" type="notifytip"> - Attachment has been saved. +Attachment has been saved. </notification> <notification @@ -6523,6 +6525,17 @@ Server Error: Media update or get failed. yestext="OK"/> </notification> + <notification + icon="alertmodal.tga" + name="ConfirmClearTeleportHistory" + type="alertmodal"> +Are you sure you want to delete your teleport history? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml index 4329982209..546f46205f 100644 --- a/indra/newview/skins/default/xui/en/panel_audio_device.xml +++ b/indra/newview/skins/default/xui/en/panel_audio_device.xml @@ -81,7 +81,6 @@ enabled="false" height="60" border_visible="false" - hide_scrollbar="true" layout="topleft" left_delta="10" max_length="65535" diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index c3ae2d953a..f7f08b9b6a 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -47,7 +47,7 @@ top="4" use_ellipses="true" value="Unknown" - width="180" /> + width="162" /> <text follows="right" font="SansSerif" @@ -85,4 +85,19 @@ picture_style="true" top="2" width="18" /> + <button + follows="right" + font="SansSerifBigBold" + height="18" + image_disabled="profile_chevron_btn.tga" + image_disabled_selected="profile_chevron_btn.tga" + image_hover_selected="profile_chevron_btn_active.tga" + image_selected="profile_chevron_btn_active.tga" + image_unselected="profile_chevron_btn.tga" + layout="topleft" + left_pad="2" + name="profile_btn" + picture_style="true" + top="2" + width="18" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml index 34b4736979..e4f6e7bd44 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml @@ -61,7 +61,6 @@ font="SansSerifSmall" read_only="true" bg_readonly_color="0 0 0 0" - hide_scrollbar="true" word_wrap="true" mouse_opaque="true" name="msg_text" > diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index cd7e340ff1..b4847368b2 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -83,7 +83,7 @@ top="6" width="70"> <button.init_callback - function="Button.SetFloaterToggle" + function="Button.SetDockableFloaterToggle" parameter="moveview" /> </button> </layout_panel> @@ -105,10 +105,10 @@ height="28" layout="topleft" min_height="28" - min_width="150" + min_width="100" name="cam_panel" top_delta="-10" - width="150"> + width="100"> <button follows="right" height="20" @@ -121,7 +121,7 @@ name="camera_btn" width="70"> <button.init_callback - function="Button.SetFloaterToggle" + function="Button.SetDockableFloaterToggle" parameter="camera" /> </button> <button @@ -136,15 +136,28 @@ image_selected="toggle_button_selected" image_unselected="toggle_button_off"> <button.init_callback - function="Button.SetFloaterToggle" + function="Button.SetDockableFloaterToggle" parameter="camera_presets" /> </button> + </layout_panel> + <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="35" + name="snapshot_panel" + top_delta="-10" + width="35"> <split_button arrow_position="right" follows="right" height="18" - left_pad="4" + left="0" + layout="topleft" name="snapshots" top="6" width="35"> @@ -160,19 +173,8 @@ image_unselected="camera_presets/camera_presets_snapshot.png" name="snapshot" tool_tip="Take Snapshot" /> - </split_button> + </split_button> </layout_panel> - <icon - auto_resize="false" - color="0 0 0 0" - follows="left|right" - height="10" - image_name="spacer24.tga" - layout="topleft" - left="0" - name="DUMMY" - top="0" - width="5"/> <layout_panel mouse_opaque="false" follows="left|right" diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 713c3a41a2..78f53562cd 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -16,7 +16,7 @@ /> <text width="130" top="25" left="40" height="20" follows="left|right|top" - font="SansSerifBigBold" text_color="white" word_wrap="true" + font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true" mouse_opaque="true" name="sender_name" > Jerry Knight </text> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 5dd03656c6..453e1319a6 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,13 +2,13 @@ <panel background_visible="true" bevel_style="in" - height="420" + height="570" label="Edit Pick" layout="topleft" left="0" name="panel_edit_pick" top="0" - width="255"> + width="333"> <text type="string" length="1" @@ -36,34 +36,26 @@ <scroll_container color="DkGray2" follows="left|top|right|bottom" - height="300" + height="470" layout="topleft" - left="0" + left="10" + top_pad="10" name="profile_scroll" reserve_scroll_corner="true" opaque="true" - width="255"> + width="313"> <panel name="scroll_content_panel" follows="left|top|right" layout="topleft" top="0" left="0" - width="240" - height="575"> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - width="220" - follows="left|right|top|bottom" - height="560" - layout="topleft" - left="0" - top="0"> + width="298" + height="555"> <texture_picker follows="left|top|right" - height="190" - width="220" + height="197" + width="280" layout="topleft" top="20" left="10" @@ -101,7 +93,7 @@ max_length="63" name="pick_name" text_color="black" - width="220" /> + width="280" /> <text type="string" length="1" @@ -119,8 +111,8 @@ <text_editor follows="left|top|right" height="100" - width="220" - hide_scrollbar="true" + width="280" + hide_scrollbar="false" layout="topleft" left="10" top_pad="2" @@ -153,7 +145,7 @@ right="-10" top_pad="2" text_color="white" - width="250" + width="280" word_wrap="true"> loading... </text> @@ -166,7 +158,6 @@ name="set_to_curr_location_btn" width="200" /> </panel> - </panel> </scroll_container> <panel follows="left|right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index b13058f40a..0202323dcf 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -14,7 +14,8 @@ width="255"> <string name="CaptionTextAcctInfo"> - [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] + [ACCTTYPE] +[PAYMENTINFO] [AGEVERIFICATION] </string> <string name="AcctTypeResident" @@ -138,6 +139,7 @@ layout="topleft" left="120" top="30" + max_length="511" name="sl_description_edit" width="115" word_wrap="true"> @@ -193,6 +195,7 @@ layout="topleft" left="120" top="195" + max_length="254" name="fl_description_edit" width="115" word_wrap="true"> @@ -294,7 +297,7 @@ width="100"/> <text follows="left|top|right" - height="15" + height="20" layout="topleft" left="10" name="acc_status_text" diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index a9363df259..be38492c82 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="panel_im_control_panel" - width="96" - height="215" - border="false"> - <avatar_list - width="90" - column_padding="0" - draw_heading="true" - draw_stripes="false" - follows="left|top|bottom|right" - layout="topleft" - left="3" - name="speakers_list" - search_column="1" - sort_column="2" - top="10" - height="150" /> - - <button name="group_info_btn" - label="Group Info" - left_delta="3" - width="90" - height="20" /> - - <button name="call_btn" - label="Call" - width="90" - height="20" /> - +<panel + name="panel_im_control_panel" + width="146" + height="215" + border="false"> + <avatar_list_tmp + color="DkGray2" + follows="left|top|right|bottom" + height="150" + layout="topleft" + left="3" + name="speakers_list" + top="10" + width="140"/> + <button + name="group_info_btn" + label="Group Info" + left_delta="3" + width="90" + height="20" /> + <button + name="call_btn" + label="Call" + width="90" + height="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 03e2d35b9f..6f01202680 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -12,9 +12,7 @@ width="280"> <panel.string name="help_text"> - The General tab contains general information about -this group, a list of Owners and visible Members, -general Group Preferences and member options. + The General tab contains general information about this group, a list of members, general Group Preferences and member options. Hover your mouse over the options for more help. </panel.string> @@ -45,7 +43,6 @@ Hover your mouse over the options for more help. follows="left|top" left="5" height="75" - hide_scrollbar="true" layout="topleft" max_length="511" name="charter" @@ -114,7 +111,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="active_title" - tool_tip="Sets the title that appears in your avatar's name tag when this group is active." + tool_tip="Sets the title that appears in your avatar's name tag when this group is active." top_pad="0" width="240" /> <check_box @@ -124,7 +121,7 @@ Hover your mouse over the options for more help. layout="topleft" left_delta="0" name="receive_notices" - tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." + tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." top_pad="5" width="240" /> <check_box @@ -180,7 +177,7 @@ Hover your mouse over the options for more help. max_val="99999" top_pad="5" name="spin_enrollment_fee" - tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." + tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." top_delta="-2" width="75" /> <check_box @@ -202,7 +199,7 @@ Hover your mouse over the options for more help. top_pad="10" width="240"> <combo_box.item - label="Select Mature -" + label="- Select Mature -" name="select_mature" value="Select" /> <combo_box.item @@ -215,4 +212,4 @@ Hover your mouse over the options for more help. value="Not Mature" /> </combo_box> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 999aa814b1..d61fcf529a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -259,6 +259,7 @@ label="Planning" layout="topleft" left="1" + help_topic="group_money_planning_tab" name="group_money_planning_tab" top="5" width="265"> @@ -284,6 +285,7 @@ label="Details" layout="topleft" left_delta="0" + help_topic="group_money_details_tab" name="group_money_details_tab" top_delta="0" width="265"> @@ -329,6 +331,7 @@ label="Sales" layout="topleft" left_delta="0" + help_topic="group_money_sales_tab" name="group_money_sales_tab" top_delta="-1" width="265"> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index ffc2f279bc..82a3c98dd9 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -187,7 +187,6 @@ the General tab. </text> <text_editor height="75" - hide_scrollbar="true" layout="topleft" left_pad="3" max_length="511" @@ -344,7 +343,6 @@ the General tab. <text_editor enabled="false" height="150" - hide_scrollbar="true" layout="topleft" left="10" max_length="511" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index f97daf922f..bd98996ae1 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -7,13 +7,13 @@ 4 </string> <panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black" - height="50" label="header" layout="topleft" left="0" name="header" + height="30" label="header" layout="topleft" left="0" name="header" top="0" width="350"> - <icon follows="left|top|right|bottom" height="40" width="40" layout="topleft" + <icon follows="left|top|right|bottom" height="20" width="20" layout="topleft" top="5" left="5" mouse_opaque="true" name="group_icon"/> <text type="string" length="1" follows="left|top|right|bottom" - font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title" - text_color="GroupNotifyTextColor" top="20" width="275" use_ellipses="true"> + font="SansSerifBigBold" height="20" layout="topleft" left_pad="10" name="title" + text_color="GroupNotifyTextColor" top="5" width="275" use_ellipses="true"> Sender Name / Group Name </text> </panel> @@ -65,7 +65,7 @@ follows="left|bottom|right" height="15" width="15" layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true" /> - <text font="SansSerif" font.style="UNDERLINE" font_shadow="hard" + <text font="SansSerif" font.style="UNDERLINE" font_shadow="none" type="string" length="1" follows="left|bottom|right" layout="topleft" left="45" bottom="122" height="15" width="280" name="attachment" text_color="GroupNotifyTextColor" visible="true"> 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 7b8bd8b337..bf861af4f2 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -174,6 +174,7 @@ label="Members" layout="topleft" left="1" + help_topic="roles_members_tab" name="members_sub_tab" tool_tip="Members" top="17" @@ -283,6 +284,7 @@ clicking on their names. label="Roles" layout="topleft" left_delta="0" + help_topic="roles_roles_tab" name="roles_sub_tab" class="panel_group_roles_subtab" top="17" @@ -400,6 +402,7 @@ including the Everyone and Owner Roles. label="Abilities" layout="topleft" left_delta="0" + help_topic="roles_actions_tab" name="actions_sub_tab" class="panel_group_actions_subtab" top="17" @@ -625,7 +628,6 @@ things in this group. There's a broad variety of Abilities. type="string" halign="left" height="48" - hide_scrollbar="true" layout="topleft" left="135" max_length="254" @@ -723,7 +725,6 @@ things in this group. There's a broad variety of Abilities. enabled="false" halign="left" height="48" - hide_scrollbar="true" layout="topleft" left_delta="0" max_length="512" diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 7db1b9e916..00ede1fb2c 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -80,7 +80,8 @@ use_ellipses="true" value="MESSAGE" width="330" - word_wrap="true" /> + word_wrap="true" + max_length="350" /> <button follows="bottom" font="SansSerifBigBold" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index aeeb884036..afe00271f7 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -164,7 +164,7 @@ control_name="RememberPassword" follows="left|bottom" height="16" - label="Remember me" + label="Remember password" layout="topleft" left_pad="10" name="remember_check" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index f1e2560356..c725334fc0 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -196,7 +196,7 @@ left="30" width="340" enabled="false" - name="meida_setting_note"> + name="media_setting_note"> Note: Residents can override this setting </text> diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 1178d75b2c..00100693cc 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -4,7 +4,7 @@ background_visible="true" bg_opaque_color="MouseGray" follows="left|top|right" - height="60" + height="65" layout="topleft" name="navigation_bar" width="600"> @@ -64,13 +64,13 @@ left_pad="7" name="home_btn" picture_style="true" - tool_tip="Teleport to your home location" + tool_tip="Teleport to my home location" top_delta="0" width="32" /> <location_input follows="left|right|top" halign="right" - height="22" + height="23" label="Location" layout="topleft" left_pad="7" @@ -133,7 +133,7 @@ follows="left|right|top" height="25" layout="topleft" - left="5" + left="0" name="favorite" image_drag_indication="Arrow_Down" chevron_button_tool_tip="Show more of My Favorites" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 4088d96ebf..3c8bf31e13 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -18,18 +18,31 @@ left_delta="7" left="0" name="chat_box" - tool_tip="Press Enter to say, Ctrl-Enter to shout." + tool_tip="Press Enter to say, Ctrl+Enter to shout." top="3" width="250" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + halign="left" + height="16" + layout="topleft" + left_pad="-24" + mouse_opaque="true" + name="chat_zone_indicator" + top="4" + visible="true" + width="20" /> <button - follows="right" - width="45" - top="3" - layout="topleft" - left_pad="5" - label="Log" - height="20"> - <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> + follows="right" + width="45" + top="3" + layout="topleft" + left_pad="5" + label="Log" + height="20"> + <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> </button> <chiclet_talk follows="right" diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 2056ec14d5..5333dfa2f5 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - bevel_style="in" - follows="left|top|right|bottom" - height="460" + follows="all" + height="535" label="Notes & Privacy" layout="topleft" left="0" name="panel_notes" top="0" - width="313"> + width="313" +> <layout_stack name="layout" orientation="vertical" @@ -16,34 +16,28 @@ layout="topleft" left="0" top="0" - height="430" - width="313" + height="517" border_size="0"> <panel name="notes_stack" follows="all" layout="topleft" top="0" - left="0" - height="390" - width="313"> + left="0"> <scroll_container color="DkGray2" - follows="left|top|right|bottom" - height="390" + follows="all" layout="topleft" left="0" name="profile_scroll" opaque="true" - top="0" - width="313"> + top="0"> <panel - height="350" - layout="topleft" - name="profile_scroll_panel" - top="0" - left="0" - width="293"> + layout="topleft" + name="profile_scroll_panel" + top="0" + left="0" + width="303"> <text follows="left|top" font="SansSerifBold" @@ -52,18 +46,17 @@ left="10" name="status_message" text_color="white" - top="5" + top="20" value="My private notes:" width="293" /> <text_editor follows="left|top" - height="200" - hide_scrollbar="true" + height="120" layout="topleft" left="10" max_length="1000" name="notes_edit" - text_color="black" + text_color="DkGray" top_pad="10" width="280" word_wrap="true" /> @@ -75,70 +68,91 @@ left="10" name="status_message2" text_color="white" - top_pad="10" - value="Let this person:" + top_pad="30" + value="Allow this person to:" width="293" /> <check_box enabled="false" - height="20" + height="16" label="See my online status" layout="topleft" left="20" name="status_check" - top_pad="0" width="293" /> <check_box enabled="false" - height="20" + height="16" label="See me on the map" layout="topleft" left="20" name="map_check" - top_pad="0" width="293" /> <check_box enabled="false" - height="20" + height="16" label="Edit, delete or take my objects" layout="topleft" left="20" name="objects_check" - top_pad="0" width="293" /> </panel> </scroll_container> </panel> <panel - follows="bottom" + follows="bottom|left" height="30" layout="topleft" - left="10" + left="0" name="notes_buttons_panel" - top_pad="5" - width="280" auto_resize="false"> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" - layout="topleft" - left="0" - name="teleport_btn" - top="0" - width="75" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Map" - layout="topleft" - name="show_on_map_btn" - top="0" - left_pad="5" - width="85" /> + <button + follows="bottom|left" + height="19" + label="Add" + layout="topleft" + left="0" + mouse_opaque="false" + name="add_friend" + top="5" + width="55" /> + <button + follows="bottom|left" + height="19" + label="IM" + layout="topleft" + name="im" + top="5" + left_pad="5" + width="40" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Call" + layout="topleft" + name="call" + left_pad="5" + top="5" + width="55" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="5" + left_pad="5" + width="50" /> + <button + follows="bottom|left" + height="19" + label="Teleport" + layout="topleft" + name="teleport" + left_pad="5" + top="5" + width="90" /> </panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 786c39c5e9..b51d53a1b4 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -60,6 +60,7 @@ color="DkGray" label="Nearby" layout="topleft" left="0" + help_topic="people_nearby_tab" name="nearby_panel" top="0" width="313"> @@ -109,6 +110,7 @@ color="DkGray" top="0" label="Friends" layout="topleft" + help_topic="people_friends_tab" name="friends_panel" width="313"> <accordion @@ -214,6 +216,7 @@ color="DkGray" label="Groups" top="0" layout="topleft" + help_topic="people_groups_tab" name="groups_panel" width="313"> <group_list @@ -301,6 +304,7 @@ color="DkGray" height="390" label="Recent" layout="topleft" + help_topic="people_recent_tab" name="recent_panel" width="313"> <avatar_list diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 9edd14ce49..7d5ae3d78a 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -31,8 +31,8 @@ <scroll_container color="DkGray2" opaque="true" - follows="left|top|bottom" - height="490" + follows="all" + height="470" layout="topleft" left="10" top_pad="10" @@ -41,14 +41,14 @@ width="313"> <panel name="scroll_content_panel" - follows="left|top|right|bottom" + follows="left|top" min_height="300" layout="topleft" top="0" background_visible="false" - height="488" + height="470" left="0" - width="311"> + width="295"> <texture_picker enabled="false" follows="left|top" @@ -57,11 +57,11 @@ left="10" name="pick_snapshot" top="20" - width="290" /> + width="280" /> <text follows="left|top|right" height="20" - width="291" + width="280" layout="topleft" font="SansSerifBig" font.style="BOLD" @@ -77,16 +77,16 @@ layout="topleft" left="10" name="pick_location" - width="291" + width="280" word_wrap="true" value="[loading...]" /> <text follows="left|top|right" - height="400" + height="280" layout="topleft" left="10" name="pick_desc" - width="290" + width="280" value="[description]" word_wrap="true" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 1bd1953397..2869ec78f4 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="left|top|right|bottom" - height="555" + follows="all" + height="535" label="Picks" layout="topleft" left="0" name="panel_picks" top="0" width="313"> - <flat_list_view + <flat_list_view color="DkGray2" - follows="left|top|right|bottom" + follows="all" height="465" layout="topleft" left="0" @@ -18,14 +18,14 @@ opaque="true" top="0" width="313" /> - <panel + <panel background_visible="true" bevel_style="none" enabled="false" auto_resize="false" follows="bottom" left="0" - height="23" + height="18" label="bottom_panel" layout="topleft" name="edit_panel" @@ -34,26 +34,24 @@ <button enabled="false" follows="bottom|left" - font="SansSerifBigBold" height="18" image_selected="OptionsMenu_Press" image_unselected="OptionsMenu_Off" image_disabled="OptionsMenu_Disabled" layout="topleft" - left="10" + left="0" name="gear_menu_btn" picture_style="true" top="5" width="18" /> <button follows="bottom|left" - font="SansSerifBigBold" height="18" image_disabled="AddItem_Disabled" image_selected="AddItem_Press" image_unselected="AddItem_Off" layout="topleft" - left="35" + left_pad="15" name="new_btn" picture_style="true" tool_tip="Create New Pick at Current Location" @@ -61,7 +59,6 @@ width="18" /> <button follows="bottom|right" - font="SansSerifBigBold" height="18" image_disabled="TrashItem_Disabled" image_selected="TrashItem_Press" @@ -77,17 +74,56 @@ follows="bottom" auto_resize="false" layout="topleft" - height="30" + height="19" name="buttons_cucks" width="313"> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Map" - layout="topleft" - name="show_on_map_btn" - width="85" /> + <button + follows="bottom|left" + height="19" + label="Add" + layout="topleft" + left="0" + mouse_opaque="false" + name="add_friend" + top="5" + width="55" /> + <button + follows="bottom|left" + height="19" + label="IM" + layout="topleft" + name="im" + top="5" + left_pad="5" + width="40" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Call" + layout="topleft" + name="call" + left_pad="5" + top="5" + width="55" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="5" + left_pad="5" + width="50" /> + <button + follows="bottom|left" + height="19" + label="Teleport" + layout="topleft" + name="teleport" + left_pad="5" + top="5" + width="90" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 696e0b3c33..1ea6e1149d 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -41,6 +41,7 @@ height="326" layout="topleft" left="0" + help_topic="places_info_tab" name="panel_place_info" top="30" visible="false" /> @@ -48,6 +49,7 @@ height="25" layout="topleft" left="0" + help_topic="places_button_tab" name="button_panel" top_pad="10" width="313"> @@ -60,7 +62,7 @@ left="5" name="teleport_btn" top="0" - width="70" /> + width="77" /> <button follows="bottom|left" font="SansSerifSmallBold" 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 06ecfdc995..f7d7d52b68 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -217,7 +217,7 @@ My Avatar: width="237" top_pad="0"/> <check_box - control_name="TapTapHoldtoRun" + control_name="AllowTapTapHoldRun" height="20" label="Tap-tap-hold to run" layout="topleft" @@ -225,36 +225,15 @@ My Avatar: name="tap_tap_hold_to_run" width="237" top_pad="0"/> - <!--menu_item_check - label="Tap-Tap-Hold to Run" - layout="topleft" - name="Tap-Tap-Hold to Run"> - <menu_item_check.on_check - function="Advanced.CheckAllowTapTapHoldRun" - parameter="TapTapHoldRun" /> - <menu_item_check.on_click - function="Advanced.ToggleAllowTapTapHoldRun" /> - </menu_item_check--> <check_box - control_name="EnableLipSync" + control_name="LipSyncEnabled" height="20" - label="Move my avatar's lips when speaking" + label="Move avatar lips when speaking" layout="topleft" left_delta="0" name="enable_lip_sync" width="237" top_pad="0" /> - <!--menu_item_check - label="Enable Lip Sync(Beta)" - layout="topleft" - name="Enable Lip Sync(Beta)"> - <menu_item_check.on_check - function="CheckControl" - parameter="LipSyncEnabled" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="LipSyncEnabled" /> - </menu_item_check--> <check_box control_name="test" height="20" @@ -293,4 +272,4 @@ My Avatar: </radio_group> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index ecfb0048a3..84fcf21623 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -48,41 +48,36 @@ length="1" enabled="true" name="640x480" - value="640 x 480"> - 640x480 - </combo_box.item> + value="640 x 480" + label="640x480"/> <combo_box.item type="string" length="1" enabled="true" name="800x600" - value="800 x 600"> - 800x600 - </combo_box.item> + value="800 x 600" + label="800x600"/> <combo_box.item type="string" length="1" enabled="true" name="720x480" - value="720 x 480"> - 720x480 (NTSC) - </combo_box.item> + value="720 x 480" + label="720x480 (NTSC)"/> <combo_box.item type="string" length="1" enabled="true" name="768x576" - value="768 x 576"> - 768x576 (PAL) - </combo_box.item> + value="768 x 576" + label="768x576 (PAL)"/> <combo_box.item type="string" length="1" enabled="true" name="1024x768" - value="1024 x 768"> - 1024x768 - </combo_box.item> + value="1024 x 768" + label="1024x768"/> <combo_box.commit_callback function="Pref.setControlFalse" parameter="FullScreenAutoDetectAspectRatio" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 9cf699ad46..ba933683e3 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="560" + height="535" label="Profile" layout="topleft" left="0" @@ -10,7 +10,8 @@ width="313"> <string name="CaptionTextAcctInfo"> - [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] + [ACCTTYPE] +[PAYMENTINFO] [AGEVERIFICATION] </string> <string name="payment_update_link_url"> @@ -26,33 +27,31 @@ <string name="no_partner_text" value="None" /> - <scroll_container + <scroll_container color="DkGray2" - follows="left|top|right|bottom" - height="500" + follows="all" + height="485" min_height="300" layout="topleft" name="profile_scroll" reserve_scroll_corner="true" opaque="true" - top="0" - width="313"> - <panel - name="scroll_content_panel" - follows="left|top|right" - layout="topleft" - top="0" - left="0" - width="300" - height="700"> + top="0"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="313"> <panel - follows="left|top" - height="117" - layout="topleft" - left="10" - name="second_life_image_panel" - top="10" - width="285"> + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="285"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -66,7 +65,6 @@ width="102" /> <text follows="left|top|right" - font="SansSerifSmall" font.style="BOLD" height="15" layout="topleft" @@ -81,9 +79,9 @@ height="90" layout="topleft" name="sl_description_edit" - width="170" + width="173" expanded_bg_visible="true" - expanded_bg_color="black"> + expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </expandable_text> </panel> @@ -107,7 +105,6 @@ width="102" /> <text follows="left|top|right" - font="SansSerifSmall" font.style="BOLD" height="15" layout="topleft" @@ -116,7 +113,7 @@ text_color="white" top_delta="0" value="Real World:" - width="175" /> + width="173" /> <expandable_text follows="left|top|right" height="90" @@ -124,7 +121,7 @@ name="fl_description_edit" width="170" expanded_bg_visible="true" - expanded_bg_color="black"> + expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </expandable_text> </panel> @@ -138,7 +135,7 @@ left="10" name="me_homepage_text" text_color="white" - top_pad="10" + top_pad="0" width="280"> Homepage: </text> @@ -148,19 +145,21 @@ layout="topleft" left="10" name="homepage_edit" + top_pad="0" value="http://librarianavengers.org" - width="280" - word_wrap="false" /> + width="290" + word_wrap="false" + use_elipsis="true" + /> <text follows="left|top" - font="SansSerifSmall" font.style="BOLD" - height="15" + height="10" layout="topleft" left="10" name="title_member_text" text_color="white" - top_pad="20" + top_pad="10" value="Member Since:" width="280" /> <text @@ -169,20 +168,18 @@ layout="topleft" left="10" name="register_date" - top_pad="5" value="05/31/1976" width="280" word_wrap="true" /> <text follows="left|top" - font="SansSerifSmall" font.style="BOLD" height="15" layout="topleft" left="10" name="title_acc_status_text" text_color="white" - top_pad="15" + top_pad="10" value="Account Status:" width="280" /> <!-- <text @@ -198,24 +195,23 @@ width="100"/> --> <text follows="left|top" - height="15" + height="20" layout="topleft" left="10" name="acc_status_text" - top_pad="5" + top_pad="0" value="Resident. No payment info on file." - width="280" + width="295" word_wrap="true" /> <text follows="left|top" - font="SansSerifSmall" font.style="BOLD" height="15" layout="topleft" left="10" name="title_partner_text" text_color="white" - top_pad="15" + top_pad="10" value="Partner:" width="280" /> <panel @@ -224,11 +220,11 @@ layout="topleft" left="10" name="partner_data_panel" - top_pad="5" + top_pad="0" width="280"> <text follows="left|top" - height="15" + height="10" layout="topleft" left="0" name="partner_text" @@ -239,14 +235,13 @@ </panel> <text follows="left|top" - font="SansSerifSmall" font.style="BOLD" height="15" layout="topleft" left="10" name="title_groups_text" text_color="white" - top_pad="15" + top_pad="10" value="Groups:" width="280" /> <text @@ -255,91 +250,93 @@ layout="topleft" left="10" name="sl_groups" - top_pad="5" - width="280" - word_wrap="true"> + top_pad="0" + width="290" + word_wrap="true" + use_elipsis="true"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> </panel> - </scroll_container> - - <panel + </scroll_container> + <panel follows="bottom|left" layout="topleft" left="0" name="profile_buttons_panel" - top_pad="0" - height="25" - width="313"> + top_pad="2" + bottom="10" + height="19"> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Add Friend" + height="19" + label="Add" layout="topleft" left="0" mouse_opaque="false" name="add_friend" - top="0" - width="90" /> + top="5" + width="55" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="IM" layout="topleft" name="im" - top="0" - left_pad="0" + top="5" + left_pad="5" width="40" /> <button enabled="false" follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Call" layout="topleft" name="call" - left_pad="0" - top="0" + left_pad="5" + top="5" + width="55" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="5" + left_pad="5" width="50" /> <button follows="bottom|left" - font="SansSerifSmallBold" - height="25" + height="19" label="Teleport" layout="topleft" name="teleport" - left_pad="0" - top="0" - width="75" /> - </panel> - <panel + left_pad="5" + top="5" + width="90" /> + </panel> + <panel follows="bottom|left" layout="topleft" left="0" name="profile_me_buttons_panel" - top_pad="0" + top_pad="-3" visible="false" - height="25" - width="313"> + height="19"> <button - follows="bottom|left" - height="23" + follows="bottom|right" + height="19" + left="10" label="Edit Profile" - layout="topleft" - left="0" name="edit_profile_btn" - top="0" width="130" /> <button - follows="bottom|left" - height="23" + follows="bottom|right" + height="19" label="Edit Appearance" - layout="topleft" - left_pad="5" + left_pad="10" name="edit_appearance_btn" - top="0" + right="-10" width="130" /> - </panel> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 606535115d..8a48574440 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -5,7 +5,6 @@ height="570" layout="topleft" min_height="350" - min_width="240" name="panel_target_profile" width="333"> <string @@ -16,65 +15,69 @@ name="status_offline"> Offline </string> + <button + follows="top|right" + height="23" + image_overlay="BackArrow_Off" + layout="topleft" + name="back" + picture_style="true" + left="10" + tab_stop="false" + top="2" + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" - height="20" + height="26" layout="topleft" - left="10" + left_pad="10" name="user_name" text_color="white" top="0" value="(Loading...)" - width="250" /> + use_elipsis="true" + width="275" /> <text follows="top|left" - height="16" + height="13" layout="topleft" - left="10" + left="45" name="status" text_color="LtGray_50" - top_pad="5" value="Online" - width="100" /> - <button - follows="top|right" - height="25" - image_overlay="BackArrow_Off" - layout="topleft" - name="back" - picture_style="true" - right="-10" - tab_stop="false" - top="0" - width="25" /> + width="150" /> <tab_container - follows="left|top|right|bottom" - height="560" + follows="all" + height="535" layout="topleft" left="10" name="tabs" - tab_min_width="75" + tab_min_width="95" + tab_height="30" tab_position="top" - top_pad="15" - width="285"> + top_pad="10" + width="313"> <panel class="panel_profile" filename="panel_profile.xml" label="Profile" layout="topleft" + help_topic="profile_profile_tab" name="panel_profile" /> <panel class="panel_picks" filename="panel_picks.xml" label="Picks" layout="topleft" + help_topic="profile_picks_tab" name="panel_picks" /> <panel class="panel_notes" filename="panel_notes.xml" label="Notes & Privacy" layout="topleft" + help_topic="profile_notes_tab" name="panel_notes" /> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 9abaf29f57..a312e4cf13 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -62,7 +62,7 @@ <text follows="left|right|top" font="SansSerifHuge" - font_shadow="hard" + font_shadow="none" halign="left" height="20" layout="topleft" @@ -74,7 +74,7 @@ <text follows="left|right|top" font="SansSerif" - font_shadow="hard" + font_shadow="none" halign="left" height="20" layout="topleft" @@ -96,7 +96,7 @@ <text follows="left|right|top|bottom" font="SansSerifLarge" - font_shadow="hard" + font_shadow="none" halign="left" height="100" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 01fbc81c32..b3147f5e6b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="350" + height="320" label="Covenant" layout="topleft" left="0" name="Covenant" top="320" - width="280"> + width="480"> <panel.string name="can_resell"> Purchased land in this region may be resold. @@ -45,14 +45,14 @@ mouse_opaque="false" name="estate_name_lbl" top_pad="5" - width="75"> + width="100"> Name: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="estate_name_text" top_delta="0" @@ -67,41 +67,40 @@ mouse_opaque="false" name="estate_owner_lbl" top_pad="5" - width="75"> + width="100"> Owner: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="estate_owner_text" top_delta="0" width="150"> (none) </text> - - <text + <text follows="left|top" - height="20" + height="20" layout="topleft" left="10" - mouse_opaque="false" - name="estate_cov_lbl" + mouse_opaque="false" + name="estate_cov_lbl" top_pad="5" - width="75"> + width="100"> Covenant: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="covenant_timestamp_text" top_delta="0" - width="167"> + width="308"> Last Modified Wed Dec 31 16:00:00 1969 </text> <button @@ -120,12 +119,12 @@ follows="left|top" height="100" layout="topleft" - left="80" + left="110" max_length="65535" name="covenant_editor" top_delta="30" handle_edit_keys_directly="true" - width="193" + width="340" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> @@ -135,7 +134,7 @@ height="18" label="Reset" layout="topleft" - left_delta="75" + left_delta="250" name="reset_covenant" top_pad="5" width="90" /> @@ -144,12 +143,11 @@ follows="left|top" height="20" layout="topleft" - left="85" + left="120" name="covenant_help_text" top_pad="10" - width="190"> - Changes to the covenant will show -on all parcels in the estate. + width="460"> + Changes to the covenant will show on all parcels in the estate. </text> <text follows="left|top" @@ -157,10 +155,10 @@ on all parcels in the estate. layout="topleft" left_delta="0" name="covenant_instructions" - top_pad="15" - width="190"> + top_pad="5" + width="465"> Drag and drop a notecard to change -the Covenant for this Estate. + the Covenant for this Estate. </text> <text @@ -171,7 +169,7 @@ the Covenant for this Estate. left="5" mouse_opaque="false" name="region_section_lbl" - top_pad="10" + top_pad="5" width="100"> Region </text> @@ -183,19 +181,19 @@ the Covenant for this Estate. mouse_opaque="false" name="region_name_lbl" top_pad="5" - width="75"> + width="100"> Name: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="region_name_text" top_delta="0" width="150"> - leyla + Erica </text> <text follows="left|top" @@ -205,14 +203,14 @@ the Covenant for this Estate. mouse_opaque="false" name="region_landtype_lbl" top_pad="5" - width="75"> + width="100"> Type: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="region_landtype_text" top_delta="0" @@ -227,14 +225,14 @@ the Covenant for this Estate. mouse_opaque="false" name="region_maturity_lbl" top_pad="5" - width="75"> + width="100"> Rating: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="region_maturity_text" top_delta="0" @@ -249,20 +247,19 @@ the Covenant for this Estate. mouse_opaque="false" name="resellable_lbl" top_pad="5" - width="75"> + width="100"> Resale: </text> <text follows="left|top" height="20" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="resellable_clause" top_delta="0" - width="190"> - Land in this region may not be -resold. + width="330"> + Land in this region may not be resold. </text> <text follows="left|top" @@ -271,21 +268,20 @@ resold. left="10" mouse_opaque="false" name="changeable_lbl" - top_pad="10" - width="75"> + top_pad="5" + width="100"> Subdivide: </text> <text follows="left|top" height="30" layout="topleft" - left_pad="0" + left_pad="10" mouse_opaque="false" name="changeable_clause" top_delta="0" - width="190"> - Land in this region may not be -joined/subdivided. + width="330"> + Land in this region may not be joined/subdivided. </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 54664bb6b9..78e5678455 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -8,7 +8,7 @@ left="0" name="Debug" top="320" - width="280"> + width="480"> <text follows="left|top" font="SansSerif" @@ -28,7 +28,7 @@ left_delta="50" name="region_text" top_delta="0" - width="220"> + width="400"> unknown </text> <check_box @@ -91,15 +91,16 @@ <button enabled="false" follows="left|top" - height="20" font="SansSerifSmall" + height="20" label="Apply" layout="topleft" left="60" name="apply_btn" top="100" - width="80" /> + width="100" /> <text + follows="left|top" height="20" layout="topleft" @@ -110,16 +111,18 @@ Object Return </text> <text + follows="left|top" height="20" layout="topleft" - left="20" + left="30" name="resident_text_lbl" top="175" width="60"> Resident: </text> <line_editor + border_style="line" border_thickness="1" enabled="false" @@ -130,7 +133,7 @@ mouse_opaque="false" name="target_avatar_name" top_delta="-2" - width="115"> + width="180"> (none) </line_editor> <button @@ -143,17 +146,17 @@ name="choose_avatar_btn" top_delta="0" width="70" /> - <text + <text follows="left|top" height="20" layout="topleft" - left="20" + left="30" name="options_text_lbl" top="198" width="60"> Options: </text> - <check_box + <check_box height="20" label="With scripts" layout="topleft" @@ -192,15 +195,15 @@ width="80" /> <button follows="left|top" - height="20" font="SansSerifSmall" + height="20" label="Get Top Colliders..." layout="topleft" left="10" name="top_colliders_btn" tool_tip="List of objects experiencing the most potential collisions" top="313" - width="130" /> + width="150" /> <button follows="left|top" font="SansSerifSmall" @@ -213,15 +216,15 @@ width="18" /> <button follows="left|top" - height="20" font="SansSerifSmall" + height="20" label="Get Top Scripts..." layout="topleft" left="10" name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts" top_pad="5" - width="130" /> + width="150" /> <button follows="left|top" font="SansSerifSmall" @@ -234,15 +237,15 @@ width="18" /> <button follows="left|top" - height="20" font="SansSerifSmall" + height="20" label="Restart Region" layout="topleft" left="10" name="restart_btn" tool_tip="Give 2 minute countdown and restart region" top_pad="5" - width="110" /> + width="130" /> <button follows="left|top" font="SansSerifSmall" @@ -255,13 +258,13 @@ width="18" /> <button follows="left|top" - height="20" font="SansSerifSmall" + height="20" label="Delay Restart" layout="topleft" left="10" name="cancel_restart_btn" tool_tip="Delay region restart by one hour" top_pad="5" - width="110" /> + width="130" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 6e837bcfee..afcefcbd3b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -2,474 +2,518 @@ <panel border="false" follows="top|left" - height="512" - top="0" - left="0" - name="EstateWrapper" + height="320" label="Estate" layout="topleft" - width="313"> - <panel - follows="top|left" - height="950" - label="Estate" + left="0" + name="Estate" + top="320" + width="480"> + <panel.string + name="email_unsupported"> + Feature unsupported + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="32" layout="topleft" - name="Estate" + left="10" + name="estate_help_text" + top="14" width="313"> - <panel.string - name="email_unsupported"> - Feature unsupported - </panel.string> - <text - type="string" - length="1" - follows="left|top" - height="32" - layout="topleft" - left="0" - name="estate_help_text" - top="5" - width="313"> Changes to settings on this tab will affect all - regions in the estate. - </text> - <text - type="string" - length="1" - follows="left|top" - - layout="topleft" - name="estate_text" - top_pad="5" - width="313"> +regions in the estate. + </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="0" + name="estate_text" + top_pad="2" + width="80"> Estate: - </text> - <text - type="string" - length="1" - follows="left|top" - layout="topleft" - name="estate_name" - top_pad="5" - width="313"> + </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="0" + name="estate_name" + top_delta="16" + width="150"> (unknown) - </text> - <text - type="string" - length="1" - follows="left|top" - layout="topleft" - left_delta="0" - name="owner_text" - top_pad="5" - width="313"> - Estate Owner: - </text> - <text - type="string" - length="1" - follows="left|top" - layout="topleft" - name="estate_owner" - top_pad="5" - width="313"> + </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="0" + name="owner_text" + top_pad="2" + width="80"> + Estate owner: + </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="0" + name="estate_owner" + top_delta="16" + width="150"> (unknown) - </text> - <check_box - height="23" - label="Use Global Time" - layout="topleft" - left="12" - name="use_global_time_check" - top="102" - width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="use_global_time_help" - top_delta="2" - width="18" /> - <check_box - height="23" - label="Fixed Sun" - layout="topleft" - left="12" - name="fixed_sun_check" - top_pad="10" - width="100" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="120" - name="fixed_sun_help" - top_delta="2" - width="18" /> - <icon - height="23" - image_name="icon_day_cycle.tga" - layout="topleft" - left="47" - name="daycycle" - top_pad="10" - width="165" /> - <slider - follows="left|top" - height="23" - increment="0.001" - label="Phase" - layout="topleft" - left="12" - max_val="30" - min_val="6" - name="sun_hour_slider" - show_text="false" - top_pad="10" - width="200" /> - <check_box - height="23" - label="Allow Public Access" - layout="topleft" - left_delta="0" - name="externally_visible_check" - top_pad="10" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="externally_visible_help" - top_delta="2" - width="18" /> - <text - type="string" - length="1" - follows="top|left" - height="16" - layout="topleft" - left="32" - name="Only Allow" - top_pad="5" - width="278"> + </text> + <view_border + bevel_style="in" + follows="top|left" + height="290" + layout="topleft" + left_delta="-4" + top_pad="5" + width="250" /> + <check_box + height="20" + label="Use Global Time" + layout="topleft" + left="12" + name="use_global_time_check" + top="132" + width="200" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="20" + name="use_global_time_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Fixed Sun" + layout="topleft" + left="12" + name="fixed_sun_check" + top="152" + width="100" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="120" + name="fixed_sun_help" + top_delta="2" + width="18" /> + <icon + height="20" + image_name="icon_day_cycle.tga" + layout="topleft" + left="47" + name="daycycle" + top="177" + width="165" /> + <slider + follows="left|top" + height="20" + increment="0.001" + label="Phase" + layout="topleft" + left="12" + max_val="30" + min_val="6" + name="sun_hour_slider" + show_text="false" + top="202" + width="200" /> + <check_box + height="20" + label="Allow Public Access" + layout="topleft" + left_delta="0" + name="externally_visible_check" + top_pad="6" + width="200" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="20" + name="externally_visible_help" + top_delta="2" + width="18" /> + <text + type="string" + length="1" + follows="top|left" + height="16" + layout="topleft" + left="32" + name="Only Allow" + top="250" + width="278"> Restrict Access To: - </text> - <check_box - follows="top|left" - height="16" - label="Residents with payment info on file" - layout="topleft" - left_delta="0" - name="limit_payment" - tool_tip="Ban unidentified residents." - top_pad="2" - width="278" /> - <check_box - follows="top|left" - height="16" - label="Age-verified adults" - layout="topleft" - left_delta="0" - name="limit_age_verified" - tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information." - top_pad="2" - width="278" /> - <check_box - height="23" - label="Allow Voice Chat" - layout="topleft" - left="12" - name="voice_chat_check" - top_pad="5" - width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="voice_chat_help" - top_delta="2" - width="18" /> - <check_box - height="23" - label="Allow Direct Teleport" - layout="topleft" - left="12" - name="allow_direct_teleport" - top_pad="0" - width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="140" - name="allow_direct_teleport_help" - top_delta="2" - width="18" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="10" - name="abuse_email_text" - top_pad="5" - width="313"> + </text> + <check_box + follows="top|left" + height="16" + label="Residents with payment info on file" + layout="topleft" + left_delta="0" + name="limit_payment" + tool_tip="Ban unidentified residents." + top_pad="2" + width="278" /> + <check_box + follows="top|left" + height="16" + label="Age-verified adults" + layout="topleft" + left_delta="0" + name="limit_age_verified" + tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information." + top_pad="2" + width="278" /> + <check_box + height="20" + label="Allow Voice Chat" + layout="topleft" + left="12" + name="voice_chat_check" + top="304" + width="200" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="20" + name="voice_chat_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Allow Direct Teleport" + layout="topleft" + left="12" + name="allow_direct_teleport" + top_pad="4" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="140" + name="allow_direct_teleport_help" + top_delta="2" + width="18" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="abuse_email_text" + top_pad="5" + width="180"> Abuse email address: - </text> - <line_editor - follows="top|left" - height="19" - layout="topleft" - left="15" - name="abuse_email_address" - top_pad="0" - width="250" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="12" - name="abuse_email_address_help" - top_delta="0" - width="18" /> - <button - enabled="false" - follows="left|top" - height="23" - label="Apply" - layout="topleft" - name="apply_btn" - right="250" - top_pad="4" - width="90" /> - <button - follows="left|top" - height="23" - label="Send Message To Estate..." - layout="topleft" - left="8" - name="message_estate_btn" - top_pad="5" - width="250" /> - <button - follows="left|top" - height="23" - label="Kick User from Estate..." - layout="topleft" - left="8" - name="kick_user_from_estate_btn" - top_pad="5" - width="250" /> - <text - type="string" - length="1" - top="490" - follows="left|top" - height="23" - layout="topleft" - name="estate_manager_label" - left="8" - width="200"> + </text> + <line_editor + follows="top|left" + height="19" + layout="topleft" + left="15" + name="abuse_email_address" + top_pad="5" + width="205" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="12" + name="abuse_email_address_help" + top_dekta="0" + width="18" /> + <button + enabled="false" + follows="left|top" + height="20" + label="Apply" + layout="topleft" + name="apply_btn" + right="250" + top_pad="4" + width="90" /> + <button + follows="left|top" + height="20" + label="Send Message To Estate..." + layout="topleft" + left="8" + name="message_estate_btn" + top_pad="5" + width="250" /> + <button + follows="left|top" + height="20" + label="Kick User from Estate..." + layout="topleft" + left="8" + name="kick_user_from_estate_btn" + top_pad="5" + width="250" /> + + <text + type="string" + length="1" + bottom="34" + follows="left|top" + height="20" + layout="topleft" + name="estate_manager_label" + right="470" + width="200"> Estate Managers: - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="232" - name="estate_manager_help" - top_delta="-1" - width="18" /> - <name_list - follows="left|top" - height="60" - layout="topleft" - left="8" - multi_select="true" - name="estate_manager_name_list" - top_pad="0" - width="300" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left="8" - name="add_estate_manager_btn" - top_pad="5" - width="90" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_estate_manager_btn" - left_pad="70" - top_delta="0" - width="90" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="8" - name="allow_resident_label" - top_pad="5" - width="200"> + </text> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_delta="182" + name="estate_manager_help" + top_delta="-1" + width="18" /> + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + right="470" + top_pad="5" + width="200" /> + <name_list + follows="left|top" + height="60" + layout="topleft" + left_delta="0" + multi_select="true" + name="estate_manager_name_list" + top_delta="0" + width="200" /> + <button + follows="left|top" + height="20" + label="Remove..." + layout="topleft" + name="remove_estate_manager_btn" + right="470" + top_pad="5" + width="90" /> + <button + follows="left|top" + height="20" + label="Add..." + layout="topleft" + left_delta="-110" + name="add_estate_manager_btn" + top_delta="0" + width="90" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="allow_resident_label" + top_pad="5" + width="200"> Allowed Residents: - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="232" - name="allow_resident_help" - top_delta="-1" - width="18" /> - <name_list - follows="left|top" - height="60" - layout="topleft" - left="8" - multi_select="true" - name="allowed_avatar_name_list" - top_pad="0" - width="300" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left="8" - name="add_allowed_avatar_btn" - top_pad="5" - width="90" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_allowed_avatar_btn" - left_pad="70" - top_delta="0" - width="90" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="8" - name="allow_group_label" - top_pad="5" - width="200"> + </text> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_delta="182" + name="allow_resident_help" + top_delta="-1" + width="18" /> + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + right="470" + top_pad="5" + width="200" /> + <name_list + follows="left|top" + height="60" + layout="topleft" + left_delta="0" + multi_select="true" + name="allowed_avatar_name_list" + top_delta="0" + width="200" /> + <button + follows="left|top" + height="20" + label="Remove..." + layout="topleft" + name="remove_allowed_avatar_btn" + right="470" + top_pad="5" + width="90" /> + <button + follows="left|top" + height="20" + label="Add..." + layout="topleft" + left_delta="-110" + name="add_allowed_avatar_btn" + top_delta="0" + width="90" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="allow_group_label" + top_pad="5" + width="200"> Allowed Groups: - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="232" - name="allow_group_help" - top_delta="-1" - width="18" /> - <name_list - follows="left|top" - height="60" - layout="topleft" - left="8" - multi_select="true" - name="allowed_group_name_list" - top_pad="0" - width="300" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left="8" - name="add_allowed_group_btn" - top_pad="5" - width="90" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_allowed_group_btn" - left_pad="70" - top_delta="0" - width="90" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="8" - name="ban_resident_label" - top_pad="5" - width="200"> + </text> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_delta="182" + name="allow_group_help" + top_delta="-1" + width="18" /> + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + right="470" + top_pad="5" + width="200" /> + <name_list + follows="left|top" + height="60" + layout="topleft" + left_delta="0" + multi_select="true" + name="allowed_group_name_list" + top_delta="0" + width="200" /> + <button + follows="left|top" + height="20" + label="Remove..." + layout="topleft" + name="remove_allowed_group_btn" + right="470" + top_pad="5" + width="90" /> + <button + follows="left|top" + height="20" + label="Add..." + layout="topleft" + left_delta="-110" + name="add_allowed_group_btn" + top_delta="0" + width="90" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="ban_resident_label" + top_pad="5" + width="200"> Banned Residents: - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="232" - name="ban_resident_help" - top_delta="-1" - width="18" /> - <name_list - follows="left|top" - height="60" - layout="topleft" - left="8" - multi_select="true" - name="banned_avatar_name_list" - top_pad="0" - width="300" /> - <button - follows="left|top" - height="23" - label="Add..." - layout="topleft" - left="8" - name="add_banned_avatar_btn" - top_pad="5" - width="90" /> - <button - follows="left|top" - height="23" - label="Remove..." - layout="topleft" - name="remove_banned_avatar_btn" - left_pad="70" - top_delta="0" - width="90" /> - </panel> + </text> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_delta="182" + name="ban_resident_help" + top_delta="-1" + width="18" /> + <view_border + bevel_style="none" + follows="top|left" + height="60" + layout="topleft" + right="470" + top_pad="5" + width="200" /> + <name_list + follows="left|top" + height="60" + layout="topleft" + left_delta="0" + multi_select="true" + name="banned_avatar_name_list" + top_delta="0" + width="200" /> + <button + follows="left|top" + height="20" + label="Remove..." + layout="topleft" + name="remove_banned_avatar_btn" + right="470" + top_pad="5" + width="90" /> + <button + follows="left|top" + height="20" + label="Add..." + layout="topleft" + left_delta="-110" + name="add_banned_avatar_btn" + top_delta="0" + width="90" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 9b9c62dbf9..160ae96fc4 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="360" + height="320" label="Region" layout="topleft" left="0" name="General" - top="360" - width="280"> + top="320" + width="480"> <text follows="left|top" font="SansSerif" @@ -28,7 +28,7 @@ left_delta="50" name="region_text" top_delta="0" - width="200"> + width="400"> unknown </text> <text @@ -279,7 +279,7 @@ label="PG" name="PG" value="13" /> - </combo_box> + </combo_box> <button follows="left|top" font="SansSerifSmall" @@ -300,10 +300,10 @@ name="apply_btn" top="320" width="100"> - <button.commit_callback + <button.commit_callback function="RegionInfo.Cancel" /> </button> - <button + <button follows="left|top" height="20" label="Teleport Home One User..." @@ -335,8 +335,8 @@ height="20" label="Manage Telehub..." layout="topleft" - left_delta="0" + left="250" name="manage_telehub_btn" - top_pad="20" - width="150" /> + top="70" + width="150" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml new file mode 100644 index 0000000000..9b9c62dbf9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -0,0 +1,342 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="360" + label="Region" + layout="topleft" + left="0" + name="General" + top="360" + width="280"> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="region_text_lbl" + top="10" + width="100"> + Region: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_text" + top_delta="0" + width="200"> + unknown + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="version_channel_text_lbl" + top="30" + width="100"> + Version: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="version_channel_text" + top_delta="0" + width="200"> + unknown + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left="10" + name="region_type_lbl" + top="50" + width="100"> + Type: + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_type" + top_delta="0" + width="200"> + unknown + </text> + <check_box + height="20" + label="Block Terraform" + layout="topleft" + left="10" + name="block_terraform_check" + top="70" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="terraform_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Block Fly" + layout="topleft" + left="10" + name="block_fly_check" + top="90" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="fly_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Allow Damage" + layout="topleft" + left="10" + name="allow_damage_check" + top="110" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="damage_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Restrict Pushing" + layout="topleft" + left="10" + name="restrict_pushobject" + top="130" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="restrict_pushobject_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Allow Land Resell" + layout="topleft" + left="10" + name="allow_land_resell_check" + top="160" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="land_resell_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Allow Land Join/Divide" + layout="topleft" + left="10" + name="allow_parcel_changes_check" + top="180" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="parcel_changes_help" + top_delta="2" + width="18" /> + <check_box + height="20" + label="Block Land Show in Search" + layout="topleft" + left="10" + name="block_parcel_search_check" + tool_tip="Let people see this region and its parcels in search results" + top="200" + width="80" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="115" + name="parcel_search_help" + top_delta="2" + width="18" /> + <spinner + follows="left|top" + height="20" + increment="1" + label="Agent Limit" + label_width="97" + layout="topleft" + left="10" + max_val="100" + min_val="1" + name="agent_limit_spin" + top="240" + width="170" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="25" + name="agent_limit_help" + top_delta="2" + width="18" /> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Object Bonus" + label_width="97" + layout="topleft" + left="10" + max_val="10" + min_val="1" + name="object_bonus_spin" + top="260" + width="170" /> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="25" + name="object_bonus_help" + top_delta="2" + width="18" /> + <text + follows="left|top" + height="20" + label="Maturity" + layout="topleft" + left="10" + name="access_text" + top="290" + width="100"> + Rating: + </text> + <combo_box + height="20" + label="Mature" + layout="topleft" + left_delta="100" + name="access_combo" + top_delta="0" + width="85"> + <combo_box.item + label="Adult" + name="Adult" + value="42" /> + <combo_box.item + label="Mature" + name="Mature" + value="21" /> + <combo_box.item + label="PG" + name="PG" + value="13" /> + </combo_box> + <button + follows="left|top" + font="SansSerifSmall" + height="18" + label="?" + layout="topleft" + left_pad="10" + name="access_help" + top_delta="2" + width="18" /> + <button + enabled="false" + follows="left|top" + height="20" + label="Apply" + layout="topleft" + left="108" + name="apply_btn" + top="320" + width="100"> + <button.commit_callback + function="RegionInfo.Cancel" /> + </button> + <button + follows="left|top" + height="20" + label="Teleport Home One User..." + layout="topleft" + left="10" + name="kick_btn" + top_pad="10" + width="250" /> + <button + follows="left|top" + height="20" + label="Teleport Home All Users..." + layout="topleft" + left_delta="0" + name="kick_all_btn" + top_pad="3" + width="250" /> + <button + follows="left|top" + height="20" + label="Send Message To Region..." + layout="topleft" + left_delta="0" + name="im_btn" + top_pad="20" + width="200" /> + <button + follows="left|top" + height="20" + label="Manage Telehub..." + layout="topleft" + left_delta="0" + name="manage_telehub_btn" + top_pad="20" + width="150" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index a78a1ea98c..148d9500bb 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -2,13 +2,13 @@ <panel border="true" follows="top|left" - height="340" + height="320" label="Terrain" layout="topleft" left="0" name="Terrain" top="320" - width="280"> + width="480"> <text follows="left|top" font="SansSerif" @@ -28,7 +28,7 @@ left_delta="50" name="region_text" top_delta="0" - width="200"> + width="400"> unknown </text> <spinner @@ -101,9 +101,9 @@ height="20" label="Use Estate Sun" layout="topleft" - left="15" + left="250" name="use_estate_sun_check" - top="105" + top="35" width="100" /> <button follows="left|top" @@ -111,7 +111,7 @@ height="18" label="?" layout="topleft" - left_pad="85" + left_pad="70" name="use_estate_sun_help" top_delta="2" width="18" /> @@ -119,9 +119,9 @@ height="20" label="Fixed Sun" layout="topleft" - left="15" + left="250" name="fixed_sun_check" - top_pad="0" + top="55" width="100" /> <button follows="left|top" @@ -129,7 +129,7 @@ height="18" label="?" layout="topleft" - left_pad="85" + left_pad="70" name="fixed_sun_help" top_delta="2" width="18" /> @@ -137,9 +137,9 @@ height="20" image_name="icon_day_cycle.tga" layout="topleft" - left="50" + left="285" name="daycycle" - top_delta="25" + top="80" width="165" /> <slider follows="left|top" @@ -147,12 +147,12 @@ increment="0.001" label="Phase" layout="topleft" - left="15" + left="250" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" - top_delta="30" + top="105" width="200" /> <button enabled="false" @@ -160,18 +160,18 @@ height="20" label="Apply" layout="topleft" - left="130" + left="350" name="apply_btn" - top_delta="30" + top="135" width="90" /> <view_border bevel_style="none" follows="top|left" - height="210" + height="130" layout="topleft" left="8" top="30" - width="240" /> + width="460" /> <button follows="left|top" height="20" @@ -180,7 +180,7 @@ left_delta="2" name="download_raw_btn" tool_tip="Available only to estate owners, not managers" - top_pad="15" + top_pad="60" width="170" /> <button follows="left|top" @@ -200,7 +200,7 @@ left="10" name="upload_raw_btn" tool_tip="Available only to estate owners, not managers" - top_pad="0" + top="243" width="170" /> <button follows="left|top" @@ -220,7 +220,7 @@ left="10" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits" - top_pad="15" + top="283" width="100" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml index 404e1b8907..5089064c07 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -2,231 +2,235 @@ <panel border="true" follows="top|left" - height="512" - name="TextureWrapper" + height="320" label="Ground Textures" layout="topleft" - width="280"> - <scroll_container - follows="top|left|right|bottom" - height="508" - name="container1" - layout="topleft" - width="280"> - <panel - follows="top|left" - height="575" - label="Ground Textures" + left="0" + name="Textures" + top="320" + width="480"> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" layout="topleft" - name="Textures" - width="258"> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="10" - name="region_text_lbl" - top="10" - width="100"> + left="10" + name="region_text_lbl" + top="10" + width="100"> Region: - </text> - <text - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="50" - name="region_text" - top_delta="0" - width="200"> + </text> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="20" + layout="topleft" + left_delta="50" + name="region_text" + top_delta="0" + width="400"> unknown - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="detail_texture_text" - top="36" - width="300"> - Terrain Textures - (requires 512x512, 24 bit .tga files) - </text> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_delta="0" - name="texture_detail_0" - top_delta="30" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_1" - top_delta="0" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left="10" - name="texture_detail_2" - top_delta="105" - width="100" /> - <texture_picker - follows="left|top" - height="100" - layout="topleft" - left_pad="10" - name="texture_detail_3" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl" - top="157" - width="65"> + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="detail_texture_text" + top="36" + width="300"> + Terrain Textures (requires 512x512, 24 bit .tga files) + </text> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_delta="0" + name="texture_detail_0" + top_delta="20" + width="100" /> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_1" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_2" + top_delta="0" + width="100" /> + <texture_picker + follows="left|top" + height="100" + layout="topleft" + left_pad="10" + name="texture_detail_3" + top_delta="0" + width="100" /> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="height_text_lbl" + top="146" + width="65"> 1 (Low) - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="45" - name="height_text_lbl2" - top_delta="0" - width="100"> + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_pad="45" + name="height_text_lbl2" + top_delta="0" + width="100"> 2 - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl3" - top_delta="105" - width="100"> + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl3" + top_delta="0" + width="100"> 3 - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl4" - top_delta="0" - width="100"> + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl4" + top_delta="0" + width="100"> 4 (High) - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl5" - top_delta="25" - width="300"> + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="height_text_lbl5" + top="186" + width="300"> Texture Elevation Ranges - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl6" - top_delta="20" - width="100"> + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left="51" + name="height_text_lbl6" + top="201" + width="100"> Southwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl7" - top_delta="0" - width="100"> + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl7" + top_delta="0" + width="100"> Northwest - </text> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_0" - top_delta="20" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_1" - top_delta="0" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_0" - top_delta="20" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_1" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl8" - top_delta="30" - width="100"> + </text> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_start_spin_0" + top_delta="20" + width="100" /> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_1" + top_delta="0" + width="100" /> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_range_spin_0" + top_delta="20" + width="100" /> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_1" + top_delta="0" + width="100" /> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl8" + top_delta="0" + width="100"> Southeast - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl9" - top_delta="0" - width="100"> + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl9" + top_delta="0" + width="100"> Northeast - </text> + </text> <spinner follows="left|top" height="20" @@ -303,17 +307,14 @@ and the HIGH value is the MINIMUM height of Texture #4. </text> - - <button - enabled="false" - follows="left|bottom" - height="20" - label="Apply" - layout="topleft" - left="120" - name="apply_btn" - top_delta="60" - width="100" /> - </panel> - </scroll_container> + <button + enabled="false" + follows="left|bottom" + height="20" + label="Apply" + layout="topleft" + left="350" + name="apply_btn" + top="290" + width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index d172154d49..d3d45640cb 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -74,7 +74,7 @@ help_topic="sidebar_places" tab_title="Places" label="Places" - description="Find places to go and places you've been." + description="Find places to go and places you've visited before." image="TabIcon_Places_Off" mouse_opaque="false" background_visible="true" @@ -93,7 +93,7 @@ name="sidebar_me" help_topic="sidebar_me" tab_title="Me" - description="Change your profile, your look and quick links to your outfits." + description="Edit your public profile and Picks." image="TabIcon_Me_Off" mouse_opaque="false" background_visible="true" @@ -111,7 +111,7 @@ name="sidebar_appearance" help_topic="sidebar_appearance" tab_title="Appearance" - description="Change your looks and appearance." + description="Change your appearance and current look." image="TabIcon_Appearance_Off" mouse_opaque="false" background_opaque="false" diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index d379c60aed..e991861e94 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bevel_style="in" - follows="left|top|right|bottom" - height="420" + bevel_style="out" + follows="all" + height="560" label="home_tab" layout="topleft" name="home_tab" @@ -13,37 +13,36 @@ bg_alpha_color="DkGray2" class="panel_sidetray_home_info" follows="left|top|right" - height="130" + height="120" layout="topleft" - left="10" + left="15" + top="17" name="sidebar_people" - width="313"> + width="303"> <text follows="left|right|top" font="SansSerifBigBold" height="30" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="tab_name" - text_color="white" + text_color="EmphasisColor" top="10" value="People" width="200" word_wrap="true" /> <icon - color="DkGray" follows="top|right" height="20" layout="topleft" name="tab_icon" right="-10" top="10" - image_name="TabIcon_Home_Selected" + image_name="TabIcon_People_Selected" width="20" /> <text follows="left|right|bottom" - font="SansSerifBold" height="120" layout="topleft" left="10" @@ -53,7 +52,7 @@ text_color="white" top="40" word_wrap="true"> - Find your friends, contacts and people nearby. + Find your friends, your groups, contacts and people nearby. </text> </panel> <panel @@ -61,37 +60,36 @@ bg_alpha_color="DkGray2" class="panel_sidetray_home_info" follows="left|top|right" - height="130" + height="120" layout="topleft" - left="10" + left="15" + top_pad="15" name="sidebar_places" - width="313"> + width="303"> <text follows="left|right|top" font="SansSerifBigBold" height="30" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="tab_name" - text_color="white" + text_color="EmphasisColor" top="10" value="Places" width="200" word_wrap="true" /> <icon - color="DkGray" follows="top|right" height="20" layout="topleft" name="tab_icon" right="-10" top="10" - width="20" + width="20" image_name="TabIcon_Places_Selected"/> <text - follows="left|right|bottom|top" - font="SansSerifBold" + follows="all" height="120" layout="topleft" left="10" @@ -101,7 +99,7 @@ text_color="white" top="40" word_wrap="true"> - Find your friends, contacts and people nearby. + Find places to go and places you've visited before. </text> </panel> <panel @@ -109,37 +107,36 @@ bg_alpha_color="DkGray2" class="panel_sidetray_home_info" follows="left|top|right" - height="130" + height="120" layout="topleft" - left="10" + left="15" + top_pad="15" name="sidebar_me" - width="313"> + width="303"> <text follows="left|right|top" font="SansSerifBigBold" height="30" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="tab_name" - text_color="white" + text_color="EmphasisColor" top="10" value="My Profile" width="200" word_wrap="true" /> <icon - color="DkGray" follows="top|right" height="20" layout="topleft" name="tab_icon" right="-10" top="10" - width="20" + width="20" image_name="TabIcon_Me_Selected"/> <text - follows="left|right|bottom|top" - font="SansSerifBold" + follows="all" height="120" layout="topleft" left="10" @@ -149,7 +146,7 @@ text_color="white" top="40" word_wrap="true"> - Change your profile. + Edit your public profile. </text> </panel> <panel @@ -157,37 +154,36 @@ bg_alpha_color="DkGray2" class="panel_sidetray_home_info" follows="left|top|right" - height="130" + height="120" layout="topleft" - left="10" + left="15" + top_pad="15" name="sidebar_appearance" - width="313"> + width="303"> <text follows="left|right|top" font="SansSerifBigBold" height="30" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="tab_name" - text_color="white" + text_color="EmphasisColor" top="10" value="My Appearance" width="200" word_wrap="true" /> <icon - color="DkGray" follows="top|right" height="20" layout="topleft" name="tab_icon" right="-10" top="10" - width="20" - image_name="TabIcon_Things_Selected"/> + width="20" + image_name="TabIcon_Appearance_Selected"/> <text - follows="left|right|bottom|top" - font="SansSerifBold" + follows="all" height="120" layout="topleft" left="10" @@ -197,7 +193,7 @@ text_color="white" top="40" word_wrap="true"> - Change your apperance and looks. + Change your appearance and current look. </text> </panel> </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 07f0806ccb..fc61ce9683 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -41,7 +41,7 @@ </panel.string> <button auto_resize="true" - halign="left" + halign="right" follows="right|bottom" font="SansSerifSmall" image_color="White_05" @@ -49,10 +49,11 @@ image_overlay="BuyArrow_Over" height="18" layout="topleft" - left="-210" + left="-225" name="buycurrency" + pad_right="23px" picture_style="true" - tool_tip="My Balance / Buy L$" + tool_tip="My Balance: Click to buy more L$" top="0" width="117" /> <text @@ -64,7 +65,7 @@ height="16" top="3" layout="topleft" - left_pad="5" + left_pad="20" name="TimeText" text_color="TimeTextColor" tool_tip="Current Time (Pacific)" @@ -103,7 +104,7 @@ bg_visible="false" text_readonly_color="HealthTextColor" follows="rsight|bottom" - font_shadow="hard" + font_shadow="none" height="16" layout="topleft" left_pad="18" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index aa95a2baef..b0cd75117f 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,16 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Teleport History" bottom="0" height="326" left="0" width="380" border="true" follows="left|top|right|bottom"> + <string + name="cant_create_lm_here" + value="Please teleport to selected location before creating Landmark. " /> + <string + name="create_landmark" + value="Create Landmark" /> + <string + name="open_landmark" + value="Open Landmark panel" /> <accordion follows="left|top|right|bottom" - height="326" + height="300" layout="topleft" left="0" top="0" name="history_accordion" width="380"> - - <accordion_tab + <accordion_tab can_resize="false" layout="topleft" name="today" @@ -24,9 +32,8 @@ name="today_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -41,9 +48,8 @@ name="yesterday_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -58,9 +64,8 @@ name="2_days_ago" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -75,9 +80,8 @@ name="3_days_ago" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -92,9 +96,8 @@ name="4_days_ago" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -109,9 +112,8 @@ name="5_days_ago_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -126,9 +128,8 @@ name="6_days_and_older_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -143,9 +144,8 @@ name="1_month_and_older_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> - + </flat_list_view> + </accordion_tab> <accordion_tab can_resize="false" layout="topleft" @@ -160,7 +160,47 @@ name="6_months_and_older_items" top="0" width="380"> - </flat_list_view> - </accordion_tab> + </flat_list_view> + </accordion_tab> </accordion> + <panel + background_visible="true" + bevel_style="none" + top_pad="0" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="380"> + <button + follows="bottom|left" + font="SansSerifBigBold" + tool_tip="" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="gear_btn" + picture_style="true" + top="5" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="Favorite_Star_Active" + image_disabled="Favorite_Star_Off" + image_unselected="Favorite_Star_Press" + layout="topleft" + left_pad="5" + name="star_btn" + picture_style="true" + tool_tip="" + top_delta="0" + width="18" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index d640d3ad88..63c2d4538e 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -42,7 +42,7 @@ height="20" layout="topleft" left_pad="5" - use_ellipsis="true" + use_ellipses="true" name="region" text_color="white" top="4" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d124a4cdfa..2a616d8e2f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -14,7 +14,10 @@ <!-- starting up --> <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading</string> + + <!-- Legacy strings, almost never used --> <string name="Fullbright">Fullbright (Legacy)</string> + <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> <string name="LoginInProgressNoFrozen">Logging in...</string> @@ -59,8 +62,8 @@ <string name="TooltipFlagNoScripts">No Scripts</string> <string name="TooltipLand">Land:</string> <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> - <string name="TooltipAltLeft">Alt-Left arrow for previous tab</string> - <string name="TooltipAltRight">Alt-Right arrow for next tab</string> + <string name="TooltipAltLeft">Alt+← for previous tab</string> + <string name="TooltipAltRight">Alt+→ for next tab</string> <!-- tooltips for Urls --> <string name="TooltipHttpUrl">Click to view this web page</string> @@ -75,8 +78,8 @@ <string name="TooltipSLAPP">Click to run the secondlife:// command</string> <!-- ButtonToolTips, llfloater.cpp --> - <string name="BUTTON_CLOSE_DARWIN">Close (⌘-W)</string> - <string name="BUTTON_CLOSE_WIN">Close (Ctrl-W)</string> + <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> + <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> @@ -230,8 +233,10 @@ <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> + <string name="worldmap_results_none_found">None found.</string> <!-- animations uploading status codes --> <string name="Ok">OK</string> @@ -2110,6 +2115,15 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="AddLandmarkNavBarMenu">Add Landmark...</string> <string name="EditLandmarkNavBarMenu">Edit Landmark...</string> + <!-- menu accelerators --> + <string name="accel-mac-control">⌃</string> + <string name="accel-mac-command">⌘</string> + <string name="accel-mac-option">⌥</string> + <string name="accel-mac-shift">⇧</string> + <string name="accel-win-control">Ctrl+</string> + <string name="accel-win-alt">Alt+</string> + <string name="accel-win-shift">Shift+</string> + <!-- Previews --> <string name="FileSaved">File Saved</string> <string name="Receiving">Receiving</string> @@ -2225,9 +2239,8 @@ Running in window. <string name="MBPixelFmtErr">Can't find suitable pixel format</string> <string name="MBPixelFmtDescErr">Can't get pixel format description</string> <string name="MBTrueColorWindow"> - [APP_NAME] requires True Color (32-bit) to run in a window. -Please go to Control Panels > Display > Settings and set the screen to 32-bit color. -Alternately, if you choose to run fullscreen, [APP_NAME] will automatically adjust the screen each time it runs. + [APP_NAME] requires True Color (32-bit) to run. +Please go to your computer's display settings and set the color mode to 32-bit. </string> <string name="MBAlpha"> [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. @@ -2246,14 +2259,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <!-- Avatar Shape Information --> <string name="5 O'Clock Shadow">5 O'Clock Shadow</string> -<string name="5 O'Clock Shadow bump">5 O'Clock Shadow bump</string> + <string name="All White">All White</string> <string name="Anime Eyes">Anime Eyes</string> <string name="Arced">Arced</string> <string name="Arm Length">Arm Length</string> <string name="Attached">Attached</string> <string name="Attached Earlobes">Attached Earlobes</string> -<string name="BELLY">BELLY</string> + <string name="Back Bangs">Back Bangs</string> <string name="Back Bangs Down">Back Bangs Down</string> <string name="Back Bangs Up">Back Bangs Up</string> @@ -2270,9 +2283,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Big">Big</string> <string name="Big Butt">Big Butt</string> <string name="Big Eyeball">Big Eyeball</string> -<string name="Big Hair Back">Big Hair Back</string> -<string name="Big Hair Front">Big Hair Front</string> -<string name="Big Hair Top">Big Hair Top</string> +<string name="Big Hair Back">Big Hair: Back</string> +<string name="Big Hair Front">Big Hair: Front</string> +<string name="Big Hair Top">Big Hair: Top</string> <string name="Big Head">Big Head</string> <string name="Big Pectorals">Big Pectorals</string> <string name="Big Spikes">Big Spikes</string> @@ -2291,7 +2304,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Bottom">Bottom</string> <string name="Bottom Left">Bottom Left</string> <string name="Bottom Right">Bottom Right</string> -<string name="Bottom bump">Bottom bump</string> + <string name="Bow Legged">Bow Legged</string> <string name="Breast Buoyancy">Breast Buoyancy</string> <string name="Breast Cleavage">Breast Cleavage</string> @@ -2303,12 +2316,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Bugged Eyes">Bugged Eyes</string> <string name="Bulbous">Bulbous</string> <string name="Bulbous Nose">Bulbous Nose</string> -<string name="Bump base">Bump base</string> -<string name="Bump upperdef">Bump upperdef</string> + + <string name="Bushy Eyebrows">Bushy Eyebrows</string> <string name="Bushy Hair">Bushy Hair</string> <string name="Butt Size">Butt Size</string> -<string name="CHEST">CHEST</string> +<string name="bustle skirt">Bustle Skirt</string> +<string name="no bustle">No Bustle</string> +<string name="more bustle">More Bustle</string> + <string name="Center">Center</string> <string name="Center 2">Center 2</string> <string name="Chaplin">Chaplin</string> @@ -2319,7 +2335,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Chin Angle">Chin Angle</string> <string name="Chin Cleft">Chin Cleft</string> <string name="Chin Curtains">Chin Curtains</string> -<string name="Chin Curtains bump">Chin Curtains bump</string> + <string name="Chin Depth">Chin Depth</string> <string name="Chin Heavy">Chin Heavy</string> <string name="Chin In">Chin In</string> @@ -2335,13 +2351,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Closed Right">Closed Right</string> <string name="Coin Purse">Coin Purse</string> <string name="Collar Back">Collar Back</string> -<string name="Collar Back Height Cloth">Collar Back Height Cloth</string> -<string name="Collar Back Shadow Height">Collar Back Shadow Height</string> -<string name="Collar Back bump">Collar Back bump</string> + + + <string name="Collar Front">Collar Front</string> -<string name="Collar Front Height Cloth">Collar Front Height Cloth</string> -<string name="Collar Front Shadow Height">Collar Front Shadow Height</string> -<string name="Collar Front bump">Collar Front bump</string> + + + <string name="Corner Down">Corner Down</string> <string name="Corner Normal">Corner Normal</string> <string name="Corner Up">Corner Up</string> @@ -2375,11 +2391,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eyeball Size">Eyeball Size</string> <string name="Eyebrow Arc">Eyebrow Arc</string> <string name="Eyebrow Density">Eyebrow Density</string> -<string name="Eyebrow Density Bump">Eyebrow Density Bump</string> + <string name="Eyebrow Height">Eyebrow Height</string> <string name="Eyebrow Points">Eyebrow Points</string> <string name="Eyebrow Size">Eyebrow Size</string> -<string name="Eyebrow Size Bump">Eyebrow Size Bump</string> + <string name="Eyelash Length">Eyelash Length</string> <string name="Eyeliner">Eyeliner</string> <string name="Eyeliner Color">Eyeliner Color</string> @@ -2429,21 +2445,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Full Sides">Full Sides</string> <string name="Glossy">Glossy</string> <string name="Glove Fingers">Glove Fingers</string> -<string name="Glove Fingers bump">Glove Fingers bump</string> + <string name="Glove Length">Glove Length</string> -<string name="Glove Length bump">Glove Length bump</string> -<string name="HEAD">HEAD</string> + + <string name="Hair">Hair</string> -<string name="Hair Back">Hair Back</string> -<string name="Hair Front">Hair Front</string> -<string name="Hair Sides">Hair Sides</string> +<string name="Hair Back">Hair: Back</string> +<string name="Hair Front">Hair: Front</string> +<string name="Hair Sides">Hair: Sides</string> <string name="Hair Sweep">Hair Sweep</string> -<string name="Hair Thickess">Hair Thickess</string> +<string name="Hair Thickess">Hair Thickness</string> <string name="Hair Thickness">Hair Thickness</string> <string name="Hair Tilt">Hair Tilt</string> <string name="Hair Tilted Left">Hair Tilted Left</string> <string name="Hair Tilted Right">Hair Tilted Right</string> -<string name="Hair Volume">Hair Volume</string> +<string name="Hair Volume">Hair: Volume</string> <string name="Hand Size">Hand Size</string> <string name="Handlebars">Handlebars</string> <string name="Head Length">Head Length</string> @@ -2462,15 +2478,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Hip Length">Hip Length</string> <string name="Hip Width">Hip Width</string> <string name="In">In</string> -<string name="In Shdw Color">In Shdw Color</string> -<string name="In Shdw Opacity">In Shdw Opacity</string> +<string name="In Shdw Color">Inner Shadow Color</string> +<string name="In Shdw Opacity">Inner Shadow Opacity</string> <string name="Inner Eye Corner">Inner Eye Corner</string> <string name="Inner Eye Shadow">Inner Eye Shadow</string> <string name="Inner Shadow">Inner Shadow</string> -<string name="Jacket Collar Back bump">Jacket Collar Back bump</string> -<string name="Jacket Collar Front bump">Jacket Collar Front bump</string> + + <string name="Jacket Length">Jacket Length</string> -<string name="Jacket Sleeve Length bump">Jacket Sleeve Length bump</string> + <string name="Jacket Wrinkles">Jacket Wrinkles</string> <string name="Jaw Angle">Jaw Angle</string> <string name="Jaw Jut">Jaw Jut</string> @@ -2534,11 +2550,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Long Torso">Long Torso</string> <string name="Long arms">Long arms</string> <string name="Longcuffs">Longcuffs</string> -<string name="Loose Lower Clothing">Loose Lower Clothing</string> + <string name="Loose Pants">Loose Pants</string> <string name="Loose Shirt">Loose Shirt</string> <string name="Loose Sleeves">Loose Sleeves</string> -<string name="Loose Upper Clothing">Loose Upper Clothing</string> + <string name="Love Handles">Love Handles</string> <string name="Low">Low</string> <string name="Low Heels">Low Heels</string> @@ -2548,7 +2564,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Lower">Lower</string> <string name="Lower Bridge">Lower Bridge</string> <string name="Lower Cheeks">Lower Cheeks</string> -<string name="Lower Clothes Shading">Lower Clothes Shading</string> + <string name="Male">Male</string> <string name="Middle Part">Middle Part</string> <string name="More">More</string> @@ -2574,14 +2590,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="More Volume">More Volume</string> <string name="More soul">More soul</string> <string name="Moustache">Moustache</string> -<string name="Moustache bump">Moustache bump</string> + <string name="Mouth">Mouth</string> <string name="Mouth Corner">Mouth Corner</string> <string name="Mouth Position">Mouth Position</string> <string name="Mowhawk">Mowhawk</string> <string name="Muscular">Muscular</string> <string name="Mutton Chops">Mutton Chops</string> -<string name="NECK">NECK</string> + <string name="Nail Polish">Nail Polish</string> <string name="Nail Polish Color">Nail Polish Color</string> <string name="Narrow">Narrow</string> @@ -2616,7 +2632,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Nose Width">Nose Width</string> <string name="Nostril Division">Nostril Division</string> <string name="Nostril Width">Nostril Width</string> -<string name="NotHair">NotHair</string> + <string name="Old">Old</string> <string name="Opaque">Opaque</string> <string name="Open">Open</string> @@ -2626,21 +2642,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Open Right">Open Right</string> <string name="Orange">Orange</string> <string name="Out">Out</string> -<string name="Out Shdw Color">Out Shdw Color</string> -<string name="Out Shdw Opacity">Out Shdw Opacity</string> +<string name="Out Shdw Color">Outer Shadow Color</string> +<string name="Out Shdw Opacity">Outer Shadow Opacity</string> <string name="Outer Eye Corner">Outer Eye Corner</string> <string name="Outer Eye Shadow">Outer Eye Shadow</string> <string name="Outer Shadow">Outer Shadow</string> <string name="Overbite">Overbite</string> -<string name="PELVIS">PELVIS</string> + <string name="Package">Package</string> <string name="Painted Nails">Painted Nails</string> <string name="Pale">Pale</string> <string name="Pants Crotch">Pants Crotch</string> <string name="Pants Fit">Pants Fit</string> <string name="Pants Length">Pants Length</string> -<string name="Pants Length Cloth">Pants Length Cloth</string> -<string name="Pants Length Shadow">Pants Length Shadow</string> + + <string name="Pants Waist">Pants Waist</string> <string name="Pants Wrinkles">Pants Wrinkles</string> <string name="Part">Part</string> @@ -2707,12 +2723,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Shift Mouth">Shift Mouth</string> <string name="Shift Right">Shift Right</string> <string name="Shirt Bottom">Shirt Bottom</string> -<string name="Shirt Bottom Cloth">Shirt Bottom Cloth</string> + <string name="Shirt Fit">Shirt Fit</string> -<string name="Shirt Shadow Bottom">Shirt Shadow Bottom</string> + <string name="Shirt Wrinkles">Shirt Wrinkles</string> <string name="Shoe Height">Shoe Height</string> -<string name="Shoe Height bump">Shoe Height bump</string> + <string name="Short">Short</string> <string name="Short Arms">Short Arms</string> <string name="Short Legs">Short Legs</string> @@ -2728,7 +2744,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Side Bangs Up">Side Bangs Up</string> <string name="Side Fringe">Side Fringe</string> <string name="Sideburns">Sideburns</string> -<string name="Sideburns bump">Sideburns bump</string> + <string name="Sides Hair">Sides Hair</string> <string name="Sides Hair Down">Sides Hair Down</string> <string name="Sides Hair Up">Sides Hair Up</string> @@ -2739,24 +2755,24 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Skull">Skull</string> <string name="Slanted Forehead">Slanted Forehead</string> <string name="Sleeve Length">Sleeve Length</string> -<string name="Sleeve Length Cloth">Sleeve Length Cloth</string> -<string name="Sleeve Length Shadow">Sleeve Length Shadow</string> -<string name="Sleeve Length bump">Sleeve Length bump</string> + + + <string name="Sleeve Looseness">Sleeve Looseness</string> -<string name="Slit Back">Slit Back</string> -<string name="Slit Front">Slit Front</string> -<string name="Slit Left">Slit Left</string> -<string name="Slit Right">Slit Right</string> +<string name="Slit Back">Slit: Back</string> +<string name="Slit Front">Slit: Front</string> +<string name="Slit Left">Slit: Left</string> +<string name="Slit Right">Slit: Right</string> <string name="Small">Small</string> <string name="Small Hands">Small Hands</string> <string name="Small Head">Small Head</string> <string name="Smooth">Smooth</string> <string name="Smooth Hair">Smooth Hair</string> <string name="Socks Length">Socks Length</string> -<string name="Socks Length bump">Socks Length bump</string> + <string name="Some">Some</string> <string name="Soulpatch">Soulpatch</string> -<string name="Soulpatch bump">Soulpatch bump</string> + <string name="Sparse">Sparse</string> <string name="Spiked Hair">Spiked Hair</string> <string name="Spine">Spine</string> @@ -2809,13 +2825,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Upper Bridge">Upper Bridge</string> <string name="Upper Cheeks">Upper Cheeks</string> <string name="Upper Chin Cleft">Upper Chin Cleft</string> -<string name="Upper Clothes Shading">Upper Clothes Shading</string> + <string name="Upper Eyelid Fold">Upper Eyelid Fold</string> <string name="Upturned">Upturned</string> <string name="Very Red">Very Red</string> <string name="Waist Height">Waist Height</string> -<string name="Waist Height Cloth">Waist Height Cloth</string> -<string name="Waist Height Shadow">Waist Height Shadow</string> + + <string name="Well-Fed">Well-Fed</string> <string name="White Hair">White Hair</string> <string name="Wide">Wide</string> @@ -2825,11 +2841,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Wild">Wild</string> <string name="Wrinkles">Wrinkles</string> - <!-- Favorites Bar --> - <string name="location_ctrl_add_landmark">Add to My Landmarks</string> - <string name="location_ctrl_edit_landmark">Edit My Landmark</string> - <string name="favorite_landmark_loading_tooltip">(Loading...)</string> - <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> [APP_NAME] Update @@ -2887,6 +2898,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="no_ability_error"> You do not have that ability. </string> + <string name="no_ability"> + You do not have that ability. + </string> <string name="not_a_mod_error"> You are not a session moderator. </string> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index df5ea24c73..3ff0b3062a 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <accordion_tab + header_bg_color="0.68 0.68 0.68 1" + header_txt_color="0.68 0.68 0.68 1" header_collapse_img="Accordion_ArrowClosed_Off" header_collapse_img_pressed="Accordion_ArrowClosed_Press" header_expand_img="Accordion_ArrowOpened_Off" - header_expand_img_pressed="Accordion_ArrowOpened_Press" /> + header_expand_img_pressed="Accordion_ArrowOpened_Press" + header_image="Accordion_Off.png" + header_image_over="Accordion_Over" + header_image_pressed="Accordion_Press" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 0dbca318b6..8b23b72c2d 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -7,7 +7,7 @@ label="" hover_glow_amount="0.15" font="SansSerifSmall" - scale_image="true" + scale_image="false" image_unselected="ComboButton_Off" image_selected="ComboButton_Selected" image_disabled="ComboButton_Disabled" /> @@ -15,7 +15,7 @@ label="" hover_glow_amount="0.15" font="SansSerifSmall" - scale_image="true" + scale_image="false" pad_right="24" image_unselected="DropDown_Off" image_selected="DropDown_Selected" @@ -23,7 +23,11 @@ <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" background_visible="true" /> + <!-- Text is "tentative" if you have typed in a string that does not match + any item in the list, but we usually don't care, so use the same color + as normal text. --> <combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" - font="SansSerifSmall" /> + font="SansSerifSmall" + text_tentative_color="TextFgColor" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index 6381dce1d6..319beac291 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -5,11 +5,12 @@ more_label="More" follows="left|top" name="text" + allow_scroll="true" use_ellipses="true" word_wrap="true" tab_stop="true" - v_pad="2" - h_pad="3" > + v_pad="3" + h_pad="4" > </textbox> <scroll name="scroll" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index df8a9431d7..d86103aedc 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -18,10 +18,12 @@ max_chars="20" follows="left|top" allow_new_values="true" + add_landmark_tool_tip="Add this to My Landmarks" + edit_landmark_tool_tip="Edit My Landmark" > <info_button name="Place Information" label="" - tool_tip="About current location" + tool_tip="See more info about the current location" width="16" height="16" follows="left|top" @@ -35,11 +37,12 @@ hover_glow_amount="0.15" image_hover_selected="Favorite_Star_Over" image_hover_unselected="Favorite_Star_Over" - width="16" - height="16" - tool_tip="Add to My Landmarks" + width="18" + height="18" follows="right|top" - scale_image="false" /> + scale_image="false" + top="19" + left="-3" /> <combo_button name="Location History" label="" pad_right="0" diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 58543338f6..53034afa61 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bg_color="MenuDefaultBgColor" bg_visible="true" - drop_shadow="true" + drop_shadow="false" tear_off="false" shortcut_pad="15"> </menu> diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index e998635d20..a054b4ee60 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -5,11 +5,13 @@ show_text_as_tentative="false" dropdown_button_visible="false" max_chars="256" + name="parent" allow_new_values="true" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"> <combo_editor + name="child1" select_on_focus="true" text_pad_left="20" tool_tip="Search" @@ -18,9 +20,11 @@ background_image_focused="TextField_Search_Active"/> <combo_list multi_select="false" + name="child2" page_lines="10" scroll_bar_bg_visible="true" /> <search_button label="" + name="child3" top_pad="4" left_pad="4" width="13" diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 8ace7b96bc..bb46ec0954 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -5,7 +5,7 @@ font="SansSerifSmall" max_length="255" embedded_items="false" - hide_scrollbar="false" + allow_scroll="true" border_visible="false" word_wrap="false" ignore_tab="true" @@ -15,8 +15,8 @@ default_color="TextDefaultColor" text_color="TextFgColor" text_readonly_color="TextFgReadOnlyColor" - h_pad="5" - v_pad="3" + h_pad="6" + v_pad="4" bg_visible="true" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 6dfb6ecf9c..25d85899a1 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <tab_container tab_min_width="60" tab_max_width="150" + tab_height="16" tab_top_image_unselected="TabTop_Middle_Off" tab_top_image_selected="TabTop_Middle_Selected" tab_bottom_image_unselected="Toolbar_Left_Off" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 5914c21b2b..5dd09e663b 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <text allow_html="true" - clip_to_rect="false" mouse_opaque="false" name="text_box" font="SansSerifSmall" - font_shadow="soft" + font_shadow="none" tab_stop="false" halign="left" hover_color="LabelSelectedColor" - h_pad="-1" - hide_scrollbar="true" + h_pad="0" + allow_scroll="false" text_readonly_color="LabelDisabledColor" bg_writeable_color="FloaterDefaultBackgroundColor" border_color="DefaultHighlightLight" @@ -18,5 +17,5 @@ border_visible="false" hover="false" text_color="LabelTextColor" - v_pad="-1" + v_pad="0" max_length="4096"/> diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index c352abca3b..e5dc022633 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<textbase clip_to_rect="true" - h_pad="4" - v_pad="4"/> +<textbase allow_scroll="true" + h_pad="5" + v_pad="5"/> diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml index 6d1122a771..bce13c1e33 100644 --- a/indra/newview/skins/default/xui/es/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="Vender el terreno"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Parcela: </text> @@ -57,4 +59,6 @@ de propietario. </text> <button label="Poner el terreno en venta" name="sell_btn"/> <button label="Cancelar" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index c3c4c55027..da842d22c6 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -159,7 +159,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Puede modificar este objeto. + Puede modificar este objeto </text> <text name="B:"> B: @@ -187,28 +187,28 @@ <check_box name="checkbox next owner can transfer" left_delta="67"/> </panel> <string name="text modify info 1"> - Puede modificar este objeto. + Puede modificar este objeto </string> <string name="text modify info 2"> - Puede modificar estos objetos. + Puede modificar estos objetos </string> <string name="text modify info 3"> - No puede modificar este objeto. + No puede modificar este objeto </string> <string name="text modify info 4"> - No puede modificar estos objetos. + No puede modificar estos objetos </string> <string name="text modify warning"> - Debe seleccionar todo el objeto para definir los permisos. + Debe seleccionar todo el objeto para definir los permisos </string> <string name="Cost Default"> - Precio: L$ + Precio: L$ </string> <string name="Cost Total"> - Precio total: L$ + Precio total: L$ </string> <string name="Cost Per Unit"> - Precio por: L$ + Precio por: L$ </string> <string name="Cost Mixed"> Precio variable @@ -502,7 +502,7 @@ </panel> <panel label="Contenido " name="Contents"> <button label="Script nuevo" label_selected="Script nuevo" name="button new script"/> - <button label="Permisos..." name="button permissions"/> + <button label="Permisos" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -516,18 +516,18 @@ Superficie: [AREA] m² </text> <button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land" width="140"/> - <check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario"/> + <check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario: Verde = Su terreno Agua = Terreno de sus grupos Rojo = Propiedad de otros Amarillo = En venta Morado = Para subasta Gris = Público"/> <button label="?" label_selected="?" name="button show owners help" left_delta="150"/> <text name="label_parcel_modify"> Modificar la parcela </text> - <button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land" width="140"/> - <button label="Unir..." label_selected="Unir..." name="button join land" width="140"/> + <button label="Subdividir" label_selected="Subdividir" name="button subdivide land" width="140"/> + <button label="Unir" label_selected="Unir" name="button join land" width="140"/> <text name="label_parcel_trans"> Transacciones de terreno </text> - <button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land" width="140"/> - <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land" width="140"/> + <button label="Comprar terreno" label_selected="Comprar terreno" name="button buy land" width="140"/> + <button label="Abandonar el terreno" label_selected="Abandonar el terreno" name="button abandon land" width="140"/> </panel> <floater.string name="status_rotate"> Arrastre las bandas de color para girar el objeto diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index e418de3929..86f3f1f125 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1760,7 +1760,7 @@ Si se marca esta opción, los compradores podrán revender el terreno que compre Por defecto: Deshabilitado </notification> <notification label="Desactivar los scripts" name="HelpRegionDisableScripts"> - Cuando el rendimiento de un sim es pobre, el culpable puede ser un script. Abra Estadísticas (Ctrl-May-1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ve que Script Time está en 25 ms o más alto, pulse el botón Listar los scripts según su uso, y verá el nombre y la posición de los scripts que pueden estar causando el bajo rendimiento. + Cuando el rendimiento de un sim es pobre, el culpable puede ser un script. Abra Estadísticas (Ctrl+May+1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ve que Script Time está en 25 ms o más alto, pulse el botón Listar los scripts según su uso, y verá el nombre y la posición de los scripts que pueden estar causando el bajo rendimiento. Marcando la casilla Desactivar los scripts y pulsando el botón Aplicar, se desactivarán temporalmente en esta región todos los scripts. Debe hacer esto para viajar a la posición que ha visto en la Lista de scripts según su uso. Cuando llegue, investigue el script para determinar si es él quien causa el problema. Deberá contactar con el propietario del script, o borrar o devolver el objeto. @@ -1769,7 +1769,7 @@ Desmarque la casilla Desactivar los scripts y pulse Aplicar para reactivar los s Por defecto: off </notification> <notification label="Desactivar las colisiones" name="HelpRegionDisableCollisions"> - Cuando el rendimiento de un sim es pobre, la culpa puede estar en los objetos físicos. Abra Estadísticas (Ctrl-May-1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ve que Sim Time (Physics) está en 20 ms o más alto, pulse el botón Listar los objetos que colisionan, y verá el nombre y la posición de los objetos que pueden estar causando el bajo rendimiento. + Cuando el rendimiento de un sim es pobre, la culpa puede estar en los objetos físicos. Abra Estadísticas (Ctrl+May+1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ve que Sim Time (Physics) está en 20 ms o más alto, pulse el botón Listar los objetos que colisionan, y verá el nombre y la posición de los objetos que pueden estar causando el bajo rendimiento. Marcando la casilla Desactivar las colisiones y pulsando el botón Aplicar, se desactivarán temporalmente las colisiones entre objetos. Debe hacer esto para viajar a la localización que se ha avisado en la Lista de objetos que colisionan. Cuando llegue, investigue el objeto: @@ -1993,9 +1993,9 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u <usetemplate ignoretext="Cuando mueva objetos con script 'no copiables' del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Atención: la acción Pagar al objeto al pulsar ha sido marcada, pero sólo funcionará si se añade un script con un evento money(). + Atención: la acción 'Pagar al objeto' al pulsar ha sido marcada, pero sólo funcionará si se añade un script con un evento money(). <form name="form"> - <ignore name="ignore" text="Cuando configure 'Pagar' en objetos sin el evento money()"/> + <ignore name="ignore" text="Cuando configure 'Pagar al objeto' sin el evento money()"/> </form> </notification> <notification name="OpenObjectCannotCopy"> @@ -2917,7 +2917,7 @@ Los objetos flexibles no pueden ser materiales, y serán inmateriales hasta que <notification name="FirstDebugMenus"> Ha activado el menú Avanzado. Contiene herramientas útiles para los desarrolladores que trabajan mejorando [SECOND_LIFE]. -Para pasar este menú a una ventana, pulse Ctrl-Alt-D. En un Mac, pulse ⌘-Opt-D. +Para pasar este menú a una ventana, pulse Ctrl+Alt+D. En un Mac, pulse ⌥⌘D. </notification> <notification name="FirstSculptedPrim"> Está editando un prim 'sculpted'. diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml new file mode 100644 index 0000000000..bcf4128e01 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Residente" />
+ <string name="AcctTypeTrial"
+ value="Prueba" />
+ <string name="AcctTypeCharterMember"
+ value="Miembro fundador" />
+ <string name="AcctTypeEmployee"
+ value="Empleado de Linden Lab" />
+ <string name="PaymentInfoUsed"
+ value="Ha usado una forma de pago" />
+ <string name="PaymentInfoOnFile"
+ value="Hay infor. de la forma de pago" />
+ <string name="NoPaymentInfoOnFile"
+ value="Sin infor. de la forma de pago" />
+ <string name="AgeVerified"
+ value="Edad verificada" />
+ <string name="NotAgeVerified"
+ value="Edad no verificada" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=es
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Compañero/a:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Mensaje en el estado ocupado:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index 0c98889d32..4fd5685b7d 100644 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="General" name="general_tab"> <string name="help_text"> - La pestaña General contiene información global de este grupo, -la lista de propietarios y miembros visibles, -las preferencias generales del grupo, y las opciones de los miembros. + La pestaña General contiene información global de este grupo, la lista de propietarios y miembros visibles, las preferencias generales del grupo, y las opciones de los miembros. Ponga su ratón sobre las opciones para más información. </string> @@ -47,7 +45,7 @@ Ponga su ratón sobre las opciones para más información. <panel name="preferences_container"> <check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/> <check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/> - <check_box label="Cuota de inscripción en L$:" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/> + <check_box label="Cuota de inscripción:" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/> <spinner width="60" left_delta="130" name="spin_enrollment_fee" tool_tip="Cuando está marcado 'Cuota de inscripción', los miembros nuevos deben pagar esta cuota para entrar al grupo."/> <combo_box bottom_delta="-38" width="150" name="group_mature_check" tool_tip="Establece si la información de su grupo es 'mature'."> <combo_box.item name="select_mature" label="- Elegir Calificación -"/> diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index b4ea0dbeda..bccc114624 100644 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml @@ -48,8 +48,11 @@ <string name="land_contrib_error"> No se ha podido defininir su contribución de terreno. </string> + <text name="your_contribution_units"> + ( m² ) + </text> <text name="your_contribution_max_value"> - m² ([AMOUNT] máx.) + ([AMOUNT] máx.) </text> <text name="group_over_limit_text"> Los miembros del grupo deben contribuir con más créditos de terreno diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index 2f2aab5448..2b813a18bf 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="'PG', 'Mature' y 'Adult'"/> <combo_box.item name="Desired_Mature" label="'PG' y 'Mature'"/> - <combo_box.item name="Desired_PG" label="sólo 'PG'"/> + <combo_box.item name="Desired_PG" label="'PG'"/> </combo_box> <text name="maturity_desired_textbox"> - sólo 'PG' + 'PG' </text> <text name="start_location_textbox"> Posición inicial: diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 653dc32a24..f16ec89cb0 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estado" name="Estate"> +<panel label="Estado" name="Estate"> <text name="estate_help_text"> Los cambios en las configuraciones de esta pestaña afectarán a todas las regiones del estado. @@ -68,6 +66,4 @@ pestaña afectarán a todas las regiones del estado. <button label="?" name="ban_resident_help" right="476"/> <button label="Quitar..." name="remove_banned_avatar_btn"/> <button label="Añadir..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml index 879fb87be2..5540358f97 100644 --- a/indra/newview/skins/default/xui/es/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texturas del terreno" name="Textures"> +<panel label="Texturas del terreno" name="Textures"> <text name="region_text_lbl"> Región: </text> @@ -56,6 +54,4 @@ y el valor ALTA es la altura MÍNIMA de la textura #4. </text> <button label="Aplicar" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 0735bb0082..294e407278 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -498,16 +498,16 @@ Si aun así persiste este mensaje, reinicie su ordenador. Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Alt- + ⌥ </string> <string name="accel-mac-shift"> - Mayús- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -615,6 +615,9 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. <string name="no_ability_error"> Usted no tiene esa capacidad. </string> + <string name="no_ability"> + Usted no tiene esa capacidad. + </string> <string name="not_a_mod_error"> Usted no es un moderador de la sesión. </string> @@ -633,4 +636,31 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. <string name="close_on_no_ability"> Usted ya no tendrá más la capacidad de estar en la sesión de chat. </string> + <string name="AcctTypeResident"> + Residente + </string> + <string name="AcctTypeTrial"> + Prueba + </string> + <string name="AcctTypeCharterMember"> + Miembro fundador + </string> + <string name="AcctTypeEmployee"> + Empleado de Linden Lab + </string> + <string name="PaymentInfoUsed"> + Ha usado una forma de pago + </string> + <string name="PaymentInfoOnFile"> + Hay infor. de la forma de pago + </string> + <string name="NoPaymentInfoOnFile"> + Sin infor. de la forma de pago + </string> + <string name="AgeVerified"> + Edad verificada + </string> + <string name="NotAgeVerified"> + Edad no verificada + </string> </strings> diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml index 6ef12fab4a..643a9435db 100644 --- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="Vendre terrain"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Parcelle : </text> @@ -59,4 +61,6 @@ de propriétaire. </text> <button label="Mettre le terrain en vente" name="sell_btn" width="165"/> <button label="Annuler" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 03ab397ea1..e8db326e15 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -149,7 +149,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Vous pouvez modifier cet objet. + Vous pouvez modifier cet objet </text> <text name="B:"> B : @@ -177,28 +177,28 @@ <check_box name="checkbox next owner can transfer"/> </panel> <string name="text modify info 1"> - Vous pouvez modifier cet objet. + Vous pouvez modifier cet objet </string> <string name="text modify info 2"> - Vous pouvez modifier ces objets. + Vous pouvez modifier ces objets </string> <string name="text modify info 3"> - Vous ne pouvez pas modifier cet objet. + Vous ne pouvez pas modifier cet objet </string> <string name="text modify info 4"> - Vous ne pouvez pas modifier ces objets. + Vous ne pouvez pas modifier ces objets </string> <string name="text modify warning"> - Sélectionnez l'objet en entier. + Sélectionnez l'objet en entier </string> <string name="Cost Default"> - Prix : L$ + Prix : L$ </string> <string name="Cost Total"> - Prix total : L$ + Prix total : L$ </string> <string name="Cost Per Unit"> - Prix par : L$ + Prix par : L$ </string> <string name="Cost Mixed"> Prix mixte @@ -443,8 +443,8 @@ <button label="Ajuster" label_selected="Ajuster" left="150" name="button align"/> </panel> <panel label="Contenu" name="Contents"> - <button label="Nouveau script" label_selected="Nouveau script..." name="button new script"/> - <button label="Droits..." name="button permissions"/> + <button label="Nouveau script" label_selected="Nouveau script" name="button new script"/> + <button label="Droits" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -458,18 +458,18 @@ Surface : [AREA] m² </text> <button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="142"/> - <check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire"/> + <check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire : Vert = votre terrain Turquoise = le terrain de votre groupe Rouge = appartenant à d'autres Jaune = en vente Mauve = aux enchères Gris = public"/> <button label="?" label_selected="?" name="button show owners help" left_delta="154"/> <text name="label_parcel_modify"> Modifier la parcelle </text> - <button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="142"/> - <button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="142"/> + <button label="Diviser" label_selected="Diviser" name="button subdivide land" width="142"/> + <button label="Fusionner" label_selected="Fusionner" name="button join land" width="142"/> <text name="label_parcel_trans"> Transactions </text> - <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="142"/> - <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="142"/> + <button label="Acheter le terrain" label_selected="Acheter le terrain" name="button buy land" width="142"/> + <button label="Abandonner le terrain" label_selected="Abandonner le terrain" name="button abandon land" width="142"/> </panel> <floater.string name="status_rotate"> Pour faire tourner l'objet, faîtes glisser les bandes de couleur. diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 3255cdb728..a38cf858e0 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1682,7 +1682,7 @@ Si cette option est cochée, les propriétaires sont libres de revendre leur par Valeur par défaut : désactivé </notification> <notification label="Désactiver les scripts" name="HelpRegionDisableScripts"> - Lorsque la performance d'une région est faible, cela peut venir d'un script. Ouvrez la section Statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur. + Lorsque la performance d'une région est faible, cela peut venir d'un script. Ouvrez la section Statistiques (Ctrl+Maj+1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur. Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les objets scriptés les plus consommateurs. Vous verrez le nom et l'emplacement des scripts éventuellement à l'origine du problème. Si vous cochez la case Désactiver les scripts et que vous appuyez sur Appliquer, tous les scripts de cette région seront temporairement désactivés. Vous devrez peut-être faire cela le temps d'arriver à l'endroit su script en cause. Une fois sur place, assurez-vous que le script est bien à l'origine du problème. Pour cela, vous devrez peut-être contacter le propriétaire du script ou bien supprimer ou renvoyer l'objet. @@ -1692,7 +1692,7 @@ Valeur par défaut : désactivé </notification> <notification label="Désactiver les collisions" name="HelpRegionDisableCollisions"> Des objets physiques peuvent fortement réduire les performances d'une région. -Ouvrez la barre de statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur. +Ouvrez la barre de statistiques (Ctrl+Maj+1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur. Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les collisions les plus consommatrices. Vous verrez le nom et l'emplacement des objets physiques éventuellement à l'origine du problème. @@ -1913,7 +1913,7 @@ Déplacer les objets de l'inventaire ? <usetemplate ignoretext="Lors du transfert d'un inventaire non copiable depuis des objets scriptés" name="okcancelignore" notext="Annuler" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Avertissement : l'action du clic Payer l'objet a été défini mais ne fonctionnera que si un script est ajouté avec l'event money(). + Avertissement : l'action du clic 'Payer l'objet' a été défini mais ne fonctionnera que si un script est ajouté avec l'event money(). <form name="form"> <ignore name="ignore" text="Lors du paramétrage de la fonction Payer sur des objets sans événement monétaire"/> </form> @@ -2333,8 +2333,8 @@ Voulez-vous aller sur le site de [SECOND_LIFE] pour enregistrer ces informations Vous ne pouvez pas devenir ami avec vous-même. </notification> <notification name="UploadingAuctionSnapshot"> - Importation de photos SL et Web en cours -(prend environ 5 minutes…) + Importation de photos SL et Web en cours... +(prend environ 5 minutes.) </notification> <notification name="UploadPayment"> Le chargement a coûté [AMOUNT] L$. @@ -2842,7 +2842,7 @@ Les objets flexibles ne peuvent pas avoir de propriétés physiques et doivent r <notification name="FirstDebugMenus"> Vous avez activé le menu Avancé. Ce menu contient des fonctionnalités utiles pour les développeurs qui travaillent sur [SECOND_LIFE]. -Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Mac, appuyez sur ⌘-Opt-Maj-D +Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl+Alt+D. Sur un Mac, appuyez sur ⌥⌘D </notification> <notification name="FirstSculptedPrim"> Vous êtes en train d'éditer un sculptie. diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml new file mode 100644 index 0000000000..f62ea7c80f --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Résident" />
+ <string name="AcctTypeTrial"
+ value="Essai" />
+ <string name="AcctTypeCharterMember"
+ value="Membre originaire" />
+ <string name="AcctTypeEmployee"
+ value="Employé(e) de Linden Lab" />
+ <string name="PaymentInfoUsed"
+ value="Infos de paiement utilisées" />
+ <string name="PaymentInfoOnFile"
+ value="Infos de paiement enregistrées" />
+ <string name="NoPaymentInfoOnFile"
+ value="Aucune info de paiement" />
+ <string name="AgeVerified"
+ value="Âge vérifié" />
+ <string name="NotAgeVerified"
+ value="Âge non vérifié" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=fr
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partenaire :"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Réponse si occupé(e) :
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml index f89c90e508..9afc4ae11d 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml @@ -43,7 +43,7 @@ <panel name="preferences_container"> <check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/> <check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/> - <check_box label="Frais d'inscription : L$" name="check_enrollment_fee" tool_tip="Indique s'il y a des frais d'inscription pour devenir membre."/> + <check_box label="Frais d'inscription :" name="check_enrollment_fee" tool_tip="Indique s'il y a des frais d'inscription pour devenir membre."/> <spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d'inscription est cochée, cela signifie qu'il faut payer des frais pour devenir membre."/> <combo_box name="group_mature_check" tool_tip="Indique si les informations sur votre groupe sont classées Mature." width="195"> <combo_box.item name="select_mature" label="- Type de public -"/> diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index 551d11d588..29259e2e42 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml @@ -49,8 +49,11 @@ financières de ce groupe. <string name="land_contrib_error"> Impossible de définir votre don de terre. </string> + <text name="your_contribution_units"> + ( m² ) + </text> <text name="your_contribution_max_value"> - m² ([AMOUNT] max.) + ([AMOUNT] max.) </text> <text name="group_over_limit_text"> Une contribution supplémentaire du groupe est requise pour prendre en diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index f3a1a0c0e2..1ed3cafbc3 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -34,10 +34,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature et Adult"/> <combo_box.item name="Desired_Mature" label="PG et Mature"/> - <combo_box.item name="Desired_PG" label="PG uniquement"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG uniquement + PG </text> <text name="start_location_textbox"> Lieu de départ : diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index b592d29711..425f273790 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Domaine" name="Estate"> +<panel label="Domaine" name="Estate"> <text name="estate_help_text" bottom="-34"> Les changements apportés aux paramètres de cet onglet auront des répercussions sur @@ -77,6 +75,4 @@ toutes les régions du domaine. <button label="Supprimer..." name="remove_banned_avatar_btn"/> <button label="Envoyer un message au domaine..." name="message_estate_btn"/> <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml index da800dc6bd..d312646788 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Textures du sol" name="Textures"> +<panel label="Textures du sol" name="Textures"> <text name="region_text_lbl"> Région : </text> @@ -71,6 +69,4 @@ et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4. </text> <button label="Appliquer" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 6bdee836d9..070d2cd1a5 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -488,16 +488,16 @@ Choisir le répertoire </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Maj- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -604,6 +604,9 @@ <string name="no_ability_error"> Vous n'avez pas ce pouvoir. </string> + <string name="no_ability"> + Vous n'avez pas ce pouvoir. + </string> <string name="not_a_mod_error"> Vous n'êtes pas modérateur de session. </string> @@ -622,4 +625,31 @@ <string name="close_on_no_ability"> Vous ne pouvez plus participer à la session de chat. </string> + <string name="AcctTypeResident"> + Résident + </string> + <string name="AcctTypeTrial"> + Essai + </string> + <string name="AcctTypeCharterMember"> + Membre originaire + </string> + <string name="AcctTypeEmployee"> + Employé(e) de Linden Lab + </string> + <string name="PaymentInfoUsed"> + Infos de paiement utilisées + </string> + <string name="PaymentInfoOnFile"> + Infos de paiement enregistrées + </string> + <string name="NoPaymentInfoOnFile"> + Aucune info de paiement + </string> + <string name="AgeVerified"> + Âge vérifié + </string> + <string name="NotAgeVerified"> + Âge non vérifié + </string> </strings> diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml index d9cf612d33..79dd2c5abf 100644 --- a/indra/newview/skins/default/xui/it/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="Vendi terra"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Terreno: </text> @@ -58,4 +60,6 @@ cambieranno proprietario. </text> <button label="Metti la terra in vendita" name="sell_btn"/> <button label="Annulla" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index d4d70f3367..8fc1818ccc 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -160,7 +160,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Puoi modificare questo oggetto. + Puoi modificare questo oggetto </text> <text name="B:"> B: @@ -188,28 +188,28 @@ <check_box name="checkbox next owner can transfer" left_delta="67"/> </panel> <string name="text modify info 1"> - Puoi modificare questo oggetto. + Puoi modificare questo oggetto </string> <string name="text modify info 2"> - Puoi modificare questi oggetti. + Puoi modificare questi oggetti </string> <string name="text modify info 3"> - Non puoi modificare questo oggetto. + Non puoi modificare questo oggetto </string> <string name="text modify info 4"> - Non puoi modificare questi oggetti. + Non puoi modificare questi oggetti </string> <string name="text modify warning"> - Devi selezionare l'intero oggetto per impostare i permessi. + Devi selezionare l'intero oggetto per impostare i permessi </string> <string name="Cost Default"> - Prezzo: L$ + Prezzo: L$ </string> <string name="Cost Total"> - Prezzo totale: L$ + Prezzo totale: L$ </string> <string name="Cost Per Unit"> - Prezzo per: L$ + Prezzo per: L$ </string> <string name="Cost Mixed"> Prezzo misto @@ -502,8 +502,8 @@ <button label="Allinea" label_selected="Allinea" name="button align" left="160"/> </panel> <panel label="Contenuto" name="Contents"> - <button label="Nuovo Script" label_selected="Nuovo script..." name="button new script"/> - <button label="Permessi..." name="button permissions"/> + <button label="Nuovo Script" label_selected="Nuovo script" name="button new script"/> + <button label="Permessi" name="button permissions"/> <panel name="ContentsInventory" width="272" /> </panel> </tab_container> @@ -518,18 +518,18 @@ Area: [AREA] m² </text> <button label="Informazioni sul terreno..." label_selected="Informazioni sul terreno..." name="button about land" width="156"/> - <check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari"/> + <check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari: Verde = il tuo terreno Acqua = la terra del tuo gruppo Rosso = posseduta da altri Giallo = in vendita Viola = in asta Grigia = pubblica"/> <button label="?" label_selected="?" name="button show owners help" left_delta="120"/> <text name="label_parcel_modify"> Modifica il terreno </text> - <button label="Suddividi..." label_selected="Suddividi..." name="button subdivide land" width="156"/> - <button label="Unisci..." label_selected="Unisci..." name="button join land" width="156"/> + <button label="Suddividi" label_selected="Suddividi" name="button subdivide land" width="156"/> + <button label="Unisci" label_selected="Unisci" name="button join land" width="156"/> <text name="label_parcel_trans"> Transazioni del territorio </text> - <button label="Acquista il terreno..." label_selected="Acquista il terreno..." name="button buy land" width="156"/> - <button label="Abbandona il terreno..." label_selected="Abbandona il terreno..." name="button abandon land" width="156"/> + <button label="Acquista il terreno" label_selected="Acquista il terreno" name="button buy land" width="156"/> + <button label="Abbandona il terreno" label_selected="Abbandona il terreno" name="button abandon land" width="156"/> </panel> <floater.string name="status_rotate"> Sposta le fasce colorate per ruotare l'oggetto diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index d85dd7732a..8f8a969ace 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1747,7 +1747,7 @@ Se questa opzione è selezionato i compratori possono rivendere i loro terreni i Impostazione base: Non consentire </notification> <notification label="Disabilita gli script" name="HelpRegionDisableScripts"> - Se le prestazioni di una sim sono basse, probabilmente è colpa di uno script. Apri la 'Barra delle statistiche' (Ctrl-Shift-1). Controlla il FPS della fisica del simulatore. + Se le prestazioni di una sim sono basse, probabilmente è colpa di uno script. Apri la 'Barra delle statistiche' (Ctrl+Shift+1). Controlla il FPS della fisica del simulatore. Se è più basso di 45, apri il pannello 'Time' (Tempi) collocato ln fondo alla 'Barra delle statistiche' Se il tempo per gli script è di 25 ms o più alto, clicca sul bottone 'Visualizza l'elenco degli script più pesanti...'. Ti verrà dato il nome e l'ubicazione degli script che probabilmente causano una cattiva prestazione. @@ -1758,7 +1758,7 @@ Impostazione base: spento </notification> <notification label="Disabilita le collisioni" name="HelpRegionDisableCollisions"> Quando le prestazioni della sim sono basse, può darsi che la colpa sia di oggetti fisici. -Apri la 'Barra delle statistiche' (Ctrl-Shift-1). +Apri la 'Barra delle statistiche' (Ctrl+Shift+1). Controlla il FPS della fisica del simulatore. Se è più basso di 45, apri il pannello 'Time' (Tempi) collocato in fondo alla 'Barra delle statistiche'. Se il tempo della sim (fisica) risulta 20 ms o più, clicca sul bottone 'mostra gli oggetti che collidono di più'. @@ -1987,9 +1987,9 @@ Trasferisci gli elementi nell'inventario? <usetemplate ignoretext="Quando si trasferiscono oggetti scriptati non copiabili nell'inventario." name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Attenzione: L'azione di pagamento automatico al click è stata impostata, ma funzionerà solo se aggiungi uno script con un evento money(). + Attenzione: L'azione 'Paga l'oggetto' al click è stata impostata, ma funzionerà solo se aggiungi uno script con un evento money(). <form name="form"> - <ignore name="ignore" text="Quando imposti il 'Pagamento' di oggetti senza l'evento money()"/> + <ignore name="ignore" text="Quando imposti il 'Paga l'oggetto' senza l'evento money()"/> </form> </notification> <notification name="OpenObjectCannotCopy"> @@ -2923,7 +2923,7 @@ Gli oggetti flessibili non possono essere fisici e devano essere fantasma fino a <notification name="FirstDebugMenus"> Hai attivato il menu Avanzato. Questo menu contiene funzioni utili per gli sviluppatori per il debug di [SECOND_LIFE]. -Per attivare o disattivare questo menu su Windows premere Ctrl-Alt-D. Su Mac premere ⌘-Opt-D. +Per attivare o disattivare questo menu su Windows premere Ctrl+Alt+D. Su Mac premere ⌥⌘D. </notification> <notification name="FirstSculptedPrim"> Si sta modificando uno sculpted prim. diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml new file mode 100644 index 0000000000..0eba7bf3b6 --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Residente" />
+ <string name="AcctTypeTrial"
+ value="Prova" />
+ <string name="AcctTypeCharterMember"
+ value="Membro privilegiato" />
+ <string name="AcctTypeEmployee"
+ value="Impiegato della Linden Lab" />
+ <string name="PaymentInfoUsed"
+ value="Info. di pagamento usate" />
+ <string name="PaymentInfoOnFile"
+ value="Info. di pagamento in archivio" />
+ <string name="NoPaymentInfoOnFile"
+ value="Nessuna info. di pagamento" />
+ <string name="AgeVerified"
+ value="Età verificata" />
+ <string name="NotAgeVerified"
+ value="Età non verificata" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=it
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Risposta agli IM quando sono in 'Occupato':
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml index 08d6268f5b..2bc4d82082 100644 --- a/indra/newview/skins/default/xui/it/panel_group_general.xml +++ b/indra/newview/skins/default/xui/it/panel_group_general.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Generale" name="general_tab"> <string name="help_text"> - Il pannello 'Generale' contiene informazioni generali riguardanti il -gruppo, un elenco dei proprietari e i membri visibili, -le preferenze generali di gruppo e le opzioni dei membri. + Il pannello 'Generale' contiene informazioni generali riguardanti il gruppo, un elenco dei proprietari e i membri visibili, le preferenze generali di gruppo e le opzioni dei membri. Passa il mouse sulle opzioni per un aiuto aggiuntivo. </string> @@ -47,7 +45,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo. <panel name="preferences_container"> <check_box label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Lascia che i residenti vedano questo gruppo nella ricerca."/> <check_box label="Iscrizione libera" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di unirsi senza essere invitati."/> - <check_box label="Tassa di iscrizione: L$" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/> + <check_box label="Tassa di iscrizione:" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/> <spinner width="60" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/> <combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi Mature."> <combo_box.item name="select_mature" label="- Seleziona -"/> diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml index 5f54d8cd25..3e6684ed06 100644 --- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml @@ -47,8 +47,11 @@ <string name="land_contrib_error"> Non è possibile impostare i tuoi contributi in terra. </string> + <text name="your_contribution_units"> + ( m² ) + </text> <text name="your_contribution_max_value"> - m² ([AMOUNT] massimo) + ([AMOUNT] massimo) </text> <text name="group_over_limit_text"> I membri del gruppo devono contribuire con più crediti per mantenere diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index 4c6a7d8eb3..e6cd6e67b2 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature e Adult"/> <combo_box.item name="Desired_Mature" label="PG e Mature"/> - <combo_box.item name="Desired_PG" label="solo PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - solo PG + PG </text> <text name="start_location_textbox"> Punto di partenza: diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml index 345e8c532c..5b95b7378b 100644 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Proprietà immobiliari" name="Estate"> +<panel label="Proprietà immobiliari" name="Estate"> <text name="estate_help_text"> I cambiamenti alle impostazioni in questa finestra avranno effetto su tutte le regioni della proprietà. @@ -68,6 +66,4 @@ avranno effetto su tutte le regioni della proprietà. <button label="?" name="ban_resident_help"/> <button label="Rimuovi..." name="remove_banned_avatar_btn"/> <button label="Aggiungi..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml index 976a93abb8..254700e9f1 100644 --- a/indra/newview/skins/default/xui/it/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/it/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texture del terreno" name="Textures"> +<panel label="Texture del terreno" name="Textures"> <text name="region_text_lbl"> Regione: </text> @@ -56,6 +54,4 @@ Texture #1, e il valore più ALTO all'altezza MINIMA della Texture #4. </text> <button label="Applica" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 67b946e1de..bc3cc38a40 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -484,16 +484,16 @@ Scegli la cartella </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -600,6 +600,9 @@ <string name="no_ability_error"> Non hai questa abilitazione. </string> + <string name="no_ability"> + Non hai questa abilitazione. + </string> <string name="not_a_mod_error"> Non sei un moderatore. </string> @@ -618,4 +621,31 @@ <string name="close_on_no_ability"> Non hai più le abilitazioni per rimanere nella sessione chat. </string> + <string name="AcctTypeResident"> + Residente + </string> + <string name="AcctTypeTrial"> + Prova + </string> + <string name="AcctTypeCharterMember"> + Membro privilegiato + </string> + <string name="AcctTypeEmployee"> + Impiegato della Linden Lab + </string> + <string name="PaymentInfoUsed"> + Info. di pagamento usate + </string> + <string name="PaymentInfoOnFile"> + Info. di pagamento in archivio + </string> + <string name="NoPaymentInfoOnFile"> + Nessuna info. di pagamento + </string> + <string name="AgeVerified"> + Età verificata + </string> + <string name="NotAgeVerified"> + Età non verificata + </string> </strings> diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml index 3860c599fb..5193e5bba1 100644 --- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="sell land" title="土地を販売" height="496" min_height="496" > + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> 区画： </text> @@ -63,4 +65,6 @@ </text> <button label="販売を決定" name="sell_btn" bottom="-489"/> <button label="取り消し" name="cancel_btn" /> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index 36aec17f9a..5840773dbd 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -192,13 +192,13 @@ 権限を設定するには、オブジェクト全体を選択する必要があります。 </string> <string name="Cost Default"> - 価格： L$ + 価格： L$ </string> <string name="Cost Total"> - 合計価格： L$ + 合計価格： L$ </string> <string name="Cost Per Unit"> - 単価： L$ + 単価： L$ </string> <string name="Cost Mixed"> 混合価格 @@ -442,7 +442,7 @@ </panel> <panel label="中身" name="Contents"> <button label="新しいスクリプト" label_selected="新しいスクリプト" name="button new script" width="120"/> - <button label="権限..." name="button permissions" left_delta="130" width="80"/> + <button label="権限" name="button permissions" left_delta="130" width="80"/> </panel> </tab_container> <panel name="land info panel"> @@ -456,18 +456,18 @@ 面積：[AREA]平方メートル </text> <button label="土地情報..." label_selected="土地情報..." name="button about land"/> - <check_box label="オーナーを表示" name="checkbox show owners" tool_tip="所有権別に区画を色分けします"/> + <check_box label="オーナーを表示" name="checkbox show owners" tool_tip="所有権別に区画を色分けします： 緑 = あなたの土地 アクア = あなたのグループ所有地 赤 = 他人が所有する土地 黄色 = 売り出し中 紫 = オークション グレー = パブリック"/> <button label="?" label_selected="?" name="button show owners help" left_delta="114"/> <text name="label_parcel_modify"> 区画の編集 </text> - <button label="再分割..." label_selected="再分割..." name="button subdivide land"/> - <button label="統合する..." label_selected="統合する..." name="button join land"/> + <button label="再分割" label_selected="再分割" name="button subdivide land"/> + <button label="統合する" label_selected="統合する" name="button join land"/> <text name="label_parcel_trans"> 土地取引 </text> - <button label="土地を購入..." label_selected="土地を購入..." name="button buy land"/> - <button label="土地を放棄..." label_selected="土地を放棄..." name="button abandon land"/> + <button label="土地を購入" label_selected="土地を購入" name="button buy land"/> + <button label="土地を放棄" label_selected="土地を放棄" name="button abandon land"/> </panel> <floater.string name="status_rotate"> 色の付いたバンドをドラッグしてオブジェクトを回転 diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 5c22fbf474..4d067d2823 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1809,7 +1809,7 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか </notification> <notification label="スクリプトを無効化" name="HelpRegionDisableScripts"> スクリプトが原因でシムの状況が悪くなる場合があります。 -統計グラフをだして（Ctrl-Shift-1）、 +統計グラフをだして（Ctrl+Shift+1）、 シミュレーターフィジックスFPSを見てください。 45より数が低ければ、一番下に位置しているタイムパネルを開いてください。 スクリプト時間が25ms以上であれば、 @@ -1828,7 +1828,7 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか <notification label="衝突を無効化" name="HelpRegionDisableCollisions"> 物理的オブジェクトが原因で、 シムの処理が重くなることがあります。 -統計グラフを開いて（Ctrl-Shift-1）、 +統計グラフを開いて（Ctrl+Shift+1）、 シミュレーターフィジックスFPSを見てください。 数値が45より低ければ、統計バーの下に位置しているタイムパネルを開いてください。 もしシムタイム（物理的作用）が20 msより長い場合は、 @@ -3128,8 +3128,8 @@ Mキーを押して変更します。 [SECOND_LIFE] をデバッグするデベロッパーにとって 有用な機能があります。 このメニューを切り替えるには、 -WindowsではCtrl-Alt-Dを押します。 -Macの場合は、⌘-Opt-Shift-Dを押してください。 +WindowsではCtrl+Alt+Dを押します。 +Macの場合は、⌥⌘Dを押してください。 </notification> <notification name="FirstSculptedPrim"> スカルプトプリムを編集しています。 diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml new file mode 100644 index 0000000000..ca4ab3e773 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="住人" />
+ <string name="AcctTypeTrial"
+ value="トライアル" />
+ <string name="AcctTypeCharterMember"
+ value="特権メンバー" />
+ <string name="AcctTypeEmployee"
+ value="Linden Lab従業員" />
+ <string name="PaymentInfoUsed"
+ value="支払い情報登録済" />
+ <string name="PaymentInfoOnFile"
+ value="支払い情報登録済み" />
+ <string name="NoPaymentInfoOnFile"
+ value="支払い情報未登録" />
+ <string name="AgeVerified"
+ value="年齢確認済み" />
+ <string name="NotAgeVerified"
+ value="年齢未確認" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=ja
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]：
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="パートナー："/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ 取り込み中応答メッセージ：
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index 266937e216..43e3ca69ef 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml @@ -47,7 +47,7 @@ <panel name="preferences_container"> <check_box label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/> <check_box label="会員募集" name="open_enrollement" tool_tip="招待状なしに自由にこのグループに加入することを許可するかどうかを指定します"/> - <check_box label="入会費：L$" name="check_enrollment_fee" tool_tip="このグループへの参加に入会費を必須とするかどうかを指定します"/> + <check_box label="入会費：" name="check_enrollment_fee" tool_tip="このグループへの参加に入会費を必須とするかどうかを指定します"/> <spinner name="spin_enrollment_fee" tool_tip="「入会費」がチェックされている場合、新規会員は入会時にここに指定された金額を支払う必要があります"/> <combo_box name="group_mature_check" tool_tip="グループ情報がMature向けかどうかの設定をします。"> <combo_box.item name="select_mature" label="- Matureの選択 -"/> diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml index 019d42c40a..595d315cf9 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml @@ -48,8 +48,11 @@ <string name="land_contrib_error"> 土地の出資設定を行うことができませんでした。 </string> + <text name="your_contribution_units"> + (平方メートル) + </text> <text name="your_contribution_max_value"> - 平方メートル ([AMOUNT]最大) + ([AMOUNT]最大) </text> <text name="group_over_limit_text"> 使用中の土地をサポートするには、グループ・メンバーがさらに多 diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index 6c3ad93d4f..584fcd6164 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG、Mature、Adult"/> <combo_box.item name="Desired_Mature" label="PGとMature"/> - <combo_box.item name="Desired_PG" label="PG限定"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG限定 + PG </text> <text name="start_location_textbox"> ログイン位置： 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 ce4f3c19b2..186820f00a 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="不動産" name="Estate"> +<panel label="不動産" name="Estate"> <text name="estate_help_text"> このタブの設定を変更するとこの不動産内 の全ての地域に影響を与えます。 @@ -77,6 +75,4 @@ <button label="メッセージを不動産へ送信..." name="message_estate_btn" /> <button label="土地からユーザーを追い出す..." name="kick_user_from_estate_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 19326c82b6..6527f0fbe6 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="地面テクスチャー" name="Textures"> +<panel label="地面テクスチャー" name="Textures"> <text name="region_text_lbl"> 地域： </text> @@ -56,6 +54,4 @@ そして「高」の値はテクスチャー#4の高さの下限となります。 </text> <button label="適用" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 7b21146651..0eb26754cf 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -488,16 +488,16 @@ 参照 </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -603,6 +603,9 @@ <string name="no_ability_error"> あなたにはその能力がありません。 </string> + <string name="no_ability"> + あなたにはその能力がありません。 + </string> <string name="not_a_mod_error"> あなたはセッション・モデレータではありません。 </string> @@ -621,4 +624,31 @@ <string name="close_on_no_ability"> このチャット・セッションを継続することはできません </string> + <string name="AcctTypeResident"> + 住人 + </string> + <string name="AcctTypeTrial"> + トライアル + </string> + <string name="AcctTypeCharterMember"> + 特権メンバー + </string> + <string name="AcctTypeEmployee"> + Linden Lab従業員 + </string> + <string name="PaymentInfoUsed"> + 支払い情報登録済 + </string> + <string name="PaymentInfoOnFile"> + 支払い情報登録済み + </string> + <string name="NoPaymentInfoOnFile"> + 支払い情報未登録 + </string> + <string name="AgeVerified"> + 年齢確認済み + </string> + <string name="NotAgeVerified"> + 年齢未確認 + </string> </strings> diff --git a/indra/newview/skins/default/xui/nl/floater_sell_land.xml b/indra/newview/skins/default/xui/nl/floater_sell_land.xml index ed5cd50165..3981f3ccc2 100644 --- a/indra/newview/skins/default/xui/nl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/nl/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="Verkoop land"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Perceel: </text> @@ -58,4 +60,6 @@ zullen van eigenaar veranderen. </text> <button label="Zet het land te koop" name="sell_btn"/> <button label="Annuleren" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml index 0d2c009dc6..cb0c1ad89a 100644 --- a/indra/newview/skins/default/xui/nl/floater_tools.xml +++ b/indra/newview/skins/default/xui/nl/floater_tools.xml @@ -159,7 +159,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - U kunt dit object wijzigen. + U kunt dit object wijzigen </text> <text name="B:"> B: @@ -187,28 +187,28 @@ <check_box name="checkbox next owner can transfer" left_delta="67"/> </panel> <string name="text modify info 1"> - U kunt dit object wijzigen. + U kunt dit object wijzigen </string> <string name="text modify info 2"> - U kunt deze objecten wijzigen. + U kunt deze objecten wijzigen </string> <string name="text modify info 3"> - U kunt dit object niet wijzigen. + U kunt dit object niet wijzigen </string> <string name="text modify info 4"> - U kunt deze objecten niet wijzigen. + U kunt deze objecten niet wijzigen </string> <string name="text modify warning"> - U moet het hele object selecteren om permissies in te stellen. + U moet het hele object selecteren om permissies in te stellen </string> <string name="Cost Default"> - Prijs: L$ + Prijs: L$ </string> <string name="Cost Total"> - Totale Prijs: L$ + Totale Prijs: L$ </string> <string name="Cost Per Unit"> - Prijs per: L$ + Prijs per: L$ </string> <string name="Cost Mixed"> Gemengde prijs @@ -499,8 +499,8 @@ <button label="Uitlijnen" label_selected="Uitlijnen" name="button align" left="155" /> </panel> <panel label="Inhoud" name="Contents"> - <button label="Nieuw script" label_selected="Nieuw script..." name="button new script"/> - <button label="Permissies..." name="button permissions"/> + <button label="Nieuw script" label_selected="Nieuw script" name="button new script"/> + <button label="Permissies" name="button permissions"/> <panel name="ContentsInventory" width="272" /> </panel> </tab_container> @@ -515,18 +515,18 @@ Gebied: [AREA] m². </text> <button label="Over land..." label_selected="Over land..." name="button about land"/> - <check_box label="Toon Eigenaren" name="checkbox show owners" tool_tip="Kleur percelen op basis van hun eigendom"/> + <check_box label="Toon Eigenaren" name="checkbox show owners" tool_tip="Kleur percelen op basis van hun eigendom: Groen = Uw land Aqua = Land van uw groep Rood = Eigendom van anderen Geel = Te koop Paars = Ter veiling Grijs = Openbaar"/> <button label="?" label_selected="?" name="button show owners help" left_delta="105"/> <text name="label_parcel_modify"> Wijzig Perceel </text> - <button label="Opdelen..." label_selected="Opdelen..." name="button subdivide land"/> - <button label="Samenvoegen..." label_selected="Samenvoegen..." name="button join land"/> + <button label="Opdelen" label_selected="Opdelen" name="button subdivide land"/> + <button label="Samenvoegen" label_selected="Samenvoegen" name="button join land"/> <text name="label_parcel_trans"> Landtransacties </text> - <button label="Koop land..." label_selected="Koop land..." name="button buy land"/> - <button label="Land Afstaan..." label_selected="Land Afstaan..." name="button abandon land"/> + <button label="Koop land" label_selected="Koop land" name="button buy land"/> + <button label="Land Afstaan" label_selected="Land Afstaan" name="button abandon land"/> </panel> <floater.string name="status_rotate"> Sleep de gekleurde banden om het object te roteren diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml index b47e92b682..9a83eaea61 100644 --- a/indra/newview/skins/default/xui/nl/notifications.xml +++ b/indra/newview/skins/default/xui/nl/notifications.xml @@ -1756,7 +1756,7 @@ Indien deze optie is aan gevinkt, kunnen kopers hun land in deze regio verkopen. Standaard: Niet toestaan </notification> <notification label="Scripts Uitschakelen" name="HelpRegionDisableScripts"> - Indien de sim prestaties slecht zijn, kan een script de oorzaak zijn. Open de Statistieken balk (Ctrl-Shift-1). Kijk naar de Simulator Fysieke FPS. Indien het lager is dan 45, open dan het Tijd paneel onderaan de Statistieken balk. Indien de Script Tijd 25 ms of hoger is, klik dan op de Top Scripts knop. U krijgt dan een naam en lokatie van scripts die mogelijk de slechte prestaties veroorzaken. + Indien de sim prestaties slecht zijn, kan een script de oorzaak zijn. Open de Statistieken balk (Ctrl+Shift+1). Kijk naar de Simulator Fysieke FPS. Indien het lager is dan 45, open dan het Tijd paneel onderaan de Statistieken balk. Indien de Script Tijd 25 ms of hoger is, klik dan op de Top Scripts knop. U krijgt dan een naam en lokatie van scripts die mogelijk de slechte prestaties veroorzaken. Het aan vinken van Scripts Uitschakelen en vervolgens op de Toepassen knop drukken, zal tijdelijk alle scripts in deze regio uitschakelen. U zult dit mogelijk moeten doen om naar de lokatie te gaan van het 'top script'. Eenmaal aangekomen, onderzoek dan of het script het probleem veroorzaakt. U zult mogelijk de eigenaar willen contacteren of het object willen retourneren c.q. verwijderen. Verwijder het vinkje van Scripts Uitschakelen en klik op Toepassen om scripts weer te reactiveren in de regio. @@ -1764,7 +1764,7 @@ Verwijder het vinkje van Scripts Uitschakelen en klik op Toepassen om scripts we Standaard: Uitgeschakeld </notification> <notification label="Botsingen Uitschakelen" name="HelpRegionDisableCollisions"> - Indien de sim prestaties slecht zijn, kunnen fysieke objecten de oorzaak zijn. Open de Statistieken balk (Ctrl-Shift-1). Kijk naar de Simulator Fysieke FPS. Indien het lager is dan 45, open dan het Tijd paneel onderaan de Statistieken balk. Indien de Sim Tijd (Fysiek) 20 ms of hoger is, klik dan op de Toon Top Botsingen knop. U krijgt dan een naam en lokatie van de fysieke objecten die mogelijk de slecht prestaties veroorzaken. + Indien de sim prestaties slecht zijn, kunnen fysieke objecten de oorzaak zijn. Open de Statistieken balk (Ctrl+Shift+1). Kijk naar de Simulator Fysieke FPS. Indien het lager is dan 45, open dan het Tijd paneel onderaan de Statistieken balk. Indien de Sim Tijd (Fysiek) 20 ms of hoger is, klik dan op de Toon Top Botsingen knop. U krijgt dan een naam en lokatie van de fysieke objecten die mogelijk de slecht prestaties veroorzaken. Het aan vinken van de Botsingen Uitschakelen knop en vervolgens op de Toepassen knop drukken, zal tijdelijk object-object botsingen uitschakelen. U zult dit mogelijk moeten doen om naar de lokatie te gaan van de 'top botsingen'. Eenmaal aangekomen, onderzoek dan het object. Botst het constant met andere objecten? U zult mogelijk de eigenaar willen contacteren of het object willen retourneren c.q. verwijderen. Verwijder het vinkje van Botsingen Uitschakelen en klik op Toepassen om botsingen weer te reactiveren in de regio. @@ -1991,7 +1991,7 @@ inventaris item(s) verplaatsen? <usetemplate ignoretext="Indien verplaatsen 'niet kopieerbare' inventaris van gescripte objecten" name="okcancelignore" notext="Annuleren" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Waarschuwing: Het Betaal Object aan klik actie is ingesteld, maar het zal alleen werken als er een script is toegevoegd met een money() event. + Waarschuwing: Het 'Betaal object' aan klik actie is ingesteld, maar het zal alleen werken als er een script is toegevoegd met een money() event. <form name="form"> <ignore name="ignore" text="Indien instellen 'Betaal' op objecten zonder money() events"/> </form> @@ -2916,7 +2916,7 @@ Flexibele objecten mogen niet fysiek zijn en moeten fantoom zijn tot de 'fl <notification name="FirstDebugMenus"> U heeft het menu Geavanceerd geactiveerd. Dit menu bevat opties die handig zijn voor ontwikkelaars tijdens het debuggen van [SECOND_LIFE]. -Om dit menu in en uit te schakelen drukt u binnen Windows Ctrl-Alt-D. Met een Mac drukt u ⌘-Opt-D. +Om dit menu in en uit te schakelen drukt u binnen Windows Ctrl+Alt+D. Met een Mac drukt u ⌥⌘D. </notification> <notification name="FirstSculptedPrim"> U bent een sculpted prim aan het bewerken. diff --git a/indra/newview/skins/default/xui/nl/panel_edit_profile.xml b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml new file mode 100644 index 0000000000..00f8c087de --- /dev/null +++ b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Inwoner" />
+ <string name="AcctTypeTrial"
+ value="Proef" />
+ <string name="AcctTypeCharterMember"
+ value="Charter lid" />
+ <string name="AcctTypeEmployee"
+ value="Linden Lab werknemer" />
+ <string name="PaymentInfoUsed"
+ value="Betalingsinformatie gebruikt" />
+ <string name="PaymentInfoOnFile"
+ value="Betalingsinformatie aanwezig" />
+ <string name="NoPaymentInfoOnFile"
+ value="Geen betalingsinfo aanwezig" />
+ <string name="AgeVerified"
+ value="Leeftijd geverifieerd" />
+ <string name="NotAgeVerified"
+ value="Leeftijd niet geverifieerd" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=nl
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Antwoord bij Niet Storen:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_general.xml b/indra/newview/skins/default/xui/nl/panel_group_general.xml index d92d41bcb3..2a0fe03232 100644 --- a/indra/newview/skins/default/xui/nl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/nl/panel_group_general.xml @@ -45,7 +45,7 @@ Laat uw muis boven de opties zweven voor meer help. <panel name="preferences_container"> <check_box label="Toon in zoeken" name="show_in_group_list" tool_tip="Stelt in of deze groep zichtbaar is in de zoekresultaten."/> <check_box label="Vrije toegang" name="open_enrollement" tool_tip="Stelt in of deze groep toestaat dat nieuwe leden lid kunnen worden zonder uitgenodigd te zijn."/> - <check_box label="Contributiebijdrage: L$" name="check_enrollment_fee" tool_tip="Stelt in of er een contributiebijdrage vereist is om lid te worden van de groep."/> + <check_box label="Contributiebijdrage:" name="check_enrollment_fee" tool_tip="Stelt in of er een contributiebijdrage vereist is om lid te worden van de groep."/> <spinner name="spin_enrollment_fee" tool_tip="Nieuwe leden moeten deze bijdrage betalen om deel te nemen aan de groep wanneer "Contributie bijdrage" is aangevinkt." width="58" left_delta="142"/> <combo_box name="group_mature_check" tool_tip="Stelt in of uw groepsinformatie als mature beschouwd wordt."> <combo_box.item name="select_mature" label="- Selecteer -"/> diff --git a/indra/newview/skins/default/xui/nl/panel_region_estate.xml b/indra/newview/skins/default/xui/nl/panel_region_estate.xml index 3a8096ce5f..7a5fa801d9 100644 --- a/indra/newview/skins/default/xui/nl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/nl/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estate" name="Estate"> +<panel label="Estate" name="Estate"> <text name="estate_help_text"> Wijzigingen van instellingen op dit tabblad zullen alle regio's in de estate beïnvloeden. @@ -69,6 +67,4 @@ zullen alle regio's in de estate beïnvloeden. <button label="?" name="ban_resident_help"/> <button label="Verwijderen..." name="remove_banned_avatar_btn"/> <button label="Toevoegen..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/nl/panel_region_texture.xml b/indra/newview/skins/default/xui/nl/panel_region_texture.xml index da40926ce2..ff10e20b7c 100644 --- a/indra/newview/skins/default/xui/nl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/nl/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Grond texturen" name="Textures"> +<panel label="Grond texturen" name="Textures"> <text name="region_text_lbl"> Regio: </text> @@ -56,6 +54,4 @@ en de HIGH waarde is de MINIMUM hoogte van textuur #4. </text> <button label="Toepassen" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml index bb073f735d..49ebcd319c 100644 --- a/indra/newview/skins/default/xui/nl/strings.xml +++ b/indra/newview/skins/default/xui/nl/strings.xml @@ -487,16 +487,16 @@ Kies folder </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -604,6 +604,9 @@ <string name="no_ability_error"> U beschikt niet over die mogelijkheid. </string> + <string name="no_ability"> + U beschikt niet over die mogelijkheid. + </string> <string name="not_a_mod_error"> U bent geen sessie moderateur </string> @@ -622,4 +625,31 @@ <string name="close_on_no_ability"> U heeft niet langer de mogelijkheid om in deze chatsessie te zijn. </string> + <string name="AcctTypeResident"> + Inwoner + </string> + <string name="AcctTypeTrial"> + Proef + </string> + <string name="AcctTypeCharterMember"> + Charter lid + </string> + <string name="AcctTypeEmployee"> + Linden Lab werknemer + </string> + <string name="PaymentInfoUsed"> + Betalingsinformatie gebruikt + </string> + <string name="PaymentInfoOnFile"> + Betalingsinformatie aanwezig + </string> + <string name="NoPaymentInfoOnFile"> + Geen betalingsinfo aanwezig + </string> + <string name="AgeVerified"> + Leeftijd geverifieerd + </string> + <string name="NotAgeVerified"> + Leeftijd niet geverifieerd + </string> </strings> diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml index 70451fb5f6..579dcd6745 100755 --- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="sell land" title="Sell Land"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Posiadłość: </text> @@ -55,4 +57,6 @@ </text> <button label="Wystaw Ziemię na Sprzedaż" name="sell_btn" /> <button label="Anuluj" name="cancel_btn" /> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index ad03e6e9f0..c9e7a7e9eb 100755 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml @@ -191,28 +191,28 @@ <check_box name="checkbox next owner can transfer"/> </panel> <string name="text modify info 1"> - Możesz modyfikować ten obiekt. + Możesz modyfikować ten obiekt </string> <string name="text modify info 2"> - Możesz modyfikować te obiekty. + Możesz modyfikować te obiekty </string> <string name="text modify info 3"> - Nie możesz modyfikować tego obiektu. + Nie możesz modyfikować tego obiektu </string> <string name="text modify info 4"> - Nie możesz modyfikować tych obieków. + Nie możesz modyfikować tych obieków </string> <string name="text modify warning"> - Musisz zaznaczyć cały obiekt by ustawić prawa. + Musisz zaznaczyć cały obiekt by ustawić prawa </string> <string name="Cost Default"> - Cena: L$ + Cena: L$ </string> <string name="Cost Total"> - Cena Całości: L$ + Cena Całości: L$ </string> <string name="Cost Per Unit"> - Cena Za: L$ + Cena Za: L$ </string> <string name="Cost Mixed"> Cena Mieszana @@ -511,8 +511,8 @@ <button label="Dopasuj" label_selected="Dopasuj" name="button align" left="160"/> </panel> <panel label="Treść" name="Contents"> - <button label="Nowy Skrypt" label_selected="Nowy Skrypt..." name="button new script"/> - <button label="Prawa..." name="button permissions"/> + <button label="Nowy Skrypt" label_selected="Nowy Skrypt" name="button new script"/> + <button label="Prawa" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -526,18 +526,18 @@ Obszar: [AREA] m </text> <button label="O Posiadłości..." label_selected="O Posiadłości..." name="button about land"/> - <check_box label="Pokaż Właścicieli" name="checkbox show owners" tool_tip="Pokoloruj posiadłości zgodnie z przynależnością do właściciela"/> + <check_box label="Pokaż Właścicieli" name="checkbox show owners" tool_tip="Pokoloruj posiadłości zgodnie z przynależnością do właściciela: Zielony = Twoja Posiadłość Morski = Posiadłość Twojej Grupy Czerwony = Posiadłości Innych Żółty = Na Sprzedaż Fioletowy = Na Aukcję Szary = Publiczna"/> <button label="?" label_selected="?" name="button show owners help" left_delta="120"/> <text name="label_parcel_modify"> Modyfikuj Posiadłość </text> - <button label="Podziel..." label_selected="Podziel..." name="button subdivide land"/> - <button label="Złącz..." label_selected="Złącz..." name="button join land"/> + <button label="Podziel" label_selected="Podziel" name="button subdivide land"/> + <button label="Złącz" label_selected="Złącz" name="button join land"/> <text name="label_parcel_trans"> Transakcje na posiadłości </text> - <button label="Kup..." label_selected="Kup..." name="button buy land"/> - <button label="Anuluj..." label_selected="Anuluj..." name="button abandon land"/> + <button label="Kup" label_selected="Kup" name="button buy land"/> + <button label="Anuluj" label_selected="Anuluj" name="button abandon land"/> </panel> <floater.string name="status_rotate"> Przeciągaj kolorowe pierścienie żeby obracać obiekt diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index ef5dad8786..3cf9be507d 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -1713,7 +1713,7 @@ Jeżeli ta opcja jest wybrana kupujący będą mogli odsprzedać posiadłości w Domyślinie: nie pozwalaj </notification> <notification label="Wyłącz Skrypty" name="HelpRegionDisableScripts"> - Słaba wydajność / prędkość symulatora może być spowodowana przez skrypt. Otwórz panel Statystyki (Ctrl-Shift-1). Sprawdź ilość klatek na sekundę (FPS) w Fizyce Symulatora. Jeżeli jest mniej niż 45 wybierz panel Czas znajdujący się na dole panelu Statystyki. Jeżeli Czas Skryptów wynosi 25 ms lub więcej kliknij na Główne Skrypty. Zobaczysz listę nazw i lokacji skryptów które mogą być odpowiedzialne za pogorszenie wydajności. + Słaba wydajność / prędkość symulatora może być spowodowana przez skrypt. Otwórz panel Statystyki (Ctrl+Shift+1). Sprawdź ilość klatek na sekundę (FPS) w Fizyce Symulatora. Jeżeli jest mniej niż 45 wybierz panel Czas znajdujący się na dole panelu Statystyki. Jeżeli Czas Skryptów wynosi 25 ms lub więcej kliknij na Główne Skrypty. Zobaczysz listę nazw i lokacji skryptów które mogą być odpowiedzialne za pogorszenie wydajności. Wybranie opcji Wyłącz Skrypty i naciśnięcie Zastosuj tymczasowo wyłączy wszystkie skrypty w tym regionie. Wybranie tej opcji może być niezbędne w celu umożliwienia podróży do lokacji wymienionego Głównego Skryptu. Po przebyciu na miejsce zobacz skrypt i sprawdź czy jest on źródłem problemu. W razie potrzeby skontaktuj się z właścicielem skryptu albo usuń lub zwróć obiekt. @@ -1722,7 +1722,7 @@ Wyłączenie opcji Wyłącz Skrypty i naciśnięcie Zastosuj ponownie włączy s Domyślnie: nie wybrana </notification> <notification label="Wyłącz Kolizje" name="HelpRegionDisableCollisions"> - Słaba wydajność / prędkość symulatora może być spowodowana przez fizyczne obiekty. Otwórz panel Statystyki (Ctrl-Shift-1). Sprawdź ilość klatek na sekundę (FPS) w Fizyce Symulatora. Jeżeli jest mniej niż 45 wybierz panel Czas znajdujący się na dole panelu Statystyki. Jeżeli Czas Symulatora (Fizyka) wynosi 20 ms lub więcej kliknij na Główne Kolizje. Zobaczysz listę nazw i lokacji fizycznych obiektów które mogą być odpowiedzialne za pogorszenie wydajności. + Słaba wydajność / prędkość symulatora może być spowodowana przez fizyczne obiekty. Otwórz panel Statystyki (Ctrl+Shift+1). Sprawdź ilość klatek na sekundę (FPS) w Fizyce Symulatora. Jeżeli jest mniej niż 45 wybierz panel Czas znajdujący się na dole panelu Statystyki. Jeżeli Czas Symulatora (Fizyka) wynosi 20 ms lub więcej kliknij na Główne Kolizje. Zobaczysz listę nazw i lokacji fizycznych obiektów które mogą być odpowiedzialne za pogorszenie wydajności. Wybranie opcji Wyłącz Kolizje i naciśnięcie Zastosuj tymczasowo wyłączy kolizje obiektów. Wybranie tej opcji może być niezbędne w celu umożliwienia podróży do lokacji wymienionych Główneych Kolizji. Po przebyciu na miejsce zobacz obiekt i sprawdź czy jest on źródłem kolizji z innymi obiektami. W razie potrzeby skontaktuj się z właścicielem obiektu albo usuń lub zwróć obiekt. @@ -1936,7 +1936,7 @@ Przenieść obiekty szafy? <usetemplate ignoretext="Przenosząc szafę bez praw kopiowania ze skryptowanych obiektów" name="okcancelignore" notext="Anuluj" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Uwaga: Opcja Zapłać Obiektowi została wybrana, ale żeby ta opcja działała musi być dodany skrypt z funkcją money(). + Uwaga: Opcja 'Zapłać Obiektowi' została wybrana, ale żeby ta opcja działała musi być dodany skrypt z funkcją money(). <form name="form"> <ignore name="ignore" text="Wybierając opcję Zapłać Obiektowi dla obiektów bez funkcji money()"/> </form> @@ -2867,7 +2867,7 @@ Obiekty elastyczne nie mogą być fizyczne i muszą być typu fantom. <notification name="FirstDebugMenus"> Zaawansowane menu zostało włączone. To menu zawiera funkcje użyteczne dla programistów analizujących [SECOND_LIFE]. -To menu jest aktywowane dzięki kombinacji klawiszy Ctrl-Alt-D (Windows) lub ⌘-Opt-D (Mac). +To menu jest aktywowane dzięki kombinacji klawiszy Ctrl+Alt+D (Windows) lub ⌥⌘D (Mac). </notification> <notification name="FirstSculptedPrim"> Edytujesz sculpt. diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml new file mode 100644 index 0000000000..e449a92d7e --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Rezydent" />
+ <string name="AcctTypeTrial"
+ value="Próbne" />
+ <string name="AcctTypeCharterMember"
+ value="Członek-zalożyciel" />
+ <string name="AcctTypeEmployee"
+ value="Pracownik Linden Lab" />
+ <string name="PaymentInfoUsed"
+ value="Dane Konta Używane" />
+ <string name="PaymentInfoOnFile"
+ value="Dane Konta Dostępne" />
+ <string name="NoPaymentInfoOnFile"
+ value="Brak Danych Konta" />
+ <string name="AgeVerified"
+ value="Wiek Zweryfikowany" />
+ <string name="NotAgeVerified"
+ value="Brak Weryfikacji Wieku" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=pl
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Pracuś Mówi:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml index 5d19485634..d09ff72226 100755 --- a/indra/newview/skins/default/xui/pl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ogólne" name="general_tab"> <string name="help_text"> - Zakładka Ogólne zawiera informacje na temat tej grupy, -listę właścicieli, widocznych członków, -ustawienia grupy oraz opcje członkostwa. + Zakładka Ogólne zawiera informacje na temat tej grupy, listę właścicieli, widocznych członków, ustawienia grupy oraz opcje członkostwa. </string> <string name="group_info_unchanged"> Ogólne informacje na temat grupy uległy zmianie. @@ -45,7 +43,7 @@ ustawienia grupy oraz opcje członkostwa. <panel name="preferences_container"> <check_box label="Wyświetlaj w wyszukiwarce" name="show_in_group_list" tool_tip="Udostępnij info o grupie w wyszukiwarce"/> <check_box label="Wolny Wstęp" name="open_enrollement" tool_tip="Sprawdź czy grupa oferuje wolny wstęp i nie wymaga zaproszenia."/> - <check_box label="Opłata Wstępu: L$" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/> + <check_box label="Opłata Wstępu:" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/> <spinner name="spin_enrollment_fee" tool_tip="Nowi członkowie grupy muszą zapłacić wymaganą opłatę by dołączyć do grupy."/> <combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, iż Twoja grupa klasyfikowana jest jako 'Mature'."> <combo_box.item name="select_mature" label="- Wybierz Treść -"/> diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml index 5080b0963a..dbfa8e3122 100755 --- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml @@ -48,8 +48,11 @@ <string name="land_contrib_error"> Nie można ustalić Twoich kontrybucji. </string> + <text name="your_contribution_units"> + ( m ) + </text> <text name="your_contribution_max_value"> - metrów ([AMOUNT] maksimum) + ([AMOUNT] maksimum) </text> <text name="group_over_limit_text"> Członkowie Grupy muszą zwiększyć kredyt na używanie Posiadłości. diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index a7654ef2ff..97b4975f29 100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml @@ -34,10 +34,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="'PG', 'Mature' oraz 'Adult'"/> <combo_box.item name="Desired_Mature" label="'PG' i 'Mature'"/> - <combo_box.item name="Desired_PG" label="tylko 'PG'"/> + <combo_box.item name="Desired_PG" label="'PG'"/> </combo_box> <text name="maturity_desired_textbox"> - tylko 'PG' + 'PG' </text> <text name="start_location_textbox"> Miejsce Startu: diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 4447de517b..4275f3f647 100755 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Majątek" name="Estate"> +<panel label="Majątek" name="Estate"> <text name="estate_help_text"> Zmiany ustawień na tej zakładce odnoszą się do wszystkich Regionów w tym Majątku. @@ -73,6 +71,4 @@ do wszystkich Regionów w tym Majątku. <name_list name="banned_avatar_name_list"/> <button label="Usuń..." name="remove_banned_avatar_btn"/> <button label="Dodaj..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml index ac43f0b2cc..d24579fc75 100755 --- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Tekstury Gruntu" name="Textures"> +<panel label="Tekstury Gruntu" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ a wartość GÓRA to MINIMALNY poziom dla tekstury #4. </text> <button label="Zastosuj" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 294353ee03..1f67944f86 100755 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -487,16 +487,16 @@ Wybierz Katalog </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -603,6 +603,9 @@ <string name="no_ability_error"> Nie posiadesz tego przywileju. </string> + <string name="no_ability"> + Nie posiadesz tego przywileju. + </string> <string name="not_a_mod_error"> Nie jesteś moderatorem konferencji. </string> @@ -621,4 +624,31 @@ <string name="close_on_no_ability"> Nie posiadasz praw by uczestniczyć w tej konferencji. </string> + <string name="AcctTypeResident"> + Rezydent + </string> + <string name="AcctTypeTrial"> + Próbne + </string> + <string name="AcctTypeCharterMember"> + Członek-zalożyciel + </string> + <string name="AcctTypeEmployee"> + Pracownik Linden Lab + </string> + <string name="PaymentInfoUsed"> + Dane Konta Używane + </string> + <string name="PaymentInfoOnFile"> + Dane Konta Dostępne + </string> + <string name="NoPaymentInfoOnFile"> + Brak Danych Konta + </string> + <string name="AgeVerified"> + Wiek Zweryfikowany + </string> + <string name="NotAgeVerified"> + Brak Weryfikacji Wieku + </string> </strings> diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index 20f9972c73..d3581405ff 100644 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="Vender terreno"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> <text name="info_parcel_label"> Lote: </text> @@ -58,4 +60,6 @@ lote irão mudar de propriedade. </text> <button label="Definir Terra para Venda" name="sell_btn"/> <button label="Cancelar" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index 7302c1c8f8..d7227deacc 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -159,7 +159,7 @@ </combo_box> <panel name="perms_build"> <text name="perm_modify"> - Você pode modificar este objeto. + Você pode modificar este objeto </text> <text name="B:"> B: @@ -187,28 +187,28 @@ <check_box name="checkbox next owner can transfer" left_delta="67"/> </panel> <string name="text modify info 1"> - Você pode modificar este objeto. + Você pode modificar este objeto </string> <string name="text modify info 2"> - Você pode modificar estes objetos. + Você pode modificar estes objetos </string> <string name="text modify info 3"> - Você não pode modificar este objeto. + Você não pode modificar este objeto </string> <string name="text modify info 4"> - Você não pode modificar estes objetos. + Você não pode modificar estes objetos </string> <string name="text modify warning"> - Você precisa selecionar o objeto todo para ajustar as permissões. + Você precisa selecionar o objeto todo para ajustar as permissões </string> <string name="Cost Default"> - Preço: L$ + Preço: L$ </string> <string name="Cost Total"> - Preço Total: L$ + Preço Total: L$ </string> <string name="Cost Per Unit"> - Preço Por: L$ + Preço Por: L$ </string> <string name="Cost Mixed"> Preço Misturado @@ -498,8 +498,8 @@ <button label="Alinhar" label_selected="Alinhar" name="button align"/> </panel> <panel label="Conteúdo" name="Contents"> - <button label="Novo Script" label_selected="Novo Script..." name="button new script"/> - <button label="Permissões..." name="button permissions"/> + <button label="Novo Script" label_selected="Novo Script" name="button new script"/> + <button label="Permissões" name="button permissions"/> <panel name="ContentsInventory" width="272" /> </panel> </tab_container> @@ -514,18 +514,18 @@ Área: [AREA] m². </text> <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/> - <check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos"/> + <check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos: Green = Sua terra Aqua = Terra do seu grupo Red = Possuída por outros Yellow = À venda Purple = A leilão Grey = Pública"/> <button label="?" label_selected="?" name="button show owners help" left_delta="100"/> <text name="label_parcel_modify"> Modificar Lote </text> - <button label="Sub-Dividir..." label_selected="Sub-Dividir..." name="button subdivide land"/> - <button label="Unir..." label_selected="Unir..." name="button join land"/> + <button label="Sub-Dividir" label_selected="Sub-Dividir" name="button subdivide land"/> + <button label="Unir" label_selected="Unir" name="button join land"/> <text name="label_parcel_trans"> Transações com a Terra </text> - <button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/> - <button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/> + <button label="Comprar Terra" label_selected="Comprar Terra" name="button buy land"/> + <button label="Abandonar Terra" label_selected="Abandonar Terra" name="button abandon land"/> </panel> <floater.string name="status_rotate"> Arrastar as bandas coloridas para girar o objeto diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 1f15feef49..0ee2c5cb84 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1730,10 +1730,10 @@ Se esta opção estiver marcada, compradores podem vender seus terrenos nesta re Padrão: Desabilitada. </notification> <notification label="Desabilitar Scripts" name="HelpRegionDisableScripts"> - Quando a performance do simulador está ruim, um script pode ser o culpado. Abra a Barra de Estatísticas (Ctrl-Shift-1). Olhe no Simulador de Física FPS. Se estiver abaixo de 45, então abra o painel 'Tempo' localizado na parte de baixo da Barra de Estatísticas. Se o Tempo de Script indicar 25 ms ou mais, clique no botão 'Get Top CScripts'. Será dado o nome e a localização do script que pode estar causando uma performance ruim. Marque a caixa 'Desabilitar Scripts' e aperte o botão 'Aplicar'. Isto temporariamente desabilitará todos os scripts nesta região. Uma vez que você chegar ao local, investigue o script para determinar se ele está causando o problema. Você pode querer entrar em contato com o proprietário do script, excluir ou devolver o objeto. Desmarque a caixa 'Desabilitar Script' e então clique em 'Aplicar' para reativar os scripts na região. Padrão: desligado. + Quando a performance do simulador está ruim, um script pode ser o culpado. Abra a Barra de Estatísticas (Ctrl+Shift+1). Olhe no Simulador de Física FPS. Se estiver abaixo de 45, então abra o painel 'Tempo' localizado na parte de baixo da Barra de Estatísticas. Se o Tempo de Script indicar 25 ms ou mais, clique no botão 'Get Top CScripts'. Será dado o nome e a localização do script que pode estar causando uma performance ruim. Marque a caixa 'Desabilitar Scripts' e aperte o botão 'Aplicar'. Isto temporariamente desabilitará todos os scripts nesta região. Uma vez que você chegar ao local, investigue o script para determinar se ele está causando o problema. Você pode querer entrar em contato com o proprietário do script, excluir ou devolver o objeto. Desmarque a caixa 'Desabilitar Script' e então clique em 'Aplicar' para reativar os scripts na região. Padrão: desligado. </notification> <notification label="Desabilitar Colisões" name="HelpRegionDisableCollisions"> - Quando a performance do simulador é pobre, os objetos físicos podem ser os culpados.Abra a a Barra de Estatísticas (Ctrl-Shift-1). + Quando a performance do simulador é pobre, os objetos físicos podem ser os culpados.Abra a a Barra de Estatísticas (Ctrl+Shift+1). Olhe a taxa de quadros por segundos (FPS) dos objetos físicos. Se ela estiver abaixo de 45, abra o painel de Tempo, localizado na parte inferior da Barra de Estatísticas. Se o Tempo (Físicos) do Simulador mostrar 20 ms ou mais, clique o botão 'Pegue os Maiores Colidentes'. Será fornecido a você o nome e a localidade dos objetos físicos que podem estar causando uma performance pobre. @@ -1954,7 +1954,7 @@ Mover para o inventário o(s) item(s)? <usetemplate ignoretext="Quando movendo objetos com scripts não copiáveis ao inventário" name="okcancelignore" notext="Não mover" yestext="Mover"/> </notification> <notification name="ClickActionNotPayable"> - Aviso: A ação de Pagar ao Objeto com clique foi definida, mas funcionará apenas se for adicionado um script com o evento money(). + Aviso: A ação de 'Pagar Objeto' com clique foi definida, mas funcionará apenas se for adicionado um script com o evento money(). <form name="form"> <ignore name="ignore" text="Quando Definindo 'Pagar' em objetos sem eventos money()"/> </form> @@ -2875,7 +2875,7 @@ Objetos flexíveis não podem ser físicos e devem ser fantasmas até que a caix <notification name="FirstDebugMenus"> Você ativou o menu Avançado. Este menu contém funcionalidades úteis para desenvolvedores debugarem o [SECOND_LIFE]. -Para mostrar esse menu no Windows pressione Ctrl-Alt-D. No Mac pressione ⌘-Opt-D. +Para mostrar esse menu no Windows pressione Ctrl+Alt+D. No Mac pressione ⌥⌘D. </notification> <notification name="FirstSculptedPrim"> Você está editando uma primitiva esculpida. diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml new file mode 100644 index 0000000000..e97e77cfe6 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="edit_profile_panel">
+ <string name="CaptionTextAcctInfo">
+ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ </string>
+ <string name="AcctTypeResident"
+ value="Residente" />
+ <string name="AcctTypeTrial"
+ value="Teste" />
+ <string name="AcctTypeCharterMember"
+ value="Estatuto do membro" />
+ <string name="AcctTypeEmployee"
+ value="Contratado da Linden Lab" />
+ <string name="PaymentInfoUsed"
+ value="Infor. de pagamento utilizadas" />
+ <string name="PaymentInfoOnFile"
+ value="Infor. de pagamento no arquivo" />
+ <string name="NoPaymentInfoOnFile"
+ value="Sem infor. de pagamento no arquivo" />
+ <string name="AgeVerified"
+ value="Idade Verificada" />
+ <string name="NotAgeVerified"
+ value="Idade não Verificada" />
+ <string name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=pt
+ </string>
+ <panel name="scroll_content_panel">
+ <panel name="data_panel" >
+ <panel name="lifes_images_panel">
+ <panel name="second_life_image_panel">
+ <text name="second_life_photo_title_text">
+ [SECOND_LIFE]:
+ </text>
+ </panel>
+ </panel>
+ <text name="title_partner_text" value="Parceiro:"/>
+ <panel name="partner_data_panel">
+ <text name="partner_text" value="[FIRST] [LAST]"/>
+ </panel>
+ <text name="text_box3">
+ Resposta no Modo Ocupado:
+ </text>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index bdaa0e72f5..226011c138 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml @@ -43,7 +43,7 @@ <panel name="preferences_container"> <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/> <check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/> - <check_box label="Taxa de adesão: L$" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/> + <check_box label="Taxa de adesão:" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/> <spinner width="60" left_delta="120" name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/> <combo_box width="170" name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature."> <combo_box.item name="select_mature" label="- Selecionar Maturidade -"/> diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml index 103da6d67d..5b09363e3c 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml @@ -47,8 +47,11 @@ <string name="land_contrib_error"> Não é possível definir sua contribuição para o terreno. </string> + <text name="your_contribution_units"> + ( m² ) + </text> <text name="your_contribution_max_value"> - m² ([AMOUNT] máxima) + ([AMOUNT] máxima) </text> <text name="group_over_limit_text"> Membros do grupo precisam contribuir com mais créditos de Terra para diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index e50713c0c8..8bde39545c 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature e Adult"/> <combo_box.item name="Desired_Mature" label="PG e Mature"/> - <combo_box.item name="Desired_PG" label="apenas PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - apenas PG + PG </text> <text name="start_location_textbox"> Posição Inicial: diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index e62ba85763..f43402be15 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Propriedade" name="Estate"> +<panel label="Propriedade" name="Estate"> <text name="estate_help_text"> Mudanças nas definições nesta guia irão afetar todas as regiões desta propriedade. @@ -68,6 +66,4 @@ todas as regiões desta propriedade. <button label="?" name="ban_resident_help"/> <button label="Remover..." name="remove_banned_avatar_btn"/> <button label="Adicionar..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml index 2fdba79807..4787b59a8d 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texturas de Chão" name="Textures"> +<panel label="Texturas de Chão" name="Textures"> <text name="region_text_lbl"> Região: </text> @@ -56,6 +54,4 @@ e o valor Alto é a altura Mínima da Textura #4. </text> <button label="Aplicar" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index b6788567e2..2d3514e5fe 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -484,16 +484,16 @@ Escolher Diretório </string> <string name="accel-mac-control"> - Ctrl- + ⌃ </string> <string name="accel-mac-command"> - Cmd- + ⌘ </string> <string name="accel-mac-option"> - Opt- + ⌥ </string> <string name="accel-mac-shift"> - Shift- + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -599,6 +599,9 @@ <string name="no_ability_error"> Você não possui esta habilidade. </string> + <string name="no_ability"> + Você não possui esta habilidade. + </string> <string name="not_a_mod_error"> Você não é um moderador de sessão. </string> @@ -617,4 +620,31 @@ <string name="close_on_no_ability"> Você não possui mais a habilidade de estar na sessão de bate-papo. </string> + <string name="AcctTypeResident"> + Residente + </string> + <string name="AcctTypeTrial"> + Teste + </string> + <string name="AcctTypeCharterMember"> + Estatuto do membro + </string> + <string name="AcctTypeEmployee"> + Contratado da Linden Lab + </string> + <string name="PaymentInfoUsed"> + Infor. de pagamento utilizadas + </string> + <string name="PaymentInfoOnFile"> + Infor. de pagamento no arquivo + </string> + <string name="NoPaymentInfoOnFile"> + Sem infor. de pagamento no arquivo + </string> + <string name="AgeVerified"> + Idade Verificada + </string> + <string name="NotAgeVerified"> + Idade não Verificada + </string> </strings> |