diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-13 16:23:27 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-13 16:23:27 -0800 |
| commit | 585ad10d04d2ea2c1bdda1cb37b239cbaf5ca162 (patch) | |
| tree | 980a1aaa9657a3a84adaae543d324586af82e54d /indra/newview | |
| parent | 2d9de5c0de366b1756023d3745cc1e5f21d3be44 (diff) | |
| parent | 9b6195fcb2b2642fcd0b934effeb90b5fe22dc64 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
24 files changed, 101 insertions, 101 deletions
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png Binary files differindex 447e0af0be..6343ddf035 100644 --- a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png +++ b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png Binary files differindex dd9133bcc4..661d1c5611 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png Binary files differindex 0080e71f41..f927fd3989 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index fac7aef690..b6443c4c21 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -112,7 +112,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number word_wrap="true"> Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others. -Thank you to the following residents for helping to ensure that this is the best version yet: (in progress) +Thank you to the following Residents for helping to ensure that this is the best version yet: (in progress) 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 33fdd923ad..900f4c5956 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1036,7 +1036,7 @@ Leyla Linden </text> name="Autoreturn" top="164" width="294"> - Autoreturn other residents' objects (minutes, 0 for off): + Autoreturn other Residents' objects (minutes, 0 for off): </text> <line_editor border_style="line" @@ -1175,7 +1175,7 @@ Only large parcels can be listed in search. name="allow_label" top="10" width="278"> - Allow other residents to: + Allow other Residents to: </text> <check_box height="16" @@ -1917,7 +1917,7 @@ Only large parcels can be listed in search. layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified residents." + tool_tip="Ban unidentified Residents." top_pad="4" width="278" /> <check_box @@ -1927,7 +1927,7 @@ Only large parcels can be listed in search. 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." + tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="4" width="278" /> <check_box 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 b01c0edc8b..0fac6cd5f1 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -123,7 +123,7 @@ layout="topleft" left_delta="0" name="check reset home" - tool_tip="When resident teleports out, reset their home to the destination position." + tool_tip="When Resident teleports out, reset their home to the destination position." top_pad="4" width="180"> <check_box.commit_callback diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index 92a6111759..a21242ffe1 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -26,7 +26,7 @@ </multi_floater.string> <multi_floater.string name="muted_message"> - You have blocked this resident. Sending a message will automatically unblock them. + You have blocked this Resident. Sending a message will automatically unblock them. </multi_floater.string> <multi_floater.string name="generic_request_error"> diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index f1a75bfcb4..aa219b9615 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -201,11 +201,11 @@ name="Age__Age_play" value="31" /> <combo_box.item - label="Age > Adult resident on Teen Second Life" + label="Age > Adult Resident on Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life" value="32" /> <combo_box.item - label="Age > Underage resident outside of Teen Second Life" + label="Age > Underage Resident outside of Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index bf61697a59..b06c6dc215 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -9,7 +9,7 @@ name="top_objects" help_topic="top_objects" title="Top Objects" - width="550"> + width="800"> <floater.string name="top_scripts_title"> Top Scripts @@ -64,7 +64,7 @@ multi_select="true" name="objects_list" top_delta="17" - width="530"> + width="780"> <scroll_list.columns label="Score" name="score" @@ -84,11 +84,15 @@ <scroll_list.columns label="Time" name="time" - width="100" /> + width="150" /> <scroll_list.columns label="Mono Time" name="mono_time" - width="55" /> + width="100" /> + <scroll_list.columns + label="URLs" + name="URLs" + width="100" /> <scroll_list.commit_callback function="TopObjects.CommitObjectsList" /> </scroll_list> @@ -112,7 +116,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" @@ -144,7 +148,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" @@ -176,7 +180,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 410c398ea5..3309876376 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -246,7 +246,7 @@ Save all changes to clothing/body parts? icon="alertmodal.tga" name="GrantModifyRights" type="alertmodal"> -Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" @@ -258,7 +258,7 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]? icon="alertmodal.tga" name="GrantModifyRightsMultiple" type="alertmodal"> -Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for the selected Residents? <usetemplate name="okcancelbuttons" @@ -1597,7 +1597,8 @@ Unable to force land ownership because selection spans multiple regions. Please icon="alertmodal.tga" name="ForceOwnerAuctionWarning" type="alertmodal"> -This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership? +This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun. +Force ownership? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -3553,7 +3554,7 @@ Type a short announcement which will be sent to everyone in this region. The maturity rating for this region has been updated. It may take some time for the change to be reflected on the map. -To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification. +To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification. </notification> <notification @@ -4543,8 +4544,8 @@ Click on any landmark to select it, then click 'Teleport' at the botto icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> -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 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> @@ -4693,7 +4694,7 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have 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 @@ -5181,7 +5182,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O 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. +This will add a bookmark in your inventory so you can quickly IM this Resident. <form name="form"> <button index="0" diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 003e1baa7e..39170b90ca 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -37,7 +37,7 @@ layout="topleft" left="5" name="blocked" - tool_tip="List of currently blocked residents" + tool_tip="List of currently blocked Residents" top="30" width="270" /> <button @@ -47,7 +47,7 @@ layout="topleft" left_delta="0" name="Block resident..." - tool_tip="Pick a resident to block" + tool_tip="Pick a Resident to block" top_pad="4" width="210"> <button.commit_callback @@ -74,7 +74,7 @@ layout="topleft" left_delta="0" name="Unblock" - tool_tip="Remove resident or object from blocked list" + tool_tip="Remove Resident or object from blocked list" top_pad="4" width="210" > <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml index ac731bcdf0..c315adb33e 100644 --- a/indra/newview/skins/default/xui/en/panel_friends.xml +++ b/indra/newview/skins/default/xui/en/panel_friends.xml @@ -118,7 +118,7 @@ layout="topleft" left_delta="0" name="add_btn" - tool_tip="Offer friendship to a resident" + tool_tip="Offer friendship to a Resident" top_pad="13" width="80" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 37578eae70..c17317d0e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -28,7 +28,7 @@ name="help_text" top="24" width="200"> - You can select multiple residents to + You can select multiple Residents to invite to your group. Click 'Open Resident Chooser' to start. </text> @@ -48,7 +48,7 @@ Resident Chooser' to start. left_delta="0" multi_select="true" name="invitee_list" - tool_tip="Hold the Ctrl key and click resident names to multi-select" + tool_tip="Hold the Ctrl key and click Resident names to multi-select" top_pad="4" width="200" /> <button @@ -57,7 +57,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="remove_button" - tool_tip="Removes residents selected above from the invite list" + tool_tip="Removes the Residents selected above from the invite list" top_pad="4" width="200" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 8327edfdd0..4a1a468186 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -312,7 +312,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the resident" + tool_tip="Offer friendship to the Resident" top="5" width="80" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 73528b28ad..45b64d5e26 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -120,7 +120,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the resident" + tool_tip="Offer friendship to the Resident" top="5" width="80" /> <button @@ -139,7 +139,7 @@ label="Call" layout="topleft" name="call" - tool_tip="Call this resident" + tool_tip="Call this Resident" left_pad="3" top="5" width="45" /> @@ -150,7 +150,7 @@ label="Map" layout="topleft" name="show_on_map_btn" - tool_tip="Show the resident on the map" + tool_tip="Show the Resident on the map" top="5" left_pad="3" width="45" /> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index adf22f825f..8a02637817 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -106,7 +106,7 @@ background_visible="true" left_pad="5" name="add_friend_btn" top_delta="0" - tool_tip="Add selected resident to your friends List" + tool_tip="Add selected Resident to your friends List" width="18"> <commit_callback function="People.addFriend" /> @@ -192,7 +192,7 @@ background_visible="true" layout="topleft" left_pad="5" name="add_btn" - tool_tip="Offer friendship to a resident" + tool_tip="Offer friendship to a Resident" top_delta="0" width="18" /> <button @@ -327,7 +327,7 @@ background_visible="true" left_pad="5" name="add_friend_btn" top_delta="0" - tool_tip="Add selected resident to your friends List" + tool_tip="Add selected Resident to your friends List" width="18"> <commit_callback function="People.addFriend" /> @@ -350,7 +350,7 @@ background_visible="true" label="Profile" layout="topleft" name="view_profile_btn" - tool_tip="Show picture, groups, and other residents information" + tool_tip="Show picture, groups, and other Residents information" width="70" /> <button follows="bottom|left" @@ -370,7 +370,7 @@ background_visible="true" label="Call" layout="topleft" name="call_btn" - tool_tip="Call this resident" + tool_tip="Call this Resident" width="50" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 43947262ec..65d7420335 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -292,7 +292,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the resident" + tool_tip="Offer friendship to the Resident" top="5" width="80" /> <button @@ -311,7 +311,7 @@ label="Call" layout="topleft" name="call" - tool_tip="Call this resident" + tool_tip="Call this Resident" left_pad="3" top="5" width="45" /> @@ -322,7 +322,7 @@ label="Map" layout="topleft" name="show_on_map_btn" - tool_tip="Show the resident on the map" + tool_tip="Show the Resident on the map" top="5" left_pad="3" width="45" /> @@ -342,7 +342,7 @@ label="▼" layout="topleft" name="overflow_btn" - tool_tip="Pay money to or share inventory with the resident" + tool_tip="Pay money to or share inventory with the Resident" right="-1" top="5" left_pad="3" 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 ba39e88024..6ddd018c7a 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -147,7 +147,7 @@ regions in the estate. layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified residents" + tool_tip="Ban unidentified Residents" top_pad="2" width="278" /> <check_box @@ -157,7 +157,7 @@ regions in the estate. 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." + tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index cf8f91bf51..02dc507781 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -67,7 +67,7 @@ <!-- tooltips for Urls --> <string name="TooltipHttpUrl">Click to view this web page</string> <string name="TooltipSLURL">Click to view this location's information</string> - <string name="TooltipAgentUrl">Click to view this resident's profile</string> + <string name="TooltipAgentUrl">Click to view this Resident's profile</string> <string name="TooltipGroupUrl">Click to view this group's description</string> <string name="TooltipEventUrl">Click to view this event's description</string> <string name="TooltipClassifiedUrl">Click to view this classified</string> @@ -1609,11 +1609,11 @@ Sends an HTTP request to the specified url with the body of the request and para </string> <string name="LSLTipText_llResetLandBanList" translate="false"> llResetLandBanList() -Removes all residents from the land ban list +Removes all Residents from the land ban list </string> <string name="LSLTipText_llResetLandPassList" translate="false"> llResetLandPassList() -Removes all residents from the land access/pass list +Removes all Residents from the land access/pass list </string> <string name="LSLTipText_llGetObjectPrimCount" translate="false"> integer llGetObjectPrimCount(key object_id) @@ -1621,7 +1621,7 @@ Returns the total number of prims for an object in the region </string> <string name="LSLTipText_llGetParcelPrimOwners" translate="false"> list llGetParcelPrimOwners(vector pos) -Returns a list of all residents who own objects on the parcel at pos and with individual prim counts. +Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts. Requires owner-like permissions for the parcel. </string> <string name="LSLTipText_llGetParcelPrimCount" translate="false"> @@ -2039,7 +2039,7 @@ this texture in your inventory <string name="RegionInfoAllEstatesYouManage"> all estates that you manage for [OWNER] </string> - <string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> + <string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> <string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string> <!-- script limits floater --> @@ -2110,7 +2110,7 @@ this texture in your inventory <!-- Mute --> <string name="MuteByName">(by name)</string> - <string name="MuteAgent">(resident)</string> + <string name="MuteAgent">(Resident)</string> <string name="MuteObject">(object)</string> <string name="MuteGroup">(group)</string> @@ -2937,7 +2937,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Click the [BUTTON NAME] button to accept/connect to this voice chat. </string> <string name="muted_message"> - You have blocked this resident. Sending a message will automatically unblock them. + You have blocked this Resident. Sending a message will automatically unblock them. </string> <!--Some times string name is getting from the body of server response. For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index af0d338256..693c43f141 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_adhoc - font="SansSerif" height="25" name="im_adhoc_chiclet" show_speaker="false" @@ -12,15 +11,14 @@ left="25" name="speaker" visible="false" - width="20"/> + width="20" /> <chiclet_im_adhoc.avatar_icon follows="left|top|bottom" height="22" mouse_opaque="true" name="adhoc_icon" - width="22"/> + width="22" /> <chiclet_im_adhoc.unread_notifications - font="SansSerif" font_halign="center" height="25" left="25" @@ -29,13 +27,13 @@ text_color="white" v_pad="5" visible="false" - width="20"/> + width="20" /> <chiclet_im_adhoc.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </chiclet_im_adhoc>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index b1988a2d20..f4fc58701c 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_group - font="SansSerif" height="25" name="im_group_chiclet" show_speaker="false" @@ -12,17 +11,17 @@ left="25" name="speaker" visible="false" - width="20"/> + width="20" /> <chiclet_im_group.group_icon default_icon="Generic_Group" follows="left|top|bottom" - height="22" + height="18" + bottom_pad="4" mouse_opaque="true" name="group_icon" - width="22"/> + width="18" /> <chiclet_im_group.unread_notifications height="25" - font="SansSerif" font_halign="center" left="25" mouse_opaque="false" @@ -32,11 +31,11 @@ visible="false" width="20"/> <chiclet_im_group.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> +bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </chiclet_im_group>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 52fbce0de7..535113f717 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_p2p - font="SansSerif" height="25" name="im_p2p_chiclet" show_speaker="false" @@ -18,10 +17,9 @@ height="22" mouse_opaque="true" name="avatar_icon" - width="22"/> + width="22" /> <chiclet_im_p2p.unread_notifications height="25" - font="SansSerif" font_halign="center" left="25" mouse_opaque="false" @@ -31,11 +29,11 @@ visible="false" width="20"/> <chiclet_im_p2p.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </chiclet_im_p2p>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 33f85a964c..86bea9be50 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_offer - font="SansSerif" height="25" name="offer_chiclet" width="25"> <chiclet_offer.icon - default_icon="Generic_Object_Small" + default_icon="Generic_Object_Small" follows="all" - height="22" + height="20" mouse_opaque="false" name="chiclet_icon" - width="22"/> + bottom_pad="2" + width="20" /> <chiclet_offer.new_message_icon - bottom="12" - height="13" + bottom="11" + height="14" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="13" /> + width="14" /> </chiclet_offer>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index 560c8e6ea5..b1f9f5b0e8 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_script - font="SansSerif" height="25" name="script_chiclet" width="25"> <chiclet_script.icon follows="all" - height="22" - image_name="Generic_Object_Small" + height="20" + image_name="Generic_Object_Small" mouse_opaque="false" name="chiclet_icon" - width="22"/> + width="20" + bottom_pad="2" /> <chiclet_script.new_message_icon - bottom="12" - height="13" + bottom="11" + height="14" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="13" /> + width="14" /> </chiclet_script>
\ No newline at end of file |
